Multiple bug fixes version 2.1 specific

Fix gh-847 feedback: Модуль json
Fix gh-853 feedback: Functions for transaction management
Fix gh-842 Make each function a link

Author: lenkis

doc/2.2/book/box/box_txn_management.rst

@@ -84,10 +84,7 @@ Below is a list of all functions for transaction management.
     | :ref:`box.on_rollback()              | Define a trigger that will be   |
     | <box-on_rollback>`                   | activated by box.rollback       |
     +--------------------------------------+---------------------------------+
-    | :ref:`is_in_txn()                    | State whether a transaction is  |
-    | <box-is_in_txn>`                     | in progress                     |
-    +--------------------------------------+---------------------------------+
-    | :ref:`is_in_txn()                    | State whether a transaction is  |
+    | :ref:`box.is_in_txn()                | State whether a transaction is  |
     | <box-is_in_txn>`                     | in progress                     |
     +--------------------------------------+---------------------------------+
 

doc/2.2/reference/reference_lua/json.rst

@@ -36,7 +36,7 @@ Below is a list of all ``json`` functions and members.
     | :ref:`json.NULL                      | Analog of Lua's "nil"           |
     | <json-null>`                         |                                 |
     +--------------------------------------+---------------------------------+
-    | :ref:`json.cfg()                     | Set persistent flags            |
+    | :ref:`json.cfg()                     | Set global flags                |
     | <json-module_cfg>`                   |                                 |
     +--------------------------------------+---------------------------------+
 

doc/2.2/reference/reference_sql/sql.rst

@@ -2579,129 +2579,243 @@ Apply a built-in function to one or more expressions and return a scalar value.
 
 Tarantool supports 32 built-in functions.
 
