X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=handlers%2Fdup.helper;h=9fe27180b31042d8af7d107391f9cd198ef85c41;hb=3313ebbd62ab9b71fba375499a85e9bca87ba030;hp=f2413344f00fbb733a66808a00a377167730c330;hpb=a99d05982d166c4bc455ef56773e93b8a558801f;p=matthijs%2Fupstream%2Fbackupninja.git

diff --git a/handlers/dup.helper b/handlers/dup.helper
index f241334..9fe2718 100644
--- a/handlers/dup.helper
+++ b/handlers/dup.helper
@@ -185,7 +185,7 @@ do_dup_gpg_passphrase() {
 do_dup_gpg() {
    
    # symmetric or public key encryption ?
-   booleanBox "$dup_title - GnuPG" "Use public key encryption? Else, symmetric encryption will be used, and data signing will be impossible." "$dup_gpg_asymmetric_encryption"
+   booleanBox "$dup_title - GnuPG" "Use public key encryption? Otherwise, symmetric encryption will be used, and data signing will be impossible." "$dup_gpg_asymmetric_encryption"
    if [ $? = 0 ]; then
       dup_gpg_asymmetric_encryption=yes
    else
@@ -207,10 +207,10 @@ do_dup_gpg() {
 	 [ $? = 0 ] || return 1
    elif [ "$dup_gpg_sign" == "yes" ]; then
       if [ -z "$dup_gpg_signkey" ]; then
-	 do_dup_gpg_passphrase "unlock the GnuPG 0x$dup_gpg_signkey key used to sign the backups"
+	 do_dup_gpg_passphrase "unlock the GnuPG key used to sign the backups"
 	 [ $? = 0 ] || return 1
       else
-	 do_dup_gpg_passphrase "unlock the GnuPG 0x$dup_gpg_encryptkey key used to sign the backups"
+	 do_dup_gpg_passphrase "unlock the GnuPG key used to sign the backups"
 	 [ $? = 0 ] || return 1
       fi
    fi
@@ -276,17 +276,17 @@ testconnect = $dup_testconnect
 
 ######################################################
 ## gpg section
-## (how to encrypt and optionnally sign the backups)
+## (how to encrypt and optionally sign the backups)
 ##
 ## WARNING: old (pre-0.9.2) example.dup used to give wrong information about
-##          the way the following options are used. Please read ahead
+##          the way the following options are used. Please read the following
 ##          carefully.
 ##
 ## If the encryptkey variable is set:
 ##   - data is encrypted with the GnuPG public key specified by the encryptkey
 ##     variable
 ##   - if signing is enabled, the password variable is used to unlock the GnuPG
-##     private key used for signing; else, you do not need to set the password
+##     private key used for signing; otherwise, you do not need to set the password
 ##     variable
 ## If the encryptkey option is not set:
 ##   - data signing is not possible
@@ -295,10 +295,10 @@ testconnect = $dup_testconnect
 
 [gpg]
 
-# when set to yes, encryptkey variable must be set bellow; if you want to use
+# when set to yes, encryptkey variable must be set below; if you want to use
 # two different keys for encryption and signing, you must also set the signkey
-# variable bellow.
-# default is no, for backward compatibility with backupninja <= 0.5.
+# variable below.
+# default is no, for backwards compatibility with backupninja <= 0.5.
 sign = $dup_gpg_sign
 
 # ID of the GnuPG public key used for data encryption.
@@ -310,7 +310,7 @@ encryptkey = $dup_gpg_encryptkey
 signkey = $dup_gpg_signkey
 
 # password
-# NB: do not quote it, and it should not contain any quote
+# NB: neither quote this, nor should it include any quotes
 password = $dup_gpg_password
 
 ######################################################
@@ -354,13 +354,14 @@ EOF
 # vsinclude = <path>
 # ...
 # Any path specified in vsinclude is added to the include list for each vserver
-# listed in vsnames (or all if vsnames = all).
+# listed in vsnames (or all if vsnames = all, which is the default).
 #
 # For example, vsinclude = /home will backup the /home directory in every
 # vserver listed in vsnames. If you have 'vsnames = foo bar baz', this
 # vsinclude will add to the include list /vservers/foo/home, /vservers/bar/home
 # and /vservers/baz/home.
 # Vservers paths are derived from $VROOTDIR.
+# vsinclude supports globbing with '*'.
 
 EOF
 
@@ -507,7 +508,7 @@ dup_wizard() {
    # Global variables whose '*' shall not be expanded
    set -o noglob
    dup_default_includes="/var/spool/cron/crontabs /var/backups /etc /root /home /usr/local/*bin /var/lib/dpkg/status*"
-   dup_default_excludes="/home/*/.gnupg"
+   dup_default_excludes="/home/*/.gnupg /home/*/.gnupg /home/*/.local/share/Trash /home/*/.Trash /home/*/.thumbnails /home/*/.beagle /home/*/.aMule /home/*/gtk-gnutella-downloads"
    set +o noglob
 
    dup_main_menu