Merge commit 'remotes/meins/master'

Conflicts:

	dss.ggo

diff --combined dss.ggo
index 46b4271936d1ae7e1fe7e958d0ecc7ce55ed876b,57e931323ad026336d5ba77f12d93d155f85e7dd..e91a4c5b90d4fd7ca015f77bf3264ff06e0e6b03
--- 1/dss.ggo
--- 2/dss.ggo
+++ b/dss.ggo
@@@ -21,6 -21,17 +21,17 @@@ details=
        configuration file. As usual, if an option is given both at
        the command line and in the configuration file, the command
        line option takes precedence.
+ 
+       However, there is an important exception to this rule:
+       If the --run option was given (see below) then dss honors
+       SIGHUP and re-reads its configuration file whenever it
+       receives this signal. In this case the options in the config
+       file override any options that were previously given at the
+       command line. This allows to change the configuration of a
+       running dss process on the fly by sending SIGHUP.
+ 
+       Note that it is not possible to change whether dss runs as
+       background daemon by sending SIGHUP.
  "
  
  option "daemon" d
@@@ -30,7 -41,7 +41,7 @@@ flag of
  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.
  "