Merge remote-tracking branch 'origin/latest' into gh-1025-releases-lifetime-table

art-dr · art-dr · commit 9854abe41999 · 2022-02-18T14:59:41.000+03:00
# Conflicts:
#	doc/dev_guide/release_management.rst
diff --git a/conf.py b/conf.py
@@ -42,6 +42,8 @@
     'doc-issue': ('https://github.com/tarantool/doc/issues/%s', 'doc-'),
 }
 
+default_role = 'code'
+
 plantuml_output_format = 'svg_img'
 imgmath_image_format = 'svg'
 
diff --git a/doc/book/connectors/__go.rst b/doc/book/connectors/__go.rst
@@ -10,6 +10,8 @@ The following connectors are available:
 
 *   Community-supported `FZambia/tarantool <https://github.com/FZambia/tarantool>`_.
 
+..  _go-feature-comparison:
+
 Feature comparison
 ------------------
 
diff --git a/doc/book/connectors/__python.rst b/doc/book/connectors/__python.rst
@@ -49,6 +49,8 @@ The table below contains a feature comparison for asynctnt, gtarantool and
 tarantool-python. aiotarantool is absent there because it is quite outdated and
 unmaintained.
 
+..  _python-feature-comparison:
+
 Feature comparison
 ------------------
 
diff --git a/doc/contributing/index.rst b/doc/contributing/index.rst
@@ -6,10 +6,10 @@
 Contributing
 ************
 
-.. toctree::
+..  toctree::
     :maxdepth: 2
 
     contributing
     release_notes
-    ../dev_guide/build_contribute_index
+    ../dev_guide/building_from_source
     ../dev_guide/guidelines_index
diff --git a/doc/dev_guide/build_contribute_index.rst b/doc/dev_guide/build_contribute_index.rst
diff --git a/doc/dev_guide/building_from_source.rst b/doc/dev_guide/building_from_source.rst
@@ -1,7 +1,7 @@
 .. _building_from_source:
 
-Building from source
-====================
+Building to contribute
+======================
 
 To build Tarantool from source files, you will need the following tools:
 
@@ -183,7 +183,7 @@ if you use MacPorts.
 
     $ git submodule update --init --recursive
 
-    $ brew install -y git openssl readline curl icu4c libiconv zlib cmake
+    $ brew install git openssl readline curl icu4c libiconv zlib cmake
 
     $ pip install --user -r test-run/requirements.txt
 
diff --git a/doc/dev_guide/index.rst b/doc/dev_guide/index.rst
@@ -12,5 +12,5 @@ Contributor's Guide
 
     reference_capi/index
     internals/index
-    build_contribute_index
+    building_from_source
     guidelines_index
diff --git a/doc/dev_guide/release_management.rst b/doc/dev_guide/release_management.rst
diff --git a/doc/reference/reference_lua/box_session/on_auth.rst b/doc/reference/reference_lua/box_session/on_auth.rst
@@ -10,7 +10,7 @@ box.session.on_auth()
 .. function:: box.session.on_auth([trigger-function [, old-trigger-function]])
 
     Define a trigger for execution during
-    ref:`authentication <authentication-users>`.
+    :ref:`authentication <authentication-users>`.
 
     The ``on_auth`` trigger function is invoked in these circumstances:
 
diff --git a/locale/ru/LC_MESSAGES/reference/reference_lua/box_session/on_auth.po b/locale/ru/LC_MESSAGES/reference/reference_lua/box_session/on_auth.po
@@ -3,7 +3,7 @@ msgid "box.session.on_auth()"
 msgstr ""
 
 msgid ""
-"Define a trigger for execution during ref:`authentication <authentication-"
+"Define a trigger for execution during :ref:`authentication <authentication-"
 "users>`."
 msgstr ""
 "Определение триггера, используемого во время :ref:`аутентификации "

Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,8 @@`
`42`	`42`	`'doc-issue': ('https://github.com/tarantool/doc/issues/%s', 'doc-'),`
`43`	`43`	`}`
`44`	`44`
	`45`	`+default_role = 'code'`
	`46`	`+`
`45`	`47`	`plantuml_output_format = 'svg_img'`
`46`	`48`	`imgmath_image_format = 'svg'`
`47`	`49`