Fix minor bugs (feedback tickets)

doc/1.10/book/box/data_model.rst

@@ -634,7 +634,7 @@ All of them are implemented as functions in :ref:`box.space <box_space>` submodu
 
   .. code-block:: tarantoolsession
 
-      tarantool> box.space.tester:upsert({999}, {{'=', 2, 'Tarantism'}})
+      tarantool> box.space.tester:upsert({999, 'Taranted'}, {{'=', 2, 'Tarantism'}})
 
 * :ref:`REPLACE <box_space-replace>`: Replace the tuple, adding a new field.
 

doc/1.10/book/getting_started/using_binary.rst

@@ -6,7 +6,7 @@ Using a binary package
 
 For production purposes, we recommend
 `official binary packages <http://tarantool.org/download.html>`_.
-You can choose from two Tarantool versions: 1.10 (stable) or 2.0 (alpha).
+You can choose from two Tarantool versions: ``1.10`` (stable) or ``2.0`` (alpha).
 An automatic build system creates, tests and publishes packages for every
 push into a corresponding branch (``1.10`` or ``2.0``) at
 `Tarantool's GitHub repository <https://github.com/tarantool/tarantool>`_.
@@ -59,15 +59,15 @@ Here is how to create a simple test database after installation.
    You can delete the directory when the tests are over.
 
 #. Check if the default port the database instance will listen to is vacant.
-   
+
    Depending on the release, during installation Tarantool may start a
    demonstrative global ``example.lua`` instance that listens to the
    ``3301`` port by default. The ``example.lua`` file showcases basic
    configuration and can be found in the ``/etc/tarantool/instances.enabled``
    or ``/etc/tarantool/instances.available`` directories.
 
    However, we encourage you to perform the instance startup manually, so you
-   can learn. 
+   can learn.
 
    Make sure the default port is vacant:
 
@@ -92,7 +92,7 @@ Here is how to create a simple test database after installation.
 
       tarantool> box.cfg{listen = 3301}
 
-#. Create the first :ref:`space <index-box_space>` (named ``'tester'``):
+#. Create the first :ref:`space <index-box_space>` (named ``tester``):
 
    .. code-block:: tarantoolsession
 
@@ -108,7 +108,7 @@ Here is how to create a simple test database after installation.
                > {name = 'year', type = 'unsigned'}
                > })
 
-#. Create the first :ref:`index <index-box_index>` (named ``'primary'``):
+#. Create the first :ref:`index <index-box_index>` (named ``primary``):
 
    .. code-block:: tarantoolsession
 
@@ -119,7 +119,7 @@ Here is how to create a simple test database after installation.
 
    This is a primary index based on the ``id`` field of each tuple.
 
-#. Insert three :ref:`tuples <index-box_tuple>` (our name for "records")
+#. Insert three :ref:`tuples <index-box_tuple>` (our name for records)
    into the space:
 
    .. code-block:: tarantoolsession
@@ -128,7 +128,7 @@ Here is how to create a simple test database after installation.
       tarantool> s:insert{2, 'Scorpions', 2015}
       tarantool> s:insert{3, 'Ace of Base', 1993}
 
-#. To select a tuple using the ``'primary'`` index, say:
+#. To select a tuple using the ``primary`` index, say:
 
    .. code-block:: tarantoolsession
 
@@ -180,7 +180,7 @@ Here is how to create a simple test database after installation.
       - - [3, 'Ace of Base', 1993]
       ...
 
-#. To add a secondary index based on the ``'band_name'`` field, say:
+#. To add a secondary index based on the ``band_name`` field, say:
 
    .. code-block:: tarantoolsession
 
@@ -189,7 +189,7 @@ Here is how to create a simple test database after installation.
                > parts = {'band_name'}
                > })
 
-#. To select tuples using the ``'secondary'`` index, say:
+#. To select tuples using the ``secondary`` index, say:
 
    .. code-block:: tarantoolsession
 
@@ -213,7 +213,7 @@ Connecting remotely
 
 In the request ``box.cfg{listen = 3301}`` that we made earlier, the ``listen``
 value can be any form of a :ref:`URI <index-uri>` (uniform resource identifier).
-In this case, it’s just a local port: port 3301. You can send requests to the
+In this case, it’s just a local port: port ``3301``. You can send requests to the
 listen URI via:
 
 (1) ``telnet``,

doc/1.10/book/getting_started/using_docker.rst

