Skip to content

Commit 794f3bf

Browse files
authored
Feedback fixes (#4534)
Fixes #4516 #4500 #4458 #4431
1 parent 50f0333 commit 794f3bf

File tree

4 files changed

+22
-5
lines changed

4 files changed

+22
-5
lines changed

doc/platform/app/c_tutorial.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ easy.c
9999
Start another shell. Change directory (``cd``) so that it is
100100
the same as the directory that the client is running on.
101101

102-
Create a file. Name it ``easy.c``. Put these six lines in it.
102+
Create a file. Name it ``easy.c``. Put the following code in it:
103103

104104
.. code-block:: c
105105

doc/platform/configuration.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ Most of the configuration options can be applied to a specific instance, replica
9797

9898
- *Instance*
9999

100-
To apply specific configuration options to a concrete instance,
100+
To apply certain configuration options to a specific instance,
101101
specify such options for this instance only.
102102
In the example below, ``iproto.listen`` is applied to *instance001* only.
103103

doc/reference/configuration/configuration_reference.rst

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -408,15 +408,15 @@ The ``compat`` section defines values of the :ref:`compat <compat-module>` modul
408408
* :ref:`compat.box_cfg_replication_sync_timeout <configuration_reference_compat_replication_timeout>`
409409
* :ref:`compat.box_error_serialize_verbose <configuration_reference_compat_error_serialize>`
410410
* :ref:`compat.box_error_unpack_type_and_code <configuration_reference_compat_error_unpack>`
411-
* :ref:`compat.box_info_cluster_meaning <configuration_reference_compat_yaml_pretty>`
411+
* :ref:`compat.box_info_cluster_meaning <configuration_reference_compat_cluster_meaning>`
412412
* :ref:`compat.box_session_push_deprecation <configuration_reference_compat_session_push>`
413413
* :ref:`compat.box_space_execute_priv <configuration_reference_compat_space_execute>`
414414
* :ref:`compat.box_space_max <configuration_reference_compat_space_max>`
415415
* :ref:`compat.box_tuple_extension <configuration_reference_compat_tuple_extension>`
416416
* :ref:`compat.box_tuple_new_vararg <configuration_reference_compat_tuple_new>`
417417
* :ref:`compat.c_func_iproto_multireturn <configuration_reference_compat_iproto_multireturn>`
418418
* :ref:`compat.fiber_channel_close_mode <configuration_reference_compat_fiber_channel>`
419-
* :ref:`compat.fiber_slice_default <configuration_reference_compat_cluster_meaning>`
419+
* :ref:`compat.fiber_slice_default <configuration_reference_compat_fiber_slice>`
420420
* :ref:`compat.json_escape_forward_slash <configuration_reference_compat_json_escape>`
421421
* :ref:`compat.sql_priv <configuration_reference_compat_sql_priv>`
422422
* :ref:`compat.sql_seq_scan_default <configuration_reference_compat_sql_scan>`
@@ -625,6 +625,23 @@ The ``compat`` section defines values of the :ref:`compat <compat-module>` modul
625625
| Default: 'new'
626626
| Environment variable: TT_COMPAT_FIBER_CHANNEL_CLOSE_MODE
627627
628+
.. _configuration_reference_compat_fiber_slice:
629+
630+
.. confval:: compat.fiber_slice_default
631+
632+
Define the maximum fiber execution time without a yield:
633+
634+
- ``new``: ``{warn = 0.5, err = 1.0}``
635+
- ``old``: infinity (no warnings or errors raised).
636+
637+
See also: :ref:`compat-option-fiber-slice`
638+
639+
|
640+
| Type: string
641+
| Possible values: 'new', 'old'
642+
| Default: 'new'
643+
| Environment variable: TT_COMPAT_FIBER_SLICE_DEFAULT
644+
628645
.. _configuration_reference_compat_json_escape:
629646

630647
.. confval:: compat.json_escape_forward_slash

doc/reference/reference_lua/net_box.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -952,7 +952,7 @@ Below is a list of all ``net.box`` functions.
952952

953953
.. _conn-new_stream:
954954

955-
.. method:: new_stream([options])
955+
.. method:: new_stream()
956956

957957
Create a stream.
958958

0 commit comments

Comments
 (0)