Skip to content

Commit 0f27e9f

Browse files
author
Vladimir I
committed
Partial Fix gh-869 Сonfusing wording in box.backup page
Fixed description regarding garbage collection in backup.start()
1 parent 9bb06d3 commit 0f27e9f

File tree

2 files changed

+11
-12
lines changed

2 files changed

+11
-12
lines changed

doc/1.10/book/admin/backups.rst

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -88,15 +88,14 @@ checkpoint.
8888
To take a mixed backup:
8989

9090
1. Issue :ref:`box.backup.start() <admin-backups-backup_start>` on the
91-
:ref:`administrative console <admin-security>`. This will suspend
92-
garbage collection till the next ``box.backup.stop()`` and
93-
will return a list of files to back up.
91+
:ref:`administrative console <admin-security>`. This will return a list of
92+
files to back up and suspend garbage collection of them till the next ``box.backup.stop()``.
9493

9594
2. Copy the files from the list to a safe location. This will include memtx
9695
snapshot files, vinyl run and index files, at a state consistent with the
9796
last checkpoint.
9897

99-
3. Issue ``box.backup.stop()`` so the garbage collector can continue.
98+
3. Issue ``box.backup.stop()`` so the garbage collector can continue as usual.
10099

101100
.. _admin-backups-cont_remote_backup_memtx:
102101

locale/ru/LC_MESSAGES/doc.po

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -183,14 +183,14 @@ msgstr "Для создания смешанной резервной копии
183183
#: ../doc/1.10/book/admin/backups.rst:124
184184
msgid ""
185185
"Issue :ref:`box.backup.start() <admin-backups-backup_start>` on the "
186-
":ref:`administrative console <admin-security>`. This will suspend garbage"
187-
" collection till the next ``box.backup.stop()`` and will return a list of"
188-
" files to back up."
186+
":ref:`administrative console <admin-security>`. This will
187+
" return a list of files to back up and suspend garbage"
188+
" collection of them till the next ``box.backup.stop()``."
189189
msgstr ""
190190
"Выполните команду :ref:`box.backup.start() <admin-backups-backup_start>` "
191-
"в :ref:`административной консоли <admin-security>`. Эта команда "
192-
"приостановит сборку мусора до вызова ``box.backup.stop()`` и покажет "
193-
"список файлов для резервирования."
191+
"в :ref:`административной консоли <admin-security>`. Эта команда покажет "
192+
"список файлов для резервного копирования и приостановит сборку мусора для этих"
193+
"файлов до вызова ``box.backup.stop()``."
194194

195195
#: ../doc/1.10/book/admin/backups.rst:129
196196
msgid ""
@@ -203,10 +203,10 @@ msgstr ""
203203
"последней контрольной точке."
204204

205205
#: ../doc/1.10/book/admin/backups.rst:133
206-
msgid "Issue ``box.backup.stop()`` so the garbage collector can continue."
206+
msgid "Issue ``box.backup.stop()`` so the garbage collector can continue as usual."
207207
msgstr ""
208208
"Выполните команду ``box.backup.stop()``, чтобы сборщик мусора мог "
209-
"продолжить работу."
209+
"продолжить работу в обычном режиме."
210210

211211
#: ../doc/1.10/book/admin/backups.rst:139
212212
msgid "Continuous remote backup (memtx)"

0 commit comments

Comments
 (0)