Install: Lots and lots of fixes

3 files changed, 71 insertions, 51 deletions

diff --git a/src/install/1_begin.xml b/src/install/1_begin.xml
index 170db36..10120f8 100644
--- a/src/install/1_begin.xml
+++ b/src/install/1_begin.xml
@@ -1,37 +1,41 @@
 <?xml version="1.0" encoding="utf-8"?>
 <chapter label="1" id="begin">
     <title>Before You Begin</title>
-    <para>Welcome to the Adélie Linux 1.0 Installation Guide. This guide will describe the process you will use to install Adélie Linux on to a computer.</para>
-    <para>If you are installing Adélie Linux to your main computer, you may use another device - such as a mobile phone or a friend's laptop, if available - to follow along with this guide.
-        Additionally, most portions of this guide are available on the installation CD for viewing during installation. Just choose "Help" from any page in the Horizon Installation Wizard.</para>
+    <para>Welcome to the Adélie Linux 1.0 Installation Handbook.
+        This Handbook will inform you how to install Adélie Linux on your computer.</para>
+    <para>If you are installing Adélie Linux on your main computer, you may use another device - such as a mobile phone or a friend's laptop, if available - to reference this Handbook.
+        Additionally, most of this Handbook is available for reading during installation.
+        Just choose "Help", or press the <keycap>F1</keycap> key, from any page in the System Installation wizard.</para>
     <section>
-        <title>Preparing for the installation</title>
+        <title>Preparing for Installation</title>
         <para>Please back up all of your data before beginning installation.
-            While every effort is made to ensure that the Adélie Linux installation routines are safe and error-free, we cannot guarantee that your data will be preserved once you start the installation.
+            While every effort has been made to ensure that the Adélie Linux installation system is safe and error-free, we cannot guarantee that your data will be preserved once you start the installation.
             If you intend on dual-booting your computer with another operating system, such as Mac OS X or Windows, ensure there is adequate disk space available to install Adélie Linux.
-            You will need up to 1 GB for a standard desktop installation, or at least 300 MB for a server installation.</para>
-        <para>To install Adélie Linux to a desktop or portable computer, you will need a display capable of at least 800x600 pixel resolution.
-            Most common desktop displays display in at least this resolution. HiDPI (or "Retina") displays are supported only on the KDE Desktop installation media.
+            You will need up to 2 GB for a standard desktop installation, or at least 300 MB for a server installation.</para>
+        <para>To install Adélie Linux on a desktop or portable computer, you will need a graphical display capable of at least an 800x600 pixel resolution.
+            Most displays support this resolution.
+            HiDPI (or "Retina") displays are supported only on the Desktop installation media.
             Please note that the server installation media may render incorrectly, or even not at all, when using HiDPI displays.
-            You may install server packages using the desktop installation media if you need to use a HiDPI display during server installation.</para>
+            You may install server packages using the Desktop installation media if you need to use a HiDPI display during server installation.</para>
         <para>To install Adélie Linux to a server, you will need either a display capable of at least 80x25 text console (720x480), or a supported serial line.
-            If you are installing via serial line, be sure you know your server's serial line settings.
-            Most servers default to either 9600 or 57200 baud; Adélie Linux does not reconfigure the serial line, so you will need to know your firmware's default settings.</para>
+            If you are installing via serial line, be sure to have your server's serial line settings available.
+            Most servers default to either 9600 or 115200 baud; Adélie Linux does not reconfigure the serial line, so you will need to know your firmware's default settings.</para>
         <para>If you plan on connecting to the Internet directly from your Adélie Linux computer without using a router (not common),
             ensure you have your Internet access credentials (typically a username and password) available before starting installation.
             Adélie Linux supports connecting to most ADSL and dial-up Internet providers using PPP; and cable, T1, and fibre providers using Ethernet.
             If you use a static IP address (not common), make sure you have your IP address, subnet, and default gateway and nameserver settings before starting installation.</para>
-        <para>If your computer came with recovery media, we recommend that you have it available in the very unlikely event you have an issue with Adélie Linux, or your hardware has an incompatibility.
-            This way, you will be able to quickly restore your computer to normal operation.</para>
+        <para>If your computer came with recovery media, we recommend that you have it available in the very unlikely event you have an issue with Adélie Linux, or your hardware is incompatible.
+            Having your recovery media will allow you to quickly restore your computer to normal operation.</para>
     </section>
     <section>
         <title>Creating the installation media</title>
         <para>You will need either:</para>
         <itemizedlist>
