summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
-rw-r--r--docs/README1
-rw-r--r--docs/inspircd.conf.example3
-rw-r--r--docs/inspircd.helpop-full.example8
-rw-r--r--docs/inspircd.helpop.example8
-rw-r--r--docs/inspircd.motd.example1
-rw-r--r--docs/modules.conf.example6
-rw-r--r--docs/modules/modules.conf.charybdis2
7 files changed, 15 insertions, 14 deletions
diff --git a/docs/README b/docs/README
index c64c2228b..e8dcfea77 100644
--- a/docs/README
+++ b/docs/README
@@ -3,7 +3,6 @@ Because of the dynamic nature of InspIRCd, we do not have traditional documentat
The documentation for InspIRCd can be found on our wiki, at http://wiki.inspircd.org
Our Bugtracker can be found at http://www.inspircd.org/bugtrack
Our Forum can be found at http://www.inspircd.org/forum
-Our Development blog can be found at http://www.inspircd.com
For online support, please connect to irc.inspircd.org, and join #inspircd
diff --git a/docs/inspircd.conf.example b/docs/inspircd.conf.example
index ffec002a2..322a6e820 100644
--- a/docs/inspircd.conf.example
+++ b/docs/inspircd.conf.example
@@ -268,6 +268,9 @@
# globalmax: Maximum global (network-wide) connections per IP (or CIDR mask, see below).
globalmax="3"
+ # maxconnwarn: Enable warnings when localmax or globalmax is hit (defaults to on)
+ maxconnwarn="off"
+
# useident: Defines if users in this class MUST respond to a ident query or not.
useident="no"
diff --git a/docs/inspircd.helpop-full.example b/docs/inspircd.helpop-full.example
index f85aab9f5..68eb266c9 100644
--- a/docs/inspircd.helpop-full.example
+++ b/docs/inspircd.helpop-full.example
@@ -799,7 +799,7 @@ Closes all unregistered connections to the local server.">
(IRCop only, requires invisible module).
R Blocks private messages from unregistered users
(requires services account module).
- S Strips mIRC colour/bold/underline codes out of private
+ S Strips mIRC color/bold/underline codes out of private
messages to the user (requires stripcolor module).
W Receives notification when a user uses WHOIS on them
(IRCop only, requires showwhois module).">
@@ -826,7 +826,7 @@ Closes all unregistered connections to the local server.">
users to join while the channel is invite-only
(requires inviteexception module).
- c Blocks messages containing mIRC colour codes
+ c Blocks messages containing mIRC color codes
(requires blockcolor module).
d [time] Blocks messages to a channel from new users
until they have been in the channel for [time]
@@ -899,7 +899,7 @@ Closes all unregistered connections to the local server.">
(requires nokicks module)
R Blocks unregistered users from joining (requires
services account module).
- S Strips mIRC colour codes from messages to the
+ S Strips mIRC color codes from messages to the
channel (requirs stripcolor module).
T Blocks /NOTICEs to the channel from users who are
not at least halfop (requires nonotice module).
@@ -1024,7 +1024,7 @@ Matching extbans:
Acting extbans:
- c:<ban> Blocks any messages that contain colour codes from
+ c:<ban> Blocks any messages that contain color codes from
matching users (requires blockcolor module).
m:<ban> Blocks messages from matching users (requires muteban
module). Users with +v or above are not affected.
diff --git a/docs/inspircd.helpop.example b/docs/inspircd.helpop.example
index 83019f170..3688f74b3 100644
--- a/docs/inspircd.helpop.example
+++ b/docs/inspircd.helpop.example
@@ -107,7 +107,7 @@ LOCKSERV UNLOCKSERV JUMPSERVER">
(IRCop only, requires invisible module).
R Blocks private messages from unregistered users
(requires services account module).
- S Strips mIRC colour/bold/underline codes out of private
+ S Strips mIRC color/bold/underline codes out of private
messages to the user (requires stripcolor module).
W Receives notification when a user uses WHOIS on them
(IRCop only, requires showwhois module).">
@@ -134,7 +134,7 @@ LOCKSERV UNLOCKSERV JUMPSERVER">
users to join while the channel is invite-only
(requires inviteexception module).
- c Blocks messages containing mIRC colour codes
+ c Blocks messages containing mIRC color codes
(requires blockcolor module).
f [*][lines]:[sec] Kicks on text flood equal to or above the
specified rate. With *, the user is banned
@@ -206,7 +206,7 @@ LOCKSERV UNLOCKSERV JUMPSERVER">
(requires nokicks module)
R Blocks unregistered users from joining (requires
services account module).
- S Strips mIRC colour codes from messages to the
+ S Strips mIRC color codes from messages to the
channel (requirs stripcolor module).
T Blocks /NOTICEs to the channel from users who are
not at least halfop (requires nonotice module).
@@ -254,7 +254,7 @@ help channel if you have any questions.">
<helpop key="extbans" value="Extended Bans
----------
- c:n!u@h Blocks any messages that contain colour codes from
+ c:n!u@h Blocks any messages that contain color codes from
matching users (requires blockcolor module).
j:#channel Prevents anyone in #channel from joining the channel
(requires channelban module).
diff --git a/docs/inspircd.motd.example b/docs/inspircd.motd.example
index 73e9f6082..0a1260c0c 100644
--- a/docs/inspircd.motd.example
+++ b/docs/inspircd.motd.example
@@ -27,7 +27,6 @@
-- To change, see inspircd.motd.example --
/ \
/ * Web: http://www.inspircd.org \
- | * Blog: http://www.inspircd.com |
| * IRC: irc.inspircd.org #inspircd |
| * Docs: http://wiki.inspircd.org |
| * Bugs: http://inspircd.org/bugtrack/ |
diff --git a/docs/modules.conf.example b/docs/modules.conf.example
index 21ee3d829..b688882d0 100644
--- a/docs/modules.conf.example
+++ b/docs/modules.conf.example
@@ -265,7 +265,7 @@
# capsmap="ABCDEFGHIJKLMNOPQRSTUVWXYZ! ">
#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
-# Block colour module: Blocking colour-coded messages with cmode +c
+# Block color module: Blocking color-coded messages with cmode +c
#<module name="m_blockcolor.so">
#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
@@ -393,7 +393,7 @@
#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
# Channel Names module: Allows disabling channels which have certain
-# characters in the channel name such as bold, colourcodes, etc which
+# characters in the channel name such as bold, colorcodes, etc which
# can be quite annoying and allow users to on occasion have a channel
# that looks like the name of another channel on the network.
#<module name="m_channames.so">
@@ -1634,7 +1634,7 @@
# your configuration file! #
#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
-# Strip colour module: Adds the channel mode +S
+# Strip color module: Adds the channel mode +S
#<module name="m_stripcolor.so">
#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
diff --git a/docs/modules/modules.conf.charybdis b/docs/modules/modules.conf.charybdis
index 509886269..8ba2f1b40 100644
--- a/docs/modules/modules.conf.charybdis
+++ b/docs/modules/modules.conf.charybdis
@@ -71,7 +71,7 @@
<module name="m_chancreate.so">
#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
# Channel Names module: Allows disabling channels which have certain
-# characters in the channel name such as bold, colourcodes, etc which
+# characters in the channel name such as bold, colorcodes, etc which
# can be quite annoying and allow users to on occasion have a channel
# that looks like the name of another channel on the network.
<module name="m_channames.so">