From ddb2b87ea572310b0d6daaf83baedb8b208356f1 Mon Sep 17 00:00:00 2001
From: Ceri Davies <ceri@FreeBSD.org>
Date: Wed, 6 Dec 2006 00:18:17 +0000
Subject: [PATCH] There is zero point in installing the ssh1 port to connect to
 the FreeBSD cluster because you won't be allowed in.

---
 .../articles/committers-guide/article.sgml       | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/en_US.ISO8859-1/articles/committers-guide/article.sgml b/en_US.ISO8859-1/articles/committers-guide/article.sgml
index 97e54db9f7..e2bf566d05 100644
--- a/en_US.ISO8859-1/articles/committers-guide/article.sgml
+++ b/en_US.ISO8859-1/articles/committers-guide/article.sgml
@@ -23,6 +23,7 @@
       <year>2003</year>
       <year>2004</year>
       <year>2005</year>
+      <year>2006</year>
       <holder>The FreeBSD Documentation Project</holder>
     </copyright>
 
@@ -729,11 +730,11 @@ alias scvs cvs -d <replaceable>user</replaceable>@ncvs.FreeBSD.org:/home/ncvs</p
 	</itemizedlist>
 
 	<para>You will almost certainly get a conflict because
-	  of the <literal>$Id: article.sgml,v 1.249 2006-10-09 19:28:30 joel Exp $</literal> (or in FreeBSD's case,
+	  of the <literal>$Id: article.sgml,v 1.250 2006-12-06 00:18:17 ceri Exp $</literal> (or in FreeBSD's case,
 	  <literal>$<!-- stop expansion -->FreeBSD<!-- stop expansion -->$</literal>)
 	  lines, so you will have to edit the file to resolve the conflict
-	  (remove the marker lines and the second <literal>$Id: article.sgml,v 1.249 2006-10-09 19:28:30 joel Exp $</literal> line,
-	  leaving the original <literal>$Id: article.sgml,v 1.249 2006-10-09 19:28:30 joel Exp $</literal> line intact).</para>
+	  (remove the marker lines and the second <literal>$Id: article.sgml,v 1.250 2006-12-06 00:18:17 ceri Exp $</literal> line,
+	  leaving the original <literal>$Id: article.sgml,v 1.250 2006-12-06 00:18:17 ceri Exp $</literal> line intact).</para>
       </listitem>
 
       <listitem>
@@ -1657,13 +1658,8 @@ docs:Documentation Bug:freebsd-doc:</programlisting>
 	<para>If you are using FreeBSD 4.0 or later,
 	  OpenSSH is included in the base system.
 	  If you are using an earlier release,
-	  update and install one of the SSH ports.  In general,
-	  you will probably want to get OpenSSH from the
-	  <filename role="package">security/openssh</filename> port.  You
-	  may also wish to check out the original ssh1 in the
-	  <filename role="package">security/ssh</filename> port, but make
-	  certain you pay attention to its license.  Note that both
-	  of these ports cannot be installed at the same time.</para>
+	  update and install OpenSSH from the
+	  <filename role="package">security/openssh</filename> port.</para>
       </step>
 
       <step>