summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAaron Campbell <aaron@cvs.openbsd.org>2000-10-13 17:20:45 +0000
committerAaron Campbell <aaron@cvs.openbsd.org>2000-10-13 17:20:45 +0000
commit87d4f5ce5b4c79913806d5627bfd2d12031570a8 (patch)
tree58d28a7a37628b2a6571d3da9516c49b54a50334
parentbb6712ce016a7abf19889dd2688703ed7a373498 (diff)
Repair formatting errors introduced after 2.7.
-rw-r--r--usr.bin/ssh/scp.15
-rw-r--r--usr.bin/ssh/sftp-server.820
-rw-r--r--usr.bin/ssh/ssh.18
-rw-r--r--usr.bin/ssh/sshd.813
4 files changed, 26 insertions, 20 deletions
diff --git a/usr.bin/ssh/scp.1 b/usr.bin/ssh/scp.1
index b551c3c185a..4fbbe6a6d05 100644
--- a/usr.bin/ssh/scp.1
+++ b/usr.bin/ssh/scp.1
@@ -9,7 +9,7 @@
.\"
.\" Created: Sun May 7 00:14:37 1995 ylo
.\"
-.\" $Id: scp.1,v 1.11 2000/10/11 20:03:27 markus Exp $
+.\" $Id: scp.1,v 1.12 2000/10/13 17:20:44 aaron Exp $
.\"
.Dd September 25, 1999
.Dt SCP 1
@@ -103,7 +103,8 @@ is already reserved for preserving the times and modes of the file in
.It Fl S Ar program
Name of
.Ar program
-to use for the encrypted connection. The program must understand
+to use for the encrypted connection.
+The program must understand
.Xr ssh 1
options.
.It Fl o Ar option
diff --git a/usr.bin/ssh/sftp-server.8 b/usr.bin/ssh/sftp-server.8
index 9811a3b4266..41a698eeca9 100644
--- a/usr.bin/ssh/sftp-server.8
+++ b/usr.bin/ssh/sftp-server.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: sftp-server.8,v 1.2 2000/09/07 20:27:53 deraadt Exp $
+.\" $OpenBSD: sftp-server.8,v 1.3 2000/10/13 17:20:44 aaron Exp $
.\"
.\" Copyright (c) 2000 Markus Friedl. All rights reserved.
.\"
@@ -36,21 +36,21 @@ is a program that speaks the server side of SFTP protocol
to stdout and expects client requests from stdin.
.Nm
is not intended to be called directly, but from
-.Xr sshd 8
+.Xr sshd 8
using the
.Cm Subsystem
option.
See
-.Xr sshd 8
+.Xr sshd 8
for more information.
-.Sh HISTORY
-.Nm
-first appeared in
-.Ox 2.8 .
-.Sh AUTHOR
-Markus Friedl <markus@openbsd.org>
.Sh SEE ALSO
.Xr ssh 1 ,
.Xr ssh-add 1 ,
.Xr ssh-keygen 1 ,
-.Xr sshd 8 ,
+.Xr sshd 8
+.Sh AUTHOR
+Markus Friedl <markus@openbsd.org>
+.Sh HISTORY
+.Nm
+first appeared in
+.Ox 2.8 .
diff --git a/usr.bin/ssh/ssh.1 b/usr.bin/ssh/ssh.1
index 18a84e6c3f9..732919227e4 100644
--- a/usr.bin/ssh/ssh.1
+++ b/usr.bin/ssh/ssh.1
@@ -374,8 +374,9 @@ is a fast block cipher, it appears very secure and is much faster than
.Ar 3des .
.It Fl c Ar "3des-cbc,blowfish-cbc,arcfour,cast128-cbc"
Additionally, for protocol version 2 a comma-separated list of ciphers can
-be specified in order of preference. Protocol version 2 supports
-3DES, Blowfish and CAST128 in CBC mode and Arcfour.
+be specified in order of preference.
+Protocol version 2 supports 3DES, Blowfish, and CAST128 in CBC mode
+and Arcfour.
.It Fl e Ar ch|^ch|none
Sets the escape character for sessions with a pty (default:
.Ql ~ ) .
@@ -483,7 +484,8 @@ debugging connection, authentication, and configuration problems.
The verbose mode is also used to display
.Xr skey 1
challenges, if the user entered "s/key" as password.
-Multiple -v options increases the verbosity. Maximum is 3.
+Multiple -v options increases the verbosity.
+Maximum is 3.
.It Fl x
Disables X11 forwarding.
.It Fl X
diff --git a/usr.bin/ssh/sshd.8 b/usr.bin/ssh/sshd.8
index 1d34c43d52f..d25c99af0d2 100644
--- a/usr.bin/ssh/sshd.8
+++ b/usr.bin/ssh/sshd.8
@@ -186,7 +186,8 @@ The server sends verbose debug output to the system
log, and does not put itself in the background.
The server also will not fork and will only process one connection.
This option is only intended for debugging for the server.
-Multiple -d options increases the debugging level. Maximum is 3.
+Multiple -d options increases the debugging level.
+Maximum is 3.
.It Fl f Ar configuration_file
Specifies the name of the configuration file.
The default is
@@ -424,7 +425,8 @@ Specifies whether Kerberos authentication is allowed.
This can be in the form of a Kerberos ticket, or if
.Cm PasswordAuthentication
is yes, the password provided by the user will be validated through
-the Kerberos KDC. To use this option, the server needs a
+the Kerberos KDC.
+To use this option, the server needs a
Kerberos servtab which allows the verification of the KDC's identity.
Default is
.Dq yes .
@@ -488,7 +490,7 @@ The default is 10.
Alternatively, random early drop can be enabled by specifying
the three colon separated values
.Dq start:rate:full
-(e.g. "10:30:60").
+(e.g., "10:30:60").
.Nm
will refuse connection attempts with a probabillity of
.Dq rate/100
@@ -610,8 +612,9 @@ directory or files world-writable.
The default is
.Dq yes .
.It Cm Subsystem
-Configures an external subsystem (e.g. file transfer daemon).
-Arguments should be a subsystem name and a command to execute upon subsystem request.
+Configures an external subsystem (e.g., file transfer daemon).
+Arguments should be a subsystem name and a command to execute upon subsystem
+request.
The command
.Xr sftp-server 8
implements the