From f1d23e0963366799f107a7423d252ed9460d9fd3 Mon Sep 17 00:00:00 2001
From: Thomas Waldmann <tw@waldmann-edv.de>
Date: Thu, 21 Mar 2019 21:08:08 +0100
Subject: [PATCH 1/3] add release date

---
 docs/changes.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/changes.rst b/docs/changes.rst
index 0ce56d9b2..b03aee81c 100644
--- a/docs/changes.rst
+++ b/docs/changes.rst
@@ -171,8 +171,8 @@ The best check that everything is ok is to run a dry-run extraction::
 Changelog
 =========
 
-Version 1.2.0a5 (not released yet)
-----------------------------------
+Version 1.2.0a5 (2019-03-21)
+----------------------------
 
 Please note:
 

From 9c380405a29efc86956775a554f91f045ad09397 Mon Sep 17 00:00:00 2001
From: Thomas Waldmann <tw@waldmann-edv.de>
Date: Thu, 21 Mar 2019 21:11:18 +0100
Subject: [PATCH 2/3] build_usage

---
 docs/usage/create.rst.inc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/usage/create.rst.inc b/docs/usage/create.rst.inc
index 9e7c53015..536c1bc69 100644
--- a/docs/usage/create.rst.inc
+++ b/docs/usage/create.rst.inc
@@ -257,6 +257,7 @@ chunks are stored. For 'U' all data chunks refer to already existing chunks.
 - 'A' = regular file, added (see also :ref:`a_status_oddity` in the FAQ)
 - 'M' = regular file, modified
 - 'U' = regular file, unchanged
+- 'C' = regular file, it changed while we backed it up
 - 'E' = regular file, an error happened while accessing/reading *this* file
 
 A lowercase character means a file type other than a regular file,

From 572a7785548c90a88d81389461e5b3254dca39e3 Mon Sep 17 00:00:00 2001
From: Thomas Waldmann <tw@waldmann-edv.de>
Date: Thu, 21 Mar 2019 21:11:46 +0100
Subject: [PATCH 3/3] build_man

---
 docs/man/borg-benchmark-crud.1         | 2 +-
 docs/man/borg-benchmark.1              | 2 +-
 docs/man/borg-break-lock.1             | 2 +-
 docs/man/borg-check.1                  | 2 +-
 docs/man/borg-common.1                 | 2 +-
 docs/man/borg-compact.1                | 2 +-
 docs/man/borg-compression.1            | 2 +-
 docs/man/borg-config.1                 | 2 +-
 docs/man/borg-create.1                 | 4 +++-
 docs/man/borg-delete.1                 | 2 +-
 docs/man/borg-diff.1                   | 2 +-
 docs/man/borg-export-tar.1             | 2 +-
 docs/man/borg-extract.1                | 2 +-
 docs/man/borg-info.1                   | 2 +-
 docs/man/borg-init.1                   | 2 +-
 docs/man/borg-key-change-passphrase.1  | 2 +-
 docs/man/borg-key-export.1             | 2 +-
 docs/man/borg-key-import.1             | 2 +-
 docs/man/borg-key-migrate-to-repokey.1 | 2 +-
 docs/man/borg-key.1                    | 2 +-
 docs/man/borg-list.1                   | 2 +-
 docs/man/borg-mount.1                  | 2 +-
 docs/man/borg-patterns.1               | 2 +-
 docs/man/borg-placeholders.1           | 2 +-
 docs/man/borg-prune.1                  | 2 +-
 docs/man/borg-recreate.1               | 2 +-
 docs/man/borg-rename.1                 | 2 +-
 docs/man/borg-serve.1                  | 2 +-
 docs/man/borg-umount.1                 | 2 +-
 docs/man/borg-upgrade.1                | 2 +-
 docs/man/borg-with-lock.1              | 2 +-
 docs/man/borg.1                        | 1 +
 docs/man/borgfs.1                      | 2 +-
 33 files changed, 35 insertions(+), 32 deletions(-)

