2 files changed, 75 insertions, 30 deletions
diff --git a/ChangeLog b/ChangeLog
index 6f5072f15..c22e569c6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -18,6 +18,10 @@
     [sftp.c]
     Fix handling of filenames containing escaped globbing characters and
     escape "#" and "*".  Patch from Jean-Marc Robert via tech@, ok djm.
+   - jmc@cvs.openbsd.org 2012/09/26 16:12:13
+     [ssh.1]
+     last stage of rfc changes, using consistent Rs/Re blocks, and moving the
+     references into a STANDARDS section;
 20120917
 - (dtucker) OpenBSD CVS Sync
diff --git a/ssh.1 b/ssh.1
index b218e11d9..e9bf3eaca 100644
--- a/ssh.1
+++ b/ssh.1
@@ -33,8 +33,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.328 2012/09/06 13:57:42 jmc Exp $
+.\" $OpenBSD: ssh.1,v 1.329 2012/09/26 16:12:13 jmc Exp $
-.Dd $Mdocdate: September 6 2012 $
+.Dd $Mdocdate: September 26 2012 $
 .Dt SSH 1
 .Os
 .Sh NAME
@@ -1434,77 +1434,118 @@ if an error occurred.
 .Xr ssh_config 5 ,
 .Xr ssh-keysign 8 ,
 .Xr sshd 8
+.Sh STANDARDS
 .Rs
+.%A S. Lehtinen
+.%A C. Lonvick
+.%D January 2006
 .%R RFC 4250
-.%T "The Secure Shell (SSH) Protocol Assigned Numbers"
+.%T The Secure Shell (SSH) Protocol Assigned Numbers
-.%D 2006
 .Re
+.Pp
 .Rs
+.%A T. Ylonen
+.%A C. Lonvick
+.%D January 2006
 .%R RFC 4251
-.%T "The Secure Shell (SSH) Protocol Architecture"
+.%T The Secure Shell (SSH) Protocol Architecture
-.%D 2006
 .Re
+.Pp
 .Rs
+.%A T. Ylonen
+.%A C. Lonvick
+.%D January 2006
 .%R RFC 4252
-.%T "The Secure Shell (SSH) Authentication Protocol"
+.%T The Secure Shell (SSH) Authentication Protocol
-.%D 2006
 .Re
+.Pp
 .Rs
+.%A T. Ylonen
+.%A C. Lonvick
+.%D January 2006
 .%R RFC 4253
-.%T "The Secure Shell (SSH) Transport Layer Protocol"
+.%T The Secure Shell (SSH) Transport Layer Protocol
-.%D 2006
 .Re
+.Pp
 .Rs
+.%A T. Ylonen
+.%A C. Lonvick
+.%D January 2006
 .%R RFC 4254
-.%T "The Secure Shell (SSH) Connection Protocol"
+.%T The Secure Shell (SSH) Connection Protocol
-.%D 2006
 .Re
+.Pp
 .Rs
+.%A J. Schlyter
+.%A W. Griffin
+.%D January 2006
 .%R RFC 4255
-.%T "Using DNS to Securely Publish Secure Shell (SSH) Key Fingerprints"
+.%T Using DNS to Securely Publish Secure Shell (SSH) Key Fingerprints
-.%D 2006
 .Re
+.Pp
 .Rs
+.%A F. Cusack
+.%A M. Forssen
+.%D January 2006
 .%R RFC 4256
-.%T "Generic Message Exchange Authentication for the Secure Shell Protocol (SSH)"
+.%T Generic Message Exchange Authentication for the Secure Shell Protocol (SSH)
-.%D 2006
 .Re
+.Pp
 .Rs
+.%A J. Galbraith
+.%A P. Remaker
+.%D January 2006
 .%R RFC 4335
-.%T "The Secure Shell (SSH) Session Channel Break Extension"
+.%T The Secure Shell (SSH) Session Channel Break Extension
-.%D 2006
 .Re
+.Pp
 .Rs
+.%A M. Bellare
+.%A T. Kohno
+.%A C. Namprempre
+.%D January 2006
 .%R RFC 4344
-.%T "The Secure Shell (SSH) Transport Layer Encryption Modes"
+.%T The Secure Shell (SSH) Transport Layer Encryption Modes
-.%D 2006
 .Re
+.Pp
 .Rs
+.%A B. Harris
+.%D January 2006
 .%R RFC 4345
-.%T "Improved Arcfour Modes for the Secure Shell (SSH) Transport Layer Protocol"
+.%T Improved Arcfour Modes for the Secure Shell (SSH) Transport Layer Protocol
-.%D 2006
 .Re
+.Pp
 .Rs
+.%A M. Friedl
+.%A N. Provos
+.%A W. Simpson
+.%D March 2006
 .%R RFC 4419
-.%T "Diffie-Hellman Group Exchange for the Secure Shell (SSH) Transport Layer Protocol"
+.%T Diffie-Hellman Group Exchange for the Secure Shell (SSH) Transport Layer Protocol
-.%D 2006
 .Re
