X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/212380e3f42f585dc1ea927402252eb943f91f7b..8ad278b08812c06f7c7f97a7346f99319ba134a3:/doc/sgml/oper-guide/commands.sgml

diff --git a/doc/sgml/oper-guide/commands.sgml b/doc/sgml/oper-guide/commands.sgml
index 25726e2..05f2b32 100644
--- a/doc/sgml/oper-guide/commands.sgml
+++ b/doc/sgml/oper-guide/commands.sgml
@@ -42,8 +42,6 @@
 	    <arg>DNS</arg>
 	    <arg>MOTD</arg>
 	    <arg>OMOTD</arg>
-	    <arg>GLINES</arg>
-	    <arg>PGLINES</arg>
 	    <arg>TKLINES</arg>
 	    <arg>TDLINES</arg>
 	    <arg>TXLINES</arg>
@@ -83,18 +81,6 @@
 	      <para>Reload the operator MOTD file</para>
 	    </listitem>
 	  </varlistentry>
-	  <varlistentry>
-	    <term>GLINES</term>
-	    <listitem>
-	      <para>Clears G:lines.</para>
-	    </listitem>
-	  </varlistentry>
-	  <varlistentry>
-	    <term>PGLINES</term>
-	    <listitem>
-	      <para>Clears pending G:lines.</para>
-	    </listitem>
-	  </varlistentry>
 	  <varlistentry>
 	    <term>TKLINES</term>
 	    <listitem>
@@ -417,12 +403,17 @@
 	<para>
 	  Adds a D:line to <filename>dline.conf</filename>, which will deny any connections
 	  from the given IP address.
+	  The IP address can be given as a full address (192.168.0.1) or
+	  as a CIDR mask (192.168.0.0/24).
 	</para>
 	<para>
 	  If the optional parameter <replaceable>length</replaceable> is given, the D:line will
 	  be temporary (i.e. it will not be stored on disk) and last that
 	  long in minutes.
 	</para>
+	<para>
+	  All clients matching the D:line will be disconnected from the server immediately.
+	</para>
 	<para>
 	  If a reason is specified, it will be sent to the client when they are disconnected, and,
 	  if dline_reason is enabled,
@@ -436,7 +427,7 @@
 	  D:lines cannot be set remotely on other servers.
 	</para>
 	<para>
-	  Only exempt{} blocks exempt from D:lines on initial connection.
+	  Only exempt{} blocks exempt from D:lines.
 	  Being a server or having kline_exempt in auth{} does
 	  <emphasis>not</emphasis> exempt (different from K/G/X:lines).
 	</para>
@@ -452,46 +443,6 @@
 	  a temporary D:line.
 	</para>
       </sect2>
-      <sect2>
-	<title>GLINE</title>
-	<cmdsynopsis>
-	  <command>GLINE</command>
-	  <group>
-	    <arg choice=plain><replaceable>user</replaceable>@<replaceable>host</replaceable></arg>
-	    <arg choice=plain><replaceable>user</replaceable>@<replaceable>a</replaceable>.<replaceable>b</replaceable>.<replaceable>c</replaceable>.<replaceable>d</replaceable></arg>
-	  </group>
-	  <arg choice=plain>:<replaceable>reason</replaceable></arg>
-	</cmdsynopsis>
-	<para>
-	  Attempts to add a network-wide ban for the given mask.
-	  It takes three different opers on three different servers
-	  requesting the same G:line to have it triggered for a configured
-	  time.
-	</para>
-	<para>
-	  Once triggered, a G:line is similar to a temporary K:line on
-	  each server. No further propagation or on-disk storage is done.
-	</para>
-	<note><para>
-	  This command can be enabled or disabled in the configuration file.
-	  If it is disabled, no oper on the server can issue a G:line and no
-	  G:lined user is banned, but G:lines are still propagated to other
-	  servers which may have G:lines enabled.
-	</para></note>
-      </sect2>
-      <sect2>
-	<title>UNGLINE</title>
-	<cmdsynopsis>
-	  <command>UNGLINE</command>
-	  <group>
-	    <arg choice=plain><replaceable>user</replaceable>@<replaceable>host</replaceable></arg>
-	    <arg choice=plain><replaceable>user</replaceable>@<replaceable>a</replaceable>.<replaceable>b</replaceable>.<replaceable>c</replaceable>.<replaceable>d</replaceable></arg>
-	  </group>
-	</cmdsynopsis>
-	<para>
-	  Removes the given G:line on this server.
-	</para>
-      </sect2>
       <sect2>
 	<title>TESTGECOS</title>
 	<cmdsynopsis>
