From: Andre Noll <maan@systemlinux.org>
Date: Tue, 23 Dec 2008 22:14:34 +0000 (+0100)
Subject: Merge commit 'fml/master'
X-Git-Tag: v0.1.3~22^2~1
X-Git-Url: http://git.tuebingen.mpg.de/?a=commitdiff_plain;h=1b6ecb6d4ea35cbc9ab77dddaaa8a68b7436d019;hp=a883830b42e84c58233efcf05c16e9aa4bb7597f;p=dss.git

Merge commit 'fml/master'
---

diff --git a/INSTALL b/INSTALL
index 8dd3846..1043ec5 100644
--- a/INSTALL
+++ b/INSTALL
@@ -9,6 +9,14 @@ some directory that is included in your PATH, e.g. to $HOME/bin or to
 Note that you'll likely need a recent version of
 ftp://ftp.gnu.org/pub/gnu/gengetopt/ (gnu gengetopt) to compile dss.
 
+Optionally, type
+
+	 make man
+
+to create the man page of dss. This invokes help2man so make sure
+that help2man is installed on your system. Note that the man page is
+just the nroff variant of the output of "dss --detailed-help".
+
 dss is known to compile on Linux, MacOS, Solaris, FreeBSD and
 NetBSD. However, it is run-tested only on Linux.
 
diff --git a/dss.ggo b/dss.ggo
index 4d14019..bca3fff 100644
--- a/dss.ggo
+++ b/dss.ggo
@@ -350,8 +350,8 @@ details="
 	If this flag is not given dss removes redundant and outdated
 	snapshots automatically.
 
-	Otherwise, this feature is deactivated so that snapshots
-	are only being removed in case disk space or inode ratio
+	Otherwise, this feature is deactivated so that snapshots are
+	only being removed in case disk space or number of free inodes
 	becomes low. Use this flag if the file system containing the
 	destination directory is used for snapshots only.
 "