PERFORCE change 207807 for review

[Rene Ladan]

http://p4web.freebsd.org/@@207807?ac=10

Change 207807 by rene at rene_acer on 2012/03/11 18:35:06

	IFC

Affected files ...

.. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/committers-guide/article.sgml#50 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#130 integrate

Differences ...

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

@@ -9,7 +9,7 @@
 
     <corpauthor>The &os; Documentation Project</corpauthor>
 
-    <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/committers-guide/article.sgml,v 1.311 2012/02/24 14:10:05 gjb Exp $</pubdate>
+    <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/committers-guide/article.sgml,v 1.313 2012/03/11 15:32:12 gjb Exp $</pubdate>
 
     <copyright>
       <year>1999</year>
@@ -131,6 +131,7 @@
 	    <entry>
 	      <literal>stable/7</literal> (7.X-STABLE),
 	      <literal>stable/8</literal> (8.X-STABLE),
+	      <literal>stable/9</literal> (9.X-STABLE),
 	      <literal>head</literal> (-CURRENT)
 	    </entry>
 	  </row>
@@ -856,10 +857,9 @@
 	</table>
 
 	<para>The following are some Subversion examples related to the
-	  src repository.  More (in-depth) information can be found at
-	  <ulink
-	    url="http://wiki.freebsd.org/SubversionPrimer">Subversion
-	    Primer</ulink> and <ulink
+	  src repository.  More (in-depth) information can be found in
+	  the Subversion Primer at <xref linkend="subversion-primer">
+	  and <ulink
 	    url="http://wiki.freebsd.org/SubversionMissing">List of
 	    things missing in Subversion when compared to CVS</ulink>.
 	  The notes at <ulink
@@ -1221,7 +1221,7 @@
 	<para>The local <acronym>SVK</acronym> repository will be
 	  stored in <filename
 	    class="directory">~/.svk/local/</filename>, but can be
-	  moved to whereever suits.  If it is moved,
+	  moved to an alternate location.  If it is moved,
 	  <filename>~/.svk/config</filename> should be amended
 	  manually to reflect the move.</para>
 
@@ -1245,8 +1245,7 @@
 	    already.</para>
 	</note>
 
-	<para>To use &a.peter;'s tarball mentioned in the note
-	  above:</para>
+	<para>To use the tarball referenced above:</para>
 
 	<screen>&prompt.user; <userinput>cd ~</userinput>
 &prompt.user; <userinput>scp freefall:/home/peter/dot_svk_r179646.tbz2 .</userinput>
@@ -1443,8 +1442,10 @@
 	  <literal>stable/7</literal>; it will not pull down the whole
 	  tree.</para>
 
-	<para>It is useful to note that decreasing the depth of a
-	  working copy is not possible.</para>
+	<note>
+	  <para>Decreasing the depth of a working copy is not
+	    possible.</para>
+	</note>
       </sect3>
 
       <sect3>
@@ -1493,13 +1494,13 @@
 	  <acronym>SVN</acronym> and <acronym>SVK</acronym> do not
 	  need to be told in advance about file editing.</para>
 
-	<para><command>svn commit</command>works like the equivalent
+	<para><command>svn commit</command> works like the equivalent
 	  <acronym>CVS</acronym> command.  To commit all changes in
 	  the current directory and all subdirectories:</para>
 
 	<screen>&prompt.user; <userinput>svn commit</userinput></screen>
 
-	<para>To commit all changes in, for example, the <filename
+	<para>To commit all changes in, for example, <filename
 	    class="directory"><replaceable>lib/libfetch/</replaceable></filename>
 	  and <filename
 	    class="directory"><replaceable>usr/bin/fetch/</replaceable></filename>
@@ -1605,13 +1606,13 @@
       <sect3>
 	<title>Diffs</title>
 
-	<para>The <command>svn diff</command> displays changes to the
-	  working copy of the repository.  <acronym>SVN</acronym>'s
-	  diffs are unified by default, unlike
-	  <acronym>CVS</acronym>'s, and <acronym>SVN</acronym>'s
-	  include new files by default in the diff output.</para>
+	<para><command>svn diff</command> displays changes to the
+	  working copy of the repository.  Diffs generated by
+	  <acronym>SVN</acronym> are unified by default, unlike
+	  <acronym>CVS</acronym>, and include new files by default
+	  in the diff output.</para>
 
-	<para>Like <command>cvs diff</command>, <command>svn
+	<para>As with <acronym>CVS</acronym>, <command>svn
 	    diff</command> can show the changes between two revisions
 	  of the same file:</para>
 

==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#130 (text+ko) ====

@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.1068 2012/03/09 22:51:43 bapt Exp $ -->
+<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.1069 2012/03/11 03:49:17 eadler Exp $ -->
 <!--
 	NOTE TO COMMITTERS: Contributors lists are sorted in alphabetical
 	order by first name.
@@ -6642,6 +6642,11 @@
     </listitem>
 
     <listitem>
+      <para>Mel Flynn
+	<email>rflynn at acsalaska.net</email></para>
+    </listitem>
+
+    <listitem>
       <para>Meno Abels
 	<email>meno.abels at adviser.com</email></para>
     </listitem>