@@ -6,8 +6,8 @@ Using a Docker image
 
 For trial and test purposes, we recommend using
 `official Tarantool images for Docker <https://github.com/tarantool/docker>`_.
-An official image contains a particular Tarantool version (1.6, 1.9, 1.10 or 2.0) and
-all popular external modules for Tarantool.
+An official image contains a particular Tarantool version (``1.6``, ``1.9``,
+``1.10`` or ``2.0``) and all popular external modules for Tarantool.
 Everything is already installed and configured in Linux.
 These images are the easiest way to install and use Tarantool.
 
@@ -38,9 +38,9 @@ options:
      -v /data/dir/on/host:/var/lib/tarantool \
      tarantool/tarantool:1
 
-This command runs a new container named 'mytarantool'.
-Docker starts it from an official image named 'tarantool/tarantool:1',
-with Tarantool version 1.9 and all external modules already installed.
+This command runs a new container named ``mytarantool``.
+Docker starts it from an official image named ``tarantool/tarantool:1``,
+with Tarantool version ``1.9`` and all external modules already installed.
 
 Tarantool will be accepting incoming connections on ``localhost:3301``.
 You may start using it as a key-value storage right away.
@@ -72,7 +72,7 @@ To attach to Tarantool that runs inside the container, say:
 This command:
 
 * Instructs Tarantool to open an interactive console port for incoming connections.
-* Attaches to the Tarantool server inside the container under 'admin' user via
+* Attaches to the Tarantool server inside the container under ``admin`` user via
   a standard Unix socket.
 
 Tarantool displays a prompt:
@@ -95,7 +95,7 @@ Creating a database
 
 While you're attached to the console, let's create a simple test database.
 
-First, create the first :ref:`space <index-box_space>` (named 'tester'):
+First, create the first :ref:`space <index-box_space>` (named ``tester``):
 
 .. code-block:: tarantoolsession
 
@@ -111,7 +111,7 @@ Format the created space by specifying field names and types:
                   > {name = 'year', type = 'unsigned'}
                   > })
 
-Create the first :ref:`index <index-box_index>` (named 'primary'):
+Create the first :ref:`index <index-box_index>` (named ``primary``):
 
 .. code-block:: tarantoolsession
 
@@ -120,9 +120,9 @@ Create the first :ref:`index <index-box_index>` (named 'primary'):
                   > parts = {'id'}
                   > })
 
-This is a primary index based on the 'id' field of each tuple.
+This is a primary index based on the ``id`` field of each tuple.
 
-Insert three :ref:`tuples <index-box_tuple>` (our name for "records")
+Insert three :ref:`tuples <index-box_tuple>` (our name for records)
 into the space:
 
 .. code-block:: tarantoolsession
@@ -131,7 +131,7 @@ into the space:
     tarantool.sock> s:insert{2, 'Scorpions', 2015}
     tarantool.sock> s:insert{3, 'Ace of Base', 1993}
 
-To select a tuple using the 'primary' index, say:
+To select a tuple using the ``primary`` index, say:
 
 .. code-block:: tarantoolsession
 
@@ -183,7 +183,7 @@ The terminal screen now looks like this:
     - - [3, 'Ace of Base', 1993]
     ...
 
-To add a secondary index based on the 'band_name' field, say:
+To add a secondary index based on the ``band_name`` field, say:
 
 .. code-block:: tarantoolsession
 
@@ -192,7 +192,7 @@ To add a secondary index based on the 'band_name' field, say:
                   > parts = {'band_name'}
                   > })
 
-To select tuples using the 'secondary' index, say:
+To select tuples using the ``secondary`` index, say:
 
 .. code-block:: tarantoolsession
 

doc/1.10/reference/reference_lua/digest.rst

