commit bae8ad59ec829e7a3c88d4d632f3a108c1377016
Author: Pete Travis <immanetize(a)fedoraproject.org>
Date: Mon Mar 26 22:14:31 2012 -0600
Revert "more noload cleanup and structure correction"
This reverts commit c7c3a926a5d680490ae704c8068c12b22a35df4b.
...Graphical_Installation_x86-common-section-1.xml | 6 +++---
en-US/Installation_Phase_2-x86.xml | 6 ++----
en-US/adminoptions.xml | 2 +-
en-US/new-users.xml | 8 +++++---
4 files changed, 11 insertions(+), 11 deletions(-)
---
diff --git a/en-US/Graphical_Installation_x86-common-section-1.xml
b/en-US/Graphical_Installation_x86-common-section-1.xml
index 1ee6501..fc103c2 100644
--- a/en-US/Graphical_Installation_x86-common-section-1.xml
+++ b/en-US/Graphical_Installation_x86-common-section-1.xml
@@ -3,11 +3,11 @@
<!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Guide.ent">
%BOOK_ENTITIES;
]>
-<section id="s1-guimode-textinterface-x86"><title>Text Mode
Installation</title> <para>Fedora can be installed with a textbased
interface.</para>
-<!--i:include href="TUI-x86.xml"
xmlns:xi="http://www.w3.org/2001/XInclude" />-->
+<section id="s1-guimode-textinterface-x86">
+<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" /> -->
+ <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 --> <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-x86.xml b/en-US/Installation_Phase_2-x86.xml
index 77e9f21..003f8fd 100644
--- a/en-US/Installation_Phase_2-x86.xml
+++ b/en-US/Installation_Phase_2-x86.xml
@@ -6,10 +6,8 @@
<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" />
<!-- 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" />
+ <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" />
<!-- 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" />
diff --git a/en-US/adminoptions.xml b/en-US/adminoptions.xml
index 05fc0cf..3c887e3 100644
--- a/en-US/adminoptions.xml
+++ b/en-US/adminoptions.xml
@@ -155,7 +155,7 @@
<section id="sn-boot-options-installmethod">
<title>Specifying the Installation Method</title>
<warning>
- <title><option>askmethod</option> and
<option>asknetowrk</option> are depricated.</title>
+ <title><option>askmethod</option> and
<option>asknetowrk</option> are deprocated.</title>
<para>The <option>askmethod</option> and
<option>asknetwork</option> options are no longer available. Use
<option>root=</option> to specify the installation method, and see <xref
linkend="sn-boot-options-network" /> to configure network interfaces.
</para>
</warning>
diff --git a/en-US/new-users.xml b/en-US/new-users.xml
index 93f8d16..eb3489d 100644
--- a/en-US/new-users.xml
+++ b/en-US/new-users.xml
@@ -61,7 +61,7 @@
flash disk image is a copy of an entire disk in a format
suitable for writing directly to a USB flash disk.</para>
<para>For more information on burning CDs and DVDs, refer to
- <xref linkend="sn-making-media" />.</para>
+ <xref linkend="sn-making-media"/>.</para>
<para>
@@ -194,7 +194,8 @@ AMD: Athlon 64, Athlon II, Sempron64, Phenom series, Fusion series,
Bulldozer se
<para>If you are unsure what type of processor your computer uses, choose
<systemitem>i386</systemitem>.</para>
<para>The exception is if your computer is a non-Intel based Apple
- Macintosh. Refer to <ulink
url="http://fedoraproject.org/wiki/Architectures/PowerPC" /> for more
information on using Fedora on these systems. </para>
+ Macintosh. Refer to <xref
+
linkend="http://fedoraproject.org/wiki/Architectures/PowerPC" /> for more
information on using Fedora on these systems. </para>
</note>
<note>
<title>Intel Atom Processor Architectures Vary</title>
@@ -212,7 +213,8 @@ AMD: Athlon 64, Athlon II, Sempron64, Phenom series, Fusion series,
Bulldozer se
includes the architecture type in the file name. For example, the file for
the DVD distribution of Fedora &PRODVER; for x86_64 is named
<filename>Fedora-&PRODVER;-x86_64-DVD.iso</filename>. Refer to
- <xref linkend="sn-which-arch" /> if you are unsure of your
computer's
+ <xref
+ linkend="sn-which-arch"/> if you are unsure of your computer's
architecture.</para>
<orderedlist>
<listitem>