Merge branch 'maint'

[paraslash.git] / m4 / lls / server.suite.m4

diff --git a/m4/lls/server.suite.m4 b/m4/lls/server.suite.m4
index be8f02f5fa4bda5101f0b2ffa67f5e4332ec0b64..1c941c433b8fcd753beb09f1c619e1976e8c5817 100644 (file)
--- a/m4/lls/server.suite.m4
+++ b/m4/lls/server.suite.m4
@@ -133,7 +133,7 @@ version-string = GIT_VERSION()
                typestr = directory
                [help]
                        The directory which contains the database for the audio file
-                       selector. The default is ~/.paraslash/afs_database-0.4.
+                       selector. The default is ~/.paraslash/afs_database-0.7.
 
                        If no database was found, the "init" command must be executed to
                        initialize the database. Once initialized, audio files may added with
@@ -273,6 +273,11 @@ version-string = GIT_VERSION()
                [help]
                        See --http-access for details.
                [/help]
+       [option dccp-no-autostart]
+               summary = do not open the DCCP port on startup
+               [help]
+                       This is like --http-no-autostart but applies to the dccp sender.
+               [/help]
        [option dccp-max-clients]
                summary = maximal number of simultaneous dccp connections
                arg_info = required_arg