-            <listitem><para>a <hardware>CD drive</hardware> capable of burning a CD, and a blank CD; or</para></listitem>
+            <listitem><para>a <hardware>CD drive</hardware> capable of writing (or "burning") a CD, and a blank CD; or</para></listitem>
             <listitem><para>a blank <hardware>USB flash drive</hardware>.</para></listitem>
         </itemizedlist>
-        <para>Download the installation media file from your local Adélie Linux mirror. Follow the instructions on the mirror's site to choose the media file appropriate for your computer.
+        <para>Download the installation media file from your local Adélie Linux mirror at <ulink url="https://distfiles.adelielinux.org/adelie/">https://distfiles.adelielinux.org/adelie/</ulink>.
+            Follow the instructions on the mirror's site to choose the media file appropriate for your computer.
             Then, follow the steps below for your current operating environment.</para>
         <section>
             <title>Using Windows</title>
@@ -43,15 +47,25 @@
         </section>
         <section>
             <title>Using Linux or BSD</title>
-            <para>On Linux or BSD systems, you can use either <command>cdrecord</command> or <command>cdrskin</command> to write the installation image to a CD via the command line. Both commands basically share the same syntax.</para>
-            <para>For example, to burn the image onto a CD at a speed of 4 and with verbose command output, run <command>cdrecord -v speed=4 <userinput>[image]</userinput></command> or <command>cdrskin -v speed=4 <userinput>[image]</userinput></command>, replacing <userinput>[image]</userinput> with the file name of the image you want to burn to the CD.</para>
-            <para>If there's only one optical disc drive on your system, it should be auto-detected. If not, find the device name using 'dmesg' or 'lsblk' and specify it using the 'dev' option.  For example, if your optical device is <literal>/dev/sr0</literal>, run <command>cdrecord -v dev=/dev/sr0 speed=4 <userinput>[image]</userinput></command>.</para>
-            <para>To write an installation image to a USB flash drive, you can use the <command>dd</command> command.</para>
-            <para>First, you'll need to get the name of the target device. This can be done by looking at the output of <command>dmesg</command> or any program that lists available storage devices (such as <command>lsblk</command> on Linux) before and after connecting the drive to the computer.</para>
-            <para>It's a good idea to double-check if you've got that device name right. Make sure you're using the name of the whole drive (such as, e.g., <literal>/dev/sde</literal>) and not merely that of a partition residing on it (e.g., <literal>/dev/sde1</literal>).</para>
-            <para>Next, make sure the device is not mounted. Then run the <command>dd</command> command and after that the <command>sync</command> command as shown below, replacing <literal>/dev/sdX</literal> with the actual name of the target device and <literal>adelie.iso</literal> with the file name of the image you want to put onto the flash drive. Running these commands may require superuser privileges.</para>
-            <para>Beware that this operation will <emphasis>destroy all data</emphasis> still residing on the target device!</para>
-            <para><command>dd if=adelie.iso of=/dev/sdX bs=4M &amp;&amp; sync</command></para>
+            <para>On Linux or BSD systems, you can use either <command>cdrecord</command> or <command>cdrskin</command> to write the installation image to a CD via the command line.
+                Both commands share a similar syntax.</para>
+            <para>For example, to burn the image onto a CD at a speed of 4x and with verbose command output, run
+                <command>cdrecord -v speed=4 <userinput>[image]</userinput></command>
+                or
+                <command>cdrskin -v speed=4 <userinput>[image]</userinput></command>,
+                replacing <userinput>[image]</userinput> with the file name of the image you want to burn to the CD.</para>
+            <para>If there is only one optical disc drive on your system, it should be auto-detected.
+                If you have more than one optical disc drive, find the device name using <command>dmesg</command> or <command>lsblk</command>, and specify it with the <varname>dev</varname> option.
+                For example, if your optical device is named <literal>/dev/sr0</literal>, run
+                <command>cdrecord -v dev=/dev/sr0 speed=4 <userinput>[image]</userinput></command>.</para>
+            <para>To write an installation image to a USB flash drive, you may use the <command>dd</command> command.
+                You will need to identify the name of the target USB device.
+                This can be done by examining the output of the <command>dmesg</command> command, or a program that lists available storage devices (such as <command>lsblk</command> on Linux), before and after connecting the drive to the computer.</para>
+            <para>You should always ensure that you have identified the correct USB device name.  Ensure you are using the name of the whole drive (such as <literal>/dev/sde</literal>) and not a partition residing on it (such as <literal>/dev/sde1</literal>).</para>
+            <para>Ensure the device is not mounted before running the <command>dd</command> command.  Please note that running the <command>dd</command> command may require superuser privileges.</para>
+            <para>Beware that this operation will <emphasis>destroy all data</emphasis> on the target device!</para>
+            <para><command>dd if=<userinput>adelie.iso</userinput> of=<userinput>/dev/sdX</userinput> bs=4M &amp;&amp; sync</command></para>
+            <para>Replace <literal><userinput>adelie.iso</userinput></literal> with the file name of the image you want to write to the USB media, and <literal><userinput>/dev/sdX</userinput></literal> with the name of the target USB device.   Running the <command>sync</command> command after the <command>dd</command> command ensures that all data has been written to the USB media.</para>
         </section>
     </section>
 </chapter>
