Merge insp20

[user/henk/code/inspircd.git] / docs / conf / links.conf.example

diff --git a/docs/conf/links.conf.example b/docs/conf/links.conf.example
index 94340cd31d4e62a616bb6cc36b9367b862a492cc..13754edbd03bcff24821430bcd788e53fd856d2a 100644 (file)
--- a/docs/conf/links.conf.example
+++ b/docs/conf/links.conf.example
@@ -29,38 +29,37 @@
 
       # allowmask: Range of IP addresses to allow for this link.
       # Can be a CIDR (see example).
-      allowmask="69.58.44.0/24"
+      allowmask="203.0.113.0/24 127.0.0.0/8 2001:db8::/32"
 
       # timeout: If defined, this option defines how long the server
       # will wait to consider the connect attempt failed and try the
       # failover (see above).
       timeout="300"
 
-      # ssl: If defined, this states extra modules that will be used when
+      # ssl: If defined, this states the SSL module that will be used when
       # making an outbound connection to the server. Options are: "openssl"
-      # and "gnutls" for encryption (they are compatible with each other).
-      # You must use the same (or a compatible) transport on both sides of the link.
+      # and "gnutls" (they are compatible with each other).
       #
-      # You will need to load the m_ssl_openssl.so module for openssl,
-      # m_ssl_gnutls.so for gnutls. The server port that you connect to
+      # You will need to load the m_ssl_openssl.so module for OpenSSL,
+      # m_ssl_gnutls.so for GnuTLS. The server port that you connect to
       # must be capable of accepting this type of connection.
       ssl="gnutls"
 
       # fingerprint: If defined, this option will force servers to be
-      # authenticated using SSL Fingerprints. See http://wiki.inspircd.org/SSL
-      # for more information. This will require an SSL link for both inbound
-      # and outbound connections.
+      # authenticated using SSL certificate fingerprints. See
+      # http://wiki.inspircd.org/SSL for more information. This will
+      # require an SSL link for both inbound and outbound connections.
       #fingerprint=""
 
       # bind: Local IP address to bind to.
       bind="1.2.3.4"
 
-      # statshidden: defines if IP is shown to opers when
-      # /stats c is invoked.
+      # statshidden: Defines if IP is shown to opers when
+      # /STATS c is invoked.
       statshidden="no"
 
       # hidden: If this is set to yes, this server and its "child"
-      # servers will not be shown when users do a /map or /links
+      # servers will not be shown when users do a /MAP or /LINKS.
       hidden="no"
 
       # passwords: the passwords we send and receive.
@@ -75,7 +74,7 @@
 <link name="hub.penguin.org"
       ipaddr="penguin.box.com"
       port="7000"
-      allowmask="69.58.44.0/24"
+      allowmask="203.0.113.0/24"
       timeout="300"
       ssl="gnutls"
       bind="1.2.3.4"
@@ -96,11 +95,11 @@
 # Simple autoconnect block. This enables automatic connection of a server
 # Recommended setup is to have leaves connect to the hub, and have no
 # automatic connections started by the hub.
-<autoconnect period="300" server="hub.penguin.org">
+<autoconnect period="10m" server="hub.penguin.org">
 
 # Failover autoconnect block. If you have multiple hubs, or want your network
 # to automatically link even if the hub is down, you can specify multiple
-# space seperated servers to autoconnect; they will be tried in a round
+# space separated servers to autoconnect; they will be tried in a round
 # robin fashion until one succeeds. Period defines the time for restarting
 # a single loop.
 <autoconnect period="120"