[install-guide] Added 2nd Lang Selection section due to hub spoke
Jack Reed
jjr at fedoraproject.org
Wed Oct 3 02:46:56 UTC 2012
commit 43fe8feddf4cf0dafe83779281bec06cf8b41326
Author: Jack Reed <jreed at redhat.com>
Date: Wed Oct 3 12:46:34 2012 +1000
Added 2nd Lang Selection section due to hub spoke
en-US/.directory | 5 --
en-US/Graphical_Installation_pre-install-hub.xml | 20 +++++---
en-US/Language_Configuration-hub-x86.xml | 48 ++++++++++++++++++++
en-US/Language_Configuration-x86.xml | 8 ++-
en-US/Language_Configuration_x86_ppc-para-1.xml | 2 +-
en-US/Language_Configuration_x86_ppc-para-2.xml | 9 ++++
.../images/langselection/langselection-hub-GUI.png | Bin 0 -> 56138 bytes
7 files changed, 75 insertions(+), 17 deletions(-)
---
diff --git a/en-US/Graphical_Installation_pre-install-hub.xml b/en-US/Graphical_Installation_pre-install-hub.xml
index ccd8bf9..301107f 100644
--- a/en-US/Graphical_Installation_pre-install-hub.xml
+++ b/en-US/Graphical_Installation_pre-install-hub.xml
@@ -38,13 +38,18 @@
<para>
To cancel the installation, click <guibutton>Quit</guibutton>.
</para>
- <xi:include href="Key_Board_Configuration-x86.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <!-- Keyboard Configuration --> <xi:include href="Storage_Devices-x86.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="Time_Zone-x86.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- Time Zone --> <xi:include href="Key_Board_Configuration-x86.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- Keyboard Configuration --> <xi:include href="Language_Configuration-hub-x86.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- Language Selection --> <xi:include href="Account_Configuration-x86.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- Account Configuration --><xi:include href="Package_Selection-x86.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- Package Selection --><xi:include href="Netconfig-x86.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- The installation system automatically detects any existing... -->
+
+ <xi:include href="Storage_Devices-x86.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+
<!-- Storage devices --> <!-- Not in Beta
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Installation_Number-x86.xml"/> --> <!-- Installation Number for RHEL --> <xi:include href="Netconfig-x86.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <!-- The installation system automatically detects any existing... --> <xi:include href="Time_Zone-x86.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <!-- Time Zone --> <xi:include href="Account_Configuration-x86.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <!-- Account Configuration --> <xi:include href="Assign_Storage_Devices-x86.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Installation_Number-x86.xml"/> --> <!-- Installation Number for RHEL --> <xi:include href="Assign_Storage_Devices-x86.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<!-- Assign Storage devices --> <xi:include href="Initializing_Hard_Disk-x86.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<!-- Initializing Hard Disk --> <xi:include href="Upgrading-x86.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<!-- The installation system automatically detects any existing... --> <xi:include href="Disk_Partitioning_Setup-x86.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
@@ -58,8 +63,7 @@
Adding Partitions
Editing Partitions --> <xi:include href="Write_changes_to_disk_x86.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<!-- The installer prompts you to confirm the partitioning options that you selected. --> <xi:include href="X86_Bootloader.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <!-- x86, AMD64, and Intel 64 Boot Loader Configuration --> <!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Netconfig-x86.xml"/> --> <!-- Network Configuration --> <!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Time_Zone-x86.xml"/> --> <!-- Time Zone --> <!-- for RHEL goes here --> <!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Account_Configuration-common.xml"/> --> <!-- Account Configuration --> <!-- for RHEL goes here --> <xi:include href="Package_Selection-x86.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <!-- Package Selection --> <!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Prepare_To_Install-x86.xml"/> --> <!-- Prepare to Install --> <xi:include href="Installing_Packages-x86.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- x86, AMD64, and Intel 64 Boot Loader Configuration --> <!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Netconfig-x86.xml"/> --> <!-- Network Configuration --> <!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Time_Zone-x86.xml"/> --> <!-- Time Zone --> <!-- for RHEL goes here --> <!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Account_Configuration-common.xml"/> --> <!-- Account Configuration --> <!-- for RHEL goes here --> <!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Prepare_To_Install-x86.xml"/> --> <!-- Prepare to Install --> <xi:include href="Installing_Packages-x86.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<!-- Installing Packages --> <xi:include href="Complete-x86.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<!-- Installation Complete -->
</section>
\ No newline at end of file
diff --git a/en-US/Language_Configuration-hub-x86.xml b/en-US/Language_Configuration-hub-x86.xml
new file mode 100644
index 0000000..f866ee2
--- /dev/null
+++ b/en-US/Language_Configuration-hub-x86.xml
@@ -0,0 +1,48 @@
+<?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;
+]>
+<section id="language-selection-hub-x86">
+ <xi:include href="Language_Configuration_x86_ppc-title-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- Keyboard Configuration --> <!-- Index terms --> <xi:include href="Language_Configuration_x86_ppc-indexterm-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="Language_Configuration_x86_ppc-indexterm-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- End Index terms -->
+ <para>
+ The language currently selected for the installation and as the system default is displayed on the Pre-Installation Hub, under <guilabel>Language</guilabel>.
+ </para>
+ <para>
+ If you need to change the language – perhaps if you accepted the default of English (United States) in error – select <guilabel>Language</guilabel> from the Pre-Installation Hub.
+ </para>
+
+ <para>
+ Use your mouse to select the language (for example, English (United States)) you would prefer to use for the installation and as the system default.
+ </para>
+
+ <xi:include href="Language_Configuration_x86_ppc-para-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- Alternatively, type your preferred language into the search box ... -->
+
+ <para>
+ Once you have made your selection, click <guibutton>Back</guibutton> to return to the Pre-Installation Hub.
+ </para>
+ <figure float="0">
+ <title>Language Configuration</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/langselection/langselection-hub-GUI.png" format="PNG" width="444" />
+ </imageobject>
+ <textobject>
+ <para>
+ Language selection screen
+ </para>
+
+ </textobject>
+
+ </mediaobject>
+
+ </figure>
+
+
+</section>
+
+
diff --git a/en-US/Language_Configuration-x86.xml b/en-US/Language_Configuration-x86.xml
index 88f7cc2..ffb94d9 100644
--- a/en-US/Language_Configuration-x86.xml
+++ b/en-US/Language_Configuration-x86.xml
@@ -10,11 +10,13 @@
<!-- End Index terms --> <para>
At the Welcome screen, use your mouse to select the language (for example, English (United States)) you would prefer to use for the installation and as the system default.
</para>
+
+ <xi:include href="Language_Configuration_x86_ppc-para-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- Alternatively, type your preferred language into the search box ... -->
<para>
- Alternatively, type your preferred language into the search box (refer to the figure below).
+ Once you have made your selection, click <guibutton>Continue</guibutton>.
</para>
- <xi:include href="Language_Configuration_x86_ppc-para-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <!-- Using your mouse, select the correct layout type ... --> <figure float="0">
+ <figure float="0">
<title>Language Configuration</title>
<mediaobject>
<imageobject>
diff --git a/en-US/Language_Configuration_x86_ppc-para-1.xml b/en-US/Language_Configuration_x86_ppc-para-1.xml
index 4bc0b73..f609278 100644
--- a/en-US/Language_Configuration_x86_ppc-para-1.xml
+++ b/en-US/Language_Configuration_x86_ppc-para-1.xml
@@ -4,6 +4,6 @@
%BOOK_ENTITIES;
]>
<para>
- Once you have made your selection, click <guibutton>Continue</guibutton>.
+ Alternatively, type your preferred language into the search box (refer to the figure below).
</para>
diff --git a/en-US/Language_Configuration_x86_ppc-para-2.xml b/en-US/Language_Configuration_x86_ppc-para-2.xml
new file mode 100644
index 0000000..4bc0b73
--- /dev/null
+++ b/en-US/Language_Configuration_x86_ppc-para-2.xml
@@ -0,0 +1,9 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Guide.ent">
+%BOOK_ENTITIES;
+]>
+<para>
+ Once you have made your selection, click <guibutton>Continue</guibutton>.
+</para>
+
diff --git a/en-US/images/langselection/langselection-hub-GUI.png b/en-US/images/langselection/langselection-hub-GUI.png
new file mode 100644
index 0000000..207fd99
Binary files /dev/null and b/en-US/images/langselection/langselection-hub-GUI.png differ
More information about the docs-commits
mailing list