From b16f3e650579c704737fd4a8fbeb11fd5961c1cc Mon Sep 17 00:00:00 2001
From: Ceri Davies <ceri@FreeBSD.org>
Date: Tue, 20 Apr 2004 18:43:19 +0000
Subject: [PATCH] Add reminders to new committers to ensure that they do not
 omit commits to files containing entity declarations.

---
 .../articles/committers-guide/article.sgml    | 24 +++++++++++--------
 1 file changed, 14 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 369f6d2de5..e409c4c6c6 100644
--- a/en_US.ISO8859-1/articles/committers-guide/article.sgml
+++ b/en_US.ISO8859-1/articles/committers-guide/article.sgml
@@ -678,11 +678,11 @@ alias scvs env CVS_RSH=ssh cvs -d <replaceable>user</replaceable>@ncvs.FreeBSD.o
 	</itemizedlist>
 
 	<para>You will almost certainly get a conflict because
-	  of the <literal>$Id: article.sgml,v 1.189 2004-04-20 18:35:00 ceri Exp $</literal> (or in FreeBSD's case,
+	  of the <literal>$Id: article.sgml,v 1.190 2004-04-20 18:43:19 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.189 2004-04-20 18:35:00 ceri Exp $</literal> line,
-	  leaving the original <literal>$Id: article.sgml,v 1.189 2004-04-20 18:35:00 ceri Exp $</literal> line intact).</para>
+	  (remove the marker lines and the second <literal>$Id: article.sgml,v 1.190 2004-04-20 18:43:19 ceri Exp $</literal> line,
+	  leaving the original <literal>$Id: article.sgml,v 1.190 2004-04-20 18:43:19 ceri Exp $</literal> line intact).</para>
       </listitem>
 
       <listitem>
@@ -981,16 +981,19 @@ checkout -P</programlisting>
 
     <itemizedlist>
       <listitem>
-	<para>Add yourself to the <quote>Developers</quote> section of
-	  the <ulink url="../contributors/index.html">Contributors List</ulink>
-	  and remove yourself from the <quote>Additional
-	  Contributors</quote> section.  Once you have done that, do not
-	  forget to add your author entity to
+	<para>Add your author entity to
 	  <filename>doc/en_US.ISO8859-1/share/sgml/authors.ent</filename>;
-	  use the other entries as example.</para>
+	  this should be done first since an omission of this commit will
+	  cause the next commits to break the doc/ build.</para>
 
 	<para>This is a relatively easy task, but remains a good first test of
 	  your CVS skills.</para>
+
+      <listitem>
+	<para>Add yourself to the <quote>Developers</quote> section of
+	  the <ulink url="../contributors/index.html">Contributors List</ulink>
+	  and remove yourself from the <quote>Additional
+	  Contributors</quote> section.</para>
       </listitem>
 
       <listitem>
@@ -1003,7 +1006,8 @@ checkout -P</programlisting>
       <listitem>
 	<para>You should add your PGP or GnuPG key to
 	  <filename>doc/share/pgpkeys</filename> (and if you do not
-	  have a key, you should create one).</para>
+	  have a key, you should create one).  Do not forget to commit
+	  the updated <filename>doc/share/pgpkeys/pgpkeys.ent</filename>.</para>
 
 	<para>&a.des; has
 	  written a shell script to make this extremely simple.  See the