Merge insp20

6 files changed, 33 insertions, 25 deletions

diff --git a/docs/conf/helpop-full.conf.example b/docs/conf/helpop-full.conf.example
index a6d3c7cd1..6268ba9ca 100644
--- a/docs/conf/helpop-full.conf.example
+++ b/docs/conf/helpop-full.conf.example
@@ -361,8 +361,8 @@ Sets your name to the specified name.">
 <helpop key="coper" value="Oper Commands
 -------------
 
-OPERMOTD  CHECK     CLONES      USERIP   LINE
-ALLTIME   MODULES   WALLOPS     GLOBOPS
+OPERMOTD  CHECK     CLONES      USERIP   TLINE
+ALLTIME   WALLOPS   GLOBOPS
 
 SETHOST   SETIDENT  CHGHOST     CHGIDENT CHGNAME
 SETIDLE   SWHOIS
diff --git a/docs/conf/helpop.conf.example b/docs/conf/helpop.conf.example
index 5f33b6d88..6d6a81719 100644
--- a/docs/conf/helpop.conf.example
+++ b/docs/conf/helpop.conf.example
@@ -34,7 +34,7 @@ PRIVMSG   NOTICE   NICK      JOIN      PART
 CYCLE     KNOCK    MODE      DEVOICE   TOPIC
 KICK      FPART    REMOVE    TBAN      INVITE
 UNINVITE  AWAY     DCCALLOW  SILENCE   ACCEPT
-MKPASSWD  VHOST    TITLE
+MKPASSWD  VHOST    TITLE     SETNAME
 
 WHOIS     WHOWAS   ISON      USERHOST  WATCH
 LIST      NAMES    WHO       MOTD
@@ -49,11 +49,11 @@ OPER">
 <helpop key="coper" value="Oper Commands
 -------------
 
-OPERMOTD  CHECK     TAXONOMY    CLONES   USERIP
-TLINE     ALLTIME   MODULES     WALLOPS  GLOBOPS
+OPERMOTD  CHECK     CLONES      USERIP   TLINE
+ALLTIME   WALLOPS   GLOBOPS
 
-SETHOST   SETIDENT  SETNAME     CHGHOST  CHGIDENT
-CHGNAME   SETIDLE   SWHOIS
+SETHOST   SETIDENT  CHGHOST     CHGIDENT CHGNAME
+SETIDLE   SWHOIS
 
 SANICK    NICKLOCK  NICKUNLOCK
 
diff --git a/docs/conf/inspircd.conf.example b/docs/conf/inspircd.conf.example
index fd7973f39..737e05e5a 100644
--- a/docs/conf/inspircd.conf.example
+++ b/docs/conf/inspircd.conf.example
@@ -236,7 +236,7 @@
 
 <connect
          # deny: Will not let people connect if they have specified host/IP.
-         deny="69.254.*">
+         deny="192.0.2.*">
 
 # connect:reason is the message that users will see if they match a deny block
 <connect deny="3ffe::0/32" reason="The 6bone address space is deprecated">
@@ -253,7 +253,7 @@
          parent="main"
 
          # allow: What IP addresses/hosts to allow for this block.
-         allow="196.12.*"
+         allow="203.0.113.*"
 
          # hash: what hash this password is hashed with. requires the module
          # for selected hash (m_md5.so, m_sha256.so or m_ripemd160.so) be
@@ -734,13 +734,15 @@
           #  no        Do not show
           operspywhois="no"
 
-          # runasuser: If this is set, InspIRCd will attempt to setuid
-          # to run as this user- allows binding of ports under 1024.
+          # runasuser: If this is set, InspIRCd will attempt to switch
+          # to run as this user, which allows binding of ports under 1024.
+          # You should NOT set this unless you are starting as root.
           # NOT SUPPORTED/NEEDED UNDER WINDOWS.
           #runasuser=""
 
-          # runasgroup: If this is set, InspIRCd will attempt to set group
-          # to run under this group, which allows binding of ports under 1024
+          # runasgroup: If this is set, InspIRCd will attempt to switch
+          # to run as this group, which allows binding of ports under 1024.
+          # You should NOT set this unless you are starting as root.
           # NOT SUPPORTED/NEEDED UNDER WINDOWS.
           #runasgroup=""
 
@@ -894,7 +896,7 @@
 
 <badip
        # ipmask: IP range to ban. Wildcards and CIDR can be used.
-       ipmask="69.69.69.69"
+       ipmask="192.0.2.69"
 
        # reason: Reason to display when user is disconnected.
        reason="No porn here thanks.">
@@ -913,22 +915,22 @@
 <badhost
          # host: ident@hostname to ban.
          # Wildcards and CIDR (if you specify an IP) can be used.
