Skip to content

Commit e710adb

Browse files
xuniqxuniq
committed
Minor fixes
1 parent 7fe13e4 commit e710adb

File tree

13 files changed

+36
-44
lines changed

13 files changed

+36
-44
lines changed

‎doc/dev_guide/internals/iproto/keys.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -605,6 +605,8 @@ IPROTO_UNKNOWN
605605

606606
Code: -1.
607607

608+
Unknown request or response type.
609+
608610
.. _internals-iproto-keys-error:
609611

610612
IPROTO_ERROR

‎doc/reference/reference_lua/box_iproto.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ The constants are divided into several types:
2727
* :ref:`request type <reference_lua-box_iproto_type>` (:ref:`IPROTO_OK <internals-iproto-ok>`)
2828
* :ref:`flag <reference_lua-box_iproto_flag>` (:ref:`IPROTO_COMMIT <box_protocol-commit>`)
2929
* :ref:`ballot key <reference_lua-box_iproto_ballot>` (:ref:`IPROTO_FLAG_COMMIT <box_protocol-flags>`)
30-
* :ref:`metadata key <reference_lua-box_iproto_metadata>` (``IPROTO_FIELD_IS_NULLABLE``)
30+
* :ref:`metadata key <reference_lua-box_iproto_metadata>` (:ref:`IPROTO_FIELD_IS_NULLABLE <internals-iproto-keys-sql-specific>`)
3131
* :ref:`RAFT key <reference_lua-box_iproto_raft>` (:ref:`IPROTO_TERM <internals-iproto-keys-term>`)
3232

3333
Each type is located in the corresponding subnamespace without prefix.
@@ -64,7 +64,7 @@ The submodule exports:
6464
API reference
6565
-------------
6666

67-
The table lists all available members and functions of the submodule:
67+
The table lists all available functions and data of the submodule:
6868

6969
.. container:: table
7070

‎doc/reference/reference_lua/box_iproto/ballot.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ box.iproto.ballot_key
55

66
.. module:: box.iproto
77

8-
.. data:: ballot_key
8+
.. data:: ballot_key
99

10-
The ``box.iproto.ballot_key`` namespace contains the keys from the :ref:`IPROTO_BALLOT <box_protocol-ballots>` requests.
11-
Learn more: :ref:`IPROTO_BALLOT keys <internals-iproto-keys-ballot>`.
10+
The ``box.iproto.ballot_key`` namespace contains the keys from the :ref:`IPROTO_BALLOT <box_protocol-ballots>` requests.
11+
Learn more: :ref:`IPROTO_BALLOT keys <internals-iproto-keys-ballot>`.
1212

1313
Available keys:
1414

‎doc/reference/reference_lua/box_iproto/feature.rst

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,16 @@ box.iproto.feature
55

66
.. module:: box.iproto
77

8-
.. data:: feature
8+
.. data:: feature
99

10-
The ``box.iproto.feature`` namespace contains the IPROTO protocol features supported by the server.
11-
Each feature is mapped to its corresponding code.
12-
Learn more: :ref:`IPROTO_FEATURES <internals-iproto-keys-features>`.
10+
The ``box.iproto.feature`` namespace contains the IPROTO protocol features supported by the server.
11+
Each feature is mapped to its corresponding code.
12+
Learn more: :ref:`IPROTO_FEATURES <internals-iproto-keys-features>`.
1313

14-
The features in the namespace are written
14+
The features in the namespace are written
1515

16-
* in the lower case
17-
* without the ``IPROTO_FEATURE_`` prefix
16+
* in the lower case
17+
* without the ``IPROTO_FEATURE_`` prefix
1818

1919
Available features:
2020

‎doc/reference/reference_lua/box_iproto/flag.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ box.iproto.flag
55

66
.. module:: box.iproto
77

8-
.. data:: flag
8+
.. data:: flag
99

10-
The ``box.iproto.flag`` namespace contains the flags from the ``IPROTO_FLAGS`` key.
11-
Learn more: :ref:`IPROTO_FLAGS key <box_protocol-flags>`.
10+
The ``box.iproto.flag`` namespace contains the flags from the ``IPROTO_FLAGS`` key.
11+
Learn more: :ref:`IPROTO_FLAGS key <box_protocol-flags>`.
1212

1313
Available flags:
1414

‎doc/reference/reference_lua/box_iproto/key.rst

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,9 @@ box.iproto.key
55

66
.. module:: box.iproto
77

8-
.. data:: key
8+
.. data:: key
99