@@ -15,8 +15,7 @@ A "digest" is a value which is returned by a function (usually a
 module supports several types of cryptographic hash functions (AES_, MD4_,
 MD5_, SHA-1_, SHA-2_, PBKDF2_) as well as a checksum function (CRC32_), two
 functions for base64_, and two non-cryptographic hash functions (guava_, murmur_).
-Some of the digest functionality is also present in the :ref:`crypto <crypto>`
-module.
+Some of the digest functionality is also present in the :ref:`crypto <crypto>`.
 
 ===============================================================================
                                     Index
@@ -309,10 +308,15 @@ Below is a list of all ``digest`` functions.
 
 .. _digest-murmur_new:
 
-.. function:: digest.murmur.new([seed])
+.. function:: digest.murmur.new(opts)
 
     Initiates incremental MurmurHash.
     See :ref:`incremental methods <digest-incremental_digests>` notes.
+    For example:
+
+    .. code-block:: lua
+
+        murmur.new({seed=0})
 
 .. _digest-incremental_digests:
 

doc/1.10/reference/reference_lua/fiber.rst

@@ -397,6 +397,10 @@ recommended.
     Check if the current fiber has been cancelled
     and throw an exception if this is the case.
 
+    .. NOTE::
+
+        This exception cannot be caught by pcall or xpcall.
+
     **Example:**
 
     .. code-block:: tarantoolsession

doc/1.10/reference/reference_lua/net_box.rst

@@ -509,7 +509,8 @@ Below is a list of all ``net.box`` functions.
 
         * ``future:is_ready()`` which will return true
           when the result of the request is available,
-        * ``future:result()`` to get the result of the request,
+        * ``future:result()`` to get the result of the request (returns the
+          response or **nil** in case it's not ready yet or there has been an error),
         * ``future:wait_result(timeout)`` to
           wait until the result of the request is available and then get it,
         * ``future:discard()`` to abandon the object.

doc/1.10/reference/reference_lua/string.rst

@@ -255,7 +255,7 @@ Below is a list of all additional ``string`` functions.
 
     .. code-block:: tarantoolsession
 
-        tarantool> fiber = require('string')
+        tarantool> string = require('string')
         ---
         ...
         tarantool> string.split("A*BXX C", "XX")

doc/1.10/reference/reference_rock/dbms.rst

@@ -548,8 +548,8 @@ For all PostgreSQL statements, the request is:
     *connection-name*:execute(*sql-statement* [, *parameters*])
 
 where ``sql-statement`` is a string, and the optional ``parameters``
-are extra values that can be plugged in to replace any question marks ("?"s)
-in the SQL statement.
+are extra values that can be plugged in to replace any placeholders
+($1 $2 $3 etc.) in the SQL statement.
 
 **Example:**
 

doc/1.10/tutorials/lua_tutorials.rst

@@ -86,7 +86,7 @@ The screen now looks like this:
 
 .. code-block:: tarantoolsession
 
-    tarantool> function string_funciton()
+    tarantool> function string_function()
              >   return "hello world"
              > end
     ---

download/connectors.rst

@@ -86,7 +86,7 @@ Tarantool - Connectors
 
                     .. container:: b-connector-owner
 
-                        Owner: `@rtisisyk <https://github.com/rtisisyk>`_
+                        Owner: `@rtsisyk <https://github.com/rtsisyk>`_
 
             .. _C#:
             .. container:: b-connector

locale/ru/LC_MESSAGES/book.po

@@ -9845,7 +9845,7 @@ msgid ""
 "-- Upsert the tuple, changing field field[2] again.\n"
 "-- The syntax of upsert is similar to the syntax of update,\n"
 "-- but the return value will be different.\n"
-"tarantool> box.space.tester:upsert({999}, {{'=', 2, 'Tarantism'}})\n"
+"tarantool> box.space.tester:upsert({999, 'Taranted'}, {{'=', 2, 'Tarantism'}})\n"
 "\n"
 "-- Replace the tuple, adding a new field.\n"
 "-- This is also possible with the update() request but\n"
@@ -9880,7 +9880,7 @@ msgstr ""
 "-- значение поля field[2].\n"
 "-- Синтаксис запроса upsert() аналогичен синтаксису update(),\n"
 "-- но возвращаемые значения у этих запросов разные.\n"
-"tarantool> box.space.tester:upsert({999}, {{'=', 2, 'Tarantism'}})\n"
+"tarantool> box.space.tester:upsert({999, 'Taranted'}, {{'=', 2, 'Tarantism'}})\n"
 "\n"
 "-- Производим замену кортежа с помощью replace(), добавляем новое поле.\n"
 "-- Это можно сделать и с помощью запроса update(),\n"

locale/ru/LC_MESSAGES/doc.po

@@ -17566,7 +17566,7 @@ msgstr ""
 "до замены ``before_replace()``. Если созданы оба типа, то все триггеры до замены "
 "``before_replace`` выполняются до всех триггеров после замены ``on_replace``. Функции для "
 "обоих типов триггеров ``on_replace`` и ``before_replace`` могут вносить изменения в базу "
-"данных, гл только функции с триггерами до замены ``before_replace`` могут изменять кортеж, "
+"данных, но только функции с триггерами до замены ``before_replace`` могут изменять кортеж, "
 "который будет заменен."
 
 #: ../doc/1.10/book/box/box_space.rst:989
@@ -28571,7 +28571,7 @@ msgid ""
 "socket."
 msgstr ""
 "Подключается через стандартный Unix-сокет к Tarantool-серверу, запущенному внутри "
-"контейнера, из-под пользователя 'admin’."
+"контейнера, из-под пользователя '**admin**'."
 
 #: ../doc/1.10/book/getting_started/using_docker.rst:112
 msgid "Tarantool displays a prompt:"
@@ -51134,6 +51134,7 @@ msgstr "Открытие файла в процессе подготовки к
 msgid "Full path to the file to open."
 msgstr "Полный путь к открываемому файлу."
 
+#, fuzzy
 #: ../doc/1.10/reference/reference_lua/fio.rst:751
 msgid ""
 "Flags can be passed as a number or as string constants, for example '``O_RDONLY``', "
@@ -54138,8 +54139,13 @@ msgid ""
 msgstr "``future:is_ready()`` вернет true (правда), если доступен результат запроса,"
 
 #: ../doc/1.10/reference/reference_lua/net_box.rst:513
-msgid "``future:result()`` to get the result of the request,"
-msgstr "``future:result()`` используется для получения результата запроса,"
+msgid ""
+"``future:result()`` to get the result of the request (returns the "
+"response or Nil in case it's not ready yet or there has been an error),"
+msgstr ""
+"``future:result()`` используется для получения результата запроса "
+"(возвращает ответ на запрос или Nil в случае, если ответ еще не получен "
+"или произошла какая-либо ошибка),"
 
 #: ../doc/1.10/reference/reference_lua/net_box.rst:514
 msgid ""
@@ -56520,7 +56526,7 @@ msgid ""
 msgstr ""
 "Во второй оболочке создайте файл, который содержит несколько строк. Содержимое не имеет "
 "значения. Предположим, что первая строка содержит A, вторая строка содержит B, третья строка "
-"содержит C. Вызвать этот файл \"tmp.txt\"."
+"содержит C. Назовите этот файл \"tmp.txt\"."
 
 #: ../doc/1.10/reference/reference_lua/socket.rst:771
 msgid ""
@@ -56899,7 +56905,7 @@ msgstr "таблица строк, которые были разделены и
 
 #: ../doc/1.10/reference/reference_lua/string.rst:239
 msgid ""
-"tarantool> fiber = require('string')\n"
+"tarantool> string = require('string')\n"
 "---\n"
 "...\n"
 "tarantool> string.split(\"A*BXX C\", \"XX\")\n"
@@ -56908,7 +56914,7 @@ msgid ""
 "  - ' C'\n"
 "..."
 msgstr ""
-"tarantool> fiber = require('string')\n"
+"tarantool> string = require('string')\n"
 "---\n"
 "...\n"
 "tarantool> string.split(\"A*BXX C\", \"XX\")\n"
@@ -59138,10 +59144,10 @@ msgstr "*имя-соединения*:execute(*sql-оператор* [, *пар
 #: ../doc/1.10/reference/reference_rock/dbms.rst:584
 msgid ""
 "where ``sql-statement`` is a string, and the optional ``parameters`` are extra values that "
-"can be plugged in to replace any question marks (\"?\"s) in the SQL statement."
+"can be plugged in to replace any placeholders ($1 $2 $3 etc.) in the SQL statement."
 msgstr ""
 "где ``sql-statement`` -- это строка, а необязательные параметры -- это дополнительные "
-"значения, которыми можно заменить любые знаки вопроса (\"?\") в SQL-операторе."
+"значения, которыми можно заменить любые местозаполнители ($1 $2 $3 и т.д.) в SQL-операторе."
 
 #: ../doc/1.10/reference/reference_rock/dbms.rst:248
 msgid ""
@@ -66512,7 +66518,7 @@ msgstr "Теперь вывод на экране выглядит следую
 
 #: ../doc/1.10/tutorials/lua_tutorials.rst:121
 msgid ""
-"tarantool> function string_funciton()\n"
+"tarantool> function string_function()\n"
 "         >   return \"hello world\"\n"
 "         > end\n"
 "---\n"
@@ -66523,7 +66529,7 @@ msgid ""
 "...\n"
 "tarantool>"
 msgstr ""
-"tarantool> function string_funciton()\n"
+"tarantool> function string_function()\n"
 "         >   return \"hello world\"\n"
 "         > end\n"
 "---\n"