commit c22a45d2a76851f22cc5a2b9b3041f9ab75275cb
Author: Jack Reed <jreed(a)redhat.com>
Date: Thu Jan 24 09:54:24 2013 +1000
Editing Software Selection sections for use in the IQSG
en-US/Installation_Quick_Start_Guide.xml | 6 +++---
en-US/Package_Selection-Live.xml | 23 +++++++++++++++++++++++
en-US/Package_Selection-x86.xml | 9 +++++----
en-US/Package_Selection_quickstart-note-1.xml | 12 ++++++++++++
4 files changed, 43 insertions(+), 7 deletions(-)
---
diff --git a/en-US/Installation_Quick_Start_Guide.xml
b/en-US/Installation_Quick_Start_Guide.xml
index 259f068..a66f2bf 100644
--- a/en-US/Installation_Quick_Start_Guide.xml
+++ b/en-US/Installation_Quick_Start_Guide.xml
@@ -29,9 +29,9 @@
<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="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="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" />
@@ -51,7 +51,7 @@
<xi:include href="Common_Content/Feedback.xml"
xmlns:xi="http://www.w3.org/2001/XInclude" />
- <!-- <xi:include href="Package_Selection-dvd.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="Revision_History.xml"
xmlns:xi="http://www.w3.org/2001/XInclude" />
</article>
diff --git a/en-US/Package_Selection-Live.xml b/en-US/Package_Selection-Live.xml
new file mode 100644
index 0000000..12645e2
--- /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="s1-pkgselection-x86"/> 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 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>
+