summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2006-01-06 04:50:11 +0100
committerDamien Miller <djm@mindrot.org>2006-01-06 04:50:11 +0100
commit128a0f114d2c0db4e4e94f055f591e79708f9990 (patch)
tree9665038e2c5f8cb36bffc5aadf4533dae95117bb
parent - jmc@cvs.openbsd.org 2006/01/04 18:45:01 (diff)
downloadopenssh-128a0f114d2c0db4e4e94f055f591e79708f9990.tar.xz
openssh-128a0f114d2c0db4e4e94f055f591e79708f9990.zip
- jmc@cvs.openbsd.org 2006/01/04 19:40:24
[ssh.1] +.Xr ssh-keyscan 1 ,
Diffstat (limited to '')
-rw-r--r--ChangeLog5
-rw-r--r--ssh.13
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index c3e9d8851..fe17d953d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -23,6 +23,9 @@
- jmc@cvs.openbsd.org 2006/01/04 18:45:01
[ssh.1]
remove .Xr's to rsh(1) and telnet(1): they are hardly needed;
+ - jmc@cvs.openbsd.org 2006/01/04 19:40:24
+ [ssh.1]
+ +.Xr ssh-keyscan 1 ,
20060103
- (djm) [channels.c] clean up harmless merge error, from reyk@
@@ -3657,4 +3660,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
-$Id: ChangeLog,v 1.4079 2006/01/06 03:49:54 djm Exp $
+$Id: ChangeLog,v 1.4080 2006/01/06 03:50:11 djm Exp $
diff --git a/ssh.1 b/ssh.1
index ef4b3ff4c..510cf6b69 100644
--- a/ssh.1
+++ b/ssh.1
@@ -34,7 +34,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $OpenBSD: ssh.1,v 1.241 2006/01/04 18:45:01 jmc Exp $
+.\" $OpenBSD: ssh.1,v 1.242 2006/01/04 19:40:24 jmc Exp $
.Dd September 25, 1999
.Dt SSH 1
.Os
@@ -1215,6 +1215,7 @@ manual page for more information.
.Xr ssh-add 1 ,
.Xr ssh-agent 1 ,
.Xr ssh-keygen 1 ,
+.Xr ssh-keyscan 1 ,
.Xr hosts.equiv 5 ,
.Xr ssh_config 5 ,
.Xr ssh-keysign 8 ,