svn commit: r44987 - head/en_US.ISO8859-1/articles/committers-guide

[Warren Block]

Author: wblock
Date: Sun Jun  1 01:04:58 2014
New Revision: 44987
URL: http://svnweb.freebsd.org/changeset/doc/44987

Log:
  Fix numerous things in the Conventions and Traditions section.

Modified:
  head/en_US.ISO8859-1/articles/committers-guide/article.xml

Modified: head/en_US.ISO8859-1/articles/committers-guide/article.xml
==============================================================================
--- head/en_US.ISO8859-1/articles/committers-guide/article.xml	Sat May 31 20:07:57 2014	(r44986)
+++ head/en_US.ISO8859-1/articles/committers-guide/article.xml	Sun Jun  1 01:04:58 2014	(r44987)
@@ -2169,16 +2169,16 @@ ControlPersist yes</screen>
   <sect1 xml:id="conventions">
     <title>Conventions and Traditions</title>
 
-    <para>As a new developer there are a number of things you should
-      do first.  The first set is specific to committers only.  (If
+    <para>There are a number of things to do as a new developer.
+      The first set is specific to committers only.  (If
       you are not a committer, e.g., have GNATS-only access, then your
-      mentor needs to do these things for you.)</para>
+      mentor must do these things.)</para>
 
     <sect2 xml:id="conventions-committers">
       <title>Guidelines for Committers</title>
 
       <note>
-	<para>The <literal>.ent</literal>, <literal>.xml</literal>,
+	<para>The <literal>.ent</literal>
 	  and <literal>.xml</literal> files listed below exist in the
 	  &os; Documentation Project SVN repository at <systemitem
 	    class="fqdomainname">svn.FreeBSD.org/doc/</systemitem>.</para>
@@ -2240,9 +2240,9 @@ ControlPersist yes</screen>
 	</listitem>
 
 	<listitem>
-	  <para>You should add your PGP or GnuPG key to
-	    <filename>head/share/pgpkeys</filename> (and if you do not
-	    have a key, you should create one).  Do not forget to
+	  <para>Add your PGP or GnuPG key to
+	    <filename>head/share/pgpkeys</filename>.  See <xref linkend="pgpkeys-creating"/>
+	    if you do not yet have a key.  Do not forget to
 	    commit the updated
 	    <filename>head/share/pgpkeys/pgpkeys.ent</filename> and
 	    <filename>head/share/pgpkeys/pgpkeys-developers.xml</filename>.
@@ -2256,8 +2256,8 @@ ControlPersist yes</screen>
 
 	  <note>
 	    <para>It is important to have an up-to-date PGP/GnuPG key
-	      in the Handbook, since the key may be required for
-	      positive identification of a committer, e.g., by the
+	      in the repository.  The key may be required for
+	      positive identification of a committer, for example, by the
 	      &a.admins; for account recovery.  A complete keyring of
 	      <systemitem
 		class="fqdomainname">FreeBSD.org</systemitem> users is
@@ -2269,7 +2269,7 @@ ControlPersist yes</screen>
 	<listitem>
 	  <para>Add an entry for yourself to the current committers
 	    section of
-	    <filename>src/share/misc/committers-<replaceable>repository</replaceable>.dot</filename>,
+	    <filename>head/share/misc/committers-<replaceable>repository</replaceable>.dot</filename>,
 	    where <replaceable>repository</replaceable> is <literal>doc</literal>, <literal>ports</literal>, or <literal>src</literal>, depending on
 	    the commit privileges granted.  Also add an entry for
 	    each of your mentor/mentee relationships in the