10-
The ``box.iproto.key`` namespace contains the request keys.
11-
To
10+
The ``box.iproto.key`` namespace contains the request keys.
1211

1312
Available keys:
1413

‎doc/reference/reference_lua/box_iproto/metadata.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ box.iproto.metadata_key
55

66
.. module:: box.iproto
77

8-
.. data:: metadata_key
8+
.. data:: metadata_key
99

10-
The ``box.iproto.metadata_key`` namespace contains the ``IPROTO_FILED_*`` keys, which are nested in the
11-
:ref:`IPROTO_METADATA <internals-iproto-keys-metadata>` key.
10+
The ``box.iproto.metadata_key`` namespace contains the ``IPROTO_FILED_*`` keys, which are nested in the
11+
:ref:`IPROTO_METADATA <internals-iproto-keys-metadata>` key.
1212

1313
Available keys:
1414

‎doc/reference/reference_lua/box_iproto/override.rst

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,3 @@ box.iproto.override()
1818

1919
**Example:**
2020

21-
.. code-block:: tarantoolsession
22-
23-
tarantool>
24-

‎doc/reference/reference_lua/box_iproto/protocol_features.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ box.iproto.protocol_version
55

66
.. module:: box.iproto
77

8-
.. data:: protocol_version
8+
.. data:: protocol_version
99

10-
The set of IPROTO protocol features supported by the server.
11-
Learn more: `src/box/iproto_features.h <https://github.com/tarantool/tarantool/blob/master/src/box/iproto_features.h>`__
12-
and `iproto_features_resolve() <https://github.com/tarantool/tarantool/blob/dec0e0221e183fa972efa65bb0fb658112f2196f/src/box/lua/net_box.lua#L93-L105>`__).
10+
The set of IPROTO protocol features supported by the server.
11+
Learn more: `src/box/iproto_features.h <https://github.com/tarantool/tarantool/blob/master/src/box/iproto_features.h>`__
12+
and `iproto_features_resolve() <https://github.com/tarantool/tarantool/blob/dec0e0221e183fa972efa65bb0fb658112f2196f/src/box/lua/net_box.lua#L93-L105>`__).
1313

1414
**Example**
1515

‎doc/reference/reference_lua/box_iproto/protocol_version.rst

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,11 @@ box.iproto.protocol_version
55

66
.. module:: box.iproto
77

8-
.. data:: protocol_version
8+
.. data:: protocol_version
9+
10+
Current IPROTO protocol version of the server.
11+
Learn more: :ref:`IPROTO_ID <box_protocol-id>`.
912

10-
Current IPROTO protocol version of the server.
11-
Learn more: :ref:`IPROTO_ID <box_protocol-id>`.
1213

1314
**Example**
1415

‎doc/reference/reference_lua/box_iproto/raft.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ box.iproto.raft
55

66
.. module:: box.iproto
77

8-
.. data:: raft_key
8+
.. data:: raft_key
99

10-
The ``box.iproto.raft_key`` namespace contains the keys from the ``IPROTO_RAFT_*`` requests.
11-
Learn more: :ref:`Synchronous replication keys <internals-iproto-keys-syncro-replication>`.
10+
The ``box.iproto.raft_key`` namespace contains the keys from the ``IPROTO_RAFT_*`` requests.
11+
Learn more: :ref:`Synchronous replication keys <internals-iproto-keys-syncro-replication>`.
1212

1313
Available keys:
1414

‎doc/reference/reference_lua/box_iproto/request_type.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ box.iproto.type
55

66
.. module:: box.iproto
77

8-
.. data:: type
8+
.. data:: type
99

10-
The ``box.iproto.type`` namespace contains all available request types.
11-
Learn more about the requests: :ref:`Client-server requests and responses <internals-requests_responses>`.
10+
The ``box.iproto.type`` namespace contains all available request types.
11+
Learn more about the requests: :ref:`Client-server requests and responses <internals-requests_responses>`.
1212

1313
Available types:
1414

‎doc/reference/reference_lua/box_iproto/send.rst

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,6 @@ box.iproto.send()
2121

2222
**Possible errors:**
2323

24-
* Index is not of type 'TREE'.
25-
* :errcode:`ER_TRANSACTION_CONFLICT` if a transaction conflict is detected in the
26-
:ref:`MVCC transaction mode <txn_mode_transaction-manager>`.
27-
28-
**Complexity factors:** Index size, Index type.
29-
3024
**Example:**
3125

3226

0 commit comments

Comments
 (0)