diff options
| author | Peter Powell <petpow@saberuk.com> | 2017-10-12 15:55:21 +0100 |
|---|---|---|
| committer | Peter Powell <petpow@saberuk.com> | 2017-10-12 15:55:21 +0100 |
| commit | a3e0768758ca68429a29d9c78ce672f2d938c6e7 (patch) | |
| tree | a66b4c4f917d56e1cef8ffda450d535ea532be35 /docs | |
| parent | c46f8a368c42f64284244f3d2dfc022a383294fa (diff) | |
| parent | 0337b92c158fa662f04056343affd59315da78db (diff) | |
Merge the latest changes from insp20 into master.
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/conf/inspircd.conf.example | 3 | ||||
| -rw-r--r-- | docs/conf/modules.conf.example | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/docs/conf/inspircd.conf.example b/docs/conf/inspircd.conf.example index c90cf5755..c08982b98 100644 --- a/docs/conf/inspircd.conf.example +++ b/docs/conf/inspircd.conf.example @@ -417,7 +417,8 @@ # represented as 192.168.1.0/24). This means that abuse across an ISP # # is detected and curtailed much easier. Here is a good chart that # # shows how many IPs the different CIDRs correspond to: # -# http://en.wikipedia.org/wiki/CIDR#Prefix_aggregation # +# https://en.wikipedia.org/wiki/IPv4_subnetting_reference # +# https://en.wikipedia.org/wiki/IPv6_subnetting_reference # # # <cidr diff --git a/docs/conf/modules.conf.example b/docs/conf/modules.conf.example index 383c6a173..a555d8be2 100644 --- a/docs/conf/modules.conf.example +++ b/docs/conf/modules.conf.example @@ -1694,7 +1694,7 @@ # as shown below: # #<securehost exception="*@*.netsplit.de"> #<securehost exception="*@*.ircdriven.com"> -#<securehost exception="*@*.irc-source.com"> +#<securehost exception="*@*.ircs.me"> # # # Define the following variable to change how long a user must wait # # before issuing a LIST. If not defined, defaults to 60 seconds. # @@ -1826,7 +1826,7 @@ # You can optionally let the user know that their command was blocked. # # You may also let SHUN affect opers (defaults to no). -#<shun enabledcommands="PING PONG QUIT PART JOIN" notifyuser="yes" affectopers="no"> +#<shun enabledcommands="ADMIN PING PONG QUIT PART JOIN" notifyuser="yes" affectopers="no"> #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-# # SSL channel mode module: Adds support for SSL-only channels via @@ -1899,7 +1899,7 @@ # SQLite3 module: Allows other SQL modules to access SQLite3 # # databases through a unified API. # # This module is in extras. Re-run configure with: # -# ./configure --enable-extras=m_sqlite.cpp +# ./configure --enable-extras=m_sqlite3.cpp # and run make install, then uncomment this module to enable it. # # #<module name="sqlite3"> |