Browse Source

help text review: magic s/number/string/, s/can/must/

Antoine Beaupré 9 years ago
parent
commit
efbad396f4
2 changed files with 6 additions and 6 deletions
  1. 4 4
      borg/archiver.py
  2. 2 2
      borg/converter.py

+ 4 - 4
borg/archiver.py

@@ -909,19 +909,19 @@ Type "Yes I am sure" if you understand this and want to continue.\n""")
         convert_epilog = textwrap.dedent("""
         convert_epilog = textwrap.dedent("""
         convert will convert an existing Attic repository to Borg in place.
         convert will convert an existing Attic repository to Borg in place.
 
 
-        it will change the magic numbers in the repository's segments
-        to match the new Borg magic numbers. the keyfiles found in
+        it will change the magic strings in the repository's segments
+        to match the new Borg magic strings. the keyfiles found in
         $ATTIC_KEYS_DIR or ~/.attic/keys/ will also be converted and
         $ATTIC_KEYS_DIR or ~/.attic/keys/ will also be converted and
         copied to $BORG_KEYS_DIR or ~/.borg/keys.
         copied to $BORG_KEYS_DIR or ~/.borg/keys.
 
 
         the cache files are *not* currently converted, which will
         the cache files are *not* currently converted, which will
-        result in a much longer backup the first time. you can run
+        result in a much longer backup the first time. you must run
         `borg check --repair` to rebuild those files after the
         `borg check --repair` to rebuild those files after the
         conversion.
         conversion.
 
 
         the conversion can IRREMEDIABLY DAMAGE YOUR REPOSITORY! Attic
         the conversion can IRREMEDIABLY DAMAGE YOUR REPOSITORY! Attic
         will also NOT BE ABLE TO READ THE BORG REPOSITORY ANYMORE, as
         will also NOT BE ABLE TO READ THE BORG REPOSITORY ANYMORE, as
-        the magic numbers will have changed.
+        the magic strings will have changed.
 
 
         it is recommended you run this on a copy of the Attic
         it is recommended you run this on a copy of the Attic
         repository, in case something goes wrong, for example:
         repository, in case something goes wrong, for example:

+ 2 - 2
borg/converter.py

@@ -35,7 +35,7 @@ class AtticRepositoryConverter(Repository):
         replacement pattern is `s/ATTICSEG/BORG_SEG/` in files in
         replacement pattern is `s/ATTICSEG/BORG_SEG/` in files in
         `$ATTIC_REPO/data/**`.
         `$ATTIC_REPO/data/**`.
 
 
-        luckily the segment length didn't change so we can just
+        luckily the magic string length didn't change so we can just
         replace the 8 first bytes of all regular files in there."""
         replace the 8 first bytes of all regular files in there."""
         for filename in segments:
         for filename in segments:
             print("converting segment %s in place" % filename)
             print("converting segment %s in place" % filename)
@@ -75,7 +75,7 @@ class AtticRepositoryConverter(Repository):
         `$HOME/.borg/keys`.
         `$HOME/.borg/keys`.
 
 
         no need to decrypt to convert. we need to rewrite the whole
         no need to decrypt to convert. we need to rewrite the whole
-        key file because magic number length changed, but that's not a
+        key file because magic string length changed, but that's not a
         problem because the keyfiles are small (compared to, say,
         problem because the keyfiles are small (compared to, say,
         all the segments)."""
         all the segments)."""
         print("converting keyfile %s" % keyfile)
         print("converting keyfile %s" % keyfile)