View | Details | Raw Unified | Return to bug 171292
Collapse All | Expand All

(-)en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml (-25 / +45 lines)
Lines 118-123 Link Here
118
	the port <filename>net/cvsup-without-gui</filename>).
118
	the port <filename>net/cvsup-without-gui</filename>).
119
	You may wish to substitute this
119
	You may wish to substitute this
120
	with &man.csup.1;, which is part of the base system.</para>
120
	with &man.csup.1;, which is part of the base system.</para>
121
      <para>The use of <command>cvsup</command> is slowly being
122
	obsoleted as <command>subversion</command> replaces the use
123
	of <command>cvs</command> for the project's underlying
124
	version control structure. New installations are discouraged
125
	from using <command>cvsup</command>/<command>csup</command>,
126
	and encouraged to use <command>svn</command> instead.</para>
121
    </note>
127
    </note>
122
  </sect1>
128
  </sect1>
123
129
Lines 1376-1410 Link Here
1376
	      </indexterm>
1382
	      </indexterm>
1377
1383
1378
	      <listitem>
1384
	      <listitem>
1379
		<para>Use the <link linkend="cvsup">cvsup</link> program
1385
		<para>Use the <application>Subversion</application> program.
1380
		  with the <filename>supfile</filename> named
1381
		  <filename>standard-supfile</filename>
1382
		  available from
1383
		  <filename>/usr/share/examples/cvsup</filename>.
1384
		  This is the most recommended method, since it allows you to
1386
		  This is the most recommended method, since it allows you to
1385
		  grab the entire collection once and then only what has
1387
		  grab the entire collection once and then only what has
1386
		  changed from then on.  Many people run
1388
		  changed from then on.  Many people run
1387
		  <command>cvsup</command> from <command>cron</command> and
1389
		  <command>subversion</command> from <command>cron</command> and
1388
		  keep their sources up-to-date automatically.  You have to
1390
		  keep their sources up-to-date automatically.
1389
		  customize the sample <filename>supfile</filename> above,
1390
		  and configure <link
1391
		    linkend="cvsup">cvsup</link> for your environment.</para>
1392
1393
		<note>
1391
		<note>
1394
		  <para>The sample <filename>standard-supfile</filename> is
1392
		  <para>There is no version-control "tag" for the
1395
		    intended for tracking a specific security branch of
1393
		    &os.current; branch of &os;.
1396
		    &os;, and not &os.current;.  You will need to edit this
1394
		    The command line for
1397
		    file and replace the following line:</para>
1395
		    using <command>subversion</command> to retrieve
1396
		    &os.current; is 
1397
		    <screen>&prompt.root; <userinput>svn checkout <literal>svn://svn.FreeBSD.org/base/head</literal> <filename class="directory">/usr/src</filename></userinput></screen>
1398
1398
1399
		  <programlisting>*default release=cvs tag=RELENG_<replaceable>X</replaceable>_<replaceable>Y</replaceable></programlisting>
1399
		  <para>Similar procedures apply for other development
1400
1400
		    branches and tags: for a detailed explanation of usable tags, please
1401
		  <para>With this one:</para>
1402
1403
		  <programlisting>*default release=cvs tag=.</programlisting>
1404
1405
		  <para>For a detailed explanation of usable tags, please
1406
		    refer to the Handbook's <link
1401
		    refer to the Handbook's <link
1407
		      linkend="cvs-tags">CVS Tags</link> section.</para>
1402
		      linkend="cvs-tags">CVS Tags</link> section,
1403
		    which is still roughly appropriate
1404
		    for <application>Subversion</application>.</para>
1408
		</note>
1405
		</note>
1409
	      </listitem>
1406
	      </listitem>
1410
1407
Lines 1567-1576 Link Here
1567
	    <para>If you are already running a previous release of &os;
1564
	    <para>If you are already running a previous release of &os;
1568
	      and wish to upgrade via sources then you can easily do so
1565
	      and wish to upgrade via sources then you can easily do so
1569
	      from &os; <link linkend="mirrors">mirror site</link>.  This can
1566
	      from &os; <link linkend="mirrors">mirror site</link>.  This can
1570
	      be done in one of two ways:</para>
1567
	      be done in one of several ways:</para>
1571
1568
1572
	    <orderedlist>
1569
	    <orderedlist>
1573
	      <indexterm>
1570
	      <indexterm>
1571
		<primary><command>subversion</command></primary>
1572
	      </indexterm>
1573
	      <indexterm>
1574
		<primary><command>cvsup</command></primary>
1574
		<primary><command>cvsup</command></primary>
1575
	      </indexterm>
1575
	      </indexterm>
1576
	      <indexterm>
1576
	      <indexterm>
Lines 1581-1591 Link Here
1581
		<secondary>syncing with <application>CVSup</application></secondary>
1581
		<secondary>syncing with <application>CVSup</application></secondary>
1582
	      </indexterm>
1582
	      </indexterm>
1583
	      <listitem>
1583
	      <listitem>
1584
		<para>Use the <command>subversion</command> program
1585
		  with the appropriate  &os.stable; tag for the
1586
		  sources on the branch you prefer.
1587
		  This is the most recommended method, since it allows you to
1588
		  grab the entire collection once and then only what has
1589
		  changed from then on.  Many people run the
1590
		  <command>subversion</command> from <command>cron</command> to
1591
		  keep their sources up-to-date automatically.
1592
		  The command line for
1593
		  using <command>subversion</command> to
1594
		  retrieve &os.stable; is
1595
		  <screen>&prompt.root; <userinput>svn checkout <literal>svn://svn.FreeBSD.org/base/stable/9</literal> <filename class="directory">/usr/src</filename></userinput></screen>
1596
		  as long as 9.x is the &os.stable; branch.
1597
		</para>
1598
	      </listitem>
1599
1600
	      <listitem>
1584
		<para>Use the <link linkend="cvsup">cvsup</link> program
1601
		<para>Use the <link linkend="cvsup">cvsup</link> program
1585
		  with the <filename>supfile</filename> named
1602
		  with the <filename>supfile</filename> named
1586
		  <filename>stable-supfile</filename> from the directory
1603
		  <filename>stable-supfile</filename> from the directory
1587
		  <filename>/usr/share/examples/cvsup</filename>.
1604
		  <filename>/usr/share/examples/cvsup</filename>.
1588
		  This is the most recommended method, since it allows you to
1605
		  This method is becoming obsolescent, but is still
1606
		  appropriate for &os; versions before
1607
		  9.1. Like <command>subversion</command>, it allows
1608
		  you to
1589
		  grab the entire collection once and then only what has
1609
		  grab the entire collection once and then only what has
1590
		  changed from then on.  Many people run
1610
		  changed from then on.  Many people run
1591
		  <command>cvsup</command> from <command>cron</command> to
1611
		  <command>cvsup</command> from <command>cron</command> to

Return to bug 171292