diff --git a/doc/sphinx/book/box/authentication.rst b/doc/sphinx/book/box/authentication.rst index bb6e347a5ae12a8d9431ec3e328fb0ef11d2bc55..a6c5d48a3bdda273f1078ec1c6485115d0ac96d1 100644 --- a/doc/sphinx/book/box/authentication.rst +++ b/doc/sphinx/book/box/authentication.rst @@ -2,7 +2,7 @@ .. highlight:: lua ------------------------------------------------------------------------------- - Authentication and authorization + Authentication and authorization ------------------------------------------------------------------------------- Understanding the details of security is primarily an issue for administrators, @@ -127,7 +127,7 @@ selects a tuple in the ``_user`` space, and then drops the user. The maximum number of users is 32. -.. _URI: http://tarantool.org/doc/user_guide.html#URI +.. _URI: :ref:`URI` =========================================================== Priveleges and _priv space @@ -236,8 +236,8 @@ users. Typically a guest user will use ``box.session.su()`` to change into a non user to whom admin has granted more than the default privileges. For example, admin might say: -.. _admin: http://tarantool.org/doc/user_guide.html#admin_port -.. _connectors: http://tarantool.org/doc/user_guide.html#connectors +.. _admin: :ref:`admin_port +.. _connectors: :doc:`../connectors/index` .. code-block:: lua diff --git a/doc/sphinx/book/box/box_introspection.rst b/doc/sphinx/book/box/box_introspection.rst index b2aa690fa14c4f0991d743b724b31e6019367dfc..f5e248b39b35e1aabfba4bf20c919e594a8134fb 100644 --- a/doc/sphinx/book/box/box_introspection.rst +++ b/doc/sphinx/book/box/box_introspection.rst @@ -31,7 +31,7 @@ access to those parameters. ... ... -.. _Configuration: http://tarantool.org/doc/user_guide.html#configuration-file +.. _Configuration: :doc:`../configuration` ===================================================================== Package `box.info` diff --git a/doc/sphinx/book/box/box_session.rst b/doc/sphinx/book/box/box_session.rst index 49cd6c2d1649b27203d733891997da9ddc425ab9..b896e38e31be549848c23a49582c9527a4feea1e 100644 --- a/doc/sphinx/book/box/box_session.rst +++ b/doc/sphinx/book/box/box_session.rst @@ -71,5 +71,6 @@ about defining triggers for connect and disconnect events with the section `Authentication and access control`_ for instructions about ``box.session`` functions that affect user identification and security. -.. _Triggers on connect and disconnect: http://tarantool.org/doc/user_guide.html#sp-box-session-triggers -.. _Authentication and access control: http://tarantool.org/doc/user_guide.html#authentication +.. _Triggers on connect and disconnect: :doc:`triggers` +.. _Authentication and access control: :doc:`authentication` + diff --git a/doc/sphinx/book/box/box_space.rst b/doc/sphinx/book/box/box_space.rst index d32c28da35fbc6db76857877de7c2ebfc4144f97..cb319294caddbaaffe538b74fcd8ecd17df73d55 100644 --- a/doc/sphinx/book/box/box_space.rst +++ b/doc/sphinx/book/box/box_space.rst @@ -723,8 +723,8 @@ A list of all ``box.space`` functions follows, then comes a list of all ``_cluster`` is a new system tuple set for support of the `replication feature`_. -.. _authorization feature: http://tarantool.org/doc/user_guide.html#authentication -.. _replication feature: http://tarantool.org/doc/user_guide.html#replication +.. _authorization feature: :doc:`authentication` +.. _replication feature: :doc:`replication` ================================================= Example diff --git a/doc/sphinx/book/box/index.rst b/doc/sphinx/book/box/index.rst index 86053e213e9d9963fb4e776d51b447e7a212da3c..79b5d7949152a73cda60f3a5b259f0c3ff54140d 100644 --- a/doc/sphinx/book/box/index.rst +++ b/doc/sphinx/book/box/index.rst @@ -69,7 +69,7 @@ introspection (inspecting contents of spaces, accessing server configuration). | | is more important than all the others. | +-------------------+-----------------------------------------------------+ -.. _wal_mode: http://tarantool.org/doc/user_guide.html#wal_mode +.. _wal_mode: :ref:`wal_mode` In the discussion of each data-manipulation function there will be a note about which Complexity Factors might affect the function's resource usage. diff --git a/doc/sphinx/book/box/limitations.rst b/doc/sphinx/book/box/limitations.rst index 81626a922ddb70cb9c9637a94ad4e37de0ebf374..f4b657357146d2832d25808ee75ca58fd04a1ca7 100644 --- a/doc/sphinx/book/box/limitations.rst +++ b/doc/sphinx/book/box/limitations.rst @@ -48,4 +48,4 @@ Limitations which are only applicable for the sophia storage engine is not supported. The ``alter()``, ``len()``, and ``count()`` functions are not supported. -.. _slab_alloc_arena: http://tarantool.org/doc/user_guide.html#slab_alloc_arena +.. _slab_alloc_arena: :ref:`slab_alloc_arena` diff --git a/doc/sphinx/book/box/net_box.rst b/doc/sphinx/book/box/net_box.rst index 98ef99f5ce4a5c6c8eca6b1188aa18b025a7ed2d..469674fef4686de1724774d9e71897fb6b2e3717 100644 --- a/doc/sphinx/book/box/net_box.rst +++ b/doc/sphinx/book/box/net_box.rst @@ -156,7 +156,7 @@ necessary to prioritize requests or to use different authentication ids. timeout expires: the timeout expiration only aborts the wait for the remote server response, not the request itself. -.. _SQL DBMS plugins: http://tarantool.org/doc/user_guide.html#plugins +.. _SQL DBMS plugins: :doc:`../app_d_plugins` =========================================================== Example diff --git a/doc/sphinx/book/configuration.rst b/doc/sphinx/book/configuration.rst index 0d301f43396729a00783b21c060672b537978800..083d6e393ebac3b8a623fb35e1132da1f1b744a1 100644 --- a/doc/sphinx/book/configuration.rst +++ b/doc/sphinx/book/configuration.rst @@ -143,9 +143,12 @@ Then the screen might look like this: .. _replication_port: .. _slab_alloc_arena: .. _replication_source: +.. _admin_port: .. _snap_dir: .. _wal_dir: +.. _wal_mode: .. _snapshot daemon: +.. _logger: ===================================================================== Configuration parameters diff --git a/doc/sphinx/book/connectors/index.rst b/doc/sphinx/book/connectors/index.rst index 8cc51a9fa3db78a93e788536a7202b2da17edc62..d050e14360d2ce448b902fdc274f6b57e3941466 100644 --- a/doc/sphinx/book/connectors/index.rst +++ b/doc/sphinx/book/connectors/index.rst @@ -38,7 +38,7 @@ written in Lua for unpacking Tarantool messages is in file `Tnt-dissector`_. .. _Tnt-dissector: https://github.com/negram/Tnt-dissector/blob/master/tarantool.dis.lua .. _Language-specific drivers: `Connectors`_ -.. _doc/box-protocol.html: http://tarantool.org/doc/dev_guide/box-protocol.html +.. _doc/box-protocol.html: :doc:`../../dev_guide/box-protocol.rst` .. container:: table diff --git a/doc/sphinx/dev_guide/building_from_source.rst b/doc/sphinx/dev_guide/building_from_source.rst index eeecc98ec8ae91f5313d9792c152e3c463399440..588f5409114e6961a5f909ae8d23f71a4ff0d157 100644 --- a/doc/sphinx/dev_guide/building_from_source.rst +++ b/doc/sphinx/dev_guide/building_from_source.rst @@ -211,7 +211,7 @@ explain what the steps are, then on the Internet you can look at some example sc 9. Make an rpm. |br| This step is optional. It's only for people who want to redistribute Tarantool. Package maintainers who want to build with rpmbuild should consult the - `Tarantool Developer Guide <http://tarantool.org/doc/dev_guide/index.html>`_ + :doc:`Tarantool Developer Guide <index>` This is the end of the list of steps to take for source downloads. diff --git a/doc/sphinx/reference/console.rst b/doc/sphinx/reference/console.rst index 77b30efd4478df87b8cd9567008bafdb89b7b845..111eb710f9a9e07557f3218314a5b7efc15dc016 100644 --- a/doc/sphinx/reference/console.rst +++ b/doc/sphinx/reference/console.rst @@ -74,4 +74,4 @@ host/port. numeric TCP port. Connections are often made with telnet. A typical port value is 3313. -.. _URI: http://tarantool.org/doc/user_guide.html#URI +.. _URI: :ref:`URI` diff --git a/doc/sphinx/reference/expirationd.rst b/doc/sphinx/reference/expirationd.rst index 141a55f08b963656d150bcd715bac363fcec6147..7f8975aac06d8ba3a867a42414dc8e371f1925f7 100644 --- a/doc/sphinx/reference/expirationd.rst +++ b/doc/sphinx/reference/expirationd.rst @@ -104,5 +104,4 @@ by passing different parameters, which will be evident after looking in more det at the source code. .. _expirationd.lua: https://github.com/tarantool/expirationd/blob/master/expirationd.lua -.. _rock: http://tarantool.org/doc/user_guide.html#rocks .. _GitHub: https://github.com/tarantool/expirationd/blob/master/expirationd.lua diff --git a/doc/sphinx/reference/log.rst b/doc/sphinx/reference/log.rst index e8a10e3339f3d12f1f9925f053e94b3a04ff177e..cc86058d7f136601aa85a27bd3c1db5489e16a84 100644 --- a/doc/sphinx/reference/log.rst +++ b/doc/sphinx/reference/log.rst @@ -60,6 +60,6 @@ The output from the less command will look approximately like this: The 'Error' line is visible in tarantool.txt preceded by the letter E. The 'Info' line is not present because the log_level is 3. -.. _logger: http://tarantool.org/doc/user_guide.html#logger -.. _log file: http://tarantool.org/doc/user_guide.html#logger -.. _log_level: http://tarantool.org/doc/user_guide.html#logger +.. _logger: :ref:`logger` +.. _log file: :ref:`logger` +.. _log_level: :ref:`logger`