summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2006-01-14 10:10:17 +1100
committerDamien Miller <djm@mindrot.org>2006-01-14 10:10:17 +1100
commite9d001e02b55f065b7a16d3e2b3d041d32ee9176 (patch)
treeac52da23f998c5bd44f4f1759b421d2b1a60d70e
parent7c24b81699c9b45f277ccefa5523e1a8d64a98a5 (diff)
- jmc@cvs.openbsd.org 2006/01/12 22:26:02
[ssh_config.5] refer to TCP forwarding, rather than TCP/IP forwarding;
-rw-r--r--ChangeLog5
-rw-r--r--ssh_config.58
2 files changed, 8 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index b68b88e9..18b9ec37 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -22,6 +22,9 @@
- jmc@cvs.openbsd.org 2006/01/12 22:20:00
[sshd.8]
refer to TCP forwarding, rather than TCP/IP forwarding;
+ - jmc@cvs.openbsd.org 2006/01/12 22:26:02
+ [ssh_config.5]
+ refer to TCP forwarding, rather than TCP/IP forwarding;
20060109
- (dtucker) [contrib/cygwin/ssh-host-config] Make sshd service depend on
@@ -3699,4 +3702,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
-$Id: ChangeLog,v 1.4088 2006/01/13 23:09:56 djm Exp $
+$Id: ChangeLog,v 1.4089 2006/01/13 23:10:17 djm Exp $
diff --git a/ssh_config.5 b/ssh_config.5
index d091bcbf..e8186a98 100644
--- a/ssh_config.5
+++ b/ssh_config.5
@@ -34,7 +34,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $OpenBSD: ssh_config.5,v 1.73 2006/01/02 17:09:49 jmc Exp $
+.\" $OpenBSD: ssh_config.5,v 1.74 2006/01/12 22:26:02 jmc Exp $
.Dd September 25, 1999
.Dt SSH_CONFIG 5
.Os
@@ -318,7 +318,7 @@ used for opportunistic connection sharing include
all three of these escape sequences.
This ensures that shared connections are uniquely identified.
.It Cm DynamicForward
-Specifies that a TCP/IP port on the local machine be forwarded
+Specifies that a TCP port on the local machine be forwarded
over the secure channel, and the application
protocol is then used to determine where to connect to from the
remote machine.
@@ -565,7 +565,7 @@ This directive is ignored unless
.Cm PermitLocalCommand
has been enabled.
.It Cm LocalForward
-Specifies that a TCP/IP port on the local machine be forwarded over
+Specifies that a TCP port on the local machine be forwarded over
the secure channel to the specified host and port from the remote machine.
The first argument must be
.Sm off
@@ -719,7 +719,7 @@ The default is
.Dq yes .
This option applies to protocol version 2 only.
.It Cm RemoteForward
-Specifies that a TCP/IP port on the remote machine be forwarded over
+Specifies that a TCP port on the remote machine be forwarded over
the secure channel to the specified host and port from the local machine.
The first argument must be
.Sm off