Automated merge with ssh://shadowircd/uranium/shadowircd/

diff --git a/help/Makefile.in b/help/Makefile.in
index 0f633f69b74a59053720797ed9580e97ff021ba3..b7c65c1e9404b61db4489403b83a96f75ebd08ac 100644 (file)
--- a/help/Makefile.in
+++ b/help/Makefile.in
@@ -12,7 +12,7 @@ helpdir=      @helpdir@
 uhelpdir=      ${helpdir}/users
 ohelpdir=      ${helpdir}/opers
 
-SYMLINKS=      topic accept admin names links away whowas \
+SYMLINKS=      topic accept admin extban names links away whowas \
                version kick who invite quit join list nick oper part \
                time credits motd userhost users whois ison lusers \
                user help pass error challenge knock ping pong \

diff --git a/help/opers/extban b/help/opers/extban
new file mode 100644 (file)
index 0000000..80e0b20
--- /dev/null
+++ b/help/opers/extban
@@ -0,0 +1,18 @@
+Extbans are all provided by extensions, some may not be present on this
+server.
+
+EXTBAN - DESCRIPTION
+------------------------------------------------------------------------
+     $o         Oper extban. Affects all operators.
+     $z         SSL extban. Affects all users connected via SSL.
+     $a[:mask]  Account extban. Affects anyone with an account that
+                matches. If the mask is omitted, it affects everyone
+                who is logged into services.
+     $j:mask    Banned from another channel extban. Affects anyone who
+                is banned from the specified channel.
+     $c:mask    Other channel extban. Affects anyone who is on the 
+                specified channel.
+     $x:mask    Extended extban. Matches a user's entire n!u@h gecos.
+     $r:mask    GECOS extban. Affects anyone with the realname/gecos
+                specified.
+     $s:mask    Server extban. Affects anyone on the specified server.
\ No newline at end of file

diff --git a/help/opers/index b/help/opers/index
index 56171ec4ce4f797d1e4c1f59ea0247a6645cd7d2..87243c41fedb0902a89ecb223ad51a6cafc463e8 100644 (file)
--- a/help/opers/index
+++ b/help/opers/index
@@ -4,20 +4,28 @@ ACCEPT          ADMIN           AWAY            CAPAB
 CHALLENGE       CHANTRACE       CLOSE           CMODE
 CNOTICE         CONNECT         CPRIVMSG        CREDITS
 DIE             DLINE           ERROR           ETRACE
-HELP            INDEX           INFO            INVITE
-ISON            JOIN            KICK            KILL
-KLINE           KNOCK           LINKS           LIST
-LOCOPS          LUSERS          MAP             MASKTRACE
-MODLIST         MODLOAD         MODRELOAD       MODRESTART
-MODUNLOAD       MOTD            NAMES           NICK
-NOTICE          OPER            OPERSPY         OPERWALL
-PART            PASS            PING            PONG
-POST            PRIVMSG         QUIT            REHASH
-RESTART         RESV            SCAN            SERVER
-SET             SJOIN           SNOMASK         SQUIT
-STATS           SVINFO          TESTGECOS       TESTLINE
-TESTMASK        TIME            TOPIC           TRACE
-UHELP           UMODE           UNDLINE         UNKLINE
-UNREJECT        UNRESV          UNXLINE         USER
-USERHOST        USERS           VERSION         WALLOPS
-WHO             WHOIS           WHOWAS          XLINE
+EXTBAN          HELP            INDEX           INFO
+INVITE          ISON            JOIN            KICK
+KILL            KLINE           KNOCK           LINKS
+LIST            LOCOPS          LUSERS          MAP
+MASKTRACE       MODLIST         MODLOAD         MODRELOAD
+MODRESTART      MODUNLOAD       MOTD            NAMES
+NICK            NOTICE          OPER            OPERSPY
+OPERWALL        PART            PASS            PING
+PONG            POST            PRIVMSG         QUIT
+REHASH          RESTART         RESV            SCAN
+SERVER          SET             SJOIN           SNOMASK
+SQUIT           STATS           SVINFO          TESTGECOS
+TESTLINE        TESTMASK        TIME            TOPIC
+TRACE           UHELP           UMODE           UNDLINE
+UNKLINE         UNREJECT        UNRESV          UNXLINE
+USER            USERHOST        USERS           VERSION
+WALLOPS         WHO             WHOIS           WHOWAS
+XLINE
+
+The following commands are provided by extensions and
+may not be present on your server:
+ADMINWALL       CYCLE           FINDFORWARDS    FORCEJOIN
+FORCEPART       IDENTIFY        MKPASSWD        OACCEPT
+OJOIN           OKICK           OLIST           OMODE
+OPME            SENDBANS
\ No newline at end of file

diff --git a/help/users/index b/help/users/index
index 654cf5f5eb8bc989e171b1920087de116a2cc47c..396f1c4bc26f178b81041a057c31619c493c7ecf 100644 (file)
--- a/help/users/index
+++ b/help/users/index
@@ -2,12 +2,17 @@ Help topics available to users:
 
 ACCEPT          ADMIN           AWAY            CHALLENGE
 CMODE           CNOTICE         CPRIVMSG        CREDITS
-ERROR           HELP            INDEX           INFO
-INVITE          ISON            JOIN            KICK
-KNOCK           LINKS           LIST            LUSERS
-MAP             MOTD            NAMES           NICK
-NOTICE          OPER            PART            PASS
-PING            PONG            PRIVMSG         QUIT
-STATS           TIME            TOPIC           TRACE
-UMODE           USER            USERHOST        USERS
-VERSION         WHO             WHOIS           WHOWAS
+ERROR           EXTBAN          HELP            INDEX
+INFO            INVITE          ISON            JOIN
+KICK            KNOCK           LINKS           LIST
+LUSERS          MAP             MOTD            NAMES
+NICK            NOTICE          OPER            PART
+PASS            PING            PONG            PRIVMSG
+QUIT            STATS           TIME            TOPIC
+TRACE           UMODE           USER            USERHOST
+USERS           VERSION         WHO             WHOIS
+WHOWAS
+
+The following commands are provided by extensions and
+may not be present on your server:
+CYCLE           IDENTIFY        MKPASSWD
\ No newline at end of file