svn commit: r41111 - head/en_US.ISO8859-1/articles/committers-guide

[Gavin Atkinson]

Author: gavin
Date: Wed Mar  6 18:12:47 2013
New Revision: 41111
URL: http://svnweb.freebsd.org/changeset/doc/41111

Log:
  Update the Subversion Primer in the committers-guide:
  
  - Explains the current state of the svn exporter, specifically that
    it should be viewed as legacy, and will not remain forever.
  - Drop the one and only reference to csup.
  - Drop the inclusion of the CVSup trademark attribution, no longer
    required since r40063.
  
  Approved by:	bcr (mentor)

Modified:
  head/en_US.ISO8859-1/articles/committers-guide/article.xml

Modified: head/en_US.ISO8859-1/articles/committers-guide/article.xml
==============================================================================
--- head/en_US.ISO8859-1/articles/committers-guide/article.xml	Wed Mar  6 18:10:45 2013	(r41110)
+++ head/en_US.ISO8859-1/articles/committers-guide/article.xml	Wed Mar  6 18:12:47 2013	(r41111)
@@ -33,7 +33,6 @@
     <legalnotice id="trademarks" role="trademarks">
       &tm-attrib.freebsd;
       &tm-attrib.coverity;
-      &tm-attrib.cvsup;
       &tm-attrib.ibm;
       &tm-attrib.intel;
       &tm-attrib.sparc;
@@ -316,9 +315,16 @@
 	<emphasis>r300894</emphasis>.</para>
 
       <para>There are mechanisms in place to automatically merge
-	changes back from the Subversion repository to the
-	<acronym>CVS</acronym> one, so regular users should not notice
-	a difference, however developers most certainly will.</para>
+	changes back from the Subversion <literal>src</literal>
+	repository to the <acronym>CVS</acronym> repository for
+	some &os; branches (<literal>releng/6</literal> through
+	<literal>releng/9</literal>), however this is purely to
+	support pre-existing end-user installs and should not be
+	relied upon, recommended or advertised.  Future branches
+	will not be exported to CVS at all.  The
+	<literal>ports</literal> repository was exported to CVS
+	for a period of time to aid end user migration, but as of
+	28th February 2013 is no longer exported.</para>
 
       <para>Subversion is not that different from
 	<acronym>CVS</acronym> when it comes to daily use, but there
@@ -459,8 +465,8 @@
 	  the same UUID, some hacking of the local repository's UUID
 	  has to occur before it is possible to start using it.</para>
 
-	<para>Unlike with <acronym>CVS</acronym> and
-	  <acronym>csup</acronym>, the hassle of a local
+	<para>Unlike with <acronym>CVS</acronym>,
+	  the hassle of a local
 	  <command>svnsync</command> mirror probably is not worth it
 	  unless the network connectivity situation or other factors
 	  demand it.  If it is needed, see the end of this chapter for