+.Pp
 .Rs
+.%A J. Galbraith
+.%A R. Thayer
+.%D November 2006
 .%R RFC 4716
-.%T "The Secure Shell (SSH) Public Key File Format"
+.%T The Secure Shell (SSH) Public Key File Format
-.%D 2006
 .Re
+.Pp
 .Rs
+.%A D. Stebila
+.%A J. Green
+.%D December 2009
 .%R RFC 5656
-.%T "Elliptic Curve Algorithm Integration in the Secure Shell Transport Layer"
+.%T Elliptic Curve Algorithm Integration in the Secure Shell Transport Layer
-.%D 2009
 .Re
+.Pp
 .Rs
-.%T "Hash Visualization: a New Technique to improve Real-World Security"
 .%A A. Perrig
 .%A D. Song
 .%D 1999
-.%O "International Workshop on Cryptographic Techniques and E-Commerce (CrypTEC '99)"
+.%O International Workshop on Cryptographic Techniques and E-Commerce (CrypTEC '99)
+.%T Hash Visualization: a New Technique to improve Real-World Security
 .Re
 .Sh AUTHORS
 OpenSSH is a derivative of the original and free

diff --git a/ChangeLog b/ChangeLog index 6f5072f15..c22e569c6 100644 --- a/ChangeLog +++ b/ChangeLog
@@ -18,6 +18,10 @@
18	[sftp.c]	18	[sftp.c]
19	Fix handling of filenames containing escaped globbing characters and	19	Fix handling of filenames containing escaped globbing characters and
20	escape "#" and "*". Patch from Jean-Marc Robert via tech@, ok djm.	20	escape "#" and "*". Patch from Jean-Marc Robert via tech@, ok djm.
		21	- jmc@cvs.openbsd.org 2012/09/26 16:12:13
		22	[ssh.1]
		23	last stage of rfc changes, using consistent Rs/Re blocks, and moving the
		24	references into a STANDARDS section;
21		25
22	20120917	26	20120917
23	- (dtucker) OpenBSD CVS Sync	27	- (dtucker) OpenBSD CVS Sync


diff --git a/ssh.1 b/ssh.1 index b218e11d9..e9bf3eaca 100644 --- a/ssh.1 +++ b/ssh.1
@@ -33,8 +33,8 @@
33	.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF	33	.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
34	.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.	34	.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
35	.\"	35	.\"
36	.\" $OpenBSD: ssh.1,v 1.328 2012/09/06 13:57:42 jmc Exp $	36	.\" $OpenBSD: ssh.1,v 1.329 2012/09/26 16:12:13 jmc Exp $
37	.Dd $Mdocdate: September 6 2012 $	37	.Dd $Mdocdate: September 26 2012 $
38	.Dt SSH 1	38	.Dt SSH 1
39	.Os	39	.Os
40	.Sh NAME	40	.Sh NAME
@@ -1434,77 +1434,118 @@ if an error occurred.
1434	.Xr ssh_config 5 ,	1434	.Xr ssh_config 5 ,
1435	.Xr ssh-keysign 8 ,	1435	.Xr ssh-keysign 8 ,
1436	.Xr sshd 8	1436	.Xr sshd 8
		1437	.Sh STANDARDS
1437	.Rs	1438	.Rs
		1439	.%A S. Lehtinen
		1440	.%A C. Lonvick
		1441	.%D January 2006
1438	.%R RFC 4250	1442	.%R RFC 4250
1439	.%T "The Secure Shell (SSH) Protocol Assigned Numbers"	1443	.%T The Secure Shell (SSH) Protocol Assigned Numbers
1440	.%D 2006
1441	.Re	1444	.Re
		1445	.Pp
1442	.Rs	1446	.Rs
		1447	.%A T. Ylonen
		1448	.%A C. Lonvick
		1449	.%D January 2006
1443	.%R RFC 4251	1450	.%R RFC 4251
1444	.%T "The Secure Shell (SSH) Protocol Architecture"	1451	.%T The Secure Shell (SSH) Protocol Architecture
1445	.%D 2006
1446	.Re	1452	.Re
		1453	.Pp
1447	.Rs	1454	.Rs
		1455	.%A T. Ylonen
		1456	.%A C. Lonvick
		1457	.%D January 2006
1448	.%R RFC 4252	1458	.%R RFC 4252
1449	.%T "The Secure Shell (SSH) Authentication Protocol"	1459	.%T The Secure Shell (SSH) Authentication Protocol
1450	.%D 2006
1451	.Re	1460	.Re
		1461	.Pp
1452	.Rs	1462	.Rs
		1463	.%A T. Ylonen
		1464	.%A C. Lonvick
		1465	.%D January 2006
1453	.%R RFC 4253	1466	.%R RFC 4253
1454	.%T "The Secure Shell (SSH) Transport Layer Protocol"	1467	.%T The Secure Shell (SSH) Transport Layer Protocol
1455	.%D 2006
1456	.Re	1468	.Re
		1469	.Pp
1457	.Rs	1470	.Rs
		1471	.%A T. Ylonen
		1472	.%A C. Lonvick
		1473	.%D January 2006
1458	.%R RFC 4254	1474	.%R RFC 4254
1459	.%T "The Secure Shell (SSH) Connection Protocol"	1475	.%T The Secure Shell (SSH) Connection Protocol
1460	.%D 2006
1461	.Re	1476	.Re
		1477	.Pp
1462	.Rs	1478	.Rs
		1479	.%A J. Schlyter
		1480	.%A W. Griffin
		1481	.%D January 2006
1463	.%R RFC 4255	1482	.%R RFC 4255
1464	.%T "Using DNS to Securely Publish Secure Shell (SSH) Key Fingerprints"	1483	.%T Using DNS to Securely Publish Secure Shell (SSH) Key Fingerprints
1465	.%D 2006
1466	.Re	1484	.Re
		1485	.Pp
1467	.Rs	1486	.Rs
		1487	.%A F. Cusack
		1488	.%A M. Forssen
		1489	.%D January 2006
1468	.%R RFC 4256	1490	.%R RFC 4256
1469	.%T "Generic Message Exchange Authentication for the Secure Shell Protocol (SSH)"	1491	.%T Generic Message Exchange Authentication for the Secure Shell Protocol (SSH)
1470	.%D 2006
1471	.Re	1492	.Re
		1493	.Pp
1472	.Rs	1494	.Rs
		1495	.%A J. Galbraith
		1496	.%A P. Remaker
		1497	.%D January 2006
1473	.%R RFC 4335	1498	.%R RFC 4335
1474	.%T "The Secure Shell (SSH) Session Channel Break Extension"	1499	.%T The Secure Shell (SSH) Session Channel Break Extension
1475	.%D 2006
1476	.Re	1500	.Re
		1501	.Pp
1477	.Rs	1502	.Rs
		1503	.%A M. Bellare
		1504	.%A T. Kohno
		1505	.%A C. Namprempre
		1506	.%D January 2006
1478	.%R RFC 4344	1507	.%R RFC 4344
1479	.%T "The Secure Shell (SSH) Transport Layer Encryption Modes"	1508	.%T The Secure Shell (SSH) Transport Layer Encryption Modes
1480	.%D 2006
1481	.Re	1509	.Re
		1510	.Pp
1482	.Rs	1511	.Rs
		1512	.%A B. Harris
		1513	.%D January 2006
1483	.%R RFC 4345	1514	.%R RFC 4345
1484	.%T "Improved Arcfour Modes for the Secure Shell (SSH) Transport Layer Protocol"	1515	.%T Improved Arcfour Modes for the Secure Shell (SSH) Transport Layer Protocol
1485	.%D 2006
1486	.Re	1516	.Re
		1517	.Pp
1487	.Rs	1518	.Rs
		1519	.%A M. Friedl
		1520	.%A N. Provos
		1521	.%A W. Simpson
		1522	.%D March 2006
1488	.%R RFC 4419	1523	.%R RFC 4419
1489	.%T "Diffie-Hellman Group Exchange for the Secure Shell (SSH) Transport Layer Protocol"	1524	.%T Diffie-Hellman Group Exchange for the Secure Shell (SSH) Transport Layer Protocol
1490	.%D 2006
1491	.Re	1525	.Re
		1526	.Pp
1492	.Rs	1527	.Rs
		1528	.%A J. Galbraith
		1529	.%A R. Thayer
		1530	.%D November 2006
1493	.%R RFC 4716	1531	.%R RFC 4716
1494	.%T "The Secure Shell (SSH) Public Key File Format"	1532	.%T The Secure Shell (SSH) Public Key File Format
1495	.%D 2006
1496	.Re	1533	.Re
		1534	.Pp
1497	.Rs	1535	.Rs
		1536	.%A D. Stebila
		1537	.%A J. Green
		1538	.%D December 2009
1498	.%R RFC 5656	1539	.%R RFC 5656
1499	.%T "Elliptic Curve Algorithm Integration in the Secure Shell Transport Layer"	1540	.%T Elliptic Curve Algorithm Integration in the Secure Shell Transport Layer
1500	.%D 2009
1501	.Re	1541	.Re
		1542	.Pp
1502	.Rs	1543	.Rs
1503	.%T "Hash Visualization: a New Technique to improve Real-World Security"
1504	.%A A. Perrig	1544	.%A A. Perrig
1505	.%A D. Song	1545	.%A D. Song
1506	.%D 1999	1546	.%D 1999
1507	.%O "International Workshop on Cryptographic Techniques and E-Commerce (CrypTEC '99)"	1547	.%O International Workshop on Cryptographic Techniques and E-Commerce (CrypTEC '99)
		1548	.%T Hash Visualization: a New Technique to improve Real-World Security
1508	.Re	1549	.Re
1509	.Sh AUTHORS	1550	.Sh AUTHORS
1510	OpenSSH is a derivative of the original and free	1551	OpenSSH is a derivative of the original and free