git: ae9f2337a7 - main - Commit the rest of the patch that should have gone into 5825ab58f756325ee2f2f3f9e253149afa740d8a

[Rene Ladan]

The branch main has been updated by rene:

URL: https://cgit.FreeBSD.org/doc/commit/?id=ae9f2337a7f091a84fb5a118cb09551e1288ab3f

commit ae9f2337a7f091a84fb5a118cb09551e1288ab3f
Author:     Rene Ladan <rene at FreeBSD.org>
AuthorDate: 2021-03-29 20:26:57 +0000
Commit:     Rene Ladan <rene at FreeBSD.org>
CommitDate: 2021-03-29 20:26:57 +0000

    Commit the rest of the patch that should have gone into 5825ab58f756325ee2f2f3f9e253149afa740d8a
---
 .../en/books/porters-handbook/testing/chapter.adoc | 46 +++++++++++-----------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/documentation/content/en/books/porters-handbook/testing/chapter.adoc b/documentation/content/en/books/porters-handbook/testing/chapter.adoc
index 04c0f6f248..3db84e6b32 100644
--- a/documentation/content/en/books/porters-handbook/testing/chapter.adoc
+++ b/documentation/content/en/books/porters-handbook/testing/chapter.adoc
@@ -196,10 +196,10 @@ Create the base jails which Poudriere will use for building:
 
 [source,shell]
 ....
-# poudriere jail -c -j 113Ramd64 -v 11.4-RELEASE -a amd64
+# poudriere jail -c -j 114Ramd64 -v 11.4-RELEASE -a amd64
 ....
 
-Fetch a `11.4-RELEASE` for `amd64` from the FTP server given by `FREEBSD_HOST` in [.filename]#poudriere.conf#, create the zfs file system `tank/poudriere/jails/113Ramd64`, mount it on [.filename]#/poudriere/jails/113Ramd64# and extract the `11.4-RELEASE` tarballs into this file system.
+Fetch a `11.4-RELEASE` for `amd64` from the FTP server given by `FREEBSD_HOST` in [.filename]#poudriere.conf#, create the zfs file system `tank/poudriere/jails/114Ramd64`, mount it on [.filename]#/poudriere/jails/114Ramd64# and extract the `11.4-RELEASE` tarballs into this file system.
 
 [source,shell]
 ....
