summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorben <ben@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109>2002-05-01 05:29:17 +0000
committerben <ben@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109>2002-05-01 05:29:17 +0000
commitc5e8525105e592a3ebde27575b306211379ea1f1 (patch)
tree3c8469ecbcfb284fa163ef44cee6776720f0412b
parentd49f6dccf43983b317d31aa49b7e9a54aa28bf01 (diff)
downloadrdiff-backup-c5e8525105e592a3ebde27575b306211379ea1f1.tar.gz
Minor typo fixes
git-svn-id: http://svn.savannah.nongnu.org/svn/rdiff-backup/trunk@50 2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109
-rw-r--r--rdiff-backup/FAQ.html13
-rw-r--r--rdiff-backup/rdiff-backup.111
2 files changed, 14 insertions, 10 deletions
diff --git a/rdiff-backup/FAQ.html b/rdiff-backup/FAQ.html
index 27b246f..3da178e 100644
--- a/rdiff-backup/FAQ.html
+++ b/rdiff-backup/FAQ.html
@@ -32,11 +32,12 @@ module named __future__" or "SyntaxError: invalid syntax". What's
happening?</strong>
<P>rdiff-backup versions 0.2.x require Python version 2.1 or later,
-and versions 0.3.x require Python version 2.2 or later. If you don't
-know what version of python you are running, type in "python -V" from
-the shell. I'm sorry if this is inconvenient, but rdiff-backup uses
-generators, iterators, nested scoping, and static/class methods
-extensively, and these were only added in version 2.2.
+and versions 0.3.x and later require Python version 2.2 or later. If
+you don't know what version of python you are running, type in "python
+-V" from the shell. I'm sorry if this is inconvenient, but
+rdiff-backup uses generators, iterators, nested scoping, and
+static/class methods extensively, and these were only added in version
+2.2.
<P>If you have two versions of python installed, and running "python"
defaults to an early version, you'll probably have to change the first
@@ -176,7 +177,7 @@ it is usually easier to use source RPMs for this.
<a href="http://www.stanford.edu/~bescoto">Ben Escoto</a> <address><a href="mailto:bescoto@stanford.edu">&lt;bescoto@stanford.edu&gt;</a></address>
<!-- Created: Fri Sep 7 15:34:45 PDT 2001 -->
<!-- hhmts start -->
-Last modified: Sun Apr 7 12:04:13 PDT 2002
+Last modified: Mon Apr 29 23:59:11 PDT 2002
<!-- hhmts end -->
</body>
</html>
diff --git a/rdiff-backup/rdiff-backup.1 b/rdiff-backup/rdiff-backup.1
index dc0adfd..150dc5b 100644
--- a/rdiff-backup/rdiff-backup.1
+++ b/rdiff-backup/rdiff-backup.1
@@ -125,7 +125,7 @@ Like
.BR --include-filelist ,
but read the list of included files from standard input.
.TP
-.BI "--include-regexp" regexp
+.BI "--include-regexp " regexp
Include files matching the regular expression
.IR regexp .
Only files explicitly matched by
@@ -182,9 +182,12 @@ section for more information.
.BI "--remove-older-than " time_interval
Remove the incremental backup information in the destination directory
that has been around longer than time_interval. The time interval is
-an integer followed by the character s, m, h, D, M, or Y, indicating
-seconds, minutes, hours, days, months, or years respectively. Thus
-32m means 32 minutes, while 1M means one month (30 days).
+an integer followed by the character s, m, h, D, W, M, or Y,
+indicating seconds, minutes, hours, days, weeks, months, or years
+respectively, or a number of these concatenated. For example, 32m
+means 32 minutes, and 3W2D10h7s means 3 weeks, 2 days, 10 hours, and 7
+seconds. In this context, a month means 30 days, a year is 365 days,
+and a day is always 86400 seconds.
Note that this option is incompatible with backing up or restoring and
must be run in a separate instance of rdiff-backup. Remember also