Merge branch 'bug167-WebircIPAnoDNS' of git://arthur.barton.de/ngircd-alex

[ngircd-alex.git] / doc / sample-ngircd.conf.tmpl

diff --git a/doc/sample-ngircd.conf.tmpl b/doc/sample-ngircd.conf.tmpl
index 1bdf01ee4f2b7309ec864ea75a389694b368e352..ec425bd284686546de2cc36bb330b82151937ba3 100644 (file)
--- a/doc/sample-ngircd.conf.tmpl
+++ b/doc/sample-ngircd.conf.tmpl
@@ -54,6 +54,12 @@
        # A simple Phrase (<256 chars) if you don't want to use a motd file.
        ;MotdPhrase = "Hello world!"
 
+       # The name of the IRC network to which this server belongs. This name
+       # is optional, should only contain ASCII characters, and can't contain
+       # spaces. It is only used to inform clients. The default is empty,
+       # so no network name is announced to clients.
+       ;Network = aIRCnetwork
+
        # Global password for all users needed to connect to the server.
        # (Default: not set)
        ;Password = abc
@@ -249,11 +255,9 @@
        ;CertFile = :ETCDIR:/ssl/server-cert.pem
 
        # Select cipher suites allowed for SSL/TLS connections. This defaults
-       # to the empty string, so all supported ciphers are allowed. Please
-       # see 'man 1ssl ciphers' (OpenSSL) and 'man 3 gnutls_priority_init'
+       # to HIGH:!aNULL:@STRENGTH (OpenSSL) or SECURE128 (GnuTLS).
+       # See 'man 1ssl ciphers' (OpenSSL) or 'man 3 gnutls_priority_init'
        # (GnuTLS) for details.
-       # For example, this setting allows only "high strength" cipher suites,
-       # disables the ones without authentication, and sorts by strength:
        # For OpenSSL:
        ;CipherList = HIGH:!aNULL:@STRENGTH
        # For GnuTLS: