summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2006-10-18 07:53:06 +1000
committerDarren Tucker <dtucker@zip.com.au>2006-10-18 07:53:06 +1000
commitffe88e15afeb403e775d87cd45ae4bd5f1203172 (patch)
treecd13274ee7220f14ba379394e62cd5fefb90d270
parenta43c00582549a440fb744bdf8849ae53f97c9bc5 (diff)
- ray@cvs.openbsd.org 2006/09/25 04:55:38
[ssh-keyscan.1 ssh.1] Change "a SSH" to "an SSH". Hurray, I'm not the only one who pronounces "SSH" as "ess-ess-aich". OK jmc@ and stevesk@.
-rw-r--r--ChangeLog10
-rw-r--r--ssh-keyscan.14
-rw-r--r--ssh.14
3 files changed, 13 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index fc86a6f9..d73ae511 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+20061018
+ - (dtucker) OpenBSD CVS Sync
+ - ray@cvs.openbsd.org 2006/09/25 04:55:38
+ [ssh-keyscan.1 ssh.1]
+ Change "a SSH" to "an SSH". Hurray, I'm not the only one who
+ pronounces "SSH" as "ess-ess-aich".
+ OK jmc@ and stevesk@.
+
20061016
- (dtucker) [monitor_fdpass.c] Include sys/in.h, required for cmsg macros
on older (2.0) Linuxes. Based on patch from thmo-13 at gmx de.
@@ -2528,4 +2536,4 @@
OpenServer 6 and add osr5bigcrypt support so when someone migrates
passwords between UnixWare and OpenServer they will still work. OK dtucker@
-$Id: ChangeLog,v 1.4570 2006/10/16 09:49:12 dtucker Exp $
+$Id: ChangeLog,v 1.4571 2006/10/17 21:53:06 dtucker Exp $
diff --git a/ssh-keyscan.1 b/ssh-keyscan.1
index 80fc8cd9..a3656fc7 100644
--- a/ssh-keyscan.1
+++ b/ssh-keyscan.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ssh-keyscan.1,v 1.21 2005/09/30 20:34:26 jaredy Exp $
+.\" $OpenBSD: ssh-keyscan.1,v 1.22 2006/09/25 04:55:38 ray Exp $
.\"
.\" Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>.
.\"
@@ -102,7 +102,7 @@ Causes
to print debugging messages about its progress.
.El
.Sh SECURITY
-If a ssh_known_hosts file is constructed using
+If an ssh_known_hosts file is constructed using
.Nm
without verifying the keys, users will be vulnerable to
.Em man in the middle
diff --git a/ssh.1 b/ssh.1
index 6e41bcd8..b6f09f40 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.263 2006/07/11 18:50:48 markus Exp $
+.\" $OpenBSD: ssh.1,v 1.264 2006/09/25 04:55:38 ray Exp $
.Dd September 25, 1999
.Dt SSH 1
.Os
@@ -1105,7 +1105,7 @@ tunnel="1",command="sh /etc/netstart tun1" ssh-rsa ... jane
tunnel="2",command="sh /etc/netstart tun2" ssh-rsa ... john
.Ed
.Pp
-Since a SSH-based setup entails a fair amount of overhead,
+Since an SSH-based setup entails a fair amount of overhead,
it may be more suited to temporary setups,
such as for wireless VPNs.
More permanent VPNs are better provided by tools such as