-         host="*@hundredz.n.hundredz.o.1337.kiddies.com"
+         host="*@hundredz.n.hundredz.o.1337.kiddies.example.net"
 
          # reason: Reason to display when user is disconnected
          reason="Too many 1337 kiddiots">
 
-<badhost host="root@*" reason="Don't irc as root!">
-<badhost host="*@172.32.0.0/16" reason="This subnet is bad.">
+<badhost host="root@*" reason="Don't IRC as root!">
+<badhost host="*@198.51.100.0/24" reason="This subnet is bad.">
 
 # exception: Hosts that are exempt from [kgz]lines.
 <exception
            # host: ident@hostname to exempt.
            # Wildcards and CIDR (if you specify an IP) can be used.
-           host="*@ircop.host.com"
+           host="*@ircop.example.com"
 
            # reason: Reason for exception. Only shown in /stats e
-           reason="Opers hostname">
+           reason="Oper's hostname">
 
 #-#-#-#-#-#-#-#-#-#-#- INSANE BAN OPTIONS  -#-#-#-#-#-#-#-#-#-#-#-#-#-#
 #                                                                     #
diff --git a/docs/conf/links.conf.example b/docs/conf/links.conf.example
index b196c5621..5e36689f0 100644
--- a/docs/conf/links.conf.example
+++ b/docs/conf/links.conf.example
@@ -29,7 +29,7 @@
 
       # allowmask: Range of IP addresses to allow for this link.
       # Can be a CIDR (see example).
-      allowmask="69.58.44.0/24 127.0.0.0/8"
+      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
@@ -74,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"
diff --git a/docs/conf/modules.conf.example b/docs/conf/modules.conf.example
index 2ab1adebf..672bcb9d0 100644
--- a/docs/conf/modules.conf.example
+++ b/docs/conf/modules.conf.example
@@ -842,6 +842,9 @@
 # a <bind> tag with type "httpd", and load at least one of the other
 # m_httpd_* modules to provide pages to display.
 #
+# You can adjust the timeout for HTTP connections below. All HTTP
+# connections will be closed after (roughly) this many seconds.
+#<httpd timeout="20">
 
 #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
 # http ACL module: Provides access control lists for m_httpd dependent
@@ -1557,7 +1560,8 @@
 
 #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
 # SASL authentication module: Provides support for IRC Authentication 
-# Layer (aka: atheme SASL) via AUTHENTICATE.
+# Layer via AUTHENTICATE. Note: You also need to have m_cap.so loaded
+# for SASL to work.
 #<module name="m_sasl.so">
 
 #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
@@ -1816,6 +1820,8 @@
 # SVSHold module: Implements SVSHOLD. Like Q:Lines, but can only be   #
 # added/removed by Services.                                          #
 #<module name="m_svshold.so">
+# If silent is true no snotices will be generated by SVSHOLD.
+#<svshold silent="false">
 
 #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
 # SWHOIS module: Allows you to add arbitary lines to user WHOIS.
diff --git a/docs/conf/opers.conf.example b/docs/conf/opers.conf.example
index b39c73e43..a759622a4 100644
--- a/docs/conf/opers.conf.example
+++ b/docs/conf/opers.conf.example
@@ -90,7 +90,7 @@
       # Multiple options can be separated by spaces and CIDR's are allowed.
       # You CAN use just * or *@* for this section, but it is not recommended
       # for security reasons.
-      host="ident@dialup15.isp.com *@localhost *@server.com *@3ffe::0/16"
+      host="yourident@dialup15.isp.com *@localhost *@example.com *@2001:db8::/32"
 
       # ** ADVANCED ** This option is disabled by default.
       # fingerprint: When using the m_sslinfo module, you may specify
@@ -127,7 +127,7 @@
 <oper
       name="Brain"
       password="s3cret"
-      host="ident@dialup15.isp.com *@localhost *@server.com *@3ffe::0/16"
+      host="yourident@dialup15.isp.com *@localhost *@example.com *@2001:db8::/32"
       #fingerprint="67cb9dc013248a829bb2171ed11becd4"
       type="NetAdmin">
 
@@ -155,7 +155,7 @@
       # Multiple options can be separated by spaces and CIDR's are allowed.
       # You CAN use just * or *@* for this section, but it is not recommended
       # for security reasons.
-      host="ident@dialup15.isp.com *@localhost *@server.com *@3ffe::0/16"
+      host="yourident@dialup15.isp.com *@localhost *@example.com *@2001:db8::/32"
 
       # type: What oper type this oline is. See the block above for list
       # of types. NOTE: This is case-sensitive as well.