Merged silc_1_0_branch to trunk.

[silc.git] / doc / example_silcd.conf.in

diff --git a/doc/example_silcd.conf.in b/doc/example_silcd.conf.in
index 2610cb23ba34be08461735a7b49472551f5c236e..9820b2ba60540377dce226c570e07c12853e3c36 100644 (file)
--- a/doc/example_silcd.conf.in
+++ b/doc/example_silcd.conf.in
@@ -48,8 +48,9 @@ General {
        # without FQDN cannot connect to the server.
        #require_reverse_lookup = true;
 
-       # Maximum number of incoming connections allowed to this server.
-       # If more attempt to connect they will be refused.
+       # Maximum number of connections server can handle.  If you want
+       # to limit the number of incoming connections, define the
+       # connections_max in the ConnectionParams.
        connections_max = 1000;
 
        # Maximum number of incoming connections allowed per single host.
@@ -158,6 +159,9 @@ General {
        #qos_limit_sec = 0;
        #qos_limit_usec = 500000;
 
+       # Limit on how many channels one client can join.  Default is 50.
+       #channel_join_limit = 100;
+
        # Debug string.  Debug string can be set to print debugging from
        # the running server.  The debug is redirected to stderr.
        # debug_string = "";