[install-guide] Revert "cleanup"
Pete Travis
immanetize at fedoraproject.org
Tue Mar 27 04:16:32 UTC 2012
commit 81701eace240b0bf77f9e1f7dabd9b254ee60cd1
Author: Pete Travis <immanetize at fedoraproject.org>
Date: Mon Mar 26 22:13:38 2012 -0600
Revert "cleanup"
This reverts commit a5451feb516aea5c7d252ef09243fcf8000317c5.
en-US/Graphical_Installation-x86.xml | 5 +++--
...Graphical_Installation_x86-common-section-1.xml | 5 -----
en-US/Installation_Phase_2-common-title-1.xml | 2 +-
en-US/Installation_Phase_2-x86.xml | 5 -----
4 files changed, 4 insertions(+), 13 deletions(-)
---
diff --git a/en-US/Graphical_Installation-x86.xml b/en-US/Graphical_Installation-x86.xml
index beed359..36e2368 100644
--- a/en-US/Graphical_Installation-x86.xml
+++ b/en-US/Graphical_Installation-x86.xml
@@ -11,8 +11,9 @@
</indexterm>
<xi:include href="Graphical_Installation_x86_ppc-para-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <!-- 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. --> <section id="s1-guimode-interface-x86">
+ <!-- This chapter explains how to perform a... -->
+
+ <section id="s1-guimode-interface-x86">
<title>The Graphical Installation Program User Interface</title>
<indexterm significance="normal">
<primary>installation</primary>
diff --git a/en-US/Graphical_Installation_x86-common-section-1.xml b/en-US/Graphical_Installation_x86-common-section-1.xml
index b5712c8..3623c86 100644
--- a/en-US/Graphical_Installation_x86-common-section-1.xml
+++ b/en-US/Graphical_Installation_x86-common-section-1.xml
@@ -3,16 +3,11 @@
<!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Guide.ent">
%BOOK_ENTITIES;
]>
-<<<<<<< HEAD
<section id="s1-guimode-textinterface-x86"><title>Text Mode Installation</title> <para>Fedora can be installed with a textbased interface.</para>
<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_common-section-1-title-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> -->
-=======
-<section id="s1-guimode-textinterface-x86">
- <xi:include href="Graphical_Installation_common-section-1-title-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
->>>>>>> parent of 243fd09... Renamed stage1 section as text mode section, and began moving relevant information there
<!-- The Text Mode Installation Program User Interface --> <xi:include href="Graphical_Installation_common-section-1-indexterm-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<!-- installation - program - text mode user interface --> <xi:include href="Graphical_Installation_common-section-1-indexterm-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<!-- user interface, text mode - installation program --> <xi:include href="Graphical_Installation_common-important-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
diff --git a/en-US/Installation_Phase_2-common-title-1.xml b/en-US/Installation_Phase_2-common-title-1.xml
index 824b9d9..8dfdc8b 100644
--- a/en-US/Installation_Phase_2-common-title-1.xml
+++ b/en-US/Installation_Phase_2-common-title-1.xml
@@ -3,5 +3,5 @@
<!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Guide.ent">
%BOOK_ENTITIES;
]>
-<title>Configuring Language and Installation Source</title>
+<title>Text mode installation</title>
diff --git a/en-US/Installation_Phase_2-x86.xml b/en-US/Installation_Phase_2-x86.xml
index 3e3fb9b..77e9f21 100644
--- a/en-US/Installation_Phase_2-x86.xml
+++ b/en-US/Installation_Phase_2-x86.xml
@@ -5,16 +5,11 @@
]>
<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" />
-<<<<<<< HEAD
<!-- text mode install -->
<!--orphaned copy, exluding <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 href="Graphical_Installation_x86-common-section-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 href="Graphical_Installation_x86-common-section-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
->>>>>>> parent of 243fd09... Renamed stage1 section as text mode section, and began moving relevant information there
<!-- The Text Mode Installation Program User Interface
links to Graphical_Installation_common-section-2.xml:
Using the Keyboard to Navigate --> <xi:include href="Language_Selection-x86.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
More information about the docs-commits
mailing list