en-US/Graphical_Installation_User_Interface_x86-note-1.xml en-US/Graphical_Installation_x86-common-section-1.xml en-US/Graphical_Installation-x86.xml en-US/Installation_Guide.xml en-US/Installation_Phase_2-common-para-1.xml en-US/Installation_Phase_2-common-title-1.xml en-US/Installation_Phase_2-x86.xml en-US/Language_Selection_common-para-3.xml en-US/Package_Selection_Customizing-common-para-13.xml en-US/Package_Selection_Customizing-x86.xml

Rüdiger Landmann rlandmann at fedoraproject.org
Sat Sep 11 20:00:40 UTC 2010 

 en-US/Graphical_Installation-x86.xml                       |    9 +++-
 en-US/Graphical_Installation_User_Interface_x86-note-1.xml |    2 -
 en-US/Graphical_Installation_x86-common-section-1.xml      |    6 ++-
 en-US/Installation_Guide.xml                               |    2 -
 en-US/Installation_Phase_2-common-para-1.xml               |    7 ---
 en-US/Installation_Phase_2-common-title-1.xml              |    6 ---
 en-US/Installation_Phase_2-x86.xml                         |   24 -------------
 en-US/Language_Selection_common-para-3.xml                 |    2 -
 en-US/Package_Selection_Customizing-common-para-13.xml     |    9 ++++
 en-US/Package_Selection_Customizing-x86.xml                |    3 +
 10 files changed, 25 insertions(+), 45 deletions(-)

New commits:
commit 8161cec28ca3a2950871383bf96d64c029d3e882
Author: Ruediger Landmann <r.landmann at redhat.com>
Date:   Sun Sep 12 06:01:01 2010 +1000

    reorganize TUI description

diff --git a/en-US/Graphical_Installation-x86.xml b/en-US/Graphical_Installation-x86.xml
index fd8ced5..41fd0ed 100644
--- a/en-US/Graphical_Installation-x86.xml
+++ b/en-US/Graphical_Installation-x86.xml
@@ -11,10 +11,10 @@
 	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Graphical_Installation_x86_ppc-para-1.xml"/>
 	<!-- This chapter explains how to perform a... -->
 	
- 	<xi:include href="TUI-x86.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-	<!-- Graphical Interface Usage - Installing in text mode does not prevent you from using a graphical interface. -->
+	<xi:include href="Graphical_Installation_x86-common-section-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+	<!-- The Text Mode Installation Program User Interface -->
 	
-	<section id="s1-guimode-interface-x86">
+ 	<section id="s1-guimode-interface-x86">
 		<title>The Graphical Installation Program User Interface</title>
 		<indexterm significance="normal">
 			<primary>installation</primary>
@@ -174,6 +174,9 @@
 		</section>
 	</section>
 		
+	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Installation_Method-x86.xml"/>
+	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Verifying_Media.xml"/>
+		
 	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Welcome-x86.xml"/>
 	<!-- Welcome to Fedora -->
 	
diff --git a/en-US/Graphical_Installation_User_Interface_x86-note-1.xml b/en-US/Graphical_Installation_User_Interface_x86-note-1.xml
index 7f5ebf3..1817d5b 100644
--- a/en-US/Graphical_Installation_User_Interface_x86-note-1.xml
+++ b/en-US/Graphical_Installation_User_Interface_x86-note-1.xml
@@ -12,7 +12,7 @@
 </screen>
 
 			<para>
-				Refer to <xref linkend="sn-boot-menu-x86"/> for a description of the Fedora boot menu and to <xref linkend="s1-guimode-textinterface-x86"/> for a brief overview of text mode installation instructions.
+				Refer to <xref linkend="sn-boot-menu-x86"/> for a description of the Fedora boot menu and to <xref linkend="ch-guimode-x86"/> for a brief overview of text mode installation instructions.
 			</para>
 			
 			<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Graphical_Installation_User_Interface_x86_ppc-note-para-1.xml"/>
diff --git a/en-US/Graphical_Installation_x86-common-section-1.xml b/en-US/Graphical_Installation_x86-common-section-1.xml
index b3bcc61..286b6be 100644
--- a/en-US/Graphical_Installation_x86-common-section-1.xml
+++ b/en-US/Graphical_Installation_x86-common-section-1.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
 ]>
 
-<section id="s1-guimode-textinterface-x86">	
+<section id="ch-tuimode-x86">	
 	<xi:include href="Graphical_Installation_common-section-1-title-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 	<!-- The Text Mode Installation Program User Interface -->
 	
