From 2fa4060991c07a84d5868a602d15d973830d49c8 Mon Sep 17 00:00:00 2001 From: Michael Pratt Date: Sun, 27 Aug 2017 18:32:53 -0700 Subject: [PATCH 1/2] doc: fix inconsistencies * Replace references to ~/shared/work/web which should be ~/web. * Replace references to ~/tmp which should be /tmp. * Restore /home/art to /tmp/restore-art instead of /tmp/restore-work, which is clearly a copy/paste from the command above. --- doc/manual.rst | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/doc/manual.rst b/doc/manual.rst index e83e93b75..9630240b2 100644 --- a/doc/manual.rst +++ b/doc/manual.rst @@ -477,7 +477,7 @@ work! .. code-block:: console - $ restic -r /tmp/backup backup ~/shared/work/web + $ restic -r /tmp/backup backup ~/work enter password for repository: using parent snapshot 40dc1520aa6a07b7b3ae561786770a01951245d2367241e71e9485f18ae8228c scan [/home/user/work] @@ -491,7 +491,7 @@ You can even backup individual files in the same repository. .. code-block:: console $ restic -r /tmp/backup backup ~/work.txt - scan [~/work.txt] + scan [/home/user/work.txt] scanned 0 directories, 1 files in 0:00 [0:00] 100.00% 0B/s 220B / 220B 1 / 1 items 0 errors ETA 0:00 duration: 0:00, 0.03MiB/s @@ -592,7 +592,7 @@ information. Just specify the tags for a snapshot one by one with ``--tag``: .. code-block:: console - $ restic -r /tmp/backup backup --tag projectX -tag foo --tag bar ~/shared/work/web + $ restic -r /tmp/backup backup --tag projectX -tag foo --tag bar ~/work [...] The tags can later be used to keep (or forget) snapshots with the ``forget`` @@ -649,7 +649,7 @@ command to restore the contents of the latest snapshot to .. code-block:: console - $ restic -r /tmp/backup restore 79766175 --target ~/tmp/restore-work + $ restic -r /tmp/backup restore 79766175 --target /tmp/restore-work enter password for repository: restoring to /tmp/restore-work @@ -659,9 +659,9 @@ backup for a specific host, path or both. .. code-block:: console - $ restic -r /tmp/backup restore latest --target ~/tmp/restore-work --path "/home/art" --host luigi + $ restic -r /tmp/backup restore latest --target /tmp/restore-art --path "/home/art" --host luigi enter password for repository: - restoring to /tmp/restore-work + restoring to /tmp/restore-art Manage repository keys ---------------------- @@ -758,7 +758,7 @@ yield the same error: .. code-block:: console - $ restic -r /tmp/backup restore 79766175 --target ~/tmp/restore-work + $ restic -r /tmp/backup restore 79766175 --target /tmp/restore-work Load indexes ciphertext verification failed From ae43c47ca83daa41cd6a24a2dfce79f05e50d061 Mon Sep 17 00:00:00 2001 From: Michael Pratt Date: Sun, 27 Aug 2017 18:36:00 -0700 Subject: [PATCH 2/2] doc: add mention of restore --exclude/--include There is a lot more detail that could be added here, but it is worth getting things off the ground with at least a mention that it is possible to restore individual files. Updates #396 --- doc/manual.rst | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/doc/manual.rst b/doc/manual.rst index 9630240b2..079457f13 100644 --- a/doc/manual.rst +++ b/doc/manual.rst @@ -663,6 +663,17 @@ backup for a specific host, path or both. enter password for repository: restoring to /tmp/restore-art +Use ``--exclude`` and ``--include`` to restrict the restore to a subset of +files in the snapshot. For example, to restore a single file: + +.. code-block:: console + + $ restic -r /tmp/backup restore 79766175 --target /tmp/restore-work --include /work/foo + enter password for repository: + restoring to /tmp/restore-work + +This will restore the file ``foo`` to ``/tmp/restore-work/work/foo``. + Manage repository keys ----------------------