summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2008-06-30 00:04:31 +1000
committerDamien Miller <djm@mindrot.org>2008-06-30 00:04:31 +1000
commit8639920a9b2322b6f54c5511be74b1295591c4c5 (patch)
treea75f7e3c7b02b51dd7eb7646ce101ea9932f333f
parent1028824e5c456dc3d8a57fe5bae539beb4a95432 (diff)
- jmc@cvs.openbsd.org 2008/06/26 21:11:46
[ssh.1] add VisualHostKey to the list of options listed in -o;
-rw-r--r--ChangeLog5
-rw-r--r--ssh.13
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 5df3f91d6..bf381c84c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -28,6 +28,9 @@
28 on every newly seen host even when the option was not enabled. 28 on every newly seen host even when the option was not enabled.
29 prodded by deraadt@, discussions, 29 prodded by deraadt@, discussions,
30 help and ok markus@ djm@ dtucker@ 30 help and ok markus@ djm@ dtucker@
31 - jmc@cvs.openbsd.org 2008/06/26 21:11:46
32 [ssh.1]
33 add VisualHostKey to the list of options listed in -o;
31 34
3220080628 3520080628
33 - (djm) [RFC.nroff contrib/cygwin/Makefile contrib/suse/openssh.spec] 36 - (djm) [RFC.nroff contrib/cygwin/Makefile contrib/suse/openssh.spec]
@@ -4448,4 +4451,4 @@
4448 OpenServer 6 and add osr5bigcrypt support so when someone migrates 4451 OpenServer 6 and add osr5bigcrypt support so when someone migrates
4449 passwords between UnixWare and OpenServer they will still work. OK dtucker@ 4452 passwords between UnixWare and OpenServer they will still work. OK dtucker@
4450 4453
4451$Id: ChangeLog,v 1.5029 2008/06/29 14:04:03 djm Exp $ 4454$Id: ChangeLog,v 1.5030 2008/06/29 14:04:31 djm Exp $
diff --git a/ssh.1 b/ssh.1
index 6165e2f73..a58f5a02a 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.275 2008/06/26 11:46:31 grunk Exp $ 37.\" $OpenBSD: ssh.1,v 1.276 2008/06/26 21:11:46 jmc Exp $
38.Dd $Mdocdate: June 26 2008 $ 38.Dd $Mdocdate: June 26 2008 $
39.Dt SSH 1 39.Dt SSH 1
40.Os 40.Os
@@ -498,6 +498,7 @@ For full details of the options listed below, and their possible values, see
498.It User 498.It User
499.It UserKnownHostsFile 499.It UserKnownHostsFile
500.It VerifyHostKeyDNS 500.It VerifyHostKeyDNS
501.It VisualHostKey
501.It XAuthLocation 502.It XAuthLocation
502.El 503.El
503.It Fl p Ar port 504.It Fl p Ar port