diff --git a/src/install/2_req.xml b/src/install/2_req.xml
index fde3f00..d290cdc 100644
--- a/src/install/2_req.xml
+++ b/src/install/2_req.xml
@@ -1,36 +1,42 @@
 <?xml version="1.0" encoding="utf-8"?>
 <chapter label="2" id="requirements">
-    <title>System Requirements</title>
+    <title>System Hardware Requirements for Adélie Linux</title>
     <para>Ensure that your computer meets the following requirements before installing Adélie Linux.
         On Windows, you may run the <command>msinfo32</command> program to determine your computer's specifications.
         On a Macintosh, choose <guimenuitem>About This Mac</guimenuitem> from the <guimenu>Apple</guimenu> menu, and then choose <guibutton>System Report</guibutton> or <guibutton>More Info</guibutton>.
     </para>
-    <section>
-        <title>Intel x86 (32-bit)</title>
-        <para>You will need at least a Pentium or Celeron compatible CPU, with MMX extensions.  This includes most AMD (K5+), Transmeta, VIA, and other x86-compatible CPUs.  Speeds of at least 500 MHz are highly recommended for running desktop applications, but speeds as low as 100 MHz may be usable in server mode.</para>
-        <para>At least 256 MB RAM is required to install the desktop version of Adélie Linux, and at least 512 MB RAM is highly recommended if you plan to run larger applications like Firefox and Thunderbird.  At least 40 MB RAM is required to install the server version of Adélie Linux.</para>
-        <warning><title>Warning</title><para>Using less than 40 MB RAM may cause lock ups or crashes during package installation.</para></warning>
-        <para>At least 3 GB of disk space is required for a full desktop installation of Adélie Linux.  The base server installation of Adélie Linux requires about 300 MB of disk space, not counting additional packages and your data.  It is recommended that you have at least 1 GB of disk space for most server roles.</para>
+    <section id="cpu">
+        <title>Processor Type/Speed</title>
+        <formalpara id="pmmx">
+            <title>Intel x86 (32-bit)</title>
+            <para>You will need at least <emphasis>a Pentium or Celeron compatible CPU, with MMX extensions</emphasis>.
+                This includes most AMD (K5+), Transmeta, VIA, and other x86-compatible CPUs.
+                A processor speed of <emphasis>at least 500 MHz</emphasis> is highly recommended for running interactive desktop applications; lower speed may be usable in text-only or server modes.</para>
+        </formalpara>
+        <formalpara id="x86_64">
+            <title>Intel x86_64 (64-bit)</title>
+            <para>All Intel and AMD CPUs with 64-bit extensions are supported by the Adélie Linux system.</para>
+        </formalpara>
+        <formalpara id="ppc">
+            <title>PowerPC (32-bit)</title>
+            <para>You will need at least <emphasis>a G3 or later</emphasis> CPU.
+                The 603 CPU is not supported by this version of Adélie Linux.
+                A processor speed of <emphasis>at least 600 MHz</emphasis> is highly recommended for running interactive desktop applications, but all G3 and G4 CPUs are supported.
+                AltiVec/VMX is not required to run Adélie; however, software titles are increasingly taking advantage of processors with these extensions.</para>
+        </formalpara>
+        <formalpara id="ppc64">
+            <title>PowerPC (64-bit)</title>
+            <para>You will need a POWER4+, or 970/970fx, or later generation CPU.  You cannot use Adélie Linux on a POWER4 or earlier CPU.  The Freescale e5500/e6500 and SPE processors do not have the required AltiVec/VMX extensions, and therefore will also not be able to run the 64-bit Adélie Linux.</para>
+        </formalpara>
+        <formalpara id="aarch64">
+            <title>AArch64 (64-bit ARM)</title>
+            <para>All 64-bit ARM processors are supported by the Adélie Linux system; however, some SoCs may need a custom kernel.  For more information, see the AArch64 HCL<!-- TODO XXX !! -->.</para>
+        </formalpara>
     </section>
     <section>
