summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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 @@
23 - jmc@cvs.openbsd.org 2006/01/04 18:45:01 23 - jmc@cvs.openbsd.org 2006/01/04 18:45:01
24 [ssh.1] 24 [ssh.1]
25 remove .Xr's to rsh(1) and telnet(1): they are hardly needed; 25 remove .Xr's to rsh(1) and telnet(1): they are hardly needed;
26 - jmc@cvs.openbsd.org 2006/01/04 19:40:24
27 [ssh.1]
28 +.Xr ssh-keyscan 1 ,
26 29
2720060103 3020060103
28 - (djm) [channels.c] clean up harmless merge error, from reyk@ 31 - (djm) [channels.c] clean up harmless merge error, from reyk@
@@ -3657,4 +3660,4 @@
3657 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 3660 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
3658 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 3661 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
3659 3662
3660$Id: ChangeLog,v 1.4079 2006/01/06 03:49:54 djm Exp $ 3663$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 @@
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.241 2006/01/04 18:45:01 jmc Exp $ 37.\" $OpenBSD: ssh.1,v 1.242 2006/01/04 19:40:24 jmc Exp $
38.Dd September 25, 1999 38.Dd September 25, 1999
39.Dt SSH 1 39.Dt SSH 1
40.Os 40.Os
@@ -1215,6 +1215,7 @@ manual page for more information.
1215.Xr ssh-add 1 , 1215.Xr ssh-add 1 ,
1216.Xr ssh-agent 1 , 1216.Xr ssh-agent 1 ,
1217.Xr ssh-keygen 1 , 1217.Xr ssh-keygen 1 ,
1218.Xr ssh-keyscan 1 ,
1218.Xr hosts.equiv 5 , 1219.Xr hosts.equiv 5 ,
1219.Xr ssh_config 5 , 1220.Xr ssh_config 5 ,
1220.Xr ssh-keysign 8 , 1221.Xr ssh-keysign 8 ,