Feedback fixes (#3565)

Fixes #3260, #3247, #2535, #2441, #2210, #2090, #1787

Author: p7nov

doc/archive/tdb.rst

@@ -10,7 +10,7 @@ going forward one line at a time, backtracing, and showing information about
 fibers. The display features include: using different colors for different
 situations, including line numbers, and adding hints.
 
-It is not supplied as part of the Tarantool repository; it must be installed
+It is not supplied as part of the Tarantool repository; it must b\e installed
 separately. Here is the usual way:
 
 .. code-block:: console

doc/book/admin/modules.rst

@@ -35,10 +35,10 @@ Installing a module from deb/rpm
 Follow these steps:
 
 1. Install Tarantool as recommended on the
-   `download page <http://tarantool.org/download.html>`_.
+   `download page <https://tarantool.io/download.html>`_.
 
 2. Install the module you need. Look up the module's name on
-   `Tarantool rocks page <http://tarantool.org/rocks.html>`_ and put the prefix
+   `Tarantool rocks page <https://tarantool.io/rocks.html>`_ and put the prefix
    "tarantool-" before the module name to avoid ambiguity:
 
    .. code-block:: console
@@ -50,11 +50,11 @@ Follow these steps:
        $ sudo yum install tarantool-<module-name>
 
    For example, to install the module
-   `shard <http://github.com/tarantool/shard>`_ on Ubuntu, say:
+   `vshard <http://github.com/tarantool/vshard>`_ on Ubuntu, say:
 
    .. code-block:: console
 
-       $ sudo apt-get install tarantool-shard
+       $ sudo apt-get install tarantool-vshard
 
 Once these steps are complete, you can:
 
@@ -68,7 +68,7 @@ Once these steps are complete, you can:
 
   .. code-block:: tarantoolsession
 
-      tarantool> shard = require('shard')
+      tarantool> vshard = require('vshard')
 
 * search locally for installed modules using ``package.path`` (Lua) or
   ``package.cpath`` (C):

doc/concepts/sharding/vshard_architecture.rst

@@ -201,10 +201,10 @@ distribution of buckets across the shards. During rebalancing, buckets are being
 migrated among replica sets.
 
 The rebalancer "wakes up" periodically and redistributes data from the most
-loaded nodes to less loaded nodes. Rebalancing starts if the **disbalance threshold**
+loaded nodes to less loaded nodes. Rebalancing starts if the **replicaset disbalance**
 of a replica set exceeds a disbalance threshold specified in the configuration.
 
-The disbalance threshold is calculated as follows:
+The replicaset disbalance is calculated as follows:
 
 ..  code-block:: none
 

doc/dev_guide/reference_capi/tuple.rst

@@ -74,9 +74,6 @@
 
     :param box_tuple_t* tuple: a tuple
 
-    :return: -1 on error
-    :return: 0 otherwise
-
     See also: :ref:`box_tuple_ref()<c_api-tuple-box_tuple_ref>`
 
 .. _c_api-tuple-box_tuple_field_count:

doc/reference/reference_lua/yaml.rst

@@ -278,36 +278,27 @@ different results:
     ---
     ...
 
-    tarantool> yaml.encode(setmetatable({'A', 'B'}, { __serialize="sequence"}))
+    tarantool> print(yaml.encode(setmetatable({'A', 'B'}, { __serialize="sequence"})))
     ---
-    - '---
-
-      - A
-
-      - B
-
-      ...
-
-      '
+    - A
+    - B
     ...
 
-    tarantool> yaml.encode(setmetatable({'A', 'B'}, { __serialize="seq"}))
     ---
-    - '--- [''A'', ''B'']
-
-      ...
+    ...
 
-      '
+    tarantool> print(yaml.encode(setmetatable({'A', 'B'}, { __serialize="seq"})))
+    --- ['A', 'B']
     ...
 
-    tarantool> yaml.encode({setmetatable({f1 = 'A', f2 = 'B'}, { __serialize="map"})})
     ---
-    - '---
-
-      - {''f2'': ''B'', ''f1'': ''A''}
+    ...
 
-      ...
+    tarantool> print(yaml.encode({setmetatable({f1 = 'A', f2 = 'B'}, { __serialize="map"})}))
+    ---
+    - {'f2': 'B', 'f1': 'A'}
+    ...
 
-      '
+    ---
     ...
 

doc/reference/reference_rock/vshard/vshard_ref.rst

@@ -117,7 +117,7 @@ Basic parameters
 .. confval:: rebalancer_disbalance_threshold
 
     A maximum bucket disbalance threshold, in percent.
-    The threshold is calculated for each replica set using the following formula:
+    The disbalance is calculated for each replica set using the following formula:
 
     .. code-block:: none
 

doc/reference/reference_rock/vshard/vshard_router.rst

@@ -130,9 +130,8 @@ Router public API
     :param argument_list: an array of the function's arguments
     :param options:
 
-        * ``timeout``—a request timeout, in seconds. If the ``router`` cannot identify a
-          shard with the specified ``bucket_id``, the operation will be repeated until the
-          timeout is reached.
+        * ``timeout`` — a request timeout, in seconds. If the ``router`` cannot identify a
+          shard with the specified ``bucket_id``, it will retry until the timeout is reached.
 
         * other :ref:`net.box options <net_box-options>`, such as ``is_async``,
           ``buffer``, ``on_push`` are also supported.
@@ -198,9 +197,8 @@ Router public API
     :param argument_list: an array of the function's arguments
     :param options:
 
-        * ``timeout``—a request timeout, in seconds. In case the ``router`` cannot identify a
-          shard with the bucket id, the operation will be repeated until the
-          timeout is reached.
+        * ``timeout`` — a request timeout, in seconds.If the ``router`` cannot identify a
+          shard with the specified ``bucket_id``, it will retry until the timeout is reached.
 
         * other :ref:`net.box options <net_box-options>`, such as ``is_async``,
           ``buffer``, ``on_push`` are also supported.
@@ -232,9 +230,8 @@ Router public API
     :param argument_list: an array of the function's arguments
     :param options:
 
-        * ``timeout``—a request timeout, in seconds. In case the ``router`` cannot identify a
-          shard with the bucket id, the operation will be repeated until the
-          timeout is reached.
+        * ``timeout`` — a request timeout, in seconds. If the ``router`` cannot identify a
+          shard with the specified ``bucket_id``, it will retry until the timeout is reached.
 
         * other :ref:`net.box options <net_box-options>`, such as ``is_async``,
           ``buffer``, ``on_push`` are also supported.
@@ -268,9 +265,8 @@ Router public API
     :param argument_list: an array of the function's arguments
     :param options:
 
-        * ``timeout``—a request timeout, in seconds. In case the ``router`` cannot identify a
-          shard with the bucket id, the operation will be repeated until the
-          timeout is reached.
+        * ``timeout`` — a request timeout, in seconds. If the ``router`` cannot identify a
+          shard with the specified ``bucket_id``, it will retry until the timeout is reached.
 
         * other :ref:`net.box options <net_box-options>`, such as ``is_async``,
           ``buffer``, ``on_push`` are also supported.
@@ -867,9 +863,8 @@ Router public API
         :param argument_list: array of the function's arguments
         :param options:
 
-            * ``timeout``—a request timeout, in seconds. In case the ``router`` cannot identify a
-              shard with the bucket id, the operation will be repeated until the
-              timeout is reached.
+            * ``timeout`` — a request timeout, in seconds. If the ``router`` cannot identify a
+          shard with the specified ``bucket_id``, it will retry until the timeout is reached.
 
             * other :ref:`net.box options <net_box-options>`, such as ``is_async``,
               ``buffer``, ``on_push`` are also supported.
@@ -895,9 +890,8 @@ Router public API
         :param argument_list: array of the function's arguments
         :param options:
 
-            * ``timeout``—a request timeout, in seconds. In case the ``router`` cannot identify a
-              shard with the bucket id, the operation will be repeated until the
-              timeout is reached.
+            * ``timeout`` — a request timeout, in seconds. If the ``router`` cannot identify a
+          shard with the specified ``bucket_id``, it will retry until the timeout is reached.
 
             * other :ref:`net.box options <net_box-options>`, such as ``is_async``,
               ``buffer``, ``on_push`` are also supported.
@@ -934,9 +928,8 @@ Router public API
         :param argument_list: array of the function's arguments
         :param options:
 
-            * ``timeout``—a request timeout, in seconds. In case the ``router`` cannot identify a
-              shard with the bucket id, the operation will be repeated until the
-              timeout is reached.
+            * ``timeout`` — a request timeout, in seconds. If the ``router`` cannot identify a
+          shard with the specified ``bucket_id``, it will retry until the timeout is reached.
 
             * other :ref:`net.box options <net_box-options>`, such as ``is_async``,
               ``buffer``, ``on_push`` are also supported.
@@ -963,9 +956,8 @@ Router public API
         :param argument_list: array of the function's arguments
         :param options:
 
-            * ``timeout``—a request timeout, in seconds. In case the ``router`` cannot identify a
-              shard with the bucket id, the operation will be repeated until the
-              timeout is reached.
+            * ``timeout`` — a request timeout, in seconds. If the ``router`` cannot identify a
+          shard with the specified ``bucket_id``, it will retry until the timeout is reached.
 
             * other :ref:`net.box options <net_box-options>`, such as ``is_async``,
               ``buffer``, ``on_push`` are also supported.

doc/reference/reference_rock/vshard/vshard_storage.rst

@@ -80,29 +80,26 @@ Storage public API
 
         tarantool> vshard.storage.info()
         ---
-        - buckets:
-            2995:
-              status: active
-              id: 2995
-            2997:
-              status: active
-              id: 2997
-            2999:
-              status: active
-              id: 2999
-          replicasets:
-            2dd0a343-624e-4d3a-861d-f45efc571cd3:
-              uuid: 2dd0a343-624e-4d3a-861d-f45efc571cd3
+        - replicasets:
+            c862545d-d966-45ff-93ad-763dce4a9723:
+              uuid: c862545d-d966-45ff-93ad-763dce4a9723
               master:
-                state: active
-                uri: storage:[email protected]:3301
-                uuid: 2ec29309-17b6-43df-ab07-b528e1243a79
-            c7ad642f-2cd8-4a8c-bb4e-4999ac70bba1:
-              uuid: c7ad642f-2cd8-4a8c-bb4e-4999ac70bba1
+                uri: admin@localhost:3302
+            1990be71-f06e-4d9a-bcf9-4514c4e0c889:
+              uuid: 1990be71-f06e-4d9a-bcf9-4514c4e0c889
               master:
-                state: active
-                uri: storage:[email protected]:3303
-                uuid: 810d85ef-4ce4-4066-9896-3c352fec9e64
+                uri: admin@localhost:3304
+          bucket:
+            receiving: 0
+            active: 15000
+            total: 15000
+            garbage: 0
+            pinned: 0
+            sending: 0
+          status: 0
+          replication:
+            status: master
+          alerts: []
         ...
 
 ..  _storage_api-call:

locale/ru/LC_MESSAGES/book/admin/modules.po

@@ -70,14 +70,14 @@ msgstr ""
 "$ sudo yum install tarantool-<module-name>"
 
 msgid ""
-"For example, to install the module `shard "
-"<http://github.com/tarantool/shard>`_ on Ubuntu, say:"
+"For example, to install the module `vshard "
+"<http://github.com/tarantool/vshard>`_ on Ubuntu, say:"
 msgstr ""
-"Например, чтобы установить модуль `shard "
-"<http://github.com/tarantool/shard>`_ на Ubuntu, введите:"
+"Например, чтобы установить модуль `vshard "
+"<http://github.com/tarantool/vshard>`_ на Ubuntu, введите:"
 
-msgid "$ sudo apt-get install tarantool-shard"
-msgstr "$ sudo apt-get install tarantool-shard"
+msgid "$ sudo apt-get install tarantool-vshard"
+msgstr "$ sudo apt-get install tarantool-vshard"
 
 msgid "Once these steps are complete, you can:"
 msgstr "Теперь можно:"
@@ -91,8 +91,8 @@ msgstr "tarantool> name = require('module-name')"
 msgid "for example:"
 msgstr "например:"
 
-msgid "tarantool> shard = require('shard')"
-msgstr "tarantool> shard = require('shard')"
+msgid "tarantool> vshard = require('vshard')"
+msgstr "tarantool> vshard = require('vshard')"
 
 msgid ""
 "search locally for installed modules using ``package.path`` (Lua) or "

locale/ru/LC_MESSAGES/concepts/sharding/index.po

@@ -14,6 +14,10 @@ msgid ""
 " which implies that a dataset is partitioned and distributed over multiple "
 "servers."
 msgstr ""
+"**Шардирование** -- это архитектурый принцип баз данных, который позволяет их `горизонтально масштабировать  "
+"<https://en.wikipedia.org/wiki/Scalability#Horizontal_(scale_out)_and_vertical_scaling_(scale_up)>`_,"
+" что означает разбиение набора даных на части и распределение их по нескольким "
+"серверам."
 
 msgid ""
 "With Tarantool's `vshard <https://github.com/tarantool/vshard>`_ module, the"