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 a5312e248b649a028d973b4118b1e2403db5a3eb..9820b2ba60540377dce226c570e07c12853e3c36 100644 (file)
--- a/doc/example_silcd.conf.in
+++ b/doc/example_silcd.conf.in
@@ -159,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 = "";