From d7284a92f02a9058042823417055cef602ea5ec9 Mon Sep 17 00:00:00 2001
From: Thomas Waldmann <tw@waldmann-edv.de>
Date: Sat, 19 Nov 2016 21:38:13 +0100
Subject: [PATCH 1/4] docs: clarify --umask usage, fixes #1859

---
 docs/usage.rst | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/docs/usage.rst b/docs/usage.rst
index 2a3538b22..09d1e2b4b 100644
--- a/docs/usage.rst
+++ b/docs/usage.rst
@@ -746,6 +746,17 @@ a new repository when changing chunker params.
 
 For more details, see :ref:`chunker_details`.
 
+
+--umask
+~~~~~~~
+
+If you use ``--umask``, make sure that all repository-modifying borg commands
+(create, delete, prune) that access the repository in question use the same
+``--umask`` value.
+
+If multiple machines access the same repository, this should hold true for all
+of them.
+
 --read-special
 ~~~~~~~~~~~~~~
 

From 3d174aef3517a385a2f5cd71a37f7f7e10e0a677 Mon Sep 17 00:00:00 2001
From: Thomas Waldmann <tw@waldmann-edv.de>
Date: Sat, 19 Nov 2016 21:52:11 +0100
Subject: [PATCH 2/4] docs: clarify passphrase mode attic repo upgrade, fixes
 #1854

---
 docs/usage.rst | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/docs/usage.rst b/docs/usage.rst
index 09d1e2b4b..14ecfbb8b 100644
--- a/docs/usage.rst
+++ b/docs/usage.rst
@@ -629,6 +629,20 @@ Examples
     no key file found for repository
 
 
+Upgrading a passphrase encrypted attic repo
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+attic offered a "passphrase" encryption mode, but this was removed in borg 1.0
+and replaced by the "repokey" mode (which stores the passphrase-protected
+encryption key into the repository config).
+
+Thus, to upgrade a "passphrase" attic repo to a "repokey" borg repo, 2 steps
+are needed, in this order:
+
+- borg upgrade repo
+- borg migrate-to-repokey repo
+
+
 .. include:: usage/break-lock.rst.inc
 
 

From d8e806aac10d18ae03da18214523257096cb01d9 Mon Sep 17 00:00:00 2001
From: Thomas Waldmann <tw@waldmann-edv.de>
Date: Sat, 19 Nov 2016 22:04:13 +0100
Subject: [PATCH 3/4] docs: datetime formatting examples for {now} placeholder,
 fixes #1822

---
 docs/usage.rst | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/docs/usage.rst b/docs/usage.rst
index 14ecfbb8b..9a0dc7108 100644
--- a/docs/usage.rst
+++ b/docs/usage.rst
@@ -382,7 +382,10 @@ Examples
 
     # 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} ~
+    # Similar, use the same datetime format as borg 1.1 will have as default
+    $ borg create /path/to/repo::{hostname}-{user}-{now:%Y-%m-%dT%H:%M:%S} ~
+    # As above, but add nanoseconds
+    $ borg create /path/to/repo::{hostname}-{user}-{now:%Y-%m-%dT%H:%M:%S.%f} ~
 
 .. include:: usage/extract.rst.inc
 

From 5fe5b6b339d20b5c19fdd7fbd7d12747b7f07ecb Mon Sep 17 00:00:00 2001
From: Thomas Waldmann <tw@waldmann-edv.de>
Date: Sat, 19 Nov 2016 22:26:07 +0100
Subject: [PATCH 4/4] docs: different pattern matching for --exclude, fixes
 #1779

---
 docs/usage.rst | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/docs/usage.rst b/docs/usage.rst
index 9a0dc7108..61b469b15 100644
--- a/docs/usage.rst
+++ b/docs/usage.rst
@@ -387,6 +387,15 @@ Examples
     # As above, but add nanoseconds
     $ borg create /path/to/repo::{hostname}-{user}-{now:%Y-%m-%dT%H:%M:%S.%f} ~
 
+Notes
+~~~~~
+
+- the --exclude patterns are not like tar. In tar --exclude .bundler/gems will
+  exclude foo/.bundler/gems. In borg it will not, you need to use --exclude
+  '*/.bundler/gems' to get the same effect. See ``borg help patterns`` for
+  more information.
+
+
 .. include:: usage/extract.rst.inc
 
 Examples