Merge commit 'remotes/meins/master'

Conflicts:

	dss.ggo

diff --git a/dss.ggo b/dss.ggo
index 57e931323ad026336d5ba77f12d93d155f85e7dd..e91a4c5b90d4fd7ca015f77bf3264ff06e0e6b03 100644 (file)
--- a/dss.ggo
+++ b/dss.ggo
@@ -41,7 +41,7 @@ flag off
 dependon="logfile"
 details="
        Note that dss refuses to start in daemon mode if no logfile
-       was specified. This option makes sense only in conjunction
+       was specified. This option is mostly useful in conjuction
        with the -R option described below.
 "