diff --git a/doc/platform/app/c_tutorial.rst b/doc/platform/app/c_tutorial.rst index af34f58bd..68172c032 100644 --- a/doc/platform/app/c_tutorial.rst +++ b/doc/platform/app/c_tutorial.rst @@ -99,7 +99,7 @@ easy.c Start another shell. Change directory (``cd``) so that it is the same as the directory that the client is running on. -Create a file. Name it ``easy.c``. Put these six lines in it. +Create a file. Name it ``easy.c``. Put the following code in it: .. code-block:: c diff --git a/doc/platform/configuration.rst b/doc/platform/configuration.rst index f65e93914..f19763bba 100644 --- a/doc/platform/configuration.rst +++ b/doc/platform/configuration.rst @@ -97,7 +97,7 @@ Most of the configuration options can be applied to a specific instance, replica - *Instance* - To apply specific configuration options to a concrete instance, + To apply certain configuration options to a specific instance, specify such options for this instance only. In the example below, ``iproto.listen`` is applied to *instance001* only. diff --git a/doc/reference/configuration/configuration_reference.rst b/doc/reference/configuration/configuration_reference.rst index b172ad39b..7f7963a28 100644 --- a/doc/reference/configuration/configuration_reference.rst +++ b/doc/reference/configuration/configuration_reference.rst @@ -408,7 +408,7 @@ The ``compat`` section defines values of the :ref:`compat ` modul * :ref:`compat.box_cfg_replication_sync_timeout ` * :ref:`compat.box_error_serialize_verbose ` * :ref:`compat.box_error_unpack_type_and_code ` -* :ref:`compat.box_info_cluster_meaning ` +* :ref:`compat.box_info_cluster_meaning ` * :ref:`compat.box_session_push_deprecation ` * :ref:`compat.box_space_execute_priv ` * :ref:`compat.box_space_max ` @@ -416,7 +416,7 @@ The ``compat`` section defines values of the :ref:`compat ` modul * :ref:`compat.box_tuple_new_vararg ` * :ref:`compat.c_func_iproto_multireturn ` * :ref:`compat.fiber_channel_close_mode ` -* :ref:`compat.fiber_slice_default ` +* :ref:`compat.fiber_slice_default ` * :ref:`compat.json_escape_forward_slash ` * :ref:`compat.sql_priv ` * :ref:`compat.sql_seq_scan_default ` @@ -625,6 +625,23 @@ The ``compat`` section defines values of the :ref:`compat ` modul | Default: 'new' | Environment variable: TT_COMPAT_FIBER_CHANNEL_CLOSE_MODE +.. _configuration_reference_compat_fiber_slice: + +.. confval:: compat.fiber_slice_default + + Define the maximum fiber execution time without a yield: + + - ``new``: ``{warn = 0.5, err = 1.0}`` + - ``old``: infinity (no warnings or errors raised). + + See also: :ref:`compat-option-fiber-slice` + + | + | Type: string + | Possible values: 'new', 'old' + | Default: 'new' + | Environment variable: TT_COMPAT_FIBER_SLICE_DEFAULT + .. _configuration_reference_compat_json_escape: .. confval:: compat.json_escape_forward_slash diff --git a/doc/reference/reference_lua/net_box.rst b/doc/reference/reference_lua/net_box.rst index c9f48f2ab..b38cf57ee 100644 --- a/doc/reference/reference_lua/net_box.rst +++ b/doc/reference/reference_lua/net_box.rst @@ -952,7 +952,7 @@ Below is a list of all ``net.box`` functions. .. _conn-new_stream: - .. method:: new_stream([options]) + .. method:: new_stream() Create a stream.