Merge pull request #1144 from ThomasWaldmann/fix-prune-docs

fix / clarify prune help, fixes #1143
This commit is contained in:
TW 2016-06-06 16:12:46 +02:00
commit a8c4c9ffab
1 changed files with 2 additions and 2 deletions

View File

@ -1244,7 +1244,7 @@ class Archiver:
help='repository for which to break the locks') help='repository for which to break the locks')
prune_epilog = textwrap.dedent(""" prune_epilog = textwrap.dedent("""
The prune command prunes a repository by deleting archives not matching The prune command prunes a repository by deleting all archives not matching
any of the specified retention options. This command is normally used by any of the specified retention options. This command is normally used by
automated backup scripts wanting to keep a certain number of historic backups. automated backup scripts wanting to keep a certain number of historic backups.
@ -1252,7 +1252,7 @@ class Archiver:
most recent days with backups (days without backups do not count). most recent days with backups (days without backups do not count).
The rules are applied from hourly to yearly, and backups selected by previous The rules are applied from hourly to yearly, and backups selected by previous
rules do not count towards those of later rules. The time that each backup rules do not count towards those of later rules. The time that each backup
completes is used for pruning purposes. Dates and times are interpreted in starts is used for pruning purposes. Dates and times are interpreted in
the local timezone, and weeks go from Monday to Sunday. Specifying a the local timezone, and weeks go from Monday to Sunday. Specifying a
negative number of archives to keep means that there is no limit. negative number of archives to keep means that there is no limit.