From 6df37710e3ac9c286d8c79ae2b5e413f658690ba Mon Sep 17 00:00:00 2001
From: david <david@e0a8ed71-7df4-0310-8962-fdc924857419>
Date: Tue, 6 Aug 2013 22:23:56 +0000
Subject: [PATCH] Move exec env vars so they're not all under --exec.

---
 ncat/docs/ncat.xml | 50 +++++++++++++++++++++-------------------------
 1 file changed, 23 insertions(+), 27 deletions(-)

diff --git a/ncat/docs/ncat.xml b/ncat/docs/ncat.xml
index 2ed699183..85b62c018 100644
--- a/ncat/docs/ncat.xml
+++ b/ncat/docs/ncat.xml
@@ -462,30 +462,6 @@
           accept a maximum, definable, number of simultaneous connections
           controlled by the <option>-m</option> option. By default this is set
           to 100 (60 on Windows).</para>
-
-          <para>--exec adds the following variables to the child's environment:
-            <itemizedlist>
-
-              <listitem>NCAT_REMOTE_ADDR - the remote address - in connect mode,
-              it's the one we're connecting to, in listen mode - it's the one
-              that connected to us,</listitem>
-
-              <listitem>NCAT_REMOTE_PORT - the remote port number, where "remote"
-              means the same as above,</listitem>
-
-              <listitem>NCAT_LOCAL_ADDR - our local address used for
-              establishing/receiving the connection,</listitem>
-
-              <listitem>NCAT_LOCAL_PORT - our local port number,</listitem>
-
-              <listitem>NCAT_PROTO - the protocol name - TCP, UDP or SCTP,</listitem>
-
-            </itemizedlist>
-          </para>
-
-          <para>Currently the address fields are numeric IP addresses. In IPv6
-          mode, the address might be not expanded.</para>
-
         </listitem>
       </varlistentry>
 
@@ -500,9 +476,7 @@
           <para>Same as <option>-e</option>, except it tries to execute
           the command via <filename>/bin/sh</filename>. This means you don't
           have to specify the full path for the command, and shell facilities
-          like environment variables are available. Ncat also sets a few
-          special environment variables (see <option>-e</option> for details).
-          </para>
+          like environment variables are available.</para>
         </listitem>
       </varlistentry>
 
@@ -520,6 +494,28 @@
 
     </variablelist>
 
+    <para>All exec options add the following variables to the child's environment:
+    <itemizedlist>
+    <listitem>NCAT_REMOTE_ADDR - the remote address - in connect mode,
+    it's the one we're connecting to, in listen mode - it's the one
+    that connected to us,</listitem>
+
+    <listitem>NCAT_REMOTE_PORT - the remote port number, where "remote"
+    means the same as above,</listitem>
+
+    <listitem>NCAT_LOCAL_ADDR - our local address used for
+    establishing/receiving the connection,</listitem>
+
+    <listitem>NCAT_LOCAL_PORT - our local port number,</listitem>
+
+    <listitem>NCAT_PROTO - the protocol name - TCP, UDP or SCTP,</listitem>
+
+    </itemizedlist>
+    </para>
+
+    <para>Currently the address fields are numeric IP addresses. In IPv6
+    mode, the address might be not expanded.</para>
+
   </refsect1>
 
   <refsect1 id="ncat-man-access-options">