@@ -54,5 +54,9 @@
 	
 	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Graphical_Installation_common-section-2.xml"/>
 	
+	<xi:include href="TUI-x86.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+	<!-- Graphical Interface Usage - Installing in text mode does not prevent you from using a graphical interface. -->
+	
+	
 </section>
 
diff --git a/en-US/Installation_Guide.xml b/en-US/Installation_Guide.xml
index 78fa053..61d2bf9 100644
--- a/en-US/Installation_Guide.xml
+++ b/en-US/Installation_Guide.xml
@@ -50,8 +50,6 @@
 		<xi:include href="Preparing-x86.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 		<xi:include href="System_Requirements_Table.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 		<xi:include href="Boot-x86.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-		<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Installation_Method-x86.xml"/>
-		<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Verifying_Media.xml"/>
 		<xi:include href="Graphical_Installation-x86.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 		<xi:include href="Trouble-x86.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 	</part>
diff --git a/en-US/Installation_Phase_2-common-para-1.xml b/en-US/Installation_Phase_2-common-para-1.xml
deleted file mode 100644
index 612ff2f..0000000
--- a/en-US/Installation_Phase_2-common-para-1.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
-]>
-
-<para>
-	Before the graphical installation program starts, you need to configure the language and installation source.
-</para>
\ No newline at end of file
diff --git a/en-US/Installation_Phase_2-common-title-1.xml b/en-US/Installation_Phase_2-common-title-1.xml
deleted file mode 100644
index e989e28..0000000
--- a/en-US/Installation_Phase_2-common-title-1.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE title PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
-]>
-
-<title>Configuring Language and Installation Source</title>
-
diff --git a/en-US/Installation_Phase_2-x86.xml b/en-US/Installation_Phase_2-x86.xml
deleted file mode 100644
index 4dccadd..0000000
--- a/en-US/Installation_Phase_2-x86.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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" [
-]>
-
-<chapter id="ch-Installation_Phase_2-x86">
-	<xi:include href="Installation_Phase_2-common-title-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-	<!-- Configuring Language and Installation Source -->
-	
-	<xi:include href="Installation_Phase_2-common-para-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-	<!-- Before the graphical installation program starts, you must choose a language -->
-	
-	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"  href="Graphical_Installation_x86-common-section-1.xml"/>
-	<!-- The Text Mode Installation Program User Interface
-	     links to Graphical_Installation_common-section-2.xml:
-	     Using the Keyboard to Navigate -->
-	     
-	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Installation_Method-x86.xml"/>
-	<!-- Installation Method -->
-	
-	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Verifying_Media.xml"/>
-	<!-- Verifying Media -->
-
-</chapter>
-
diff --git a/en-US/Language_Selection_common-para-3.xml b/en-US/Language_Selection_common-para-3.xml
index 6c27fce..3f709b3 100644
--- a/en-US/Language_Selection_common-para-3.xml
+++ b/en-US/Language_Selection_common-para-3.xml
@@ -5,5 +5,5 @@
     <para>
       To add support for additional languages, customize the
       installation at the package selection stage. For more information,
-      refer to <xref linkend="sn-lang-packages"/>.
+      refer to <xref linkend="sn-package-selection-x86"/>.
     </para>
diff --git a/en-US/Package_Selection_Customizing-common-para-13.xml b/en-US/Package_Selection_Customizing-common-para-13.xml
new file mode 100644
index 0000000..6ea49c8
--- /dev/null
+++ b/en-US/Package_Selection_Customizing-common-para-13.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+]>
+
+<para>
+	Your Fedora system automatically supports the language that you selected at the start of the installation process. To include support for additional languages, select the package group for those languages from the <literal>Languages</literal> category. 
+</para>
\ No newline at end of file
diff --git a/en-US/Package_Selection_Customizing-x86.xml b/en-US/Package_Selection_Customizing-x86.xml
index 9769fbc..03174f8 100644
--- a/en-US/Package_Selection_Customizing-x86.xml
+++ b/en-US/Package_Selection_Customizing-x86.xml
@@ -39,6 +39,9 @@
 	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Package_Selection_Customizing-common-figure-2.xml"/>
 	<!-- Package Group Context Menu -->
 	
+	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Package_Selection_Customizing-common-para-13.xml"/>
+	<!-- Your Fedora system automatically supports the language that you selected at the start of the installation process.  -->
+	
 	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Package_Selection_Customizing-common-para-6.xml"/>
 	<!-- After you choose the desired packages, select Next to proceed. -->

More information about the docs-commits mailing list