From 682d581f98f3d8c4f708a42c7cd26f767d2605d8 Mon Sep 17 00:00:00 2001
From: Brad Davis <brd@FreeBSD.org>
Date: Fri, 29 May 2020 20:14:40 +0000
Subject: [PATCH] Replace the manual fetch method with bsdinstall and break the
 methods into separate sections.

Will follow up with the white space change as a separate commit.

Reviewed by:	bcr
Differential Revision:	https://reviews.freebsd.org/D25044
---
 .../books/handbook/jails/chapter.xml          | 39 +++++++++++++++----
 1 file changed, 31 insertions(+), 8 deletions(-)

diff --git a/en_US.ISO8859-1/books/handbook/jails/chapter.xml b/en_US.ISO8859-1/books/handbook/jails/chapter.xml
index a632c11e89..b39d98246b 100644
--- a/en_US.ISO8859-1/books/handbook/jails/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/jails/chapter.xml
@@ -201,6 +201,27 @@
       prebuilt binaries (such as those supplied on an install media)
       or build from source.</para>
 
+    <sect2>
+      <title>Installing a Jail</title>
+
+      <sect3 xml:id="jails-install-internet">
+        <title>To install a Jail from the Internet</title>
+      
+        <para>The &man.bsdinstall.8; tool can be used to fetch and
+          install the binaries needed for a jail.  This will walk through
+          the picking of a mirror, which distributions will be installed
+          into the destination directory, and some basic configuration
+          of the jail:</para>
+    
+        <screen>&prompt.root; <userinput>bsdinstall jail <replaceable>/here/is/the/jail</replaceable></userinput></screen>
+      
+        <para>Once the command is complete, the next step is configuring
+          the host to run the jail.</para>
+      </sect3>
+
+      <sect3 xml:id="jails-install-iso">
+        <title>To install a Jail from an ISO</title>
+
     <para>To install the userland from installation media, first
       create the root directory for the jail.  This can be done by
       setting the <varname>DESTDIR</varname> variable to the proper
@@ -217,14 +238,6 @@
     <screen>&prompt.root; <userinput>mount -t cd9660 /dev/`mdconfig -f cdimage.iso` /mnt</userinput>
 &prompt.root; <userinput>cd /mnt/usr/freebsd-dist/</userinput></screen>
 
-    <para>Alternatively, download the tarballs from a mirror:</para>
-
-    <screen>&prompt.root; <userinput>sh</userinput>
-&prompt.root; <userinput>export DESTRELEASE=<replaceable>12.0-RELEASE</replaceable></userinput>
-&prompt.root; <userinput>export DESTARCH=<replaceable>`uname -m`</replaceable></userinput>
-&prompt.root; <userinput>export SOURCEURL=<replaceable>http://ftp.freebsd.org/pub/</replaceable>FreeBSD/releases/$DESTARCH/$DESTRELEASE/</userinput>
-&prompt.root; <userinput>for set in base ports; do fetch $SOURCEURL/$set.txz ; done</userinput></screen>
-
     <para>Extract the binaries from the tarballs on the install media
       into the declared destination.  Minimally, only the base set
       needs to be extracted, but a complete install can be performed
@@ -237,6 +250,10 @@
     <para>To install everything except the kernel:</para>
 
     <screen>&prompt.root; <userinput>for set in base ports; do tar -xf $set.txz -C $DESTDIR ; done</userinput></screen>
+      </sect3>
+
+      <sect3 xml:id="jails-install-source">
+        <title>To build and install a Jail from source</title>
 
     <para>The &man.jail.8; manual page explains the procedure for
       building a jail:</para>
@@ -301,6 +318,11 @@
 	  &man.devfs.8; and &man.devfs.conf.5; manual pages.</para>
       </callout>
     </calloutlist>
+      </sect3>
+    </sect2>
+
+    <sect2>
+      <title>Configuring the Host</title>
 
     <para>Once a jail is installed, it can be started by using the
       &man.jail.8; utility.  The &man.jail.8; utility takes four
@@ -372,6 +394,7 @@
 
     <para>More information about this can be found in the &man.jail.8;
       manual page.</para>
+    </sect2>
   </sect1>
 
   <sect1 xml:id="jails-tuning">