Adds missing information about the ability to act as a SOCKS5 client. Fixes #996

ncat/docs/ncat.usage.txt

@@ -39,7 +39,7 @@ Options taking a time assume seconds. Append 'ms' for milliseconds,
       --broker               Enable Ncat's connection brokering mode
       --chat                 Start a simple Ncat chat server
       --proxy <addr[:port]>  Specify address of host to proxy through
-      --proxy-type <type>    Specify proxy type ("http" or "socks4" or "socks5")
+      --proxy-type <type>    Specify proxy type ("http", "socks4" or "socks5")
       --proxy-auth <auth>    Authenticate with HTTP or SOCKS proxy server
       --ssl                  Connect or listen with SSL
       --ssl-cert             Specify SSL certificate file (PEM) for listening

ncat/docs/ncat.xml

@@ -39,7 +39,7 @@
 
     <para>Among Ncat's vast number of features there is the ability to chain Ncats
     together; redirection of TCP, UDP, and SCTP ports to other sites; SSL support; and proxy
-    connections via SOCKS4 or HTTP proxies (with optional proxy
+    connections via SOCKS4, SOCKS5 or HTTP proxies (with optional proxy
     authentication as well).  Some general principles apply to most applications
     and thus give you the capability of instantly adding networking support to
     software that would normally never support it.</para>
@@ -446,8 +446,9 @@
           this option has Ncat act as a proxy server using the specified protocol.</para>
 
           <para>The currently available protocols in connect mode are <literal>http</literal>
-          (CONNECT) and <literal>socks4</literal> (SOCKSv4).  The only server currently supported
-          is <literal>http</literal>.
+          (CONNECT), <literal>socks4</literal> (SOCKSv4), and
+          <literal>socks5</literal> (SOCKSv5).
+          The only server currently supported is <literal>http</literal>.
           If this option is not used, the default protocol is <literal>http</literal>.</para>
         </listitem>
       </varlistentry>
@@ -461,7 +462,9 @@
           <para>In connect mode, gives the credentials that will be used to
           connect to the proxy server. In listen mode, gives the credentials
           that will be required of connecting clients. For use with
-          <option>--proxy-type http</option>, the form should be user:pass.  For
+          <option>--proxy-type http</option> or
+          <option>--proxy-type socks5</option>, the form should be
+          username:password.  For
           <option>--proxy-type socks4</option>, it should be a username only.</para>
         </listitem>
       </varlistentry>
@@ -913,7 +916,15 @@
         Connect to smtphost:25 through a SOCKS4 server on port 1080.
         </term>
         <listitem>
-        <para><command>ncat --proxy socks4host --proxy-type socks4 --proxy-auth user smtphost 25</command></para>
+        <para><command>ncat --proxy socks4host --proxy-type socks4 --proxy-auth joe smtphost 25</command></para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>
+        Connect to smtphost:25 through a SOCKS5 server on port 1080.
+        </term>
+        <listitem>
+        <para><command>ncat --proxy socks5host --proxy-type socks5 --proxy-auth joe:secret smtphost 25</command></para>
         </listitem>
       </varlistentry>
       <varlistentry>

ncat/docs/ncatguide.xml

@@ -942,14 +942,14 @@ Protocol mismatch.
   <indexterm><primary>proxy</primary><secondary>Ncat as</secondary></indexterm>
   <para>
   Ncat can route its connections through a
-  SOCKS&nbsp;4<indexterm><primary>SOCKS proxy</primary></indexterm> or
-  HTTP<indexterm><primary>HTTP proxy</primary></indexterm> proxy. A basic
+  SOCKS&nbsp;4<indexterm><primary>SOCKS proxy</primary></indexterm>, SOCKS&nbsp;5
+  or HTTP<indexterm><primary>HTTP proxy</primary></indexterm> proxy. A basic
   connection looks like
   <informalexample>
 <indexterm><primary><option>--proxy</option> (Ncat option)</primary></indexterm>
 <indexterm><primary><option>--proxy-type</option> (Ncat option)</primary></indexterm>
 <literallayout>
-<command>ncat --proxy <replaceable>proxyhost</replaceable><optional>:<replaceable>proxyport</replaceable></optional> --proxy-type <group choice="req"><arg choice="plain">http</arg><arg choice="plain">socks4</arg></group> <replaceable>host</replaceable> <optional><replaceable>port</replaceable></optional></command>
+<command>ncat --proxy <replaceable>proxyhost</replaceable><optional>:<replaceable>proxyport</replaceable></optional> --proxy-type <group choice="req"><arg choice="plain">http</arg><arg choice="plain">socks4</arg><arg choice="plain">socks5</arg></group> <replaceable>host</replaceable> <optional><replaceable>port</replaceable></optional></command>
 </literallayout>
   </informalexample>
   <option>--proxy-type</option> may be omitted; it defaults to
@@ -966,14 +966,14 @@ Protocol mismatch.
   <option>--proxy-auth</option><indexterm><primary><option>--proxy-auth</option> (Ncat option)</primary></indexterm>
   option. Use
   <command>--proxy-auth <replaceable>username</replaceable>:<replaceable>password</replaceable></command>
-  for HTTP proxies and
+  for HTTP and SOCKS5 proxies and
   <command>--proxy-auth <replaceable>username</replaceable></command>
-  for SOCKS proxies.
+  for SOCKS4 proxies.
   </para>
 
   <para>
   Ncat can act as a proxy server itself in listen mode. The only proxy
-  type supported is <literal>http</literal>.
+  type supported in this case is <literal>http</literal>.
   <informalexample>
 <literallayout>
 <command>ncat -l 3128 --proxy-type http</command>