Revert "restoring after an undesirable edit"

This reverts commit 95b344e.

Author: bigbes

sphinx/book/box/authentication.rst

@@ -38,9 +38,12 @@ several years ago`_ which has proved adequate for medium-security installations.
 Nevertheless administrators should warn users that no system is foolproof against
 determined long-term attacks, so passwords should be guarded and changed occasionally.
 
-Notes: To get the hash-password of a string 'X', say ``box.schema.user.password('X')``.
-To see more about the details of the algorithm for the purpose of writing a new
-client application, read the `scramble.h`_ header file.
+.. NOTE::
+
+    To get the hash-password of a string 'X', say
+    ``box.schema.user.password('X')``. To see more about the details of the
+    algorithm for the purpose of writing a new client application, read the
+    `scramble.h`_ header file.
 
 .. _Cryptographic hash function: https://en.wikipedia.org/wiki/Cryptographic_hash
 .. _Salt Value: https://en.wikipedia.org/wiki/Salt_%28cryptography%29

sphinx/book/box/box_space.rst

@@ -804,16 +804,20 @@ A list of all ``box.space`` functions follows, then comes a list of all
 
     .. method:: truncate()
 
-        Deletes all tuples. Note that ``truncate`` must be called only by the
-        user who created the space OR under a `setuid` function created by that
-        user. Read more about `setuid` functions :ref:`here <authentication-funcs>`.
+        Deletes all tuples. .
 
         Parameters: :samp:`{space_object}` = an :ref:`object reference <index-object_reference>`.
 
         **Complexity Factors:** Index size, Index type, Number of tuples accessed.
 
         :return: nil
 
+        .. NOTE::
+
+            Note that ``truncate`` must be called only by the user who created
+            the space OR under a `setuid` function created by that user. Read
+            more about `setuid` functions :ref:`here <authentication-funcs>`
+
         Note re storage engine: vinyl does not support ``truncate()``.
 
         **Example:**

sphinx/book/box/index.rst

@@ -319,8 +319,10 @@ the tuple that was just updated.
 Note re storage engine: vinyl handles yields differently, see
 :ref:`differences between memtx and vinyl <vinyl_diff>`.
 
-Note re multi-request transactions: there is a way to delay yields,
-see :ref:`Atomic execution <atomic-atomic_execution>`.
+.. NOTE:: Note re multi-request transactions
+
+    there is a way to delay yields, see
+    :ref:`Atomic execution <atomic-atomic_execution>`.
 
 Since locks don't exist, and disk writes only involve the write-ahead log,
 transactions are usually fast. Also the Tarantool server may not be using up all

sphinx/book/configuration/cfg_basic.rst

@@ -54,8 +54,10 @@
     A typical value is 3301. The listen parameter may also be set for
     :ref:`local hot standby <book_cfg_local_hot_standby>`.
 
-    NOTE: A replica also binds to this port, and accepts connections, but these
-    connections can only serve reads until the replica becomes a master.
+    .. NOTE::
+
+        A replica also binds to this port, and accepts connections, but these
+        connections can only serve reads until the replica becomes a master.
 
     Type: integer or string |br|
     Default: null |br|

sphinx/book/replication/index.rst

@@ -65,21 +65,27 @@ file and the WAL .xlog files), then starting replication again - the replica
 will then catch up with the master by retrieving all the master's tuples.
 Again, this procedure works only if the master's WAL files are present.
 
-NOTE:
-Replication parameters are "dynamic", which allows the replica to become
-a master and vice versa with the help of the :ref:`box.cfg <box_introspection-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.
-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.
-
-NOTE:
-Replication requires privileges. Privileges for accessing spaces could be granted directly
-to the user who will start the replica. However, it is more usual to
-grant privileges for accessing spaces to a :ref:`role <authentication-rep_role>`, and then grant the
-role to the user who will start the replica.
+.. NOTE::
+
+    Replication parameters are "dynamic", which allows the replica to become
+    a master and vice versa with the help of the
+    :ref:`box.cfg <box_introspection-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. 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.
+
+.. NOTE::
+
+    Replication requires privileges. Privileges for accessing spaces could be
+    granted directly to the user who will start the replica. However, it is more
+    usual to grant privileges for accessing spaces to a
+    :ref:`role <authentication-rep_role>`, and then grant the role to the user
+    who will start the replica.
 
 =====================================================================
                 Recovering from a degraded state

sphinx/reference_lua/json.rst

@@ -137,28 +137,41 @@ Serializing 'A' and 'B' with different ``__serialize`` values causes different r
 
 .. _json-module_cfg:
 
-A NOTE ABOUT CONFIGURATION SETTINGS:
-There are configuration settings which affect the way that Tarantool
-encodes invalid numbers or types. They are all boolean true/false values. |br|
-:code:`cfg.encode_invalid_numbers     default = true    /* allow nan and inf */` |br|
-:code:`cfg.encode_use_tostring        default = false   /* use tostring for unrecognizable types */` |br|
-:code:`cfg.encode_invalid_as_nil      default = false   /* use null for all unrecognizable types */` |br|
-:code:`cfg.encode_load_metatables     default = true    /* load metatables */` |br|
-For example, the following code will interpret 0/0
-(which is "not a number") and 1/0 (which is "infinity")
-as special values rather than nulls or errors: |br|
-:code:`json = require('json')` |br|
-:code:`json.cfg{encode_invalid_numbers = true}` |br|
-:code:`x = 0/0` |br|
-:code:`y = 1/0` |br|
-:code:`json.encode({1,x,y,2})` |br|
-The result of the json.encode request will look like this: |br|
-:code:`tarantool>` :extsamp:`{**{json.encode({1,x,y,2})}**}` |br|
-:code:`---` |br|
-:code:`- '[1,nan,inf,2]` |br|
-:code:`...` |br|
-The same configuration settings exist for json, for :ref:`MsgPack <msgpack-module>`, and
-for :ref:`yaml <yaml-module>`.
+================================================================
+                    Configuration settings
+================================================================
+
+There are configuration settings which affect the way that Tarantool encodes
+invalid numbers or types. They are all boolean ``true``/``false`` values
+
+* ``cfg.encode_invalid_numbers`` - allow nan and inf (default is true)
+* ``cfg.encode_use_tostring`` - use tostring for unrecognizable types (default is false)
+* ``cfg.encode_invalid_as_nil`` - use null for all unrecognizable types (default is false)
+* ``cfg.encode_load_metatables`` - load metatables (default is false)
+
+For example, the following code will interpret 0/0 (which is "not a number")
+and 1/0 (which is "infinity") as special values rather than nulls or errors:
+
+.. code-block:: lua
+
+    json = require('json')
+    json.cfg{encode_invalid_numbers = true}
+    x = 0/0
+    y = 1/0
+    json.encode({1, x, y, 2})
+
+The result of the json.encode request will look like this:
+
+.. code-block:: tarantoolsession
+
+    tarantool> json.encode({1, x, y, 2})
+    ---
+    - '[1,nan,inf,2]
+    ...
+
+The same configuration settings exist for json, for
+:ref:`MsgPack <msgpack-module>`, and for :ref:`YAML <yaml-module>`.
+>>>>>>> Fix every NOTE to be highlighted on site + JSON cfg rewritten
 
 .. _Lua-CJSON module by Mark Pulford: http://www.kyne.com.au/~mark/software/lua-cjson.php
 .. _the official documentation: http://www.kyne.com.au/~mark/software/lua-cjson-manual.html