summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--ssh.15
2 files changed, 7 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 879ac1065..51c272248 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -23,6 +23,11 @@
23 mark channel as write failed or dead instead of read failed on error 23 mark channel as write failed or dead instead of read failed on error
24 of the channel output filter. 24 of the channel output filter.
25 ok markus@ 25 ok markus@
26 - jmc@cvs.openbsd.org 2006/01/30 13:37:49
27 [ssh.1]
28 remove an incorrect sentence;
29 reported by roumen petrov;
30 ok djm markus
26 31
2720060129 3220060129
28 - (dtucker) [configure.ac opensshd.init.in] Bug #1144: Use /bin/sh for the 33 - (dtucker) [configure.ac opensshd.init.in] Bug #1144: Use /bin/sh for the
@@ -3748,4 +3753,4 @@
3748 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 3753 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
3749 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 3754 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
3750 3755
3751$Id: ChangeLog,v 1.4099 2006/01/31 10:47:15 djm Exp $ 3756$Id: ChangeLog,v 1.4100 2006/01/31 10:47:58 djm Exp $
diff --git a/ssh.1 b/ssh.1
index 309782879..f4c677628 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.252 2006/01/26 08:47:56 jmc Exp $ 37.\" $OpenBSD: ssh.1,v 1.253 2006/01/30 13:37:49 jmc Exp $
38.Dd September 25, 1999 38.Dd September 25, 1999
39.Dt SSH 1 39.Dt SSH 1
40.Os 40.Os
@@ -1256,9 +1256,6 @@ sensitive part of this file using 3DES.
1256Contains the public key for authentication. 1256Contains the public key for authentication.
1257These files are not 1257These files are not
1258sensitive and can (but need not) be readable by anyone. 1258sensitive and can (but need not) be readable by anyone.
1259They are
1260never used automatically and are not necessary: they are only provided for
1261the convenience of the user.
1262.Pp 1259.Pp
1263.It ~/.ssh/known_hosts 1260.It ~/.ssh/known_hosts
1264Contains a list of host keys for all hosts the user has logged into 1261Contains a list of host keys for all hosts the user has logged into