From e967edad9868c14fcefc8e2306f7bd2d1a28eed9 Mon Sep 17 00:00:00 2001 From: rugk Date: Fri, 23 Jun 2017 17:03:04 +0200 Subject: [PATCH 1/2] Include prune example in doc --- docs/usage/prune.rst | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/docs/usage/prune.rst b/docs/usage/prune.rst index fb1fe660c..6a3b5ab0c 100644 --- a/docs/usage/prune.rst +++ b/docs/usage/prune.rst @@ -14,8 +14,6 @@ prefix "foo" if you do not also want to match "foobar". It is strongly recommended to always run ``prune -v --list --dry-run ...`` first so you will see what it would do without it actually doing anything. -There is also a visualized prune example in ``docs/misc/prune-example.txt``. - :: # Keep 7 end of day and 4 additional end of week archives. @@ -33,3 +31,8 @@ There is also a visualized prune example in ``docs/misc/prune-example.txt``. # Keep all backups in the last 10 days, 4 additional end of week archives, # and an end of month archive for every month: $ borg prune -v --list --keep-within=10d --keep-weekly=4 --keep-monthly=-1 /path/to/repo + +There is also a visualized prune example in ``docs/misc/prune-example.txt``. + +.. include:: misc/prune-example.txt + :literal: From 310a9b3486f9b29a730c548c2447110f5142b62b Mon Sep 17 00:00:00 2001 From: Marian Beermann Date: Fri, 23 Jun 2017 19:16:33 +0200 Subject: [PATCH 2/2] docs: prune: fix include path --- docs/usage/prune.rst | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/usage/prune.rst b/docs/usage/prune.rst index 6a3b5ab0c..028f83004 100644 --- a/docs/usage/prune.rst +++ b/docs/usage/prune.rst @@ -32,7 +32,8 @@ first so you will see what it would do without it actually doing anything. # and an end of month archive for every month: $ borg prune -v --list --keep-within=10d --keep-weekly=4 --keep-monthly=-1 /path/to/repo -There is also a visualized prune example in ``docs/misc/prune-example.txt``. +There is also a visualized prune example in ``docs/misc/prune-example.txt``: -.. include:: misc/prune-example.txt +.. highlight:: none +.. include:: ../misc/prune-example.txt :literal: