From 05e23a69fdc586a900ea6ec6c699acd42fd392ab Mon Sep 17 00:00:00 2001
From: Trevor Johnson <trevor@FreeBSD.org>
Date: Mon, 15 Jan 2001 03:49:03 +0000
Subject: [PATCH] Mention the pgpkeys file.

Looked at by:	will

Update copyright.
---
 .../articles/committers-guide/article.sgml        | 15 +++++++++++----
 .../articles/committers-guide/article.sgml        | 15 +++++++++++----
 2 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/en_US.ISO8859-1/articles/committers-guide/article.sgml b/en_US.ISO8859-1/articles/committers-guide/article.sgml
index 76e3530e84..0469b7074d 100644
--- a/en_US.ISO8859-1/articles/committers-guide/article.sgml
+++ b/en_US.ISO8859-1/articles/committers-guide/article.sgml
@@ -19,11 +19,12 @@
       </author>
     </authorgroup>
 
-    <pubdate>$FreeBSD: doc/en_US.ISO_8859-1/articles/committers-guide/article.sgml,v 1.46 2000/12/28 13:40:03 jedgar Exp $</pubdate>
+    <pubdate>$FreeBSD: doc/en_US.ISO_8859-1/articles/committers-guide/article.sgml,v 1.47 2001/01/13 02:04:07 dannyboy Exp $</pubdate>
 
     <copyright>
       <year>1999</year>
       <year>2000</year>
+      <year>2001</year>
       <holder>The FreeBSD Documentation Project</holder>
     </copyright>
 
@@ -515,11 +516,11 @@
         </itemizedlist>
 
         <para>You'll almost certainly get a conflict because
-          of the <literal>$Id: article.sgml,v 1.47 2001-01-13 02:04:07 dannyboy Exp $</literal> (or in FreeBSD's case,
+          of the <literal>$Id: article.sgml,v 1.48 2001-01-15 03:49:03 trevor Exp $</literal> (or in FreeBSD's case,
           <literal>$FreeBSD<!-- stop expansion -->$</literal>) lines, so you'll have to edit
           the file to resolve the conflict (remove the marker lines and
-          the second <literal>$Id: article.sgml,v 1.47 2001-01-13 02:04:07 dannyboy Exp $</literal> line, leaving the original
-          <literal>$Id: article.sgml,v 1.47 2001-01-13 02:04:07 dannyboy Exp $</literal> line intact).</para>
+          the second <literal>$Id: article.sgml,v 1.48 2001-01-15 03:49:03 trevor Exp $</literal> line, leaving the original
+          <literal>$Id: article.sgml,v 1.48 2001-01-15 03:49:03 trevor Exp $</literal> line intact).</para>
       </listitem>
 
       <listitem>
@@ -792,6 +793,12 @@ checkout -P</programlisting>
 	  format.</para>
       </listitem>
 
+      <listitem>
+	<para>If you have a PGP or GnuPG key, you may want to add it to
+	  <filename>doc/en_US.ISO_8859-1/books/handbook/pgpkeys</filename>.
+	  </para>
+      </listitem>
+
       <listitem>
 	<para>Some people also add an entry for themselves to
 	  <filename>ports/astro/xearth/files/freebsd.committers.markers</filename>.</para>
diff --git a/en_US.ISO_8859-1/articles/committers-guide/article.sgml b/en_US.ISO_8859-1/articles/committers-guide/article.sgml
index 76e3530e84..0469b7074d 100644
--- a/en_US.ISO_8859-1/articles/committers-guide/article.sgml
+++ b/en_US.ISO_8859-1/articles/committers-guide/article.sgml
@@ -19,11 +19,12 @@
       </author>
     </authorgroup>
 
-    <pubdate>$FreeBSD: doc/en_US.ISO_8859-1/articles/committers-guide/article.sgml,v 1.46 2000/12/28 13:40:03 jedgar Exp $</pubdate>
+    <pubdate>$FreeBSD: doc/en_US.ISO_8859-1/articles/committers-guide/article.sgml,v 1.47 2001/01/13 02:04:07 dannyboy Exp $</pubdate>
 
     <copyright>
       <year>1999</year>
       <year>2000</year>
+      <year>2001</year>
       <holder>The FreeBSD Documentation Project</holder>
     </copyright>
 
@@ -515,11 +516,11 @@
         </itemizedlist>
 
         <para>You'll almost certainly get a conflict because
-          of the <literal>$Id: article.sgml,v 1.47 2001-01-13 02:04:07 dannyboy Exp $</literal> (or in FreeBSD's case,
+          of the <literal>$Id: article.sgml,v 1.48 2001-01-15 03:49:03 trevor Exp $</literal> (or in FreeBSD's case,
           <literal>$FreeBSD<!-- stop expansion -->$</literal>) lines, so you'll have to edit
           the file to resolve the conflict (remove the marker lines and
-          the second <literal>$Id: article.sgml,v 1.47 2001-01-13 02:04:07 dannyboy Exp $</literal> line, leaving the original
-          <literal>$Id: article.sgml,v 1.47 2001-01-13 02:04:07 dannyboy Exp $</literal> line intact).</para>
+          the second <literal>$Id: article.sgml,v 1.48 2001-01-15 03:49:03 trevor Exp $</literal> line, leaving the original
+          <literal>$Id: article.sgml,v 1.48 2001-01-15 03:49:03 trevor Exp $</literal> line intact).</para>
       </listitem>
 
       <listitem>
@@ -792,6 +793,12 @@ checkout -P</programlisting>
 	  format.</para>
       </listitem>
 
+      <listitem>
+	<para>If you have a PGP or GnuPG key, you may want to add it to
+	  <filename>doc/en_US.ISO_8859-1/books/handbook/pgpkeys</filename>.
+	  </para>
+      </listitem>
+
       <listitem>
 	<para>Some people also add an entry for themselves to
 	  <filename>ports/astro/xearth/files/freebsd.committers.markers</filename>.</para>