Multiple minor bug fixes (#897)

v-izmalkov · lenkis · commit fc76e0daf67e · 2019-09-09T19:25:15.000+03:00
Fix gh-875 feedback: Справочник по настройке Partial Fix for gh-868 Tarantool dependency list was changed Fix gh-882 feedback: Adding instances Fix gh-890 feedback: Launching an application Fix Rus gh-890 feedback: Launching an application Fix gh-891 feedback: Вложенный модуль box.space Fix gh-880 feedback: Using a Docker image Fix gh-894 feedback: Monitoring a replica set Fix gh-885 gh-886 gh-887 gh-888 gh-889 Модуль vshard
diff --git a/doc/1.10/book/app_server/launching_app.rst b/doc/1.10/book/app_server/launching_app.rst
@@ -175,7 +175,7 @@ For example:
 .. code-block:: lua
 
     box.cfg {
-       listen = 3301
+       listen = 3301,
        background = true,
        log = '1.log',
        pid_file = '1.pid'
diff --git a/doc/1.10/book/box/box_space.rst b/doc/1.10/book/box/box_space.rst
@@ -1436,16 +1436,16 @@ Below is a list of all ``box.space`` functions and members.
 
     .. _box_space-upsert:
 
-    .. method:: upsert(tuple_value, {{operator, field_no, value}, ...}, )
+    .. method:: upsert({tuple}, {{operator, field_no, value}, ...}, )
 
         Update or insert a tuple.
 
-        If there is an existing tuple which matches the key fields of ``tuple_value``, then the
+        If there is an existing tuple which matches the key fields of ``tuple``, then the
         request has the same effect as :ref:`space_object:update() <box_space-update>` and the
         ``{{operator, field_no, value}, ...}`` parameter is used.
-        If there is no existing tuple which matches the key fields of ``tuple_value``, then the
+        If there is no existing tuple which matches the key fields of ``tuple``, then the
         request has the same effect as :ref:`space_object:insert() <box_space-insert>` and the
-        ``{tuple_value}`` parameter is used. However, unlike ``insert`` or
+        ``{tuple}`` parameter is used. However, unlike ``insert`` or
         ``update``, ``upsert`` will not read a tuple and perform
         error checks before returning -- this is a design feature which
         enhances throughput but requires more caution on the part of the user.
diff --git a/doc/1.10/book/getting_started/using_docker.rst b/doc/1.10/book/getting_started/using_docker.rst
@@ -40,7 +40,7 @@ options:
 
 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.
+with Tarantool version ``1.10`` 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.
diff --git a/doc/1.10/book/replication/repl_add_instances.rst b/doc/1.10/book/replication/repl_add_instances.rst
@@ -22,14 +22,14 @@ analog of the instance file that we created for the first replica in that set:
    -- instance file for replica #2
    box.cfg{
      listen = 3301,
-     replication = ('replicator:password@192.168.0.101:3301',  -- master URI
+     replication = {'replicator:password@192.168.0.101:3301',  -- master URI
                     'replicator:password@192.168.0.102:3301',  -- replica #1 URI
-                    'replicator:password@192.168.0.103:3301'), -- replica #2 URI
+                    'replicator:password@192.168.0.103:3301'}, -- replica #2 URI
      read_only = true
    }
    box.once("schema", function()
       box.schema.user.create('replicator', {password = 'password'})
-      box.schema.user.grant('replicator', 'replication’) -- grant replication role
+      box.schema.user.grant('replicator', 'replication') -- grant replication role
       box.schema.space.create("test")
       box.space.test:create_index("primary")
       print('box.once executed on replica #2')
@@ -95,7 +95,7 @@ instances in that set:
    }
    box.once("schema", function()
       box.schema.user.create('replicator', {password = 'password'})
-      box.schema.user.grant('replicator', 'replication’) -- grant "replication" role
+      box.schema.user.grant('replicator', 'replication') -- grant replication role
       box.schema.space.create("test")
       box.space.test:create_index("primary")
    end)
diff --git a/doc/1.10/book/replication/repl_monitoring.rst b/doc/1.10/book/replication/repl_monitoring.rst
@@ -26,7 +26,7 @@ these instances, issue a :ref:`box.info.replication <box_info_replication>` requ
             peer: replicator@192.168.0.102:3301
             lag: 0
           downstream:
-         vclock: {1: 31}
+            vclock: {1: 31}
         3:
           id: 3
           uuid: e38ef895-5804-43b9-81ac-9f2cd872b9c4
diff --git a/doc/1.10/dev_guide/building_from_source.rst b/doc/1.10/dev_guide/building_from_source.rst
@@ -25,9 +25,12 @@ the preferences can differ. But strategically the steps are always the same.
    * `ReadLine <http://www.gnu.org/software/readline/>`_ library, any version
    * `ncurses <https://www.gnu.org/software/ncurses/>`_ library, any version
    * `OpenSSL <https://www.openssl.org>`_ library, version 1.0.1+
-   * `cURL <https://curl.haxx.se/>`_ library, version 0.725+
    * `LibYAML <http://pyyaml.org/wiki/LibYAML>`_ library, version 0.1.4+
    * `ICU <http://site.icu-project.org/download>`_ library, recent version
+   * `Autoconf <https://www.gnu.org/software/autoconf/>`_ library, any version
+   * `Automake <https://www.gnu.org/software/automake/>`_ library, any version
+   * `Libtool <https://www.gnu.org/software/libtool/>`_ library, any version
+   * `Zlib-devel <https://www.zlib.net/>`_ library, any version
 
    * Python and modules. |br| Python interpreter is not necessary for building
      Tarantool itself, unless you intend to use the "Run the test suite"
@@ -47,8 +50,9 @@ the preferences can differ. But strategically the steps are always the same.
      .. code-block:: console
 
         $ apt install -y build-essential cmake coreutils sed \
+              autoconf automake libtool zlib1g-dev \
               libreadline-dev libncurses5-dev libyaml-dev libssl-dev \
-              libcurl4-openssl-dev libunwind-dev libicu-dev \
+              libunwind-dev libicu-dev \
               python python-pip python-setuptools python-dev \
               python-msgpack python-yaml python-argparse python-six python-gevent
 
@@ -57,8 +61,9 @@ the preferences can differ. But strategically the steps are always the same.
      .. code-block:: console
 
          $ yum install -y gcc gcc-c++ cmake coreutils sed \
+               autoconf automake libtool zlib-devel \
                readline-devel ncurses-devel libyaml-devel openssl-devel \
-               libcurl-devel libunwind-devel libicu-devel \
+               libunwind-devel libicu-devel \
                python python-pip python-setuptools python-devel \
                python-msgpack python-yaml python-argparse python-six python-gevent
 
@@ -69,10 +74,15 @@ the preferences can differ. But strategically the steps are always the same.
      .. code-block:: console
 
          $ brew install cmake autoconf binutils zlib \
-                readline ncurses libyaml openssl curl libunwind-headers icu4c \
+                autoconf automake libtool \
+                readline ncurses libyaml openssl libunwind-headers icu4c \
                 && pip install python-daemon \
                 msgpack-python pyyaml configargparse six gevent
 
+     .. NOTE::
+
+         You can not install `zlib-devel <https://www.zlib.net/>`_  package this way.
+
      Alternatively, download Apple's default Xcode toolset:
 
      .. code-block:: console
@@ -85,7 +95,8 @@ the preferences can differ. But strategically the steps are always the same.
      .. code-block:: console
 
          $ pkg install -y sudo git cmake gmake gcc coreutils \
-               readline ncurses libyaml openssl curl libunwind icu \
+               autoconf automake libtool \
+               readline ncurses libyaml openssl libunwind icu \
                python27 py27-pip py27-setuptools py27-daemon \
                py27-msgpack-python py27-yaml py27-argparse py27-six py27-gevent
 
diff --git a/doc/1.10/reference/reference_rock/vshard/index.rst b/doc/1.10/reference/reference_rock/vshard/index.rst
@@ -263,7 +263,7 @@ A **rebalancer** is a background rebalancing process that ensures an even
 distribution of buckets across the shards. During rebalancing, buckets are being
 migrated among replica sets.
 
-A replica set from which the bucket is being migrated is called a **source**; a
+A replica set from which the bucket is being migrated is called a **source** ; a
 target replica set to which the bucket is being migrated is called a **destination**.
 
 A **replica set lock** makes a replica set invisible to the rebalancer. A locked
diff --git a/locale/ru/LC_MESSAGES/doc.po b/locale/ru/LC_MESSAGES/doc.po
@@ -8669,14 +8669,14 @@ msgstr "Например:"
 #: ../doc/1.10/book/app_server/launching_app.rst:209
 msgid ""
 "box.cfg {\n"
-"   listen = 3301\n"
+"   listen = 3301,\n"
 "   background = true,\n"
 "   log = '1.log',\n"
 "   pid_file = '1.pid'\n"
 "}"
 msgstr ""
 "box.cfg {\n"
-"   listen = 3301\n"
+"   listen = 3301,\n"
 "   background = true,\n"
 "   log = '1.log',\n"
 "   pid_file = '1.pid'\n"
@@ -32010,17 +32010,17 @@ msgid ""
 "-- instance file for replica #2\n"
 "box.cfg{\n"
 "  listen = 3301,\n"
-"  replication = ('replicator:password@192.168.0.101:3301',  -- master URI"
+"  replication = {'replicator:password@192.168.0.101:3301',  -- master URI"
 "\n"
 "                 'replicator:password@192.168.0.102:3301',  -- replica #1"
 " URI\n"
-"                 'replicator:password@192.168.0.103:3301'), -- replica #2"
+"                 'replicator:password@192.168.0.103:3301'}, -- replica #2"
 " URI\n"
 "  read_only = true\n"
 "}\n"
 "box.once(\"schema\", function()\n"
 "   box.schema.user.create('replicator', {password = 'password'})\n"
-"   box.schema.user.grant('replicator', 'replication’) -- grant "
+"   box.schema.user.grant('replicator', 'replication') -- grant "
 "replication role\n"
 "   box.schema.space.create(\"test\")\n"
 "   box.space.test:create_index(\"primary\")\n"
@@ -32030,17 +32030,17 @@ msgstr ""
 "-- файл экземпляра для реплики №2\n"
 "box.cfg{\n"
 "  listen = 3301,\n"
-"  replication = ('replicator:password@192.168.0.101:3301',  -- URI "
+"  replication = {'replicator:password@192.168.0.101:3301',  -- URI "
 "мастера\n"
 "                 'replicator:password@192.168.0.102:3301',  -- URI "
 "реплики №1\n"
-"                 'replicator:password@192.168.0.103:3301'), -- URI "
+"                 'replicator:password@192.168.0.103:3301'}, -- URI "
 "реплики №2\n"
 "  read_only = true\n"
 "}\n"
 "box.once(\"schema\", function()\n"
 "   box.schema.user.create('replicator', {password = 'password'})\n"
-"   box.schema.user.grant('replicator', 'replication’) -- предоставить "
+"   box.schema.user.grant('replicator', 'replication') -- предоставить "
 "роль для репликации\n"
 "   box.schema.space.create(\"test\")\n"
 "   box.space.test:create_index(\"primary\")\n"
@@ -32178,7 +32178,7 @@ msgid ""
 "}\n"
 "box.once(\"schema\", function()\n"
 "   box.schema.user.create('replicator', {password = 'password'})\n"
-"   box.schema.user.grant('replicator', 'replication’) -- grant "
+"   box.schema.user.grant('replicator', 'replication') -- grant "
 "\"replication\" role\n"
 "   box.schema.space.create(\"test\")\n"
 "   box.space.test:create_index(\"primary\")\n"
@@ -32197,7 +32197,7 @@ msgstr ""
 "}\n"
 "box.once(\"schema\", function()\n"
 "   box.schema.user.create('replicator', {password = 'password'})\n"
-"   box.schema.user.grant('replicator', 'replication’) -- предоставить "
+"   box.schema.user.grant('replicator', 'replication') -- предоставить "
 "роль \"replication\"\n"
 "   box.schema.space.create(\"test\")\n"
 "   box.space.test:create_index(\"primary\")\n"
@@ -48024,8 +48024,8 @@ msgid ""
 "one."
 msgstr ""
 "заставит демон создания контрольных точек создавать снимок каждый час до "
-"тех пор, пока не будет создано десять снимков. После этого самый старый "
-"снимок (а также любые связанные с ним WAL-файлы) перед созданием нового "
+"тех пор, пока не будет создано десять снимков. Затем самый старый "
+"снимок удаляется (а также любые связанные с ним WAL-файлы) после создания нового "
 "снимка."
 
 #: ../doc/1.10/reference/configuration/cfg_snapshot_daemon.rst:93
@@ -67755,7 +67755,7 @@ msgstr ""
 #: ../doc/1.10/reference/reference_rock/vshard/index.rst:300
 msgid ""
 "A replica set from which the bucket is being migrated is called a "
-"**source**; a target replica set to which the bucket is being migrated is"
+"**source** ; a target replica set to which the bucket is being migrated is"
 " called a **destination**."
 msgstr ""
 "Набор реплик, из которого переносится сегмент, называется **исходный** "
@@ -79339,7 +79339,7 @@ msgstr "Fedora 22, Ubuntu Vivid"
 #~ ":ref:`box.commit() <box-commit>`."
 
 #~ msgid "Create the first :ref:`index <index-box_index>` (named 'primary'):"
-#~ msgstr "Создайте первый :ref:`индекс <index-box_index>` (с именем 'primary’):"
+#~ msgstr "Создайте первый :ref:`индекс <index-box_index>` (с именем 'primary'):"
 
 #~ msgid "This is a primary index based on the 'id' field of each tuple."
 #~ msgstr "Это первичный индекс по полю 'id' в каждом кортеже."
