Various changes for v0.11.1 (see CHANGELOG)

git-svn-id: http://svn.savannah.nongnu.org/svn/rdiff-backup/trunk@256 2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109

1 files changed, 6 insertions, 10 deletions

diff --git a/rdiff-backup/rdiff-backup.1 b/rdiff-backup/rdiff-backup.1
index 03f52ee..5dc8c18 100644
--- a/rdiff-backup/rdiff-backup.1
+++ b/rdiff-backup/rdiff-backup.1
@@ -217,16 +217,12 @@ The default is
 "(?i).*\\.(gz|z|bz|bz2|tgz|zip|rpm|deb|jpg|gif|png|jp2|mp3|ogg|avi|wmv|mpeg|mpg|rm|mov)$"
 .TP
 .BI --no-hard-links
-Don't preserve hard links from source to mirror directories.
-Otherwise, no increment files will themselves be hard linked, but a
-hard link database will be written so that hard links from any dataset
-will be recreated if originally present.  If many hard linked files
-are present, this option can drastically decrease memory usage.
-.TP
-.B --no-resume
-Do not resume last aborted backup even if it falls within the resume
-window.
-.TP
+Don't replicate hard links on destination side.  Note that because
+metadata is written to a separate file, hard link information will not
+be lost even if the --no-hard-links option is given (however, mirror
+files will not be linked).  If many hard-linked files are present,
+this option can drastically increase memory usage.
+..TP
 .B --null-separator
 Use nulls (\\0) instead of newlines (\\n) as line separators, which
 may help when dealing with filenames containing newlines.  This