diff --git a/doc/sphinx/book/administration.rst b/doc/sphinx/book/administration.rst index af410e6aff0f8cfcf73827ff516e221a75d28295..990c59d259d2997e0d80f8a8a93ed7e4537b0b44 100644 --- a/doc/sphinx/book/administration.rst +++ b/doc/sphinx/book/administration.rst @@ -26,7 +26,8 @@ SIGHUP can be used to cause a log file rotation. See .. program:: tarantool -If ``tarantool`` is started without a Lua script to run, it automatically +If ``tarantool`` is started without an :ref:`initialization file <init-label>`, +or if the initialization file contains :func:`console.start()`, then ``tarantool`` enters interactive mode. There will be a prompt ("``tarantool>``") and it will be possible to enter requests. When used this way, ``tarantool`` can be a client for a remote server. @@ -99,10 +100,12 @@ described in `Lua documentation`_. Examples: 'Hello, world', 'A', [[A\\B!]]. .. _Lua documentation: http://www.lua.org/pil/2.4.html Numeric literals are: Character sequences containing only digits, optionally -preceded by + or -. Examples: 55, -. Notes: Tarantool NUM data type is +preceded by + or -. Large or floating-point numeric +literals may include decimal points, exponential notation, or suffixes. +Examples: 500, -500, 5e2, 500.1, 5LL, 5ULL. Notes: Tarantool NUM data type is unsigned, so -1 is understood as a large unsigned number. -Single-byte tokens are: * or , or ( or ). Examples: * , ( ). +Single-byte tokens are: , or ( or ) or arithmetic operators. Examples: * , ( ). Tokens must be separated from each other by one or more spaces, except that spaces are not necessary around single-byte tokens or string literals. diff --git a/doc/sphinx/book/configuration/cfg-storage.rst b/doc/sphinx/book/configuration/cfg-storage.rst index e3ba5ceab1a78ddcb2fd5bdc1ab33e4d989af469..07d1810a6cc3e0a79a37f320d86c113f819afdd2 100644 --- a/doc/sphinx/book/configuration/cfg-storage.rst +++ b/doc/sphinx/book/configuration/cfg-storage.rst @@ -58,7 +58,7 @@ threads = *number*, node_size = *number*, memory_limit = *number*, - }` + } This method may change in the future. diff --git a/doc/sphinx/book/configuration/index.rst b/doc/sphinx/book/configuration/index.rst index 3d5e403615cfb3e10709b728bb414cf16d1a2fe4..86665f903d6ac37d6a5d5be04b9c668c8923e90b 100644 --- a/doc/sphinx/book/configuration/index.rst +++ b/doc/sphinx/book/configuration/index.rst @@ -38,7 +38,7 @@ Tarantool is started by entering the command: .. code-block:: console $ ./tarantool --version - Tarantool 1.6.3-439-g7e1011b + Tarantool 1.6.8-235-gb948587 Target: Linux-x86_64-Debug ... diff --git a/doc/sphinx/book/replication/index.rst b/doc/sphinx/book/replication/index.rst index 3f8b67132ebd8e26484f429bd55db619073afee2..063e6e85f3cf1e0e0781a28281442648f8ce1266 100644 --- a/doc/sphinx/book/replication/index.rst +++ b/doc/sphinx/book/replication/index.rst @@ -89,7 +89,7 @@ degraded state requires a human inspection. However, once a master failure is detected, the recovery is simple: declare that the replica is now the new master, by saying -:codenormal:`box.cfg{... listen=`:codeitalic:`URI`:codenormal`}`. +:codenormal:`box.cfg{... listen=`:codeitalic:`URI`:codenormal:`}`. Then, if there are updates on the old master that were not propagated before the old master went down, they would have to be re-applied manually.