en-US/Beginning_Installation_Hard_Disk_common-para-1.xml en-US/Beginning_Installation_Network_x86_ppc-para-5.xml en-US/Beginning_Installation_URL-common-para-2-Fedora.xml en-US/Beginning_Installation_URL-x86.xml en-US/Language_Selection-x86.xml en-US/Package_Selection_Customizing-x86.xml en-US/Package_Selection_Repositories-x86.xml
Rüdiger Landmann
rlandmann at fedoraproject.org
Thu Apr 29 09:49:18 UTC 2010
en-US/Beginning_Installation_Hard_Disk_common-para-1.xml | 4 ++--
en-US/Beginning_Installation_Network_x86_ppc-para-5.xml | 2 +-
en-US/Beginning_Installation_URL-common-para-2-Fedora.xml | 4 ++--
en-US/Beginning_Installation_URL-x86.xml | 3 ---
en-US/Language_Selection-x86.xml | 11 +++++++----
en-US/Package_Selection_Customizing-x86.xml | 2 +-
en-US/Package_Selection_Repositories-x86.xml | 2 +-
7 files changed, 14 insertions(+), 14 deletions(-)
New commits:
commit a32b6980a646a0e7ea5eea0240185d904a1f6d8c
Author: Ruediger Landmann <r.landmann at redhat.com>
Date: Thu Apr 29 19:48:38 2010 +1000
Update sections 7.6 and 7.7
diff --git a/en-US/Beginning_Installation_Hard_Disk_common-para-1.xml b/en-US/Beginning_Installation_Hard_Disk_common-para-1.xml
index 132c202..34f0b4a 100644
--- a/en-US/Beginning_Installation_Hard_Disk_common-para-1.xml
+++ b/en-US/Beginning_Installation_Hard_Disk_common-para-1.xml
@@ -3,5 +3,5 @@
]>
<para>
- The <guilabel>Select Partition</guilabel> screen applies only if you are installing from a disk partition (that is, if you used the <literal>askmethod</literal> boot options and selected <guimenuitem>Hard Drive</guimenuitem> in the <guilabel>Installation Method</guilabel> dialog). This dialog allows you to name the disk partition and directory from which you are installing Fedora. If you used the <literal>repo=hd</literal>boot option, you already specified a partition.
-</para>
\ No newline at end of file
+ The <guilabel>Select Partition</guilabel> screen applies only if you are installing from a disk partition (that is, if you used the <literal>askmethod</literal> boot options and selected <guimenuitem>Hard Drive</guimenuitem> in the <guilabel>Installation Method</guilabel> dialog). This dialog allows you to name the disk partition and directory from which you are installing Fedora. If you used the <literal>repo=hd</literal> boot option, you already specified a partition.
+</para>
diff --git a/en-US/Beginning_Installation_Network_x86_ppc-para-5.xml b/en-US/Beginning_Installation_Network_x86_ppc-para-5.xml
index 7409a81..c7e6106 100644
--- a/en-US/Beginning_Installation_Network_x86_ppc-para-5.xml
+++ b/en-US/Beginning_Installation_Network_x86_ppc-para-5.xml
@@ -3,6 +3,6 @@
]>
<para>
- The installation program supports only the IPv4 protocol. Refer also to <xref linkend="sn-networkconfig-fedora"/> for more information on configuring your network.
+ The installation program supports the IPv4 and IPv6 protocols.
</para>
diff --git a/en-US/Beginning_Installation_URL-common-para-2-Fedora.xml b/en-US/Beginning_Installation_URL-common-para-2-Fedora.xml
index 3536784..a3dd700 100644
--- a/en-US/Beginning_Installation_URL-common-para-2-Fedora.xml
+++ b/en-US/Beginning_Installation_URL-common-para-2-Fedora.xml
@@ -4,5 +4,5 @@
<para>
- Enter the URL for the directory that contains the installation image file (<filename>install.img</filename>) on your chosen FTP or HTTP site and press <keycap>Enter</keycap>. By default, this directory will be named <filename>/pub/fedora/linux/releases/&PRODVER;/Fedora/<replaceable>arch</replaceable>/os/images/</filename>, where <replaceable>arch</replaceable> is replaced with the architecture type of your system, such as i386. The complete URL will therefore resemble this example:<filename>http://download.fedoraproject.org/pub/fedora/linux/releases/&PRODVER;/Fedora/i386/os/images</filename>. If the system can reach the URL that you provided, and can find a file named <filename>install.img</filename> at that location, a message box appears indicating that files are being retrieved from the server.
-</para>
\ No newline at end of file
+ Enter the URL for the directory that contains the installation image file (<filename>install.img</filename>) on your chosen FTP or HTTP site and press <keycap>Enter</keycap>. By default, this directory will be named <filename>/pub/fedora/linux/releases/&PRODVER;/Fedora/<replaceable>arch</replaceable>/os/images/</filename>, where <replaceable>arch</replaceable> is replaced with the architecture type of your system, such as i386. The complete URL will therefore resemble this example:<filename>http://download.fedoraproject.org/pub/fedora/linux/releases/&PRODVER;/Fedora/i386/os/images</filename>. Specify the address of a proxy server, and if necessary, provide a port number, username, and password. If the system can reach the URL that you provided, and can find a file named <filename>install.img</filename> at that location, a message box appears indicating that files are being retrieved from the server.
+</para>
diff --git a/en-US/Beginning_Installation_URL-x86.xml b/en-US/Beginning_Installation_URL-x86.xml
index 6294ea3..2598a25 100644
--- a/en-US/Beginning_Installation_URL-x86.xml
+++ b/en-US/Beginning_Installation_URL-x86.xml
@@ -30,7 +30,4 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Beginning_Installation_URL-common-para-3.xml"/>
<!-- Next, the Welcome dialog appears -->
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Loopbacktip-common.xml"/>
- <!-- Tip: You can save disk space by using the ISO images... -->
-
</section>
\ No newline at end of file
diff --git a/en-US/Language_Selection-x86.xml b/en-US/Language_Selection-x86.xml
index 3395a50..a70787d 100644
--- a/en-US/Language_Selection-x86.xml
+++ b/en-US/Language_Selection-x86.xml
@@ -11,16 +11,18 @@
href="Language_Selection_common-indexterm.xml"/>
<para>
- Using your mouse, select a language to use for the installation (refer to <xref linkend="fig-langselection-x86"/>).
+ 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.
</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... -->
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="Language_Selection_common-para-3.xml"/>
- <!-- To add support for additional languages, customize... -->
+ <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>
<figure float="0" id="fig-langselection-x86"><title>Language Selection</title>
<mediaobject>
@@ -37,3 +39,4 @@
<!-- Once you have selected the appropriate language... -->
</section>
+
diff --git a/en-US/Package_Selection_Customizing-x86.xml b/en-US/Package_Selection_Customizing-x86.xml
index 3b1c7bb..e3ec488 100644
--- a/en-US/Package_Selection_Customizing-x86.xml
+++ b/en-US/Package_Selection_Customizing-x86.xml
@@ -4,7 +4,7 @@
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
]>
- <section id="sn-package-selection">
+ <section id="sn-package-selection-x86">
<title>Customizing the Software Selection</title>
<para>
Select <guilabel>Customize now</guilabel> to specify the software
diff --git a/en-US/Package_Selection_Repositories-x86.xml b/en-US/Package_Selection_Repositories-x86.xml
index e2b6bf7..3912665 100644
--- a/en-US/Package_Selection_Repositories-x86.xml
+++ b/en-US/Package_Selection_Repositories-x86.xml
@@ -92,7 +92,7 @@
Once you provide information for an additional repository, the
installer reads the package metadata over the network. Software
that is specially marked is then included in the package group
- selection system. See <xref linkend="sn-package-selection"/> for
+ selection system. See <xref linkend="sn-package-selection-x86"/> for
more information on selecting packages.
</para>
<note>
More information about the docs-commits
mailing list