summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2006-01-31 21:47:58 +1100
committerDamien Miller <djm@mindrot.org>2006-01-31 21:47:58 +1100
commitb5dd55cccc7096d3db59378bba44920183f34110 (patch)
treea2d41592b59b7ae5731a6da47efa5183afce8c91
parente204f6aa0dc399dfb709f3def13b9c4f8ab35357 (diff)
- jmc@cvs.openbsd.org 2006/01/30 13:37:49
[ssh.1] remove an incorrect sentence; reported by roumen petrov; ok djm markus
-rw-r--r--ChangeLog7
-rw-r--r--ssh.15
2 files changed, 7 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 879ac106..51c27224 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -23,6 +23,11 @@
mark channel as write failed or dead instead of read failed on error
of the channel output filter.
ok markus@
+ - jmc@cvs.openbsd.org 2006/01/30 13:37:49
+ [ssh.1]
+ remove an incorrect sentence;
+ reported by roumen petrov;
+ ok djm markus
20060129
- (dtucker) [configure.ac opensshd.init.in] Bug #1144: Use /bin/sh for the
@@ -3748,4 +3753,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.4099 2006/01/31 10:47:15 djm Exp $
+$Id: ChangeLog,v 1.4100 2006/01/31 10:47:58 djm Exp $
diff --git a/ssh.1 b/ssh.1
index 30978287..f4c67762 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.252 2006/01/26 08:47:56 jmc Exp $
+.\" $OpenBSD: ssh.1,v 1.253 2006/01/30 13:37:49 jmc Exp $
.Dd September 25, 1999
.Dt SSH 1
.Os
@@ -1256,9 +1256,6 @@ sensitive part of this file using 3DES.
Contains the public key for authentication.
These files are not
sensitive and can (but need not) be readable by anyone.
-They are
-never used automatically and are not necessary: they are only provided for
-the convenience of the user.
.Pp
.It ~/.ssh/known_hosts
Contains a list of host keys for all hosts the user has logged into