From 9e09786b33babdb358d254a55dae176f20d48c51 Mon Sep 17 00:00:00 2001
From: Thomas Waldmann <tw@waldmann-edv.de>
Date: Thu, 5 May 2016 13:38:08 +0200
Subject: [PATCH 1/2] borg create help: document format tags, fixes #894

docs: rephrased, more useful examples
---
 borg/archiver.py | 3 +++
 docs/usage.rst   | 7 +++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/borg/archiver.py b/borg/archiver.py
index 995278b75..ae2fd4645 100644
--- a/borg/archiver.py
+++ b/borg/archiver.py
@@ -997,6 +997,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/usage.rst b/docs/usage.rst
index e14f5dfff..258f9a1aa 100644
--- a/docs/usage.rst
+++ b/docs/usage.rst
@@ -301,10 +301,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
 

From 7457c0f5da5bf5696500c7d7bbabef2fd6e37660 Mon Sep 17 00:00:00 2001
From: Thomas Waldmann <tw@waldmann-edv.de>
Date: Sat, 30 Apr 2016 00:45:34 +0200
Subject: [PATCH 2/2] update CHANGES in 1.0-maint

---
 docs/changes.rst | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/docs/changes.rst b/docs/changes.rst
index 7d32c2eff..7adabb903 100644
--- a/docs/changes.rst
+++ b/docs/changes.rst
@@ -1,6 +1,24 @@
 Changelog
 =========
 
+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
 -------------