new-account.sgml:

- Remove the requirement for mentors to send PGP keys of new
  committers to admins@.

committers-guide/article.sgml:
- Update copyright year.
- Emphasize that new committers should add their PGP key to the
  Handbook, since it might be needed for identification, e.g. for
  account recovery.

teams.ent:
- Add an entiry for admins@.

Discussed with:	admins (joe, kensmith)

en_US.ISO8859-1/articles/committers-guide/article.sgml

@@ -36,6 +36,7 @@
       <year>2001</year>
       <year>2002</year>
       <year>2003</year>
+      <year>2004</year>
       <holder>The FreeBSD Documentation Project</holder>
     </copyright>
 
@@ -677,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.177 2003-12-28 20:57:24 ale Exp $</literal> (or in FreeBSD's case,
+	  of the <literal>$Id: article.sgml,v 1.178 2004-01-17 19:29:55 simon 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.177 2003-12-28 20:57:24 ale Exp $</literal> line,
-	  leaving the original <literal>$Id: article.sgml,v 1.177 2003-12-28 20:57:24 ale Exp $</literal> line intact).</para>
+	  (remove the marker lines and the second <literal>$Id: article.sgml,v 1.178 2004-01-17 19:29:55 simon Exp $</literal> line,
+	  leaving the original <literal>$Id: article.sgml,v 1.178 2004-01-17 19:29:55 simon Exp $</literal> line intact).</para>
       </listitem>
 
       <listitem>
@@ -1000,15 +1001,22 @@ checkout -P</programlisting>
       </listitem>
 
       <listitem>
-	<para>If you have a PGP or GnuPG key, you may want to add it to
-	  <filename>doc/share/pgpkeys</filename>.
-	  </para>
+	<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>
 
 	<para>&a.des; has
 	  written a shell script to make this extremely simple.  See the
 	  <ulink
 	  url="http://cvsweb.FreeBSD.org/doc/share/pgpkeys/README">README</ulink>
 	  file for more information.</para>
+
+	<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 &a.admins; for
+	    account recovery.</para>
+	</note>
       </listitem>
 
       <listitem>

en_US.ISO8859-1/share/sgml/teams.ent

@@ -15,6 +15,8 @@
      $FreeBSD$
 -->
 
+<!ENTITY a.admins "FreeBSD Administrators <email>admins@FreeBSD.org</email>">
+
 <!ENTITY a.core-secretary "Core Team Secretary <email>core-secretary@FreeBSD.org</email>">
 
 <!ENTITY a.cvs "CVS Repository Meisters <email>cvs@FreeBSD.org</email>">