summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2013-07-18 16:14:13 +1000
committerDamien Miller <djm@mindrot.org>2013-07-18 16:14:13 +1000
commitbf836e535dc3a8050c1756423539bac127ee5098 (patch)
tree78cfe7d4e7c1f38dc58f6d9b5b64f6a769dea910
parent649fe025a409d0ce88c60a068f3f211193c35873 (diff)
- schwarze@cvs.openbsd.org 2013/07/16 00:07:52
[scp.1 sftp-server.8 ssh-keyscan.1 ssh-keysign.8 ssh-pkcs11-helper.8] use .Mt for email addresses; from Jan Stary <hans at stare dot cz>; ok jmc@
-rw-r--r--ChangeLog3
-rw-r--r--scp.18
-rw-r--r--sftp-server.86
-rw-r--r--ssh-keyscan.18
-rw-r--r--ssh-keysign.86
-rw-r--r--ssh-pkcs11-helper.86
6 files changed, 20 insertions, 17 deletions
diff --git a/ChangeLog b/ChangeLog
index 21d35b373..09d24ce1f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -57,6 +57,9 @@
57 - djm@cvs.openbsd.org 2013/07/12 05:48:55 57 - djm@cvs.openbsd.org 2013/07/12 05:48:55
58 [ssh.c] 58 [ssh.c]
59 set TCP nodelay for connections started with -N; bz#2124 ok dtucker@ 59 set TCP nodelay for connections started with -N; bz#2124 ok dtucker@
60 - schwarze@cvs.openbsd.org 2013/07/16 00:07:52
61 [scp.1 sftp-server.8 ssh-keyscan.1 ssh-keysign.8 ssh-pkcs11-helper.8]
62 use .Mt for email addresses; from Jan Stary <hans at stare dot cz>; ok jmc@
60 63
6120130702 6420130702
62 - (dtucker) [contrib/cygwin/README contrib/cygwin/ssh-host-config 65 - (dtucker) [contrib/cygwin/README contrib/cygwin/ssh-host-config
diff --git a/scp.1 b/scp.1
index 734b97bb1..c83012c92 100644
--- a/scp.1
+++ b/scp.1
@@ -8,9 +8,9 @@
8.\" 8.\"
9.\" Created: Sun May 7 00:14:37 1995 ylo 9.\" Created: Sun May 7 00:14:37 1995 ylo
10.\" 10.\"
11.\" $OpenBSD: scp.1,v 1.58 2011/09/05 07:01:44 jmc Exp $ 11.\" $OpenBSD: scp.1,v 1.59 2013/07/16 00:07:52 schwarze Exp $
12.\" 12.\"
13.Dd $Mdocdate: September 5 2011 $ 13.Dd $Mdocdate: July 16 2013 $
14.Dt SCP 1 14.Dt SCP 1
15.Os 15.Os
16.Sh NAME 16.Sh NAME
@@ -235,5 +235,5 @@ is based on the
235program in BSD source code from the Regents of the University of 235program in BSD source code from the Regents of the University of
236California. 236California.
237.Sh AUTHORS 237.Sh AUTHORS
238.An Timo Rinne Aq tri@iki.fi 238.An Timo Rinne Aq Mt tri@iki.fi
239.An Tatu Ylonen Aq ylo@cs.hut.fi 239.An Tatu Ylonen Aq Mt ylo@cs.hut.fi
diff --git a/sftp-server.8 b/sftp-server.8
index d35af6840..cc925b96e 100644
--- a/sftp-server.8
+++ b/sftp-server.8
@@ -1,4 +1,4 @@
1.\" $OpenBSD: sftp-server.8,v 1.22 2013/05/06 07:35:12 dtucker Exp $ 1.\" $OpenBSD: sftp-server.8,v 1.23 2013/07/16 00:07:52 schwarze Exp $
2.\" 2.\"
3.\" Copyright (c) 2000 Markus Friedl. All rights reserved. 3.\" Copyright (c) 2000 Markus Friedl. All rights reserved.
4.\" 4.\"
@@ -22,7 +22,7 @@
22.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 22.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
23.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 23.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24.\" 24.\"
25.Dd $Mdocdate: May 6 2013 $ 25.Dd $Mdocdate: July 16 2013 $
26.Dt SFTP-SERVER 8 26.Dt SFTP-SERVER 8
27.Os 27.Os
28.Sh NAME 28.Sh NAME
@@ -133,4 +133,4 @@ establish a logging socket inside the chroot directory.
133first appeared in 133first appeared in
134.Ox 2.8 . 134.Ox 2.8 .
135.Sh AUTHORS 135.Sh AUTHORS
136.An Markus Friedl Aq markus@openbsd.org 136.An Markus Friedl Aq Mt markus@openbsd.org
diff --git a/ssh-keyscan.1 b/ssh-keyscan.1
index f2b0fc8fa..c35ea05e0 100644
--- a/ssh-keyscan.1
+++ b/ssh-keyscan.1
@@ -1,4 +1,4 @@
1.\" $OpenBSD: ssh-keyscan.1,v 1.30 2012/04/11 13:34:17 djm Exp $ 1.\" $OpenBSD: ssh-keyscan.1,v 1.31 2013/07/16 00:07:52 schwarze Exp $
2.\" 2.\"
3.\" Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>. 3.\" Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>.
4.\" 4.\"
@@ -6,7 +6,7 @@
6.\" permitted provided that due credit is given to the author and the 6.\" permitted provided that due credit is given to the author and the
7.\" OpenBSD project by leaving this copyright notice intact. 7.\" OpenBSD project by leaving this copyright notice intact.
8.\" 8.\"
9.Dd $Mdocdate: April 11 2012 $ 9.Dd $Mdocdate: July 16 2013 $
10.Dt SSH-KEYSCAN 1 10.Dt SSH-KEYSCAN 1
11.Os 11.Os
12.Sh NAME 12.Sh NAME
@@ -164,9 +164,9 @@ $ ssh-keyscan -t rsa,dsa,ecdsa -f ssh_hosts | \e
164.Xr sshd 8 164.Xr sshd 8
165.Sh AUTHORS 165.Sh AUTHORS
166.An -nosplit 166.An -nosplit
167.An David Mazieres Aq dm@lcs.mit.edu 167.An David Mazieres Aq Mt dm@lcs.mit.edu
168wrote the initial version, and 168wrote the initial version, and
169.An Wayne Davison Aq wayned@users.sourceforge.net 169.An Wayne Davison Aq Mt wayned@users.sourceforge.net
170added support for protocol version 2. 170added support for protocol version 2.
171.Sh BUGS 171.Sh BUGS
172It generates "Connection closed by remote host" messages on the consoles 172It generates "Connection closed by remote host" messages on the consoles
diff --git a/ssh-keysign.8 b/ssh-keysign.8
index 5e09e0271..5e0b2d232 100644
--- a/ssh-keysign.8
+++ b/ssh-keysign.8
@@ -1,4 +1,4 @@
1.\" $OpenBSD: ssh-keysign.8,v 1.12 2010/08/31 11:54:45 djm Exp $ 1.\" $OpenBSD: ssh-keysign.8,v 1.13 2013/07/16 00:07:52 schwarze Exp $
2.\" 2.\"
3.\" Copyright (c) 2002 Markus Friedl. All rights reserved. 3.\" Copyright (c) 2002 Markus Friedl. All rights reserved.
4.\" 4.\"
@@ -22,7 +22,7 @@
22.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 22.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
23.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 23.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24.\" 24.\"
25.Dd $Mdocdate: August 31 2010 $ 25.Dd $Mdocdate: July 16 2013 $
26.Dt SSH-KEYSIGN 8 26.Dt SSH-KEYSIGN 8
27.Os 27.Os
28.Sh NAME 28.Sh NAME
@@ -88,4 +88,4 @@ information corresponding with the private keys above.
88first appeared in 88first appeared in
89.Ox 3.2 . 89.Ox 3.2 .
90.Sh AUTHORS 90.Sh AUTHORS
91.An Markus Friedl Aq markus@openbsd.org 91.An Markus Friedl Aq Mt markus@openbsd.org
diff --git a/ssh-pkcs11-helper.8 b/ssh-pkcs11-helper.8
index 9bdaadc01..3728c4e4e 100644
--- a/ssh-pkcs11-helper.8
+++ b/ssh-pkcs11-helper.8
@@ -1,4 +1,4 @@
1.\" $OpenBSD: ssh-pkcs11-helper.8,v 1.3 2010/02/10 23:20:38 markus Exp $ 1.\" $OpenBSD: ssh-pkcs11-helper.8,v 1.4 2013/07/16 00:07:52 schwarze Exp $
2.\" 2.\"
3.\" Copyright (c) 2010 Markus Friedl. All rights reserved. 3.\" Copyright (c) 2010 Markus Friedl. All rights reserved.
4.\" 4.\"
@@ -14,7 +14,7 @@
14.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 14.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
15.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. 15.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
16.\" 16.\"
17.Dd $Mdocdate: February 10 2010 $ 17.Dd $Mdocdate: July 16 2013 $
18.Dt SSH-PKCS11-HELPER 8 18.Dt SSH-PKCS11-HELPER 8
19.Os 19.Os
20.Sh NAME 20.Sh NAME
@@ -40,4 +40,4 @@ is not intended to be invoked by the user, but from
40first appeared in 40first appeared in
41.Ox 4.7 . 41.Ox 4.7 .
42.Sh AUTHORS 42.Sh AUTHORS
43.An Markus Friedl Aq markus@openbsd.org 43.An Markus Friedl Aq Mt markus@openbsd.org