diff --git a/docs/man/borg-benchmark-crud.1 b/docs/man/borg-benchmark-crud.1
index 5ab9169b5..650663734 100644
--- a/docs/man/borg-benchmark-crud.1
+++ b/docs/man/borg-benchmark-crud.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH BORG-BENCHMARK-CRUD 1 "2019-03-10" "" "borg backup tool"
+.TH BORG-BENCHMARK-CRUD 1 "2019-03-21" "" "borg backup tool"
 .SH NAME
 borg-benchmark-crud \- Benchmark Create, Read, Update, Delete for archives.
 .
diff --git a/docs/man/borg-benchmark.1 b/docs/man/borg-benchmark.1
index e555444c2..8f000dec4 100644
--- a/docs/man/borg-benchmark.1
+++ b/docs/man/borg-benchmark.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH BORG-BENCHMARK 1 "2019-03-10" "" "borg backup tool"
+.TH BORG-BENCHMARK 1 "2019-03-21" "" "borg backup tool"
 .SH NAME
 borg-benchmark \- benchmark command
 .
diff --git a/docs/man/borg-break-lock.1 b/docs/man/borg-break-lock.1
index 8b8134584..19ed8e045 100644
--- a/docs/man/borg-break-lock.1
+++ b/docs/man/borg-break-lock.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH BORG-BREAK-LOCK 1 "2019-03-10" "" "borg backup tool"
+.TH BORG-BREAK-LOCK 1 "2019-03-21" "" "borg backup tool"
 .SH NAME
 borg-break-lock \- Break the repository lock (e.g. in case it was left by a dead borg.
 .
diff --git a/docs/man/borg-check.1 b/docs/man/borg-check.1
index 4955e8607..88a2072c1 100644
--- a/docs/man/borg-check.1
+++ b/docs/man/borg-check.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH BORG-CHECK 1 "2019-03-10" "" "borg backup tool"
+.TH BORG-CHECK 1 "2019-03-21" "" "borg backup tool"
 .SH NAME
 borg-check \- Check repository consistency
 .
diff --git a/docs/man/borg-common.1 b/docs/man/borg-common.1
index 76d01312e..89173da79 100644
--- a/docs/man/borg-common.1
+++ b/docs/man/borg-common.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH BORG-COMMON 1 "2019-03-10" "" "borg backup tool"
+.TH BORG-COMMON 1 "2019-03-21" "" "borg backup tool"
 .SH NAME
 borg-common \- Common options of Borg commands
 .
diff --git a/docs/man/borg-compact.1 b/docs/man/borg-compact.1
index ddd9138df..d7f988aad 100644
--- a/docs/man/borg-compact.1
+++ b/docs/man/borg-compact.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH BORG-COMPACT 1 "2019-03-10" "" "borg backup tool"
+.TH BORG-COMPACT 1 "2019-03-21" "" "borg backup tool"
 .SH NAME
 borg-compact \- compact segment files in the repository
 .
diff --git a/docs/man/borg-compression.1 b/docs/man/borg-compression.1
index 8aefd87e3..bdb894120 100644
--- a/docs/man/borg-compression.1
+++ b/docs/man/borg-compression.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH BORG-COMPRESSION 1 "2019-03-10" "" "borg backup tool"
+.TH BORG-COMPRESSION 1 "2019-03-21" "" "borg backup tool"
 .SH NAME
 borg-compression \- Details regarding compression
 .
diff --git a/docs/man/borg-config.1 b/docs/man/borg-config.1
index 1be313df2..273363dbd 100644
--- a/docs/man/borg-config.1
+++ b/docs/man/borg-config.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH BORG-CONFIG 1 "2019-03-10" "" "borg backup tool"
+.TH BORG-CONFIG 1 "2019-03-21" "" "borg backup tool"
 .SH NAME
 borg-config \- get, set, and delete values in a repository or cache config file
 .
diff --git a/docs/man/borg-create.1 b/docs/man/borg-create.1
index b4ad65086..7eb973c48 100644
--- a/docs/man/borg-create.1
+++ b/docs/man/borg-create.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH BORG-CREATE 1 "2019-03-10" "" "borg backup tool"
+.TH BORG-CREATE 1 "2019-03-21" "" "borg backup tool"
 .SH NAME
 borg-create \- Create new archive
 .
@@ -335,6 +335,8 @@ chunks are stored. For \(aqU\(aq all data chunks refer to already existing chunk
 .IP \(bu 2
 \(aqU\(aq = regular file, unchanged
 .IP \(bu 2
+\(aqC\(aq = regular file, it changed while we backed it up
+.IP \(bu 2
 \(aqE\(aq = regular file, an error happened while accessing/reading \fIthis\fP file
 .UNINDENT
 .sp
diff --git a/docs/man/borg-delete.1 b/docs/man/borg-delete.1
index 0c11a2963..972fe7265 100644
--- a/docs/man/borg-delete.1
+++ b/docs/man/borg-delete.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH BORG-DELETE 1 "2019-03-10" "" "borg backup tool"
+.TH BORG-DELETE 1 "2019-03-21" "" "borg backup tool"
 .SH NAME
 borg-delete \- Delete an existing repository or archives
 .
diff --git a/docs/man/borg-diff.1 b/docs/man/borg-diff.1
index 5afcdadac..d0a818072 100644
--- a/docs/man/borg-diff.1
+++ b/docs/man/borg-diff.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH BORG-DIFF 1 "2019-03-10" "" "borg backup tool"
+.TH BORG-DIFF 1 "2019-03-21" "" "borg backup tool"
 .SH NAME
 borg-diff \- Diff contents of two archives
 .
diff --git a/docs/man/borg-export-tar.1 b/docs/man/borg-export-tar.1
index 2e6759727..8c9bc97f6 100644
--- a/docs/man/borg-export-tar.1
+++ b/docs/man/borg-export-tar.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH BORG-EXPORT-TAR 1 "2019-03-10" "" "borg backup tool"
+.TH BORG-EXPORT-TAR 1 "2019-03-21" "" "borg backup tool"
 .SH NAME
 borg-export-tar \- Export archive contents as a tarball
 .
diff --git a/docs/man/borg-extract.1 b/docs/man/borg-extract.1
index 275baca42..f4ad4b4c0 100644
--- a/docs/man/borg-extract.1
+++ b/docs/man/borg-extract.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH BORG-EXTRACT 1 "2019-03-10" "" "borg backup tool"
+.TH BORG-EXTRACT 1 "2019-03-21" "" "borg backup tool"
 .SH NAME
 borg-extract \- Extract archive contents
 .
diff --git a/docs/man/borg-info.1 b/docs/man/borg-info.1
index d9a4800fb..3719b0007 100644
--- a/docs/man/borg-info.1
+++ b/docs/man/borg-info.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH BORG-INFO 1 "2019-03-10" "" "borg backup tool"
+.TH BORG-INFO 1 "2019-03-21" "" "borg backup tool"
 .SH NAME
 borg-info \- Show archive details such as disk space used
 .
diff --git a/docs/man/borg-init.1 b/docs/man/borg-init.1
index 2f47a7ccb..7a1b418a7 100644
--- a/docs/man/borg-init.1
+++ b/docs/man/borg-init.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH BORG-INIT 1 "2019-03-10" "" "borg backup tool"
+.TH BORG-INIT 1 "2019-03-21" "" "borg backup tool"
 .SH NAME
 borg-init \- Initialize an empty repository
 .
diff --git a/docs/man/borg-key-change-passphrase.1 b/docs/man/borg-key-change-passphrase.1
index 87a5d29d0..0aa23d2d8 100644
--- a/docs/man/borg-key-change-passphrase.1
+++ b/docs/man/borg-key-change-passphrase.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH BORG-KEY-CHANGE-PASSPHRASE 1 "2019-03-10" "" "borg backup tool"
+.TH BORG-KEY-CHANGE-PASSPHRASE 1 "2019-03-21" "" "borg backup tool"
 .SH NAME
 borg-key-change-passphrase \- Change repository key file passphrase
 .
diff --git a/docs/man/borg-key-export.1 b/docs/man/borg-key-export.1
index ad1d490b4..d24dafbf3 100644
--- a/docs/man/borg-key-export.1
+++ b/docs/man/borg-key-export.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH BORG-KEY-EXPORT 1 "2019-03-10" "" "borg backup tool"
+.TH BORG-KEY-EXPORT 1 "2019-03-21" "" "borg backup tool"
 .SH NAME
 borg-key-export \- Export the repository key for backup
 .
diff --git a/docs/man/borg-key-import.1 b/docs/man/borg-key-import.1
index f0cf594d0..5eae1241d 100644
--- a/docs/man/borg-key-import.1
+++ b/docs/man/borg-key-import.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH BORG-KEY-IMPORT 1 "2019-03-10" "" "borg backup tool"
+.TH BORG-KEY-IMPORT 1 "2019-03-21" "" "borg backup tool"
 .SH NAME
 borg-key-import \- Import the repository key from backup
 .
diff --git a/docs/man/borg-key-migrate-to-repokey.1 b/docs/man/borg-key-migrate-to-repokey.1
index e4cec3a1b..c432be9b2 100644
--- a/docs/man/borg-key-migrate-to-repokey.1
+++ b/docs/man/borg-key-migrate-to-repokey.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH BORG-KEY-MIGRATE-TO-REPOKEY 1 "2019-03-10" "" "borg backup tool"
+.TH BORG-KEY-MIGRATE-TO-REPOKEY 1 "2019-03-21" "" "borg backup tool"
 .SH NAME
 borg-key-migrate-to-repokey \- Migrate passphrase -> repokey
 .
diff --git a/docs/man/borg-key.1 b/docs/man/borg-key.1
index 63ab13a34..2bb7003cf 100644
--- a/docs/man/borg-key.1
+++ b/docs/man/borg-key.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH BORG-KEY 1 "2019-03-10" "" "borg backup tool"
+.TH BORG-KEY 1 "2019-03-21" "" "borg backup tool"
 .SH NAME
 borg-key \- Manage a keyfile or repokey of a repository
 .
diff --git a/docs/man/borg-list.1 b/docs/man/borg-list.1
index daff93383..9060d27d3 100644
--- a/docs/man/borg-list.1
+++ b/docs/man/borg-list.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH BORG-LIST 1 "2019-03-10" "" "borg backup tool"
+.TH BORG-LIST 1 "2019-03-21" "" "borg backup tool"
 .SH NAME
 borg-list \- List archive or repository contents
 .
diff --git a/docs/man/borg-mount.1 b/docs/man/borg-mount.1
index f7f94ebdb..508cd86ba 100644
--- a/docs/man/borg-mount.1
+++ b/docs/man/borg-mount.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH BORG-MOUNT 1 "2019-03-10" "" "borg backup tool"
+.TH BORG-MOUNT 1 "2019-03-21" "" "borg backup tool"
 .SH NAME
 borg-mount \- Mount archive or an entire repository as a FUSE filesystem
 .
diff --git a/docs/man/borg-patterns.1 b/docs/man/borg-patterns.1
index 1f7b77993..7aff5336b 100644
--- a/docs/man/borg-patterns.1
+++ b/docs/man/borg-patterns.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH BORG-PATTERNS 1 "2019-03-10" "" "borg backup tool"
+.TH BORG-PATTERNS 1 "2019-03-21" "" "borg backup tool"
 .SH NAME
 borg-patterns \- Details regarding patterns
 .
diff --git a/docs/man/borg-placeholders.1 b/docs/man/borg-placeholders.1
index 980f23609..68f05d4ec 100644
--- a/docs/man/borg-placeholders.1
+++ b/docs/man/borg-placeholders.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH BORG-PLACEHOLDERS 1 "2019-03-10" "" "borg backup tool"
+.TH BORG-PLACEHOLDERS 1 "2019-03-21" "" "borg backup tool"
 .SH NAME
 borg-placeholders \- Details regarding placeholders
 .
diff --git a/docs/man/borg-prune.1 b/docs/man/borg-prune.1
index 055d34b87..243d026e8 100644
--- a/docs/man/borg-prune.1
+++ b/docs/man/borg-prune.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH BORG-PRUNE 1 "2019-03-10" "" "borg backup tool"
+.TH BORG-PRUNE 1 "2019-03-21" "" "borg backup tool"
 .SH NAME
 borg-prune \- Prune repository archives according to specified rules
 .
diff --git a/docs/man/borg-recreate.1 b/docs/man/borg-recreate.1
index b839eb738..a804e64ee 100644
--- a/docs/man/borg-recreate.1
+++ b/docs/man/borg-recreate.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH BORG-RECREATE 1 "2019-03-10" "" "borg backup tool"
+.TH BORG-RECREATE 1 "2019-03-21" "" "borg backup tool"
 .SH NAME
 borg-recreate \- Re-create archives
 .
diff --git a/docs/man/borg-rename.1 b/docs/man/borg-rename.1
index 6aa6bb9b7..99f35506e 100644
--- a/docs/man/borg-rename.1
+++ b/docs/man/borg-rename.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH BORG-RENAME 1 "2019-03-10" "" "borg backup tool"
+.TH BORG-RENAME 1 "2019-03-21" "" "borg backup tool"
 .SH NAME
 borg-rename \- Rename an existing archive
 .
diff --git a/docs/man/borg-serve.1 b/docs/man/borg-serve.1
index 7b9e1c5d2..2d8223790 100644
--- a/docs/man/borg-serve.1
+++ b/docs/man/borg-serve.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH BORG-SERVE 1 "2019-03-10" "" "borg backup tool"
+.TH BORG-SERVE 1 "2019-03-21" "" "borg backup tool"
 .SH NAME
 borg-serve \- Start in server mode. This command is usually not used manually.
 .
diff --git a/docs/man/borg-umount.1 b/docs/man/borg-umount.1
index 4c5c5abb4..16d43d1dd 100644
--- a/docs/man/borg-umount.1
+++ b/docs/man/borg-umount.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH BORG-UMOUNT 1 "2019-03-10" "" "borg backup tool"
+.TH BORG-UMOUNT 1 "2019-03-21" "" "borg backup tool"
 .SH NAME
 borg-umount \- un-mount the FUSE filesystem
 .
diff --git a/docs/man/borg-upgrade.1 b/docs/man/borg-upgrade.1
index 3324fac6f..47e7feeb2 100644
--- a/docs/man/borg-upgrade.1
+++ b/docs/man/borg-upgrade.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH BORG-UPGRADE 1 "2019-03-10" "" "borg backup tool"
+.TH BORG-UPGRADE 1 "2019-03-21" "" "borg backup tool"
 .SH NAME
 borg-upgrade \- upgrade a repository from a previous version
 .
diff --git a/docs/man/borg-with-lock.1 b/docs/man/borg-with-lock.1
index 07a50c91f..cbdffe86c 100644
--- a/docs/man/borg-with-lock.1
+++ b/docs/man/borg-with-lock.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH BORG-WITH-LOCK 1 "2019-03-10" "" "borg backup tool"
+.TH BORG-WITH-LOCK 1 "2019-03-21" "" "borg backup tool"
 .SH NAME
 borg-with-lock \- run a user specified command with the repository lock held
 .
diff --git a/docs/man/borg.1 b/docs/man/borg.1
index 147b3be2f..3bfef2715 100644
--- a/docs/man/borg.1
+++ b/docs/man/borg.1
@@ -430,6 +430,7 @@ use \fI\%fqdn@uniqueid\fP\&.
 .TP
 .B BORG_LOGGING_CONF
 When set, use the given filename as \fI\%INI\fP\-style logging configuration.
+A basic example conf can be found at \fBdocs/misc/logging.conf\fP\&.
 .TP
 .B BORG_RSH
 When set, use this command instead of \fBssh\fP\&. This can be used to specify ssh options, such as
diff --git a/docs/man/borgfs.1 b/docs/man/borgfs.1
index 86f44e832..a3d1ef266 100644
--- a/docs/man/borgfs.1
+++ b/docs/man/borgfs.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH BORGFS 1 "2019-03-10" "" "borg backup tool"
+.TH BORGFS 1 "2019-03-21" "" "borg backup tool"
 .SH NAME
 borgfs \- Mount archive or an entire repository as a FUSE filesystem
 .