-        <title>Intel x86_64 (64-bit)</title>
-        <para>All Intel CPUs that have 64-bit extensions are supported by the Adélie Linux kernel and software distribution.</para>
-        <para>At least 256 MB RAM is required to install the desktop version of Adélie Linux, and at least 512 MB RAM is highly recommended if you plan to run larger applications like Firefox and Thunderbird.  At least 48 MB RAM is required to install the server version of Adélie Linux.</para>
-        <warning><title>Warning</title><para>Using less than 48 MB RAM may cause lock ups or crashes during package installation.</para></warning>
-        <para>At least 3 GB of disk space is required for a full desktop installation of Adélie Linux.  The base server installation of Adélie Linux requires about 270 MB of disk space, not counting additional packages and your data.  It is recommended that you have at least 1 GB of disk space for most server roles.</para>
-    </section>
-    <section>
-        <title>PowerPC (32-bit)</title>
-        <para>You will need at least a G3 CPU.  The 603 series is not supported by this version of Adélie Linux.  Speeds of at least 600 MHz are highly recommended for running desktop applications, but all G3 and G4 CPUs are supported.  AltiVec/VMX is not required to run Adélie, but some packages may perform much better on systems that have these extensions.</para>
-        <para>At least 3 GB of disk space is required for a full desktop installation of Adélie Linux.  The base server installation of Adélie Linux requires about 200 MB of disk space, not counting additional packages and your data.  It is recommended that you have at least 1 GB of disk space for most server roles.</para>
-    </section>
-    <section>
-        <title>PowerPC (64-bit)</title>
-        <para>You will need a POWER4+, or 970/970fx, or later generation CPU.  You cannot use Adélie Linux on a POWER4 or earlier CPU.  The Freescale e5500/e6500 and SPE processors do not have the required AltiVec/VMX extensions, and therefore will also not be able to run the 64-bit Adélie Linux.</para>
-        <para>At least 3 GB of disk space is required for a full desktop installation of Adélie Linux.  The base server installation of Adélie Linux requires about 200 MB of disk space, not counting additional packages and your data.  It is recommended that you have at least 1 GB of disk space for most server roles.</para>
-    </section>
-    <section>
-        <title>AArch64 (64-bit ARM)</title>
-        <para>All known 64-bit ARM processors should be able to run Adélie Linux.</para>
+        <title>Hardware</title>
+        <para>At least 384 MB RAM is required for the Standard installation of Adélie Linux, and at least 512 MB RAM is highly recommended if you plan to run larger applications like Firefox and Thunderbird.  At least 40 MB RAM is required to install the server version of Adélie Linux.</para>
+        <warning><title>Warning</title><para>Using less than 40 MB RAM may cause lock ups or crashes during package installation.</para></warning>
+        <para>At least 3 GB of disk space is required for a full desktop installation of Adélie Linux.  The base, text-only installation of Adélie Linux requires about 300 MB of disk space, not counting additional packages and your data.  It is recommended that you have at least 1 GB of disk space for most server roles.</para>
     </section>
 </chapter>
diff --git a/src/install/installbook.xml b/src/install/installbook.xml
index b60bef8..0c4fcbf 100644
--- a/src/install/installbook.xml
+++ b/src/install/installbook.xml
@@ -17,7 +17,7 @@
         <title>Preface</title>
         <para>This Installation Handbook is the full, official documentation for installing Adélie Linux 1.0 on a supported computer, including special architecture-specific notes and a bootstrap installation from another distribution.  It was initially drafted with a section outline in 2015, before the distribution itself was even created.  It is hoped by the author that you find this handbook easy to understand and read.</para>
         <para>Many contributed to the final version of the Handbook.  This includes <personname><othername>[[sroracle]]</othername></personname> and <personname><othername>smaeul</othername></personname> on the Adélie IRC channel, whom tested the instructions on their machines and reported omissions and corrections.  <!-- more.. --></para>
-        <para>Please feel free to contact me or the Adélie Linux community if you have any suggestions on how to make this handbook better.  We'd love to hear from you, and we hope you enjoy using our distribution.</para>
+        <para>Please feel free to contact the Adélie Linux community if you have any suggestions on how to make this handbook better.  We'd love to hear from you, and we hope you enjoy using our distribution.</para>
         <para>– A. Wilcox, 2019</para>
 	&helping;
     </preface>