summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2008-11-03 19:27:07 +1100
committerDamien Miller <djm@mindrot.org>2008-11-03 19:27:07 +1100
commitc1719f7f0d3f828ae5ca0ac339813a64169becef (patch)
tree08a8ca435cbe909e740a648403c49e0b7ad4680f
parenta009433333ccb10b30e840435755eccd1e3fefd6 (diff)
- sobrado@cvs.openbsd.org 2008/11/01 11:14:36
[ssh-keyscan.1 ssh-keyscan.c] the ellipsis is not an optional argument; while here, improve spacing.
-rw-r--r--ChangeLog5
-rw-r--r--ssh-keyscan.16
-rw-r--r--ssh-keyscan.c7
3 files changed, 11 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 2650f6b7d..5b6889fba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -89,6 +89,9 @@
89 - stevesk@cvs.openbsd.org 2008/11/01 06:43:33 89 - stevesk@cvs.openbsd.org 2008/11/01 06:43:33
90 [channels.c] 90 [channels.c]
91 fix some typos in log messages; ok djm@ 91 fix some typos in log messages; ok djm@
92 - sobrado@cvs.openbsd.org 2008/11/01 11:14:36
93 [ssh-keyscan.1 ssh-keyscan.c]
94 the ellipsis is not an optional argument; while here, improve spacing.
92 95
9320080906 9620080906
94 - (dtucker) [config.guess config.sub] Update to latest versions from 97 - (dtucker) [config.guess config.sub] Update to latest versions from
@@ -4823,4 +4826,4 @@
4823 OpenServer 6 and add osr5bigcrypt support so when someone migrates 4826 OpenServer 6 and add osr5bigcrypt support so when someone migrates
4824 passwords between UnixWare and OpenServer they will still work. OK dtucker@ 4827 passwords between UnixWare and OpenServer they will still work. OK dtucker@
4825 4828
4826$Id: ChangeLog,v 1.5120 2008/11/03 08:26:35 djm Exp $ 4829$Id: ChangeLog,v 1.5121 2008/11/03 08:27:07 djm Exp $
diff --git a/ssh-keyscan.1 b/ssh-keyscan.1
index 8a4f3bcba..299a6cc94 100644
--- a/ssh-keyscan.1
+++ b/ssh-keyscan.1
@@ -1,4 +1,4 @@
1.\" $OpenBSD: ssh-keyscan.1,v 1.24 2008/04/30 10:14:03 djm Exp $ 1.\" $OpenBSD: ssh-keyscan.1,v 1.25 2008/11/01 11:14:36 sobrado Exp $
2.\" 2.\"
3.\" Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>. 3.\" Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>.
4.\" 4.\"
@@ -6,7 +6,7 @@
6.\" permitted provided that due credit is given to the author and the 6.\" permitted provided that due credit is given to the author and the
7.\" OpenBSD project by leaving this copyright notice intact. 7.\" OpenBSD project by leaving this copyright notice intact.
8.\" 8.\"
9.Dd $Mdocdate: April 30 2008 $ 9.Dd $Mdocdate: November 1 2008 $
10.Dt SSH-KEYSCAN 1 10.Dt SSH-KEYSCAN 1
11.Os 11.Os
12.Sh NAME 12.Sh NAME
@@ -21,7 +21,7 @@
21.Op Fl T Ar timeout 21.Op Fl T Ar timeout
22.Op Fl t Ar type 22.Op Fl t Ar type
23.Op Ar host | addrlist namelist 23.Op Ar host | addrlist namelist
24.Op Ar ... 24.Ar ...
25.Ek 25.Ek
26.Sh DESCRIPTION 26.Sh DESCRIPTION
27.Nm 27.Nm
diff --git a/ssh-keyscan.c b/ssh-keyscan.c
index d81077764..c6ec3507e 100644
--- a/ssh-keyscan.c
+++ b/ssh-keyscan.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh-keyscan.c,v 1.76 2008/04/30 10:14:03 djm Exp $ */ 1/* $OpenBSD: ssh-keyscan.c,v 1.77 2008/11/01 11:14:36 sobrado Exp $ */
2/* 2/*
3 * Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>. 3 * Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>.
4 * 4 *
@@ -713,8 +713,9 @@ fatal(const char *fmt,...)
713static void 713static void
714usage(void) 714usage(void)
715{ 715{
716 fprintf(stderr, "usage: %s [-46Hv] [-f file] [-p port] [-T timeout] [-t type]\n" 716 fprintf(stderr,
717 "\t\t [host | addrlist namelist] [...]\n", 717 "usage: %s [-46Hv] [-f file] [-p port] [-T timeout] [-t type]\n"
718 "\t\t [host | addrlist namelist] ...\n",
718 __progname); 719 __progname);
719 exit(1); 720 exit(1);
720} 721}