[installation-quick-start-guide] updating en-US to f16 version
Jack Reed
jjr at fedoraproject.org
Fri Feb 10 05:09:36 UTC 2012
commit 1e5a90dce1b7c6475ce5d2996f2941f8d33ff377
Author: Jack Reed <jreed at redhat.com>
Date: Fri Feb 10 15:09:01 2012 +1000
updating en-US to f16 version
.gitignore | 3 +
en-US/Account_Configuration-common.xml | 82 ---
en-US/Account_Configuration-x86.xml | 25 +
en-US/Account_Configuration_common-figure-1.xml | 21 +
en-US/Account_Configuration_common-indexterm-1.xml | 9 +
en-US/Account_Configuration_common-indexterm-2.xml | 10 +
en-US/Account_Configuration_common-para-1.xml | 9 +
en-US/Account_Configuration_common-para-6.xml | 20 +-
en-US/Account_Configuration_common-title.xml | 8 +-
en-US/Article_Info.xml | 2 +-
en-US/Assign_Storage_Devices-common-figure-1.xml | 23 +-
en-US/Assign_Storage_Devices-common-para-1.xml | 10 +-
en-US/Assign_Storage_Devices-common-para-2.xml | 8 +-
en-US/Assign_Storage_Devices-common-para-3.xml | 8 +-
en-US/Assign_Storage_Devices-common-para-4.xml | 8 +-
en-US/Assign_Storage_Devices-common-para-5.xml | 8 +-
en-US/Assign_Storage_Devices-common-para-6.xml | 8 +-
en-US/Assign_Storage_Devices-common-title.xml | 10 +-
en-US/Assign_Storage_Devices-x86.xml | 54 +--
en-US/Author_Group.xml | 10 +-
en-US/Automatic_Partitioning_common-para-1.xml | 10 +-
en-US/Automatic_Partitioning_common-para-2.xml | 7 +-
en-US/Automatic_Partitioning_common-para-4.xml | 13 +-
...utomatic_Partitioning_common-varlistentry-1.xml | 20 +-
...utomatic_Partitioning_common-varlistentry-2.xml | 11 +-
...utomatic_Partitioning_common-varlistentry-3.xml | 18 +-
.../Automatic_Partitioning_x86-variablelist-1.xml | 37 +-
en-US/Boot_your_computer_from_the_CD.xml | 3 +
en-US/Disk_Partitioning_Setup-x86.xml | 43 ++
en-US/Disk_Partitioning_Setup_common-figure-1.xml | 24 +-
en-US/Disk_Partitioning_Setup_common-para-1.xml | 7 +-
en-US/Disk_Partitioning_Setup_common-para-2.xml | 7 +-
en-US/Disk_Partitioning_Setup_common-title.xml | 11 +-
en-US/Download_Fedora.xml | 2 +-
...ora_live_system.xml => Fedora_Live_Desktop.xml} | 21 +-
en-US/Initializing_Hard_Disk-x86.xml | 55 +--
en-US/Initializing_Hard_Disk_common-para-1.xml | 14 +-
en-US/Initializing_Hard_Disk_common-para-3.xml | 10 +-
en-US/Initializing_Hard_Disk_common-title.xml | 7 +-
en-US/Installation_Quick_Start_Guide.ent | 4 +-
en-US/Installation_Quick_Start_Guide.xml | 18 +-
en-US/Installing_Packages-x86.xml | 36 +-
en-US/Key_Board_Configuration-x86.xml | 60 +--
en-US/Language_Selection.xml | 63 +++
en-US/Package_Selection-Live.xml | 23 +
en-US/Package_Selection-dvd.xml | 51 --
en-US/Package_Selection-x86.xml | 66 ++-
...ckage_Selection_Customizing-common-figure-1.xml | 19 +
...Package_Selection_Customizing-common-para-2.xml | 14 +
...Package_Selection_Customizing-common-para-4.xml | 9 +
...Package_Selection_Customizing-common-para-6.xml | 9 +
...ackage_Selection_Customizing-common-title-1.xml | 7 +
en-US/Package_Selection_Customizing-x86.xml | 213 ++-------
en-US/Package_Selection_common-imagecap-1.xml | 13 +-
en-US/Package_Selection_common-list-1.xml | 84 ++-
en-US/Package_Selection_common-note-3.xml | 12 +
en-US/Package_Selection_common-para-2.xml | 12 +-
en-US/Package_Selection_common-para-3.xml | 13 +-
en-US/Package_Selection_common-para-7.xml | 16 +-
en-US/Package_Selection_common-title-1.xml | 11 +-
en-US/Requirements.xml | 2 +-
en-US/Revision_History.xml | 31 +-
en-US/Storage_Devices-x86.xml | 48 +--
en-US/Time_Zone-x86.xml | 74 +--
en-US/Time_Zone_common-figure-1.xml | 24 +-
en-US/Time_Zone_common-itemizedlist-1.xml | 18 +-
en-US/Time_Zone_common-para-1.xml | 13 +-
en-US/Time_Zone_common-para-2.xml | 13 +-
en-US/Time_Zone_common-title.xml | 8 +-
en-US/Upgrading-common-figure-1.xml | 21 +
en-US/Upgrading-common-para-3.xml | 9 +
en-US/Upgrading-common-title-1.xml | 7 +
en-US/Upgrading-x86.xml | 66 +++
en-US/Warning_boot_partition_64bit.xml | 12 +
en-US/Write_changes_to_disk.xml | 34 --
en-US/Write_changes_to_disk_common-figure-1.xml | 21 +
en-US/Write_changes_to_disk_common-para-1.xml | 9 +
en-US/Write_changes_to_disk_common-para-2.xml | 9 +
en-US/Write_changes_to_disk_common-para-3.xml | 9 +
en-US/Write_changes_to_disk_common-para-5.xml | 9 +
en-US/Write_changes_to_disk_common-title-1.xml | 7 +
en-US/Write_changes_to_disk_common-title-2.xml | 7 +
en-US/Write_changes_to_disk_x86-para-4.xml | 9 +
en-US/Write_changes_to_disk_x86.xml | 20 +
en-US/X86_Bootloader.xml | 540 ++++++++++----------
en-US/firstboot-datetime.xml | 3 +-
en-US/firstboot-systemuser.xml | 4 +-
en-US/images/accountconfig/rootpassword.png | Bin 20385 -> 18556 bytes
en-US/images/bootscreen/bootscreen-livecd.png | Bin 322754 -> 4198 bytes
en-US/images/diskpartitioning/write_changes.png | Bin 14370 -> 25112 bytes
en-US/images/diskpartsetup/disk-setup.png | Bin 60780 -> 64316 bytes
en-US/images/firstboot/fb-createuser.png | Bin 35676 -> 43555 bytes
en-US/images/firstboot/fb-datetime.png | Bin 42704 -> 43995 bytes
en-US/images/firstboot/fb-license.png | Bin 44043 -> 43155 bytes
en-US/images/firstboot/fb-profile.png | Bin 59562 -> 79247 bytes
en-US/images/firstboot/fb-welcome.png | Bin 30885 -> 33089 bytes
en-US/images/kbdconfig/keyboard.png | Bin 31583 -> 42468 bytes
en-US/images/livedesktop/livedesktop-initial.png | Bin 0 -> 397916 bytes
en-US/images/livedesktop/livedesktop.png | Bin 648655 -> 453491 bytes
en-US/images/netconfig/hostname.png | Bin 17907 -> 20606 bytes
en-US/images/pkgselection/pkg-group-details.png | Bin 47878 -> 59550 bytes
en-US/images/pkgselection/pkg-group.png | Bin 42300 -> 36215 bytes
.../images/storagedevices/selectstoragedevices.png | Bin 42444 -> 63855 bytes
en-US/images/storagedevices/storagedevices.png | Bin 25528 -> 25436 bytes
en-US/images/timezone/timezone.png | Bin 127700 -> 150369 bytes
en-US/upgrading-fedora.xml | 2 +-
106 files changed, 1313 insertions(+), 1125 deletions(-)
---
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..5207192
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+en-US/.directory
+tmp/**/*
+publish/**/*
diff --git a/en-US/Account_Configuration-x86.xml b/en-US/Account_Configuration-x86.xml
new file mode 100644
index 0000000..2dbe0d4
--- /dev/null
+++ b/en-US/Account_Configuration-x86.xml
@@ -0,0 +1,25 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Quick_Start_Guide.ent">
+%BOOK_ENTITIES;
+]>
+<section id="sn-account_configuration-x86">
+ <xi:include href="Account_Configuration_common-title.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- Account Configuration --> <!-- begin indexterms --> <xi:include href="Account_Configuration_common-indexterm-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="Account_Configuration_common-indexterm-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- end indexterms --> <xi:include href="Account_Configuration_common-para-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- Setting up a root account and password is one of the most important steps during your installation. --> <!-- <xi:include href="Account_Configuration_common-note-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> -->
+ <!-- The root user (also known as the superuser) has complete access to the entire system... --> <xi:include href="Account_Configuration_common-figure-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- Setting your root password --> <!-- <xi:include href="Account_Configuration_common-para-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> -->
+ <!-- Use the root account only for system administration. --> <!-- <xi:include href="Account_Configuration_common-note-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> -->
+ <!-- To become root, type <command>su -</command> at the shell prompt --> <!-- <xi:include href="Account_Configuration_common-para-3.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> -->
+ <!-- The installation program prompts you to set a root password --> <!-- <xi:include href="Account_Configuration_common-para-4.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> -->
+ <!-- The root password must be at least six characters long --> <!-- <xi:include href="Account_Configuration_common-para-5.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> -->
+ <!-- You should make the root password something you can remember --> <!-- <xi:include href="Account_Configuration_common-note-3.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> -->
+ <!-- Do not use one of the example passwords offered in this manual. --> <!-- <xi:include href="Account_Configuration_common-para-7.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> -->
+ <!-- To change your root password after you have completed the installation --> <!-- <xi:include href="Account_Configuration_common-para-8.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> -->
+ <!-- Type the system-config-rootpassword command --> <xi:include href="Account_Configuration_common-para-6.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- Enter the root password into the Root Password field.... -->
+</section>
+
+
diff --git a/en-US/Account_Configuration_common-figure-1.xml b/en-US/Account_Configuration_common-figure-1.xml
new file mode 100644
index 0000000..15b9caf
--- /dev/null
+++ b/en-US/Account_Configuration_common-figure-1.xml
@@ -0,0 +1,21 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE figure PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Quick_Start_Guide.ent">
+%BOOK_ENTITIES;
+]>
+<figure float="0">
+ <title>Root Password</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/accountconfig/rootpassword.png" format="PNG" width="444" />
+ </imageobject>
+ <textobject>
+ <para>
+ Setting your root password.
+ </para>
+
+ </textobject>
+
+ </mediaobject>
+</figure>
+
diff --git a/en-US/Account_Configuration_common-indexterm-1.xml b/en-US/Account_Configuration_common-indexterm-1.xml
new file mode 100644
index 0000000..736e749
--- /dev/null
+++ b/en-US/Account_Configuration_common-indexterm-1.xml
@@ -0,0 +1,9 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE indexterm PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Quick_Start_Guide.ent">
+%BOOK_ENTITIES;
+]>
+<indexterm significance="normal">
+ <primary>root password</primary>
+</indexterm>
+
diff --git a/en-US/Account_Configuration_common-indexterm-2.xml b/en-US/Account_Configuration_common-indexterm-2.xml
new file mode 100644
index 0000000..368cfa2
--- /dev/null
+++ b/en-US/Account_Configuration_common-indexterm-2.xml
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE indexterm PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Quick_Start_Guide.ent">
+%BOOK_ENTITIES;
+]>
+<indexterm significance="normal">
+ <primary>password</primary>
+ <secondary>setting root</secondary>
+</indexterm>
+
diff --git a/en-US/Account_Configuration_common-para-1.xml b/en-US/Account_Configuration_common-para-1.xml
new file mode 100644
index 0000000..811ccb2
--- /dev/null
+++ b/en-US/Account_Configuration_common-para-1.xml
@@ -0,0 +1,9 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Quick_Start_Guide.ent">
+%BOOK_ENTITIES;
+]>
+<para>
+ Setting up a root account and password is one of the most important steps during your installation. The root account is used to install packages, upgrade RPMs, and perform most system maintenance. Logging in as root gives you complete control over your system.
+</para>
+
diff --git a/en-US/Account_Configuration_common-para-6.xml b/en-US/Account_Configuration_common-para-6.xml
index 62917bb..701e6af 100644
--- a/en-US/Account_Configuration_common-para-6.xml
+++ b/en-US/Account_Configuration_common-para-6.xml
@@ -1,15 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
- "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Quick_Start_Guide.ent">
+%BOOK_ENTITIES;
]>
+<para>
+ <!-- $Id: --> Enter the <systemitem class="username">root</systemitem> password into the <guilabel>Root Password</guilabel> field. Fedora displays the characters as asterisks for security. Type the same password into the <guilabel>Confirm</guilabel> field to ensure it is set correctly. After you set the root password, select <guibutton>Next</guibutton> to proceed.
+</para>
-<!-- $Id: -->
-
- <para>
- Enter the <systemitem class="username">root</systemitem> password
- into the <guilabel>Root Password</guilabel> field. Fedora displays
- the characters as asterisks for security. Type the same password
- into the <guilabel>Confirm</guilabel> field to ensure it is set
- correctly. After you set the root password, select
- <guibutton>Next</guibutton> to proceed.
- </para>
diff --git a/en-US/Account_Configuration_common-title.xml b/en-US/Account_Configuration_common-title.xml
index 29c6c9d..0d87301 100644
--- a/en-US/Account_Configuration_common-title.xml
+++ b/en-US/Account_Configuration_common-title.xml
@@ -1,5 +1,7 @@
-<?xml version="1.0"?>
-<!DOCTYPE title PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE title PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Quick_Start_Guide.ent">
+%BOOK_ENTITIES;
]>
+<title>Set the Root Password</title>
-<title>Set the Root Password</title>
\ No newline at end of file
diff --git a/en-US/Article_Info.xml b/en-US/Article_Info.xml
index 81fb31d..e0665c7 100644
--- a/en-US/Article_Info.xml
+++ b/en-US/Article_Info.xml
@@ -6,7 +6,7 @@
<title>Installation Quick Start Guide</title>
<subtitle>Downloading and installing Fedora &PRODVER; on most desktop and laptop computers</subtitle>
<productname>Fedora</productname>
- <productnumber>13</productnumber>
+ <productnumber>16</productnumber>
<edition>1</edition>
<pubsnumber>1</pubsnumber>
<abstract>
diff --git a/en-US/Assign_Storage_Devices-common-figure-1.xml b/en-US/Assign_Storage_Devices-common-figure-1.xml
index ab00669..3b19c47 100644
--- a/en-US/Assign_Storage_Devices-common-figure-1.xml
+++ b/en-US/Assign_Storage_Devices-common-figure-1.xml
@@ -1,14 +1,21 @@
-<?xml version="1.0"?>
-<!DOCTYPE figure PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE figure PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Quick_Start_Guide.ent">
+%BOOK_ENTITIES;
]>
-
-
-<figure float="0"><title>Assign storage devices</title>
- <mediaobject>
- <imageobject><imagedata fileref="images/storagedevices/assignstoragedevices.png" format="PNG"/></imageobject>
- <textobject><para>
+<figure float="0">
+ <title>Assign storage devices</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/storagedevices/assignstoragedevices.png" format="PNG" width="444" />
+ </imageobject>
+ <textobject>
+ <para>
Screen to select storage devices for installation or for data storage only
</para>
+
</textobject>
+
</mediaobject>
</figure>
+
diff --git a/en-US/Assign_Storage_Devices-common-para-1.xml b/en-US/Assign_Storage_Devices-common-para-1.xml
index b3b91c8..6082320 100644
--- a/en-US/Assign_Storage_Devices-common-para-1.xml
+++ b/en-US/Assign_Storage_Devices-common-para-1.xml
@@ -1,7 +1,9 @@
-<?xml version="1.0"?>
-<!DOCTYPE title PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Quick_Start_Guide.ent">
+%BOOK_ENTITIES;
]>
-
<para>
- During installation, the devices that you identify here as being for data storage only are mounted as part of the file system, but are not partitioned or formatted.
+ During installation, the devices that you identify here as being for data storage only are mounted as part of the file system, but are not partitioned or formatted.
</para>
+
diff --git a/en-US/Assign_Storage_Devices-common-para-2.xml b/en-US/Assign_Storage_Devices-common-para-2.xml
index bf4b1c4..14168ef 100644
--- a/en-US/Assign_Storage_Devices-common-para-2.xml
+++ b/en-US/Assign_Storage_Devices-common-para-2.xml
@@ -1,7 +1,9 @@
-<?xml version="1.0"?>
-<!DOCTYPE title PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Quick_Start_Guide.ent">
+%BOOK_ENTITIES;
]>
-
<para>
The screen is split into two panes. The left pane contains a list of devices to be used for data storage only. The right pane contains a list of devices that are to be available for installation of the operating system.
</para>
+
diff --git a/en-US/Assign_Storage_Devices-common-para-3.xml b/en-US/Assign_Storage_Devices-common-para-3.xml
index c6c998a..99811a2 100644
--- a/en-US/Assign_Storage_Devices-common-para-3.xml
+++ b/en-US/Assign_Storage_Devices-common-para-3.xml
@@ -1,7 +1,9 @@
-<?xml version="1.0"?>
-<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Quick_Start_Guide.ent">
+%BOOK_ENTITIES;
]>
-
<para>
Each list contains information about the devices to help you to identify them. A small drop-down menu marked with an icon is located to the right of the column headings. This menu allows you to select the types of data presented on each device. Reducing or expanding the amount of information presented might help you to identify particular devices.
</para>
+
diff --git a/en-US/Assign_Storage_Devices-common-para-4.xml b/en-US/Assign_Storage_Devices-common-para-4.xml
index 077d98c..e84c727 100644
--- a/en-US/Assign_Storage_Devices-common-para-4.xml
+++ b/en-US/Assign_Storage_Devices-common-para-4.xml
@@ -1,7 +1,9 @@
-<?xml version="1.0"?>
-<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Quick_Start_Guide.ent">
+%BOOK_ENTITIES;
]>
-
<para>
Move a device from one list to the other by clicking on the device, then clicking either the button labeled with a left-pointing arrow to move it to the list of data storage devices or the button labeled with a right-pointing arrow to move it to the list of devices available for installation of the operating system.
</para>
+
diff --git a/en-US/Assign_Storage_Devices-common-para-5.xml b/en-US/Assign_Storage_Devices-common-para-5.xml
index 98aec91..28bcce3 100644
--- a/en-US/Assign_Storage_Devices-common-para-5.xml
+++ b/en-US/Assign_Storage_Devices-common-para-5.xml
@@ -1,7 +1,9 @@
-<?xml version="1.0"?>
-<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Quick_Start_Guide.ent">
+%BOOK_ENTITIES;
]>
-
<para>
The list of devices available as installation targets also includes a radio button beside each device. Use this radio button to specify the device that you want to use as the boot device for the system.
</para>
+
diff --git a/en-US/Assign_Storage_Devices-common-para-6.xml b/en-US/Assign_Storage_Devices-common-para-6.xml
index 0787d78..b909fe3 100644
--- a/en-US/Assign_Storage_Devices-common-para-6.xml
+++ b/en-US/Assign_Storage_Devices-common-para-6.xml
@@ -1,7 +1,9 @@
-<?xml version="1.0"?>
-<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Quick_Start_Guide.ent">
+%BOOK_ENTITIES;
]>
-
<para>
When you have finished identifying devices to be used for installation, click <guibutton>Next</guibutton> to continue.
</para>
+
diff --git a/en-US/Assign_Storage_Devices-common-title.xml b/en-US/Assign_Storage_Devices-common-title.xml
index 8fa40c9..0fa2e27 100644
--- a/en-US/Assign_Storage_Devices-common-title.xml
+++ b/en-US/Assign_Storage_Devices-common-title.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0"?>
-<!DOCTYPE title PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE title PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Quick_Start_Guide.ent">
+%BOOK_ENTITIES;
]>
+<title> Assign Storage Devices </title>
-<title>
- Assign Storage Devices
-</title>
diff --git a/en-US/Assign_Storage_Devices-x86.xml b/en-US/Assign_Storage_Devices-x86.xml
index 4c0a57b..4e61a10 100644
--- a/en-US/Assign_Storage_Devices-x86.xml
+++ b/en-US/Assign_Storage_Devices-x86.xml
@@ -1,36 +1,30 @@
-<?xml version="1.0"?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Quick_Start_Guide.ent">
+%BOOK_ENTITIES;
]>
-
<section id="Assign_Storage_Devices-x86">
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Assign_Storage_Devices-common-title.xml"/>
- <!-- Storage Devices -->
-
- <para>
- If you selected more than one storage device on the storage devices selection screen (refer to <xref linkend="Storage_Devices-x86"/>), <application>anaconda</application> asks you to select which of these devices should be available for installation of the operating system, and which should only be attached to the file system for data storage.
+ <xi:include href="Assign_Storage_Devices-common-title.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- Storage Devices --> <para>
+ If you selected more than one storage device on the storage devices selection screen (refer to <xref linkend="Storage_Devices-x86" />), <application>anaconda</application> asks you to select which of these devices should be available for installation of the operating system, and which should only be attached to the file system for data storage. If you selected only one storage device, <application>anaconda</application> does not present you with this screen.
</para>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Assign_Storage_Devices-common-para-1.xml"/>
- <!-- During installation, the devices that you identify here -->
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Assign_Storage_Devices-common-figure-1.xml"/>
- <!-- Assign Storage Devices -->
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Assign_Storage_Devices-common-para-2.xml"/>
- <!-- The screen is split into two panes. -->
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Assign_Storage_Devices-common-para-3.xml"/>
- <!-- Each list contains information about the devices to help you to identify them. -->
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Assign_Storage_Devices-common-para-4.xml"/>
- <!-- Move a device from one list to the other by clicking on the device, -->
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Assign_Storage_Devices-common-para-5.xml"/>
- <!-- The list of devices available as installation targets includes -->
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Assign_Storage_Devices-common-para-6.xml"/>
- <!-- When you have finished identifying devices to be used for installation -->
+ <xi:include href="Assign_Storage_Devices-common-para-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- During installation, the devices that you identify here --> <xi:include href="Assign_Storage_Devices-common-figure-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- Assign Storage Devices --> <xi:include href="Assign_Storage_Devices-common-para-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- The screen is split into two panes. --> <xi:include href="Assign_Storage_Devices-common-para-3.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- Each list contains information about the devices to help you to identify them. --> <xi:include href="Assign_Storage_Devices-common-para-4.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- Move a device from one list to the other by clicking on the device, --> <xi:include href="Assign_Storage_Devices-common-para-5.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- The list of devices available as installation targets includes --> <!-- <important>
+ <xi:include href="Assign_Storage_Devices-common-important-title-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> -->
+ <!-- Important — chain loading --> <!-- <xi:include href="Assign_Storage_Devices-common-important-indexterm-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> -->
+ <!-- Chain loading --> <!-- <xi:include href="Assign_Storage_Devices-common-important-para-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> -->
+ <!-- If any storage device contains a boot loader that will chain load the Fedora boot loader --> <!--<para>
+ Storage devices that you identify as <guilabel>Install Target Devices</guilabel> on this screen are not automatically erased by the installation process unless you selected the <guilabel>Use All Space</guilabel> option on the partitioning screen (refer to <xref linkend="s1-diskpartsetup-x86" />).
+ </para>
+ </important> -->
+ <xi:include href="Assign_Storage_Devices-common-para-6.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- When you have finished identifying devices to be used for installation -->
</section>
+
diff --git a/en-US/Author_Group.xml b/en-US/Author_Group.xml
index f22246f..a7b5b85 100644
--- a/en-US/Author_Group.xml
+++ b/en-US/Author_Group.xml
@@ -12,6 +12,14 @@
<orgname>Red Hat</orgname>
<orgdiv>Engineering Content Services</orgdiv>
</affiliation>
- <email>r.landmann at redhat.com</email>
+ </editor>
+ <editor>
+ <firstname>Jack</firstname>
+ <surname>Reed</surname>
+ <affiliation>
+ <orgname>Red Hat</orgname>
+ <orgdiv>Engineering Content Services</orgdiv>
+ </affiliation>
+ <email>jreed at redhat.com</email>
</editor>
</authorgroup>
diff --git a/en-US/Automatic_Partitioning_common-para-1.xml b/en-US/Automatic_Partitioning_common-para-1.xml
index 75368cd..87abca7 100644
--- a/en-US/Automatic_Partitioning_common-para-1.xml
+++ b/en-US/Automatic_Partitioning_common-para-1.xml
@@ -1,10 +1,8 @@
-<?xml version="1.0"?>
-<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
-
-
-
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Quick_Start_Guide.ent">
+%BOOK_ENTITIES;
]>
-
<para>
Your options are:
</para>
diff --git a/en-US/Automatic_Partitioning_common-para-2.xml b/en-US/Automatic_Partitioning_common-para-2.xml
index 9eda6af..208fb7b 100644
--- a/en-US/Automatic_Partitioning_common-para-2.xml
+++ b/en-US/Automatic_Partitioning_common-para-2.xml
@@ -1,7 +1,8 @@
-<?xml version="1.0"?>
-<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Quick_Start_Guide.ent">
+%BOOK_ENTITIES;
]>
-
<para>
Choose your preferred partitioning method by clicking the radio button to the left of its description in the dialog box.
</para>
diff --git a/en-US/Automatic_Partitioning_common-para-4.xml b/en-US/Automatic_Partitioning_common-para-4.xml
index 5ed0b92..92d1e0a 100644
--- a/en-US/Automatic_Partitioning_common-para-4.xml
+++ b/en-US/Automatic_Partitioning_common-para-4.xml
@@ -1,10 +1,9 @@
-<?xml version="1.0"?>
-<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
-
-
-
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Quick_Start_Guide.ent">
+%BOOK_ENTITIES;
]>
-
<para>
Click <guibutton>Next</guibutton> once you have made your selections to proceed.
-</para>
\ No newline at end of file
+</para>
+
diff --git a/en-US/Automatic_Partitioning_common-varlistentry-1.xml b/en-US/Automatic_Partitioning_common-varlistentry-1.xml
index 7e88634..ee3ec1f 100644
--- a/en-US/Automatic_Partitioning_common-varlistentry-1.xml
+++ b/en-US/Automatic_Partitioning_common-varlistentry-1.xml
@@ -1,19 +1,25 @@
-<?xml version="1.0"?>
-<!DOCTYPE varlistentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE varlistentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Quick_Start_Guide.ent">
+%BOOK_ENTITIES;
]>
-
<varlistentry>
<term>Use All Space</term>
- <listitem>
+ <listitem>
<para>
Select this option to remove all partitions on your hard drives (this includes partitions created by other operating systems such as Windows VFAT or NTFS partitions).
</para>
- <warning>
+ <warning>
<title>Warning</title>
- <para>
- If you select this option, all data on the selected hard drive(s) is removed by the installation program. Do not select this option if you have information that you want to keep on the hard drive(s) where you are installing Fedora.
+ <para>
+ If you select this option, all data on the selected hard drives is removed by the installation program. Do not select this option if you have information that you want to keep on the hard drives where you are installing Fedora.
+ </para>
+ <para>
+ In particular, do not select this option when you configure a system to chain load the Fedora boot loader from another boot loader.
</para>
+
</warning>
+
</listitem>
</varlistentry>
diff --git a/en-US/Automatic_Partitioning_common-varlistentry-2.xml b/en-US/Automatic_Partitioning_common-varlistentry-2.xml
index fee118e..1bd9ef8 100644
--- a/en-US/Automatic_Partitioning_common-varlistentry-2.xml
+++ b/en-US/Automatic_Partitioning_common-varlistentry-2.xml
@@ -1,12 +1,15 @@
-<?xml version="1.0"?>
-<!DOCTYPE varlistentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE varlistentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Quick_Start_Guide.ent">
+%BOOK_ENTITIES;
]>
-
<varlistentry>
<term>Replace Existing Linux System(s)</term>
- <listitem>
+ <listitem>
<para>
Select this option to remove only partitions created by a previous Linux installation. This does not remove other partitions you may have on your hard drives (such as VFAT or FAT32 partitions).
</para>
+
</listitem>
</varlistentry>
+
diff --git a/en-US/Automatic_Partitioning_common-varlistentry-3.xml b/en-US/Automatic_Partitioning_common-varlistentry-3.xml
index 0334ae3..ba33e50 100644
--- a/en-US/Automatic_Partitioning_common-varlistentry-3.xml
+++ b/en-US/Automatic_Partitioning_common-varlistentry-3.xml
@@ -1,20 +1,22 @@
-<?xml version="1.0"?>
-<!DOCTYPE varlistentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE varlistentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Quick_Start_Guide.ent">
+%BOOK_ENTITIES;
]>
-
<varlistentry>
<term>Shrink Current System</term>
- <listitem>
+ <listitem>
<para>
Select this option to resize your current data and partitions manually and install a default Fedora layout in the space that is freed.
</para>
- <warning>
+ <warning>
<title>Warning</title>
- <para>
+ <para>
If you shrink partitions on which other operating systems are installed, you might not be able to use those operating systems. Although this partitioning option does not destroy data, operating systems typically require some free space in their partitions. Before you resize a partition that holds an operating system that you might want to use again, find out how much space you need to leave free.
</para>
+
</warning>
+
</listitem>
</varlistentry>
-
-
\ No newline at end of file
+
diff --git a/en-US/Automatic_Partitioning_x86-variablelist-1.xml b/en-US/Automatic_Partitioning_x86-variablelist-1.xml
index 9c4f7db..2f8e286 100644
--- a/en-US/Automatic_Partitioning_x86-variablelist-1.xml
+++ b/en-US/Automatic_Partitioning_x86-variablelist-1.xml
@@ -1,34 +1,33 @@
-<?xml version="1.0"?>
-<!DOCTYPE variablelist PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE variablelist PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Quick_Start_Guide.ent">
+%BOOK_ENTITIES;
]>
-
<variablelist>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Automatic_Partitioning_common-varlistentry-1.xml"/>
- <!-- Use All Space -->
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Automatic_Partitioning_common-varlistentry-2.xml"/>
- <!-- Replace Existing Linux System(s) -->
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Automatic_Partitioning_common-varlistentry-3.xml"/>
- <!-- Shrink Current System -->
-
- <varlistentry>
+ <xi:include href="Automatic_Partitioning_common-varlistentry-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- Use All Space --> <xi:include href="Automatic_Partitioning_common-varlistentry-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- Replace Existing Linux System(s) --> <xi:include href="Automatic_Partitioning_common-varlistentry-3.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- Shrink Current System --> <varlistentry>
<term>Use Free Space</term>
- <listitem>
+ <listitem>
<para>
- Select this option to retain your current data and partitions and install Fedora in the unused space available on the storage drives. Ensure that there is sufficient space available on the storage drives before you select this option. <!-- — refer to <xref linkend="Disk_Space-x86"/>. -->
+ Select this option to retain your current data and partitions and install Fedora in the unused space available on the storage drives. Ensure that there is sufficient space available on the storage drives before you select this option.
</para>
+ <xi:include href="Warning_boot_partition_64bit.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
</listitem>
</varlistentry>
+
- <varlistentry>
+ <varlistentry>
<term>Create Custom Layout</term>
- <listitem>
+ <listitem>
<para>
- Select this option to partition storage devices manually and create customized layouts. <!-- not IQSG Refer to <xref linkend="s1-diskpartitioning-x86"/> -->
+ Select this option to partition storage devices manually and create customized layouts.
</para>
+
</listitem>
+
</varlistentry>
-
+
</variablelist>
diff --git a/en-US/Boot_your_computer_from_the_CD.xml b/en-US/Boot_your_computer_from_the_CD.xml
index 4fcdea2..602e622 100644
--- a/en-US/Boot_your_computer_from_the_CD.xml
+++ b/en-US/Boot_your_computer_from_the_CD.xml
@@ -17,6 +17,9 @@
</mediaobject>
</figure>
<para>
+ Either press <keycap>Enter</keycap> to select the <guilabel>Start Fedora 16</guilabel> option, or wait for the countdown to expire.
+ </para>
+ <para>
If you do not see this screen, you might need to select an option manually to make your computer boot from the CD. Power your computer on, and watch the initial BIOS screen for a prompt that indicates which key to use for either:
</para>
<itemizedlist>
diff --git a/en-US/Disk_Partitioning_Setup-x86.xml b/en-US/Disk_Partitioning_Setup-x86.xml
new file mode 100644
index 0000000..f9cc156
--- /dev/null
+++ b/en-US/Disk_Partitioning_Setup-x86.xml
@@ -0,0 +1,43 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Quick_Start_Guide.ent">
+%BOOK_ENTITIES;
+]>
+<section id="s1-diskpartsetup-x86">
+ <xi:include href="Disk_Partitioning_Setup_common-title.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- Disk Partitioning Setup --> <!-- Index terms --> <!-- <xi:include href="Disk_Partitioning_Setup_common-indexterm-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="Disk_Partitioning_Setup_common-indexterm-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="Automatic_Partitioning_common-indexterm-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="Automatic_Partitioning_common-indexterm-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> -->
+ <!-- End Index terms --> <!-- <xi:include href="Automatic_Partitioning_common-caution-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> -->
+ <!-- It is always a good idea to back up any data ... --> <!-- <xi:include href="Automatic_Partitioning_common-note-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> -->
+ <!-- Installation in text mode... --> <!-- <important>
+ <title>Important — Booting from RAIDs</title>
+ <xi:include href="Automatic_Partitioning_x86_ppc-tip-para-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> -->
+ <!-- If you have a RAID card, be aware that some BIOSes... --> <!-- <xi:include href="Automatic_Partitioning_x86_ppc-tip-para-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> -->
+ <!-- A /boot/ partition is also necessary for ... --> <!-- <xi:include href="Automatic_Partitioning_x86_ppc-tip-para-3.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> -->
+ <!-- If you have chosen to automatically partition your system ... -->
+ <!-- </important>
+ <para>
+ Partitioning allows you to divide your hard drive into isolated sections, where each section behaves as its own hard drive. Partitioning is particularly useful if you run multiple operating systems. If you are not sure how you want your system to be partitioned, read <xref linkend="ch-partitions-x86" /> for more information.
+ </para> -->
+
+ <xi:include href="Disk_Partitioning_Setup_common-para-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- On this screen, you can choose between three different automatic partitioning... -->
+ <xi:include href="Disk_Partitioning_Setup_common-figure-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- Choose automatic partitioning or manual partitioning... --> <xi:include href="Disk_Partitioning_Setup_common-para-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- The first three options allow you to perform an installation --> <xi:include href="Automatic_Partitioning_common-para-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- Your options are: --> <xi:include href="Automatic_Partitioning_x86-variablelist-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- Remove all partitions on selected drives and create default layout
+ Remove linux partitions on selected drives and create default layout
+ Caution
+ Use free space on selected drives and create default layout --> <xi:include href="Automatic_Partitioning_common-para-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- Choose your preferred partitioning method... --> <!-- <xi:include href="Automatic_Partitioning_common-para-5.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> -->
+ <!-- Select Encrypt system to encrypt all partitions... --> <!-- <xi:include href="Automatic_Partitioning_common-para-3.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> -->
+ <!-- To review and make any necessary changes to the partitions... --> <!-- <xi:include href="Disk_Partitioning_Setup_common-important-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> -->
+ <!-- Important - chain loading... --> <!-- <xi:include href="Disk_Partitioning_Setup_common-important-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> -->
+ <!-- Important - multipath and non-multipath... --> <xi:include href="Automatic_Partitioning_common-para-4.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- Click Next once you have made your selection... -->
+</section>
+
+
diff --git a/en-US/Disk_Partitioning_Setup_common-figure-1.xml b/en-US/Disk_Partitioning_Setup_common-figure-1.xml
index 8e8404c..3f598b5 100644
--- a/en-US/Disk_Partitioning_Setup_common-figure-1.xml
+++ b/en-US/Disk_Partitioning_Setup_common-figure-1.xml
@@ -1,13 +1,21 @@
-<?xml version="1.0"?>
-<!DOCTYPE figure PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE figure PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Quick_Start_Guide.ent">
+%BOOK_ENTITIES;
]>
-
-<figure float="0"><title>Disk Partitioning Setup</title>
- <mediaobject>
- <imageobject><imagedata fileref="images/diskpartsetup/disk-setup.png" format="PNG"/></imageobject>
- <textobject><para>
+<figure float="0">
+ <title>Disk Partitioning Setup</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/diskpartsetup/disk-setup.png" format="PNG" width="444" />
+ </imageobject>
+ <textobject>
+ <para>
Choose automatic partitioning or manual partitioning.
</para>
+
</textobject>
+
</mediaobject>
-</figure>
\ No newline at end of file
+</figure>
+
diff --git a/en-US/Disk_Partitioning_Setup_common-para-1.xml b/en-US/Disk_Partitioning_Setup_common-para-1.xml
index dfd253f..75a5ad8 100644
--- a/en-US/Disk_Partitioning_Setup_common-para-1.xml
+++ b/en-US/Disk_Partitioning_Setup_common-para-1.xml
@@ -1,7 +1,8 @@
-<?xml version="1.0"?>
-<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Quick_Start_Guide.ent">
+%BOOK_ENTITIES;
]>
-
<para>
On this screen you can choose to create the default partition layout in one of four different ways, or choose to partition storage devices manually to create a custom layout.
</para>
diff --git a/en-US/Disk_Partitioning_Setup_common-para-2.xml b/en-US/Disk_Partitioning_Setup_common-para-2.xml
index 3798e1c..a1dd29d 100644
--- a/en-US/Disk_Partitioning_Setup_common-para-2.xml
+++ b/en-US/Disk_Partitioning_Setup_common-para-2.xml
@@ -1,7 +1,8 @@
-<?xml version="1.0"?>
-<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Quick_Start_Guide.ent">
+%BOOK_ENTITIES;
]>
-
<para>
The first four options allow you to perform an automated installation without having to partition your storage devices yourself. If you do not feel comfortable with partitioning your system, choose one of these options and let the installation program partition the storage devices for you. Depending on the option that you choose, you can still control what data (if any) is removed from the system.
</para>
diff --git a/en-US/Disk_Partitioning_Setup_common-title.xml b/en-US/Disk_Partitioning_Setup_common-title.xml
index 0042f2e..eab6c55 100644
--- a/en-US/Disk_Partitioning_Setup_common-title.xml
+++ b/en-US/Disk_Partitioning_Setup_common-title.xml
@@ -1,8 +1,7 @@
-<?xml version="1.0"?>
-<!DOCTYPE title PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
-
-
-
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE title PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Quick_Start_Guide.ent">
+%BOOK_ENTITIES;
]>
+<title>Disk Partitioning Setup</title>
-<title>Disk Partitioning Setup</title>
\ No newline at end of file
diff --git a/en-US/Download_Fedora.xml b/en-US/Download_Fedora.xml
index 45349ec..1c671ee 100644
--- a/en-US/Download_Fedora.xml
+++ b/en-US/Download_Fedora.xml
@@ -5,6 +5,6 @@
<section id="Download_Fedora">
<title>Download the Fedora live CD image file</title>
<para>
- The image file for the Fedora &PRODVER; live CD is available from <ulink url="http://download.fedoraproject.org/pub/fedora/linux/releases/13/Live/i686/Fedora-13-i686-Live.iso"></ulink>. Download and save this file to your computer.
+ The image file for the Fedora &PRODVER; live CD is available from <ulink url="http://download.fedoraproject.org/pub/fedora/linux/releases/16/Live/i686/Fedora-16-i686-Live-Desktop.iso"></ulink>. Download and save this file to your computer.
</para>
</section>
diff --git a/en-US/Log_in_to_the_Fedora_live_system.xml b/en-US/Fedora_Live_Desktop.xml
similarity index 66%
rename from en-US/Log_in_to_the_Fedora_live_system.xml
rename to en-US/Fedora_Live_Desktop.xml
index 0bc7250..81fabe7 100644
--- a/en-US/Log_in_to_the_Fedora_live_system.xml
+++ b/en-US/Fedora_Live_Desktop.xml
@@ -2,9 +2,9 @@
<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docarticle/xml/4.5/docarticlex.dtd" [
]>
-<section id="Log_in_to_the_Fedora_live_system.xml">
- <title>Log in to the Fedora live system</title>
- <para>
+<section id="Fedora_Live_Desktop">
+ <title>Fedora Live Desktop</title>
+ <!-- <para>
After a ten-second countdown, your computer loads the Fedora live system and presents you with a login screen:
</para>
<figure float="0" id="fig-livedesktop-login"><title>The Fedora live system login screen</title>
@@ -27,17 +27,24 @@
Click the <guibutton>Log In</guibutton> button. The Fedora live system desktop loads.
</para>
</step>
- </procedure>
+ </procedure> -->
+
<para>
- The Fedora live system desktop consists of menu bars at the top and bottom of the screen, plus two icons on the desktop. Double-click the icon marked <guilabel>Install to Hard Drive</guilabel> to launch the installation program.
+ Click <guilabel>Activities</guilabel>, and a menu with several icons will drop down.
</para>
- <figure float="0" id="fig-livedesktop"><title>The desktop of the Fedora live system</title>
+
+ <figure float="0" id="fig-livedesktop"><title>The Activities menu in the Fedora live system</title>
<mediaobject>
<imageobject><imagedata fileref="images/livedesktop/livedesktop.png" format="PNG"/></imageobject>
<textobject><para>
- The desktop of the Fedora live system. There are menu bars at the top and bottom of the screen, and the icons <guilabel>Computer</guilabel> and <guilabel>Install to Hard Drive</guilabel> on the desktop itself.
+ The Activities menu in the desktop of the Fedora live system, accessible from the menu bar at the top of the screen. The menu includes the <guilabel>Install to Hard Drive</guilabel> icon.
</para>
</textobject>
</mediaobject>
</figure>
+
+ <para>
+ The final icon is labeled <guilabel>Install to Hard Drive</guilabel>. Click this icon to launch the installation program.
+ </para>
+
</section>
diff --git a/en-US/Initializing_Hard_Disk-x86.xml b/en-US/Initializing_Hard_Disk-x86.xml
index 5a73eff..f65cf2e 100644
--- a/en-US/Initializing_Hard_Disk-x86.xml
+++ b/en-US/Initializing_Hard_Disk-x86.xml
@@ -1,40 +1,33 @@
-<?xml version="1.0"?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Quick_Start_Guide.ent">
+%BOOK_ENTITIES;
]>
-
<section id="sn-initialize-hdd-x86">
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="Initializing_Hard_Disk_common-title.xml"/>
- <!-- Title: Initializing the Hard Disk -->
-
-<!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="Initializing_Hard_Disk_common-indexterm.xml"/> -->
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="Initializing_Hard_Disk_common-para-1.xml"/>
- <!-- If no readable partition tables are found on existing hard disks... -->
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="Initializing_Hard_Disk_common-para-3.xml"/>
- <!-- The installation program presents you with a separate dialog for each disk... -->
-
- <figure float="0" id="fig-initializing-x86"><title>Warning screen – initializing hard drive</title>
- <mediaobject>
- <imageobject><imagedata fileref="images/initializing/initializing.png" format="PNG"/></imageobject>
- <textobject><para>
+ <xi:include href="Initializing_Hard_Disk_common-title.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- Title: Initializing the Hard Disk --> <!-- <xi:include href="Initializing_Hard_Disk_common-indexterm.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> -->
+ <xi:include href="Initializing_Hard_Disk_common-para-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- If no readable partition tables are found on existing hard disks... --> <xi:include href="Initializing_Hard_Disk_common-para-3.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- The installation program presents you with a separate dialog for each disk... --> <figure float="0" id="fig-initializing-x86">
+ <title>Warning screen – initializing hard drive</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/initializing/initializing.png" format="PNG" width="444" />
+ </imageobject>
+ <textobject>
+ <para>
Warning screen – initializing hard drive.
</para>
+
</textobject>
+
</mediaobject>
+
</figure>
-
-<!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="Initializing_Hard_Disk_common-para-2.xml"/> -->
- <!-- Certain RAID systems or other nonstandard configurations... -->
-
-<!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="Initializing_Hard_Disk_common-note-1.xml"/> -->
- <!-- Detach Unneeded Disks -->
-
+ <!-- <xi:include href="Initializing_Hard_Disk_common-para-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> -->
+ <!-- Certain RAID systems or other nonstandard configurations... --> <!-- <xi:include href="Initializing_Hard_Disk_common-para-4.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> -->
+ <!-- To enable automatic initializing of hard disks wherever necessary ... --> <!-- <xi:include href="Initializing_Hard_Disk_common-note-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> -->
+ <!-- Detach Unneeded Disks -->
</section>
+
diff --git a/en-US/Initializing_Hard_Disk_common-para-1.xml b/en-US/Initializing_Hard_Disk_common-para-1.xml
index 0be9422..bca4662 100644
--- a/en-US/Initializing_Hard_Disk_common-para-1.xml
+++ b/en-US/Initializing_Hard_Disk_common-para-1.xml
@@ -1,9 +1,9 @@
-<?xml version="1.0"?>
-<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Quick_Start_Guide.ent">
+%BOOK_ENTITIES;
]>
-
- <para>
- If no readable partition tables are found on existing hard disks, the installation program asks to initialize the hard disk. This operation makes any existing data on the hard disk unreadable. If your system has a brand new hard disk with no operating system installed, or you have removed all partitions on the hard disk, click <guibutton>Re-initialize drive</guibutton>.
- </para>
-
+<para>
+ If no readable partition tables are found on existing hard disks, the installation program asks to initialize the hard disk. This operation makes any existing data on the hard disk unreadable. If your system has a brand new hard disk with no operating system installed, or you have removed all partitions on the hard disk, click <guibutton>Re-initialize drive</guibutton>.
+</para>
diff --git a/en-US/Initializing_Hard_Disk_common-para-3.xml b/en-US/Initializing_Hard_Disk_common-para-3.xml
index b1a9060..0d7ade7 100644
--- a/en-US/Initializing_Hard_Disk_common-para-3.xml
+++ b/en-US/Initializing_Hard_Disk_common-para-3.xml
@@ -1,9 +1,9 @@
-<?xml version="1.0"?>
-<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Quick_Start_Guide.ent">
+%BOOK_ENTITIES;
]>
-
<para>
- The installation program presents you with a separate dialog for each disk on which it cannot read a valid partition table. Click the <guibutton>Ignore all</guibutton> button or <guibutton>Re-initialize all</guibutton> button to apply the same answer to all devices.
+ The installation program presents you with a separate dialog for each disk on which it cannot read a valid partition table. Click the <guibutton>Ignore all</guibutton> button or <guibutton>Re-initialize all</guibutton> button to apply the same answer to all devices.
</para>
-
diff --git a/en-US/Initializing_Hard_Disk_common-title.xml b/en-US/Initializing_Hard_Disk_common-title.xml
index 3e12d0b..fed67ca 100644
--- a/en-US/Initializing_Hard_Disk_common-title.xml
+++ b/en-US/Initializing_Hard_Disk_common-title.xml
@@ -1,6 +1,7 @@
-<?xml version="1.0"?>
-<!DOCTYPE title PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE title PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Quick_Start_Guide.ent">
+%BOOK_ENTITIES;
]>
-
<title>Initializing the Hard Disk</title>
diff --git a/en-US/Installation_Quick_Start_Guide.ent b/en-US/Installation_Quick_Start_Guide.ent
index a4aab10..09ad3c8 100644
--- a/en-US/Installation_Quick_Start_Guide.ent
+++ b/en-US/Installation_Quick_Start_Guide.ent
@@ -1,6 +1,6 @@
<!ENTITY PRODUCT "Fedora Documentation">
<!ENTITY BOOKID "installation-quick-start-guide">
-<!ENTITY YEAR "2010">
+<!ENTITY YEAR "2011">
<!ENTITY HOLDER "Red Hat, Inc. and others">
-<!ENTITY PRODVER "13">
+<!ENTITY PRODVER "16">
diff --git a/en-US/Installation_Quick_Start_Guide.xml b/en-US/Installation_Quick_Start_Guide.xml
index 9c4ddcf..acf2e50 100644
--- a/en-US/Installation_Quick_Start_Guide.xml
+++ b/en-US/Installation_Quick_Start_Guide.xml
@@ -15,11 +15,13 @@
<xi:include href="Boot_your_computer_from_the_CD.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="Log_in_to_the_Fedora_live_system.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="Language_Selection.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="Welcome-x86.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="Fedora_Live_Desktop.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="Language_Selection-x86.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- <xi:include href="Welcome-x86.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+
+ <xi:include href="Language_Selection-x86.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> -->
<xi:include href="Key_Board_Configuration-x86.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
@@ -29,21 +31,21 @@
<xi:include href="Initializing_Hard_Disk-x86.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="upgrading-fedora.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="Upgrading-x86.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="networkconfig-fedora.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="Time_Zone-x86.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="Account_Configuration-common.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="Account_Configuration-x86.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="Disk_Partitioning.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="Disk_Partitioning_Setup-x86.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="Write_changes_to_disk.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="Write_changes_to_disk_x86.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="X86_Bootloader.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="Package_Selection-x86.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="Package_Selection-Live.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="Installing_Packages-x86.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
diff --git a/en-US/Installing_Packages-x86.xml b/en-US/Installing_Packages-x86.xml
index a7fc839..ed85d35 100644
--- a/en-US/Installing_Packages-x86.xml
+++ b/en-US/Installing_Packages-x86.xml
@@ -1,24 +1,18 @@
-<?xml version="1.0"?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
-
-
-
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Quick_Start_Guide.ent">
+%BOOK_ENTITIES;
]>
-
<section id="s1-installpkgs-x86">
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Installing_Packages_common-title.xml"/>
- <!-- Installing Packages -->
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Installing_Packages_common-para-1.xml"/>
- <!-- At this point there is nothing left for you to do until -->
-
-<!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Installing_Packages_common-para-2.xml"/> -->
- <!-- Fedora reports the installation progress on the screen -->
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Installing_Packages_common-para-3.xml"/>
- <!-- After installation completes, select Reboot -->
-
-<!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Installing_Packages_common-note-1.xml"/> -->
- <!-- Installing from a Live Image -->
-
+ <xi:include href="Installing_Packages_common-title.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- Installing Packages --> <xi:include href="Installing_Packages_common-para-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- At this point there is nothing left for you to do until --> <!-- <xi:include href="Installing_Packages_common-para-4.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> -->
+ <!-- Depending on the available resources, you might see the following progress bar --> <!-- <xi:include href="Installing_Packages_common-figure-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="Installing_Packages_common-para-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> -->
+ <!-- Fedora reports the installation progress on the screen --> <!-- <xi:include href="Installing_Packages_common-figure-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="Installing_Packages_common-para-2a.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> -->
+ <!-- For your reference, a complete log of your installation can be found --> <xi:include href="Installing_Packages_common-para-3.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- After installation completes, select Reboot -->
</section>
+
+
diff --git a/en-US/Key_Board_Configuration-x86.xml b/en-US/Key_Board_Configuration-x86.xml
index 1619989..6335519 100644
--- a/en-US/Key_Board_Configuration-x86.xml
+++ b/en-US/Key_Board_Configuration-x86.xml
@@ -1,41 +1,39 @@
-<?xml version="1.0"?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Quick_Start_Guide.ent">
+%BOOK_ENTITIES;
]>
-
-
-<section>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Key_Board_Configuration_x86_ppc-title-1.xml"/>
- <!-- Keyboard Configuration -->
-
- <!-- Index terms -->
-<!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Key_Board_Configuration_x86_ppc-indexterm-1.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Key_Board_Configuration_x86_ppc-indexterm-2.xml"/> -->
- <!-- End Index terms -->
-
- <para>
+<section id="sn-keyboard-x86">
+ <xi:include href="Key_Board_Configuration_x86_ppc-title-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- Keyboard Configuration --> <!-- Index terms --> <!-- <xi:include href="Key_Board_Configuration_x86_ppc-indexterm-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="Key_Board_Configuration_x86_ppc-indexterm-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> -->
+ <!-- End Index terms --> <para>
Using your mouse, select the correct layout type (for example, U.S. English) for the keyboard you would prefer to use for the installation and as the system default (refer to the figure below).
</para>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Key_Board_Configuration_x86_ppc-para-1.xml"/>
- <!-- Using your mouse, select the correct layout type ... -->
-
- <figure float="0"><title>Keyboard Configuration</title>
- <mediaobject>
- <imageobject><imagedata fileref="images/kbdconfig/keyboard.png" format="PNG"/></imageobject>
- <textobject><para>
+ <xi:include href="Key_Board_Configuration_x86_ppc-para-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- Using your mouse, select the correct layout type ... --> <figure float="0">
+ <title>Keyboard Configuration</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/kbdconfig/keyboard.png" format="PNG" width="444" />
+ </imageobject>
+ <textobject>
+ <para>
Keyboard configuration screen
</para>
+
</textobject>
+
</mediaobject>
+
</figure>
-
-<!-- <para>
+ <!--<para>
Fedora includes support for more than one keyboard layout for many languages. In particular, most European languages include a <literal>latin1</literal> option, which uses <firstterm>dead keys</firstterm> to access certain characters, such as those with diacritical marks. When you press a dead key, nothing will appear on your screen until you press another key to "complete" the character. For example, to type <literal>é</literal> on a latin1 keyboard layout, you would press (and release) the <keycap>'</keycap> key, and then press the <literal>E</literal> key. By contrast, you access this character on some other keyboards by pressing and holding down a key (such as <keycap>Alt-Gr</keycap>) while you press the <literal>E</literal> key. Other keyboards might have a dedicated key for this character.
- </para> -->
-
-<!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Key_Board_Configuration_x86_ppc-para-2.xml"/> -->
- <!-- Actually, despite the name, this is a tip.
+ </para>
+ <xi:include href="Key_Board_Configuration_x86_ppc-para-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> -->
+ <!-- Actually, despite the name, this is a tip.
- To change your keyboard layout type after you have completed... -->
-</section>
\ No newline at end of file
+ To change your keyboard layout type after you have completed... -->
+</section>
+
+
diff --git a/en-US/Language_Selection.xml b/en-US/Language_Selection.xml
new file mode 100644
index 0000000..bb09280
--- /dev/null
+++ b/en-US/Language_Selection.xml
@@ -0,0 +1,63 @@
+<?xml version='1.0'?>
+<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docarticle/xml/4.5/docarticlex.dtd" [
+]>
+
+<section id="Language_Selection.xml">
+ <title>Language Selection</title>
+
+ <para>
+ After the ten-second countdown, your computer loads the Fedora live system desktop. You will see a menu bar at the top of the screen.
+ </para>
+
+ <figure float="0" id="fig-livedesktop-initial"><title>The Fedora Live desktop</title>
+ <mediaobject>
+ <imageobject><imagedata fileref="images/livedesktop/livedesktop-initial.png" format="PNG"/></imageobject>
+ <textobject><para>
+ The desktop of the Fedora live system.
+ </para>
+ </textobject>
+ </mediaobject>
+ </figure>
+
+ <para>
+ The default language for the installation process is English. If you do not need to change the language, proceed to <xref linkend="Fedora_Live_Desktop" />
+ </para>
+ <para>
+ To select another language:
+ </para>
+
+ <procedure>
+ <step>
+ <para>
+ Click <guilabel>Live System User</guilabel> in the menu bar.
+ </para>
+ </step>
+ <step>
+ <para>
+ Select <guilabel>System Settings</guilabel>.
+ </para>
+ </step>
+ <step>
+ <para>
+ Select <guilabel>Region and Language</guilabel>.
+ </para>
+ </step>
+ <step>
+ <para>
+ Select your preferred language. If it is not listed, click on the <guilabel>+</guilabel> button. Either select from the list or search, then press <guilabel>Select</guilabel>.
+ </para>
+ </step>
+ <step>
+ <para>
+ Close the <guilabel>Region and Language</guilabel> window and select <guilabel>Log Out</guilabel> from the <guilabel>Live System User</guilabel> menu.
+ </para>
+ </step>
+ <step>
+ <para>
+ Log back in. No password is required. The desktop will now be presented in your selected language.
+ </para>
+ </step>
+ </procedure>
+
+
+</section>
diff --git a/en-US/Package_Selection-Live.xml b/en-US/Package_Selection-Live.xml
new file mode 100644
index 0000000..713b4d2
--- /dev/null
+++ b/en-US/Package_Selection-Live.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+
+<!-- TEXT HERE IS FROM Package_Selection_common-note-1 -->
+
+<section id="s1-pkgselection-x86">
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Package_Selection_common-title-1.xml"/>
+ <!-- Package Group Selection -->
+
+ <para>If you install from a Fedora Live image, you cannot make
+ package selections. This installation method transfers a copy of
+ the Live image rather than installing packages from a repository.
+ To change the package selection, complete the installation, then
+ use the <application>Add/Remove Software</application> application
+ to make desired changes.</para>
+
+ <para>
+ If you are installing Fedora from a DVD, refer to <xref linkend="ap-pkgselection-dvd"/> for details of package selection.
+ </para>
+
+</section>
\ No newline at end of file
diff --git a/en-US/Package_Selection-x86.xml b/en-US/Package_Selection-x86.xml
index a87f8f0..c6c210f 100644
--- a/en-US/Package_Selection-x86.xml
+++ b/en-US/Package_Selection-x86.xml
@@ -1,23 +1,51 @@
-<?xml version="1.0"?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Quick_Start_Guide.ent">
+%BOOK_ENTITIES;
]>
-
-<!-- TEXT HERE IS FROM Package_Selection_common-note-1 -->
-
<section id="s1-pkgselection-x86">
+ <xi:include href="Package_Selection_common-title-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- Package Group Selection --> <!-- Begin Index terms --> <!-- <xi:include href="Package_Selection_common-indexterm-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="Package_Selection_common-indexterm-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="Package_Selection_common-indexterm-3.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="Package_Selection_common-indexterm-4.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="Package_Selection_common-indexterm-5.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="Package_Selection_common-indexterm-6.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> -->
+ <!-- End Index terms -->
+
+ <xi:include href="Package_Selection_common-note-3.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- You will not see this screen if you are installing Fedora from the Live CD -->
+ <!-- <xi:include href="Package_Selection_common-para-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> -->
+ <!-- Now that you have made most of the choices.. --> <xi:include href="Package_Selection_common-para-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- The Package Installation Defaults screen... --> <!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Package_Selection_common-note-1.xml"/> --> <!-- Fedora --> <!-- Installing from a Live Image --> <!-- <xi:include href="Package_Selection_common-note-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> -->
+ <!-- Installing in text mode --> <figure float="0" id="fig-pkgselection-group-x86">
+ <title>Package Group Selection</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/pkgselection/pkg-group.png" format="PNG" width="444" />
+ </imageobject>
+ <textobject>
+ <xi:include href="Package_Selection_common-imagecap-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- Choose which package groups you want to install. -->
+ </textobject>
+
+ </mediaobject>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Package_Selection_common-title-1.xml"/>
- <!-- Package Group Selection -->
-
- <para>If you install from a Fedora Live image, you cannot make
- package selections. This installation method transfers a copy of
- the Live image rather than installing packages from a repository.
- To change the package selection, complete the installation, then
- use the <application>Add/Remove Software</application> application
- to make desired changes.</para>
-
- <para>
- If you are installing Fedora from a DVD or set of six CDs, refer to <xref linkend="ap-pkgselection-dvd"/> for details of package selection.
+ </figure>
+ <xi:include href="Package_Selection_common-para-7.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- By default, the Fedora Installation process loads... --> <xi:include href="Package_Selection_common-list-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- Office and Productivity
+ Software Development
+ Web server --> <!-- <para>
+ If you choose to accept the current package list, skip ahead to <xref linkend="s1-installpkgs-x86" />.
</para>
-
-</section>
\ No newline at end of file
+ <para>
+ To select a component, click on the checkbox beside it (refer to <xref linkend="fig-pkgselection-group-x86" />).
+ </para> -->
+ <xi:include href="Package_Selection_common-para-3.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- To customize your package set further, select... --> <!-- <xi:include href="Package_Selection_Repositories-x86.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> -->
+ <!-- You can define additional repositories to increase the software... --> <xi:include href="Package_Selection_Customizing-x86.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- Select Customize now to specify the software packages for your final... --> <!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Package_Selection_common-para-5.xml"/> --> <!-- Select each component you wish to install. Selecting... --> <!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Package_Selection_common-para-6.xml"/> --> <!-- Once a package group has been selected, click on... -->
+</section>
+
+
diff --git a/en-US/Package_Selection_Customizing-common-figure-1.xml b/en-US/Package_Selection_Customizing-common-figure-1.xml
new file mode 100644
index 0000000..8b0556f
--- /dev/null
+++ b/en-US/Package_Selection_Customizing-common-figure-1.xml
@@ -0,0 +1,19 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE figure PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Quick_Start_Guide.ent">
+%BOOK_ENTITIES;
+]>
+<figure float="0">
+ <title>Package Group Details</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/pkgselection/pkg-group-details.png" format="PNG" width="444" />
+ </imageobject>
+ <textobject>
+ <xi:include href="Package_Selection_common-imagecap-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- Choose to add or remove optional packages from this package group. -->
+ </textobject>
+
+ </mediaobject>
+</figure>
+
diff --git a/en-US/Package_Selection_Customizing-common-para-2.xml b/en-US/Package_Selection_Customizing-common-para-2.xml
new file mode 100644
index 0000000..4495f3e
--- /dev/null
+++ b/en-US/Package_Selection_Customizing-common-para-2.xml
@@ -0,0 +1,14 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Quick_Start_Guide.ent">
+%BOOK_ENTITIES;
+]>
+<para>
+ Fedora divides the included software into
+ <indexterm>
+ <primary>package groups</primary>
+
+ </indexterm>
+ <firstterm>package groups</firstterm>. For ease of use, the package selection screen displays these groups as categories.
+</para>
+
diff --git a/en-US/Package_Selection_Customizing-common-para-4.xml b/en-US/Package_Selection_Customizing-common-para-4.xml
new file mode 100644
index 0000000..7c7441d
--- /dev/null
+++ b/en-US/Package_Selection_Customizing-common-para-4.xml
@@ -0,0 +1,9 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Quick_Start_Guide.ent">
+%BOOK_ENTITIES;
+]>
+<para>
+ To specify a package group for installation, select the check box next to the group. The box at the bottom of the screen displays the details of the package group that is currently highlighted. <emphasis>None</emphasis> of the packages from a group will be installed unless the check box for that group is selected.
+</para>
+
diff --git a/en-US/Package_Selection_Customizing-common-para-6.xml b/en-US/Package_Selection_Customizing-common-para-6.xml
new file mode 100644
index 0000000..7edcd46
--- /dev/null
+++ b/en-US/Package_Selection_Customizing-common-para-6.xml
@@ -0,0 +1,9 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Quick_Start_Guide.ent">
+%BOOK_ENTITIES;
+]>
+<para>
+ After you choose the desired packages, select <guilabel>Next</guilabel> to proceed. The installer checks your selection, and automatically adds any extra packages required to use the software you selected. When you have finished selecting packages, click <guilabel>Close</guilabel> to save your optional package selections and return to the main package selection screen.
+</para>
+
diff --git a/en-US/Package_Selection_Customizing-common-title-1.xml b/en-US/Package_Selection_Customizing-common-title-1.xml
new file mode 100644
index 0000000..7c526b2
--- /dev/null
+++ b/en-US/Package_Selection_Customizing-common-title-1.xml
@@ -0,0 +1,7 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE title PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Quick_Start_Guide.ent">
+%BOOK_ENTITIES;
+]>
+<title> Customizing the Software Selection </title>
+
diff --git a/en-US/Package_Selection_Customizing-x86.xml b/en-US/Package_Selection_Customizing-x86.xml
index aee25f3..a65f56e 100644
--- a/en-US/Package_Selection_Customizing-x86.xml
+++ b/en-US/Package_Selection_Customizing-x86.xml
@@ -1,186 +1,33 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
- "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Quick_Start_Guide.ent">
+%BOOK_ENTITIES;
]>
-
- <section id="sn-package-selection">
- <title>Customizing the Software Selection</title>
-<!-- <para>
- Select <guilabel>Customize now</guilabel> to specify the software
- packages for your final system in more detail. This option causes
- the installation process to display an additional customization
- screen when you select <guibutton>Next</guibutton>.
- </para>
- <note>
- <title>Installing Support for Additional Languages</title>
-
- <para>
- Select <guilabel>Customize now</guilabel> to install support for
- additional languages. Refer to <xref
- linkend="sn-lang-packages"/> for more information on
- configuring language support.
- </para>
- </note> -->
-
- <figure float="0" id="fig-pkgselection-details-x86"><title>Package Group Details</title>
- <mediaobject>
- <imageobject><imagedata fileref="images/pkgselection/pkg-group-details.png" format="PNG"/></imageobject>
- <textobject>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Package_Selection_common-imagecap-2.xml"/>
- <!-- Choose to add or remove optional packages from this package group. -->
- </textobject>
- </mediaobject>
- </figure>
-
-
- <para>
- Fedora divides the included software into
- <indexterm>
- <primary>package groups</primary>
- </indexterm> <firstterm>package groups</firstterm>. For ease of
- use, the package selection screen displays these groups as
- categories.
- </para>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Package_Selection_common-para-4.xml"/>
- <!-- You can select package groups, which group components... -->
-
-<!-- <para>
- To view the package groups for a category, select the category
- from the list on the left. The list on the right displays the
- package groups for the currently selected category.
- </para>
-
- <para>
- To specify a package group for installation, select the check box
- next to the group. The box at the bottom of the screen displays
- the details of the package group that is currently highlighted.
- <emphasis>None</emphasis> of the packages from a group will be
- installed unless the check box for that group is selected.
- </para>
-
- <para>
- If you select a package group, Fedora automatically installs the
- base and mandatory packages for that group. To change which
- optional packages within a selected group will be installed,
- select the <guibutton>Optional Packages</guibutton> button under
- the description of the group. Then use the check box next to an
- individual package name to change its selection.
- </para> -->
- <para>
- After you choose the desired packages, select
- <guilabel>Next</guilabel> to proceed. Fedora checks your selection,
- and automatically adds any extra packages required to use the
- software you select. When you have finished selecting packages, click
- <guilabel>Close</guilabel> to save your optional package selections and
- return to the main package
- selection screen.
- </para>
-<!-- <section id="sn-changing-selection">
- <title>Changing Your Mind</title>
- <para>
- The packages that you select are not permanent. After you boot
- your system, use the <application>Add/Remove Software</application> tool to
- either install new software or remove installed packages. To run
- this tool, from the main menu, select <menuchoice>
- <guimenu>System</guimenu>
- <guisubmenu>Administration</guisubmenu>
- <guimenuitem>Add/Remove Software</guimenuitem>
- </menuchoice>. The Fedora software management system downloads
- the latest packages from network servers, rather than using
- those on the installation discs.
- </para>
- </section>
- <section id="sn-lang-packages">
- <title>Additional Language Support</title>
-
- <para>
- Your Fedora system automatically supports the language that you
- selected at the start of the installation process. To include
- support for additional languages, select the package group for
- those languages from the <guilabel>Languages</guilabel>
- category.
- </para>
-
- </section>
- <section id="sn-mandatory-services">
- <title>Core Network Services</title>
-
- <para>
- All Fedora installations include the following network
- services:
- </para>
-
- <itemizedlist>
- <listitem>
- <para>
- centralized logging through syslog
- </para>
- </listitem>
- <listitem>
- <para>
- email through SMTP (Simple Mail Transfer Protocol)
- </para>
- </listitem>
- <listitem>
- <para>
- network file sharing through NFS (Network File System)
- </para>
- </listitem>
- <listitem>
- <para>
- remote access through SSH (Secure SHell)
- </para>
- </listitem>
- <listitem>
- <para>
- resource advertising through mDNS (multicast DNS)
- </para>
- </listitem>
- </itemizedlist>
-
- <para>
- The default installation also provides:
- </para>
-
- <itemizedlist>
- <listitem>
- <para>
- network file transfer through HTTP (HyperText Transfer
- Protocol)
- </para>
- </listitem>
- <listitem>
- <para>
- printing through CUPS (Common UNIX Printing System)
- </para>
- </listitem>
- <listitem>
- <para>
- remote desktop access through VNC (Virtual Network
- Computing)
- </para>
- </listitem>
- </itemizedlist>
-
- <para>
- Some automated processes on your Fedora system use the email
- service to send reports and messages to the system
- administrator. By default, the email, logging, and printing
- services do not accept connections from other systems. Fedora
- installs the NFS sharing, HTTP, and VNC components without
- enabling those services.
- </para>
-
- <para>
- You may configure your Fedora system after installation to offer
- email, file sharing, logging, printing and remote desktop access
- services. The SSH service is enabled by default. You may use NFS
- to access files on other systems without enabling the NFS
- sharing service.
- </para>
- </section> -->
- </section>
+<section id="sn-package-selection-x86">
+ <xi:include href="Package_Selection_Customizing-common-title-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- Customizing the Software Selection --> <!-- <xi:include href="Package_Selection_Customizing-common-note-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> -->
+ <!-- Your Fedora system automatically supports the language that you selected at the start of the installation process. --> <!-- <xi:include href="Package_Selection_Customizing-common-para-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> -->
+ <!-- Select Customize now to specify the software packages for your final system in more detail. --> <xi:include href="Package_Selection_Customizing-common-figure-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- Package Group Details --> <xi:include href="Package_Selection_Customizing-common-para-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- Fedora divides the included software into package groups --> <xi:include href="Package_Selection_common-para-4.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- You can select package groups, which group components... --> <!-- <xi:include href="Package_Selection_Customizing-common-para-3.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> -->
+ <!-- To view the package groups for a category, select the category from the list on the left. --> <!-- <xi:include href="Package_Selection_Customizing-common-para-4.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> -->
+ <!-- To specify a package group for installation, select the check box next to the group. --> <!-- <xi:include href="Package_Selection_Customizing-common-para-5.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> -->
+ <!-- If you select a package group, Fedora automatically installs the base and mandatory packages for that group. --> <!-- <xi:include href="Package_Selection_Customizing-common-para-12.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> -->
+ <!-- In the package selection list on the right, you can use the context menu as a shortcut --> <!-- <xi:include href="Package_Selection_Customizing-common-figure-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> -->
+ <!-- Package Group Context Menu --> <xi:include href="Package_Selection_Customizing-common-para-6.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- After you choose the desired packages, select Next to proceed. --> <!-- <xi:include href="Package_Selection_Customizing-common-para-7.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> -->
+ <!-- The packages that you select are not permanent. After you boot your system, use the Add/Remove Software tool to either install new software or remove installed packages. --> <!-- <section id="sn-mandatory-services-x86">
+ <xi:include href="Package_Selection_Customizing-common-title-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> -->
+ <!-- Core Network Services --> <!-- <xi:include href="Package_Selection_Customizing-common-para-8.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> -->
+ <!-- All Fedora installations include the following network services: --> <!-- <xi:include href="Package_Selection_Customizing-common-itemizedlist-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> -->
+ <!-- centralized logging through syslog --> <!-- xi:include href="Package_Selection_Customizing-common-para-9.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> -->
+ <!-- The default installation also provides: --> <!-- <xi:include href="Package_Selection_Customizing-common-itemizedlist-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> -->
+ <!-- network file transfer through HTTP (HyperText Transfer Protocol) --> <!-- <xi:include href="Package_Selection_Customizing-common-para-10.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> -->
+ <!-- Some automated processes on your Fedora system use the email service to send reports and messages to the system administrator. --> <!-- <xi:include href="Package_Selection_Customizing-common-para-11.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> -->
+ <!-- You may configure your Fedora system after installation to offer email, file sharing, logging, printing and remote desktop access services. -->
+ <!-- </section> -->
+
+</section>
diff --git a/en-US/Package_Selection_common-imagecap-1.xml b/en-US/Package_Selection_common-imagecap-1.xml
index 72fcd39..0440985 100644
--- a/en-US/Package_Selection_common-imagecap-1.xml
+++ b/en-US/Package_Selection_common-imagecap-1.xml
@@ -1,10 +1,9 @@
-<?xml version="1.0"?>
-<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
-
-
-
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Quick_Start_Guide.ent">
+%BOOK_ENTITIES;
]>
-
<para>
Choose which package groups you want to install.
-</para>
\ No newline at end of file
+</para>
+
diff --git a/en-US/Package_Selection_common-list-1.xml b/en-US/Package_Selection_common-list-1.xml
index b1677a8..12647d3 100644
--- a/en-US/Package_Selection_common-list-1.xml
+++ b/en-US/Package_Selection_common-list-1.xml
@@ -4,34 +4,60 @@
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
]>
- <variablelist>
- <varlistentry>
- <term>Office and Productivity</term>
- <listitem>
- <para>
- This option provides the OpenOffice.org productivity suite,
- the Planner project management application, graphical tools
- such as the GIMP, and multimedia applications.
- </para>
- </listitem>
- </varlistentry>
+<variablelist>
+ <!--<varlistentry>
+ <term>Basic Server</term>
+ <listitem>
+ <para>
+ This option provides a basic installation of Red Hat Enterprise Linux for use on a server.
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>Database Server</term>
+ <listitem>
+ <para>
+ This option provides the <application>MySQL</application> and <application>PostgreSQL</application> databases.
+ </para>
+ </listitem>
+ </varlistentry> -->
+
+ <varlistentry>
+ <term>Graphical Desktop</term>
+ <listitem>
+ <para>
+ This option provides the <application>OpenOffice.org</application> productivity suite, graphical tools such as the <application>GIMP</application>, and multimedia applications.
+ </para>
+ </listitem>
+ </varlistentry>
- <varlistentry>
- <term>Software Development</term>
- <listitem>
- <para>
- This option provides the necessary tools to compile software
- on your Fedora system.
- </para>
- </listitem>
- </varlistentry>
+ <varlistentry>
+ <term>Software Development</term>
+ <listitem>
+ <para>
+ This option provides the necessary tools to compile software on your Fedora system.
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>Web server</term>
+ <listitem>
+ <para>
+ This option provides the <application>Apache</application> web server.
+ </para>
+ </listitem>
+ </varlistentry>
+
+
+ <varlistentry>
+ <term>Minimal</term>
+ <listitem>
+ <para>
+ This option provides only the packages essential to run Fedora. A minimal installation provides the basis for a single-purpose server or desktop appliance and maximizes performance and security on such an installation.
+ </para>
+ </listitem>
+ </varlistentry>
+</variablelist>
- <varlistentry>
- <term>Web server</term>
- <listitem>
- <para>
- This option provides the Apache Web server.
- </para>
- </listitem>
- </varlistentry>
- </variablelist>
diff --git a/en-US/Package_Selection_common-note-3.xml b/en-US/Package_Selection_common-note-3.xml
new file mode 100644
index 0000000..82e4620
--- /dev/null
+++ b/en-US/Package_Selection_common-note-3.xml
@@ -0,0 +1,12 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE important PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Quick_Start_Guide.ent">
+%BOOK_ENTITIES;
+]>
+<note>
+ <title>DVD only</title>
+ <para>
+ You will not see this screen if you are installing Fedora from the live CD.
+ </para>
+ </note>
+
diff --git a/en-US/Package_Selection_common-para-2.xml b/en-US/Package_Selection_common-para-2.xml
index 2b9aeb1..46bead0 100644
--- a/en-US/Package_Selection_common-para-2.xml
+++ b/en-US/Package_Selection_common-para-2.xml
@@ -1,7 +1,9 @@
-<?xml version="1.0"?>
-<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Quick_Start_Guide.ent">
+%BOOK_ENTITIES;
]>
-
<para>
- The <guilabel>Package Installation Defaults</guilabel> screen appears and details the default package set for your Fedora installation. <!--This screen varies depending on the version of Fedora you are installing. -->
-</para>
\ No newline at end of file
+ The <guilabel>Package Installation Defaults</guilabel> screen appears and details the default package set for your Fedora installation. This screen varies depending on the version of Fedora you are installing.
+</para>
+
diff --git a/en-US/Package_Selection_common-para-3.xml b/en-US/Package_Selection_common-para-3.xml
index cd769ef..376d42a 100644
--- a/en-US/Package_Selection_common-para-3.xml
+++ b/en-US/Package_Selection_common-para-3.xml
@@ -1,10 +1,9 @@
-<?xml version="1.0"?>
-<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
-
-
-
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Quick_Start_Guide.ent">
+%BOOK_ENTITIES;
]>
-
<para>
To customize your package set further, select the <guilabel>Customize now</guilabel> option on the screen. Clicking <guibutton>Next</guibutton> takes you to the <guilabel>Package Group Selection</guilabel> screen.
-</para>
\ No newline at end of file
+</para>
+
diff --git a/en-US/Package_Selection_common-para-7.xml b/en-US/Package_Selection_common-para-7.xml
index b17de01..67dd746 100644
--- a/en-US/Package_Selection_common-para-7.xml
+++ b/en-US/Package_Selection_common-para-7.xml
@@ -1,11 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
- "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Quick_Start_Guide.ent">
+%BOOK_ENTITIES;
]>
+<para>
+ By default, the Fedora installation process loads a selection of software that is suitable for a system deployed as a basic server. Note that this installation does not include a graphical environment. To include a selection of software suitable for other roles, click the radio button that corresponds to one of the following options:
+</para>
- <para>
- By default, the Fedora installation process loads a selection of
- software that is suitable for a desktop system. To include or remove
- software for common tasks, select the relevant items from the list:
- </para>
diff --git a/en-US/Package_Selection_common-title-1.xml b/en-US/Package_Selection_common-title-1.xml
index 1a2676c..1214ee1 100644
--- a/en-US/Package_Selection_common-title-1.xml
+++ b/en-US/Package_Selection_common-title-1.xml
@@ -1,8 +1,7 @@
-<?xml version="1.0"?>
-<!DOCTYPE title PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
-
-
-
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE title PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Quick_Start_Guide.ent">
+%BOOK_ENTITIES;
]>
+<title>Package Group Selection</title>
-<title>Package Group Selection</title>
\ No newline at end of file
diff --git a/en-US/Requirements.xml b/en-US/Requirements.xml
index 2c67142..1a92276 100644
--- a/en-US/Requirements.xml
+++ b/en-US/Requirements.xml
@@ -75,7 +75,7 @@
</listitem>
<listitem>
<para>
- skip ahead to <xref linkend="sn-welcome-x86"/> if you have a Fedora &PRODVER; DVD or set of six CDs.
+ skip ahead to <xref linkend="sn-keyboard-x86"/> if you have a Fedora &PRODVER; DVD.
</para>
</listitem>
</itemizedlist>
diff --git a/en-US/Revision_History.xml b/en-US/Revision_History.xml
index a40059c..ab978fa 100644
--- a/en-US/Revision_History.xml
+++ b/en-US/Revision_History.xml
@@ -7,36 +7,15 @@
<simpara>
<revhistory>
<revision>
- <revnumber>13.1.1</revnumber>
- <date>Mon May 3 2010</date>
+ <revnumber>16.1.0</revnumber>
+ <date>Tue Dec 20 2011</date>
<author>
- <firstname>Rüdiger</firstname>
- <surname>Landmann</surname>
+ <firstname>Jack</firstname>
+ <surname>Reed</surname>
</author>
<revdescription>
<simplelist>
- <member>Re-sync files with Installation Guide</member>
- </simplelist>
- </revdescription>
- </revision>
- <revision>
- <revnumber>13.1.0</revnumber>
- <date>Sun Apr 19 2010</date>
- <author>
- <firstname>Ben</firstname>
- <surname>Cotton</surname>
- </author>
- <author>
- <firstname>Eli</firstname>
- <surname>Madrinich</surname>
- </author>
- <author>
- <firstname>David</firstname>
- <surname>Nalley</surname>
- </author>
- <revdescription>
- <simplelist>
- <member>Update for Fedora 13</member>
+ <member>Update for Fedora 16</member>
</simplelist>
</revdescription>
</revision>
diff --git a/en-US/Storage_Devices-x86.xml b/en-US/Storage_Devices-x86.xml
index 97621cb..1c24a84 100644
--- a/en-US/Storage_Devices-x86.xml
+++ b/en-US/Storage_Devices-x86.xml
@@ -1,39 +1,25 @@
-<?xml version="1.0"?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Quick_Start_Guide.ent">
+%BOOK_ENTITIES;
]>
-
<section id="Storage_Devices-x86">
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Storage_Devices_common-title.xml"/>
- <!-- Storage Devices -->
-
- <!-- Index terms -->
- <!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Storage_Devices_common-indexterm-1.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Storage_Devices_common-indexterm-2.xml"/> -->
- <!-- End Index terms -->
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Storage_Devices_common-para-1.xml"/>
- <!-- You can install Fedora on a large variety of storage devices... -->
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Storage_Devices_common-figure-1.xml"/>
- <!-- Storage devices -->
-
- <!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Storage_Devices_common-variablelist-1.xml"/> -->
- <!-- Basic Storage Devices -->
-
-<!-- the following para unique to the IQSG -->
+ <xi:include href="Storage_Devices_common-title.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- Storage Devices --> <!-- Index terms --> <!-- <xi:include href="Storage_Devices_common-indexterm-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="Storage_Devices_common-indexterm-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> -->
+ <!-- End Index terms --> <xi:include href="Storage_Devices_common-para-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- You can install Fedora on a large variety of storage devices... --> <xi:include href="Storage_Devices_common-figure-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- Storage devices -->
+ <!-- the following para unique to the IQSG -->
<para>
This quick start guide only covers installing Fedora on basic storage devices such as the hard drives and solid-state drives of typical desktop and laptop computers. Refer to the <citetitle>Fedora &PRODVER; Installation Guide</citetitle> available from <ulink url="http://docs.fedoraproject.org/"/> for details of installing Fedora on specialized storage devices.
</para>
-<!-- end unique para -->
-
- <para>
- If you select <guimenuitem>Basic Storage Devices</guimenuitem> and have only one storage device attached to your system, <application>anaconda</application> automatically detects the local storage attached to the system and does not require further input from you. Proceed to <xref linkend="sn-initialize-hdd-x86"/>.
+ <!-- end unique para -->
+ <para>
+ If you select <guimenuitem>Basic Storage Devices</guimenuitem>, <application>anaconda</application> automatically detects the local storage attached to the system and does not require further input from you. Proceed to <xref linkend="sn-initialize-hdd-x86" />.
</para>
-
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Specialized_Storage_Devices-x86.xml"/>
- <!-- Specialized Storage Devices -->
-
+ <xi:include href="Specialized_Storage_Devices-x86.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- Specialized Storage Devices -->
</section>
+
diff --git a/en-US/Time_Zone-x86.xml b/en-US/Time_Zone-x86.xml
index 4447b1f..07cd843 100644
--- a/en-US/Time_Zone-x86.xml
+++ b/en-US/Time_Zone-x86.xml
@@ -1,53 +1,27 @@
-<?xml version="1.0"?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Quick_Start_Guide.ent">
+%BOOK_ENTITIES;
]>
-
<section id="s1-timezone-x86">
+ <xi:include href="Time_Zone_common-title.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- Time Zone --> <!-- Begin Index Terms --> <!-- <xi:include href="Time_Zone_common-indexterm-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="Time_Zone_common-indexterm-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="Time_Zone_common-indexterm-3.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="Time_Zone_common-indexterm-4.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="Time_Zone_common-indexterm-5.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="Time_Zone_common-indexterm-6.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="Time_Zone_common-indexterm-7.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> -->
+ <!-- End Index Terms --> <xi:include href="Time_Zone_common-para-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- Set your time zone by selecting the city closest --> <!-- <xi:include href="Time_Zone_common-para-4.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> -->
+ <!-- Specify a time zone even if you plan to use NTP... --> <xi:include href="Time_Zone_common-para-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- From here there are two ways for you to select your time zone: --> <xi:include href="Time_Zone_common-itemizedlist-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- Using your mouse, click on the interactive map to select a specific city --> <xi:include href="Time_Zone_common-figure-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- Time zone configuration screen. --> <!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Time_Zone_common-para-3.xml"/> --> <!-- Select System Clock uses UTC if you know that your system is set to UTC. --> <!-- <xi:include href="Time_Zone_common-para-5.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> -->
+ <!-- If Fedora is the only operating system on your computer, --> <!-- <xi:include href="Time_Zone_common-para-6.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> -->
+ <!-- Select Next to proceed --> <!-- <xi:include href="Time_Zone_common-note-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> -->
+ <!-- Windows and the System Clock --> <!-- <xi:include href="Time_Zone_common-tip-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> -->
+ <!-- To change your time zone configuration after you have completed the installation, -->
+</section>
+
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Time_Zone_common-title.xml"/>
- <!-- Time Zone -->
-
- <!-- Begin Index Terms -->
-<!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Time_Zone_common-indexterm-1.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Time_Zone_common-indexterm-2.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Time_Zone_common-indexterm-3.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Time_Zone_common-indexterm-4.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Time_Zone_common-indexterm-5.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Time_Zone_common-indexterm-6.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Time_Zone_common-indexterm-7.xml"/> -->
- <!-- End Index Terms -->
-
-<!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Time_Zone_common-para-4.xml"/> -->
- <!-- Specify a time zone even if you plan to use NTP... -->
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Time_Zone_common-para-1.xml"/>
- <!-- Set your time zone by selecting the city closest -->
-
-<!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Time_Zone_common-para-4.xml"/> -->
- <!-- Specify a time zone even if you plan to use NTP... -->
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Time_Zone_common-para-2.xml"/>
- <!-- From here there are two ways for you to select your time zone: -->
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Time_Zone_common-itemizedlist-1.xml"/>
- <!-- Using your mouse, click on the interactive map to select a specific city -->
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Time_Zone_common-figure-1.xml"/>
- <!-- Time zone configuration screen. -->
-
- <!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Time_Zone_common-para-3.xml"/> -->
- <!-- Select System Clock uses UTC if you know that your system is set to UTC. -->
-
-<!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Time_Zone_common-para-5.xml"/> -->
- <!-- If Fedora is the only operating system on your computer, -->
-
-<!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Time_Zone_common-note-1.xml"/> -->
- <!-- Windows and the System Clock -->
-
-<!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Time_Zone_common-tip-1.xml"/> -->
- <!-- To change your time zone configuration after you have completed the installation, -->
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Time_Zone_common-para-6.xml"/>
- <!-- Select Next to proceed -->
-
-</section>
\ No newline at end of file
diff --git a/en-US/Time_Zone_common-figure-1.xml b/en-US/Time_Zone_common-figure-1.xml
index d12cffa..e83784a 100644
--- a/en-US/Time_Zone_common-figure-1.xml
+++ b/en-US/Time_Zone_common-figure-1.xml
@@ -1,13 +1,21 @@
-<?xml version="1.0"?>
-<!DOCTYPE figure PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE figure PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Quick_Start_Guide.ent">
+%BOOK_ENTITIES;
]>
-
-<figure float="0"><title>Configuring the Time Zone</title>
- <mediaobject>
- <imageobject><imagedata fileref="images/timezone/timezone.png" format="PNG"/></imageobject>
- <textobject><para>
+<figure float="0">
+ <title>Configuring the Time Zone</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/timezone/timezone.png" format="PNG" width="444" />
+ </imageobject>
+ <textobject>
+ <para>
Time zone configuration screen.
</para>
+
</textobject>
+
</mediaobject>
-</figure>
\ No newline at end of file
+</figure>
+
diff --git a/en-US/Time_Zone_common-itemizedlist-1.xml b/en-US/Time_Zone_common-itemizedlist-1.xml
index 5f74d5a..00f3cd0 100644
--- a/en-US/Time_Zone_common-itemizedlist-1.xml
+++ b/en-US/Time_Zone_common-itemizedlist-1.xml
@@ -1,20 +1,20 @@
-<?xml version="1.0"?>
-<!DOCTYPE itemizedlist PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
-
-
-
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE itemizedlist PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Quick_Start_Guide.ent">
+%BOOK_ENTITIES;
]>
-
<itemizedlist>
<listitem>
<para>
Using your mouse, click on the interactive map to select a specific city (represented by a yellow dot). A red <guilabel>X</guilabel> appears indicating your selection.
</para>
+
</listitem>
-
- <listitem>
+ <listitem>
<para>
You can also scroll through the list at the bottom of the screen to select your time zone. Using your mouse, click on a location to highlight your selection.
</para>
+
</listitem>
-</itemizedlist>
\ No newline at end of file
+</itemizedlist>
+
diff --git a/en-US/Time_Zone_common-para-1.xml b/en-US/Time_Zone_common-para-1.xml
index b1bec59..7e0502b 100644
--- a/en-US/Time_Zone_common-para-1.xml
+++ b/en-US/Time_Zone_common-para-1.xml
@@ -1,10 +1,9 @@
-<?xml version="1.0"?>
-<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
-
-
-
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Quick_Start_Guide.ent">
+%BOOK_ENTITIES;
]>
-
<para>
Set your time zone by selecting the city closest to your computer's physical location. Click on the map to zoom in to a particular geographical region of the world.
-</para>
\ No newline at end of file
+</para>
+
diff --git a/en-US/Time_Zone_common-para-2.xml b/en-US/Time_Zone_common-para-2.xml
index ec87f69..670e831 100644
--- a/en-US/Time_Zone_common-para-2.xml
+++ b/en-US/Time_Zone_common-para-2.xml
@@ -1,10 +1,9 @@
-<?xml version="1.0"?>
-<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
-
-
-
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Quick_Start_Guide.ent">
+%BOOK_ENTITIES;
]>
-
<para>
From here there are two ways for you to select your time zone:
-</para>
\ No newline at end of file
+</para>
+
diff --git a/en-US/Time_Zone_common-title.xml b/en-US/Time_Zone_common-title.xml
index fed8ad5..dc4aea1 100644
--- a/en-US/Time_Zone_common-title.xml
+++ b/en-US/Time_Zone_common-title.xml
@@ -1,5 +1,7 @@
-<?xml version="1.0"?>
-<!DOCTYPE title PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE title PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Quick_Start_Guide.ent">
+%BOOK_ENTITIES;
]>
+<title>Time Zone Configuration</title>
-<title>Time Zone Configuration</title>
\ No newline at end of file
diff --git a/en-US/Upgrading-common-figure-1.xml b/en-US/Upgrading-common-figure-1.xml
new file mode 100644
index 0000000..3a3972a
--- /dev/null
+++ b/en-US/Upgrading-common-figure-1.xml
@@ -0,0 +1,21 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE figure PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Quick_Start_Guide.ent">
+%BOOK_ENTITIES;
+]>
+<figure float="0">
+ <title>The Upgrade Dialog</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/upgrading/upgrading.png" format="PNG" width="444" />
+ </imageobject>
+ <textobject>
+ <para>
+ The Upgrade Dialog
+ </para>
+
+ </textobject>
+
+ </mediaobject>
+</figure>
+
diff --git a/en-US/Upgrading-common-para-3.xml b/en-US/Upgrading-common-para-3.xml
new file mode 100644
index 0000000..5116549
--- /dev/null
+++ b/en-US/Upgrading-common-para-3.xml
@@ -0,0 +1,9 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Quick_Start_Guide.ent">
+%BOOK_ENTITIES;
+]>
+<para>
+ If your system contains a Fedora installation, a dialog appears asking whether you want to upgrade that installation. To perform an upgrade of an existing system, choose the appropriate installation from the drop-down list and select <guibutton>Next</guibutton>.
+</para>
+
diff --git a/en-US/Upgrading-common-title-1.xml b/en-US/Upgrading-common-title-1.xml
new file mode 100644
index 0000000..8d5876a
--- /dev/null
+++ b/en-US/Upgrading-common-title-1.xml
@@ -0,0 +1,7 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE title PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Quick_Start_Guide.ent">
+%BOOK_ENTITIES;
+]>
+<title> Upgrading an Existing System </title>
+
diff --git a/en-US/Upgrading-x86.xml b/en-US/Upgrading-x86.xml
new file mode 100644
index 0000000..70af3d8
--- /dev/null
+++ b/en-US/Upgrading-x86.xml
@@ -0,0 +1,66 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Quick_Start_Guide.ent">
+%BOOK_ENTITIES;
+]>
+<section id="sn-upgrading-system-x86">
+ <xi:include href="Upgrading-common-title-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- Upgrading an existing system -->
+ <!-- <note>
+ <title>Preupgrade</title>
+ <para>
+ Fedora includes <application>preupgrade</application>, a command-line tool that allows you to upgrade easily to a new version from within your existing Fedora installation.
+ </para>
+ </note><xi:include href="Upgrading-common-para-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> -->
+ <!-- The installation system automatically detects any existing installation of Fedora. --> <!-- <xi:include href="Upgrading-common-para-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> -->
+ <!-- Note that the installation medium that you are using might not contain all the software packages that you need to upgrade your computer. --> <!-- <section id="sn-upgrade-examine-x86">
+ <xi:include href="Upgrading-common-title-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> -->
+ <!-- The Upgrade Dialog --> <xi:include href="Upgrading-common-para-3.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- If your system contains a Fedora installation... --> <xi:include href="Upgrading-common-figure-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- The Upgrade Dialog --> <!-- <xi:include href="Upgrading-common-note-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> -->
+ <!-- Manually Installed Software -->
+ <!-- </section>
+
+ <section id="sn-upgrade-tree-x86">
+ <xi:include href="Upgrading-common-title-3.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> -->
+ <!-- Upgrading Using the Installer --> <!-- <xi:include href="Upgrading-common-note-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> -->
+ <!-- Installations are Recommended --> <!-- <xi:include href="Upgrading-common-para-4.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> -->
+ <!-- If you choose to upgrade your system using the installation program... --> <!-- <xi:include href="Upgrading-common-screen-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="Upgrading-common-para-5.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> -->
+ <!-- After installation, consult this list to discover which packages you may need to rebuild or retrieve... --> <!-- <xi:include href="Upgrading-common-para-6.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> -->
+ <!-- Next, make a backup of any system configuration data: --> <!-- <xi:include href="Upgrading-common-screen-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="Upgrading-common-para-7.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> -->
+ <!-- Make a complete backup of any important data before performing an upgrade. --> <!-- <xi:include href="Upgrading-common-warning-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> -->
+ <!-- Storing Backups --> <!-- <xi:include href="Upgrading-common-para-8.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> -->
+ <!-- For more information on completing the upgrade process later... -->
+ <!-- </section>
+
+ <section id="sn-upgrading-bootloader-x86">
+ <xi:include href="Upgrading-common-title-4.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> -->
+ <!-- Upgrading Boot Loader Configuration --> <!-- <xi:include href="Upgrading-common-indexterm-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <indexterm>
+ <primary>boot loader</primary>
+ <seealso>GRUB</seealso>
+
+ </indexterm>
+ <para>
+ Your completed Fedora installation must be registered in the <firstterm>boot loader</firstterm> to boot properly. A boot loader is software on your machine that locates and starts the operating system. Refer to <xref linkend="ch-grub" /> for more information about boot loaders.
+ </para>
+ <xi:include href="Upgrading-common-figure-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> -->
+ <!-- The Update Boot Loader Dialog --> <!-- <xi:include href="Upgrading-common-para-9.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> -->
+ <!-- If the existing boot loader was installed by a Linux distribution... --> <!-- <para>
+ <firstterm>GRUB</firstterm> is the standard boot loader for Fedora on 32-bit and 64-bit x86 architectures. If your machine uses another boot loader, such as BootMagic, System Commander, or the loader installed by Microsoft Windows, then the Fedora installation system cannot update it. In this case, select <guilabel>Skip boot loader updating</guilabel>. When the installation process completes, refer to the documentation for your product for assistance.
+ </para>
+ <para>
+ Install a new boot loader as part of an upgrade process only if you are certain you want to replace the existing boot loader. If you install a new boot loader, you may not be able to boot other operating systems on the same machine until you have configured the new boot loader. Select <guilabel>Create new boot loader configuration</guilabel> to remove the existing boot loader and install GRUB.
+ </para>
+ <para>
+ After you make your selection, click <guibutton>Next</guibutton> to continue. If you selected the <guilabel>Create new boot loader configuration</guilabel> option, refer to <xref linkend="s1-x86-bootloader" />. If you chose to update or skip boot loader configuration, installation continues without further input from you.
+ </para>
+
+ </section> -->
+
+
+</section>
+
+
diff --git a/en-US/Warning_boot_partition_64bit.xml b/en-US/Warning_boot_partition_64bit.xml
new file mode 100644
index 0000000..ffc908d
--- /dev/null
+++ b/en-US/Warning_boot_partition_64bit.xml
@@ -0,0 +1,12 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE important PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Quick_Start_Guide.ent">
+%BOOK_ENTITIES;
+]>
+<warning>
+ <title>Warning</title>
+ <para>
+ If your 64-bit x86 system uses UEFI instead of BIOS, you will need to manually create a /boot partition. This partition must have an ext3 file system. If you choose to partition automatically, your system will not boot.
+ </para>
+</warning>
+
diff --git a/en-US/Write_changes_to_disk_common-figure-1.xml b/en-US/Write_changes_to_disk_common-figure-1.xml
new file mode 100644
index 0000000..1213043
--- /dev/null
+++ b/en-US/Write_changes_to_disk_common-figure-1.xml
@@ -0,0 +1,21 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE figure PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Quick_Start_Guide.ent">
+%BOOK_ENTITIES;
+]>
+<figure float="0">
+ <title>Writing storage configuration to disk</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/diskpartitioning/write_changes.png" format="PNG" />
+ </imageobject>
+ <textobject>
+ <para>
+ The <guilabel>Writing storage configuration to disk</guilabel> dialog box lets you choose to <guibutton>Write changes to disk</guibutton> or to <guibutton>Go back</guibutton>.
+ </para>
+
+ </textobject>
+
+ </mediaobject>
+</figure>
+
diff --git a/en-US/Write_changes_to_disk_common-para-1.xml b/en-US/Write_changes_to_disk_common-para-1.xml
new file mode 100644
index 0000000..3d38d2c
--- /dev/null
+++ b/en-US/Write_changes_to_disk_common-para-1.xml
@@ -0,0 +1,9 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Quick_Start_Guide.ent">
+%BOOK_ENTITIES;
+]>
+<para>
+ The installer prompts you to confirm the partitioning options that you selected. Click <guibutton>Write changes to disk</guibutton> to allow the installer to partition your hard drive and install Fedora.
+</para>
+
diff --git a/en-US/Write_changes_to_disk_common-para-2.xml b/en-US/Write_changes_to_disk_common-para-2.xml
new file mode 100644
index 0000000..669933a
--- /dev/null
+++ b/en-US/Write_changes_to_disk_common-para-2.xml
@@ -0,0 +1,9 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Quick_Start_Guide.ent">
+%BOOK_ENTITIES;
+]>
+<para>
+ If you are certain that you want to proceed, click <guibutton>Write changes to disk</guibutton>.
+</para>
+
diff --git a/en-US/Write_changes_to_disk_common-para-3.xml b/en-US/Write_changes_to_disk_common-para-3.xml
new file mode 100644
index 0000000..6f1554b
--- /dev/null
+++ b/en-US/Write_changes_to_disk_common-para-3.xml
@@ -0,0 +1,9 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Quick_Start_Guide.ent">
+%BOOK_ENTITIES;
+]>
+<para>
+ Up to this point in the installation process, the installer has made no lasting changes to your computer. When you click <guibutton>Write changes to disk</guibutton>, the installer will allocate space on your hard drive and start to transfer Fedora into this space. Depending on the partitioning option that you chose, this process might include erasing data that already exists on your computer.
+</para>
+
diff --git a/en-US/Write_changes_to_disk_common-para-5.xml b/en-US/Write_changes_to_disk_common-para-5.xml
new file mode 100644
index 0000000..401157d
--- /dev/null
+++ b/en-US/Write_changes_to_disk_common-para-5.xml
@@ -0,0 +1,9 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Quick_Start_Guide.ent">
+%BOOK_ENTITIES;
+]>
+<para>
+ After you click <guibutton>Write changes to disk</guibutton>, allow the installation process to complete. If the process is interrupted (for example, by you switching off or resetting the computer, or by a power outage) you will probably not be able to use your computer until you restart and complete the Fedora installation process, or install a different operating system.
+</para>
+
diff --git a/en-US/Write_changes_to_disk_common-title-1.xml b/en-US/Write_changes_to_disk_common-title-1.xml
new file mode 100644
index 0000000..1438862
--- /dev/null
+++ b/en-US/Write_changes_to_disk_common-title-1.xml
@@ -0,0 +1,7 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE title PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Quick_Start_Guide.ent">
+%BOOK_ENTITIES;
+]>
+<title>Write changes to disk</title>
+
diff --git a/en-US/Write_changes_to_disk_common-title-2.xml b/en-US/Write_changes_to_disk_common-title-2.xml
new file mode 100644
index 0000000..3dce0a0
--- /dev/null
+++ b/en-US/Write_changes_to_disk_common-title-2.xml
@@ -0,0 +1,7 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE title PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Quick_Start_Guide.ent">
+%BOOK_ENTITIES;
+]>
+<title>Last chance to cancel safely</title>
+
diff --git a/en-US/Write_changes_to_disk_x86-para-4.xml b/en-US/Write_changes_to_disk_x86-para-4.xml
new file mode 100644
index 0000000..c6a66ba
--- /dev/null
+++ b/en-US/Write_changes_to_disk_x86-para-4.xml
@@ -0,0 +1,9 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Quick_Start_Guide.ent">
+%BOOK_ENTITIES;
+]>
+<para>
+ To revise any of the choices that you made up to this point, click <guibutton>Go back</guibutton>. To cancel installation completely, switch off your computer. To switch off most computers at this stage, press the power button and hold it down for a few seconds.
+</para>
+
diff --git a/en-US/Write_changes_to_disk_x86.xml b/en-US/Write_changes_to_disk_x86.xml
new file mode 100644
index 0000000..971476e
--- /dev/null
+++ b/en-US/Write_changes_to_disk_x86.xml
@@ -0,0 +1,20 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Quick_Start_Guide.ent">
+%BOOK_ENTITIES;
+]>
+<section id="Write_changes_to_disk-x86">
+ <xi:include href="Write_changes_to_disk_common-title-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- Write changes to disk --> <xi:include href="Write_changes_to_disk_common-para-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- The installer prompts you to confirm the partitioning options that you selected. --> <xi:include href="Write_changes_to_disk_common-figure-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- Writing storage configuration to disk --> <xi:include href="Write_changes_to_disk_common-para-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- If you are certain that you want to proceed, --> <warning>
+ <xi:include href="Write_changes_to_disk_common-title-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- Last chance to cancel safely --> <xi:include href="Write_changes_to_disk_common-para-3.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- Up to this point in the installation process, the installer has made no lasting changes --> <xi:include href="Write_changes_to_disk_x86-para-4.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- To revise any of the choices that you made up to this point, --> <xi:include href="Write_changes_to_disk_common-para-5.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- After you click Write changes to disk -->
+ </warning>
+</section>
+
+
diff --git a/en-US/X86_Bootloader.xml b/en-US/X86_Bootloader.xml
index 125a7a1..bc9b402 100644
--- a/en-US/X86_Bootloader.xml
+++ b/en-US/X86_Bootloader.xml
@@ -1,371 +1,355 @@
-<?xml version="1.0"?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Quick_Start_Guide.ent">
+%BOOK_ENTITIES;
]>
-
<section id="s1-x86-bootloader">
-<!-- <title>x86, AMD64, and <trademark class="registered">Intel</trademark> 64 Boot Loader Configuration</title> -->
<title>Boot Loader Configuration</title>
-<!-- <indexterm significance="normal">
+ <indexterm significance="normal">
<primary>boot loader</primary>
+
</indexterm>
- <indexterm significance="normal">
+ <indexterm significance="normal">
<primary>boot loader</primary>
- <secondary>GRUB</secondary>
+ <secondary>GRUB</secondary>
+
</indexterm>
- <indexterm significance="normal">
+ <indexterm significance="normal">
<primary>GRUB</primary>
+
</indexterm>
- <indexterm significance="normal">
+ <indexterm significance="normal">
<primary>configuration</primary>
- <secondary>GRUB</secondary>
+ <secondary>GRUB</secondary>
+
</indexterm>
- <indexterm significance="normal">
+ <indexterm significance="normal">
<primary>GRUB</primary>
- <secondary>configuration</secondary>
+ <secondary>configuration</secondary>
+
</indexterm>
- <indexterm significance="normal">
+ <indexterm significance="normal">
<primary>boot loader</primary>
- <secondary>configuration</secondary>
+ <secondary>configuration</secondary>
+
</indexterm>
- <indexterm significance="normal">
+ <indexterm significance="normal">
<primary>master boot record</primary>
- </indexterm>
- <para>
- To boot the system without boot media, you usually need to install a boot loader. A boot loader is the first software program that runs when a computer starts. It is responsible for loading and transferring control to the operating system kernel
- software. The kernel, in turn, initializes the rest of the operating system.
- </para>
- <important>
- <title>Installing in text mode</title>
- <para>If you install Fedora in text mode, the installer configures the bootloader automatically and you cannot customize bootloader settings during the installation process.</para>
- </important> -->
+ </indexterm>
+ <!-- <para>
+ To boot the system without boot media, you usually need to install a boot loader. A boot loader is the first software program that runs when a computer starts. It is responsible for loading and transferring control to the operating system kernel software. The kernel, in turn, initializes the rest of the operating system.
+ </para>
+ <important>
+ <title>Installing in text mode</title>
+ <para>
+ If you install Fedora in text mode, the installer configures the bootloader automatically and you cannot customize bootloader settings during the installation process.
+ </para>
+ </important> -->
+
<para>
Some partitioning options cause the boot loader configuration screen to appear. If you do not see this screen, skip to <xref linkend="s1-pkgselection-x86"/>.
</para>
- <para>
- GRUB (GRand Unified Bootloader), which is installed by default, is a very powerful boot loader. GRUB can load a variety of free operating systems, as well as proprietary operating systems with chain-loading (the mechanism for loading unsupported
- operating systems, such as DOS or Windows, by loading another boot loader).
- </para>
-<!-- <note>
- <title>The GRUB boot menu</title>
- <para>The GRUB menu
- defaults to being hidden, except on dual-boot systems.
- To show the GRUB menu during system boot, press and hold the
- <keycap>Shift</keycap> key before the kernel is loaded. (Any other
- key works as well but the <keycap>Shift</keycap> key is the safest to use.)
- </para>
- </note> -->
-
- <figure float="0" id="fig-x86-bootloader"><title>Boot Loader Configuration</title>
- <mediaobject>
- <imageobject><imagedata fileref="images/x86-bootloader/x86-bootloader.png" format="PNG"/></imageobject>
- <textobject><para>
+ <para>
+ GRUB (GRand Unified Bootloader), which is installed by default, is a very powerful boot loader. GRUB can load a variety of free operating systems, as well as proprietary operating systems with chain-loading (the mechanism for loading unsupported operating systems, such as Windows, by loading another boot loader). Note that Fedora &PRODVER; uses GRUB 2. GRUB Legacy is no longer actively developed.<footnote>
+ <para>
+ <ulink url="http://www.gnu.org/software/grub/grub-legacy.en.html" />
+ </para>
+ </footnote>
+ </para>
+ <!-- <note>
+ <title>The GRUB boot menu</title>
+ <para>
+ The GRUB menu defaults to being hidden, except on dual-boot systems. To show the GRUB menu during system boot, press and hold the <keycap>Shift</keycap> key before the kernel is loaded. (Any other key works as well but the <keycap>Shift</keycap> key is the safest to use.)
+ </para>
+
+ </note> -->
+ <figure float="0" id="fig-x86-bootloader">
+ <title>Boot Loader Configuration</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/x86-bootloader/x86-bootloader.png" format="PNG" width="444" />
+ </imageobject>
+ <textobject>
+ <para>
Configure how you would like to boot the system.
</para>
+
</textobject>
+
</mediaobject>
+
</figure>
- <!-- <para>
+ <!-- <para>
If you do not want to install GRUB as your boot loader, click <guibutton>Change boot loader</guibutton>, where you can choose not to install a boot loader at all.
</para>
<para>
If you already have a boot loader that can boot Fedora and do not want to overwrite your current boot loader, choose <guilabel>Do not install a boot loader</guilabel> by clicking on the <guibutton>Change
boot loader</guibutton> button.
- </para> -->
- <para>
- If there are no other operating systems on your computer, or you are
- completely removing any other operating systems the installation
- program will install <application>GRUB</application> as your boot
- loader without any intervention. In that case you may continue on to
- <xref linkend="s1-pkgselection-x86"/>.
- </para>
-
-<!-- <para>
- You may have a boot loader installed on your system already. An
- operating system may install its own preferred boot loader, or you
- may have installed a third-party boot loader.If your boot loader
- does not recognize Linux partitions, you may not be able to boot
- Fedora. Use <application>GRUB</application> as your boot loader to
- boot Linux and most other operating systems. Follow the directions
- in this chapter to install <application>GRUB</application>.
- </para>
-
-
- <warning>
- <title>Installing GRUB</title>
-
- <para>
- If you install GRUB, it may overwrite your existing boot loader.
- </para>
- </warning>
-
- <para>
- By default, the installation program installs GRUB in the
- master boot record or <abbrev>MBR</abbrev>, of the device for the root
- file system. To decline installation of a new boot loader, unselect
- <guilabel>Install boot loader on /dev/sda</guilabel>.
- </para>
-
+ </para> --> <para>
+ If there are no other operating systems on your computer, or you are completely removing any other operating systems the installation program will install <application>GRUB</application> as your boot loader without any intervention. In that case you may continue on to <xref linkend="s1-pkgselection-x86" />.
+ </para>
+ <!-- <para>
+ You may have a boot loader installed on your system already. An operating system may install its own preferred boot loader, or you may have installed a third-party boot loader. If your boot loader does not recognize Linux partitions, you may not be able to boot Fedora. Use <application>GRUB</application> as your boot loader to boot Linux and most other operating systems. Follow the directions in this chapter to install <application>GRUB</application>.
+ </para>
+ <warning>
+ <title>Installing GRUB</title>
+ <para>
+ If you install GRUB, it may overwrite your existing boot loader.
+ </para>
+
+ </warning>
+ <para>
+ By default, the installation program installs GRUB in the master boot record or <abbrev>MBR</abbrev>, of the device for the root file system. To decline installation of a new boot loader, unselect <guilabel>Install boot loader on /dev/sda</guilabel>.
+ </para>
<warning>
<title>Warning</title>
-
- <para>
+ <para>
If you choose not to install GRUB for any reason, you will not be able to boot the system directly, and you must use another boot method (such as a commercial boot loader application). Use this option only if you are sure you have another way of booting the system!
</para>
- </warning>
--->
- <!-- <para>
+
+ </warning> -->
+ <!-- <para>
Every bootable partition is listed, including partitions used by other operating systems. The partition holding the system's root file system has a <guilabel>Label</guilabel> of <filename>Fedora</filename> (for GRUB). Other partitions may also have boot labels. To add or change the boot label for other partitions that have been detected by the installation program, click once on the partition to select it. Once selected, you can change the boot label by clicking the <guibutton>Edit</guibutton> button.
- </para> -->
-
- <para>
- If you have other operating systems already installed, Fedora
- attempts to automatically detect and configure
- <application>GRUB</application> to boot them. You may manually
- configure any additional operating systems if
- <application>GRUB</application> does not detect them.
- </para>
-
- <para>To add, remove, or change the detected operating system
- settings, use the options provided.</para>
-
- <variablelist>
- <varlistentry>
- <term><guibutton>Add</guibutton></term>
- <listitem>
- <para>
- Select <guibutton>Add</guibutton> to include an additional
- operating system in GRUB.
- </para>
- <para>
- Select the disk partition which contains the bootable
- operating system from the drop-down list and give the entry
- a label. <application>GRUB</application> displays this label
- in its boot menu.
- </para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term><guibutton>Edit</guibutton></term>
- <listitem>
- <para>
- To change an entry in the GRUB boot menu, select the entry
- and then select <guibutton>Edit</guibutton>.
- </para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term><guibutton>Delete</guibutton></term>
- <listitem>
- <para>
- To remove an entry from the GRUB boot menu, select the entry
- and then select <guibutton>Delete</guibutton>.
- </para>
- </listitem>
- </varlistentry>
- </variablelist>
-
- <para>
+ </para> --> <para>
+ If you have other operating systems already installed, Fedora attempts to automatically detect and configure <application>GRUB</application> to boot them. You may manually configure any additional operating systems if <application>GRUB</application> does not detect them.
+ </para>
+ <para>
+ To add, remove, or change the detected operating system settings, use the options provided.
+ </para>
+ <variablelist>
+ <varlistentry>
+ <term><guibutton>Add</guibutton></term>
+ <listitem>
+ <para>
+ Select <guibutton>Add</guibutton> to include an additional operating system in GRUB.
+ </para>
+ <para>
+ Select the disk partition which contains the bootable operating system from the drop-down list and give the entry a label. <application>GRUB</application> displays this label in its boot menu.
+ </para>
+
+ </listitem>
+
+ </varlistentry>
+ <varlistentry>
+ <term><guibutton>Edit</guibutton></term>
+ <listitem>
+ <para>
+ To change an entry in the GRUB boot menu, select the entry and then select <guibutton>Edit</guibutton>.
+ </para>
+
+ </listitem>
+
+ </varlistentry>
+ <varlistentry>
+ <term><guibutton>Delete</guibutton></term>
+ <listitem>
+ <para>
+ To remove an entry from the GRUB boot menu, select the entry and then select <guibutton>Delete</guibutton>.
+ </para>
+
+ </listitem>
+
+ </varlistentry>
+
+ </variablelist>
+ <para>
Select <guilabel>Default</guilabel> beside the preferred boot partition to choose your default bootable OS. You cannot move forward in the installation unless you choose a default boot image.
</para>
-<!--
- <note>
+ <!-- <note>
<title>Note</title>
-
- <para>
+ <para>
The <guilabel>Label</guilabel> column lists what you must enter at the boot prompt, in non-graphical boot loaders, in order to boot the desired operating system.
</para>
-
- <para>
+ <para>
Once you have loaded the GRUB boot screen, use the arrow keys to choose a boot label or type <keycap>e</keycap> for edit. You are presented with a list of items in the configuration file for the boot label you have selected.
</para>
+
</note>
-
- <para>
+ <para>
Boot loader passwords provide a security mechanism in an environment where physical access to your server is available.
</para>
-
- <para>
- If you are installing a boot loader, you should create a password to protect your system. Without a boot loader password, users with access to your system can pass options to the kernel which can compromise your system security. With a boot loader password in place, the password must first be entered before selecting any non-standard boot options. However, it is still possible for someone with physical access to the machine to boot from a diskette, CD-ROM, or USB media if the BIOS supports it. Security plans which include boot loader passwords should also address alternate boot methods.
+ <para>
+ If you are installing a boot loader, you should create a password to protect your system. Without a boot loader password, users with access to your system can pass options to the kernel which can compromise your system security. With a boot loader password in place, the password must first be entered before selecting any non-standard boot options. However, it is still possible for someone with physical access to the machine to boot from a diskette, CD-ROM, DVD, or USB media if the BIOS supports it. Security plans which include boot loader passwords should also address alternate boot methods.
</para>
- <indexterm significance="normal">
+ <indexterm significance="normal">
<primary>boot loader password</primary>
+
</indexterm>
- <indexterm significance="normal">
+ <indexterm significance="normal">
<primary>password</primary>
- <secondary>boot loader</secondary>
+ <secondary>boot loader</secondary>
+
</indexterm>
- <indexterm significance="normal">
+ <indexterm significance="normal">
<primary>boot loader</primary>
- <secondary>password</secondary>
- </indexterm>
-
- <note>
- <title>GRUB Passwords Not Required</title>
- <para>
- You may not require a <application>GRUB</application> password
- if your system only has trusted operators, or is physically
- secured with controlled console access. However, if an untrusted
- person can get physical access to your computer's keyboard and
- monitor, that person can reboot the system and access
- <application>GRUB</application>. A password is helpful in this
- case.
- </para>
- </note>
+ <secondary>password</secondary>
+ </indexterm>
+ <note>
+ <title>GRUB Passwords Not Required</title>
+ <para>
+ You may not require a <application>GRUB</application> password if your system only has trusted operators, or is physically secured with controlled console access. However, if an untrusted person can get physical access to your computer's keyboard and monitor, that person can reboot the system and access <application>GRUB</application>. A password is helpful in this case.
+ </para>
- <para>
+ </note>
+ <para>
If you choose to use a boot loader password to enhance your system security, be sure to select the checkbox labeled <guilabel>Use a boot loader password</guilabel>.
</para>
-
- <para>
+ <para>
Once selected, enter a password and confirm it.
</para>
+ <para>
+ Whenever you are required to enter this password, you will also be asked for a username, which is <command>root</command>.
+ </para>
+ <para>
+ <application>GRUB</application> stores the password in encrypted form, so it <emphasis>cannot</emphasis> be read or recovered. If you forget the boot password, boot the system normally and then change the password entry in the <filename>/etc/grub.d/00_header</filename> file. Then, run <command>grub2-mkconfig</command> with root privileges to update the <filename>grub.cfg</filename> file with your updated password. If you cannot boot, you may be able to use the <systemitem>rescue mode</systemitem> on the Fedora installation DVD to reset the GRUB password.
+ </para> -->
- <para>
- <application>GRUB</application> stores the password in encrypted
- form, so it <emphasis>cannot</emphasis> be read or recovered. If
- you forget the boot password, boot the system normally and then
- change the password entry in the
- <filename>/boot/grub/grub.conf</filename> file. If you cannot
- boot, you may be able to use the "rescue" mode on the first Fedora
- installation disc to reset the GRUB password.
- </para>
-
- <para>
- If you do need to change the <application>GRUB</application>
- password, use the <command>grub-md5-crypt</command> utility. For
- information on using this utility, use the command <command>man
- grub-md5-crypt</command> in a terminal window to read the
- manual pages.
- </para>
+ <!-- <para>
+ If you do need to change the <application>GRUB</application> password, use the <command>grub-md5-crypt</command> utility. For information on using this utility, use the command <command>man grub-md5-crypt</command> in a terminal window to read the manual pages.
+ </para> -->
+ <!-- <important>
+ <title>GRUB recognizes only the QWERTY keyboard layout</title>
+ <para>
+ When selecting a GRUB password, be aware that GRUB recognizes only the QWERTY keyboard layout, regardless of the keyboard actually attached to the system. If you use a keyboard with a significantly different layout, it might be more effective to memorize a pattern of keystrokes rather than the word that the pattern produces.
+ </para>
- <para>
+ </important>
+ <para>
To configure more advanced boot loader options, such as changing the drive order or passing options to the kernel, be sure <guilabel>Configure advanced boot loader options</guilabel> is selected before clicking <guibutton>Next</guibutton>.
</para>
-
- <section id="x86-bootloader-adv">
+ <section id="x86-bootloader-adv">
<title>Advanced Boot Loader Configuration</title>
-
- <para>
- Now that you have chosen which boot loader to install, you can also determine where you want the boot loader to be installed. You may install the boot loader in one of two places:
- </para>
- <indexterm significance="normal">
+ <indexterm significance="normal">
<primary>boot loader</primary>
- <secondary>MBR</secondary>
+ <secondary>MBR</secondary>
+
</indexterm>
- <indexterm significance="normal">
+ <indexterm significance="normal">
<primary>MBR</primary>
- <secondary>installing boot loader on</secondary>
+ <secondary>installing boot loader on</secondary>
+
</indexterm>
- <indexterm significance="normal">
+ <indexterm significance="normal">
<primary>OS/2 boot manager</primary>
+
</indexterm>
- <itemizedlist>
+ <xi:include href="Assign_Storage_Devices-common-important-indexterm-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> -->
+ <!-- Chain loading --> <!-- <para>
+ Now that you have chosen which boot loader to install, you can also determine where you want the boot loader to be installed. You may install the boot loader in one of two places:
+ </para>
+ <itemizedlist>
<listitem>
<para>
The master boot record (MBR) — This is the recommended place to install a boot loader, unless the MBR already starts another operating system loader, such as System Commander. The MBR is a special area on your hard drive that is automatically loaded by your computer's BIOS, and is the earliest point at which the boot loader can take control of the boot process. If you install it in the MBR, when your machine boots, GRUB presents a boot prompt. You can then boot Fedora or any other operating system that you have configured the boot loader to boot.
</para>
+
</listitem>
- <listitem>
+ <listitem>
<para>
-
- <indexterm significance="normal">
- <primary>boot loader</primary>
- <secondary>installing on boot partition</secondary>
- </indexterm>
- The first sector of your boot partition — This is recommended if you are already using another boot loader on your system. In this case, your other boot loader takes control first. You can then configure that boot loader to start GRUB, which then boots Fedora.
+ <indexterm significance="normal">
+ <primary>boot loader</primary>
+ <secondary>installing on boot partition</secondary>
+
+ </indexterm>
+ The first sector of your boot partition — This is recommended if you are already using another boot loader on your system. In this case, your other boot loader takes control first. You can then configure that boot loader to start GRUB, which then boots Fedora.
</para>
-
- <note>
- <title>GRUB as a Secondary Boot Loader</title>
- <para>
- If you install GRUB as a secondary boot loader, you must
- reconfigure your primary boot loader whenever you install and
- boot from a new kernel. The kernel of an operating system such
- as Microsoft Windows does not boot in the same fashion. Most
- users therefore use GRUB as the primary boot loader on dual-boot
- systems.
- </para>
- </note>
-
-
+ <note>
+ <title>GRUB as a Secondary Boot Loader</title>
+ <para>
+ If you install GRUB as a secondary boot loader, you must reconfigure your primary boot loader whenever you install and boot from a new kernel. The kernel of an operating system such as Microsoft Windows does not boot in the same fashion. Most users therefore use GRUB as the primary boot loader on dual-boot systems.
+ </para>
+
+ </note>
+
</listitem>
+
</itemizedlist>
- <figure float="0" id="fig-x86-adv-bootloader"><title>Boot Loader Installation</title>
- <mediaobject>
- <imageobject><imagedata fileref="images/x86-bootloader/x86-adv-bootloader.png" format="PNG"/></imageobject>
- <textobject><para>
+ <figure float="0" id="fig-x86-adv-bootloader">
+ <title>Boot Loader Installation</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/x86-bootloader/x86-adv-bootloader.png" format="PNG" />
+ </imageobject>
+ <textobject>
+ <para>
Choose where to install a boot loader and how to configure it.
</para>
+
</textobject>
+
</mediaobject>
+
</figure>
- <note><title>Note</title>
- <para>
+ <note>
+ <title>Note</title>
+ <para>
If you have a RAID card, be aware that some BIOSes do not support booting from the RAID card. In cases such as these, the boot loader <emphasis>should not</emphasis> be installed on the MBR of the RAID array. Rather, the boot loader should be installed on the MBR of the same drive as the <filename>/boot/</filename> partition was created.
</para>
+
</note>
- <para>
+ <para>
If your system only uses Fedora, you should choose the MBR.
</para>
-
- <para>
+ <para>
Click the <guibutton>Change Drive Order</guibutton> button if you would like to rearrange the drive order or if your BIOS does not return the correct drive order. Changing the drive order may be useful if you have multiple SCSI adapters, or both SCSI and IDE adapters, and you want to boot from the SCSI device.
</para>
--->
- <!-- <para>
+ <warning>
+ <title>If installing from USB, ensure boot loader is installed to hard drive</title>
+ <para>
+ If you are installing Fedora from a USB, the boot loader will by default be installed to the MBR on the USB rather than the MBR on the hard drive. This will prevent the system booting once the installation is complete. To avoid this, select <guibutton>Change Device</guibutton> and reverse the order of the BIOS drives. <filename>/dev/sda</filename> is typically the hard drive and should be first in the BIOS Drive Order.
+ </para>
+ </warning> -->
+ <!-- <para>
The <guilabel>Force LBA32 (not normally required)</guilabel> option allows you to exceed the 1024 cylinder limit for the <filename>/boot/</filename> partition. If you have a system which supports the LBA32 extension for booting operating systems above the 1024 cylinder limit, and you want to place your <filename>/boot/</filename> partition above cylinder 1024, you should select this option.
- </para> -->
-<!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="X86_Bios_Tip.xml"/> -->
- <!-- <para>
+ </para> --><!-- <xi:include href="X86_Bios_Tip.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> -->
+ <!-- <para>
To add default options to the boot command, enter them into the <guilabel>Kernel parameters</guilabel> field. Any options you enter are passed to the Linux kernel every time it boots.
- </para> -->
- </section>
-<!--
- <section id="s2-x86-bootloader-rescue">
+ </para>
+ </section> -->
+
+ <!-- <section id="s2-x86-bootloader-rescue">
<title>Rescue Mode</title>
- <indexterm significance="normal">
+ <indexterm significance="normal">
<primary>rescue mode</primary>
+
</indexterm>
- <para>
+ <para>
Rescue mode provides the ability to boot a small Fedora environment entirely from boot media or some other boot method instead of the system's hard drive. There may be times when you are unable to get Fedora running completely enough to access files on your system's hard drive. Using rescue mode, you can access the files stored on your system's hard drive, even if you cannot actually run Fedora from that hard drive. If you need to use rescue mode, try the following method:
</para>
-
- <itemizedlist>
+ <itemizedlist>
<listitem>
<para>
- Boot an x86, AMD64, or <trademark class="registered">Intel</trademark> 64 system from any installation medium, such as CD, DVD, USB, or PXE, and type <userinput>linux rescue</userinput> at the installation boot prompt.--> <!-- (RHEL) Itanium users should type <userinput>elilo linux rescue</userinput> to enter rescue mode. --><!-- Refer to <xref linkend="ap-rescuemode"/> for a more complete description of rescue mode.
+ Boot an x86, AMD64, or Intel 64 system from any installation medium, such as CD, DVD, USB, or PXE, and type <userinput>linux rescue</userinput> at the installation boot prompt. Refer to <xref linkend="ap-rescuemode" /> for a more complete description of rescue mode.
</para>
+
</listitem>
- </itemizedlist> -->
-
- <!-- Reference to RHEL Deployment Guide: <para>
- For additional information, refer to the <citetitle>&PROD; &DCAG;</citetitle>.
- </para> -->
-<!-- </section> -->
-
-<!-- <section id="s2-x86-bootloader-alt">
- <title>Alternative Boot Loaders</title> -->
- <!-- <indexterm significance="normal">
+
+ </itemizedlist>
+ <para>
+ For additional information, refer to the <citetitle>Fedora Deployment Guide</citetitle>.
+ </para>
+
+ </section>
+
+ <section id="s2-x86-bootloader-alt">
+ <title>Alternative Boot Loaders</title> -->
+ <!-- <indexterm significance="normal">
<primary>boot loader</primary>
<secondary>alternatives to</secondary>
- </indexterm> -->
-<!-- <indexterm significance="normal">
+ </indexterm> --> <!-- <indexterm significance="normal">
<primary>GRUB</primary>
- <secondary>alternatives to</secondary>
+ <secondary>alternatives to</secondary>
+
</indexterm>
-
- <para>
- <application>GRUB</application> is the default bootloader for Fedora, but is not the only choice. A variety of open-source and proprietary alternatives to <application>GRUB</application> are available to load Fedora, including <application>LILO</application>, <application>SYSLINUX</application>, <application>Acronis Disk Director Suite</application>, and <application>Apple Boot Camp</application>.
- </para> -->
-
- <!-- <para>
+ <para>
+ <application>GRUB</application> is the default bootloader for Fedora, but is not the only choice. A variety of open-source and proprietary alternatives to <application>GRUB</application> are available to load Fedora, including <application>LILO</application>, <application>SYSLINUX</application>, and <application>Acronis Disk Director Suite</application>.
+ </para> -->
+ <!-- <para>
If you do not wish to use a boot loader, you have several alternatives:
</para>
@@ -448,17 +432,17 @@ Commercial boot loaders </term> <listitem>
</para>
</listitem>
</varlistentry>
- </variablelist>
-
- (RHEL) <note>
- <title>Note</title>
-
- <para>
- Boot loaders such as LOADLIN and System Commander are considered to be third-party boot loaders and are not supported by Red Hat.
+ </variablelist> --> <!-- note>
+ <title>Important</title>
+ <para>
+ The Fedora Project does not support third-party boot loaders.
</para>
- </note> -->
-<!-- </section> -->
-<!--
+
+ </note>
+
+ </section> -->
+
+ <!--
<section id="s2-x86-bootloader-smp">
<title>SMP Motherboards and GRUB</title>
<indexterm significance="normal">
@@ -492,16 +476,18 @@ Commercial boot loaders </term> <listitem>
<title>Note</title>
<para>
- An SMP kernel is installed by default on <trademark class="registered">Intel</trademark> <trademark class="registered">Pentium</trademark> 4 systems with hyperthreading.
+ An SMP kernel is installed by default on Intel <trademark class="registered">Pentium</trademark> 4 systems with hyperthreading.
</para>
</note>
<para>
- The two GRUB entries are <computeroutput>Red Hat Enterprise Linux (<replaceable>kernel version</replaceable>)</computeroutput> and <computeroutput>Red Hat Enterprise Linux (<replaceable>kernel
- version</replaceable>-smp)</computeroutput>. The <computeroutput>Red Hat Enterprise Linux (<replaceable>kernel version</replaceable>-smp)</computeroutput> boots by default. However, if you have trouble with the SMP kernel, you can elect
- to boot the <computeroutput>Red Hat Enterprise Linux (<replaceable>kernel version</replaceable>)</computeroutput> entry instead. You retain all the functionality as before, but only operate with a single processor.
+ The two GRUB entries are <computeroutput>Fedora (<replaceable>kernel version</replaceable>)</computeroutput> and <computeroutput>Fedora (<replaceable>kernel
+ version</replaceable>-smp)</computeroutput>. The <computeroutput>Fedora (<replaceable>kernel version</replaceable>-smp)</computeroutput> boots by default. However, if you have trouble with the SMP kernel, you can elect
+ to boot the <computeroutput>Fedora (<replaceable>kernel version</replaceable>)</computeroutput> entry instead. You retain all the functionality as before, but only operate with a single processor.
</para>
- </section> -->
-<!-- </section> -->
+ </section> -->
+</section>
+
+
diff --git a/en-US/firstboot-datetime.xml b/en-US/firstboot-datetime.xml
index 18ac1be..a727c31 100644
--- a/en-US/firstboot-datetime.xml
+++ b/en-US/firstboot-datetime.xml
@@ -11,7 +11,8 @@
<para>
If your system does not have Internet access or a network time
server, manually set the date and time for your system on this
- screen. Otherwise, use
+ screen. Otherwise, click the <guilabel>Synchronize date and time
+ over the network</guilabel> checkbox to configure your system to use
<indexterm>
<primary>NTP (Network Time Protocol)</primary>
</indexterm>
diff --git a/en-US/firstboot-systemuser.xml b/en-US/firstboot-systemuser.xml
index acfcb33..b46d085 100644
--- a/en-US/firstboot-systemuser.xml
+++ b/en-US/firstboot-systemuser.xml
@@ -5,8 +5,8 @@
<!-- TEXT FROM firstboot.xml -->
- <section id="sn-firstboot-systemuser">
- <title>System User</title>
+ <section id="sn-firstboot-createuser">
+ <title>Create User</title>
<para>
Create a user account for yourself with this screen. Always use
diff --git a/en-US/images/accountconfig/rootpassword.png b/en-US/images/accountconfig/rootpassword.png
index c66cb7a..4cec1dd 100644
Binary files a/en-US/images/accountconfig/rootpassword.png and b/en-US/images/accountconfig/rootpassword.png differ
diff --git a/en-US/images/bootscreen/bootscreen-livecd.png b/en-US/images/bootscreen/bootscreen-livecd.png
index c4a24f6..7a85cdf 100644
Binary files a/en-US/images/bootscreen/bootscreen-livecd.png and b/en-US/images/bootscreen/bootscreen-livecd.png differ
diff --git a/en-US/images/diskpartitioning/write_changes.png b/en-US/images/diskpartitioning/write_changes.png
index 6491de4..09da934 100644
Binary files a/en-US/images/diskpartitioning/write_changes.png and b/en-US/images/diskpartitioning/write_changes.png differ
diff --git a/en-US/images/diskpartsetup/disk-setup.png b/en-US/images/diskpartsetup/disk-setup.png
index 2fbf243..3c10805 100644
Binary files a/en-US/images/diskpartsetup/disk-setup.png and b/en-US/images/diskpartsetup/disk-setup.png differ
diff --git a/en-US/images/firstboot/fb-createuser.png b/en-US/images/firstboot/fb-createuser.png
index 773b0df..29db244 100644
Binary files a/en-US/images/firstboot/fb-createuser.png and b/en-US/images/firstboot/fb-createuser.png differ
diff --git a/en-US/images/firstboot/fb-datetime.png b/en-US/images/firstboot/fb-datetime.png
index 2f58def..6cfd5c1 100644
Binary files a/en-US/images/firstboot/fb-datetime.png and b/en-US/images/firstboot/fb-datetime.png differ
diff --git a/en-US/images/firstboot/fb-license.png b/en-US/images/firstboot/fb-license.png
index 575b3a7..6130bcd 100644
Binary files a/en-US/images/firstboot/fb-license.png and b/en-US/images/firstboot/fb-license.png differ
diff --git a/en-US/images/firstboot/fb-profile.png b/en-US/images/firstboot/fb-profile.png
index b173bc4..41d6255 100644
Binary files a/en-US/images/firstboot/fb-profile.png and b/en-US/images/firstboot/fb-profile.png differ
diff --git a/en-US/images/firstboot/fb-welcome.png b/en-US/images/firstboot/fb-welcome.png
index 46815ce..6532386 100644
Binary files a/en-US/images/firstboot/fb-welcome.png and b/en-US/images/firstboot/fb-welcome.png differ
diff --git a/en-US/images/kbdconfig/keyboard.png b/en-US/images/kbdconfig/keyboard.png
index 5c118e1..4e5d23c 100644
Binary files a/en-US/images/kbdconfig/keyboard.png and b/en-US/images/kbdconfig/keyboard.png differ
diff --git a/en-US/images/livedesktop/livedesktop-initial.png b/en-US/images/livedesktop/livedesktop-initial.png
new file mode 100644
index 0000000..dce1427
Binary files /dev/null and b/en-US/images/livedesktop/livedesktop-initial.png differ
diff --git a/en-US/images/livedesktop/livedesktop.png b/en-US/images/livedesktop/livedesktop.png
index 6429cc2..e480b6b 100644
Binary files a/en-US/images/livedesktop/livedesktop.png and b/en-US/images/livedesktop/livedesktop.png differ
diff --git a/en-US/images/netconfig/hostname.png b/en-US/images/netconfig/hostname.png
index 4eb3165..d2f34cf 100644
Binary files a/en-US/images/netconfig/hostname.png and b/en-US/images/netconfig/hostname.png differ
diff --git a/en-US/images/pkgselection/pkg-group-details.png b/en-US/images/pkgselection/pkg-group-details.png
index 663627d..b9aec1d 100644
Binary files a/en-US/images/pkgselection/pkg-group-details.png and b/en-US/images/pkgselection/pkg-group-details.png differ
diff --git a/en-US/images/pkgselection/pkg-group.png b/en-US/images/pkgselection/pkg-group.png
index d59bd11..8f44865 100644
Binary files a/en-US/images/pkgselection/pkg-group.png and b/en-US/images/pkgselection/pkg-group.png differ
diff --git a/en-US/images/storagedevices/selectstoragedevices.png b/en-US/images/storagedevices/selectstoragedevices.png
index 1e03e8c..530ff25 100644
Binary files a/en-US/images/storagedevices/selectstoragedevices.png and b/en-US/images/storagedevices/selectstoragedevices.png differ
diff --git a/en-US/images/storagedevices/storagedevices.png b/en-US/images/storagedevices/storagedevices.png
index a2a3af2..acef7c3 100644
Binary files a/en-US/images/storagedevices/storagedevices.png and b/en-US/images/storagedevices/storagedevices.png differ
diff --git a/en-US/images/timezone/timezone.png b/en-US/images/timezone/timezone.png
index b57b6c4..ff94aad 100644
Binary files a/en-US/images/timezone/timezone.png and b/en-US/images/timezone/timezone.png differ
diff --git a/en-US/upgrading-fedora.xml b/en-US/upgrading-fedora.xml
index 722c867..749c327 100644
--- a/en-US/upgrading-fedora.xml
+++ b/en-US/upgrading-fedora.xml
@@ -34,7 +34,7 @@
<title>Upgrade Examine</title>
-->
<para>
- If your system contains a Fedora or Red Hat Linux installation, a dialog
+ If your system contains a Fedora installation, a dialog
appears asking whether you want to upgrade that installation. To
perform an upgrade of an existing system, choose the appropriate
installation from the drop-down list and select
More information about the docs-commits
mailing list