[install-guide/f18] New and modified files for incorporation of Installation Quick Start Guide, copied from master
Jack Reed
jjr at fedoraproject.org
Tue Jan 29 05:26:25 UTC 2013
commit 0211991ef96bbd75068916030a61ce99b720dd21
Author: Jack Reed <jreed at redhat.com>
Date: Tue Jan 29 15:23:57 2013 +1000
New and modified files for incorporation of Installation Quick Start Guide, copied from master
en-US/Account_Configuration-x86.xml | 18 +-
en-US/Article_Info.xml | 28 +++
en-US/Automatic_Partitioning_quickstart-note-1.xml | 11 +
en-US/Automatic_Partitioning_quickstart-para-1.xml | 8 +
en-US/Automatic_Partitioning_quickstart-para-2.xml | 8 +
en-US/Automatic_Partitioning_quickstart-para-3.xml | 9 +
en-US/Boot_your_computer_from_the_CD.xml | 41 ++++
en-US/Burn_the_image_file_to_CD.xml | 56 +++++
en-US/Disk_Partitioning_Setup-x86.xml | 54 +++--
...Disk_Partitioning_Setup_quickstart-figure-1.xml | 21 ++
en-US/Download_Fedora.xml | 12 +
en-US/Fedora_Live_Desktop.xml | 47 ++++
en-US/Graphical_Installation_install-hub.xml | 19 ++-
en-US/Installation_Guide.ent | 2 +-
en-US/Installation_Quick_Start_Guide.ent | 6 +
en-US/Installation_Quick_Start_Guide.xml | 60 +++++
en-US/Introduction.xml | 11 +
en-US/Key_Board_Configuration-x86.xml | 12 +-
en-US/Package_Selection-Live.xml | 23 ++
en-US/Package_Selection-quickstart.xml | 45 ++++
en-US/Package_Selection-x86.xml | 9 +-
en-US/Package_Selection_quickstart-note-1.xml | 12 +
en-US/Progress_Hub-x86.xml | 4 +-
en-US/Reboot-quickstart.xml | 24 ++
en-US/Requirements.xml | 84 +++++++
en-US/Revision_History-quickstart.xml | 30 +++
en-US/Revision_History.xml | 4 +-
en-US/Steps_Hardware-x86.xml | 2 +-
en-US/Time_Zone-x86.xml | 6 +-
.../Write_changes_to_disk_quickstart-figure-1.xml | 21 ++
en-US/Write_changes_to_disk_x86.xml | 3 +-
en-US/Your_installation_is_complete.xml | 13 +
en-US/firstboot-datetime.xml | 45 ++++
en-US/firstboot-license.xml | 27 +++
en-US/firstboot-systemuser.xml | 131 +++++++++++
en-US/firstboot-welcome.xml | 45 ++++
en-US/firstboot.xml | 241 +------------------
en-US/images/bootscreen/bootscreen-livecd.png | Bin 0 -> 4060 bytes
.../images/diskpartitioning/write_changes-live.png | Bin 0 -> 34043 bytes
.../images/diskpartsetup/install-options-live.png | Bin 0 -> 17242 bytes
en-US/images/livedesktop/livedesktop-login.png | Bin 0 -> 455656 bytes
en-US/images/livedesktop/try_or_install.png | Bin 0 -> 645386 bytes
en-US/images/preinstallhub/preinstall_hub-live.png | Bin 0 -> 38527 bytes
en-US/images/reboot/reboot.png | Bin 0 -> 24637 bytes
en-US/pxe-server-config-bios.xml | 2 +-
quickstart.cfg | 12 +
46 files changed, 923 insertions(+), 283 deletions(-)
---
diff --git a/en-US/Account_Configuration-x86.xml b/en-US/Account_Configuration-x86.xml
index 7278f1a..cafbfe2 100644
--- a/en-US/Account_Configuration-x86.xml
+++ b/en-US/Account_Configuration-x86.xml
@@ -8,16 +8,16 @@
<!-- 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" />
+ <!-- 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" condition="install-guide" />
<!-- 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" />
+ <!-- Setting your root password --> <xi:include href="Account_Configuration_common-para-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude" condition="install-guide" />
+ <!-- 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" condition="install-guide" />
+ <!-- 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" condition="install-guide" />
+ <!-- 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" condition="install-guide" />
+ <!-- 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" condition="install-guide" />
+ <!-- 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" condition="install-guide" />
+ <!-- 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" condition="install-guide" />
+ <!-- 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" condition="install-guide" />
<!-- 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/Article_Info.xml b/en-US/Article_Info.xml
new file mode 100644
index 0000000..c1b7118
--- /dev/null
+++ b/en-US/Article_Info.xml
@@ -0,0 +1,28 @@
+<?xml version='1.0'?>
+<!DOCTYPE articleinfo PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+]>
+
+<articleinfo id="Installation_Quick_Start_Guide">
+ <title>Installation Quick Start Guide</title>
+ <subtitle>Downloading and installing Fedora &PRODVER; on most desktop and laptop computers</subtitle>
+ <productname>Fedora Draft Documentation</productname>
+ <productnumber></productnumber>
+ <edition>17.0.1</edition>
+ <pubsnumber>1</pubsnumber>
+ <abstract>
+ <para>This document shows you how to download and install Fedora. It does not cover every possible scenario, but describes steps that will work in most situations on most common hardware.</para>
+ </abstract>
+ <corpauthor>
+ <inlinemediaobject>
+ <imageobject>
+ <imagedata format='SVG' fileref="Common_Content/images/title_logo.svg" />
+ </imageobject>
+ <textobject><phrase>Fedora Documentation Project</phrase></textobject>
+ </inlinemediaobject>
+ </corpauthor>
+ <xi:include href="Common_Content/Legal_Notice.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="Author_Group.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+</articleinfo>
+
+
+
diff --git a/en-US/Automatic_Partitioning_quickstart-note-1.xml b/en-US/Automatic_Partitioning_quickstart-note-1.xml
new file mode 100644
index 0000000..5d3bebf
--- /dev/null
+++ b/en-US/Automatic_Partitioning_quickstart-note-1.xml
@@ -0,0 +1,11 @@
+<?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_Guide.ent">
+%BOOK_ENTITIES;
+]>
+<warning>
+ <para>
+ All data will be erased during installation from the disks you select at this stage. Do not select disks that contain data you want to preserve.
+ </para>
+</warning>
+
diff --git a/en-US/Automatic_Partitioning_quickstart-para-1.xml b/en-US/Automatic_Partitioning_quickstart-para-1.xml
new file mode 100644
index 0000000..0b69597
--- /dev/null
+++ b/en-US/Automatic_Partitioning_quickstart-para-1.xml
@@ -0,0 +1,8 @@
+<?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_Guide.ent">
+%BOOK_ENTITIES;
+]>
+<para>
+ To create and edit the partitions yourself, check the box labeled <guilabel>Let me customize the partitioning of the disks</guilabel>, then click <guibutton>Continue</guibutton> to reach the <guilabel>Manual Partitioning</guilabel> section. Refer to the <citetitle>Fedora Installation Guide</citetitle> for instructions on manual partitioning.
+</para>
diff --git a/en-US/Automatic_Partitioning_quickstart-para-2.xml b/en-US/Automatic_Partitioning_quickstart-para-2.xml
new file mode 100644
index 0000000..e81a06b
--- /dev/null
+++ b/en-US/Automatic_Partitioning_quickstart-para-2.xml
@@ -0,0 +1,8 @@
+<?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_Guide.ent">
+%BOOK_ENTITIES;
+]>
+<para>
+ Click <guibutton>Continue</guibutton> to allow Fedora to automatically configure the partitions for you and return to the Installation Summary Menu.
+</para>
diff --git a/en-US/Automatic_Partitioning_quickstart-para-3.xml b/en-US/Automatic_Partitioning_quickstart-para-3.xml
new file mode 100644
index 0000000..c35a3b3
--- /dev/null
+++ b/en-US/Automatic_Partitioning_quickstart-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_Guide.ent">
+%BOOK_ENTITIES;
+]>
+<para>
+ You may want to simply install Fedora on all available disks. However, if you want to retain data or previously installed operating systems on one or more of those disks, do not include them in the installation.
+</para>
+
diff --git a/en-US/Boot_your_computer_from_the_CD.xml b/en-US/Boot_your_computer_from_the_CD.xml
new file mode 100644
index 0000000..fe657b1
--- /dev/null
+++ b/en-US/Boot_your_computer_from_the_CD.xml
@@ -0,0 +1,41 @@
+<?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="Boot_your_computer_from_the_CD">
+ <title>Boot your computer from the CD</title>
+ <para>
+ Switch on your computer, load the Fedora &PRODVER; live CD into the CD or DVD drive, and restart the computer with the disc still in the drive. Ideally, you should soon see the Fedora boot screen and a ten-second countdown:
+ </para>
+ <figure float="0" id="fig-bootscreen"><title>The Fedora live CD boot screen</title>
+ <mediaobject>
+ <imageobject><imagedata fileref="images/bootscreen/bootscreen-livecd.png" format="PNG" width ="444" /></imageobject>
+ <textobject><para>
+ The boot screen displays a countdown timer.
+ </para>
+ </textobject>
+ </mediaobject>
+ </figure>
+ <para>
+ Either press <keycap>Enter</keycap> to select the <guilabel>Start Fedora &PRODVER;</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>
+ <listitem>
+ <para>
+ a boot menu, or
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ the BIOS setup utility
+ </para>
+ </listitem>
+ </itemizedlist>
+ <para>
+ The boot menu option is preferable. If you cannot see such a prompt, consult your manufacturer's documentation for your computer system, motherboard, or mainboard for the correct keystroke. On many systems, the required key will be <keycap>F12</keycap>, <keycap>F2</keycap>, <keycap>F1</keycap>, <keycap>Esc</keycap>, or <keycap>Delete</keycap>.
+ </para>
+</section>
+
diff --git a/en-US/Burn_the_image_file_to_CD.xml b/en-US/Burn_the_image_file_to_CD.xml
new file mode 100644
index 0000000..f71dd10
--- /dev/null
+++ b/en-US/Burn_the_image_file_to_CD.xml
@@ -0,0 +1,56 @@
+<?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="Burn_the_image_file_to_CD">
+ <title>Burn the image file to CD</title>
+ <para>
+ The exact series of steps that produces a CD from an image file varies greatly from computer to computer, depending on the operating system and disc burning software installed. Use this procedure as a general guide. You might be able to omit certain steps on your computer, or might have to perform some of the steps in a different order from the order described here.
+ </para>
+ <para>
+ Make sure that your disc burning software is capable of burning discs from image files. Although this is true of most disc burning software, exceptions exist.
+ </para>
+ <para>
+ In particular, note that the CD burning feature built into Windows XP and Windows Vista cannot burn CDs from images and that earlier Windows operating systems did not have any CD burning capability installed by default. Therefore, if your computer has a Windows operating system prior to Windows 7 installed on it, you need a separate piece of software for this task. Examples of popular CD burning software for Windows that you might already have on your computer include <application>Nero Burning ROM</application> and <application>Roxio Creator</application>. If you use a Windows operating system on your computer and do not have disc burning software installed (or you are not sure that the software can burn discs from image files) <application>InfraRecorder</application> is a suitable alternative available from <ulink url="http://www.infrarecorder.org/"></ulink>, and is free and open-source.
+ </para>
+ <para>
+ The <application>Disk Utility</application> software installed by default with Mac OS X on Apple computers has the capability to burn CDs from images built into it already. Most widely-used CD burning software for Linux, such as <application>Brasero</application> and <application>K3b</application>, also includes this capability.
+ </para>
+ <procedure>
+ <step>
+ <para>
+ Insert a blank, writeable CD into your computer's CD or DVD burner. On some computers, a window opens and displays various options when you insert the disc. If you see a window like this, look for an option to launch your chosen disc burning program. If you do not see an option like this, close the window and launch the program manually.
+ </para>
+ </step>
+ <step>
+ <para>
+ Launch your disc burning program. On some computers, you can do this by right-clicking (or control-clicking) on the image file and selecting a menu option with a label like <guilabel>Copy image to CD</guilabel>, or <guilabel>Copy CD or DVD image</guilabel>. Other computers might provide you with a menu option to launch your chosen disc burning program, either directly or with an option like <guimenuitem>Open With</guimenuitem>. If none of these options are available on your computer, launch the program from an icon on your desktop, in a menu of applications such as the <guimenu>Start</guimenu> menu on Windows operating systems, or in the Mac <filename>Applications</filename> folder.
+ </para>
+ </step>
+ <step>
+ <para>
+ In your disc burning program, select the option to burn a CD from an image file. For example, in <application>Nero Burning ROM</application>, this option is called <guimenuitem>Burn Image</guimenuitem> and is located on the <guimenu>File</guimenu> menu.
+ </para>
+ <para>
+ Note that you can skip this step when using certain CD burning software; for example, <application>Disk Utility</application> on Mac OS X does not require it.
+ </para>
+ </step>
+ <step>
+ <para>
+ Browse to the ISO CD image file that you downloaded previously and select it for burning.
+ </para>
+ </step>
+ <step>
+ <para>
+ Click the button that starts the burning process.
+ </para>
+ </step>
+ </procedure>
+ <note>
+ <title>Check the CD</title>
+ <para>
+ After the burning process completes, browse to the CD and check its contents. If you have burned the disc correctly, it should contain a number of files and folders, including <filename>GPL</filename>, <filename>README</filename>, <filename>LiveOS</filename>, <filename>EFI</filename>, and
+ <filename>isolinux</filename>. If you see only a single file named <filename>Fedora-&PRODVER;-i686-Live.iso</filename>, you have burned the image file itself to the CD, rather than burning a CD from the image file. In this case, you cannot use the CD and must try again.
+ </para>
+ </note>
+</section>
diff --git a/en-US/Disk_Partitioning_Setup-x86.xml b/en-US/Disk_Partitioning_Setup-x86.xml
index fcb11e0..ce9c14a 100644
--- a/en-US/Disk_Partitioning_Setup-x86.xml
+++ b/en-US/Disk_Partitioning_Setup-x86.xml
@@ -9,50 +9,56 @@
<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>
+ <!-- End Index terms --> <xi:include href="Automatic_Partitioning_common-caution-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" condition="install-guide" />
+ <!-- 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" condition="install-guide" />
+ <!-- Installation in text mode... --> <important condition="install-guide">
<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" />
+ <xi:include href="Automatic_Partitioning_x86_ppc-tip-para-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" condition="install-guide" />
+ <!-- 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" condition="install-guide" />
+ <!-- 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" condition="install-guide" />
<!-- If you have chosen to automatically partition your system ... -->
</important>
<para>
Select <guilabel>Installation Destination</guilabel> from the Installation Summary Menu to select and partition the disks Fedora will be installed on.
</para>
- <para>
+ <para condition="install-guide">
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-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-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-para-2.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-para-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude" condition="install-guide" />
<!-- If you do not feel comfortable with partitioning your system --> <!-- <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" />
- <!-- To encrypt all partitions except the /boot partition... --> <xi:include href="Automatic_Partitioning_common-para-6.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- Choose your preferred partitioning method... --> <xi:include href="Automatic_Partitioning_quickstart-para-3.xml" xmlns:xi="http://www.w3.org/2001/XInclude" condition="quick-start" />
+ <!-- You may want to simply install Fedora on all available disks... --> <xi:include href="Automatic_Partitioning_common-para-5.xml" xmlns:xi="http://www.w3.org/2001/XInclude" condition="install-guide" />
+ <!-- To encrypt all partitions except the /boot partition... --> <xi:include href="Automatic_Partitioning_quickstart-note-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" condition="quick-start" />
+ <!-- During installation, all data will be erased... --> <xi:include href="Automatic_Partitioning_common-para-6.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<!-- Click Continue once you have made your selections... --> <xi:include href="Automatic_Partitioning_common-para-3.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <!-- The Installation Options dialog now appears... --> <xi:include href="Disk_Partitioning_Setup_common-figure-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <!-- Choose automatic partitioning or manual partitioning... --> <xi:include href="Automatic_Partitioning_common-para-7.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <!-- If there is sufficient space... --> <xi:include href="Automatic_Partitioning_common-itemizedlist-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <!-- Click Cancel and add more disks... --> <xi:include href="Disk_Partitioning_Setup_common-figure-3.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <!-- Choose automatic partitioning or manual partitioning... --> <xi:include href="Automatic_Partitioning_common-para-8.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <!-- If there is not enough space... --> <xi:include href="Automatic_Partitioning_common-itemizedlist-3.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <!-- Free space available... --> <xi:include href="Automatic_Partitioning_common-para-11.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <!-- Choose from the following paths... --> <xi:include href="Automatic_Partitioning_common-itemizedlist-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <!-- Click Cancel and add more disks... --> <xi:include href="Automatic_Partitioning_common-para-10.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <!-- Whichever path you choose... --> <xi:include href="Automatic_Partitioning_common-para-4.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <!-- Click Partition Scheme Configuration to choose... --> <xi:include href="Automatic_Partitioning_common-list-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <!-- Standard Partition... --> <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" />
+ <!-- The Installation Options dialog now appears... --> <xi:include href="Disk_Partitioning_Setup_common-figure-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude" condition="install-guide" />
+ <!-- Choose automatic partitioning or manual partitioning... --> <xi:include href="Disk_Partitioning_Setup_quickstart-figure-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" condition="quick-start" />
+ <!-- Choose automatic partitioning or manual partitioning... --> <xi:include href="Automatic_Partitioning_common-para-7.xml" xmlns:xi="http://www.w3.org/2001/XInclude" condition="install-guide" />
+ <!-- If there is sufficient space... --> <xi:include href="Automatic_Partitioning_quickstart-para-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" condition="quick-start" />
+ <!-- To create and edit the partitions yourself... --> <xi:include href="Automatic_Partitioning_quickstart-para-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude" condition="quick-start" />
+ <!-- Click Continue to allow Fedora... --> <xi:include href="Automatic_Partitioning_common-itemizedlist-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" condition="install-guide"/>
+ <!-- Click Cancel and add more disks... --> <xi:include href="Disk_Partitioning_Setup_common-figure-3.xml" xmlns:xi="http://www.w3.org/2001/XInclude" condition="install-guide"/>
+ <!-- Choose automatic partitioning or manual partitioning... --> <xi:include href="Automatic_Partitioning_common-para-8.xml" xmlns:xi="http://www.w3.org/2001/XInclude" condition="install-guide" />
+ <!-- If there is not enough space... --> <xi:include href="Automatic_Partitioning_common-itemizedlist-3.xml" xmlns:xi="http://www.w3.org/2001/XInclude" condition="install-guide" />
+ <!-- Free space available... --> <xi:include href="Automatic_Partitioning_common-para-11.xml" xmlns:xi="http://www.w3.org/2001/XInclude" condition="install-guide" />
+ <!-- Choose from the following paths... --> <xi:include href="Automatic_Partitioning_common-itemizedlist-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude" condition="install-guide"/>
+ <!-- Click Cancel and add more disks... --> <xi:include href="Automatic_Partitioning_common-para-10.xml" xmlns:xi="http://www.w3.org/2001/XInclude" condition="install-guide" />
+ <!-- Whichever path you choose... --> <xi:include href="Automatic_Partitioning_common-para-4.xml" xmlns:xi="http://www.w3.org/2001/XInclude" condition="install-guide" />
+ <!-- Click Partition Scheme Configuration to choose... --> <xi:include href="Automatic_Partitioning_common-list-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" condition="install-guide" />
+ <!-- Standard Partition... --> <xi:include href="Disk_Partitioning_Setup_common-important-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" condition="install-guide" />
+ <!-- Important - chain loading... --> <xi:include href="Disk_Partitioning_Setup_common-important-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude" condition="install-guide" />
<!-- Important - multipath and non-multipath... -->
- <xi:include href="X86_Bootloader.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="X86_Bootloader.xml" xmlns:xi="http://www.w3.org/2001/XInclude" condition="install-guide"/>
<!-- x86, AMD64, and Intel 64 Boot Loader Configuration -->
</section>
diff --git a/en-US/Disk_Partitioning_Setup_quickstart-figure-1.xml b/en-US/Disk_Partitioning_Setup_quickstart-figure-1.xml
new file mode 100644
index 0000000..559f784
--- /dev/null
+++ b/en-US/Disk_Partitioning_Setup_quickstart-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_Guide.ent">
+%BOOK_ENTITIES;
+]>
+<figure float="0">
+ <title>Installation Options dialog</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/diskpartsetup/install-options-live.png" format="PNG" width="444" />
+ </imageobject>
+ <textobject>
+ <para>
+ Edit the partition configuration and select custom partitioning
+ </para>
+
+ </textobject>
+
+ </mediaobject>
+</figure>
+
diff --git a/en-US/Download_Fedora.xml b/en-US/Download_Fedora.xml
new file mode 100644
index 0000000..16090ce
--- /dev/null
+++ b/en-US/Download_Fedora.xml
@@ -0,0 +1,12 @@
+<?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="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/&PRODVER;/Live/i686/Fedora-&PRODVER;-i686-Live-Desktop.iso"></ulink>.
+ Download and save this file to your computer.
+ </para>
+</section>
diff --git a/en-US/Fedora_Live_Desktop.xml b/en-US/Fedora_Live_Desktop.xml
new file mode 100644
index 0000000..a642648
--- /dev/null
+++ b/en-US/Fedora_Live_Desktop.xml
@@ -0,0 +1,47 @@
+<?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="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>
+ <mediaobject>
+ <imageobject><imagedata fileref="images/livedesktop/livedesktop-login.png" format="PNG" width="444"/></imageobject>
+ <textobject><para>
+ The Fedora live system login screen. Click the user named <guilabel>Live System User</guilabel> to log in and reach the desktop.
+ </para>
+ </textobject>
+ </mediaobject>
+ </figure>
+
+ <para>
+ Click the <guibutton>Live System User</guibutton> button. No password is required. The Fedora live system desktop will then load.
+ </para>
+
+
+ <para>
+ After a few seconds, a menu will appear offering two choices.
+ </para>
+
+ <figure float="0" id="fig-livedesktop"><title>Try or install Fedora</title>
+ <mediaobject>
+ <imageobject><imagedata fileref="images/livedesktop/try_or_install.png" format="PNG" width="444"/></imageobject>
+ <textobject><para>
+ The menu presented when the desktop loads, offering the choice to try Fedora or install it to the hard drive.
+ </para>
+ </textobject>
+ </mediaobject>
+ </figure>
+
+ <para>
+ To test out Fedora before installing, click <guibutton>Try Fedora</guibutton> to browse the desktop interface.
+ </para>
+
+ <para>
+ To install Fedora, click <guibutton>Install to Hard Drive</guibutton>.
+ </para>
+
+</section>
diff --git a/en-US/Graphical_Installation_install-hub.xml b/en-US/Graphical_Installation_install-hub.xml
index c463344..62a5917 100644
--- a/en-US/Graphical_Installation_install-hub.xml
+++ b/en-US/Graphical_Installation_install-hub.xml
@@ -10,7 +10,7 @@
<para>
The Installation Summary Menu is the central screen for setting up an installation.
</para>
- <figure float="0">
+ <figure float="0" condition="install-guide">
<title>The Installation Summary Menu</title>
<mediaobject>
<imageobject>
@@ -26,6 +26,23 @@
</mediaobject>
</figure>
+
+ <figure float="0" condition="quick-start">
+ <title>The Installation Summary Menu</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/preinstallhub/preinstall_hub-live.png" format="PNG" width="444" />
+ </imageobject>
+ <textobject>
+ <para>
+ Installation Summary Menu screen
+ </para>
+
+ </textobject>
+
+ </mediaobject>
+
+ </figure>
<para>
Instead of directing you through consecutive screens, the Fedora installer allows you to configure your installation in the order you choose.
</para>
diff --git a/en-US/Installation_Guide.ent b/en-US/Installation_Guide.ent
index b779a41..c54c2dd 100644
--- a/en-US/Installation_Guide.ent
+++ b/en-US/Installation_Guide.ent
@@ -2,5 +2,5 @@
<!ENTITY PRODVER "18">
<!ENTITY PREVVER "17">
<!ENTITY BOOKID "install-guide">
-<!ENTITY YEAR "2012">
+<!ENTITY YEAR "2013">
<!ENTITY HOLDER "Red Hat, Inc. and others">
diff --git a/en-US/Installation_Quick_Start_Guide.ent b/en-US/Installation_Quick_Start_Guide.ent
new file mode 100644
index 0000000..6309f8a
--- /dev/null
+++ b/en-US/Installation_Quick_Start_Guide.ent
@@ -0,0 +1,6 @@
+<!ENTITY PRODUCT "Fedora Documentation">
+<!ENTITY BOOKID "installation-quick-start-guide">
+<!ENTITY YEAR "2013">
+<!ENTITY HOLDER "Red Hat, Inc. and others">
+<!ENTITY PRODVER "18">
+
diff --git a/en-US/Installation_Quick_Start_Guide.xml b/en-US/Installation_Quick_Start_Guide.xml
new file mode 100644
index 0000000..29534e8
--- /dev/null
+++ b/en-US/Installation_Quick_Start_Guide.xml
@@ -0,0 +1,60 @@
+<?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" [
+]>
+
+<article>
+ <xi:include href="Article_Info.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+
+ <xi:include href="Introduction.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+
+ <xi:include href="Requirements.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+
+ <xi:include href="Download_Fedora.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+
+ <xi:include href="Burn_the_image_file_to_CD.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+
+ <xi:include href="Boot_your_computer_from_the_CD.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_Configuration-x86.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+
+ <xi:include href="Graphical_Installation_install-hub.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" />
+
+ <!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Storage_Devices-x86.xml"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Assign_Storage_Devices-x86.xml"/> -->
+
+ <xi:include href="Time_Zone-x86.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="Package_Selection-Live.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="Progress_Hub-x86.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="Reboot-quickstart.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+
+ <xi:include href="firstboot-welcome.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+
+ <xi:include href="firstboot-license.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+
+ <xi:include href="firstboot-systemuser.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+
+ <xi:include href="firstboot-datetime.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+
+ <xi:include href="Your_installation_is_complete.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+
+ <xi:include href="Common_Content/Feedback.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+
+ <xi:include href="Package_Selection-quickstart.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+
+ <xi:include href="Revision_History-quickstart.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+</article>
+
diff --git a/en-US/Introduction.xml b/en-US/Introduction.xml
new file mode 100644
index 0000000..1921579
--- /dev/null
+++ b/en-US/Introduction.xml
@@ -0,0 +1,11 @@
+<?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="Introduction">
+ <title>Introduction</title>
+ <para>
+ This guide shows you how to download a Fedora &PRODVER; live CD image, burn this image to a disc, and use this disc to install Fedora &PRODVER; on a typical desktop or notebook computer. This guide is not a complete description of the installation process and all its options — for greater detail, refer to the <citetitle>Fedora &PRODVER; Installation Guide</citetitle>, available from <ulink url="http://docs.fedoraproject.org/"></ulink>.
+ </para>
+</section>
+
diff --git a/en-US/Key_Board_Configuration-x86.xml b/en-US/Key_Board_Configuration-x86.xml
index da6abe6..ed16cee 100644
--- a/en-US/Key_Board_Configuration-x86.xml
+++ b/en-US/Key_Board_Configuration-x86.xml
@@ -35,28 +35,28 @@
<para>
To change the layout or add additional layouts, click the <guibutton>+</guibutton> button and select from the list. To delete a layout, select it and click the <guibutton>-</guibutton> button. Use the arrow buttons to arrange the layouts in order of preference. For a visual preview of the keyboard layout, select it and click the keyboard button.
</para>
- <para>
+ <para condition="install-guide">
To test a layout, use the mouse to click inside the text box at the right. Type some text to confirm that your selection functions correctly.
</para>
- <para>
+ <para condition="install-guide">
To test additional layouts, you will need to set up a keyboard combination to toggle between them. Click <guibutton>Options</guibutton> to open the <guilabel>Layout Switching Options</guilabel> dialog and choose a combination from the list by selecting its check box. The combination will then be displayed above the <guibutton>Options</guibutton> button. This combination applies both during the installer and on the installed system, so you must configure a combination here in order to use one after installation.
</para>
- <important>
+ <important condition="install-guide">
<para>
If you use a layout that cannot accept Roman/ASCII characters, such as <guilabel>Russian</guilabel>, you are advised to also add the <guilabel>English (United States)</guilabel> layout and configure a keyboard combination to switch between the two layouts. If you select only your native layout or do not configure a layout switch combination, you may be unable to enter a valid root password or user credentials later in the installation process. This may prevent you from completing the installation.
</para>
</important>
- <xi:include href="Key_Board_Configuration_x86_ppc-para-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="Key_Board_Configuration_x86_ppc-para-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" condition="install-guide" />
<!-- Using your mouse, select the correct layout type ... -->
- <xi:include href="Key_Board_Configuration_x86_ppc-para-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="Key_Board_Configuration_x86_ppc-para-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude" condition="install-guide" />
<!-- Actually, despite the name, this is a tip.
To change your keyboard layout type after you have completed... -->
- <para>
+ <para condition="install-guide">
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>
diff --git a/en-US/Package_Selection-Live.xml b/en-US/Package_Selection-Live.xml
new file mode 100644
index 0000000..a5c5f9c
--- /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-live">
+
+ <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-x86"/> for details of package selection.
+ </para>
+
+</section>
\ No newline at end of file
diff --git a/en-US/Package_Selection-quickstart.xml b/en-US/Package_Selection-quickstart.xml
new file mode 100644
index 0000000..0e4b0ee
--- /dev/null
+++ b/en-US/Package_Selection-quickstart.xml
@@ -0,0 +1,45 @@
+<?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_Guide.ent">
+%BOOK_ENTITIES;
+]>
+<appendix id="ap-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-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_quickstart-note-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" condition="quick-start" />
+ <!-- DVD or six-CD set only --> <figure float="0" id="fig-pkgselection-group-x86">
+ <title>Software 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>
+
+ </figure>
+ <xi:include href="Package_Selection_common-para-12.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- To specify which packages Fedora will... --> <xi:include href="Package_Selection_common-para-7.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- By default, Fedora installs the GNOME... --> <xi:include href="Package_Selection_common-list-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- Graphical Desktops
+ GNOME Desktop
+ KDE Plasma Workspaces --> <xi:include href="Package_Selection_common-note-3.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- Only one desktop environment can be selected at install time --> <xi:include href="Package_Selection_common-para-8.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- Fedora will automatically install the base... --> <xi:include href="Package_Selection_common-para-9.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- To specify add-ons for installation... --> <xi:include href="Package_Selection_common-para-10.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- Once you have selected an environment... --> <xi:include href="Package_Selection_common-para-11.xml" xmlns:xi="http://www.w3.org/2001/XInclude" condition="install-guide"/>
+ <!-- The packages that you select are not permanent... -->
+
+</appendix>
+
+
diff --git a/en-US/Package_Selection-x86.xml b/en-US/Package_Selection-x86.xml
index 4f7d18e..d09a4c5 100644
--- a/en-US/Package_Selection-x86.xml
+++ b/en-US/Package_Selection-x86.xml
@@ -13,8 +13,9 @@
<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-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">
+ <!-- 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" condition="install-guide" />
+ <!-- Installing in text mode --> <xi:include href="Package_Selection_quickstart-note-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" condition="quick-start" />
+ <!-- DVD or six-CD set only --> <figure float="0" id="fig-pkgselection-group-x86">
<title>Software Selection</title>
<mediaobject>
<imageobject>
@@ -37,7 +38,7 @@
<!-- Only one desktop environment can be selected at install time --> <xi:include href="Package_Selection_common-para-8.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<!-- Fedora will automatically install the base... --> <xi:include href="Package_Selection_common-para-9.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<!-- To specify add-ons for installation... --> <xi:include href="Package_Selection_common-para-10.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <!-- Once you have selected an environment... --> <xi:include href="Package_Selection_common-para-11.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- Once you have selected an environment... --> <xi:include href="Package_Selection_common-para-11.xml" xmlns:xi="http://www.w3.org/2001/XInclude" condition="install-guide"/>
<!-- The packages that you select are not permanent... -->
<!-- <para>
@@ -51,7 +52,7 @@
<!-- Select Customize now to specify the software packages for your final... --> <!-- <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 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 id="sn-mandatory-services-x86">
+ <section id="sn-mandatory-services-x86" condition="install-guide">
<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" />
diff --git a/en-US/Package_Selection_quickstart-note-1.xml b/en-US/Package_Selection_quickstart-note-1.xml
new file mode 100644
index 0000000..4c66b45
--- /dev/null
+++ b/en-US/Package_Selection_quickstart-note-1.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_Guide.ent">
+%BOOK_ENTITIES;
+]>
+<note>
+ <title>DVD or six-CD set 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/Progress_Hub-x86.xml b/en-US/Progress_Hub-x86.xml
index b97a2db..b218e22 100644
--- a/en-US/Progress_Hub-x86.xml
+++ b/en-US/Progress_Hub-x86.xml
@@ -7,11 +7,11 @@
<xi:include href="Progress_Hub_common-title.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<!-- The Configuration Menu and Progress Screen --> <xi:include href="Progress_Hub_common-para-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<!-- Once you have completed all the required sections of the Installation Summary Menu --> <xi:include href="Progress_Hub_common-figure-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="Progress_Hub_common-para-2a.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="Progress_Hub_common-para-2a.xml" xmlns:xi="http://www.w3.org/2001/XInclude" condition="install-guide" />
<!-- For your reference, a complete log of your installation can be found --> <xi:include href="Progress_Hub_common-para-3.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<!-- While the packages are being installed -->
- <xi:include href="Account_Configuration-x86.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="Account_Configuration-x86.xml" xmlns:xi="http://www.w3.org/2001/XInclude" condition="install-guide"/>
<!-- Account Configuration -->
</section>
diff --git a/en-US/Reboot-quickstart.xml b/en-US/Reboot-quickstart.xml
new file mode 100644
index 0000000..b854627
--- /dev/null
+++ b/en-US/Reboot-quickstart.xml
@@ -0,0 +1,24 @@
+<?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="Reboot_your_system">
+ <title>Reboot your system</title>
+ <para>
+ Once the packages are installed and you have set the root password, click the <guibutton>Quit</guibutton> button that will appear at the bottom of the screen to exit to the Live Desktop.
+ </para>
+
+ <figure float="0" id="fig-reboot"><title>Packages installed</title>
+ <mediaobject>
+ <imageobject><imagedata fileref="images/reboot/reboot.png" format="PNG" width="444"/></imageobject>
+ <textobject><para>
+ The menu presented when the desktop loads, offering the choice to try Fedora or install it to the hard drive.
+ </para>
+ </textobject>
+ </mediaobject>
+ </figure>
+
+ <para>
+ Click <guilabel>Live System User</guilabel> in the top right of the Live Desktop. Click <guilabel>Power Off</guilabel> from the drop-down menu that appears, then <guilabel>Restart</guilabel> to reboot your system and begin the Firstboot process.
+ </para>
+</section>
diff --git a/en-US/Requirements.xml b/en-US/Requirements.xml
new file mode 100644
index 0000000..1a92276
--- /dev/null
+++ b/en-US/Requirements.xml
@@ -0,0 +1,84 @@
+<?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="Requirements">
+ <title>Requirements</title>
+ <para>
+ To create a Fedora live CD, you need:
+ <itemizedlist>
+ <listitem>
+ <para>
+ a broadband connection to the Internet.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ a computer with a CD or DVD burner.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ software that allows you to create a CD from an image file.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ a blank, writeable CD.
+ </para>
+ </listitem>
+ </itemizedlist>
+ </para>
+ <!-- the following para is from new-users.xml -->
+ <para>
+ If you do not have a fast Internet connection, or if you have a problem creating boot media, downloading may not be an option. Fedora DVD and CD distribution media is available from a number of online sources around the world at a minimal cost. Use your favorite Web search engine to locate a vendor, or refer to <ulink url="http://fedoraproject.org/wiki/Distribution"/>.
+ </para>
+ <para>
+ The computer on which you intend to install Fedora &PRODVER; from the live CD should have:
+ <itemizedlist>
+ <listitem>
+ <para>
+ a CD or DVD drive, and the capability to boot from this drive.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ a 400 MHz processor or faster
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ at least 1 GB of memory (RAM) <!-- this line different from Installation Guide; more RAM required to install from live image -->
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ at least 10 GB of permanent storage (hard drive) space.
+ </para>
+ </listitem>
+ </itemizedlist>
+ These specifications represent a bare minumum to use Fedora in graphical mode. Almost any laptop or desktop computer manufactured in recent years will meet these requirements. For more details of the hardware requirements for Fedora &PRODVER;, refer to the <citetitle>Fedora &PRODVER; Release Notes</citetitle>, available from <ulink url="http://docs.fedoraproject.org/"></ulink>.
+ </para>
+ <para>
+ If your computer does not have a CD or DVD drive, or is not capable of booting from this drive, then you might be able to install Fedora from a USB storage device such as a USB flash drive. Refer to the <citetitle>liveusb-creator</citetitle> page at <ulink url="https://fedorahosted.org/liveusb-creator/"></ulink> for instructions.
+ </para>
+ <note>
+ <title>Do you already have Fedora &PRODVER; on CD, DVD, or live USB media?</title>
+ <para>
+ If you already have Fedora &PRODVER; on CD, DVD, or live USB media, you can still use this guide, because many steps will be similar. Skip ahead to <xref linkend="Boot_your_computer_from_the_CD"/>, then
+ </para>
+ <itemizedlist>
+ <listitem>
+ <para>
+ continue through the instructions in order if you have a Fedora &PRODVER; live CD or live USB device.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ skip ahead to <xref linkend="sn-keyboard-x86"/> if you have a Fedora &PRODVER; DVD.
+ </para>
+ </listitem>
+ </itemizedlist>
+ </note>
+</section>
+
diff --git a/en-US/Revision_History-quickstart.xml b/en-US/Revision_History-quickstart.xml
new file mode 100644
index 0000000..c54237e
--- /dev/null
+++ b/en-US/Revision_History-quickstart.xml
@@ -0,0 +1,30 @@
+<?xml version='1.0'?>
+<!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+]>
+
+<appendix id="appe-Publican-Revision_History-quickstart">
+ <title>Revision History</title>
+ <!-- <para>
+ Note that revision numbers relate to the edition of this manual, not to version numbers of Fedora.
+ </para> -->
+ <simpara>
+ <revhistory>
+ <revision>
+ <revnumber>1.0-0</revnumber>
+ <date>Fri Jan 25 2013</date>
+ <author>
+ <firstname>Jack</firstname>
+ <surname>Reed</surname>
+ <email>jreed at redhat.com</email>
+ </author>
+ <revdescription>
+ <simplelist>
+ <member>Updates for Fedora 18</member>
+ </simplelist>
+ </revdescription>
+ </revision>
+ </revhistory>
+ </simpara>
+</appendix>
+
+
diff --git a/en-US/Revision_History.xml b/en-US/Revision_History.xml
index 29eaf5e..34ed012 100644
--- a/en-US/Revision_History.xml
+++ b/en-US/Revision_History.xml
@@ -11,7 +11,7 @@
<revhistory>
<revision>
<revnumber>1.0-0</revnumber>
- <date>Thu Apr 26 2012</date>
+ <date>Tue Jan 13 2013</date>
<author>
<firstname>Jack</firstname>
<surname>Reed</surname>
@@ -19,7 +19,7 @@
</author>
<revdescription>
<simplelist>
- <member>Updates for Fedora 17</member>
+ <member>Updates for Fedora 18</member>
</simplelist>
</revdescription>
</revision>
diff --git a/en-US/Steps_Hardware-x86.xml b/en-US/Steps_Hardware-x86.xml
index d239449..90508f1 100644
--- a/en-US/Steps_Hardware-x86.xml
+++ b/en-US/Steps_Hardware-x86.xml
@@ -23,4 +23,4 @@
<para>
At the end of a successful Fedora installation process, the installation program offers you the option to provide details of your hardware configuration anonymously to the Fedora Project (refer to <xref linkend="sn-smolt"/>). You can view the statistics gathered by this method at <ulink url="http://smolt.fedoraproject.org/static/stats/devices.html"></ulink>. Viewing the list of hardware that makes up systems on which other people have successfully installed Fedora might help you determine how suitable your hardware is.
</para>
-</section>
+</section>
\ No newline at end of file
diff --git a/en-US/Time_Zone-x86.xml b/en-US/Time_Zone-x86.xml
index 5f9092b..ee91208 100644
--- a/en-US/Time_Zone-x86.xml
+++ b/en-US/Time_Zone-x86.xml
@@ -14,15 +14,15 @@
<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-7.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<!-- Select Date and Time --> <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" />
+ <!-- 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" condition="install-guide" />
<!-- 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-para-3.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-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" />
+ <!-- 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" condition="install-guide" />
<!-- 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" />
<!-- Once you have made your selection --> <!-- <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" />
+ <!-- Windows and the System Clock --> <xi:include href="Time_Zone_common-tip-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" condition="install-guide" />
<!-- To change your time zone configuration after you have completed the installation, -->
</section>
diff --git a/en-US/Write_changes_to_disk_quickstart-figure-1.xml b/en-US/Write_changes_to_disk_quickstart-figure-1.xml
new file mode 100644
index 0000000..75d1a36
--- /dev/null
+++ b/en-US/Write_changes_to_disk_quickstart-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_Guide.ent">
+%BOOK_ENTITIES;
+]>
+<figure float="0">
+ <title>Ready to install</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/diskpartitioning/write_changes-live.png" format="PNG" width="444" />
+ </imageobject>
+ <textobject>
+ <para>
+ When all required items on the Installation Summary Menu have been attended to, the installation can begin.
+ </para>
+
+ </textobject>
+
+ </mediaobject>
+</figure>
+
diff --git a/en-US/Write_changes_to_disk_x86.xml b/en-US/Write_changes_to_disk_x86.xml
index e1ba975..a13e103 100644
--- a/en-US/Write_changes_to_disk_x86.xml
+++ b/en-US/Write_changes_to_disk_x86.xml
@@ -6,7 +6,8 @@
<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" />
+ <!-- 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" condition="install-guide" />
+ <!-- Writing storage configuration to disk --> <xi:include href="Write_changes_to_disk_quickstart-figure-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" condition="quick-start" />
<!-- 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" />
diff --git a/en-US/Your_installation_is_complete.xml b/en-US/Your_installation_is_complete.xml
new file mode 100644
index 0000000..0aba7ca
--- /dev/null
+++ b/en-US/Your_installation_is_complete.xml
@@ -0,0 +1,13 @@
+<?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="Your_installation_is_complete">
+ <title>Your installation is complete</title>
+ <para>
+ Fedora is now installed on your computer. Log in with the username and password that you created during the installation process.
+ </para>
+ <para>
+ To learn more about Fedora, visit the Fedora Project website at <ulink url="http://fedoraproject.org/"></ulink>. If you need help installing or using Fedora, visit <ulink url="http://fedoraproject.org/en/get-help"></ulink>.
+ </para>
+</section>
diff --git a/en-US/firstboot-datetime.xml b/en-US/firstboot-datetime.xml
new file mode 100644
index 0000000..94ed9f0
--- /dev/null
+++ b/en-US/firstboot-datetime.xml
@@ -0,0 +1,45 @@
+<?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">
+
+<!-- TEXT FROM firstboot.xml -->
+
+<section id="sn-firstboot-datetime">
+ <title>Date and Time</title>
+
+ <indexterm>
+ <primary>NTP (Network Time Protocol)</primary>
+ </indexterm>
+
+ <para condition="install-guide">
+ Use this screen to adjust the date and time of the system clock. To change these settings after installation, click <menuchoice> <guimenu>System</guimenu> <guisubmenu>Administration</guisubmenu> <guimenuitem>Date & Time</guimenuitem> </menuchoice>.
+ </para>
+
+ <para condition="quick-start">
+ 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, 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>
+ <firstterm>NTP</firstterm> (Network Time Protocol) servers to maintain the accuracy of the clock. NTP provides time synchronization service to computers on the same network. The Internet contains many computers that offer public NTP services.
+ </para>
+
+ <figure float="0"><title>Firstboot date and time screen</title>
+ <mediaobject>
+ <imageobject><imagedata fileref="images/firstboot/fb-datetime.png" format="PNG" width="444"/></imageobject>
+ <textobject><para>
+ Firstboot date and time screen
+ </para>
+ </textobject>
+ </mediaobject>
+ </figure>
+
+ <para condition="install-guide">
+ Click the <guilabel>Synchronize date and time over the network</guilabel> checkbox to configure your system to use <firstterm>Network Time Protocol</firstterm> (NTP) servers to maintain the accuracy of the clock. NTP provides time synchronization service to computers on the same network. Many public NTP servers are available on the Internet.
+ </para>
+
+ <para condition="quick-start">
+ Click <guibutton>Finish</guibutton> to complete and exit <application>Firstboot</application>.
+ </para>
+
+</section>
diff --git a/en-US/firstboot-license.xml b/en-US/firstboot-license.xml
new file mode 100644
index 0000000..05a71ae
--- /dev/null
+++ b/en-US/firstboot-license.xml
@@ -0,0 +1,27 @@
+<?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">
+
+<!-- TEXT FROM firstboot.xml -->
+
+<section id="sn-firstboot-license">
+ <title>License Agreement</title>
+
+ <para>
+ This screen displays the overall licensing terms for Fedora. Each software package in Fedora is covered by its own license. All licensing guidelines for Fedora are located at <ulink url="http://fedoraproject.org/wiki/Legal/Licenses"/>.
+ </para>
+
+ <figure float="0"><title>Firstboot license screen</title>
+ <mediaobject>
+ <imageobject><imagedata fileref="images/firstboot/fb-license.png" format="PNG" width="444"/></imageobject>
+ <textobject><para>
+ Firstboot license screen
+ </para>
+ </textobject>
+ </mediaobject>
+ </figure>
+ <para>
+ If you agree to the terms of the licence, click <guibutton>Forward</guibutton>.
+ </para>
+ </section>
diff --git a/en-US/firstboot-systemuser.xml b/en-US/firstboot-systemuser.xml
new file mode 100644
index 0000000..b1b2401
--- /dev/null
+++ b/en-US/firstboot-systemuser.xml
@@ -0,0 +1,131 @@
+<?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">
+
+<!-- TEXT FROM firstboot.xml -->
+
+ <section id="sn-firstboot-systemuser">
+ <title>Create User</title>
+
+ <para>
+ Create a user account for yourself with this screen. Always use this account to log in to your Fedora system, rather than using the <systemitem class="username">root</systemitem> account.
+ </para>
+
+ <figure float="0"><title>Firstboot create user screen</title>
+ <mediaobject>
+ <imageobject><imagedata fileref="images/firstboot/fb-createuser.png" format="PNG" width="444"/></imageobject>
+ <textobject><para>
+ Firstboot create user screen
+ </para>
+ </textobject>
+ </mediaobject>
+ </figure>
+
+
+ <para condition="install-guide">
+ Enter a user name and your full name, and then enter your chosen password. Type your password once more in the <guilabel>Confirm Password</guilabel> box to ensure that it is correct. <!-- FIXME Refer to <xref linkend="sn-account_configuration" /> for guidelines on selecting a secure password. -->
+ </para>
+ <para condition="install-guide">
+ Check the <guilabel>Add to Administrators group</guilabel> box if you would like administrative privileges. This will place you in the wheel group, which gives you access to all administrative functions, including installing and updating software, creating and altering configuration files, and administering other users.
+ </para>
+ <para condition="install-guide">
+ To configure Fedora to use network services for authentication of user information, click <guibutton>Use Network Login</guibutton>. Refer to <xref linkend="sn-firstboot-authentication"/> for further details.
+ </para>
+ <para condition="install-guide">
+ To create additional users or customise your first user account, click <guibutton>Advanced</guibutton> to open the <application>User Manager</application>.
+ </para>
+
+ <figure float="0" condition="install-guide"><title>User Manager</title>
+ <mediaobject>
+ <imageobject><imagedata fileref="images/firstboot/fb-createuser-usermanager.png" format="PNG"/></imageobject>
+ <textobject><para>
+ Firstboot user manager screen
+ </para>
+ </textobject>
+ </mediaobject>
+ </figure>
+
+ <para condition="install-guide">
+ In <application>User Manager</application> you can edit various properties, such as a private group for the user, the preferred login shell, and user and group IDs.
+ </para>
+
+ <important condition="install-guide">
+ <title>Important — Create at least one user account</title>
+ <para>
+ If you do not create at least one user account in this step, you will not be able to log in to the Fedora graphical environment. If you skipped this step during installation, refer to <xref linkend="Trouble_After_Booting-GUI"/>.
+ </para>
+ </important>
+ <note condition="install-guide">
+ <title>Note — Creating Extra User Accounts</title>
+ <para>
+ To add additional user accounts to your system after the installation is complete, choose <menuchoice> <guimenu>System</guimenu> <guisubmenu>Administration</guisubmenu> <guimenuitem>Users & Groups</guimenuitem> </menuchoice>.
+ </para>
+ </note>
+
+ <section id="sn-firstboot-authentication" condition="install-guide">
+ <title>Authentication Configuration</title>
+
+ <para>
+ If you clicked <guibutton>Use Network Login</guibutton> on the <guilabel>Create User</guilabel> screen, you must now specify how users are to be authenticated on the system. Use the drop-down menu to select from the following types of user database:
+ </para>
+ <itemizedlist>
+ <listitem>
+ <para>
+ <guimenuitem>Local accounts only</guimenuitem> (for use when the user database on the network is not accessible)
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <guimenuitem>LDAP</guimenuitem> (Lightweight Directory Access Protocol)
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <guimenuitem>NIS</guimenuitem> (Network Information Service)
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <guimenuitem>Winbind</guimenuitem> (for use with Microsoft Active Directory)
+ </para>
+ </listitem>
+ </itemizedlist>
+ <figure float="0"><title>Firstboot Authentication Configuration screen</title>
+ <mediaobject>
+ <imageobject><imagedata fileref="images/firstboot/fb-authentication.png" format="PNG"/></imageobject>
+ <textobject><para>
+ Firstboot Authentication Configuration screen
+ </para>
+ </textobject>
+ </mediaobject>
+ </figure>
+ <para>
+ When you select the type of user database appropriate for your network, you must provide additional details relevant to that database type. For example, if you select <literal>LDAP</literal>, you must specify the <firstterm>base distinguished name</firstterm> for LDAP searches, and the address of the LDAP server. You must also select an <guilabel>Authentication Method</guilabel> relevant to the type of user database that you chose, for example, a Kerberos password, LDAP password, or NIS password.
+ </para>
+ <para>
+ The <guilabel>Advanced Options</guilabel> tab lets you enable other authentication mechanisms, including fingerprint readers, smart cards, and local access control in <filename>/etc/security/access.conf</filename>.
+ </para>
+ <figure float="0"><title>Firstboot authentication Advanced Options screen</title>
+ <mediaobject>
+ <imageobject><imagedata fileref="images/firstboot/fb-auth-advanced.png" format="PNG"/></imageobject>
+ <textobject><para>
+ Firstboot authentication Advanced Options screen
+ </para>
+ </textobject>
+ </mediaobject>
+ </figure>
+ <para>
+ The <guilabel>Password Options</guilabel> tab lets you set format requirements for user passwords, including minimum length and required character classes such as lower case, upper case, and numbers.
+ </para>
+ <figure float="0"><title>Firstboot authentication Password Options screen</title>
+ <mediaobject>
+ <imageobject><imagedata fileref="images/firstboot/fb-auth-passwd.png" format="PNG"/></imageobject>
+ <textobject><para>
+ Firstboot authentication Password Options screen
+ </para>
+ </textobject>
+ </mediaobject>
+ </figure>
+ </section>
+ </section>
\ No newline at end of file
diff --git a/en-US/firstboot-welcome.xml b/en-US/firstboot-welcome.xml
new file mode 100644
index 0000000..9d6a529
--- /dev/null
+++ b/en-US/firstboot-welcome.xml
@@ -0,0 +1,45 @@
+<?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">
+
+<!-- TEXT FROM firstboot.xml -->
+
+<section id="sn-firstboot-welcome">
+ <title>Welcome to Firstboot</title>
+
+<!--
+ <indexterm>
+ <primary>Firstboot</primary>
+ </indexterm> -->
+ <para>
+ <application>Firstboot</application> launches the first time
+ that you start a new Fedora system. Use <application>Firstboot</application> to configure the system for use before you log
+ in.
+ </para>
+
+<figure float="0"><title>Firstboot welcome screen</title>
+ <mediaobject>
+ <imageobject><imagedata fileref="images/firstboot/fb-welcome.png" format="PNG" width="444"/></imageobject>
+ <textobject><para>
+ Firstboot welcome screen
+ </para>
+ </textobject>
+ </mediaobject>
+</figure>
+
+ <para>
+ Select <guibutton>Forward</guibutton> to start
+ <application>Firstboot</application>.
+ </para>
+
+</section>
+<!-- <note>
+ <title>Graphical Interface Required</title>
+
+ <para>
+ <application>Firstboot</application> requires a graphical
+ interface. If you did not install one, or if Fedora has trouble
+ starting it, you may see a slightly different setup screen.
+ </para>
+ </note> -->
diff --git a/en-US/firstboot.xml b/en-US/firstboot.xml
index 7468c83..0c153f2 100644
--- a/en-US/firstboot.xml
+++ b/en-US/firstboot.xml
@@ -6,33 +6,27 @@
<!-- $Id: -->
<chapter id="ch-firstboot">
+
<title>Firstboot</title>
<indexterm>
<primary>Firstboot</primary>
</indexterm>
- <important>
+ <important condition="install-guide">
<title>Important — Firstboot not available after text-mode installation</title>
<para>
Firstboot is only available on systems after a graphical installation or after a kickstart installation where a desktop and the X window system were installed and graphical login was enabled. If you performed a text-mode installation or a kickstart installation that did not include a desktop and the X window system, the <application>Firstboot</application> configuration tool does not appear.
</para>
</important>
- <para>
- <application>Firstboot</application> launches the first time that you start a new Fedora system. Use <application>Firstboot</application> to configure the system for use before you log in.
- </para>
-
- <figure float="0"><title>Firstboot welcome screen</title>
- <mediaobject>
- <imageobject><imagedata fileref="images/firstboot/fb-welcome.png" format="PNG"/></imageobject>
- <textobject><para>
- Firstboot welcome screen
- </para>
- </textobject>
- </mediaobject>
- </figure>
-
- <para>
- Select <guibutton>Forward</guibutton> to start <application>Firstboot</application>.
- </para>
+
+ <xi:include href="firstboot-welcome.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+
+ <xi:include href="firstboot-license.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+
+ <xi:include href="firstboot-systemuser.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+
+ <xi:include href="firstboot-datetime.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+
+ <xi:include href="firstboot-smolt.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<!-- <note>
<title>Graphical Interface Required</title>
@@ -43,27 +37,7 @@
starting it, you may see a slightly different setup screen.
</para>
</note> -->
-
- <section id="sn-firstboot-license">
- <title>License Agreement</title>
- <para>
- This screen displays the overall licensing terms for Fedora. Each software package in Fedora is covered by its own license. All licensing guidelines for Fedora are located at <ulink url="http://fedoraproject.org/wiki/Legal/Licenses"/>.
- </para>
-
- <figure float="0"><title>Firstboot license screen</title>
- <mediaobject>
- <imageobject><imagedata fileref="images/firstboot/fb-license.png" format="PNG"/></imageobject>
- <textobject><para>
- Firstboot license screen
- </para>
- </textobject>
- </mediaobject>
- </figure>
- <para>
- If you agree to the terms of the licence, select <guilabel>Yes, I agree to the License Agreement</guilabel> and click <guibutton>Forward</guibutton>.
- </para>
- </section>
<!--
<section id="sn-firstboot-updates">
<title>Set Up Software Updates</title>
@@ -165,159 +139,7 @@
</section>
-->
- <section id="sn-firstboot-systemuser">
- <title>Create User</title>
-
- <para>
- Create a user account for yourself with this screen. Always use this account to log in to your Fedora system, rather than using the <systemitem class="username">root</systemitem> account.
- </para>
-
- <figure float="0"><title>Firstboot create user screen</title>
- <mediaobject>
- <imageobject><imagedata fileref="images/firstboot/fb-createuser.png" format="PNG"/></imageobject>
- <textobject><para>
- Firstboot create user screen
- </para>
- </textobject>
- </mediaobject>
- </figure>
-
-
- <para>
- Enter a user name and your full name, and then enter your chosen password. Type your password once more in the <guilabel>Confirm Password</guilabel> box to ensure that it is correct. <!-- FIXME Refer to <xref linkend="sn-account_configuration" /> for guidelines on selecting a secure password. -->
- </para>
- <para>
- Check the <guilabel>Add to Administrators group</guilabel> box if you would like administrative privileges. This will place you in the wheel group, which gives you access to all administrative functions, including installing and updating software, creating and altering configuration files, and administering other users.
- </para>
- <para>
- To configure Fedora to use network services for authentication of user information, click <guibutton>Use Network Login</guibutton>. Refer to <xref linkend="sn-firstboot-authentication"/> for further details.
- </para>
- <para>
- To create additional users or customise your first user account, click <guibutton>Advanced</guibutton> to open the <application>User Manager</application>.
- </para>
-
- <figure float="0"><title>User Manager</title>
- <mediaobject>
- <imageobject><imagedata fileref="images/firstboot/fb-createuser-usermanager.png" format="PNG"/></imageobject>
- <textobject><para>
- Firstboot user manager screen
- </para>
- </textobject>
- </mediaobject>
- </figure>
-
- <para>
- In <application>User Manager</application> you can edit various properties, such as a private group for the user, the preferred login shell, and user and group IDs.
- </para>
-
- <important>
- <title>Important — Create at least one user account</title>
- <para>
- If you do not create at least one user account in this step, you will not be able to log in to the Fedora graphical environment. If you skipped this step during installation, refer to <xref linkend="Trouble_After_Booting-GUI"/>.
- </para>
- </important>
- <note>
- <title>Note — Creating Extra User Accounts</title>
- <para>
- To add additional user accounts to your system after the installation is complete, choose <menuchoice> <guimenu>System</guimenu> <guisubmenu>Administration</guisubmenu> <guimenuitem>Users & Groups</guimenuitem> </menuchoice>.
- </para>
- </note>
-
- <section id="sn-firstboot-authentication">
- <title>Authentication Configuration</title>
-
- <para>
- If you clicked <guibutton>Use Network Login</guibutton> on the <guilabel>Create User</guilabel> screen, you must now specify how users are to be authenticated on the system. Use the drop-down menu to select from the following types of user database:
- </para>
- <itemizedlist>
- <listitem>
- <para>
- <guimenuitem>Local accounts only</guimenuitem> (for use when the user database on the network is not accessible)
- </para>
- </listitem>
- <listitem>
- <para>
- <guimenuitem>LDAP</guimenuitem> (Lightweight Directory Access Protocol)
- </para>
- </listitem>
- <listitem>
- <para>
- <guimenuitem>NIS</guimenuitem> (Network Information Service)
- </para>
- </listitem>
- <listitem>
- <para>
- <guimenuitem>Winbind</guimenuitem> (for use with Microsoft Active Directory)
- </para>
- </listitem>
- </itemizedlist>
- <figure float="0"><title>Firstboot Authentication Configuration screen</title>
- <mediaobject>
- <imageobject><imagedata fileref="images/firstboot/fb-authentication.png" format="PNG"/></imageobject>
- <textobject><para>
- Firstboot Authentication Configuration screen
- </para>
- </textobject>
- </mediaobject>
- </figure>
- <para>
- When you select the type of user database appropriate for your network, you must provide additional details relevant to that database type. For example, if you select <literal>LDAP</literal>, you must specify the <firstterm>base distinguished name</firstterm> for LDAP searches, and the address of the LDAP server. You must also select an <guilabel>Authentication Method</guilabel> relevant to the type of user database that you chose, for example, a Kerberos password, LDAP password, or NIS password.
- </para>
- <para>
- The <guilabel>Advanced Options</guilabel> tab lets you enable other authentication mechanisms, including fingerprint readers, smart cards, and local access control in <filename>/etc/security/access.conf</filename>.
- </para>
- <figure float="0"><title>Firstboot authentication Advanced Options screen</title>
- <mediaobject>
- <imageobject><imagedata fileref="images/firstboot/fb-auth-advanced.png" format="PNG"/></imageobject>
- <textobject><para>
- Firstboot authentication Advanced Options screen
- </para>
- </textobject>
- </mediaobject>
- </figure>
- <para>
- The <guilabel>Password Options</guilabel> tab lets you set format requirements for user passwords, including minimum length and required character classes such as lower case, upper case, and numbers.
- </para>
- <figure float="0"><title>Firstboot authentication Password Options screen</title>
- <mediaobject>
- <imageobject><imagedata fileref="images/firstboot/fb-auth-passwd.png" format="PNG"/></imageobject>
- <textobject><para>
- Firstboot authentication Password Options screen
- </para>
- </textobject>
- </mediaobject>
- </figure>
- </section>
- </section>
- <section id="sn-firstboot-datetime">
- <title>Date and Time</title>
-
- <indexterm>
- <primary>NTP (Network Time Protocol)</primary>
- </indexterm>
-
- <para>
- Use this screen to adjust the date and time of the system clock. To change these settings after installation, click <menuchoice> <guimenu>System</guimenu> <guisubmenu>Administration</guisubmenu> <guimenuitem>Date & Time</guimenuitem> </menuchoice>.
- </para>
-
- <figure float="0"><title>Firstboot date and time screen</title>
- <mediaobject>
- <imageobject><imagedata fileref="images/firstboot/fb-datetime.png" format="PNG"/></imageobject>
- <textobject><para>
- Firstboot date and time screen
- </para>
- </textobject>
- </mediaobject>
- </figure>
-
- <para>
- Click the <guilabel>Synchronize date and time over the network</guilabel> checkbox to configure your system to use <firstterm>Network Time Protocol</firstterm> (NTP) servers to maintain the accuracy of the clock. NTP provides time synchronization service to computers on the same network. Many public NTP servers are available on the Internet.
- </para>
-
-
-
- </section>
<!--
<section id="sn-firstboot-kdump">
<title>Kdump</title>
@@ -356,44 +178,7 @@
</section>
-->
- <section id="sn-smolt">
- <title>Hardware Profile</title>
- <para>
- <application>Firstboot</application> displays a screen that
- allows you to submit your hardware information anonymously to the
- Fedora Project. Developers use these hardware details to guide further
- support efforts. You can read more about this project and its
- development at <ulink url="http://smolts.org/"/>.
- </para>
-
-<figure float="0"><title>Firstboot hardware profile screen</title>
- <mediaobject>
- <imageobject><imagedata fileref="images/firstboot/fb-profile.png" format="PNG"/></imageobject>
- <textobject><para>
- Firstboot hardware profile screen
- </para>
- </textobject>
- </mediaobject>
-</figure>
-
-
- <para>
- To opt in to this important work, select <guilabel>Send
- Profile</guilabel>. If you choose not to submit any profile data,
- do not change the default. Select <guilabel>Finish</guilabel> to
- continue to the login screen.
- </para>
- <important>
- <title>Update Your System</title>
-
- <para>
- To ensure the security of your system, run a package update
- after the installation completes.
- <xref linkend="ch-next-steps" /> explains how to update your
- Fedora system.
- </para>
- </important>
- </section>
+
</chapter>
diff --git a/en-US/images/bootscreen/bootscreen-livecd.png b/en-US/images/bootscreen/bootscreen-livecd.png
new file mode 100644
index 0000000..597ce0b
Binary files /dev/null and b/en-US/images/bootscreen/bootscreen-livecd.png differ
diff --git a/en-US/images/diskpartitioning/write_changes-live.png b/en-US/images/diskpartitioning/write_changes-live.png
new file mode 100644
index 0000000..a58b605
Binary files /dev/null and b/en-US/images/diskpartitioning/write_changes-live.png differ
diff --git a/en-US/images/diskpartsetup/install-options-live.png b/en-US/images/diskpartsetup/install-options-live.png
new file mode 100644
index 0000000..9f3e6f1
Binary files /dev/null and b/en-US/images/diskpartsetup/install-options-live.png differ
diff --git a/en-US/images/livedesktop/livedesktop-login.png b/en-US/images/livedesktop/livedesktop-login.png
new file mode 100644
index 0000000..92fd430
Binary files /dev/null and b/en-US/images/livedesktop/livedesktop-login.png differ
diff --git a/en-US/images/livedesktop/try_or_install.png b/en-US/images/livedesktop/try_or_install.png
new file mode 100644
index 0000000..9954ab2
Binary files /dev/null and b/en-US/images/livedesktop/try_or_install.png differ
diff --git a/en-US/images/preinstallhub/preinstall_hub-live.png b/en-US/images/preinstallhub/preinstall_hub-live.png
new file mode 100644
index 0000000..e6dea5a
Binary files /dev/null and b/en-US/images/preinstallhub/preinstall_hub-live.png differ
diff --git a/en-US/images/reboot/reboot.png b/en-US/images/reboot/reboot.png
new file mode 100644
index 0000000..0f5dcaa
Binary files /dev/null and b/en-US/images/reboot/reboot.png differ
diff --git a/en-US/pxe-server-config-bios.xml b/en-US/pxe-server-config-bios.xml
index a615c00..b72474a 100644
--- a/en-US/pxe-server-config-bios.xml
+++ b/en-US/pxe-server-config-bios.xml
@@ -142,4 +142,4 @@ label memtest86
</procedure>
- </section>
+ </section>
\ No newline at end of file
diff --git a/quickstart.cfg b/quickstart.cfg
new file mode 100644
index 0000000..320c551
--- /dev/null
+++ b/quickstart.cfg
@@ -0,0 +1,12 @@
+# Config::Simple 4.59
+# Mon Nov 23 14:29:50 2009
+
+debug: 1
+xml_lang: en-US
+brand: fedora
+version: 0.1
+web_version_label: UNUSED
+condition: quick-start
+mainfile: Installation_Quick_Start_Guide
+rev_file: Revision_History-quickstart.xml
+
More information about the docs-commits
mailing list