diff --git a/build_submodules.sh b/build_submodules.sh index 668c532d94..bdb73eb010 100755 --- a/build_submodules.sh +++ b/build_submodules.sh @@ -13,7 +13,6 @@ po_src="${project_root}/modules/cartridge/build.luarocks/build.rst/locale/ru/LC_ po_dest="${project_root}/locale/ru/LC_MESSAGES/book/cartridge" cartridge_cli_root="${project_root}/modules/cartridge-cli/doc" cartridge_cli_dest="${rst_dest}/cartridge_cli" -cartridge_cli_index_dest="${cartridge_cli_dest}/index.rst" monitoring_root="${project_root}/modules/metrics/doc/monitoring" monitoring_dest="${project_root}/doc/book" monitoring_grafana_root="${project_root}/modules/grafana-dashboard/doc/monitoring" @@ -42,7 +41,8 @@ yes | cp -rf "${monitoring_root}" "${monitoring_dest}/" yes | cp -rf "${monitoring_grafana_root}" "${monitoring_dest}/" mkdir -p "${cartridge_cli_dest}" -yes | cp -rf "${cartridge_cli_root}/index.rst" "${cartridge_cli_index_dest}" +cd ${cartridge_cli_root} || exit +find . -iregex '.*\.\(rst\|png\|puml\|svg\)$' -exec cp -rv --parents {} "${cartridge_cli_dest}" \; mkdir -p "${cartridge_kubernetes_dest}" yes | cp -rf "${cartridge_kubernetes_root}" "${cartridge_kubernetes_dest}" diff --git a/doc/getting_started/getting_started_cartridge.rst b/doc/getting_started/getting_started_cartridge.rst index a32f4fa829..2ae3114e6b 100644 --- a/doc/getting_started/getting_started_cartridge.rst +++ b/doc/getting_started/getting_started_cartridge.rst @@ -17,7 +17,7 @@ Next, create an application named ``myapp``. Say: This will create a Tarantool Cartridge application in the ``./myapp`` directory, with a handful of -:ref:`template files and directories ` +:doc:`template files and directories ` inside. Go inside and make a dry run: @@ -222,5 +222,5 @@ Everything is up and running! What's next? cluster and try some cool cluster management features. * Get inspired with `these examples `_ and implement more sophisticated business logic for your role. -* :ref:`Pack ` your application for easy distribution. +* :doc:`Pack ` your application for easy distribution. Choose what you like: a DEB or RPM package, a TGZ archive, or a Docker image. diff --git a/locale/ru/LC_MESSAGES/getting_started/getting_started_cartridge.po b/locale/ru/LC_MESSAGES/getting_started/getting_started_cartridge.po index c2e7e43d7f..fa4a0e4264 100644 --- a/locale/ru/LC_MESSAGES/getting_started/getting_started_cartridge.po +++ b/locale/ru/LC_MESSAGES/getting_started/getting_started_cartridge.po @@ -20,12 +20,12 @@ msgstr "$ cartridge create --name myapp" msgid "" "This will create a Tarantool Cartridge application in the ``./myapp`` " -"directory, with a handful of :ref:`template files and directories " -"` inside." +"directory, with a handful of :doc:`template files and directories " +"` inside." msgstr "" "Эта команда создает новое Tarantool Cartridge-приложение в директории " -"``./myapp``. Там теперь содержатся созданные по шаблону :ref:`файлы и " -"директории `." +"``./myapp``. Там теперь содержатся созданные по шаблону :doc:`файлы и " +"директории `." msgid "Go inside and make a dry run:" msgstr "Войдите внутрь этой директории и запустите ваше приложение:" @@ -392,10 +392,10 @@ msgstr "" " для вашей роли." msgid "" -":ref:`Pack ` your application for easy" -" distribution. Choose what you like: a DEB or RPM package, a TGZ archive, or" -" a Docker image." +":doc:`Pack ` your application " +"for easy distribution. Choose what you like: a DEB or RPM package, a TGZ " +"archive, or a Docker image." msgstr "" -":ref:`Упакуйте ` ваше приложение для " -"дальнейшего распространения. Вы можете выбрать любой из поддерживаемых видов" -" пакетов: DEB, RPM, архив TGZ или Docker-образ." +":doc:`Упакуйте ` ваше " +"приложение для дальнейшего распространения. Вы можете выбрать любой из " +"поддерживаемых видов пакетов: DEB, RPM, архив TGZ или Docker-образ."