PERFORCE change 160222 for review

[Rene Ladan]

http://perforce.freebsd.org/chv.cgi?CH=160222

Change 160222 by rene at rene_self on 2009/04/05 09:09:02

	committers-guide: incorporate comments of keramida

Affected files ...

.. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/committers-guide/article.sgml#22 edit

Differences ...

==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/committers-guide/article.sgml#22 (text+ko) ====

@@ -115,7 +115,7 @@
 	    <entry>
 	      <literal>RELENG_6</literal> (6.X-STABLE), 
 	      <literal>RELENG_7</literal> (7.X-STABLE), 
-	      <literal>.</literal> (-CURRENT)
+	      <literal>HEAD</literal> (-CURRENT)
 	    </entry>
 	  </row>
 
@@ -285,7 +285,11 @@
       combined under a single <literal>CVSROOT</literal> when distributed
       via <application>CVSup</application> for the convenience of our users.
       The <literal>src</literal> tree is automatically exported to
-      CVS.</para>
+      CVS for compatibility reasons only (e.g.
+      <application>CVSup</application>).  The <quote>official</quote>
+      <literal>src</literal> repository is not stored in
+      <application>CVS</application> but in Subversion.  The official
+      and exported trees are not necessarily equal.</para>
 
     <note><para>Note that the <literal>www</literal> module containing sources
       for the <ulink url="http://www.FreeBSD.org">FreeBSD website</ulink> is
@@ -485,7 +489,7 @@
 	    <para>Check out the <filename>Tools</filename> module as it was
 	      on March 25th, 2009:</para>
 
-	    <screen>&prompt.user; <userinput>cvs co -D'03/25/2009' Tools</userinput></screen>
+	    <screen>&prompt.user; <userinput>cvs co -D'2009-03-25' Tools</userinput></screen>
 
 	    <para>You will not be able to commit modifications.</para>
 	  </listitem>
@@ -502,7 +506,7 @@
 
 	<para>Note that cvs stores metadata in subdirectories named
 	  <filename>CVS</filename>.
-	  Similarly, SVN stores metadata in subdirectories named
+	  Similarly, Subversion stores metadata in subdirectories named
 	  <filename>.svn</filename>.</para>
 
 	<para>Arguments to <option>-D</option> and <option>-r</option>
@@ -856,10 +860,6 @@
 	  </listitem>
 	</itemizedlist>
 
-	<para>Use the <option>-f</option> option if you realize that
-	  you left out important information from the commit message.
-	  This seems only possible with CVS.</para>
-
 	<para>Good commit messages are important. They tell others
 	  why you did the changes you did, not just right here and now,
 	  but months or years from now when someone wonders why some
@@ -1580,10 +1580,14 @@
 	<term>&a.committers;</term>
 
 	<listitem>
-	  <para><replaceable>repository</replaceable>-committers is the entity that the version control system uses to send you all your
+	  <para>cvs-committers is the entity that the version control system uses to send you all your
 	    commit messages.  You should <emphasis>never</emphasis> send email
 	    directly to this list.  You should only send replies to this list
 	    when they are short and are directly related to a commit.</para>
+
+	  <para>There is a similar list, svn-committers, which has a
+	    similar purpose but is a normal list, i.e. you are free to
+	    send any suitable message to this list.</para>
 	</listitem>
       </varlistentry>