start of interactive procedure and clock setting

1 files changed, 31 insertions, 77 deletions

diff --git a/doc/official_installation_guide_en b/doc/official_installation_guide_en
index 1e09b62..e591cfd 100644
--- a/doc/official_installation_guide_en
+++ b/doc/official_installation_guide_en
@@ -25,14 +25,14 @@ General installation documentation for the Arch Linux distribution.
     * [3.1 Using the Install Media](#Using_the_Install_Media)
       * [3.1.1 Pre-boot](#Pre_boot)
       * [3.1.2 Post-boot](#Post_boot)
-    * [3.2 Performing the installation](#Perform_install) #shortly desc 2 procedures
-      * [3.2.1 Interactive Installation Procedure](#Interactive_Installation_Procedure) #explain running setup here
+    * [3.2 Performing the installation](#Perform_install)
+      * [3.2.1 Interactive Installation Procedure](#Interactive_Installation_Procedure)
       * [3.2.1.1 Select Source](#Select_Source)
         * [3.2.1.1.1 CD-ROM or OTHER SOURCE](#CD-ROM_or_OTHER_SOURCE)
         * [3.2.1.1.2 NET (FTP/HTTP)](#NET)
           * [3.2.1.1.2.1 Setup Network](#Setup_Network)
           * [3.2.1.1.2.2 Choose Mirror](#Choose_Mirror)
-      * [3.2.1.2 Set Clock](#Set_Clock) #timezone, ntp or manual, localtime/utc hardwareclock
+      * [3.2.1.2 Set Clock](#Set_Clock)
       * [3.2.1.3 Prepare Hard Disks](#Prepare_Hard_Drive)
         * [2.5.5.1 Auto-Prepare](#Auto-Prepare)
         * [2.5.5.2 Manual](#Manual)
@@ -125,10 +125,16 @@ These procedures are shipped by default:
 
 * interactive: An interactive installation procedure, which asks you some questions, guides you through an installation
                and helps you configuring the target system by automatically changing some settings for you depending on what you did earlier (eg network settings)
+               The installed system will initially have only a customisable set of "base" packages installed with whatever utilities
+               and drivers you need to get online. Then once you've successfully booted the installed system,
+               you'll run a full system upgrade and install any other packages you want.
                (aliased as `/arch/setup`)
 * automatic:   An automated, deploy-tool-alike procedure.  designed for low-to zero interactivity.
                uses profiles for configuration of the installation/target system.
                See /usr/share/aif/examples/ for example profile files.
+               The examples implement quite generic scenarios but you're
+               free to change them how you like to install extra packages,
+               do configuration tweaks, etc.
 * base:        basic, little-interactivity installation with some common defaults.
                This procedure is used by the others to inherit from, it is NOT meant to be used directly by end users
 * partial-configure-network: exposes the network configuration step from the interactive procedure, to help you setup the network in the live environment
@@ -231,69 +237,15 @@ There is also an `arch` login which can be usefull if you want to do things as n
 
 You will find that everything you need to perform this installation (a copy of this guide, aif README, shortcuts to common aif procedures) can be found in /arch
 
+### Performing the installation
+You can either use the interactive procedure or the automatic one.  See
+section [2.3 AIF, the installation tool](#Aif_the_installation_tool) or the AIF readme for more info.
 
-### Interactive Installation Procedure
- The
-most common (and recommended) installation procedure is to use the install
-media to initially install only the "base" package set and whatever utilities
-and drivers you need to get online. Then once you've successfully booted the
-installed system, run a full system upgrade and install any other packages you
-want.
+#### Interactive Installation Procedure
 
-**Installation Steps:**
+Type `/arch/setup` (or `aif -p interactive`, which is the same) to get you started.
 
-  1. Loading a non-US Keymap
-
-  2. Running Setup
-
-  3. Select Source
-
-    1. CD-ROM or OTHER SOURCE
-
-    2. FTP/HTTP
-
-      1. Setup Network
-
-      2. Choose Mirror
-
-  4. Set Clock
-
-  5. Prepare Hard Drive
-
-    1. Auto-Prepare
-
-    2. Partition Hard Drives
-
-    3. Set Filesystem Mountpoints
-
-  6. Select Packages
-
-  7. Install Packages
-
-  8. Configure System
-
-  9. Install Bootloader
-
-  10. Exit Install
-
-####  Login and Loading a non-US Keymap
-
-If you need to load a non-US keymap and/or want to set a different console
-font, use the "km" utility.
-
-
-     km
-
-
-####  Running Setup
-
-Now you can run /arch/setup to invoke the installer program.
-
-
-     /arch/setup
-
-
-After an informational welcome message you will be presented with the main
+After the welcome message and disclaimer you will be presented with the main
 installation menu. You can use UP and DOWN arrow to navigate menus. Use TAB to
 switch between buttons and ENTER to select. At any point during the install
 process, you can switch to your 7th virtual console (ALT-F7) to view the
@@ -301,14 +253,15 @@ output from the commands the setup is running. Use (ALT-F1) to get back to
 your first console where the installer is running, and any F-key in between if
 you need to open another console to intervene manually for any reason.
 
-####  Select Source
+#####  Select Source
 
 As a first step you must choose the method you want to install Arch Linux. If
-you have a fast Internet connection, you might prefer the FTP installation to
+you have a fast Internet connection, you might prefer the NET installation to
 ensure you get the latest packages instead of using the potentially outdated
-CD or USB image contents.
+CD or USB image contents.  If you're using a NET image you don't have much
+choice ;-).
 
-#####  CD-ROM or OTHER SOURCE
+######  CD-ROM or OTHER SOURCE
 
 When choosing a CD-ROM or OTHER SOURCE install you will only be able to
 install packages contained on the CD, which may be quite old, or packages
@@ -318,9 +271,9 @@ you won't need an Internet connection, and is therefore the recommended choice
 for dialup users or those unable or unwilling to download the entire package
 set.
 
-#####  FTP/HTTP
+###### NET (FTP/HTTP)
 
-######  Setup Network
+#######  Setup Network
 
 The first entry Setup Network will allow you to install and configure your
 network device. If you are using a wireless device you will still need to use
@@ -340,7 +293,7 @@ asked to enter the networking information manually. Either way, your network
 should be successfully configured, and you may check connectivity using
 standard tools like ping on another console.
 
-######  Choose Mirror
+####### Choose Mirror
 
 Choose Mirror will allow you to choose the preferred mirror to download the
 packages that will be installed in your Arch Linux system. You should choose a
@@ -355,14 +308,15 @@ These menu entries are only available when choosing FTP Installation, for
 rather obvious reasons. After successful preparation, choose Return to Main
 Menu.
 
-####  Set Clock
+#####  Set Clock
 
-Set Clock will allow you to set up your system clock and date. Choose UTC if
-your BIOS clock is set to UTC, or localtime if your BIOS clock is set to your
-local time. If you have an OS installed which cannot handle UTC BIOS times
-correctly, like Windows, choose localtime, otherwise you should prefer UTC.
-Next the setup will want you to select the continent and country you are from,
-and then set the date and time.
+Set Clock will allow you to set up your system clock and date. 
+First you have to say if your hardwareclock is (or should be) in UTC or
+localtime.  UTC is preferred, but if you have an OS installed which cannot handle UTC BIOS times
+correctly, like Windows, you'll have to choose localtime.
+Next the setup will want you to select your continent/country (timezone),
+and allow you to set the date and time (for which you can also use
+[NTP](http://www.ntp.org/) if your network is up)
 
 ####  Prepare Hard Drive