a148ac8a5cbe480fe89853f35addc8a8db04119d

Author
Andrew M <andrew.web@ifdattic.com>
Committer
Andrew M <andrew.web@ifdattic.com>
Date

Message

Fix typos, remove trailing whitespace

Diff

  1diff --git a/README.md b/README.md
  2index baa135c23e45b23af6ac674cfb222c63f6390470..83ed15b6cf873e1916b71af774ff7fd7770af64e 100644
  3--- a/README.md
  4+++ b/README.md
  5@@ -142,7 +142,7 @@ Note that the commands `--restore-file` and `--restore-dir` are equivalent.
  6 
  7     duplicity-backup.sh [-c config_file] --list-current-files
  8 
  9-**See the collection status (i.e. all the backup sets in the remore archive)**
 10+**See the collection status (i.e. all the backup sets in the remote archive)**
 11 
 12     duplicity-backup.sh [-c config_file] --collection-status
 13 
 14diff --git a/duplicity-backup.conf.example b/duplicity-backup.conf.example
 15index a52f7c00310fa6932b277902a8e7a585b82c8874..ccdeb82d065234297d8b1d98e4ddbca7c48bacc3 100644
 16--- a/duplicity-backup.conf.example
 17+++ b/duplicity-backup.conf.example
 18@@ -83,18 +83,18 @@ GPG_SIGN_KEY="foobar_gpg_key"
 19 
 20 # Do you want to hide the key id of the encrypted files? yes/no
 21 # It uses the gpg's --hidden-recipient command to obfuscate the owner of the backup.
 22-# On restore, gpg will automatically try all available secret keys in order to 
 23+# On restore, gpg will automatically try all available secret keys in order to
 24 # decrypt the backup. See gpg(1) for more details.
 25 # HIDE_KEY_ID='yes'
 26 
 27 # You can optionally specify the secret keyring file to use for the encryption and
 28-# signing keys. If not specified, the default secret keyring is used which is 
 29+# signing keys. If not specified, the default secret keyring is used which is
 30 # usually located at ~/.gnupg/secring.gpg
 31 # SECRET_KEYRING="/home/foobar_user_name/.gnupg/duplicity.gpg
 32 
 33 # BACKUP SOURCE INFORMATION
 34 # The ROOT of your backup (where you want the backup to start);
 35-# This can be / or somwhere else -- I use /home/ because all the
 36+# This can be / or somewhere else -- I use /home/ because all the
 37 # directories start with /home/ that I want to backup.
 38 ROOT="/home"
 39 
 40@@ -165,26 +165,26 @@ INCLIST=( "/home/foobar_user_name/Documents/" )
 41 EXCLIST=( "/home/foobar_user_name/Documents/foobar-to-exclude" )
 42 
 43 # INCLUDE GLOBBING FILELIST
 44-# Instead of using the INCLIST/EXCLIST variable you can also define a special 
 45-# (text-)file where each line in the filelist will be interpreted as 
 46-# a globbing pattern. By using the '+' or '-' sign at the beginning of each line 
 47-# you are able to specify if the folder should be included or excluded. 
 48-# 
 49-# 
 50+# Instead of using the INCLIST/EXCLIST variable you can also define a special
 51+# (text-)file where each line in the filelist will be interpreted as
 52+# a globbing pattern. By using the '+' or '-' sign at the beginning of each line
 53+# you are able to specify if the folder should be included or excluded.
 54+#
 55+#
 56 # Example:
 57-# 	+ /dir/foo 
 58-# 	- /dir/foob*
 59-# 	+ /dir/*
 60-# 
 61-# From the duplicity manual: 	
 62+#   + /dir/foo
 63+#   - /dir/foob*
 64+#   + /dir/*
 65+#
 66+# From the duplicity manual:
 67 # Lines starting with "+" are interpreted as include directives[...]Similarly, lines starting with "-" exclude files even if they are found within an include filelist.
 68 # For more examples or information refer to http://duplicity.nongnu.org/duplicity.1.html#sect10
 69 # INCEXCFILE=/path/to/file
 70 
 71 # EXCLUDE DEVICE FILES
 72-# Exclude all device files. This can be useful for security/permissions reasons 
 73+# Exclude all device files. This can be useful for security/permissions reasons
 74 # or if device files are not handled correctly.
 75-# 
 76+#
 77 # EXDEVICEFILES=1
 78 
 79 
 80@@ -216,16 +216,16 @@ CLEAN_UP_VARIABLE="4"
 81 # CLEAN_UP_TYPE="none"
 82 #
 83 # In combination with "remove-older-than" clean-up type, you may want
 84-# to keep only the full backups older than (n) number backup sets. For example, 
 85+# to keep only the full backups older than (n) number backup sets. For example,
 86 # let's say you set to CLEAN_UP_TYPE="remove-older-than", CLEAN_UP_VARIABLE
 87 # to "6M" (six months), STATIC_OPTIONS to "--full-if-older-than 7D"
 88-# (a full backup every 7 days), and you execute duplicity-backup once a day. 
 89-# After six months you'll have 25 full backups, each with daily incrementals 
 90-# in between. Perhaps you're keeping the backups past 1 month "just in case", 
 91+# (a full backup every 7 days), and you execute duplicity-backup once a day.
 92+# After six months you'll have 25 full backups, each with daily incrementals
 93+# in between. Perhaps you're keeping the backups past 1 month "just in case",
 94 # and so the older incrementals are overkill – weekly full backups beyond
 95-# one month backward would suffice. In this case you can set 
 96-# "REMOVE_INCREMENTALS_OLDER_THAN to, say, "4" which will delete the 
 97-# incrementals for backup sets beyond the four most recent, keeping 
 98+# one month backward would suffice. In this case you can set
 99+# "REMOVE_INCREMENTALS_OLDER_THAN to, say, "4" which will delete the
100+# incrementals for backup sets beyond the four most recent, keeping
101 # only the full weekly backups for those backup sets. The incrementals
102 # for the four most recent backup sets remain untouched.
103 #REMOVE_INCREMENTALS_OLDER_THAN="4"