summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2002-01-22 23:19:55 +1100
committerDamien Miller <djm@mindrot.org>2002-01-22 23:19:55 +1100
commit70972eb388575578955a8f0e4d3f85e231d3fb7e (patch)
treefb1ef923ed6e3ab132e9647a59fb4b667f9679f8
parenta90fc08b88eeb08f907d9e3ba2f9a03420af39ae (diff)
- stevesk@cvs.openbsd.org 2002/01/05 21:51:56
[ssh.1 sshd.8] some missing and misplaced periods
-rw-r--r--ChangeLog5
-rw-r--r--ssh.16
-rw-r--r--sshd.86
3 files changed, 10 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 98cca0e2d..0df400e9e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -97,6 +97,9 @@
97 fix hanging x11 channels for rejected cookies (e.g. 97 fix hanging x11 channels for rejected cookies (e.g.
98 XAUTHORITY=/dev/null xbiff) bug #36, based on patch from 98 XAUTHORITY=/dev/null xbiff) bug #36, based on patch from
99 djast@cs.toronto.edu 99 djast@cs.toronto.edu
100 - stevesk@cvs.openbsd.org 2002/01/05 21:51:56
101 [ssh.1 sshd.8]
102 some missing and misplaced periods
100 103
101 104
10220020121 10520020121
@@ -7245,4 +7248,4 @@
7245 - Wrote replacements for strlcpy and mkdtemp 7248 - Wrote replacements for strlcpy and mkdtemp
7246 - Released 1.0pre1 7249 - Released 1.0pre1
7247 7250
7248$Id: ChangeLog,v 1.1750 2002/01/22 12:19:38 djm Exp $ 7251$Id: ChangeLog,v 1.1751 2002/01/22 12:19:55 djm Exp $
diff --git a/ssh.1 b/ssh.1
index 740a29b5a..54c461b26 100644
--- a/ssh.1
+++ b/ssh.1
@@ -34,7 +34,7 @@
34.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 34.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
35.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 35.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
36.\" 36.\"
37.\" $OpenBSD: ssh.1,v 1.142 2001/12/28 22:37:48 stevesk Exp $ 37.\" $OpenBSD: ssh.1,v 1.143 2002/01/05 21:51:56 stevesk Exp $
38.Dd September 25, 1999 38.Dd September 25, 1999
39.Dt SSH 1 39.Dt SSH 1
40.Os 40.Os
@@ -900,7 +900,7 @@ is similar to
900Specifies the protocol version 2 host key algorithms 900Specifies the protocol version 2 host key algorithms
901that the client wants to use in order of preference. 901that the client wants to use in order of preference.
902The default for this option is: 902The default for this option is:
903.Dq ssh-rsa,ssh-dss 903.Dq ssh-rsa,ssh-dss .
904.It Cm HostKeyAlias 904.It Cm HostKeyAlias
905Specifies an alias that should be used instead of the 905Specifies an alias that should be used instead of the
906real host name when looking up or saving the host key 906real host name when looking up or saving the host key
@@ -1014,7 +1014,7 @@ authentication methods. This allows a client to prefer one method (e.g.
1014over another method (e.g. 1014over another method (e.g.
1015.Cm password ) 1015.Cm password )
1016The default for this option is: 1016The default for this option is:
1017.Dq hostbased,publickey,keyboard-interactive,password 1017.Dq hostbased,publickey,keyboard-interactive,password .
1018.It Cm Protocol 1018.It Cm Protocol
1019Specifies the protocol versions 1019Specifies the protocol versions
1020.Nm 1020.Nm
diff --git a/sshd.8 b/sshd.8
index d2fa27612..971724799 100644
--- a/sshd.8
+++ b/sshd.8
@@ -34,7 +34,7 @@
34.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 34.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
35.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 35.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
36.\" 36.\"
37.\" $OpenBSD: sshd.8,v 1.160 2002/01/04 18:14:16 stevesk Exp $ 37.\" $OpenBSD: sshd.8,v 1.161 2002/01/05 21:51:56 stevesk Exp $
38.Dd September 25, 1999 38.Dd September 25, 1999
39.Dt SSHD 8 39.Dt SSHD 8
40.Os 40.Os
@@ -378,7 +378,7 @@ After expansion,
378is taken to be an absolute path or one relative to the user's home 378is taken to be an absolute path or one relative to the user's home
379directory. 379directory.
380The default is 380The default is
381.Dq .ssh/authorized_keys 381.Dq .ssh/authorized_keys .
382.It Cm Banner 382.It Cm Banner
383In some jurisdictions, sending a warning message before authentication 383In some jurisdictions, sending a warning message before authentication
384may be relevant for getting legal protection. 384may be relevant for getting legal protection.
@@ -397,7 +397,7 @@ The default is
397Specifies the ciphers allowed for protocol version 2. 397Specifies the ciphers allowed for protocol version 2.
398Multiple ciphers must be comma-separated. 398Multiple ciphers must be comma-separated.
399The default is 399The default is
400.Dq aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour. 400.Dq aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour .
401.It Cm ClientAliveInterval 401.It Cm ClientAliveInterval
402Sets a timeout interval in seconds after which if no data has been received 402Sets a timeout interval in seconds after which if no data has been received
403from the client, 403from the client,