summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2010-03-05 21:30:35 +1100
committerDamien Miller <djm@mindrot.org>2010-03-05 21:30:35 +1100
commit98339054f949ad87f15b4d618a421765d4097cd9 (patch)
treee132b8e22770e85ff77fd7305d21957f4863a973
parent9527f228ae88a1b328163717f5d68904d86c5d98 (diff)
- jmc@cvs.openbsd.org 2010/03/05 06:50:35
[ssh.1 sshd.8] tweak previous;
-rw-r--r--ChangeLog3
-rw-r--r--ssh.15
-rw-r--r--sshd.86
3 files changed, 8 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index efb7a094..99ec9795 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -23,6 +23,9 @@
- djm@cvs.openbsd.org 2010/03/05 02:58:11
[auth.c]
make the warning for a revoked key louder and more noticable
+ - jmc@cvs.openbsd.org 2010/03/05 06:50:35
+ [ssh.1 sshd.8]
+ tweak previous;
- (tim) [ssh-pkcs11.c] Fix "non-constant initializer" errors in older
compilers. OK djm@
- (djm) [ssh-rand-helper.c] declare optind, avoiding compilation failure
diff --git a/ssh.1 b/ssh.1
index b201d87d..fd713e3b 100644
--- a/ssh.1
+++ b/ssh.1
@@ -34,8 +34,8 @@
.\" (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.299 2010/03/04 23:19:29 djm Exp $
-.Dd $Mdocdate: March 4 2010 $
+.\" $OpenBSD: ssh.1,v 1.300 2010/03/05 06:50:34 jmc Exp $
+.Dd $Mdocdate: March 5 2010 $
.Dt SSH 1
.Os
.Sh NAME
@@ -1103,7 +1103,6 @@ See the
option in
.Xr ssh_config 5
for more information.
-.Pp
.Sh SSH-BASED VIRTUAL PRIVATE NETWORKS
.Nm
contains support for Virtual Private Network (VPN) tunnelling
diff --git a/sshd.8 b/sshd.8
index 577d1994..5f196600 100644
--- a/sshd.8
+++ b/sshd.8
@@ -34,8 +34,8 @@
.\" (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: sshd.8,v 1.254 2010/03/04 23:19:29 djm Exp $
-.Dd $Mdocdate: March 4 2010 $
+.\" $OpenBSD: sshd.8,v 1.255 2010/03/05 06:50:35 jmc Exp $
+.Dd $Mdocdate: March 5 2010 $
.Dt SSHD 8
.Os
.Sh NAME
@@ -721,7 +721,7 @@ or by taking
.Pa /etc/ssh/ssh_host_key.pub
and adding the host names at the front.
.Xr ssh-keygen 1
-also offers some basic automated editing for
+also offers some basic automated editing for
.Pa ~/.ssh/known_hosts
including removing hosts matching a host name and converting all host
names to their hashed representations.