diff --git a/borg/archiver.py b/borg/archiver.py index daa76fbd0..5f82e200e 100644 --- a/borg/archiver.py +++ b/borg/archiver.py @@ -1283,6 +1283,9 @@ class Archiver: '.checkpoint.N' (with N being a number), because these names are used for checkpoints and treated in special ways. + In the archive name, you may use the following format tags: + {now}, {utcnow}, {fqdn}, {hostname}, {user}, {pid} + To speed up pulling backups over sshfs and similar network file systems which do not provide correct inode information the --ignore-inode flag can be used. This potentially decreases reliability of change detection, while avoiding always reading diff --git a/docs/changes.rst b/docs/changes.rst index bebaf3b26..1e6d1a6f1 100644 --- a/docs/changes.rst +++ b/docs/changes.rst @@ -70,6 +70,24 @@ Other changes: - ChunkBuffer: add test for leaving partial chunk in buffer, fixes #945 +Version 1.0.3 (not released yet) +-------------------------------- + +Bug fixes: + +- prune: ignore checkpoints, #997 +- prune: fix bad validator, #942 +- fix capabilities extraction on Linux (set xattrs last, after chown()) + +Other changes: + +- update readthedocs URLs, #991 +- add missing docs for "borg break-lock", #992 +- borg create help: add some words to about the archive name +- borg create help: document format tags, #894 +- Vagrantfile: OS X: update osxfuse / install lzma package, #933 + + Version 1.0.2 ------------- diff --git a/docs/usage.rst b/docs/usage.rst index d1cb8a934..34048ee81 100644 --- a/docs/usage.rst +++ b/docs/usage.rst @@ -311,10 +311,9 @@ Examples # Even slower, even higher compression (N = 0..9) $ borg create --compression lzma,N /path/to/repo::arch ~ - # Format tags available for archive name: - # {now}, {utcnow}, {fqdn}, {hostname}, {user}, {pid} - # add short hostname, backup username and current unixtime (seconds from epoch) - $ borg create /path/to/repo::{hostname}-{user}-{now:%s} ~ + # Use short hostname, user name and current time in archive name + $ borg create /path/to/repo::{hostname}-{user}-{now} ~ + $ borg create /path/to/repo::{hostname}-{user}-{now:%Y-%m-%d_%H:%M:%S} ~ .. include:: usage/extract.rst.inc