Merge branch 'ocelot-master'

doc/sphinx/book/box/box_index.rst

@@ -455,7 +455,7 @@ API is a direct binding to corresponding methods of index objects of type
                                     field-values, or a tuple containing only
                                     the field-values.
 
-        :return: the number of matching index keys. The ``index`` function
+        :return: the number of matching index keys. The ``count`` function
                 is only applicable for the memtx storage engine.
         :rtype:  number
 

doc/sphinx/book/box/box_space.rst

@@ -447,10 +447,6 @@ A list of all ``box.space`` functions follows, then comes a list of all
 
     space-object:len()
 
-        .. NOTE::
-
-            The ``len()`` function is only applicable for the memtx storage engine.
-
         :return: Number of tuples in the space.
 
         | :codebold:`Example`

doc/sphinx/book/box/index.rst

@@ -434,16 +434,12 @@ Every one of the examples does the same thing:
 select a tuple set from a space named tester where
 the primary-key field value equals 1.
 
-First there are "naming variations":
-
-    1. :codenormal:`box.space.tester:select{1}`
-
-    2. :codenormal:`box.space['tester']:select{1}`
-
-    3. :codenormal:`box.space[512]:select{1}`
-
-    4. :codenormal:`variable = 'tester'; box.space[variable]:select{1}`
-
+First there are "naming variations": |br|
+|nbsp| 1. :codenormal:`box.space.tester:select{1}` |br|
+|nbsp| 2. :codenormal:`box.space['tester']:select{1}` |br|
+|nbsp| 3. :codenormal:`box.space[512]:select{1}` |br|
+|nbsp| 4. :codenormal:`variable = 'tester'` |br|
+|nbsp| |nbsp| |nbsp| :codenormal:`box.space[variable]:select{1}` |br|
 ... There is an assumption that the numeric id of
 'tester' is 512, which happens to be the case in our
 sandbox example only. Literal values such as 'tester'
@@ -452,20 +448,15 @@ in this manual have the "box.space.space.tester:" form;
 however, this is a matter of user preference and all
 the variants exist in the wild.
 
-Then there are "parameter variations":
-
-    1. :codenormal:`box.space.tester:select{1}`
-
-    2. :codenormal:`box.space.tester:select({1})`
-
-    3. :codenormal:`box.space.tester:select(1)`
-
-    4. :codenormal:`box.space.tester:select({1},{iterator='EQ'})`
-
-    5. :codenormal:`variable = 1; box.space.tester:select{variable}`
-
-    6. :codenormal:`variable = {1}; box.space.tester:select(variable)`
-
+Then there are "parameter variations": |br|
+|nbsp| 1. :codenormal:`box.space.tester:select{1}` |br|
+|nbsp| 2. :codenormal:`box.space.tester:select({1})` |br|
+|nbsp| 3. :codenormal:`box.space.tester:select(1)` |br|
+|nbsp| 4. :codenormal:`box.space.tester:select({1},{iterator='EQ'})` |br|
+|nbsp| 5. :codenormal:`variable = 1` |br|
+|nbsp| |nbsp| |nbsp| :codenormal:`box.space.tester:select{variable}` |br|
+|nbsp| 6. :codenormal:`variable = {1}` |br|
+|nbsp| |nbsp| |nbsp| :codenormal:`box.space.tester:select(variable)` |br|
 ... The primary-key value is enclosed in braces, and if
 it was a multi-part primary key then the value would be
 multi-part, for example "...select{1,2,3}". The braces

doc/sphinx/book/box/limitations.rst

@@ -42,7 +42,7 @@ Limitations which are only applicable for the sophia storage engine
     The maximum number of fields in an index is always 1, that is, multi-part
     indexes are not supported. The maximum number of indexes in a space is
     always 1, that is, secondary indexes are not supported. Indexes must be
-    unique, that is, the options type=HASH or type=RTREE or type=BITSET are
+    type=TREE, that is, the options type=HASH or type=RTREE or type=BITSET are
     not supported. Indexes must be unique, that is, the option unique=false
-    is not supported. The ``alter()``, ``len()``, and ``count()`` functions
+    is not supported. The ``alter()`` and ``count()`` functions
     are not supported.

doc/sphinx/book/configuration/cfg-basic.rst

@@ -40,7 +40,7 @@
 .. confval:: sophia_dir
 
     A directory where sophia files will be stored. Can be relative to
-    :confval:`work_dir`. If not specified, defaults to :file:`work_dir/sophia`.
+    :confval:`work_dir`. If not specified, defaults to :file:`work_dir`.
 
     Type: string |br|
     Default: "sophia" |br|