en-US/adminoptions.xml en-US/Boot_x86_ppc-variablelist-1.xml en-US/Files_in_progress.txt en-US/Graphical_Installation-x86.xml en-US/Installation_Guide.xml en-US/Installation_Phase_2-x86.xml en-US/Language_Selection_common-para-3.xml en-US/Language_Selection-x86.xml en-US/Package_Selection_common-list-1.xml
Rüdiger Landmann
rlandmann at fedoraproject.org
Sat Sep 11 18:41:24 UTC 2010
en-US/Boot_x86_ppc-variablelist-1.xml | 4 -
en-US/Files_in_progress.txt | 47 ----------------
en-US/Graphical_Installation-x86.xml | 3 +
en-US/Installation_Guide.xml | 3 -
en-US/Installation_Phase_2-x86.xml | 3 -
en-US/Language_Selection-x86.xml | 14 ++--
en-US/Language_Selection_common-para-3.xml | 9 +++
en-US/Package_Selection_common-list-1.xml | 84 ++++++++++++++++++-----------
en-US/adminoptions.xml | 4 -
9 files changed, 81 insertions(+), 90 deletions(-)
New commits:
commit 1f4cc95ea9a6574e2b4da932165426bede43ed29
Author: Ruediger Landmann <r.landmann at redhat.com>
Date: Sun Sep 12 04:41:44 2010 +1000
Restore some Fedora-specific content
diff --git a/en-US/Boot_x86_ppc-variablelist-1.xml b/en-US/Boot_x86_ppc-variablelist-1.xml
index c3aa0b5..9b671bc 100644
--- a/en-US/Boot_x86_ppc-variablelist-1.xml
+++ b/en-US/Boot_x86_ppc-variablelist-1.xml
@@ -35,13 +35,13 @@
</para>
</listitem>
</varlistentry>
- <!-- Not in RHEL6 Beta <varlistentry>
+ <varlistentry>
<term>Memory Test</term>
<listitem>
<para>
This option runs an exhaustive test on the memory on your system. For more information, refer to <xref linkend="sn-memtest"/>.
</para>
</listitem>
- </varlistentry> -->
+ </varlistentry>
</variablelist>
diff --git a/en-US/Files_in_progress.txt b/en-US/Files_in_progress.txt
deleted file mode 100644
index 04ba09b..0000000
--- a/en-US/Files_in_progress.txt
+++ /dev/null
@@ -1,47 +0,0 @@
-Graphical_Installation-x86.xml
-Graphical_Installation-ppc.xml
-Graphical_Installation-s390.xml
-
-
-
-Graphical_Installation_common-list-1.xml
-Graphical_Installation_common-listitem-1.xml
-Graphical_Installation_common-listitem-2.xml
-Graphical_Installation_common-listitem-3.xml
-Graphical_Installation_common-listitem-4.xml
-Graphical_Installation_common-listitem-5.xml
-Graphical_Installation_common-listitem-6.xml
-Graphical_Installation_common-note-1.xml
-Graphical_Installation_common-para-1.xml
-Graphical_Installation_common-para-2.xml
-Graphical_Installation_common-section-1.xml
-Graphical_Installation_common-section-2.xml
-Graphical_Installation_x86_ppc-para-1.xml
-Graphical_Installation_x86_ppc-para-2.xml
-Graphical_Installation_x86_ppc-para-3.xml
-Graphical_Installation_x86_ppc-para-4.xml
-Graphical_Installation_x86_ppc-para-5.xml
-Graphical_Installation_x86_ppc-para-6.xml
-Graphical_Installation_x86_ppc-table-1.xml
-Graphical_Installation_x86_ppc-table-1.xml
-Graphical_Installation_x86_Starting.xml
-Graphical_Installation_x86-Installation-methods.xml
-Graphical_Installation_ppc-common-section-1.xml
-Graphical_Installation_s390-common-section-1.xml
-Graphical_Installation_x86-common-section-1.xml
-
-Boot_Options-x86.xml
-Boot_Options-ppc.xml
-Boot_Options-s390.xml
-
-Verify whether these files have the same or different content in the book
-
-Boot_Options_common-para-1.xml
-Boot_Options_common-para-2.xml
-Boot_Options_common-variablelist-1.xml
-
-
-Right now I'm working in Graphical_Installation
-
-
-
diff --git a/en-US/Graphical_Installation-x86.xml b/en-US/Graphical_Installation-x86.xml
index b5cefab..fd8ced5 100644
--- a/en-US/Graphical_Installation-x86.xml
+++ b/en-US/Graphical_Installation-x86.xml
@@ -177,6 +177,9 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Welcome-x86.xml"/>
<!-- Welcome to Fedora -->
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Language_Selection-x86.xml"/>
+ <!-- Language Selection -->
+
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Key_Board_Configuration-x86.xml"/>
<!-- Keyboard Configuration -->
diff --git a/en-US/Installation_Guide.xml b/en-US/Installation_Guide.xml
index cfa7f79..78fa053 100644
--- a/en-US/Installation_Guide.xml
+++ b/en-US/Installation_Guide.xml
@@ -50,7 +50,8 @@
<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 href="Installation_Phase_2-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-x86.xml b/en-US/Installation_Phase_2-x86.xml
index 7954273..4dccadd 100644
--- a/en-US/Installation_Phase_2-x86.xml
+++ b/en-US/Installation_Phase_2-x86.xml
@@ -14,9 +14,6 @@
links to Graphical_Installation_common-section-2.xml:
Using the Keyboard to Navigate -->
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Language_Selection-x86.xml"/>
- <!-- Language Selection -->
-
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Installation_Method-x86.xml"/>
<!-- Installation Method -->
diff --git a/en-US/Language_Selection-x86.xml b/en-US/Language_Selection-x86.xml
index a70787d..e5f3a12 100644
--- a/en-US/Language_Selection-x86.xml
+++ b/en-US/Language_Selection-x86.xml
@@ -11,23 +11,23 @@
href="Language_Selection_common-indexterm.xml"/>
<para>
- Use the arrow keys on your keyboard to select a language to use during the installation process (refer to <xref linkend="fig-langselection-x86"/>). With your selected language highlighted, press the <keycap>Tab</keycap> key to move to the <guibutton>OK</guibutton> button and press the <keycap>Enter</keycap> key to confirm your choice.
+ Using your mouse, select a language to use for the installation (refer to <xref linkend="fig-langselection-x86"/>).
</para>
+
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="Language_Selection_common-para-1.xml"/>
<!-- The language you select here will become the default language... -->
- <para>
- To add support for additional languages, customize the
- installation at the package selection stage. For more information,
- refer to <xref linkend="sn-package-selection-x86"/>.
- </para>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="Language_Selection_common-para-3.xml"/>
+ <!-- To add support for additional languages, customize... -->
<figure float="0" id="fig-langselection-x86"><title>Language Selection</title>
<mediaobject>
<imageobject><imagedata fileref="images/langselection/lang.png" format="PNG"/></imageobject>
<textobject><para>
+
Language selection screen.
</para>
</textobject>
@@ -40,3 +40,5 @@
</section>
+
+
diff --git a/en-US/Language_Selection_common-para-3.xml b/en-US/Language_Selection_common-para-3.xml
new file mode 100644
index 0000000..6c27fce
--- /dev/null
+++ b/en-US/Language_Selection_common-para-3.xml
@@ -0,0 +1,9 @@
+<?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>
+ To add support for additional languages, customize the
+ installation at the package selection stage. For more information,
+ refer to <xref linkend="sn-lang-packages"/>.
+ </para>
diff --git a/en-US/Package_Selection_common-list-1.xml b/en-US/Package_Selection_common-list-1.xml
index b1677a8..12647d3 100644
--- a/en-US/Package_Selection_common-list-1.xml
+++ b/en-US/Package_Selection_common-list-1.xml
@@ -4,34 +4,60 @@
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
]>
- <variablelist>
- <varlistentry>
- <term>Office and Productivity</term>
- <listitem>
- <para>
- This option provides the OpenOffice.org productivity suite,
- the Planner project management application, graphical tools
- such as the GIMP, and multimedia applications.
- </para>
- </listitem>
- </varlistentry>
+<variablelist>
+ <!--<varlistentry>
+ <term>Basic Server</term>
+ <listitem>
+ <para>
+ This option provides a basic installation of Red Hat Enterprise Linux for use on a server.
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>Database Server</term>
+ <listitem>
+ <para>
+ This option provides the <application>MySQL</application> and <application>PostgreSQL</application> databases.
+ </para>
+ </listitem>
+ </varlistentry> -->
+
+ <varlistentry>
+ <term>Graphical Desktop</term>
+ <listitem>
+ <para>
+ This option provides the <application>OpenOffice.org</application> productivity suite, graphical tools such as the <application>GIMP</application>, and multimedia applications.
+ </para>
+ </listitem>
+ </varlistentry>
- <varlistentry>
- <term>Software Development</term>
- <listitem>
- <para>
- This option provides the necessary tools to compile software
- on your Fedora system.
- </para>
- </listitem>
- </varlistentry>
+ <varlistentry>
+ <term>Software Development</term>
+ <listitem>
+ <para>
+ This option provides the necessary tools to compile software on your Fedora system.
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>Web server</term>
+ <listitem>
+ <para>
+ This option provides the <application>Apache</application> web server.
+ </para>
+ </listitem>
+ </varlistentry>
+
+
+ <varlistentry>
+ <term>Minimal</term>
+ <listitem>
+ <para>
+ This option provides only the packages essential to run Fedora. A minimal installation provides the basis for a single-purpose server or desktop appliance and maximizes performance and security on such an installation.
+ </para>
+ </listitem>
+ </varlistentry>
+</variablelist>
- <varlistentry>
- <term>Web server</term>
- <listitem>
- <para>
- This option provides the Apache Web server.
- </para>
- </listitem>
- </varlistentry>
- </variablelist>
diff --git a/en-US/adminoptions.xml b/en-US/adminoptions.xml
index b847fca..7d3d53e 100644
--- a/en-US/adminoptions.xml
+++ b/en-US/adminoptions.xml
@@ -789,7 +789,7 @@ Press <enter> for a shell</screen>
<section id="sn-boot-modes">
<title>Using the Maintenance Boot Modes</title>
-<!-- Not in RHEL6 Beta 1
+
<section id="sn-memtest">
<title>Loading the Memory (RAM) Testing Mode</title>
@@ -824,7 +824,7 @@ Press <enter> for a shell</screen>
<keycap>Esc</keycap> at any time.
</para>
</section>
--->
+
<section id="sn-boot-mediacheck">
<title>Verifying boot media</title>
<para>
More information about the docs-commits
mailing list