updates.

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

diff --git a/doc/example_silcd.conf.in b/doc/example_silcd.conf.in
index ce9c2e9816c6fa08b964ab7f337b833e11572e38..2f68295b54a21f2fe2092d2184f8bc683f665d1c 100644 (file)
--- a/doc/example_silcd.conf.in
+++ b/doc/example_silcd.conf.in
@@ -32,7 +32,7 @@ General {
        # over public key authentication in these cases.
        #prefer_passphrase_auth = true;
 
-       # Set this to true if you the server to require fully qualified
+       # Set this to true if the server should require fully qualified
        # domain names (FQDN) for incoming connections.
        #require_reverse_lookup = false;        
 
@@ -46,7 +46,8 @@ General {
        # interval grows when reconnect count grows.  Next example will
        # attempt to reconnect after 10 seconds of disconnect, and the
        # interval grows up to 600 seconds or until 7 times was attempted
-       # to reconnect.
+       # to reconnect.  These settings has effect only when connecting
+       # as initiator.
        #
        # reconnect_count        - how many times reconnect is attempted
        # reconnect_interval     - how often reconnect it performed (seconds)
@@ -94,7 +95,7 @@ ServerInfo {
        #
        # Admin's email address
        #
-       EMail = "priikone@poseidon.pspt.fi";
+       AdminEmail = "priikone@poseidon.pspt.fi";
 
        #
        # Run SILC server as specific user and group. The server must be 
@@ -127,6 +128,7 @@ ServerInfo {
 #
 # This section is used to set various logging files, their paths, maximum
 # sizes and logging options.
+#
 # There are only four defined channels allowed for defining (see below).
 # The log channels have an importance value, and most important channels
 # are redirected on the less important ones, thus setting a valid logging
@@ -192,7 +194,8 @@ ConnectionParam {
        # interval grows when reconnect count grows.  Next example will
        # attempt to reconnect after 10 seconds of disconnect, and the
        # interval grows up to 600 seconds or until 7 times was attempted
-       # to reconnect.
+       # to reconnect.  These settings has effect only when connecting
+       # as initiator.
        #
        # reconnect_count        - how many times reconnect is attempted
        # reconnect_interval     - how often reconnect it performed (seconds)
@@ -233,11 +236,11 @@ ConnectionParam {
 # Next example connection will match to all incoming client connections,
 # and no authentication is required
 #
-Client { 
-       #host = "";
-       #passphrase = "secret";
-       #publickey = "/path/to/the/public.key";
-       param = "normal";
+Client {
+       #Host = "10.1.*";
+       #Passphrase = "secret";
+       #PublicKey = "/path/to/the/public.key";
+       Param = "normal";
 };
 
 #
@@ -281,7 +284,7 @@ Admin {
 ServerConnection {
        Host = "10.2.1.7";
        Passphrase = "verysecret";
-       # Publickey = "/path/to/the/public.key";
+       #Publickey = "/path/to/the/public.key";
        VersionID = 1;
        Param = "normal";
        Backup = false;
@@ -316,7 +319,7 @@ RouterConnection {
        Host = "10.2.1.100";
        Port = 706;
        Passphrase = "verysecret";
-       # Publickey = "/path/to/the/public.key";
+       #Publickey = "/path/to/the/public.key";
        VersionID = 1;
        Param = "normal";
        Initiator = true;