From 1c20401fc932fe9a486c2cae841200110b093324 Mon Sep 17 00:00:00 2001
From: "Simon L. B. Nielsen" <simon@FreeBSD.org>
Date: Sun, 27 Feb 2005 12:56:02 +0000
Subject: [PATCH] * Remove obsolete and confusing question "I added a new port.
   Do I need to add it to the INDEX?" (ports/INDEX file is really dead) * Add
 2005 year to <copyright>

PR:		docs/78145
Submitted by:	skv
---
 .../articles/committers-guide/article.sgml    | 20 ++++---------------
 1 file changed, 4 insertions(+), 16 deletions(-)

diff --git a/en_US.ISO8859-1/articles/committers-guide/article.sgml b/en_US.ISO8859-1/articles/committers-guide/article.sgml
index 6ce6453fa9..f6a807b590 100644
--- a/en_US.ISO8859-1/articles/committers-guide/article.sgml
+++ b/en_US.ISO8859-1/articles/committers-guide/article.sgml
@@ -22,6 +22,7 @@
       <year>2002</year>
       <year>2003</year>
       <year>2004</year>
+      <year>2005</year>
       <holder>The FreeBSD Documentation Project</holder>
     </copyright>
 
@@ -727,11 +728,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.219 2004-12-22 07:54:15 linimon Exp $</literal> (or in FreeBSD's case,
+	  of the <literal>$Id: article.sgml,v 1.220 2005-02-27 12:56:02 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.219 2004-12-22 07:54:15 linimon Exp $</literal> line,
-	  leaving the original <literal>$Id: article.sgml,v 1.219 2004-12-22 07:54:15 linimon Exp $</literal> line intact).</para>
+	  (remove the marker lines and the second <literal>$Id: article.sgml,v 1.220 2005-02-27 12:56:02 simon Exp $</literal> line,
+	  leaving the original <literal>$Id: article.sgml,v 1.220 2005-02-27 12:56:02 simon Exp $</literal> line intact).</para>
       </listitem>
 
       <listitem>
@@ -2853,19 +2854,6 @@ bak/packages  packages from last complete &lt;major_version&gt; run on &lt;arch&
 	  </answer>
 	</qandaentry>
 
-	<qandaentry>
-	  <question>
-	    <para>I added a new port.  Do I need to add it to the
-	      <filename>INDEX</filename>?</para>
-	  </question>
-
-	  <answer>
-	    <para>No.  The ports manager will regenerate the
-	      <filename>INDEX</filename> and commit it for each
-	      &os; release.</para>
-	  </answer>
-	</qandaentry>
-
 	<qandaentry>
 	  <question>
 	    <para>Are there any other files I am not allowed to