Update manpages and auto-completion

doc/bash-completion.sh

@@ -36,71 +36,9 @@ __restic_contains_word()
     return 1
 }
 
-__restic_handle_go_custom_completion()
-{
-    __restic_debug "${FUNCNAME[0]}: cur is ${cur}, words[*] is ${words[*]}, #words[@] is ${#words[@]}"
-
-    local out requestComp lastParam lastChar comp directive args
-
-    # Prepare the command to request completions for the program.
-    # Calling ${words[0]} instead of directly restic allows to handle aliases
-    args=("${words[@]:1}")
-    requestComp="${words[0]} __completeNoDesc ${args[*]}"
-
-    lastParam=${words[$((${#words[@]}-1))]}
-    lastChar=${lastParam:$((${#lastParam}-1)):1}
-    __restic_debug "${FUNCNAME[0]}: lastParam ${lastParam}, lastChar ${lastChar}"
-
-    if [ -z "${cur}" ] && [ "${lastChar}" != "=" ]; then
-        # If the last parameter is complete (there is a space following it)
-        # We add an extra empty parameter so we can indicate this to the go method.
-        __restic_debug "${FUNCNAME[0]}: Adding extra empty parameter"
-        requestComp="${requestComp} \"\""
-    fi
-
-    __restic_debug "${FUNCNAME[0]}: calling ${requestComp}"
-    # Use eval to handle any environment variables and such
-    out=$(eval "${requestComp}" 2>/dev/null)
-
-    # Extract the directive integer at the very end of the output following a colon (:)
-    directive=${out##*:}
-    # Remove the directive
-    out=${out%:*}
-    if [ "${directive}" = "${out}" ]; then
-        # There is not directive specified
-        directive=0
-    fi
-    __restic_debug "${FUNCNAME[0]}: the completion directive is: ${directive}"
-    __restic_debug "${FUNCNAME[0]}: the completions are: ${out[*]}"
-
-    if [ $((directive & 1)) -ne 0 ]; then
-        # Error code.  No completion.
-        __restic_debug "${FUNCNAME[0]}: received error from custom completion go code"
-        return
-    else
-        if [ $((directive & 2)) -ne 0 ]; then
-            if [[ $(type -t compopt) = "builtin" ]]; then
-                __restic_debug "${FUNCNAME[0]}: activating no space"
-                compopt -o nospace
-            fi
-        fi
-        if [ $((directive & 4)) -ne 0 ]; then
-            if [[ $(type -t compopt) = "builtin" ]]; then
-                __restic_debug "${FUNCNAME[0]}: activating no file completion"
-                compopt +o default
-            fi
-        fi
-
-        while IFS='' read -r comp; do
-            COMPREPLY+=("$comp")
-        done < <(compgen -W "${out[*]}" -- "$cur")
-    fi
-}
-
 __restic_handle_reply()
 {
     __restic_debug "${FUNCNAME[0]}"
-    local comp
     case $cur in
         -*)
             if [[ $(type -t compopt) = "builtin" ]]; then
@@ -112,9 +50,7 @@ __restic_handle_reply()
             else
                 allflags=("${flags[*]} ${two_word_flags[*]}")
             fi
-            while IFS='' read -r comp; do
+            COMPREPLY=( $(compgen -W "${allflags[*]}" -- "$cur") )
-                COMPREPLY+=("$comp")
-            done < <(compgen -W "${allflags[*]}" -- "$cur")
             if [[ $(type -t compopt) = "builtin" ]]; then
                 [[ "${COMPREPLY[0]}" == *= ]] || compopt +o nospace
             fi
@@ -160,22 +96,14 @@ __restic_handle_reply()
     completions=("${commands[@]}")
     if [[ ${#must_have_one_noun[@]} -ne 0 ]]; then
         completions=("${must_have_one_noun[@]}")
-    elif [[ -n "${has_completion_function}" ]]; then
-        # if a go completion function is provided, defer to that function
-        completions=()
-        __restic_handle_go_custom_completion
     fi
     if [[ ${#must_have_one_flag[@]} -ne 0 ]]; then
         completions+=("${must_have_one_flag[@]}")
     fi
-    while IFS='' read -r comp; do
+    COMPREPLY=( $(compgen -W "${completions[*]}" -- "$cur") )
-        COMPREPLY+=("$comp")
-    done < <(compgen -W "${completions[*]}" -- "$cur")
 
     if [[ ${#COMPREPLY[@]} -eq 0 && ${#noun_aliases[@]} -gt 0 && ${#must_have_one_noun[@]} -ne 0 ]]; then
-        while IFS='' read -r comp; do
+        COMPREPLY=( $(compgen -W "${noun_aliases[*]}" -- "$cur") )
-            COMPREPLY+=("$comp")
-        done < <(compgen -W "${noun_aliases[*]}" -- "$cur")
     fi
 
     if [[ ${#COMPREPLY[@]} -eq 0 ]]; then
@@ -210,7 +138,7 @@ __restic_handle_filename_extension_flag()
 __restic_handle_subdirs_in_dir_flag()
 {
     local dir="$1"
-    pushd "${dir}" >/dev/null 2>&1 && _filedir -d && popd >/dev/null 2>&1 || return
+    pushd "${dir}" >/dev/null 2>&1 && _filedir -d && popd >/dev/null 2>&1
 }
 
 __restic_handle_flag()
@@ -418,6 +346,8 @@ _restic_backup()
     flags+=("--repo=")
     two_word_flags+=("--repo")
     two_word_flags+=("-r")
+    flags+=("--repository-file=")
+    two_word_flags+=("--repository-file")
     flags+=("--tls-client-cert=")
     two_word_flags+=("--tls-client-cert")
     flags+=("--verbose")
@@ -479,6 +409,8 @@ _restic_cache()
     flags+=("--repo=")
     two_word_flags+=("--repo")
     two_word_flags+=("-r")
+    flags+=("--repository-file=")
+    two_word_flags+=("--repository-file")
     flags+=("--tls-client-cert=")
     two_word_flags+=("--tls-client-cert")
     flags+=("--verbose")
@@ -533,6 +465,8 @@ _restic_cat()
     flags+=("--repo=")
     two_word_flags+=("--repo")
     two_word_flags+=("-r")
+    flags+=("--repository-file=")
+    two_word_flags+=("--repository-file")
     flags+=("--tls-client-cert=")
     two_word_flags+=("--tls-client-cert")
     flags+=("--verbose")
@@ -596,6 +530,8 @@ _restic_check()
     flags+=("--repo=")
     two_word_flags+=("--repo")
     two_word_flags+=("-r")
+    flags+=("--repository-file=")
+    two_word_flags+=("--repository-file")
     flags+=("--tls-client-cert=")
     two_word_flags+=("--tls-client-cert")
     flags+=("--verbose")
@@ -672,6 +608,8 @@ _restic_copy()
     flags+=("--repo=")
     two_word_flags+=("--repo")
     two_word_flags+=("-r")
+    flags+=("--repository-file=")
+    two_word_flags+=("--repository-file")
     flags+=("--tls-client-cert=")
     two_word_flags+=("--tls-client-cert")
     flags+=("--verbose")
@@ -728,6 +666,8 @@ _restic_diff()
     flags+=("--repo=")
     two_word_flags+=("--repo")
     two_word_flags+=("-r")
+    flags+=("--repository-file=")
+    two_word_flags+=("--repository-file")
     flags+=("--tls-client-cert=")
     two_word_flags+=("--tls-client-cert")
     flags+=("--verbose")
@@ -792,6 +732,8 @@ _restic_dump()
     flags+=("--repo=")
     two_word_flags+=("--repo")
     two_word_flags+=("-r")
+    flags+=("--repository-file=")
+    two_word_flags+=("--repository-file")
     flags+=("--tls-client-cert=")
     two_word_flags+=("--tls-client-cert")
     flags+=("--verbose")
@@ -882,6 +824,8 @@ _restic_find()
     flags+=("--repo=")
     two_word_flags+=("--repo")
     two_word_flags+=("-r")
+    flags+=("--repository-file=")
+    two_word_flags+=("--repository-file")
     flags+=("--tls-client-cert=")
     two_word_flags+=("--tls-client-cert")
     flags+=("--verbose")
@@ -987,6 +931,8 @@ _restic_forget()
     flags+=("--repo=")
     two_word_flags+=("--repo")
     two_word_flags+=("-r")
+    flags+=("--repository-file=")
+    two_word_flags+=("--repository-file")
     flags+=("--tls-client-cert=")
     two_word_flags+=("--tls-client-cert")
     flags+=("--verbose")
@@ -1050,6 +996,8 @@ _restic_generate()
     flags+=("--repo=")
     two_word_flags+=("--repo")
     two_word_flags+=("-r")
+    flags+=("--repository-file=")
+    two_word_flags+=("--repository-file")
     flags+=("--tls-client-cert=")
     two_word_flags+=("--tls-client-cert")
     flags+=("--verbose")
@@ -1118,6 +1066,8 @@ _restic_init()
     flags+=("--repo=")
     two_word_flags+=("--repo")
     two_word_flags+=("-r")
+    flags+=("--repository-file=")
+    two_word_flags+=("--repository-file")
     flags+=("--tls-client-cert=")
     two_word_flags+=("--tls-client-cert")
     flags+=("--verbose")
@@ -1181,6 +1131,8 @@ _restic_key()
     flags+=("--repo=")
     two_word_flags+=("--repo")
     two_word_flags+=("-r")
+    flags+=("--repository-file=")
+    two_word_flags+=("--repository-file")
     flags+=("--tls-client-cert=")
     two_word_flags+=("--tls-client-cert")
     flags+=("--verbose")
@@ -1235,6 +1187,8 @@ _restic_list()
     flags+=("--repo=")
     two_word_flags+=("--repo")
     two_word_flags+=("-r")
+    flags+=("--repository-file=")
+    two_word_flags+=("--repository-file")
     flags+=("--tls-client-cert=")
     two_word_flags+=("--tls-client-cert")
     flags+=("--verbose")
@@ -1304,6 +1258,8 @@ _restic_ls()
     flags+=("--repo=")
     two_word_flags+=("--repo")
     two_word_flags+=("-r")
+    flags+=("--repository-file=")
+    two_word_flags+=("--repository-file")
     flags+=("--tls-client-cert=")
     two_word_flags+=("--tls-client-cert")
     flags+=("--verbose")
@@ -1361,6 +1317,8 @@ _restic_migrate()
     flags+=("--repo=")
     two_word_flags+=("--repo")
     two_word_flags+=("-r")
+    flags+=("--repository-file=")
+    two_word_flags+=("--repository-file")
     flags+=("--tls-client-cert=")
     two_word_flags+=("--tls-client-cert")
     flags+=("--verbose")
@@ -1434,6 +1392,8 @@ _restic_mount()
     flags+=("--repo=")
     two_word_flags+=("--repo")
     two_word_flags+=("-r")
+    flags+=("--repository-file=")
+    two_word_flags+=("--repository-file")
     flags+=("--tls-client-cert=")
     two_word_flags+=("--tls-client-cert")
     flags+=("--verbose")
@@ -1488,6 +1448,8 @@ _restic_prune()
     flags+=("--repo=")
     two_word_flags+=("--repo")
     two_word_flags+=("-r")
+    flags+=("--repository-file=")
+    two_word_flags+=("--repository-file")
     flags+=("--tls-client-cert=")
     two_word_flags+=("--tls-client-cert")
     flags+=("--verbose")
@@ -1542,6 +1504,8 @@ _restic_rebuild-index()
     flags+=("--repo=")
     two_word_flags+=("--repo")
     two_word_flags+=("-r")
+    flags+=("--repository-file=")
+    two_word_flags+=("--repository-file")
     flags+=("--tls-client-cert=")
     two_word_flags+=("--tls-client-cert")
     flags+=("--verbose")
@@ -1596,6 +1560,8 @@ _restic_recover()
     flags+=("--repo=")
     two_word_flags+=("--repo")
     two_word_flags+=("-r")
+    flags+=("--repository-file=")
+    two_word_flags+=("--repository-file")
     flags+=("--tls-client-cert=")
     two_word_flags+=("--tls-client-cert")
     flags+=("--verbose")
@@ -1680,6 +1646,8 @@ _restic_restore()
     flags+=("--repo=")
     two_word_flags+=("--repo")
     two_word_flags+=("-r")
+    flags+=("--repository-file=")
+    two_word_flags+=("--repository-file")
     flags+=("--tls-client-cert=")
     two_word_flags+=("--tls-client-cert")
     flags+=("--verbose")
@@ -1737,6 +1705,8 @@ _restic_self-update()
     flags+=("--repo=")
     two_word_flags+=("--repo")
     two_word_flags+=("-r")
+    flags+=("--repository-file=")
+    two_word_flags+=("--repository-file")
     flags+=("--tls-client-cert=")
     two_word_flags+=("--tls-client-cert")
     flags+=("--verbose")
@@ -1810,6 +1780,8 @@ _restic_snapshots()
     flags+=("--repo=")
     two_word_flags+=("--repo")
     two_word_flags+=("-r")
+    flags+=("--repository-file=")
+    two_word_flags+=("--repository-file")
     flags+=("--tls-client-cert=")
     two_word_flags+=("--tls-client-cert")
     flags+=("--verbose")
@@ -1877,6 +1849,8 @@ _restic_stats()
     flags+=("--repo=")
     two_word_flags+=("--repo")
     two_word_flags+=("-r")
+    flags+=("--repository-file=")
+    two_word_flags+=("--repository-file")
     flags+=("--tls-client-cert=")
     two_word_flags+=("--tls-client-cert")
     flags+=("--verbose")
@@ -1950,6 +1924,8 @@ _restic_tag()
     flags+=("--repo=")
     two_word_flags+=("--repo")
     two_word_flags+=("-r")
+    flags+=("--repository-file=")
+    two_word_flags+=("--repository-file")
     flags+=("--tls-client-cert=")
     two_word_flags+=("--tls-client-cert")
     flags+=("--verbose")
@@ -2006,6 +1982,8 @@ _restic_unlock()
     flags+=("--repo=")
     two_word_flags+=("--repo")
     two_word_flags+=("-r")
+    flags+=("--repository-file=")
+    two_word_flags+=("--repository-file")
     flags+=("--tls-client-cert=")
     two_word_flags+=("--tls-client-cert")
     flags+=("--verbose")
@@ -2060,6 +2038,8 @@ _restic_version()
     flags+=("--repo=")
     two_word_flags+=("--repo")
     two_word_flags+=("-r")
+    flags+=("--repository-file=")
+    two_word_flags+=("--repository-file")
     flags+=("--tls-client-cert=")
     two_word_flags+=("--tls-client-cert")
     flags+=("--verbose")
@@ -2140,6 +2120,8 @@ _restic_root_command()
     flags+=("--repo=")
     two_word_flags+=("--repo")
     two_word_flags+=("-r")
+    flags+=("--repository-file=")
+    two_word_flags+=("--repository-file")
     flags+=("--tls-client-cert=")
     two_word_flags+=("--tls-client-cert")
     flags+=("--verbose")
@@ -2170,7 +2152,6 @@ __start_restic()
     local commands=("restic")
     local must_have_one_flag=()
     local must_have_one_noun=()
-    local has_completion_function
     local last_command
     local nouns=()
 

doc/man/restic-backup.1

@@ -1,6 +1,7 @@
+.TH "restic backup" "1" "Jan 2017" "generated by `restic generate`" "" 
 .nh
-.TH restic backup(1)Jan 2017
+.ad l
-generated by \fB\fCrestic generate\fR
+
 
 .SH NAME
 .PP
@@ -32,7 +33,8 @@ Exit status is 3 if some source data could not be read (incomplete snapshot crea
 
 .PP
 \fB\-\-exclude\-caches\fP[=false]
-	excludes cache directories that are marked with a CACHEDIR.TAG file. See https://bford.info/cachedir/ for the Cache Directory Tagging Standard
+    excludes cache directories that are marked with a CACHEDIR.TAG file. See 
+\[la]https://bford.info/cachedir/\[ra] for the Cache Directory Tagging Standard
 
 .PP
 \fB\-\-exclude\-file\fP=[]
@@ -138,7 +140,7 @@ Exit status is 3 if some source data could not be read (incomplete snapshot crea
 
 .PP
 \fB\-\-no\-lock\fP[=false]
-	do not lock the repo, this allows some operations on read\-only repos
+    do not lock the repository, this allows some operations on read\-only repositories
 
 .PP
 \fB\-o\fP, \fB\-\-option\fP=[]
@@ -160,13 +162,17 @@ Exit status is 3 if some source data could not be read (incomplete snapshot crea
 \fB\-r\fP, \fB\-\-repo\fP=""
     \fB\fCrepository\fR to backup to or restore from (default: $RESTIC\_REPOSITORY)
 
+.PP
+\fB\-\-repository\-file\fP=""
+    \fB\fCfile\fR to read the repository location from (default: $RESTIC\_REPOSITORY\_FILE)
+
 .PP
 \fB\-\-tls\-client\-cert\fP=""
     path to a \fB\fCfile\fR containing PEM encoded TLS client certificate and private key
 
 .PP
 \fB\-v\fP, \fB\-\-verbose\fP[=0]
-	be verbose (specify \-\-verbose multiple times or level \-\-verbose=\fB\fCn\fR)
+    be verbose (specify multiple times or a level using \-\-verbose=\fB\fCn\fR, max level/times is 3)
 
 
 .SH SEE ALSO

doc/man/restic-cache.1

@@ -1,6 +1,7 @@
+.TH "restic backup" "1" "Jan 2017" "generated by `restic generate`" "" 
 .nh
-.TH restic backup(1)Jan 2017
+.ad l
-generated by \fB\fCrestic generate\fR
+
 
 .SH NAME
 .PP
@@ -75,7 +76,7 @@ Exit status is 0 if the command was successful, and non\-zero if there was any e
 
 .PP
 \fB\-\-no\-lock\fP[=false]
-	do not lock the repo, this allows some operations on read\-only repos
+    do not lock the repository, this allows some operations on read\-only repositories
 
 .PP
 \fB\-o\fP, \fB\-\-option\fP=[]
@@ -97,13 +98,17 @@ Exit status is 0 if the command was successful, and non\-zero if there was any e
 \fB\-r\fP, \fB\-\-repo\fP=""
     \fB\fCrepository\fR to backup to or restore from (default: $RESTIC\_REPOSITORY)
 
+.PP
+\fB\-\-repository\-file\fP=""
+    \fB\fCfile\fR to read the repository location from (default: $RESTIC\_REPOSITORY\_FILE)
+
 .PP
 \fB\-\-tls\-client\-cert\fP=""
     path to a \fB\fCfile\fR containing PEM encoded TLS client certificate and private key
 
 .PP
 \fB\-v\fP, \fB\-\-verbose\fP[=0]
-	be verbose (specify \-\-verbose multiple times or level \-\-verbose=\fB\fCn\fR)
+    be verbose (specify multiple times or a level using \-\-verbose=\fB\fCn\fR, max level/times is 3)
 
 
 .SH SEE ALSO

doc/man/restic-cat.1

@@ -1,6 +1,7 @@
+.TH "restic backup" "1" "Jan 2017" "generated by `restic generate`" "" 
 .nh
-.TH restic backup(1)Jan 2017
+.ad l
-generated by \fB\fCrestic generate\fR
+
 
 .SH NAME
 .PP
@@ -63,7 +64,7 @@ Exit status is 0 if the command was successful, and non\-zero if there was any e
 
 .PP
 \fB\-\-no\-lock\fP[=false]
-	do not lock the repo, this allows some operations on read\-only repos
+    do not lock the repository, this allows some operations on read\-only repositories
 
 .PP
 \fB\-o\fP, \fB\-\-option\fP=[]
@@ -85,13 +86,17 @@ Exit status is 0 if the command was successful, and non\-zero if there was any e
 \fB\-r\fP, \fB\-\-repo\fP=""
     \fB\fCrepository\fR to backup to or restore from (default: $RESTIC\_REPOSITORY)
 
+.PP
+\fB\-\-repository\-file\fP=""
+    \fB\fCfile\fR to read the repository location from (default: $RESTIC\_REPOSITORY\_FILE)
+
 .PP
 \fB\-\-tls\-client\-cert\fP=""
     path to a \fB\fCfile\fR containing PEM encoded TLS client certificate and private key
 
 .PP
 \fB\-v\fP, \fB\-\-verbose\fP[=0]
-	be verbose (specify \-\-verbose multiple times or level \-\-verbose=\fB\fCn\fR)
+    be verbose (specify multiple times or a level using \-\-verbose=\fB\fCn\fR, max level/times is 3)
 
 
 .SH SEE ALSO

doc/man/restic-check.1

@@ -1,6 +1,7 @@
+.TH "restic backup" "1" "Jan 2017" "generated by `restic generate`" "" 
 .nh
-.TH restic backup(1)Jan 2017
+.ad l
-generated by \fB\fCrestic generate\fR
+
 
 .SH NAME
 .PP
@@ -84,7 +85,7 @@ Exit status is 0 if the command was successful, and non\-zero if there was any e
 
 .PP
 \fB\-\-no\-lock\fP[=false]
-	do not lock the repo, this allows some operations on read\-only repos
+    do not lock the repository, this allows some operations on read\-only repositories
 
 .PP
 \fB\-o\fP, \fB\-\-option\fP=[]
@@ -106,13 +107,17 @@ Exit status is 0 if the command was successful, and non\-zero if there was any e
 \fB\-r\fP, \fB\-\-repo\fP=""
     \fB\fCrepository\fR to backup to or restore from (default: $RESTIC\_REPOSITORY)
 
+.PP
+\fB\-\-repository\-file\fP=""
+    \fB\fCfile\fR to read the repository location from (default: $RESTIC\_REPOSITORY\_FILE)
+
 .PP
 \fB\-\-tls\-client\-cert\fP=""
     path to a \fB\fCfile\fR containing PEM encoded TLS client certificate and private key
 
 .PP
 \fB\-v\fP, \fB\-\-verbose\fP[=0]
-	be verbose (specify \-\-verbose multiple times or level \-\-verbose=\fB\fCn\fR)
+    be verbose (specify multiple times or a level using \-\-verbose=\fB\fCn\fR, max level/times is 3)
 
 
 .SH SEE ALSO

doc/man/restic-copy.1

@@ -1,6 +1,7 @@
+.TH "restic backup" "1" "Jan 2017" "generated by `restic generate`" "" 
 .nh
-.TH restic backup(1)Jan 2017
+.ad l
-generated by \fB\fCrestic generate\fR
+
 
 .SH NAME
 .PP
@@ -49,7 +50,7 @@ option when initializing a new destination repository using the "init" command.
 
 .PP
 \fB\-\-repo2\fP=""
-	destination repository to copy snapshots to (default: $RESTIC\_REPOSITORY2)
+    destination \fB\fCrepository\fR to copy snapshots to (default: $RESTIC\_REPOSITORY2)
 
 .PP
 \fB\-\-tag\fP=[]
@@ -91,7 +92,7 @@ option when initializing a new destination repository using the "init" command.
 
 .PP
 \fB\-\-no\-lock\fP[=false]
-	do not lock the repo, this allows some operations on read\-only repos
+    do not lock the repository, this allows some operations on read\-only repositories
 
 .PP
 \fB\-o\fP, \fB\-\-option\fP=[]
@@ -113,13 +114,17 @@ option when initializing a new destination repository using the "init" command.
 \fB\-r\fP, \fB\-\-repo\fP=""
     \fB\fCrepository\fR to backup to or restore from (default: $RESTIC\_REPOSITORY)
 
+.PP
+\fB\-\-repository\-file\fP=""
+    \fB\fCfile\fR to read the repository location from (default: $RESTIC\_REPOSITORY\_FILE)
+
 .PP
 \fB\-\-tls\-client\-cert\fP=""
     path to a \fB\fCfile\fR containing PEM encoded TLS client certificate and private key
 
 .PP
 \fB\-v\fP, \fB\-\-verbose\fP[=0]
-	be verbose (specify \-\-verbose multiple times or level \-\-verbose=\fB\fCn\fR)
+    be verbose (specify multiple times or a level using \-\-verbose=\fB\fCn\fR, max level/times is 3)
 
 
 .SH SEE ALSO

doc/man/restic-diff.1

@@ -1,6 +1,7 @@
+.TH "restic backup" "1" "Jan 2017" "generated by `restic generate`" "" 
 .nh
-.TH restic backup(1)Jan 2017
+.ad l
-generated by \fB\fCrestic generate\fR
+
 
 .SH NAME
 .PP
@@ -83,7 +84,7 @@ Exit status is 0 if the command was successful, and non\-zero if there was any e
 
 .PP
 \fB\-\-no\-lock\fP[=false]
-	do not lock the repo, this allows some operations on read\-only repos
+    do not lock the repository, this allows some operations on read\-only repositories
 
 .PP
 \fB\-o\fP, \fB\-\-option\fP=[]
@@ -105,13 +106,17 @@ Exit status is 0 if the command was successful, and non\-zero if there was any e
 \fB\-r\fP, \fB\-\-repo\fP=""
     \fB\fCrepository\fR to backup to or restore from (default: $RESTIC\_REPOSITORY)
 
+.PP
+\fB\-\-repository\-file\fP=""
+    \fB\fCfile\fR to read the repository location from (default: $RESTIC\_REPOSITORY\_FILE)
+
 .PP
 \fB\-\-tls\-client\-cert\fP=""
     path to a \fB\fCfile\fR containing PEM encoded TLS client certificate and private key
 
 .PP
 \fB\-v\fP, \fB\-\-verbose\fP[=0]
-	be verbose (specify \-\-verbose multiple times or level \-\-verbose=\fB\fCn\fR)
+    be verbose (specify multiple times or a level using \-\-verbose=\fB\fCn\fR, max level/times is 3)
 
 
 .SH SEE ALSO

doc/man/restic-dump.1

@@ -1,6 +1,7 @@
+.TH "restic backup" "1" "Jan 2017" "generated by `restic generate`" "" 
 .nh
-.TH restic backup(1)Jan 2017
+.ad l
-generated by \fB\fCrestic generate\fR
+
 
 .SH NAME
 .PP
@@ -82,7 +83,7 @@ Exit status is 0 if the command was successful, and non\-zero if there was any e
 
 .PP
 \fB\-\-no\-lock\fP[=false]
-	do not lock the repo, this allows some operations on read\-only repos
+    do not lock the repository, this allows some operations on read\-only repositories
 
 .PP
 \fB\-o\fP, \fB\-\-option\fP=[]
@@ -104,13 +105,17 @@ Exit status is 0 if the command was successful, and non\-zero if there was any e
 \fB\-r\fP, \fB\-\-repo\fP=""
     \fB\fCrepository\fR to backup to or restore from (default: $RESTIC\_REPOSITORY)
 
+.PP
+\fB\-\-repository\-file\fP=""
+    \fB\fCfile\fR to read the repository location from (default: $RESTIC\_REPOSITORY\_FILE)
+
 .PP
 \fB\-\-tls\-client\-cert\fP=""
     path to a \fB\fCfile\fR containing PEM encoded TLS client certificate and private key
 
 .PP
 \fB\-v\fP, \fB\-\-verbose\fP[=0]
-	be verbose (specify \-\-verbose multiple times or level \-\-verbose=\fB\fCn\fR)
+    be verbose (specify multiple times or a level using \-\-verbose=\fB\fCn\fR, max level/times is 3)
 
 
 .SH SEE ALSO

doc/man/restic-find.1

@@ -1,6 +1,7 @@
+.TH "restic backup" "1" "Jan 2017" "generated by `restic generate`" "" 
 .nh
-.TH restic backup(1)Jan 2017
+.ad l
-generated by \fB\fCrestic generate\fR
+
 
 .SH NAME
 .PP
@@ -108,7 +109,7 @@ It can also be used to search for restic blobs or trees for troubleshooting.
 
 .PP
 \fB\-\-no\-lock\fP[=false]
-	do not lock the repo, this allows some operations on read\-only repos
+    do not lock the repository, this allows some operations on read\-only repositories
 
 .PP
 \fB\-o\fP, \fB\-\-option\fP=[]
@@ -130,13 +131,17 @@ It can also be used to search for restic blobs or trees for troubleshooting.
 \fB\-r\fP, \fB\-\-repo\fP=""
     \fB\fCrepository\fR to backup to or restore from (default: $RESTIC\_REPOSITORY)
 
+.PP
+\fB\-\-repository\-file\fP=""
+    \fB\fCfile\fR to read the repository location from (default: $RESTIC\_REPOSITORY\_FILE)
+
 .PP
 \fB\-\-tls\-client\-cert\fP=""
     path to a \fB\fCfile\fR containing PEM encoded TLS client certificate and private key
 
 .PP
 \fB\-v\fP, \fB\-\-verbose\fP[=0]
-	be verbose (specify \-\-verbose multiple times or level \-\-verbose=\fB\fCn\fR)
+    be verbose (specify multiple times or a level using \-\-verbose=\fB\fCn\fR, max level/times is 3)
 
 
 .SH EXAMPLE

doc/man/restic-forget.1

@@ -1,6 +1,7 @@
+.TH "restic backup" "1" "Jan 2017" "generated by `restic generate`" "" 
 .nh
-.TH restic backup(1)Jan 2017
+.ad l
-generated by \fB\fCrestic generate\fR
+
 
 .SH NAME
 .PP
@@ -72,7 +73,7 @@ Exit status is 0 if the command was successful, and non\-zero if there was any e
 
 .PP
 \fB\-c\fP, \fB\-\-compact\fP[=false]
-	use compact format
+    use compact output format
 
 .PP
 \fB\-g\fP, \fB\-\-group\-by\fP="host,paths"
@@ -126,7 +127,7 @@ Exit status is 0 if the command was successful, and non\-zero if there was any e
 
 .PP
 \fB\-\-no\-lock\fP[=false]
-	do not lock the repo, this allows some operations on read\-only repos
+    do not lock the repository, this allows some operations on read\-only repositories
 
 .PP
 \fB\-o\fP, \fB\-\-option\fP=[]
@@ -148,13 +149,17 @@ Exit status is 0 if the command was successful, and non\-zero if there was any e
 \fB\-r\fP, \fB\-\-repo\fP=""
     \fB\fCrepository\fR to backup to or restore from (default: $RESTIC\_REPOSITORY)
 
+.PP
+\fB\-\-repository\-file\fP=""
+    \fB\fCfile\fR to read the repository location from (default: $RESTIC\_REPOSITORY\_FILE)
+
 .PP
 \fB\-\-tls\-client\-cert\fP=""
     path to a \fB\fCfile\fR containing PEM encoded TLS client certificate and private key
 
 .PP
 \fB\-v\fP, \fB\-\-verbose\fP[=0]
-	be verbose (specify \-\-verbose multiple times or level \-\-verbose=\fB\fCn\fR)
+    be verbose (specify multiple times or a level using \-\-verbose=\fB\fCn\fR, max level/times is 3)
 
 
 .SH SEE ALSO

doc/man/restic-generate.1

@@ -1,6 +1,7 @@
+.TH "restic backup" "1" "Jan 2017" "generated by `restic generate`" "" 
 .nh
-.TH restic backup(1)Jan 2017
+.ad l
-generated by \fB\fCrestic generate\fR
+
 
 .SH NAME
 .PP
@@ -76,7 +77,7 @@ Exit status is 0 if the command was successful, and non\-zero if there was any e
 
 .PP
 \fB\-\-no\-lock\fP[=false]
-	do not lock the repo, this allows some operations on read\-only repos
+    do not lock the repository, this allows some operations on read\-only repositories
 
 .PP
 \fB\-o\fP, \fB\-\-option\fP=[]
@@ -98,13 +99,17 @@ Exit status is 0 if the command was successful, and non\-zero if there was any e
 \fB\-r\fP, \fB\-\-repo\fP=""
     \fB\fCrepository\fR to backup to or restore from (default: $RESTIC\_REPOSITORY)
 
+.PP
+\fB\-\-repository\-file\fP=""
+    \fB\fCfile\fR to read the repository location from (default: $RESTIC\_REPOSITORY\_FILE)
+
 .PP
 \fB\-\-tls\-client\-cert\fP=""
     path to a \fB\fCfile\fR containing PEM encoded TLS client certificate and private key
 
 .PP
 \fB\-v\fP, \fB\-\-verbose\fP[=0]
-	be verbose (specify \-\-verbose multiple times or level \-\-verbose=\fB\fCn\fR)
+    be verbose (specify multiple times or a level using \-\-verbose=\fB\fCn\fR, max level/times is 3)
 
 
 .SH SEE ALSO

doc/man/restic-init.1

@@ -1,6 +1,7 @@
+.TH "restic backup" "1" "Jan 2017" "generated by `restic generate`" "" 
 .nh
-.TH restic backup(1)Jan 2017
+.ad l
-generated by \fB\fCrestic generate\fR
+
 
 .SH NAME
 .PP
@@ -45,7 +46,7 @@ Exit status is 0 if the command was successful, and non\-zero if there was any e
 
 .PP
 \fB\-\-repo2\fP=""
-	secondary repository to copy chunker parameters from (default: $RESTIC\_REPOSITORY2)
+    secondary \fB\fCrepository\fR to copy chunker parameters from (default: $RESTIC\_REPOSITORY2)
 
 
 .SH OPTIONS INHERITED FROM PARENT COMMANDS
@@ -83,7 +84,7 @@ Exit status is 0 if the command was successful, and non\-zero if there was any e
 
 .PP
 \fB\-\-no\-lock\fP[=false]
-	do not lock the repo, this allows some operations on read\-only repos
+    do not lock the repository, this allows some operations on read\-only repositories
 
 .PP
 \fB\-o\fP, \fB\-\-option\fP=[]
@@ -105,13 +106,17 @@ Exit status is 0 if the command was successful, and non\-zero if there was any e
 \fB\-r\fP, \fB\-\-repo\fP=""
     \fB\fCrepository\fR to backup to or restore from (default: $RESTIC\_REPOSITORY)
 
+.PP
+\fB\-\-repository\-file\fP=""
+    \fB\fCfile\fR to read the repository location from (default: $RESTIC\_REPOSITORY\_FILE)
+
 .PP
 \fB\-\-tls\-client\-cert\fP=""
     path to a \fB\fCfile\fR containing PEM encoded TLS client certificate and private key
 
 .PP
 \fB\-v\fP, \fB\-\-verbose\fP[=0]
-	be verbose (specify \-\-verbose multiple times or level \-\-verbose=\fB\fCn\fR)
+    be verbose (specify multiple times or a level using \-\-verbose=\fB\fCn\fR, max level/times is 3)
 
 
 .SH SEE ALSO

doc/man/restic-key.1

@@ -1,6 +1,7 @@
+.TH "restic backup" "1" "Jan 2017" "generated by `restic generate`" "" 
 .nh
-.TH restic backup(1)Jan 2017
+.ad l
-generated by \fB\fCrestic generate\fR
+
 
 .SH NAME
 .PP
@@ -75,7 +76,7 @@ Exit status is 0 if the command was successful, and non\-zero if there was any e
 
 .PP
 \fB\-\-no\-lock\fP[=false]
-	do not lock the repo, this allows some operations on read\-only repos
+    do not lock the repository, this allows some operations on read\-only repositories
 
 .PP
 \fB\-o\fP, \fB\-\-option\fP=[]
@@ -97,13 +98,17 @@ Exit status is 0 if the command was successful, and non\-zero if there was any e
 \fB\-r\fP, \fB\-\-repo\fP=""
     \fB\fCrepository\fR to backup to or restore from (default: $RESTIC\_REPOSITORY)
 
+.PP
+\fB\-\-repository\-file\fP=""
+    \fB\fCfile\fR to read the repository location from (default: $RESTIC\_REPOSITORY\_FILE)
+
 .PP
 \fB\-\-tls\-client\-cert\fP=""
     path to a \fB\fCfile\fR containing PEM encoded TLS client certificate and private key
 
 .PP
 \fB\-v\fP, \fB\-\-verbose\fP[=0]
-	be verbose (specify \-\-verbose multiple times or level \-\-verbose=\fB\fCn\fR)
+    be verbose (specify multiple times or a level using \-\-verbose=\fB\fCn\fR, max level/times is 3)
 
 
 .SH SEE ALSO

doc/man/restic-list.1

@@ -1,6 +1,7 @@
+.TH "restic backup" "1" "Jan 2017" "generated by `restic generate`" "" 
 .nh
-.TH restic backup(1)Jan 2017
+.ad l
-generated by \fB\fCrestic generate\fR
+
 
 .SH NAME
 .PP
@@ -63,7 +64,7 @@ Exit status is 0 if the command was successful, and non\-zero if there was any e
 
 .PP
 \fB\-\-no\-lock\fP[=false]
-	do not lock the repo, this allows some operations on read\-only repos
+    do not lock the repository, this allows some operations on read\-only repositories
 
 .PP
 \fB\-o\fP, \fB\-\-option\fP=[]
@@ -85,13 +86,17 @@ Exit status is 0 if the command was successful, and non\-zero if there was any e
 \fB\-r\fP, \fB\-\-repo\fP=""
     \fB\fCrepository\fR to backup to or restore from (default: $RESTIC\_REPOSITORY)
 
+.PP
+\fB\-\-repository\-file\fP=""
+    \fB\fCfile\fR to read the repository location from (default: $RESTIC\_REPOSITORY\_FILE)
+
 .PP
 \fB\-\-tls\-client\-cert\fP=""
     path to a \fB\fCfile\fR containing PEM encoded TLS client certificate and private key
 
 .PP
 \fB\-v\fP, \fB\-\-verbose\fP[=0]
-	be verbose (specify \-\-verbose multiple times or level \-\-verbose=\fB\fCn\fR)
+    be verbose (specify multiple times or a level using \-\-verbose=\fB\fCn\fR, max level/times is 3)
 
 
 .SH SEE ALSO

doc/man/restic-ls.1

@@ -1,6 +1,7 @@
+.TH "restic backup" "1" "Jan 2017" "generated by `restic generate`" "" 
 .nh
-.TH restic backup(1)Jan 2017
+.ad l
-generated by \fB\fCrestic generate\fR
+
 
 .SH NAME
 .PP
@@ -98,7 +99,7 @@ Exit status is 0 if the command was successful, and non\-zero if there was any e
 
 .PP
 \fB\-\-no\-lock\fP[=false]
-	do not lock the repo, this allows some operations on read\-only repos
+    do not lock the repository, this allows some operations on read\-only repositories
 
 .PP
 \fB\-o\fP, \fB\-\-option\fP=[]
@@ -120,13 +121,17 @@ Exit status is 0 if the command was successful, and non\-zero if there was any e
 \fB\-r\fP, \fB\-\-repo\fP=""
     \fB\fCrepository\fR to backup to or restore from (default: $RESTIC\_REPOSITORY)
 
+.PP
+\fB\-\-repository\-file\fP=""
+    \fB\fCfile\fR to read the repository location from (default: $RESTIC\_REPOSITORY\_FILE)
+
 .PP
 \fB\-\-tls\-client\-cert\fP=""
     path to a \fB\fCfile\fR containing PEM encoded TLS client certificate and private key
 
 .PP
 \fB\-v\fP, \fB\-\-verbose\fP[=0]
-	be verbose (specify \-\-verbose multiple times or level \-\-verbose=\fB\fCn\fR)
+    be verbose (specify multiple times or a level using \-\-verbose=\fB\fCn\fR, max level/times is 3)
 
 
 .SH SEE ALSO

doc/man/restic-migrate.1

@@ -1,6 +1,7 @@
+.TH "restic backup" "1" "Jan 2017" "generated by `restic generate`" "" 
 .nh
-.TH restic backup(1)Jan 2017
+.ad l
-generated by \fB\fCrestic generate\fR
+
 
 .SH NAME
 .PP
@@ -68,7 +69,7 @@ Exit status is 0 if the command was successful, and non\-zero if there was any e
 
 .PP
 \fB\-\-no\-lock\fP[=false]
-	do not lock the repo, this allows some operations on read\-only repos
+    do not lock the repository, this allows some operations on read\-only repositories
 
 .PP
 \fB\-o\fP, \fB\-\-option\fP=[]
@@ -90,13 +91,17 @@ Exit status is 0 if the command was successful, and non\-zero if there was any e
 \fB\-r\fP, \fB\-\-repo\fP=""
     \fB\fCrepository\fR to backup to or restore from (default: $RESTIC\_REPOSITORY)
 
+.PP
+\fB\-\-repository\-file\fP=""
+    \fB\fCfile\fR to read the repository location from (default: $RESTIC\_REPOSITORY\_FILE)
+
 .PP
 \fB\-\-tls\-client\-cert\fP=""
     path to a \fB\fCfile\fR containing PEM encoded TLS client certificate and private key
 
 .PP
 \fB\-v\fP, \fB\-\-verbose\fP[=0]
-	be verbose (specify \-\-verbose multiple times or level \-\-verbose=\fB\fCn\fR)
+    be verbose (specify multiple times or a level using \-\-verbose=\fB\fCn\fR, max level/times is 3)
 
 
 .SH SEE ALSO

doc/man/restic-mount.1

@@ -1,6 +1,7 @@
+.TH "restic backup" "1" "Jan 2017" "generated by `restic generate`" "" 
 .nh
-.TH restic backup(1)Jan 2017
+.ad l
-generated by \fB\fCrestic generate\fR
+
 
 .SH NAME
 .PP
@@ -46,7 +47,8 @@ Mon Jan 2 15:04:05 \-0700 MST 2006
 
 .PP
 For details please see the documentation for time.Format() at:
-  https://godoc.org/time#Time.Format
+  
+\[la]https://godoc.org/time#Time.Format\[ra]
 
 
 .SH EXIT STATUS
@@ -123,7 +125,7 @@ Exit status is 0 if the command was successful, and non\-zero if there was any e
 
 .PP
 \fB\-\-no\-lock\fP[=false]
-	do not lock the repo, this allows some operations on read\-only repos
+    do not lock the repository, this allows some operations on read\-only repositories
 
 .PP
 \fB\-o\fP, \fB\-\-option\fP=[]
@@ -145,13 +147,17 @@ Exit status is 0 if the command was successful, and non\-zero if there was any e
 \fB\-r\fP, \fB\-\-repo\fP=""
     \fB\fCrepository\fR to backup to or restore from (default: $RESTIC\_REPOSITORY)
 
+.PP
+\fB\-\-repository\-file\fP=""
+    \fB\fCfile\fR to read the repository location from (default: $RESTIC\_REPOSITORY\_FILE)
+
 .PP
 \fB\-\-tls\-client\-cert\fP=""
     path to a \fB\fCfile\fR containing PEM encoded TLS client certificate and private key
 
 .PP
 \fB\-v\fP, \fB\-\-verbose\fP[=0]
-	be verbose (specify \-\-verbose multiple times or level \-\-verbose=\fB\fCn\fR)
+    be verbose (specify multiple times or a level using \-\-verbose=\fB\fCn\fR, max level/times is 3)
 
 
 .SH SEE ALSO

doc/man/restic-prune.1

@@ -1,6 +1,7 @@
+.TH "restic backup" "1" "Jan 2017" "generated by `restic generate`" "" 
 .nh
-.TH restic backup(1)Jan 2017
+.ad l
-generated by \fB\fCrestic generate\fR
+
 
 .SH NAME
 .PP
@@ -64,7 +65,7 @@ Exit status is 0 if the command was successful, and non\-zero if there was any e
 
 .PP
 \fB\-\-no\-lock\fP[=false]
-	do not lock the repo, this allows some operations on read\-only repos
+    do not lock the repository, this allows some operations on read\-only repositories
 
 .PP
 \fB\-o\fP, \fB\-\-option\fP=[]
@@ -86,13 +87,17 @@ Exit status is 0 if the command was successful, and non\-zero if there was any e
 \fB\-r\fP, \fB\-\-repo\fP=""
     \fB\fCrepository\fR to backup to or restore from (default: $RESTIC\_REPOSITORY)
 
+.PP
+\fB\-\-repository\-file\fP=""
+    \fB\fCfile\fR to read the repository location from (default: $RESTIC\_REPOSITORY\_FILE)
+
 .PP
 \fB\-\-tls\-client\-cert\fP=""
     path to a \fB\fCfile\fR containing PEM encoded TLS client certificate and private key
 
 .PP
 \fB\-v\fP, \fB\-\-verbose\fP[=0]
-	be verbose (specify \-\-verbose multiple times or level \-\-verbose=\fB\fCn\fR)
+    be verbose (specify multiple times or a level using \-\-verbose=\fB\fCn\fR, max level/times is 3)
 
 
 .SH SEE ALSO

doc/man/restic-rebuild-index.1

@@ -1,6 +1,7 @@
+.TH "restic backup" "1" "Jan 2017" "generated by `restic generate`" "" 
 .nh
-.TH restic backup(1)Jan 2017
+.ad l
-generated by \fB\fCrestic generate\fR
+
 
 .SH NAME
 .PP
@@ -64,7 +65,7 @@ Exit status is 0 if the command was successful, and non\-zero if there was any e
 
 .PP
 \fB\-\-no\-lock\fP[=false]
-	do not lock the repo, this allows some operations on read\-only repos
+    do not lock the repository, this allows some operations on read\-only repositories
 
 .PP
 \fB\-o\fP, \fB\-\-option\fP=[]
@@ -86,13 +87,17 @@ Exit status is 0 if the command was successful, and non\-zero if there was any e
 \fB\-r\fP, \fB\-\-repo\fP=""
     \fB\fCrepository\fR to backup to or restore from (default: $RESTIC\_REPOSITORY)
 
+.PP
+\fB\-\-repository\-file\fP=""
+    \fB\fCfile\fR to read the repository location from (default: $RESTIC\_REPOSITORY\_FILE)
+
 .PP
 \fB\-\-tls\-client\-cert\fP=""
     path to a \fB\fCfile\fR containing PEM encoded TLS client certificate and private key
 
 .PP
 \fB\-v\fP, \fB\-\-verbose\fP[=0]
-	be verbose (specify \-\-verbose multiple times or level \-\-verbose=\fB\fCn\fR)
+    be verbose (specify multiple times or a level using \-\-verbose=\fB\fCn\fR, max level/times is 3)
 
 
 .SH SEE ALSO

doc/man/restic-recover.1

@@ -1,6 +1,7 @@
+.TH "restic backup" "1" "Jan 2017" "generated by `restic generate`" "" 
 .nh
-.TH restic backup(1)Jan 2017
+.ad l
-generated by \fB\fCrestic generate\fR
+
 
 .SH NAME
 .PP
@@ -14,7 +15,7 @@ restic\-recover \- Recover data from the repository
 
 .SH DESCRIPTION
 .PP
-The "recover" command build a new snapshot from all directories it can find in
+The "recover" command builds a new snapshot from all directories it can find in
 the raw data of the repository. It can be used if, for example, a snapshot has
 been removed by accident with "forget".
 
@@ -65,7 +66,7 @@ Exit status is 0 if the command was successful, and non\-zero if there was any e
 
 .PP
 \fB\-\-no\-lock\fP[=false]
-	do not lock the repo, this allows some operations on read\-only repos
+    do not lock the repository, this allows some operations on read\-only repositories
 
 .PP
 \fB\-o\fP, \fB\-\-option\fP=[]
@@ -87,13 +88,17 @@ Exit status is 0 if the command was successful, and non\-zero if there was any e
 \fB\-r\fP, \fB\-\-repo\fP=""
     \fB\fCrepository\fR to backup to or restore from (default: $RESTIC\_REPOSITORY)
 
+.PP
+\fB\-\-repository\-file\fP=""
+    \fB\fCfile\fR to read the repository location from (default: $RESTIC\_REPOSITORY\_FILE)
+
 .PP
 \fB\-\-tls\-client\-cert\fP=""
     path to a \fB\fCfile\fR containing PEM encoded TLS client certificate and private key
 
 .PP
 \fB\-v\fP, \fB\-\-verbose\fP[=0]
-	be verbose (specify \-\-verbose multiple times or level \-\-verbose=\fB\fCn\fR)
+    be verbose (specify multiple times or a level using \-\-verbose=\fB\fCn\fR, max level/times is 3)
 
 
 .SH SEE ALSO

doc/man/restic-restore.1

@@ -1,6 +1,7 @@
+.TH "restic backup" "1" "Jan 2017" "generated by `restic generate`" "" 
 .nh
-.TH restic backup(1)Jan 2017
+.ad l
-generated by \fB\fCrestic generate\fR
+
 
 .SH NAME
 .PP
@@ -104,7 +105,7 @@ Exit status is 0 if the command was successful, and non\-zero if there was any e
 
 .PP
 \fB\-\-no\-lock\fP[=false]
-	do not lock the repo, this allows some operations on read\-only repos
+    do not lock the repository, this allows some operations on read\-only repositories
 
 .PP
 \fB\-o\fP, \fB\-\-option\fP=[]
@@ -126,13 +127,17 @@ Exit status is 0 if the command was successful, and non\-zero if there was any e
 \fB\-r\fP, \fB\-\-repo\fP=""
     \fB\fCrepository\fR to backup to or restore from (default: $RESTIC\_REPOSITORY)
 
+.PP
+\fB\-\-repository\-file\fP=""
+    \fB\fCfile\fR to read the repository location from (default: $RESTIC\_REPOSITORY\_FILE)
+
 .PP
 \fB\-\-tls\-client\-cert\fP=""
     path to a \fB\fCfile\fR containing PEM encoded TLS client certificate and private key
 
 .PP
 \fB\-v\fP, \fB\-\-verbose\fP[=0]
-	be verbose (specify \-\-verbose multiple times or level \-\-verbose=\fB\fCn\fR)
+    be verbose (specify multiple times or a level using \-\-verbose=\fB\fCn\fR, max level/times is 3)
 
 
 .SH SEE ALSO

doc/man/restic-self-update.1

@@ -1,6 +1,7 @@
+.TH "restic backup" "1" "Jan 2017" "generated by `restic generate`" "" 
 .nh
-.TH restic backup(1)Jan 2017
+.ad l
-generated by \fB\fCrestic generate\fR
+
 
 .SH NAME
 .PP
@@ -70,7 +71,7 @@ Exit status is 0 if the command was successful, and non\-zero if there was any e
 
 .PP
 \fB\-\-no\-lock\fP[=false]
-	do not lock the repo, this allows some operations on read\-only repos
+    do not lock the repository, this allows some operations on read\-only repositories
 
 .PP
 \fB\-o\fP, \fB\-\-option\fP=[]
@@ -92,13 +93,17 @@ Exit status is 0 if the command was successful, and non\-zero if there was any e
 \fB\-r\fP, \fB\-\-repo\fP=""
     \fB\fCrepository\fR to backup to or restore from (default: $RESTIC\_REPOSITORY)
 
+.PP
+\fB\-\-repository\-file\fP=""
+    \fB\fCfile\fR to read the repository location from (default: $RESTIC\_REPOSITORY\_FILE)
+
 .PP
 \fB\-\-tls\-client\-cert\fP=""
     path to a \fB\fCfile\fR containing PEM encoded TLS client certificate and private key
 
 .PP
 \fB\-v\fP, \fB\-\-verbose\fP[=0]
-	be verbose (specify \-\-verbose multiple times or level \-\-verbose=\fB\fCn\fR)
+    be verbose (specify multiple times or a level using \-\-verbose=\fB\fCn\fR, max level/times is 3)
 
 
 .SH SEE ALSO

doc/man/restic-snapshots.1

@@ -1,6 +1,7 @@
+.TH "restic backup" "1" "Jan 2017" "generated by `restic generate`" "" 
 .nh
-.TH restic backup(1)Jan 2017
+.ad l
-generated by \fB\fCrestic generate\fR
+
 
 .SH NAME
 .PP
@@ -25,7 +26,7 @@ Exit status is 0 if the command was successful, and non\-zero if there was any e
 .SH OPTIONS
 .PP
 \fB\-c\fP, \fB\-\-compact\fP[=false]
-	use compact format
+    use compact output format
 
 .PP
 \fB\-g\fP, \fB\-\-group\-by\fP=""
@@ -87,7 +88,7 @@ Exit status is 0 if the command was successful, and non\-zero if there was any e
 
 .PP
 \fB\-\-no\-lock\fP[=false]
-	do not lock the repo, this allows some operations on read\-only repos
+    do not lock the repository, this allows some operations on read\-only repositories
 
 .PP
 \fB\-o\fP, \fB\-\-option\fP=[]
@@ -109,13 +110,17 @@ Exit status is 0 if the command was successful, and non\-zero if there was any e
 \fB\-r\fP, \fB\-\-repo\fP=""
     \fB\fCrepository\fR to backup to or restore from (default: $RESTIC\_REPOSITORY)
 
+.PP
+\fB\-\-repository\-file\fP=""
+    \fB\fCfile\fR to read the repository location from (default: $RESTIC\_REPOSITORY\_FILE)
+
 .PP
 \fB\-\-tls\-client\-cert\fP=""
     path to a \fB\fCfile\fR containing PEM encoded TLS client certificate and private key
 
 .PP
 \fB\-v\fP, \fB\-\-verbose\fP[=0]
-	be verbose (specify \-\-verbose multiple times or level \-\-verbose=\fB\fCn\fR)
+    be verbose (specify multiple times or a level using \-\-verbose=\fB\fCn\fR, max level/times is 3)
 
 
 .SH SEE ALSO

doc/man/restic-stats.1

@@ -1,6 +1,7 @@
+.TH "restic backup" "1" "Jan 2017" "generated by `restic generate`" "" 
 .nh
-.TH restic backup(1)Jan 2017
+.ad l
-generated by \fB\fCrestic generate\fR
+
 
 .SH NAME
 .PP
@@ -109,7 +110,7 @@ Exit status is 0 if the command was successful, and non\-zero if there was any e
 
 .PP
 \fB\-\-no\-lock\fP[=false]
-	do not lock the repo, this allows some operations on read\-only repos
+    do not lock the repository, this allows some operations on read\-only repositories
 
 .PP
 \fB\-o\fP, \fB\-\-option\fP=[]
@@ -131,13 +132,17 @@ Exit status is 0 if the command was successful, and non\-zero if there was any e
 \fB\-r\fP, \fB\-\-repo\fP=""
     \fB\fCrepository\fR to backup to or restore from (default: $RESTIC\_REPOSITORY)
 
+.PP
+\fB\-\-repository\-file\fP=""
+    \fB\fCfile\fR to read the repository location from (default: $RESTIC\_REPOSITORY\_FILE)
+
 .PP
 \fB\-\-tls\-client\-cert\fP=""
     path to a \fB\fCfile\fR containing PEM encoded TLS client certificate and private key
 
 .PP
 \fB\-v\fP, \fB\-\-verbose\fP[=0]
-	be verbose (specify \-\-verbose multiple times or level \-\-verbose=\fB\fCn\fR)
+    be verbose (specify multiple times or a level using \-\-verbose=\fB\fCn\fR, max level/times is 3)
 
 
 .SH SEE ALSO

doc/man/restic-tag.1

@@ -1,6 +1,7 @@
+.TH "restic backup" "1" "Jan 2017" "generated by `restic generate`" "" 
 .nh
-.TH restic backup(1)Jan 2017
+.ad l
-generated by \fB\fCrestic generate\fR
+
 
 .SH NAME
 .PP
@@ -94,7 +95,7 @@ Exit status is 0 if the command was successful, and non\-zero if there was any e
 
 .PP
 \fB\-\-no\-lock\fP[=false]
-	do not lock the repo, this allows some operations on read\-only repos
+    do not lock the repository, this allows some operations on read\-only repositories
 
 .PP
 \fB\-o\fP, \fB\-\-option\fP=[]
@@ -116,13 +117,17 @@ Exit status is 0 if the command was successful, and non\-zero if there was any e
 \fB\-r\fP, \fB\-\-repo\fP=""
     \fB\fCrepository\fR to backup to or restore from (default: $RESTIC\_REPOSITORY)
 
+.PP
+\fB\-\-repository\-file\fP=""
+    \fB\fCfile\fR to read the repository location from (default: $RESTIC\_REPOSITORY\_FILE)
+
 .PP
 \fB\-\-tls\-client\-cert\fP=""
     path to a \fB\fCfile\fR containing PEM encoded TLS client certificate and private key
 
 .PP
 \fB\-v\fP, \fB\-\-verbose\fP[=0]
-	be verbose (specify \-\-verbose multiple times or level \-\-verbose=\fB\fCn\fR)
+    be verbose (specify multiple times or a level using \-\-verbose=\fB\fCn\fR, max level/times is 3)
 
 
 .SH SEE ALSO

doc/man/restic-unlock.1

@@ -1,6 +1,7 @@
+.TH "restic backup" "1" "Jan 2017" "generated by `restic generate`" "" 
 .nh
-.TH restic backup(1)Jan 2017
+.ad l
-generated by \fB\fCrestic generate\fR
+
 
 .SH NAME
 .PP
@@ -67,7 +68,7 @@ Exit status is 0 if the command was successful, and non\-zero if there was any e
 
 .PP
 \fB\-\-no\-lock\fP[=false]
-	do not lock the repo, this allows some operations on read\-only repos
+    do not lock the repository, this allows some operations on read\-only repositories
 
 .PP
 \fB\-o\fP, \fB\-\-option\fP=[]
@@ -89,13 +90,17 @@ Exit status is 0 if the command was successful, and non\-zero if there was any e
 \fB\-r\fP, \fB\-\-repo\fP=""
     \fB\fCrepository\fR to backup to or restore from (default: $RESTIC\_REPOSITORY)
 
+.PP
+\fB\-\-repository\-file\fP=""
+    \fB\fCfile\fR to read the repository location from (default: $RESTIC\_REPOSITORY\_FILE)
+
 .PP
 \fB\-\-tls\-client\-cert\fP=""
     path to a \fB\fCfile\fR containing PEM encoded TLS client certificate and private key
 
 .PP
 \fB\-v\fP, \fB\-\-verbose\fP[=0]
-	be verbose (specify \-\-verbose multiple times or level \-\-verbose=\fB\fCn\fR)
+    be verbose (specify multiple times or a level using \-\-verbose=\fB\fCn\fR, max level/times is 3)
 
 
 .SH SEE ALSO

doc/man/restic-version.1

@@ -1,6 +1,7 @@
+.TH "restic backup" "1" "Jan 2017" "generated by `restic generate`" "" 
 .nh
-.TH restic backup(1)Jan 2017
+.ad l
-generated by \fB\fCrestic generate\fR
+
 
 .SH NAME
 .PP
@@ -64,7 +65,7 @@ Exit status is 0 if the command was successful, and non\-zero if there was any e
 
 .PP
 \fB\-\-no\-lock\fP[=false]
-	do not lock the repo, this allows some operations on read\-only repos
+    do not lock the repository, this allows some operations on read\-only repositories
 
 .PP
 \fB\-o\fP, \fB\-\-option\fP=[]
@@ -86,13 +87,17 @@ Exit status is 0 if the command was successful, and non\-zero if there was any e
 \fB\-r\fP, \fB\-\-repo\fP=""
     \fB\fCrepository\fR to backup to or restore from (default: $RESTIC\_REPOSITORY)
 
+.PP
+\fB\-\-repository\-file\fP=""
+    \fB\fCfile\fR to read the repository location from (default: $RESTIC\_REPOSITORY\_FILE)
+
 .PP
 \fB\-\-tls\-client\-cert\fP=""
     path to a \fB\fCfile\fR containing PEM encoded TLS client certificate and private key
 
 .PP
 \fB\-v\fP, \fB\-\-verbose\fP[=0]
-	be verbose (specify \-\-verbose multiple times or level \-\-verbose=\fB\fCn\fR)
+    be verbose (specify multiple times or a level using \-\-verbose=\fB\fCn\fR, max level/times is 3)
 
 
 .SH SEE ALSO

doc/man/restic.1

@@ -1,6 +1,7 @@
+.TH "restic backup" "1" "Jan 2017" "generated by `restic generate`" "" 
 .nh
-.TH restic backup(1)Jan 2017
+.ad l
-generated by \fB\fCrestic generate\fR
+
 
 .SH NAME
 .PP
@@ -57,7 +58,7 @@ directories in an encrypted repository stored on different backends.
 
 .PP
 \fB\-\-no\-lock\fP[=false]
-	do not lock the repo, this allows some operations on read\-only repos
+    do not lock the repository, this allows some operations on read\-only repositories
 
 .PP
 \fB\-o\fP, \fB\-\-option\fP=[]
@@ -79,13 +80,17 @@ directories in an encrypted repository stored on different backends.
 \fB\-r\fP, \fB\-\-repo\fP=""
     \fB\fCrepository\fR to backup to or restore from (default: $RESTIC\_REPOSITORY)
 
+.PP
+\fB\-\-repository\-file\fP=""
+    \fB\fCfile\fR to read the repository location from (default: $RESTIC\_REPOSITORY\_FILE)
+
 .PP
 \fB\-\-tls\-client\-cert\fP=""
     path to a \fB\fCfile\fR containing PEM encoded TLS client certificate and private key
 
 .PP
 \fB\-v\fP, \fB\-\-verbose\fP[=0]
-	be verbose (specify \-\-verbose multiple times or level \-\-verbose=\fB\fCn\fR)
+    be verbose (specify multiple times or a level using \-\-verbose=\fB\fCn\fR, max level/times is 3)
 
 
 .SH SEE ALSO

doc/zsh-completion.zsh

@@ -14,14 +14,15 @@ function _restic {
     '--limit-download[limits downloads to a maximum rate in KiB/s. (default: unlimited)]:' \
     '--limit-upload[limits uploads to a maximum rate in KiB/s. (default: unlimited)]:' \
     '--no-cache[do not use a local cache]' \
-    '--no-lock[do not lock the repo, this allows some operations on read-only repos]' \
+    '--no-lock[do not lock the repository, this allows some operations on read-only repositories]' \
     '(*-o *--option)'{\*-o,\*--option}'[set extended option (`key=value`, can be specified multiple times)]:' \
     '--password-command[shell `command` to obtain the repository password from (default: $RESTIC_PASSWORD_COMMAND)]:' \
     '(-p --password-file)'{-p,--password-file}'[`file` to read the repository password from (default: $RESTIC_PASSWORD_FILE)]:' \
     '(-q --quiet)'{-q,--quiet}'[do not output comprehensive progress report]' \
     '(-r --repo)'{-r,--repo}'[`repository` to backup to or restore from (default: $RESTIC_REPOSITORY)]:' \
+    '--repository-file[`file` to read the repository location from (default: $RESTIC_REPOSITORY_FILE)]:' \
     '--tls-client-cert[path to a `file` containing PEM encoded TLS client certificate and private key]:' \
-    '(-v --verbose)'{-v,--verbose}'[be verbose (specify --verbose multiple times or level --verbose=`n`)]' \
+    '(-v --verbose)'{-v,--verbose}'[be verbose (specify multiple times or a level using --verbose=`n`, max level/times is 3)]' \
     "1: :->cmnds" \
     "*::arg:->args"
 
@@ -174,14 +175,15 @@ function _restic_backup {
     '--limit-download[limits downloads to a maximum rate in KiB/s. (default: unlimited)]:' \
     '--limit-upload[limits uploads to a maximum rate in KiB/s. (default: unlimited)]:' \
     '--no-cache[do not use a local cache]' \
-    '--no-lock[do not lock the repo, this allows some operations on read-only repos]' \
+    '--no-lock[do not lock the repository, this allows some operations on read-only repositories]' \
     '(*-o *--option)'{\*-o,\*--option}'[set extended option (`key=value`, can be specified multiple times)]:' \
     '--password-command[shell `command` to obtain the repository password from (default: $RESTIC_PASSWORD_COMMAND)]:' \
     '(-p --password-file)'{-p,--password-file}'[`file` to read the repository password from (default: $RESTIC_PASSWORD_FILE)]:' \
     '(-q --quiet)'{-q,--quiet}'[do not output comprehensive progress report]' \
     '(-r --repo)'{-r,--repo}'[`repository` to backup to or restore from (default: $RESTIC_REPOSITORY)]:' \
+    '--repository-file[`file` to read the repository location from (default: $RESTIC_REPOSITORY_FILE)]:' \
     '--tls-client-cert[path to a `file` containing PEM encoded TLS client certificate and private key]:' \
-    '(-v --verbose)'{-v,--verbose}'[be verbose (specify --verbose multiple times or level --verbose=`n`)]'
+    '(-v --verbose)'{-v,--verbose}'[be verbose (specify multiple times or a level using --verbose=`n`, max level/times is 3)]'
 }
 
 function _restic_cache {
@@ -198,14 +200,15 @@ function _restic_cache {
     '--limit-download[limits downloads to a maximum rate in KiB/s. (default: unlimited)]:' \
     '--limit-upload[limits uploads to a maximum rate in KiB/s. (default: unlimited)]:' \
     '--no-cache[do not use a local cache]' \
-    '--no-lock[do not lock the repo, this allows some operations on read-only repos]' \
+    '--no-lock[do not lock the repository, this allows some operations on read-only repositories]' \
     '(*-o *--option)'{\*-o,\*--option}'[set extended option (`key=value`, can be specified multiple times)]:' \
     '--password-command[shell `command` to obtain the repository password from (default: $RESTIC_PASSWORD_COMMAND)]:' \
     '(-p --password-file)'{-p,--password-file}'[`file` to read the repository password from (default: $RESTIC_PASSWORD_FILE)]:' \
     '(-q --quiet)'{-q,--quiet}'[do not output comprehensive progress report]' \
     '(-r --repo)'{-r,--repo}'[`repository` to backup to or restore from (default: $RESTIC_REPOSITORY)]:' \
+    '--repository-file[`file` to read the repository location from (default: $RESTIC_REPOSITORY_FILE)]:' \
     '--tls-client-cert[path to a `file` containing PEM encoded TLS client certificate and private key]:' \
-    '(-v --verbose)'{-v,--verbose}'[be verbose (specify --verbose multiple times or level --verbose=`n`)]'
+    '(-v --verbose)'{-v,--verbose}'[be verbose (specify multiple times or a level using --verbose=`n`, max level/times is 3)]'
 }
 
 function _restic_cat {
@@ -219,14 +222,15 @@ function _restic_cat {
     '--limit-download[limits downloads to a maximum rate in KiB/s. (default: unlimited)]:' \
     '--limit-upload[limits uploads to a maximum rate in KiB/s. (default: unlimited)]:' \
     '--no-cache[do not use a local cache]' \
-    '--no-lock[do not lock the repo, this allows some operations on read-only repos]' \
+    '--no-lock[do not lock the repository, this allows some operations on read-only repositories]' \
     '(*-o *--option)'{\*-o,\*--option}'[set extended option (`key=value`, can be specified multiple times)]:' \
     '--password-command[shell `command` to obtain the repository password from (default: $RESTIC_PASSWORD_COMMAND)]:' \
     '(-p --password-file)'{-p,--password-file}'[`file` to read the repository password from (default: $RESTIC_PASSWORD_FILE)]:' \
     '(-q --quiet)'{-q,--quiet}'[do not output comprehensive progress report]' \
     '(-r --repo)'{-r,--repo}'[`repository` to backup to or restore from (default: $RESTIC_REPOSITORY)]:' \
+    '--repository-file[`file` to read the repository location from (default: $RESTIC_REPOSITORY_FILE)]:' \
     '--tls-client-cert[path to a `file` containing PEM encoded TLS client certificate and private key]:' \
-    '(-v --verbose)'{-v,--verbose}'[be verbose (specify --verbose multiple times or level --verbose=`n`)]'
+    '(-v --verbose)'{-v,--verbose}'[be verbose (specify multiple times or a level using --verbose=`n`, max level/times is 3)]'
 }
 
 function _restic_check {
@@ -244,14 +248,15 @@ function _restic_check {
     '--limit-download[limits downloads to a maximum rate in KiB/s. (default: unlimited)]:' \
     '--limit-upload[limits uploads to a maximum rate in KiB/s. (default: unlimited)]:' \
     '--no-cache[do not use a local cache]' \
-    '--no-lock[do not lock the repo, this allows some operations on read-only repos]' \
+    '--no-lock[do not lock the repository, this allows some operations on read-only repositories]' \
     '(*-o *--option)'{\*-o,\*--option}'[set extended option (`key=value`, can be specified multiple times)]:' \
     '--password-command[shell `command` to obtain the repository password from (default: $RESTIC_PASSWORD_COMMAND)]:' \
     '(-p --password-file)'{-p,--password-file}'[`file` to read the repository password from (default: $RESTIC_PASSWORD_FILE)]:' \
     '(-q --quiet)'{-q,--quiet}'[do not output comprehensive progress report]' \
     '(-r --repo)'{-r,--repo}'[`repository` to backup to or restore from (default: $RESTIC_REPOSITORY)]:' \
+    '--repository-file[`file` to read the repository location from (default: $RESTIC_REPOSITORY_FILE)]:' \
     '--tls-client-cert[path to a `file` containing PEM encoded TLS client certificate and private key]:' \
-    '(-v --verbose)'{-v,--verbose}'[be verbose (specify --verbose multiple times or level --verbose=`n`)]'
+    '(-v --verbose)'{-v,--verbose}'[be verbose (specify multiple times or a level using --verbose=`n`, max level/times is 3)]'
 }
 
 function _restic_copy {
@@ -262,7 +267,7 @@ function _restic_copy {
     '--password-command2[shell `command` to obtain the destination repository password from (default: $RESTIC_PASSWORD_COMMAND2)]:' \
     '--password-file2[`file` to read the destination repository password from (default: $RESTIC_PASSWORD_FILE2)]:' \
     '*--path[only consider snapshots which include this (absolute) `path`, when no snapshot ID is given]:' \
-    '--repo2[destination repository to copy snapshots to (default: $RESTIC_REPOSITORY2)]:' \
+    '--repo2[destination `repository` to copy snapshots to (default: $RESTIC_REPOSITORY2)]:' \
     '--tag[only consider snapshots which include this `taglist`, when no snapshot ID is given]:' \
     '*--cacert[`file` to load root certificates from (default: use system certificates)]:' \
     '--cache-dir[set the cache `directory`. (default: use system default cache directory)]:' \
@@ -272,14 +277,15 @@ function _restic_copy {
     '--limit-download[limits downloads to a maximum rate in KiB/s. (default: unlimited)]:' \
     '--limit-upload[limits uploads to a maximum rate in KiB/s. (default: unlimited)]:' \
     '--no-cache[do not use a local cache]' \
-    '--no-lock[do not lock the repo, this allows some operations on read-only repos]' \
+    '--no-lock[do not lock the repository, this allows some operations on read-only repositories]' \
     '(*-o *--option)'{\*-o,\*--option}'[set extended option (`key=value`, can be specified multiple times)]:' \
     '--password-command[shell `command` to obtain the repository password from (default: $RESTIC_PASSWORD_COMMAND)]:' \
     '(-p --password-file)'{-p,--password-file}'[`file` to read the repository password from (default: $RESTIC_PASSWORD_FILE)]:' \
     '(-q --quiet)'{-q,--quiet}'[do not output comprehensive progress report]' \
     '(-r --repo)'{-r,--repo}'[`repository` to backup to or restore from (default: $RESTIC_REPOSITORY)]:' \
+    '--repository-file[`file` to read the repository location from (default: $RESTIC_REPOSITORY_FILE)]:' \
     '--tls-client-cert[path to a `file` containing PEM encoded TLS client certificate and private key]:' \
-    '(-v --verbose)'{-v,--verbose}'[be verbose (specify --verbose multiple times or level --verbose=`n`)]'
+    '(-v --verbose)'{-v,--verbose}'[be verbose (specify multiple times or a level using --verbose=`n`, max level/times is 3)]'
 }
 
 function _restic_diff {
@@ -294,14 +300,15 @@ function _restic_diff {
     '--limit-download[limits downloads to a maximum rate in KiB/s. (default: unlimited)]:' \
     '--limit-upload[limits uploads to a maximum rate in KiB/s. (default: unlimited)]:' \
     '--no-cache[do not use a local cache]' \
-    '--no-lock[do not lock the repo, this allows some operations on read-only repos]' \
+    '--no-lock[do not lock the repository, this allows some operations on read-only repositories]' \
     '(*-o *--option)'{\*-o,\*--option}'[set extended option (`key=value`, can be specified multiple times)]:' \
     '--password-command[shell `command` to obtain the repository password from (default: $RESTIC_PASSWORD_COMMAND)]:' \
     '(-p --password-file)'{-p,--password-file}'[`file` to read the repository password from (default: $RESTIC_PASSWORD_FILE)]:' \
     '(-q --quiet)'{-q,--quiet}'[do not output comprehensive progress report]' \
     '(-r --repo)'{-r,--repo}'[`repository` to backup to or restore from (default: $RESTIC_REPOSITORY)]:' \
+    '--repository-file[`file` to read the repository location from (default: $RESTIC_REPOSITORY_FILE)]:' \
     '--tls-client-cert[path to a `file` containing PEM encoded TLS client certificate and private key]:' \
-    '(-v --verbose)'{-v,--verbose}'[be verbose (specify --verbose multiple times or level --verbose=`n`)]'
+    '(-v --verbose)'{-v,--verbose}'[be verbose (specify multiple times or a level using --verbose=`n`, max level/times is 3)]'
 }
 
 function _restic_dump {
@@ -318,14 +325,15 @@ function _restic_dump {
     '--limit-download[limits downloads to a maximum rate in KiB/s. (default: unlimited)]:' \
     '--limit-upload[limits uploads to a maximum rate in KiB/s. (default: unlimited)]:' \
     '--no-cache[do not use a local cache]' \
-    '--no-lock[do not lock the repo, this allows some operations on read-only repos]' \
+    '--no-lock[do not lock the repository, this allows some operations on read-only repositories]' \
     '(*-o *--option)'{\*-o,\*--option}'[set extended option (`key=value`, can be specified multiple times)]:' \
     '--password-command[shell `command` to obtain the repository password from (default: $RESTIC_PASSWORD_COMMAND)]:' \
     '(-p --password-file)'{-p,--password-file}'[`file` to read the repository password from (default: $RESTIC_PASSWORD_FILE)]:' \
     '(-q --quiet)'{-q,--quiet}'[do not output comprehensive progress report]' \
     '(-r --repo)'{-r,--repo}'[`repository` to backup to or restore from (default: $RESTIC_REPOSITORY)]:' \
+    '--repository-file[`file` to read the repository location from (default: $RESTIC_REPOSITORY_FILE)]:' \
     '--tls-client-cert[path to a `file` containing PEM encoded TLS client certificate and private key]:' \
-    '(-v --verbose)'{-v,--verbose}'[be verbose (specify --verbose multiple times or level --verbose=`n`)]'
+    '(-v --verbose)'{-v,--verbose}'[be verbose (specify multiple times or a level using --verbose=`n`, max level/times is 3)]'
 }
 
 function _restic_find {
@@ -351,14 +359,15 @@ function _restic_find {
     '--limit-download[limits downloads to a maximum rate in KiB/s. (default: unlimited)]:' \
     '--limit-upload[limits uploads to a maximum rate in KiB/s. (default: unlimited)]:' \
     '--no-cache[do not use a local cache]' \
-    '--no-lock[do not lock the repo, this allows some operations on read-only repos]' \
+    '--no-lock[do not lock the repository, this allows some operations on read-only repositories]' \
     '(*-o *--option)'{\*-o,\*--option}'[set extended option (`key=value`, can be specified multiple times)]:' \
     '--password-command[shell `command` to obtain the repository password from (default: $RESTIC_PASSWORD_COMMAND)]:' \
     '(-p --password-file)'{-p,--password-file}'[`file` to read the repository password from (default: $RESTIC_PASSWORD_FILE)]:' \
     '(-q --quiet)'{-q,--quiet}'[do not output comprehensive progress report]' \
     '(-r --repo)'{-r,--repo}'[`repository` to backup to or restore from (default: $RESTIC_REPOSITORY)]:' \
+    '--repository-file[`file` to read the repository location from (default: $RESTIC_REPOSITORY_FILE)]:' \
     '--tls-client-cert[path to a `file` containing PEM encoded TLS client certificate and private key]:' \
-    '(-v --verbose)'{-v,--verbose}'[be verbose (specify --verbose multiple times or level --verbose=`n`)]'
+    '(-v --verbose)'{-v,--verbose}'[be verbose (specify multiple times or a level using --verbose=`n`, max level/times is 3)]'
 }
 
 function _restic_forget {
@@ -374,7 +383,7 @@ function _restic_forget {
     '*--host[only consider snapshots with the given `host` (can be specified multiple times)]:' \
     '--tag[only consider snapshots which include this `taglist` in the format `tag[,tag,...]` (can be specified multiple times)]:' \
     '*--path[only consider snapshots which include this (absolute) `path` (can be specified multiple times)]:' \
-    '(-c --compact)'{-c,--compact}'[use compact format]' \
+    '(-c --compact)'{-c,--compact}'[use compact output format]' \
     '(-g --group-by)'{-g,--group-by}'[string for grouping snapshots by host,paths,tags]:' \
     '(-n --dry-run)'{-n,--dry-run}'[do not delete anything, just print what would be done]' \
     '--prune[automatically run the '\''prune'\'' command if snapshots have been removed]' \
@@ -387,14 +396,15 @@ function _restic_forget {
     '--limit-download[limits downloads to a maximum rate in KiB/s. (default: unlimited)]:' \
     '--limit-upload[limits uploads to a maximum rate in KiB/s. (default: unlimited)]:' \
     '--no-cache[do not use a local cache]' \
-    '--no-lock[do not lock the repo, this allows some operations on read-only repos]' \
+    '--no-lock[do not lock the repository, this allows some operations on read-only repositories]' \
     '(*-o *--option)'{\*-o,\*--option}'[set extended option (`key=value`, can be specified multiple times)]:' \
     '--password-command[shell `command` to obtain the repository password from (default: $RESTIC_PASSWORD_COMMAND)]:' \
     '(-p --password-file)'{-p,--password-file}'[`file` to read the repository password from (default: $RESTIC_PASSWORD_FILE)]:' \
     '(-q --quiet)'{-q,--quiet}'[do not output comprehensive progress report]' \
     '(-r --repo)'{-r,--repo}'[`repository` to backup to or restore from (default: $RESTIC_REPOSITORY)]:' \
+    '--repository-file[`file` to read the repository location from (default: $RESTIC_REPOSITORY_FILE)]:' \
     '--tls-client-cert[path to a `file` containing PEM encoded TLS client certificate and private key]:' \
-    '(-v --verbose)'{-v,--verbose}'[be verbose (specify --verbose multiple times or level --verbose=`n`)]'
+    '(-v --verbose)'{-v,--verbose}'[be verbose (specify multiple times or a level using --verbose=`n`, max level/times is 3)]'
 }
 
 function _restic_generate {
@@ -411,14 +421,15 @@ function _restic_generate {
     '--limit-download[limits downloads to a maximum rate in KiB/s. (default: unlimited)]:' \
     '--limit-upload[limits uploads to a maximum rate in KiB/s. (default: unlimited)]:' \
     '--no-cache[do not use a local cache]' \
-    '--no-lock[do not lock the repo, this allows some operations on read-only repos]' \
+    '--no-lock[do not lock the repository, this allows some operations on read-only repositories]' \
     '(*-o *--option)'{\*-o,\*--option}'[set extended option (`key=value`, can be specified multiple times)]:' \
     '--password-command[shell `command` to obtain the repository password from (default: $RESTIC_PASSWORD_COMMAND)]:' \
     '(-p --password-file)'{-p,--password-file}'[`file` to read the repository password from (default: $RESTIC_PASSWORD_FILE)]:' \
     '(-q --quiet)'{-q,--quiet}'[do not output comprehensive progress report]' \
     '(-r --repo)'{-r,--repo}'[`repository` to backup to or restore from (default: $RESTIC_REPOSITORY)]:' \
+    '--repository-file[`file` to read the repository location from (default: $RESTIC_REPOSITORY_FILE)]:' \
     '--tls-client-cert[path to a `file` containing PEM encoded TLS client certificate and private key]:' \
-    '(-v --verbose)'{-v,--verbose}'[be verbose (specify --verbose multiple times or level --verbose=`n`)]'
+    '(-v --verbose)'{-v,--verbose}'[be verbose (specify multiple times or a level using --verbose=`n`, max level/times is 3)]'
 }
 
 function _restic_help {
@@ -431,14 +442,15 @@ function _restic_help {
     '--limit-download[limits downloads to a maximum rate in KiB/s. (default: unlimited)]:' \
     '--limit-upload[limits uploads to a maximum rate in KiB/s. (default: unlimited)]:' \
     '--no-cache[do not use a local cache]' \
-    '--no-lock[do not lock the repo, this allows some operations on read-only repos]' \
+    '--no-lock[do not lock the repository, this allows some operations on read-only repositories]' \
     '(*-o *--option)'{\*-o,\*--option}'[set extended option (`key=value`, can be specified multiple times)]:' \
     '--password-command[shell `command` to obtain the repository password from (default: $RESTIC_PASSWORD_COMMAND)]:' \
     '(-p --password-file)'{-p,--password-file}'[`file` to read the repository password from (default: $RESTIC_PASSWORD_FILE)]:' \
     '(-q --quiet)'{-q,--quiet}'[do not output comprehensive progress report]' \
     '(-r --repo)'{-r,--repo}'[`repository` to backup to or restore from (default: $RESTIC_REPOSITORY)]:' \
+    '--repository-file[`file` to read the repository location from (default: $RESTIC_REPOSITORY_FILE)]:' \
     '--tls-client-cert[path to a `file` containing PEM encoded TLS client certificate and private key]:' \
-    '(-v --verbose)'{-v,--verbose}'[be verbose (specify --verbose multiple times or level --verbose=`n`)]'
+    '(-v --verbose)'{-v,--verbose}'[be verbose (specify multiple times or a level using --verbose=`n`, max level/times is 3)]'
 }
 
 function _restic_init {
@@ -448,7 +460,7 @@ function _restic_init {
     '--key-hint2[key ID of key to try decrypting the secondary repository first (default: $RESTIC_KEY_HINT2)]:' \
     '--password-command2[shell `command` to obtain the secondary repository password from (default: $RESTIC_PASSWORD_COMMAND2)]:' \
     '--password-file2[`file` to read the secondary repository password from (default: $RESTIC_PASSWORD_FILE2)]:' \
-    '--repo2[secondary repository to copy chunker parameters from (default: $RESTIC_REPOSITORY2)]:' \
+    '--repo2[secondary `repository` to copy chunker parameters from (default: $RESTIC_REPOSITORY2)]:' \
     '*--cacert[`file` to load root certificates from (default: use system certificates)]:' \
     '--cache-dir[set the cache `directory`. (default: use system default cache directory)]:' \
     '--cleanup-cache[auto remove old cache directories]' \
@@ -457,14 +469,15 @@ function _restic_init {
     '--limit-download[limits downloads to a maximum rate in KiB/s. (default: unlimited)]:' \
     '--limit-upload[limits uploads to a maximum rate in KiB/s. (default: unlimited)]:' \
     '--no-cache[do not use a local cache]' \
-    '--no-lock[do not lock the repo, this allows some operations on read-only repos]' \
+    '--no-lock[do not lock the repository, this allows some operations on read-only repositories]' \
     '(*-o *--option)'{\*-o,\*--option}'[set extended option (`key=value`, can be specified multiple times)]:' \
     '--password-command[shell `command` to obtain the repository password from (default: $RESTIC_PASSWORD_COMMAND)]:' \
     '(-p --password-file)'{-p,--password-file}'[`file` to read the repository password from (default: $RESTIC_PASSWORD_FILE)]:' \
     '(-q --quiet)'{-q,--quiet}'[do not output comprehensive progress report]' \
     '(-r --repo)'{-r,--repo}'[`repository` to backup to or restore from (default: $RESTIC_REPOSITORY)]:' \
+    '--repository-file[`file` to read the repository location from (default: $RESTIC_REPOSITORY_FILE)]:' \
     '--tls-client-cert[path to a `file` containing PEM encoded TLS client certificate and private key]:' \
-    '(-v --verbose)'{-v,--verbose}'[be verbose (specify --verbose multiple times or level --verbose=`n`)]'
+    '(-v --verbose)'{-v,--verbose}'[be verbose (specify multiple times or a level using --verbose=`n`, max level/times is 3)]'
 }
 
 function _restic_key {
@@ -481,14 +494,15 @@ function _restic_key {
     '--limit-download[limits downloads to a maximum rate in KiB/s. (default: unlimited)]:' \
     '--limit-upload[limits uploads to a maximum rate in KiB/s. (default: unlimited)]:' \
     '--no-cache[do not use a local cache]' \
-    '--no-lock[do not lock the repo, this allows some operations on read-only repos]' \
+    '--no-lock[do not lock the repository, this allows some operations on read-only repositories]' \
     '(*-o *--option)'{\*-o,\*--option}'[set extended option (`key=value`, can be specified multiple times)]:' \
     '--password-command[shell `command` to obtain the repository password from (default: $RESTIC_PASSWORD_COMMAND)]:' \
     '(-p --password-file)'{-p,--password-file}'[`file` to read the repository password from (default: $RESTIC_PASSWORD_FILE)]:' \
     '(-q --quiet)'{-q,--quiet}'[do not output comprehensive progress report]' \
     '(-r --repo)'{-r,--repo}'[`repository` to backup to or restore from (default: $RESTIC_REPOSITORY)]:' \
+    '--repository-file[`file` to read the repository location from (default: $RESTIC_REPOSITORY_FILE)]:' \
     '--tls-client-cert[path to a `file` containing PEM encoded TLS client certificate and private key]:' \
-    '(-v --verbose)'{-v,--verbose}'[be verbose (specify --verbose multiple times or level --verbose=`n`)]'
+    '(-v --verbose)'{-v,--verbose}'[be verbose (specify multiple times or a level using --verbose=`n`, max level/times is 3)]'
 }
 
 function _restic_list {
@@ -502,14 +516,15 @@ function _restic_list {
     '--limit-download[limits downloads to a maximum rate in KiB/s. (default: unlimited)]:' \
     '--limit-upload[limits uploads to a maximum rate in KiB/s. (default: unlimited)]:' \
     '--no-cache[do not use a local cache]' \
-    '--no-lock[do not lock the repo, this allows some operations on read-only repos]' \
+    '--no-lock[do not lock the repository, this allows some operations on read-only repositories]' \
     '(*-o *--option)'{\*-o,\*--option}'[set extended option (`key=value`, can be specified multiple times)]:' \
     '--password-command[shell `command` to obtain the repository password from (default: $RESTIC_PASSWORD_COMMAND)]:' \
     '(-p --password-file)'{-p,--password-file}'[`file` to read the repository password from (default: $RESTIC_PASSWORD_FILE)]:' \
     '(-q --quiet)'{-q,--quiet}'[do not output comprehensive progress report]' \
     '(-r --repo)'{-r,--repo}'[`repository` to backup to or restore from (default: $RESTIC_REPOSITORY)]:' \
+    '--repository-file[`file` to read the repository location from (default: $RESTIC_REPOSITORY_FILE)]:' \
     '--tls-client-cert[path to a `file` containing PEM encoded TLS client certificate and private key]:' \
-    '(-v --verbose)'{-v,--verbose}'[be verbose (specify --verbose multiple times or level --verbose=`n`)]'
+    '(-v --verbose)'{-v,--verbose}'[be verbose (specify multiple times or a level using --verbose=`n`, max level/times is 3)]'
 }
 
 function _restic_ls {
@@ -528,14 +543,15 @@ function _restic_ls {
     '--limit-download[limits downloads to a maximum rate in KiB/s. (default: unlimited)]:' \
     '--limit-upload[limits uploads to a maximum rate in KiB/s. (default: unlimited)]:' \
     '--no-cache[do not use a local cache]' \
-    '--no-lock[do not lock the repo, this allows some operations on read-only repos]' \
+    '--no-lock[do not lock the repository, this allows some operations on read-only repositories]' \
     '(*-o *--option)'{\*-o,\*--option}'[set extended option (`key=value`, can be specified multiple times)]:' \
     '--password-command[shell `command` to obtain the repository password from (default: $RESTIC_PASSWORD_COMMAND)]:' \
     '(-p --password-file)'{-p,--password-file}'[`file` to read the repository password from (default: $RESTIC_PASSWORD_FILE)]:' \
     '(-q --quiet)'{-q,--quiet}'[do not output comprehensive progress report]' \
     '(-r --repo)'{-r,--repo}'[`repository` to backup to or restore from (default: $RESTIC_REPOSITORY)]:' \
+    '--repository-file[`file` to read the repository location from (default: $RESTIC_REPOSITORY_FILE)]:' \
     '--tls-client-cert[path to a `file` containing PEM encoded TLS client certificate and private key]:' \
-    '(-v --verbose)'{-v,--verbose}'[be verbose (specify --verbose multiple times or level --verbose=`n`)]'
+    '(-v --verbose)'{-v,--verbose}'[be verbose (specify multiple times or a level using --verbose=`n`, max level/times is 3)]'
 }
 
 function _restic_migrate {
@@ -550,14 +566,15 @@ function _restic_migrate {
     '--limit-download[limits downloads to a maximum rate in KiB/s. (default: unlimited)]:' \
     '--limit-upload[limits uploads to a maximum rate in KiB/s. (default: unlimited)]:' \
     '--no-cache[do not use a local cache]' \
-    '--no-lock[do not lock the repo, this allows some operations on read-only repos]' \
+    '--no-lock[do not lock the repository, this allows some operations on read-only repositories]' \
     '(*-o *--option)'{\*-o,\*--option}'[set extended option (`key=value`, can be specified multiple times)]:' \
     '--password-command[shell `command` to obtain the repository password from (default: $RESTIC_PASSWORD_COMMAND)]:' \
     '(-p --password-file)'{-p,--password-file}'[`file` to read the repository password from (default: $RESTIC_PASSWORD_FILE)]:' \
     '(-q --quiet)'{-q,--quiet}'[do not output comprehensive progress report]' \
     '(-r --repo)'{-r,--repo}'[`repository` to backup to or restore from (default: $RESTIC_REPOSITORY)]:' \
+    '--repository-file[`file` to read the repository location from (default: $RESTIC_REPOSITORY_FILE)]:' \
     '--tls-client-cert[path to a `file` containing PEM encoded TLS client certificate and private key]:' \
-    '(-v --verbose)'{-v,--verbose}'[be verbose (specify --verbose multiple times or level --verbose=`n`)]'
+    '(-v --verbose)'{-v,--verbose}'[be verbose (specify multiple times or a level using --verbose=`n`, max level/times is 3)]'
 }
 
 function _restic_mount {
@@ -578,14 +595,15 @@ function _restic_mount {
     '--limit-download[limits downloads to a maximum rate in KiB/s. (default: unlimited)]:' \
     '--limit-upload[limits uploads to a maximum rate in KiB/s. (default: unlimited)]:' \
     '--no-cache[do not use a local cache]' \
-    '--no-lock[do not lock the repo, this allows some operations on read-only repos]' \
+    '--no-lock[do not lock the repository, this allows some operations on read-only repositories]' \
     '(*-o *--option)'{\*-o,\*--option}'[set extended option (`key=value`, can be specified multiple times)]:' \
     '--password-command[shell `command` to obtain the repository password from (default: $RESTIC_PASSWORD_COMMAND)]:' \
     '(-p --password-file)'{-p,--password-file}'[`file` to read the repository password from (default: $RESTIC_PASSWORD_FILE)]:' \
     '(-q --quiet)'{-q,--quiet}'[do not output comprehensive progress report]' \
     '(-r --repo)'{-r,--repo}'[`repository` to backup to or restore from (default: $RESTIC_REPOSITORY)]:' \
+    '--repository-file[`file` to read the repository location from (default: $RESTIC_REPOSITORY_FILE)]:' \
     '--tls-client-cert[path to a `file` containing PEM encoded TLS client certificate and private key]:' \
-    '(-v --verbose)'{-v,--verbose}'[be verbose (specify --verbose multiple times or level --verbose=`n`)]'
+    '(-v --verbose)'{-v,--verbose}'[be verbose (specify multiple times or a level using --verbose=`n`, max level/times is 3)]'
 }
 
 function _restic_prune {
@@ -599,14 +617,15 @@ function _restic_prune {
     '--limit-download[limits downloads to a maximum rate in KiB/s. (default: unlimited)]:' \
     '--limit-upload[limits uploads to a maximum rate in KiB/s. (default: unlimited)]:' \
     '--no-cache[do not use a local cache]' \
-    '--no-lock[do not lock the repo, this allows some operations on read-only repos]' \
+    '--no-lock[do not lock the repository, this allows some operations on read-only repositories]' \
     '(*-o *--option)'{\*-o,\*--option}'[set extended option (`key=value`, can be specified multiple times)]:' \
     '--password-command[shell `command` to obtain the repository password from (default: $RESTIC_PASSWORD_COMMAND)]:' \
     '(-p --password-file)'{-p,--password-file}'[`file` to read the repository password from (default: $RESTIC_PASSWORD_FILE)]:' \
     '(-q --quiet)'{-q,--quiet}'[do not output comprehensive progress report]' \
     '(-r --repo)'{-r,--repo}'[`repository` to backup to or restore from (default: $RESTIC_REPOSITORY)]:' \
+    '--repository-file[`file` to read the repository location from (default: $RESTIC_REPOSITORY_FILE)]:' \
     '--tls-client-cert[path to a `file` containing PEM encoded TLS client certificate and private key]:' \
-    '(-v --verbose)'{-v,--verbose}'[be verbose (specify --verbose multiple times or level --verbose=`n`)]'
+    '(-v --verbose)'{-v,--verbose}'[be verbose (specify multiple times or a level using --verbose=`n`, max level/times is 3)]'
 }
 
 function _restic_rebuild-index {
@@ -620,14 +639,15 @@ function _restic_rebuild-index {
     '--limit-download[limits downloads to a maximum rate in KiB/s. (default: unlimited)]:' \
     '--limit-upload[limits uploads to a maximum rate in KiB/s. (default: unlimited)]:' \
     '--no-cache[do not use a local cache]' \
-    '--no-lock[do not lock the repo, this allows some operations on read-only repos]' \
+    '--no-lock[do not lock the repository, this allows some operations on read-only repositories]' \
     '(*-o *--option)'{\*-o,\*--option}'[set extended option (`key=value`, can be specified multiple times)]:' \
     '--password-command[shell `command` to obtain the repository password from (default: $RESTIC_PASSWORD_COMMAND)]:' \
     '(-p --password-file)'{-p,--password-file}'[`file` to read the repository password from (default: $RESTIC_PASSWORD_FILE)]:' \
     '(-q --quiet)'{-q,--quiet}'[do not output comprehensive progress report]' \
     '(-r --repo)'{-r,--repo}'[`repository` to backup to or restore from (default: $RESTIC_REPOSITORY)]:' \
+    '--repository-file[`file` to read the repository location from (default: $RESTIC_REPOSITORY_FILE)]:' \
     '--tls-client-cert[path to a `file` containing PEM encoded TLS client certificate and private key]:' \
-    '(-v --verbose)'{-v,--verbose}'[be verbose (specify --verbose multiple times or level --verbose=`n`)]'
+    '(-v --verbose)'{-v,--verbose}'[be verbose (specify multiple times or a level using --verbose=`n`, max level/times is 3)]'
 }
 
 function _restic_recover {
@@ -641,14 +661,15 @@ function _restic_recover {
     '--limit-download[limits downloads to a maximum rate in KiB/s. (default: unlimited)]:' \
     '--limit-upload[limits uploads to a maximum rate in KiB/s. (default: unlimited)]:' \
     '--no-cache[do not use a local cache]' \
-    '--no-lock[do not lock the repo, this allows some operations on read-only repos]' \
+    '--no-lock[do not lock the repository, this allows some operations on read-only repositories]' \
     '(*-o *--option)'{\*-o,\*--option}'[set extended option (`key=value`, can be specified multiple times)]:' \
     '--password-command[shell `command` to obtain the repository password from (default: $RESTIC_PASSWORD_COMMAND)]:' \
     '(-p --password-file)'{-p,--password-file}'[`file` to read the repository password from (default: $RESTIC_PASSWORD_FILE)]:' \
     '(-q --quiet)'{-q,--quiet}'[do not output comprehensive progress report]' \
     '(-r --repo)'{-r,--repo}'[`repository` to backup to or restore from (default: $RESTIC_REPOSITORY)]:' \
+    '--repository-file[`file` to read the repository location from (default: $RESTIC_REPOSITORY_FILE)]:' \
     '--tls-client-cert[path to a `file` containing PEM encoded TLS client certificate and private key]:' \
-    '(-v --verbose)'{-v,--verbose}'[be verbose (specify --verbose multiple times or level --verbose=`n`)]'
+    '(-v --verbose)'{-v,--verbose}'[be verbose (specify multiple times or a level using --verbose=`n`, max level/times is 3)]'
 }
 
 function _restic_restore {
@@ -671,14 +692,15 @@ function _restic_restore {
     '--limit-download[limits downloads to a maximum rate in KiB/s. (default: unlimited)]:' \
     '--limit-upload[limits uploads to a maximum rate in KiB/s. (default: unlimited)]:' \
     '--no-cache[do not use a local cache]' \
-    '--no-lock[do not lock the repo, this allows some operations on read-only repos]' \
+    '--no-lock[do not lock the repository, this allows some operations on read-only repositories]' \
     '(*-o *--option)'{\*-o,\*--option}'[set extended option (`key=value`, can be specified multiple times)]:' \
     '--password-command[shell `command` to obtain the repository password from (default: $RESTIC_PASSWORD_COMMAND)]:' \
     '(-p --password-file)'{-p,--password-file}'[`file` to read the repository password from (default: $RESTIC_PASSWORD_FILE)]:' \
     '(-q --quiet)'{-q,--quiet}'[do not output comprehensive progress report]' \
     '(-r --repo)'{-r,--repo}'[`repository` to backup to or restore from (default: $RESTIC_REPOSITORY)]:' \
+    '--repository-file[`file` to read the repository location from (default: $RESTIC_REPOSITORY_FILE)]:' \
     '--tls-client-cert[path to a `file` containing PEM encoded TLS client certificate and private key]:' \
-    '(-v --verbose)'{-v,--verbose}'[be verbose (specify --verbose multiple times or level --verbose=`n`)]'
+    '(-v --verbose)'{-v,--verbose}'[be verbose (specify multiple times or a level using --verbose=`n`, max level/times is 3)]'
 }
 
 function _restic_self-update {
@@ -693,19 +715,20 @@ function _restic_self-update {
     '--limit-download[limits downloads to a maximum rate in KiB/s. (default: unlimited)]:' \
     '--limit-upload[limits uploads to a maximum rate in KiB/s. (default: unlimited)]:' \
     '--no-cache[do not use a local cache]' \
-    '--no-lock[do not lock the repo, this allows some operations on read-only repos]' \
+    '--no-lock[do not lock the repository, this allows some operations on read-only repositories]' \
     '(*-o *--option)'{\*-o,\*--option}'[set extended option (`key=value`, can be specified multiple times)]:' \
     '--password-command[shell `command` to obtain the repository password from (default: $RESTIC_PASSWORD_COMMAND)]:' \
     '(-p --password-file)'{-p,--password-file}'[`file` to read the repository password from (default: $RESTIC_PASSWORD_FILE)]:' \
     '(-q --quiet)'{-q,--quiet}'[do not output comprehensive progress report]' \
     '(-r --repo)'{-r,--repo}'[`repository` to backup to or restore from (default: $RESTIC_REPOSITORY)]:' \
+    '--repository-file[`file` to read the repository location from (default: $RESTIC_REPOSITORY_FILE)]:' \
     '--tls-client-cert[path to a `file` containing PEM encoded TLS client certificate and private key]:' \
-    '(-v --verbose)'{-v,--verbose}'[be verbose (specify --verbose multiple times or level --verbose=`n`)]'
+    '(-v --verbose)'{-v,--verbose}'[be verbose (specify multiple times or a level using --verbose=`n`, max level/times is 3)]'
 }
 
 function _restic_snapshots {
   _arguments \
-    '(-c --compact)'{-c,--compact}'[use compact format]' \
+    '(-c --compact)'{-c,--compact}'[use compact output format]' \
     '(-g --group-by)'{-g,--group-by}'[string for grouping snapshots by host,paths,tags]:' \
     '(-h --help)'{-h,--help}'[help for snapshots]' \
     '(*-H *--host)'{\*-H,\*--host}'[only consider snapshots for this `host` (can be specified multiple times)]:' \
@@ -720,14 +743,15 @@ function _restic_snapshots {
     '--limit-download[limits downloads to a maximum rate in KiB/s. (default: unlimited)]:' \
     '--limit-upload[limits uploads to a maximum rate in KiB/s. (default: unlimited)]:' \
     '--no-cache[do not use a local cache]' \
-    '--no-lock[do not lock the repo, this allows some operations on read-only repos]' \
+    '--no-lock[do not lock the repository, this allows some operations on read-only repositories]' \
     '(*-o *--option)'{\*-o,\*--option}'[set extended option (`key=value`, can be specified multiple times)]:' \
     '--password-command[shell `command` to obtain the repository password from (default: $RESTIC_PASSWORD_COMMAND)]:' \
     '(-p --password-file)'{-p,--password-file}'[`file` to read the repository password from (default: $RESTIC_PASSWORD_FILE)]:' \
     '(-q --quiet)'{-q,--quiet}'[do not output comprehensive progress report]' \
     '(-r --repo)'{-r,--repo}'[`repository` to backup to or restore from (default: $RESTIC_REPOSITORY)]:' \
+    '--repository-file[`file` to read the repository location from (default: $RESTIC_REPOSITORY_FILE)]:' \
     '--tls-client-cert[path to a `file` containing PEM encoded TLS client certificate and private key]:' \
-    '(-v --verbose)'{-v,--verbose}'[be verbose (specify --verbose multiple times or level --verbose=`n`)]'
+    '(-v --verbose)'{-v,--verbose}'[be verbose (specify multiple times or a level using --verbose=`n`, max level/times is 3)]'
 }
 
 function _restic_stats {
@@ -745,14 +769,15 @@ function _restic_stats {
     '--limit-download[limits downloads to a maximum rate in KiB/s. (default: unlimited)]:' \
     '--limit-upload[limits uploads to a maximum rate in KiB/s. (default: unlimited)]:' \
     '--no-cache[do not use a local cache]' \
-    '--no-lock[do not lock the repo, this allows some operations on read-only repos]' \
+    '--no-lock[do not lock the repository, this allows some operations on read-only repositories]' \
     '(*-o *--option)'{\*-o,\*--option}'[set extended option (`key=value`, can be specified multiple times)]:' \
     '--password-command[shell `command` to obtain the repository password from (default: $RESTIC_PASSWORD_COMMAND)]:' \
     '(-p --password-file)'{-p,--password-file}'[`file` to read the repository password from (default: $RESTIC_PASSWORD_FILE)]:' \
     '(-q --quiet)'{-q,--quiet}'[do not output comprehensive progress report]' \
     '(-r --repo)'{-r,--repo}'[`repository` to backup to or restore from (default: $RESTIC_REPOSITORY)]:' \
+    '--repository-file[`file` to read the repository location from (default: $RESTIC_REPOSITORY_FILE)]:' \
     '--tls-client-cert[path to a `file` containing PEM encoded TLS client certificate and private key]:' \
-    '(-v --verbose)'{-v,--verbose}'[be verbose (specify --verbose multiple times or level --verbose=`n`)]'
+    '(-v --verbose)'{-v,--verbose}'[be verbose (specify multiple times or a level using --verbose=`n`, max level/times is 3)]'
 }
 
 function _restic_tag {
@@ -772,14 +797,15 @@ function _restic_tag {
     '--limit-download[limits downloads to a maximum rate in KiB/s. (default: unlimited)]:' \
     '--limit-upload[limits uploads to a maximum rate in KiB/s. (default: unlimited)]:' \
     '--no-cache[do not use a local cache]' \
-    '--no-lock[do not lock the repo, this allows some operations on read-only repos]' \
+    '--no-lock[do not lock the repository, this allows some operations on read-only repositories]' \
     '(*-o *--option)'{\*-o,\*--option}'[set extended option (`key=value`, can be specified multiple times)]:' \
     '--password-command[shell `command` to obtain the repository password from (default: $RESTIC_PASSWORD_COMMAND)]:' \
     '(-p --password-file)'{-p,--password-file}'[`file` to read the repository password from (default: $RESTIC_PASSWORD_FILE)]:' \
     '(-q --quiet)'{-q,--quiet}'[do not output comprehensive progress report]' \
     '(-r --repo)'{-r,--repo}'[`repository` to backup to or restore from (default: $RESTIC_REPOSITORY)]:' \
+    '--repository-file[`file` to read the repository location from (default: $RESTIC_REPOSITORY_FILE)]:' \
     '--tls-client-cert[path to a `file` containing PEM encoded TLS client certificate and private key]:' \
-    '(-v --verbose)'{-v,--verbose}'[be verbose (specify --verbose multiple times or level --verbose=`n`)]'
+    '(-v --verbose)'{-v,--verbose}'[be verbose (specify multiple times or a level using --verbose=`n`, max level/times is 3)]'
 }
 
 function _restic_unlock {
@@ -794,14 +820,15 @@ function _restic_unlock {
     '--limit-download[limits downloads to a maximum rate in KiB/s. (default: unlimited)]:' \
     '--limit-upload[limits uploads to a maximum rate in KiB/s. (default: unlimited)]:' \
     '--no-cache[do not use a local cache]' \
-    '--no-lock[do not lock the repo, this allows some operations on read-only repos]' \
+    '--no-lock[do not lock the repository, this allows some operations on read-only repositories]' \
     '(*-o *--option)'{\*-o,\*--option}'[set extended option (`key=value`, can be specified multiple times)]:' \
     '--password-command[shell `command` to obtain the repository password from (default: $RESTIC_PASSWORD_COMMAND)]:' \
     '(-p --password-file)'{-p,--password-file}'[`file` to read the repository password from (default: $RESTIC_PASSWORD_FILE)]:' \
     '(-q --quiet)'{-q,--quiet}'[do not output comprehensive progress report]' \
     '(-r --repo)'{-r,--repo}'[`repository` to backup to or restore from (default: $RESTIC_REPOSITORY)]:' \
+    '--repository-file[`file` to read the repository location from (default: $RESTIC_REPOSITORY_FILE)]:' \
     '--tls-client-cert[path to a `file` containing PEM encoded TLS client certificate and private key]:' \
-    '(-v --verbose)'{-v,--verbose}'[be verbose (specify --verbose multiple times or level --verbose=`n`)]'
+    '(-v --verbose)'{-v,--verbose}'[be verbose (specify multiple times or a level using --verbose=`n`, max level/times is 3)]'
 }
 
 function _restic_version {
@@ -815,13 +842,14 @@ function _restic_version {
     '--limit-download[limits downloads to a maximum rate in KiB/s. (default: unlimited)]:' \
     '--limit-upload[limits uploads to a maximum rate in KiB/s. (default: unlimited)]:' \
     '--no-cache[do not use a local cache]' \
-    '--no-lock[do not lock the repo, this allows some operations on read-only repos]' \
+    '--no-lock[do not lock the repository, this allows some operations on read-only repositories]' \
     '(*-o *--option)'{\*-o,\*--option}'[set extended option (`key=value`, can be specified multiple times)]:' \
     '--password-command[shell `command` to obtain the repository password from (default: $RESTIC_PASSWORD_COMMAND)]:' \
     '(-p --password-file)'{-p,--password-file}'[`file` to read the repository password from (default: $RESTIC_PASSWORD_FILE)]:' \
     '(-q --quiet)'{-q,--quiet}'[do not output comprehensive progress report]' \
     '(-r --repo)'{-r,--repo}'[`repository` to backup to or restore from (default: $RESTIC_REPOSITORY)]:' \
+    '--repository-file[`file` to read the repository location from (default: $RESTIC_REPOSITORY_FILE)]:' \
     '--tls-client-cert[path to a `file` containing PEM encoded TLS client certificate and private key]:' \
-    '(-v --verbose)'{-v,--verbose}'[be verbose (specify --verbose multiple times or level --verbose=`n`)]'
+    '(-v --verbose)'{-v,--verbose}'[be verbose (specify multiple times or a level using --verbose=`n`, max level/times is 3)]'
 }