@@ -530,6 +481,10 @@
 	  in use. As of charybdis 2.1.1, no_tilde and username truncation will
 	  be taken into account like in the normal client access check.
 	</para>
+	<para>
+	  As of charybdis 2.2.0, a channel name can be specified and the
+	  RESV will be returned, if there is one.
+	</para>
       </sect2>
       <sect2>
 	<title>TESTMASK</title>
@@ -889,18 +844,6 @@
 	      <para>Show file descriptors</para>
 	    </listitem>
 	  </varlistentry>
-	  <varlistentry>
-	    <term>g</term>
-	    <listitem>
-	      <para>Show pending glines</para>
-	    </listitem>
-	  </varlistentry>
-	  <varlistentry>
-	    <term>G</term>
-	    <listitem>
-	      <para>Show active glines</para>
-	    </listitem>
-	  </varlistentry>
 	  <varlistentry>
 	    <term>h</term>
 	    <listitem>
@@ -916,13 +859,13 @@
 	  <varlistentry>
 	    <term>k</term>
 	    <listitem>
-	      <para>Show temporary K:lines, or matched temporary K:lines</para>
+	      <para>Show temporary K:lines, or matched K:lines</para>
 	    </listitem>
 	  </varlistentry>
 	  <varlistentry>
 	    <term>K</term>
 	    <listitem>
-	      <para>Show permanent K:lines, or matched permanent K:lines</para>
+	      <para>Show permanent K:lines, or matched K:lines</para>
 	    </listitem>
 	  </varlistentry>
 	  <varlistentry>
@@ -931,8 +874,9 @@
 	      <para>
 		Show hostname and link information about the given nick.
 		With a server name, show information about opers and servers
-		on that server; opers also get information about all local users
-		if they query their own server.
+		on that server; opers get information about all local
+		connections if they query their own server.
+		No hostname is shown for server connections.
 	      </para>
 	    </listitem>
 	  </varlistentry>
@@ -951,7 +895,7 @@
 	  <varlistentry>
 	    <term>n</term>
 	    <listitem>
-	      <para>Show blacklist blocks (DNS blacklists) with hit counts.</para>
+	      <para>Show blacklist blocks (DNS blacklists) with hit counts since last rehash and (parenthesized) reference counts. The reference count shows how many clients are waiting on a lookup of this blacklist or have been found and are waiting on registration to complete.</para>
 	    </listitem>
 	  </varlistentry>
 	  <varlistentry>
@@ -969,19 +913,19 @@
 	  <varlistentry>
 	    <term>P</term>
 	    <listitem>
-	      <para>Show listen blocks</para>
+	      <para>Show listen blocks (ports)</para>
 	    </listitem>
 	  </varlistentry>
 	  <varlistentry>
 	    <term>q</term>
 	    <listitem>
-	      <para>Show temporarily resv'ed nicks and channels</para>
+	      <para>Show temporarily resv'ed nicks and channels with hit counts</para>
 	    </listitem>
 	  </varlistentry>
 	  <varlistentry>
 	    <term>Q</term>
 	    <listitem>
-	      <para>Show permanently resv'ed nicks and channels</para>
+	      <para>Show permanently resv'ed nicks and channels with hit counts since last rehash bans</para>
 	    </listitem>
 	  </varlistentry>
 	  <varlistentry>
@@ -993,7 +937,7 @@
 	  <varlistentry>
 	    <term>t</term>
 	    <listitem>
-	      <para>Show generic server statistics</para>
+	      <para>Show generic server statistics about local connections</para>
 	    </listitem>
 	  </varlistentry>
 	  <varlistentry>
@@ -1017,13 +961,13 @@
 	  <varlistentry>
 	    <term>x</term>
 	    <listitem>
-	      <para>Show temporary X:lines</para>
+	      <para>Show temporary X:lines with hit counts</para>
 	    </listitem>
 	  </varlistentry>
 	  <varlistentry>
 	    <term>X</term>
 	    <listitem>
-	      <para>Show permanent X:lines</para>
+	      <para>Show permanent X:lines with hit counts since last rehash bans</para>
 	    </listitem>
 	  </varlistentry>
 	  <varlistentry>
@@ -1047,7 +991,7 @@
 	  <varlistentry>
 	    <term>?</term>
 	    <listitem>
-	      <para>Show connected servers and sendq information about them</para>
+	      <para>Show connected servers and link information about them</para>
 	    </listitem>
 	  </varlistentry>
 	</variablelist>