summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--ssh.110
2 files changed, 10 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 9c1d96ed5..d1661c6d2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,9 @@
12 - markus@cvs.openbsd.org 2003/04/12 10:15:36 12 - markus@cvs.openbsd.org 2003/04/12 10:15:36
13 [misc.c] 13 [misc.c]
14 debug->debug2 14 debug->debug2
15 - naddy@cvs.openbsd.org 2003/04/12 11:40:15
16 [ssh.1]
17 document -V switch, fix wording; ok markus@
15 18
1620030512 1920030512
17 - (djm) Redhat spec: Don't install profile.d scripts when not 20 - (djm) Redhat spec: Don't install profile.d scripts when not
@@ -1399,4 +1402,4 @@
1399 save auth method before monitor_reset_key_state(); bugzilla bug #284; 1402 save auth method before monitor_reset_key_state(); bugzilla bug #284;
1400 ok provos@ 1403 ok provos@
1401 1404
1402$Id: ChangeLog,v 1.2680 2003/05/14 03:41:39 djm Exp $ 1405$Id: ChangeLog,v 1.2681 2003/05/14 03:42:08 djm Exp $
diff --git a/ssh.1 b/ssh.1
index fd822bb3d..a7e95c1f4 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.168 2003/03/28 10:11:43 jmc Exp $ 37.\" $OpenBSD: ssh.1,v 1.169 2003/04/12 11:40:15 naddy Exp $
38.Dd September 25, 1999 38.Dd September 25, 1999
39.Dt SSH 1 39.Dt SSH 1
40.Os 40.Os
@@ -49,7 +49,7 @@
49.Pp 49.Pp
50.Nm ssh 50.Nm ssh
51.Bk -words 51.Bk -words
52.Op Fl afgknqstvxACNTX1246 52.Op Fl afgknqstvxACNTVX1246
53.Op Fl b Ar bind_address 53.Op Fl b Ar bind_address
54.Op Fl c Ar cipher_spec 54.Op Fl c Ar cipher_spec
55.Op Fl e Ar escape_char 55.Op Fl e Ar escape_char
@@ -563,8 +563,10 @@ This is helpful in
563debugging connection, authentication, and configuration problems. 563debugging connection, authentication, and configuration problems.
564Multiple 564Multiple
565.Fl v 565.Fl v
566options increases the verbosity. 566options increase the verbosity.
567Maximum is 3. 567The maximum is 3.
568.It Fl V
569Display the version number and exit.
568.It Fl x 570.It Fl x
569Disables X11 forwarding. 571Disables X11 forwarding.
570.It Fl X 572.It Fl X