From 2efcfdddbb85b4ac7aa597a8c7051b17e0243842 Mon Sep 17 00:00:00 2001
From: John Polstra <jdp@FreeBSD.org>
Date: Mon, 14 Oct 2002 23:18:35 +0000
Subject: [PATCH] Correct an error in the instructions for using cvpasswd.

Noticed by:	gerald
---
 .../articles/committers-guide/article.sgml          | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/en_US.ISO8859-1/articles/committers-guide/article.sgml b/en_US.ISO8859-1/articles/committers-guide/article.sgml
index d038e8afa8..4f349400a1 100644
--- a/en_US.ISO8859-1/articles/committers-guide/article.sgml
+++ b/en_US.ISO8859-1/articles/committers-guide/article.sgml
@@ -579,11 +579,11 @@
         </itemizedlist>
 
         <para>You will almost certainly get a conflict because
-          of the <literal>$Id: article.sgml,v 1.138 2002-10-10 17:44:48 bmah Exp $</literal> (or in FreeBSD's case,
+          of the <literal>$Id: article.sgml,v 1.139 2002-10-14 23:18:35 jdp 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.138 2002-10-10 17:44:48 bmah Exp $</literal> line, leaving the original
-          <literal>$Id: article.sgml,v 1.138 2002-10-10 17:44:48 bmah Exp $</literal> line intact).</para>
+          the second <literal>$Id: article.sgml,v 1.139 2002-10-14 23:18:35 jdp Exp $</literal> line, leaving the original
+          <literal>$Id: article.sgml,v 1.139 2002-10-14 23:18:35 jdp Exp $</literal> line intact).</para>
       </listitem>
 
       <listitem>
@@ -2506,8 +2506,11 @@ docs:Documentation Bug:nik:</programlisting>
 	    to <hostid role="fqdn">cvsup-master.FreeBSD.org</hostid>,
 	    providing the public key output from <command>cvpasswd
 	    <replaceable>yourusername</replaceable>@FreeBSD.org
-	    cvsup-master.FreeBSD.org</command>.  Access to
-	    <hostid>cvsup-master</hostid> should not be over-used as it is
+	    freefall.FreeBSD.org</command>.  Please note: you must
+	    specify <hostid>freefall.FreeBSD.org</hostid> on the
+	    <command>cvpasswd</command> command line even though the
+	    actual server is <hostid>cvsup-master</hostid>.  Access to
+	    <hostid>cvsup-master</hostid> should not be overused as it is
 	    a busy machine.</para>
 	</listitem>
       </varlistentry>