Merge branch 'master' of https://projects.archlinux.org/git/aif

Conflicts:
	doc/official_installation_guide_en

1 files changed, 58 insertions, 4 deletions

diff --git a/doc/official_installation_guide_en b/doc/official_installation_guide_en
index bf9d386..76df02c 100644
--- a/doc/official_installation_guide_en
+++ b/doc/official_installation_guide_en
@@ -230,9 +230,18 @@ There is also an
 login which can be usefull if you want to do things as non-privileged user.
 Most people don't need this.
 
+<<<<<<< HEAD
 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
+=======
+Make sure your BIOS is set in a way to allow booting from your CD-ROM or USB
+device. Reboot your computer with the Arch Linux Installation CD in the drive or
+the USB stick plugged in the port. Once the installation medium has started
+booting, you will see the Arch Linux logo and an Isolinux menu waiting for your
+selection. Most likely you can just hit enter at this point.
+
+>>>>>>> 13c8c0813328eb8f52b03b3c53a32f1f40558021
 
 ### Using PXE (Network booting)
 
@@ -459,6 +468,7 @@ hard disk preparations need to be undone.
 
 #### Select Packages
 
+<<<<<<< HEAD
 Select Packages will let you select the packages you wish to install from
 the CD, USB or your NET mirror. You have the opportunity to specify whole
 package groups from which you'd generally like to install packages, then
@@ -467,6 +477,17 @@ the groups you have chosen using the space bar. It is recommended that you
 install all the “base” packages, but not anything else at this point. The
 only exception to this rule is installing any packages you need for setting
 up Internet connectivity.
+=======
+Select Packages will let you select the packages you wish to install from the
+CD, USB or your NET mirror. First, you are prompted to select a bootloader
+package (the bootloader will be configured later on in the "Install Bootloader"
+stage). After this, you can select package groups from which you'd generally
+like to install packages, then fine-tune your coarse selection by (de)selecting
+individual packages from the groups you have chosen using the space bar. It is
+recommended that you install all the "base" packages, but not anything else at
+this point. The only exception to this rule is installing any packages you need
+for setting up Internet connectivity.
+>>>>>>> 13c8c0813328eb8f52b03b3c53a32f1f40558021
 
 Once you're done selecting the packages you need, leave the selection screen
 and continue to the next step.
@@ -487,7 +508,20 @@ allow you to manually change important config files for your target system.
 You'll be asked which text editor you want to use. You have the choice
 between nano, joe and vi allow you to set the root password for the target.
 
+<<<<<<< HEAD
 #### Configuration Files
+=======
+  * /etc/rc.conf
+  * [ /etc/fstab][48]
+  * /etc/mkinitcpio.conf
+  * /etc/modprobe.d/modprobe.conf
+  * /etc/resolv.conf
+  * /etc/hosts
+  * /etc/locale.gen
+  * /etc/pacman.d/mirrorlist
+  * /etc/pacman.conf
+  * /etc/crypttab
+>>>>>>> 13c8c0813328eb8f52b03b3c53a32f1f40558021
 
 These are the core configuration files for Parabola GNU/Linux-Libre. If
 you need help configuring a specific service, please read the appropriate
@@ -659,6 +693,7 @@ happily ignore this file.
 
 #### /etc/hosts
 
+<<<<<<< HEAD
 This is where you stick hostname/ip associations of computers on your
 network. If a hostname isn't known to your DNS, you can add it here to allow
 proper resolving, or override DNS replies. You usually don't need to change
@@ -683,6 +718,9 @@ allow here. eg. to allow all machines to connect via ssh:
   sshd: ALL: ALLOW
 
 #### /etc/locale.gen
+=======
+**/etc/locale.gen**
+>>>>>>> 13c8c0813328eb8f52b03b3c53a32f1f40558021
 
 This file contains a list of all supported locales and charsets available to
 you. When choosing a LOCALE in your /etc/rc.conf or when starting a program,
@@ -732,6 +770,7 @@ changes you made in mkinitcpio.conf.
 
 #### Install Bootloader
 
+<<<<<<< HEAD
 Install Bootloader will install a bootloader on your hard drive, either GRUB
 or NONE in case you have a bootloader already installed and want to use that
 one instead. If you choose to install GRUB, the setup script will want you
@@ -745,12 +784,27 @@ want to use GRUB, otherwise you will have to modify your existing
 bootloader's configuration file. The installer will have pre-populated this
 file using UUID entries which you may have to change in the same cases you'd
 need to change them in your fstab.
+=======
+Install Bootloader will install and help you configure the bootloader that you
+selected in the "Select Packages" stage.
+
+**/boot/grub/menu.lst**
+**/boot/syslinux/syslinux.cfg**
+
+An editor will open, allowing you to edit the appropriate bootloader
+configuration file which the installer has pre-populated. You should check and
+modify this file, if needed, to accommodate your boot setup.
+
+Syslinux:
+After checking your bootloader configuration for correctness, you'll be asked to
+allow the installer to Set the Boot Flag and install the Syslinux MBR.
+
+Grub:
+>>>>>>> 13c8c0813328eb8f52b03b3c53a32f1f40558021
 
 After checking your bootloader configuration for correctness, you'll be
-prompted for a partition to install the loader to. Unless you're using yet
-another boot loader, you should install GRUB to the MBR of the installation
-disk, which is usually represented by the appropriate device name without a
-number suffix.
+prompted for a disk to install the loader to. You should install GRUB to the MBR
+of the installation disk.
 
 #### Exit Install