Merge branch 'ocelot-master'

doc/sphinx/book/app_a_errcodes.rst

@@ -24,7 +24,7 @@ ER_ILLEGAL_PARAMS
     Illegal parameters. Malformed protocol message.
 
 ER_MEMORY_ISSUE
-    Out of memory: :ref:`slab_alloc_arena` limit is reached.
+    Out of memory: :ref:`slab_alloc_arena <slab_alloc_arena>` limit is reached.
 
 ER_WAL_IO
     Failed to write to disk. May mean: failed to record a change in the

doc/sphinx/book/app_d_plugins.rst

@@ -46,7 +46,7 @@ This example assumes that MySQL 5.5 or MySQL 5.6 has been installed (recent
 MariaDB versions should also work).
 
 The example was run on a Linux machine where the base directory had a copy of
-he Tarantool source on ~/tarantool, and a copy of MySQL on ~/mysql-5.5. The
+the Tarantool source on ~/tarantool, and a copy of MySQL on ~/mysql-5.5. The
 mysqld server is already running on the local host 127.0.0.1.
 
 ::
@@ -71,14 +71,12 @@ mysqld server is already running on the local host 127.0.0.1.
     ...
     Type 'help;' or '\h' for help. Type '\c' to clear the current input statement.
 
-    mysql>
-
     # Insert a row in database test, and quit.
     mysql> CREATE TABLE IF NOT EXISTS test (s1 INT, s2 VARCHAR(50));
     Query OK, 0 rows affected (0.13 sec)
     mysql> INSERT INTO test.test VALUES (1,'MySQL row');
     Query OK, 1 row affected (0.02 sec)
-    mysql> QUIT
+    mysql> **QUIT**
     Bye
 
     # Build the Tarantool server. Make certain that "cmake" gets the right

doc/sphinx/book/box/box_space.rst

@@ -145,7 +145,7 @@ A list of all ``box.space`` functions follows, then comes a list of all
           - [2, 'D']
         ...
 
-    For examples of complex ``select``s, where one can specify which index to
+    For examples of complex ``select`` requests, where one can specify which index to
     search and what condition to use (for example "greater than" instead of
     "equal to") and how many tuples to return, see the later section
     ``box.space.space-name[.index.index-name]:select``.

doc/sphinx/book/box/triggers.rst

@@ -13,7 +13,7 @@ All triggers have the following characteristics.
 
 * They associate a function with an `event`. The request to "define a trigger"
   consists of passing the name of the trigger's function to one of the
-  "on_``event-name...``" functions: ``on_connect()``, ``on_disconnect()``,
+  "on_event-name..." functions: ``on_connect()``, ``on_disconnect()``,
   or ``on_replace()``.
 * They are `defined by any user`. There are no privilege requirements for defining
   triggers.
@@ -35,7 +35,7 @@ All triggers have the following characteristics.
   outside the event context.
 * They are `replaceable`. The request to "redefine a trigger" consists of passing
   the names of a new trigger function and an old trigger function to one of the
-  "on_``event-name...``" functions.
+  "on_event-name..." functions.
 
 ===========================================================
                     Connection triggers

doc/sphinx/faq.rst

@@ -16,15 +16,15 @@
 
 
     :Q: Why Lua?
-    :A: Lua is a ligthweight, fast, extensible multi-paradigm language. Lua also happens
+    :A: Lua is a lightweight, fast, extensible multi-paradigm language. Lua also happens
         to be very easy to embed. Lua coroutines relate very closely to Tarantool fibers,
-        and Lua architecture works well with Tarantool internals. Lua is the first, but,
-        hopefully, not the last stored program language for Tarantool.
+        and Lua architecture works well with Tarantool internals. Lua is the first, but
+        hopefully not the last, stored program language for Tarantool.
 
 
     :Q: What's the key advantage of Tarantool?
     :A: Tarantool provides a rich database feature set (HASH, TREE, RTREE, BITSET indexes,
-        secondary indexes, composite indexes, transactions, triggres, asynchronous replication)
+        secondary indexes, composite indexes, transactions, triggers, asynchronous replication)
         in a flexible environment of a Lua interpreter.
         
         These two properties make it possible to code fast, atomic and reliable in-memory
@@ -41,17 +41,17 @@
 
 
     :Q: Who is developing Tarantool?
-    :A: There is a small engineering team employed by Mail.ru -- check out our commit
+    :A: There is a small engineering team employed by Mail.Ru -- check out our commit
         logs on github. The development is fully open, and most of the connectors
-        authors and maintainers in different distributions are from the community.
+        authors and maintainers for different distributions are from the community.
 
 
     :Q: How serious is Mail.Ru about Tarantool?
     :A: Tarantool is an open source project, distributed under a BSD license, and as
-        such does not depend on any one sponsor. However, it is currently and integral
-        part of Mail.Ru backbone, so it gets a lot of support from Mail.ru.
+        such does not depend on any one sponsor. However, it is currently an integral
+        part of Mail.Ru backbone, so it gets a lot of support from Mail.Ru.
 
 
     :Q: What happens when Tarantool runs out of memory?
     :A: The server stops accepting updates until more memory is available. Read and
-        delete requests are served just fine.
+        delete requests continue to be served without difficulty.