-``CHAR([numeric-expression [,numeric-expression...])``
-        Return the characters whose Unicode code point values are equal
-        to the numeric expressions.
-
-        Short example:
-        The first 128 Unicode characters are the "ASCII" characters,
-        so CHAR(65,66,67) is 'ABC'.
-
-        Long example:
-        For the current list of Unicode characters,
-        in order by code point, see
-        `www.unicode.org/Public/UCD/latest/ucd/UnicodeData.txt <http://www.unicode.org/Public/UCD/latest/ucd/UnicodeData.txt>`_.
-        In that list, there is a line for a Linear B ideogram |br|
-        ``100CC;LINEAR B IDEOGRAM B240 WHEELED CHARIOT ...`` |br|
-        Therefore, for a string with a chariot in the middle,
-        use the concatenation operator ``||`` and the CHAR function
-        ``'start of string ' || CHAR(0X100CC) || ' end of string'``.
-
-``COALESCE(expression, expression [, expression ...])``
-        Return the value of the first non-NULL expression, or, if all
-        expression values are NULL, return NULL.
-
-        Example: ``COALESCE(NULL, 17, 32)`` is 17
-
-``HEX(expression)``
-        Return the hexadecimal code for each byte in *expression*,
-        which may be either a string or a byte sequence.
-        For ASCII characters, this
-        is straightforward because the encoding is
-        the same as the code point value. For
-        non-ASCII characters, since character strings
-        are usually encoded in UTF-8, each character
-        will require two or more bytes.
-
-        Examples:
-
-        * ``HEX('A')`` will return '41'
-        * ``HEX('Д')`` will return 'D094'
-
-``IFNULL(expression, expression)``
-        Return the value of the first non-NULL expression, or, if both
-        expression values are NULL, return NULL. Thus
-        ``IFNULL(expression,expression)`` is the same as
-        ``COALESCE(expression, expression)``.
-
-        Example: ``IFNULL(NULL, 17)`` is 17
-
-``LENGTH(expression)``
-        Return the number of characters in the *expression*,
-        or the number of bytes in the *expression*.
-        It depends on the data type:
-        strings with data type STRING are counted in characters,
-        byte sequences with data type VARBINARY
-        are counted in bytes and are not ended by the nul character.
-        There are two aliases for ``LENGTH(expression)`` -- ``CHAR_LENGTH(expression)``
-        and ``CHARACTER_LENGTH(expression)`` do the same thing.
-
-        Examples:
-
-        * ``LENGTH('ДД')`` is 2, the string has 2 characters
-        * ``LENGTH(CAST('ДД' AS VARBINARY))`` is 4, the string has 4 bytes
-        * ``LENGTH(CHAR(0,65))`` is 2, '\0' does not mean 'end of string'
-        * ``LENGTH(X'410041')`` is 3, X'...' byte sequences have type VARBINARY
-
-``NULLIF(expression-1, expression-2)``
-        Return *expression-1* if *expression-1* <> *expression-2*,
-        otherwise return NULL.
-
-        Examples:
-
-        * ``NULLIF('a','A')`` is 'a'
-        * ``NULLIF(1.00, 1)`` is NULL
-
-``PRINTF(string-expression [, expression ...])``
-        Return a string formatted according to the rules of the C
-        ``sprintf()`` function, where ``%d%s`` means the next two arguments
-        are a number and a string, etc.
-
-        If an argument is missing or is NULL, it becomes:
-
-        * '0' if the format requires an integer,
-        * '0.0' if the format requires a decimal number,
-        * '' if the format requires a string.
-
-        Example: ``PRINTF('%da', 5)`` is '5a'
-
-``QUOTE(string-literal)``
-        Return a string with enclosing quotes if necessary,
-        and with quotes inside the enclosing quotes if necessary.
-        This function is useful for creating strings
-        which are part of SQL statements, because of SQL's rules that
-        string literals are enclosed by single quotes, and single quotes
-        inside such strings are shown as two single quotes in a row.
-
-        Example: ``QUOTE('a')`` is '''a'''
-
-``SOUNDEX(string-expression)``
-        Return a four-character string which represents the sound
-        of ``string-expression``. Often words and names which have
-        different spellings will have the same Soundex representation
-        if they are pronounced similarly,
-        so it is possible to search by what they sound like.
-        The algorithm works with characters in the Latin alphabet
-        and works best with English words.
-
-        Example: ``SOUNDEX('Crater')`` and ``SOUNDEX('Creature')`` both return 'C636'.
-
-``UNICODE(string-expression)``
-        Return the Unicode code point value of the first character of
-        *string-expression*.
-        If *string-expression* is empty, the return is NULL.
-        This is the reverse of CHAR(integer).
-
-        Example: ``UNICODE('Щ')`` is 1065 (hexadecimal 0429)
-
-``UPPER(string-expression)``
-        Return the expression, with lower-case characters converted
-        to upper case.
-        This is the reverse of LOWER(string-expression).
+.. _sql_function_char:
 
-        Example: ``UPPER('-4щl')`` is '-4ЩL'
+***********************************************
+CHAR
+***********************************************
+
+Syntax:
+
+:samp:`CHAR([numeric-expression [,numeric-expression...])`
+
+Return the characters whose Unicode code point values are equal
+to the numeric expressions.
+
+Short example:
+
+The first 128 Unicode characters are the "ASCII" characters,
+so CHAR(65,66,67) is 'ABC'.
+
+Long example:
+
+For the current list of Unicode characters,
+in order by code point, see
+`www.unicode.org/Public/UCD/latest/ucd/UnicodeData.txt
+<http://www.unicode.org/Public/UCD/latest/ucd/UnicodeData.txt>`_.
+In that list, there is a line for a Linear B ideogram
+
+``100CC;LINEAR B IDEOGRAM B240 WHEELED CHARIOT ...``
+
+Therefore, for a string with a chariot in the middle,
+use the concatenation operator ``||`` and the CHAR function
+
+``'start of string ' || CHAR(0X100CC) || ' end of string'``.
+
+.. _sql_function_coalesce:
+
+***********************************************
+COALESCE
+***********************************************
+
+Syntax:
+
+:samp:`COALESCE(expression, expression [, expression ...])`
+
+Return the value of the first non-NULL expression, or, if all
+expression values are NULL, return NULL.
+
+Example:
+  ``COALESCE(NULL, 17, 32)`` is 17.
+
+.. _sql_function_hex:
+
+***********************************************
+HEX
+***********************************************
+
+Syntax:
+
+:samp:`HEX(expression)`
+
+Return the hexadecimal code for each byte in **expression**,
+which may be either a string or a byte sequence.
+For ASCII characters, this
+is straightforward because the encoding is
+the same as the code point value. For
+non-ASCII characters, since character strings
+are usually encoded in UTF-8, each character
+will require two or more bytes.
+
+Examples:
+
+  * ``HEX('A')`` will return ``41``.
+  * ``HEX('Д')`` will return ``D094``.
+
+.. _sql_function_ifnull:
+
+***********************************************
+IFNULL
+***********************************************
+
+Syntax:
+
+:samp:`IFNULL(expression, expression)`
+
+Return the value of the first non-NULL expression, or, if both
+expression values are NULL, return NULL. Thus
+``IFNULL(expression, expression)`` is the same as
+``COALESCE(expression, expression)``.
+
+Example:
+  ``IFNULL(NULL, 17)`` is 17
+
+.. _sql_function_length:
+
+***********************************************
+LENGTH
+***********************************************
+
+Syntax:
+
+:samp:`LENGTH(expression)`
+
+Return the number of characters in the **expression**,
+or the number of bytes in the **expression**.
+It depends on the data type:
+strings with data type STRING are counted in characters,
+byte sequences with data type VARBINARY
+are counted in bytes and are not ended by the nul character.
+There are two aliases for ``LENGTH(expression)`` -- ``CHAR_LENGTH(expression)``
+and ``CHARACTER_LENGTH(expression)`` do the same thing.
+
+Examples:
+
+  * ``LENGTH('ДД')`` is 2, the string has 2 characters.
+  * ``LENGTH(CAST('ДД' AS VARBINARY))`` is 4, the string has 4 bytes.
+  * ``LENGTH(CHAR(0,65))`` is 2, '\0' does not mean 'end of string'.
+  * ``LENGTH(X'410041')`` is 3, X'...' byte sequences have type VARBINARY.
+
+.. _sql_function_nullif:
+
+***********************************************
+NULLIF
+***********************************************
+
+Syntax:
+
+:samp:`NULLIF(expression-1, expression-2)`
+
+Return *expression-1* if *expression-1* <> *expression-2*,
+otherwise return NULL.
+
+Examples:
+
+  * ``NULLIF('a','A')`` is 'a'.
+  * ``NULLIF(1.00, 1)`` is NULL.
+
+.. _sql_function_printf:
+
+***********************************************
+PRINTF
+***********************************************
+
+Syntax:
+
+:samp:`PRINTF(string-expression [, expression ...])`
+
+Return a string formatted according to the rules of the C
+``sprintf()`` function, where ``%d%s`` means the next two arguments
+are a number and a string, etc.
+
+If an argument is missing or is NULL, it becomes:
+
+  * '0' if the format requires an integer,
+  * '0.0' if the format requires a decimal number,
+  * '' if the format requires a string.
+
+Example: ``PRINTF('%da', 5)`` is '5a'.
+
+.. _sql_function_quote:
+
+***********************************************
+QUOTE
+***********************************************
+
+Syntax:
+
+:samp:`QUOTE(string-literal)`
+
+Return a string with enclosing quotes if necessary,
+and with quotes inside the enclosing quotes if necessary.
+This function is useful for creating strings
+which are part of SQL statements, because of SQL's rules that
+string literals are enclosed by single quotes, and single quotes
+inside such strings are shown as two single quotes in a row.
+
+Example: ``QUOTE('a')`` is ``'a'``.
+
+.. _sql_function_soundex:
+
+***********************************************
+SOUNDEX
+***********************************************
+
+Syntax:
+
+:samp:`SOUNDEX(string-expression)`
+
+Return a four-character string which represents the sound
+of ``string-expression``. Often words and names which have
+different spellings will have the same Soundex representation
+if they are pronounced similarly,
+so it is possible to search by what they sound like.
+The algorithm works with characters in the Latin alphabet
+and works best with English words.
+
+Example: ``SOUNDEX('Crater')`` and ``SOUNDEX('Creature')`` both return ``C636``.
+
+.. _sql_function_unicode:
+
+***********************************************
+UNICODE
+***********************************************
+
+Syntax:
+
+:samp:`UNICODE(string-expression)`
+
+Return the Unicode code point value of the first character of **string-expression**.
+If *string-expression* is empty, the return is NULL.
+This is the reverse of CHAR(integer).
+
+Example: ``UNICODE('Щ')`` is 1065 (hexadecimal 0429).
+
+.. _sql_function_upper:
+
+***********************************************
+UPPER
+***********************************************
+
+Syntax:
+
+:samp:`UPPER(string-expression)`
+
+Return the expression, with lower-case characters converted to upper case.
+This is the reverse of LOWER(string-expression).
+
+Example: ``UPPER('-4щl')`` is '-4ЩL'.
+
+.. _sql_function_version:
+
+***********************************************
+VERSION
+***********************************************
+
+Syntax:
+
+:samp:`VERSION()`
+
+Return the Tarantool version.
 
-``VERSION()``
-        Return the Tarantool version.
-
-        Example: for a March 2019 build VERSION() is  '2.1.1-374-g27283debc'
+Example: for a March 2019 build VERSION() is ``2.1.1-374-g27283debc``.

locale/ru/LC_MESSAGES/doc.po

@@ -61996,8 +61996,8 @@ msgid ":ref:`json.cfg() <json-module_cfg>`"
 msgstr ":ref:`json.cfg() <json-module_cfg>`"
 
 #: ../doc/2.2/reference/reference_lua/json.rst:39
-msgid "Set persistent flags"
-msgstr "Определение энергостойких флагов"
+msgid "Set global flags"
+msgstr "Определение глобальных флагов"
 
 #: ../doc/2.2/reference/reference_lua/json.rst:49
 msgid "Convert a Lua object to a JSON string."