From f11789c43765975d89067161c35005581d37523b Mon Sep 17 00:00:00 2001 From: Martin Michlmayr Date: Tue, 23 Apr 2019 09:06:32 +0700 Subject: [PATCH 1/3] Add missing opening parenthesis --- cmd/restic/cmd_generate.go | 2 +- doc/man/restic-generate.1 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd/restic/cmd_generate.go b/cmd/restic/cmd_generate.go index 5c42537dc..3c9fba3d2 100644 --- a/cmd/restic/cmd_generate.go +++ b/cmd/restic/cmd_generate.go @@ -12,7 +12,7 @@ var cmdGenerate = &cobra.Command{ Use: "generate [command]", Short: "Generate manual pages and auto-completion files (bash, zsh)", Long: ` -The "generate" command writes automatically generated files like the man pages +The "generate" command writes automatically generated files (like the man pages and the auto-completion files for bash and zsh). `, DisableAutoGenTag: true, diff --git a/doc/man/restic-generate.1 b/doc/man/restic-generate.1 index 91c963152..2ab782bf2 100644 --- a/doc/man/restic-generate.1 +++ b/doc/man/restic-generate.1 @@ -15,7 +15,7 @@ restic\-generate \- Generate manual pages and auto\-completion files (bash, zsh) .SH DESCRIPTION .PP -The "generate" command writes automatically generated files like the man pages +The "generate" command writes automatically generated files (like the man pages and the auto\-completion files for bash and zsh). From 1aafc17212b800dd88f6cb4deeb58a98bb9ece6e Mon Sep 17 00:00:00 2001 From: Martin Michlmayr Date: Tue, 23 Apr 2019 09:08:18 +0700 Subject: [PATCH 2/3] Avoid error "undefined control sequence" in LaTeX Converting the changelog to PDF using pandoc leads to: ! Undefined control sequence. l.1497 ...mple, by creating a file named ``..\test This is because \t is interpreted as a control sequence. Use `` instead of "" to work around this. --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e1d819ebf..daca5db04 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1117,7 +1117,7 @@ Details Exploiting the vulnerability requires a Linux/Unix system which saves backups via restic and a Windows systems which restores files from the repo. In addition, the attackers need to be able to create create files with arbitrary names which are then saved to the restic repo. For - example, by creating a file named "..\test.txt" (which is a perfectly legal filename on Linux) + example, by creating a file named `..\test.txt` (which is a perfectly legal filename on Linux) and restoring a snapshot containing this file on Windows, it would be written to the parent of the target directory. From 05611559635f6f5e6b677e58598b8907734d33ac Mon Sep 17 00:00:00 2001 From: Martin Michlmayr Date: Tue, 23 Apr 2019 09:10:10 +0700 Subject: [PATCH 3/3] Split paragraph from list in restic stats --help The help text for `restic stats` lists a number of modes in a list. Make sure the "more info" text is a separate paragraph rather than being part of the list. --- cmd/restic/cmd_stats.go | 3 ++- doc/man/restic-stats.1 | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/cmd/restic/cmd_stats.go b/cmd/restic/cmd_stats.go index 590ef5f14..709b20ec8 100644 --- a/cmd/restic/cmd_stats.go +++ b/cmd/restic/cmd_stats.go @@ -36,7 +36,8 @@ The modes are: * raw-data: Counts the size of blobs in the repository, regardless of how many files reference them. * blobs-per-file: A combination of files-by-contents and raw-data. -* Refer to the online manual for more details about each mode. + +Refer to the online manual for more details about each mode. `, DisableAutoGenTag: true, RunE: func(cmd *cobra.Command, args []string) error { diff --git a/doc/man/restic-stats.1 b/doc/man/restic-stats.1 index f9578c38b..2465cde85 100644 --- a/doc/man/restic-stats.1 +++ b/doc/man/restic-stats.1 @@ -40,7 +40,8 @@ raw\-data: Counts the size of blobs in the repository, regardless of how many files reference them. .IP \(bu 2 blobs\-per\-file: A combination of files\-by\-contents and raw\-data. -.IP \(bu 2 + +.PP Refer to the online manual for more details about each mode. .RE