diff --git a/doc/Manual.md b/doc/Manual.md index cac48d967..5e5d495c7 100644 --- a/doc/Manual.md +++ b/doc/Manual.md @@ -230,7 +230,7 @@ Or filter by host: bdbd3439 2015-05-08 21:45:17 luigi /home/art 9f0bc19e 2015-05-08 21:46:11 luigi /srv -Combining filters are also possible. +Combining filters is also possible. # Restore a snapshot @@ -241,12 +241,13 @@ restore the contents of the latest snapshot to `/tmp/restore-work`: enter password for repository: restoring to /tmp/restore-work -Use the word 'latest' to restore the last backup. You can also combine 'latest' -with the --host and --path filters to choose the last backup for a specific +Use the word `latest` to restore the last backup. You can also combine `latest` +with the `--host` and `--path` filters to choose the last backup for a specific host, path or both. $ restic -r /tmp/backup restore latest --target ~/tmp/restore-work --path "/home/art" --host luigi - + enter password for repository: + restoring to /tmp/restore-work # Manage repository keys diff --git a/src/cmds/restic/cmd_restore.go b/src/cmds/restic/cmd_restore.go index 2d925b753..97b77ec1b 100644 --- a/src/cmds/restic/cmd_restore.go +++ b/src/cmds/restic/cmd_restore.go @@ -14,7 +14,7 @@ type CmdRestore struct { Exclude []string `short:"e" long:"exclude" description:"Exclude a pattern (can be specified multiple times)"` Include []string `short:"i" long:"include" description:"Include a pattern, exclude everything else (can be specified multiple times)"` Target string `short:"t" long:"target" description:"Directory to restore to"` - Host string `short:"h" long:"host" description:"Source Filter (for id=latest)"` + Host string `short:"h" long:"host" description:"Source Filter (for id=latest)"` Paths []string `short:"p" long:"path" description:"Path Filter (absolute path;for id=latest) (can be specified multiple times)"` global *GlobalOptions diff --git a/src/cmds/restic/cmd_snapshots.go b/src/cmds/restic/cmd_snapshots.go index 309e3bb56..abca558f5 100644 --- a/src/cmds/restic/cmd_snapshots.go +++ b/src/cmds/restic/cmd_snapshots.go @@ -48,8 +48,8 @@ func (t Table) Write(w io.Writer) error { const TimeFormat = "2006-01-02 15:04:05" type CmdSnapshots struct { - Host string `short:"h" long:"host" description:"Host Filter"` - Paths []string `short:"p" long:"path" description:"Path Filter (absolute path) (can be specified multiple times)"` + Host string `short:"h" long:"host" description:"Host Filter"` + Paths []string `short:"p" long:"path" description:"Path Filter (absolute path) (can be specified multiple times)"` global *GlobalOptions }