removed useless source address resolving type option

git-svn-id: https://svn.spreadspace.org/tcpproxy/trunk@23 e61f0598-a718-4e21-a8f0-0aadfa62ad6b

2 files changed, 7 insertions, 26 deletions

diff --git a/doc/tcpproxy.8 b/doc/tcpproxy.8
index d4bcb42..b4ea062 100644
--- a/doc/tcpproxy.8
+++ b/doc/tcpproxy.8
@@ -1,22 +1,13 @@
 '\" t
 .\"     Title: tcpproxy
 .\"    Author: [see the "AUTHORS" section]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
+.\" Generator: DocBook XSL Stylesheets v1.75.1 <http://docbook.sf.net/>
 .\"      Date: 12/02/2010
-.\"    Manual: \ \&
-.\"    Source: \ \&
+.\"    Manual: tcpproxy user manual
+.\"    Source: tcpproxy trunk
 .\"  Language: English
 .\"
-.TH "TCPPROXY" "8" "12/02/2010" "\ \&" "\ \&"
-.\" -----------------------------------------------------------------
-.\" * Define some portability stuff
-.\" -----------------------------------------------------------------
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.\" http://bugs.debian.org/507673
-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
+.TH "TCPPROXY" "8" "12/02/2010" "tcpproxy trunk" "tcpproxy user manual"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -48,7 +39,6 @@ tcpproxy \- IPv4/IPv6 tcp connection proxy
   [ \fB\-R|\-\-remote\-resolv\fR (ipv4|4|ipv6|6) ]
   [ \fB\-o|\-\-remote\-port\fR <service> ]
   [ \fB\-s|\-\-source\-addr\fR <host> ]
-  [ \fB\-S|\-\-source\-resolv\fR (ipv4|4|ipv6|6) ]
   [ \fB\-b|\-\-buffer\-size\fR <size> ]
   [ \fB\-c|\-\-config\fR <file> ]
 .fi
@@ -158,7 +148,7 @@ The remote address to connect to\&. Unless the configuration file should be used
 .PP
 \fB\-R|\-\-remote\-resolv (ipv4|4|ipv6|6)\fR
 .RS 4
-When resolving the remote address (see above) use only IPv4 or IPv6\&. The default is to resolv both\&.
+When resolving the remote address (see above) use only IPv4 or IPv6\&. The default is to resolv both\&. Mind that this also effects resolving of the source address (see below) as the remote and source addresses must be of the same protocol familiy\&.
 .RE
 .PP
 \fB\-o, \-\-remote\-port <service>\fR
@@ -174,11 +164,6 @@ Instruct tcpproxy to use this source address for connections to
 uses the default source address for the defined remote host\&.
 .RE
 .PP
-\fB\-S|\-\-source\-resolv (ipv4|4|ipv6|6)\fR
-.RS 4
-When resolving the source address (see above) use only IPv4 or IPv6\&. The default is to resolv both\&.
-.RE
-.PP
 \fB\-b, \-\-buffer\-size <size>\fR
 .RS 4
 The size of the transmit buffers to use\&.
diff --git a/doc/tcpproxy.8.txt b/doc/tcpproxy.8.txt
index 8da0b98..14a12af 100644
--- a/doc/tcpproxy.8.txt
+++ b/doc/tcpproxy.8.txt
@@ -27,7 +27,6 @@ tcpproxy
   [ -R|--remote-resolv (ipv4|4|ipv6|6) ]
   [ -o|--remote-port <service> ]
   [ -s|--source-addr <host> ]
-  [ -S|--source-resolv (ipv4|4|ipv6|6) ]
   [ -b|--buffer-size <size> ]
   [ -c|--config <file> ]
 ....
@@ -105,7 +104,8 @@ The following options can be passed to the *tcpproxy* daemon:
 
 *-R|--remote-resolv (ipv4|4|ipv6|6)*::
    When resolving the remote address (see above) use only IPv4 or IPv6. The default is
-   to resolv both.
+   to resolv both. Mind that this also effects resolving of the source address (see below)
+   as the remote and source addresses must be of the same protocol familiy.
 
 *-o, --remote-port <service>*::
    The remote port to connect to. Unless the configuration file should be used this
@@ -115,10 +115,6 @@ The following options can be passed to the *tcpproxy* daemon:
    Instruct tcpproxy to use this source address for connections to *-R|--remote-address*.
    By default *tcpproxy* uses the default source address for the defined remote host.
 
-*-S|--source-resolv (ipv4|4|ipv6|6)*::
-   When resolving the source address (see above) use only IPv4 or IPv6. The default is
-   to resolv both.
-
 *-b, --buffer-size <size>*::
    The size of the transmit buffers to use. *tcpproxy* will allocate two buffers of this 
    size for any client which is connected. By default a value of 10Kbytes is used.