Browse Source

Merge pull request #3288 from ThomasWaldmann/doc-updates2

Doc updates 2
TW 7 years ago
parent
commit
febb7ffca8
2 changed files with 8 additions and 10 deletions
  1. 1 0
      docs/misc/create_chunker-params.txt
  2. 7 10
      src/borg/archiver.py

+ 1 - 0
docs/misc/create_chunker-params.txt

@@ -7,6 +7,7 @@ CHUNK_MIN_EXP and CHUNK_MAX_EXP give the exponent N of the 2^N minimum and
 maximum chunk size. Required: CHUNK_MIN_EXP < CHUNK_MAX_EXP.
 maximum chunk size. Required: CHUNK_MIN_EXP < CHUNK_MAX_EXP.
 
 
 Defaults: 19 (2^19 == 512KiB) minimum, 23 (2^23 == 8MiB) maximum.
 Defaults: 19 (2^19 == 512KiB) minimum, 23 (2^23 == 8MiB) maximum.
+Currently it is not supported to give more than 23 as maximum.
 
 
 HASH_MASK_BITS is the number of least-significant bits of the rolling hash
 HASH_MASK_BITS is the number of least-significant bits of the rolling hash
 that need to be zero to trigger a chunk cut.
 that need to be zero to trigger a chunk cut.

+ 7 - 10
src/borg/archiver.py

@@ -2691,9 +2691,6 @@ class Archiver:
         and not include any other contents of the containing folder, this can be enabled
         and not include any other contents of the containing folder, this can be enabled
         through using the ``--keep-exclude-tags`` option.
         through using the ``--keep-exclude-tags`` option.
 
 
-        Borg respects the nodump flag. Files flagged nodump will be marked as excluded (x)
-        in ``--list`` output.
-
         Item flags
         Item flags
         ++++++++++
         ++++++++++
 
 
@@ -3307,13 +3304,13 @@ class Archiver:
 
 
             borg delete borg
             borg delete borg
 
 
-        Unless ``--inplace`` is specified, the upgrade process first
-        creates a backup copy of the repository, in
-        REPOSITORY.before-upgrade-DATETIME, using hardlinks. This takes
-        longer than in place upgrades, but is much safer and gives
-        progress information (as opposed to ``cp -al``). Once you are
-        satisfied with the conversion, you can safely destroy the
-        backup copy.
+        Unless ``--inplace`` is specified, the upgrade process first creates a backup
+        copy of the repository, in REPOSITORY.before-upgrade-DATETIME, using hardlinks.
+        This requires that the repository and its parent directory reside on same
+        filesystem so the hardlink copy can work.
+        This takes longer than in place upgrades, but is much safer and gives
+        progress information (as opposed to ``cp -al``). Once you are satisfied
+        with the conversion, you can safely destroy the backup copy.
 
 
         WARNING: Running the upgrade in place will make the current
         WARNING: Running the upgrade in place will make the current
         copy unusable with older version, with no way of going back
         copy unusable with older version, with no way of going back