Merge branch 'master' of https://github.com/ocelot-inc/tarantool into 1.6

doc/sphinx/book/replication/index.rst

@@ -71,7 +71,7 @@ a master and vice versa with the help of the :func:`box.cfg` statement.
 
 NOTE:
 The replica does not inherit the master's configuration parameters, such
-as the ones that cause the :ref:`snapshot daemon <book-cfg-snapshot_daemon>` to run on the master.
+as the ones that cause the :ref:`snapshot daemon <book_cfg_snapshot_daemon>` to run on the master.
 To get the same behavior, one would have to set the relevant parameters explicitly
 so that they are the same on both master and replica.
 
@@ -408,12 +408,12 @@ screen looks like this: (except that UUID values are always different):
         .. container:: b-documentation_tab
             :name: terminal-2-1
 
-            .. include:: 1-1.rst
+            .. include:: 1_1.rst
 
         .. container:: b-documentation_tab
             :name: terminal-2-2
 
-            .. include:: 1-2.rst
+            .. include:: 1_2.rst
 
     .. raw:: html
 
@@ -489,12 +489,12 @@ on Terminal #1, because both servers are in the same cluster.
         .. container:: b-documentation_tab
             :name: terminal-3-1
 
-            .. include:: 2-1.rst
+            .. include:: 2_1.rst
 
         .. container:: b-documentation_tab
             :name: terminal-3-2
 
-            .. include:: 2-2.rst
+            .. include:: 2_2.rst
 
     .. raw:: html
 
@@ -558,12 +558,12 @@ Now the screen looks like this:
         .. container:: b-documentation_tab
             :name: terminal-4-1
 
-            .. include:: 3-1.rst
+            .. include:: 3_1.rst
 
         .. container:: b-documentation_tab
             :name: terminal-4-2
 
-            .. include:: 3-2.rst
+            .. include:: 3_2.rst
 
     .. raw:: html
 
@@ -630,12 +630,12 @@ Now the screen looks like this (remember to click on the "Terminal #2" tab when
         .. container:: b-documentation_tab
             :name: terminal-5-1
 
-            .. include:: 4-1.rst
+            .. include:: 4_1.rst
 
         .. container:: b-documentation_tab
             :name: terminal-5-2
 
-            .. include:: 4-2.rst
+            .. include:: 4_2.rst
 
     .. raw:: html
 
@@ -704,12 +704,12 @@ similar sizes because they both contain the same tuples.
         .. container:: b-documentation_tab
             :name: terminal-6-1
 
-            .. include:: 5-1.rst
+            .. include:: 5_1.rst
 
         .. container:: b-documentation_tab
             :name: terminal-6-2
 
-            .. include:: 5-2.rst
+            .. include:: 5_2.rst
 
     .. raw:: html
 
@@ -774,12 +774,12 @@ messages):
         .. container:: b-documentation_tab
             :name: terminal-7-1
 
-            .. include:: 6-1.rst
+            .. include:: 6_1.rst
 
         .. container:: b-documentation_tab
             :name: terminal-7-2
 
-            .. include:: 6-2.rst
+            .. include:: 6_2.rst
 
     .. raw:: html
 
@@ -845,12 +845,12 @@ Now the screen looks like this:
         .. container:: b-documentation_tab
             :name: terminal-8-1
 
-            .. include:: 7-1.rst
+            .. include:: 7_1.rst
 
         .. container:: b-documentation_tab
             :name: terminal-8-2
 
-            .. include:: 7-2.rst
+            .. include:: 7_2.rst
 
     .. raw:: html
 
@@ -919,12 +919,12 @@ The screen now looks like this:
         .. container:: b-documentation_tab
             :name: terminal-9-1
 
-            .. include:: 8-1.rst
+            .. include:: 8_1.rst
 
         .. container:: b-documentation_tab
             :name: terminal-9-2
 
-            .. include:: 8-2.rst
+            .. include:: 8_2.rst
 
     .. raw:: html
 

doc/sphinx/conf.py

@@ -38,9 +38,9 @@ version = '.'.join(release.split('.')[0:2])
 exclude_patterns = [
     '_build',
     'book/connectors/__*',
-    'book/replication/*-1.rst',
-    'book/replication/*-2.rst',
-    'book/configuration/cfg-*'
+    'book/replication/*_1.rst',
+    'book/replication/*_2.rst',
+    'book/configuration/cfg_*'
 ]
 
 pygments_style = 'sphinx'

doc/sphinx/dev_guide/building_from_source.rst

@@ -149,6 +149,9 @@ explain what the steps are, then on the Internet you can look at some example sc
    the reasonable option
    is ``-DENABLE_DOC=false`` or just don't use the ``-DENABLE_DOC`` clause at all.
 
+   The option for hinting that the result will be distributed is :code:`-DENABLE_DIST=ON`.
+   If this option is on, then later ``make install`` will install tarantoolctl files in addition to tarantool files.
+
 6. Use make to complete the build.
 
    .. code-block:: bash
@@ -205,7 +208,6 @@ explain what the steps are, then on the Internet you can look at some example sc
 This is the end of the list of steps to take for source downloads.
 
 For your added convenience, github.com has README files with example scripts: |br|
-`README.CentOS <https://github.com/tarantool/tarantool/blob/1.6/README.CentOS>`_ for CentOS 5.8, |br|
 `README.FreeBSD <https://github.com/tarantool/tarantool/blob/1.6/README.FreeBSD>`_ for FreeBSD 10.1, |br|
 `README.MacOSX <https://github.com/tarantool/tarantool/blob/1.6/README.MacOSX>`_ for Mac OS X `El Capitan`, |br|
 `README.md <https://github.com/tarantool/tarantool/blob/1.6/README.md>`_ for generic GNU/Linux. |br|

doc/sphinx/dev_guide/index.rst

@@ -10,7 +10,7 @@
     building_documentation
     developer_guidelines
     documentation_guidelines
-    box-protocol
+    box_protocol
     c_style_guide
     python_style_guide
     release_management

doc/sphinx/reference/index.rst

@@ -16,7 +16,7 @@
     box_error
     expirationd
     fiber
-    fiber-ipc
+    fiber_ipc
     fio
     fun
     jit