diff --git a/en_US.ISO8859-1/books/porters-handbook/testing/chapter.xml b/en_US.ISO8859-1/books/porters-handbook/testing/chapter.xml index 3a28fc081b..218dc7010f 100644 --- a/en_US.ISO8859-1/books/porters-handbook/testing/chapter.xml +++ b/en_US.ISO8859-1/books/porters-handbook/testing/chapter.xml @@ -471,7 +471,7 @@ SVN_HOST=svn.FreeBSD.org kernels can build and run older jails. For instance, a 13.0-CURRENT kernel can build and run a 11.3-STABLE - Poudriere jails if the + Poudriere jail if the COMPAT_FREEBSD11 kernel option was compiled in (on by default in 13.0-CURRENT @@ -534,19 +534,27 @@ JAILNAME VERSION ARCH METHOD Poudriere. The most straightforward way is to have Poudriere create a default ports - tree for itself: + tree for itself, using either &man.portsnap.8; (if running + &os; &rel121.current; or &rel114.current;) or + Subversion (if running + &os.current;): - &prompt.root; poudriere ports -c + &prompt.root; poudriere ports -c -m portsnap - This command creates + or + + &prompt.root; poudriere ports -c -m svn+https + + These commands create tank/poudriere/ports/default, mount it on /poudriere/ports/default, and populate it - using &man.portsnap.8;. Afterward it is included in the list - of known ports trees: + using either &man.portsnap.8; or + Subversion. Afterward it is + included in the list of known ports trees: &prompt.root; poudriere ports -l -PORTSTREE METHOD PATH -default portsnap /poudriere/ports/default +PORTSTREE METHOD TIMESTAMP PATH +default svn+https 2020-07-20 04:23:56 /poudriere/ports/default Note that the default ports tree is @@ -564,9 +572,8 @@ default portsnap /poudriere/ports/default 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 - Subversion is possible: - - &prompt.root; poudriere ports -c -m svn+https -p subversive + Subversion (as described above) + is preferable. The http and https @@ -575,17 +582,6 @@ default portsnap /poudriere/ports/default is enabled by default. - Creates tank/poudriere/ports/subversive - and mounts it on - /poudriere/ports/subversive. It is then - populated using Subversion. - Finally, it is added to the list of known ports trees: - - &prompt.root; poudriere ports -l -PORTSTREE METHOD PATH -default portsnap /poudriere/ports/default -subversive svn+https /poudriere/ports/subversive - The svn method allows extra qualifiers to tell Subversion @@ -625,11 +621,11 @@ subversive svn+https /poudriere/ports/subversive This will be listed in the table of known trees: &prompt.root; poudriere ports -l -PORTSTREE METHOD PATH -development - /work/ports +PORTSTREE METHOD TIMESTAMP PATH +development null 2020-07-20 05:06:33 /work/ports - The dash in the METHOD column means + The dash or null in the METHOD column means that Poudriere will not update or change this ports tree, ever. It is completely up to the user to maintain this tree, including all local