svn commit: r54396 - head/en_US.ISO8859-1/books/porters-handbook/testing

[Benedict Reuschling]

Author: bcr
Date: Wed Aug  5 11:09:22 2020
New Revision: 54396
URL: https://svnweb.freebsd.org/changeset/doc/54396

Log:
  Deprecate references to portsnap.
  
  FreeBSD versions newer than 12.1 won't use portsnap anymore, so advise to use
  Subversion instead.
  
  While here, fix an errand plural.
  
  Submitted by:	pauamma_gundo.com
  Approved by:	bcr
  Differential Revision: https://reviews.freebsd.org/D25801

Modified:
  head/en_US.ISO8859-1/books/porters-handbook/testing/chapter.xml

Modified: head/en_US.ISO8859-1/books/porters-handbook/testing/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/porters-handbook/testing/chapter.xml	Wed Aug  5 11:02:12 2020	(r54395)
+++ head/en_US.ISO8859-1/books/porters-handbook/testing/chapter.xml	Wed Aug  5 11:09:22 2020	(r54396)
@@ -471,7 +471,7 @@ SVN_HOST=svn.FreeBSD.org</programlisting>
 	    kernels can build and run older jails.  For instance, a
 	    <literal>13.0-CURRENT</literal> kernel can build and run a
 	    <literal>11.3-STABLE</literal>
-	    <application>Poudriere</application> jails if the
+	    <application>Poudriere</application> jail if the
 	    <literal>COMPAT_FREEBSD11</literal> kernel option was
 	    compiled in (on by default in
 	    <literal>13.0-CURRENT</literal>
@@ -534,19 +534,27 @@ JAILNAME             VERSION              ARCH    METH
 	<application>Poudriere</application>.  The most
 	straightforward way is to have
 	<application>Poudriere</application> create a default ports
-	tree for itself:</para>
+	tree for itself, using either &man.portsnap.8; (if running
+	&os; &rel121.current; or &rel114.current;) or
+	<application>Subversion</application> (if running
+	&os.current;):</para>
 
-      <screen>&prompt.root; <userinput>poudriere ports -c</userinput></screen>
+      <screen>&prompt.root; <userinput>poudriere ports -c -m portsnap</userinput></screen>
 
-      <para>This command creates
+      <para>or</para>
+
+      <screen>&prompt.root; <userinput>poudriere ports -c -m svn+https</userinput></screen>
+
+      <para>These commands create
 	<literal>tank/poudriere/ports/default</literal>, mount it on
 	<filename>/poudriere/ports/default</filename>, and populate it
-	using &man.portsnap.8;.  Afterward it is included in the list
-	of known ports trees:</para>
+	using either &man.portsnap.8; or
+	<application>Subversion</application>.  Afterward it is
+	included in the list of known ports trees:</para>
 
       <screen>&prompt.root; <userinput>poudriere ports -l</userinput>
-PORTSTREE      METHOD     PATH
-default        portsnap   /poudriere/ports/default</screen>
+PORTSTREE METHOD    TIMESTAMP           PATH
+default   svn+https 2020-07-20 04:23:56 /poudriere/ports/default</screen>
 
       <note>
 	<para>Note that the <quote>default</quote> ports tree is
@@ -564,10 +572,9 @@ default        portsnap   /poudriere/ports/default</sc
 	use a different method for creating the ports tree.  To add an
 	additional ports tree for testing local modifications and
 	ports development, checking out the tree via
-	<application>Subversion</application> is possible:</para>
+	<application>Subversion</application> (as described above)
+	is preferable.</para>
 
-      <screen>&prompt.root; <userinput>poudriere ports -c -m svn+https -p subversive</userinput></screen>
-
       <note>
 	<para>The <acronym>http</acronym> and <acronym>https</acronym>
 	  methods need <package role="port">devel/subversion</package>
@@ -575,17 +582,6 @@ default        portsnap   /poudriere/ports/default</sc
 	  is enabled by default.</para>
       </note>
 
-      <para>Creates <literal>tank/poudriere/ports/subversive</literal>
-	and mounts it on
-	<filename>/poudriere/ports/subversive</filename>.  It is then
-	populated using <application>Subversion</application>.
-	Finally, it is added to the list of known ports trees:</para>
-
-      <screen>&prompt.root; <userinput>poudriere ports -l</userinput>
-PORTSTREE            METHOD     PATH
-default              portsnap   /poudriere/ports/default
-subversive           svn+https  /poudriere/ports/subversive</screen>
-
       <tip>
 	<para>The <literal>svn</literal> method allows extra
 	  qualifiers to tell <application>Subversion</application>
@@ -625,11 +621,11 @@ subversive           svn+https  /poudriere/ports/subve
       <para>This will be listed in the table of known trees:</para>
 
       <screen>&prompt.root; <userinput>poudriere ports -l</userinput>
-PORTSTREE    METHOD   PATH
-development  -        /work/ports</screen>
+PORTSTREE   METHOD    TIMESTAMP           PATH
+development null      2020-07-20 05:06:33 /work/ports</screen>
 
       <note>
-	<para>The dash in the <literal>METHOD</literal> column means
+	<para>The dash or <literal>null</literal> in the <literal>METHOD</literal> column means
 	  that <application>Poudriere</application> will not update or
 	  change this ports tree, ever.  It is completely up to the
 	  user to maintain this tree, including all local