@@ -380,36 +380,36 @@ For example, local modifications to the package:www/firefox[] port located in [.
 
 [source,shell]
 ....
-# poudriere testport -j 113Ramd64 -p development -o www/firefox
+# poudriere testport -j 114Ramd64 -p development -o www/firefox
 ....
 
 This will build all dependencies of Firefox. If a dependency has been built previously and is still up-to-date, the pre-built package is installed. If a dependency has no up-to-date package, one will be built with default options in a jail. Then Firefox itself is built.
 
-The complete build of every port is logged to [.filename]#/poudriere/data/logs/bulk/113Ri386-development/build-time/logs#.
+The complete build of every port is logged to [.filename]#/poudriere/data/logs/bulk/114Ri386-development/build-time/logs#.
 
-The directory name `113Ri386-development` is derived from the arguments to `-j` and `-p`, respectively. For convenience, a symbolic link [.filename]#/poudriere/data/logs/bulk/113Ri386-development/latest# is also maintained. The link points to the latest _build-time_ directory. Also in this directory is an [.filename]#index.html# for observing the build process with a web browser.
+The directory name `114Ri386-development` is derived from the arguments to `-j` and `-p`, respectively. For convenience, a symbolic link [.filename]#/poudriere/data/logs/bulk/114Ri386-development/latest# is also maintained. The link points to the latest _build-time_ directory. Also in this directory is an [.filename]#index.html# for observing the build process with a web browser.
 
 By default, Poudriere cleans up the jails and leaves log files in the directories mentioned above. To ease investigation, jails can be kept running after the build by adding `-i` to `testport`:
 
 [source,shell]
 ....
-# poudriere testport -j 113Ramd64 -p development -i -o www/firefox
+# poudriere testport -j 114Ramd64 -p development -i -o www/firefox
 ....
 
 After the build completes, and regardless of whether it was successful, a shell is provided within the jail. The shell is used to investigate further. Poudriere can be told to leave the jail running after the build finishes with `-I`. Poudriere will show the command to run when the jail is no longer needed. It is then possible to man:jexec[8] into it:
 
 [source,shell]
 ....
-# poudriere testport -j 113Ramd64 -p development -I -o www/firefox
+# poudriere testport -j 114Ramd64 -p development -I -o www/firefox
 [...]
 ====>> Installing local Pkg repository to /usr/local/etc/pkg/repos
-====>> Leaving jail 113Ramd64-development-n running, mounted at /poudriere/data/.m/113Ramd64-development/ref for interactive run testing
-====>> To enter jail: jexec 113Ramd64-development-n env -i TERM=$TERM /usr/bin/login -fp root
-====>> To stop jail: poudriere jail -k -j 113Ramd64 -p development
-# jexec 113Ramd64-development-n env -i TERM=$TERM /usr/bin/login -fp root
+====>> Leaving jail 114Ramd64-development-n running, mounted at /poudriere/data/.m/114Ramd64-development/ref for interactive run testing
+====>> To enter jail: jexec 114Ramd64-development-n env -i TERM=$TERM /usr/bin/login -fp root
+====>> To stop jail: poudriere jail -k -j 114Ramd64 -p development
+# jexec 114Ramd64-development-n env -i TERM=$TERM /usr/bin/login -fp root
 # [do some stuff in the jail]
 # exit
-# poudriere jail -k -j 113Ramd64 -p development
+# poudriere jail -k -j 114Ramd64 -p development
 ====>> Umounting file systems
 ....
 
@@ -437,17 +437,17 @@ To use sets, Poudriere expects an existing directory structure similar to `PORT_
 
 [source,shell]
 ....
-# poudriere testport -j 113Ramd64 -p development -z devset -o www/firefox
+# poudriere testport -j 114Ramd64 -p development -z devset -o www/firefox
 ....
 
 This will look for the existence of these directories in this order:
 
-* [.filename]#/usr/local/etc/poudriere.d/113Ramd64-development-devset-options#
-* [.filename]#/usr/local/etc/poudriere.d/113Ramd64-devset-options#
-* [.filename]#/usr/local/etc/poudriere.d/113Ramd64-development-options#
+* [.filename]#/usr/local/etc/poudriere.d/114Ramd64-development-devset-options#
+* [.filename]#/usr/local/etc/poudriere.d/114Ramd64-devset-options#
+* [.filename]#/usr/local/etc/poudriere.d/114Ramd64-development-options#
 * [.filename]#/usr/local/etc/poudriere.d/devset-options#
 * [.filename]#/usr/local/etc/poudriere.d/development-options#
-* [.filename]#/usr/local/etc/poudriere.d/113Ramd64-options#
+* [.filename]#/usr/local/etc/poudriere.d/114Ramd64-options#
 * [.filename]#/usr/local/etc/poudriere.d/options#
 
 From this list, Poudriere man:nullfs[5]-mounts the _first existing_ directory tree into the [.filename]#/var/db/ports# directory of the build jails. Hence, all custom options are used for all the ports during this run of `testport`.
@@ -473,7 +473,7 @@ Similar to using sets, Poudriere will also use a custom [.filename]#make.conf# i
 
 [source,shell]
 ....
-# poudriere testport -j 113Ramd64 -p development -z devset -o www/firefox
+# poudriere testport -j 114Ramd64 -p development -z devset -o www/firefox
 ....
 
 causes Poudriere to check for the existence of these files in this order:
@@ -481,12 +481,12 @@ causes Poudriere to check for the existence of these files in this order:
 * [.filename]#/usr/local/etc/poudriere.d/make.conf#
 * [.filename]#/usr/local/etc/poudriere.d/devset-make.conf#
 * [.filename]#/usr/local/etc/poudriere.d/development-make.conf#
-* [.filename]#/usr/local/etc/poudriere.d/113Ramd64-make.conf#
-* [.filename]#/usr/local/etc/poudriere.d/113Ramd64-development-make.conf#
-* [.filename]#/usr/local/etc/poudriere.d/113Ramd64-devset-make.conf#
-* [.filename]#/usr/local/etc/poudriere.d/113Ramd64-development-devset-make.conf#
+* [.filename]#/usr/local/etc/poudriere.d/114Ramd64-make.conf#
+* [.filename]#/usr/local/etc/poudriere.d/114Ramd64-development-make.conf#
+* [.filename]#/usr/local/etc/poudriere.d/114Ramd64-devset-make.conf#
+* [.filename]#/usr/local/etc/poudriere.d/114Ramd64-development-devset-make.conf#
 
-Unlike with sets, all of the found files will be appended, _in that order_, into one [.filename]#make.conf# inside the build jails. It is hence possible to have general make variables, intended to affect all builds in [.filename]#/usr/local/etc/poudriere.d/make.conf#. Special variables, intended to affect only certain jails or sets can be set in specialised [.filename]#make.conf# files, such as [.filename]#/usr/local/etc/poudriere.d/113Ramd64-development-devset-make.conf#.
+Unlike with sets, all of the found files will be appended, _in that order_, into one [.filename]#make.conf# inside the build jails. It is hence possible to have general make variables, intended to affect all builds in [.filename]#/usr/local/etc/poudriere.d/make.conf#. Special variables, intended to affect only certain jails or sets can be set in specialised [.filename]#make.conf# files, such as [.filename]#/usr/local/etc/poudriere.d/114Ramd64-development-devset-make.conf#.
 
 [[testing-poudriere-sets-perl]]
 .Using [.filename]#make.conf# to Change Default Perl