From 2e1cf17dd5ba5a99185a7a9285bb90a29bb3523f Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Sat, 3 Sep 2016 18:41:27 +0200 Subject: [PATCH 1/3] add release signing key / security contact to README, fixes #1560 --- README.rst | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/README.rst b/README.rst index f6132773e..9b5451c61 100644 --- a/README.rst +++ b/README.rst @@ -114,6 +114,22 @@ Now doing another backup, just to show off the great deduplication: For a graphical frontend refer to our complementary project `BorgWeb `_. +Checking Release Authenticity and Security Contact +================================================== + +`Releases `_ are signed with this GPG key, +please use GPG to verify their authenticity. + +In case you discover a security issue, please use this contact for reporting it privately +and please, if possible, use encrypted E-Mail: + +Thomas Waldmann + +GPG Key Fingerprint: 6D5B EF9A DD20 7580 5747 B70F 9F88 FB52 FAF7 B393 + +The public key can be fetched from any GPG keyserver, but be careful: you must +use the **full fingerprint** to check that you got the correct key. + Links ===== From 2c5b8d690bced58f2a13d7c71e3e15711716f75d Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Sat, 3 Sep 2016 19:05:07 +0200 Subject: [PATCH 2/3] improve borg info --help, explain size infos, fixes #1532 --- borg/archiver.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/borg/archiver.py b/borg/archiver.py index 43ec093ad..7605fcd92 100644 --- a/borg/archiver.py +++ b/borg/archiver.py @@ -1344,6 +1344,15 @@ def build_parser(self, args=None, prog=None): info_epilog = textwrap.dedent(""" This command displays some detailed information about the specified archive. + + Please note that the deduplicated sizes of the individual archives do not add + up to the deduplicated size of the repository ("all archives"), because the two + are meaning different things: + + This archive / deduplicated size = amount of data stored ONLY for this archive + = unique chunks of this archive. + All archives / deduplicated size = amount of data stored in the repo + = all chunks in the repository. """) subparser = subparsers.add_parser('info', parents=[common_parser], description=self.do_info.__doc__, From f70008238a26905fd5cb72ba62c075414fb44fa7 Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Sat, 3 Sep 2016 19:22:39 +0200 Subject: [PATCH 3/3] link reference docs and faq about BORG_FILES_CACHE_TTL, fixes #1561 --- docs/faq.rst | 2 ++ docs/usage.rst | 1 + 2 files changed, 3 insertions(+) diff --git a/docs/faq.rst b/docs/faq.rst index c772f5fa7..0806c483c 100644 --- a/docs/faq.rst +++ b/docs/faq.rst @@ -356,6 +356,8 @@ those files are reported as being added when, really, chunks are already used. +.. _always_chunking: + It always chunks all my files, even unchanged ones! --------------------------------------------------- diff --git a/docs/usage.rst b/docs/usage.rst index ab92c1cb1..89a9e3cc7 100644 --- a/docs/usage.rst +++ b/docs/usage.rst @@ -89,6 +89,7 @@ General: BORG_FILES_CACHE_TTL When set to a numeric value, this determines the maximum "time to live" for the files cache entries (default: 20). The files cache is used to quickly determine whether a file is unchanged. + The FAQ explains this more detailled in: :ref:`always_chunking` TMPDIR where temporary files are stored (might need a lot of temporary space for some operations)