en-US/Disk_Partitioning_Advanced_Storage-x86.xml | 34 +++++++++---- en-US/Disk_Partitioning_Advanced_Storage_common-para-6.xml | 7 ++ en-US/Graphical_Installation-x86.xml | 6 +- en-US/Language_Selection-x86.xml | 14 +++-- en-US/Netconfig_common-figure-2.xml | 16 ++++++ en-US/Netconfig_common-para-7.xml | 9 +++ en-US/Netconfig_common-para-8.xml | 9 +++ en-US/Netconfig_common-para-9.xml | 9 +++ en-US/Netconfig_common-title-2.xml | 7 ++ en-US/images/begininstall/nfs.png |binary en-US/images/begininstall/url.png |binary en-US/images/boot/boot_screen.png |binary en-US/images/firstboot/fb-license.png |binary en-US/images/firstboot/fb-profile.png |binary en-US/images/firstboot/fb-welcome.png |binary en-US/images/langselection/lang.png |binary en-US/images/pkgselection/pkg-group.png |binary 17 files changed, 93 insertions(+), 18 deletions(-)
New commits: commit ae8cef773762e581a76c788a7af6e349daf09496 Author: Ruediger Landmann r.landmann@redhat.com Date: Fri Apr 30 21:06:27 2010 +1000
Final tweaks
diff --git a/en-US/Disk_Partitioning_Advanced_Storage-x86.xml b/en-US/Disk_Partitioning_Advanced_Storage-x86.xml index 311ce2a..e251ead 100644 --- a/en-US/Disk_Partitioning_Advanced_Storage-x86.xml +++ b/en-US/Disk_Partitioning_Advanced_Storage-x86.xml @@ -1,12 +1,8 @@ <?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" [ - - - ]> <section id="s1-advanced-storage-x86"> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Disk_Partitioning_Advanced_Storage_common-title.xml"/> <!-- Title: Advanced Storage Options --> @@ -15,11 +11,28 @@ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Disk_Partitioning_Advanced_Storage-indexterm2.xml"/> <!-- End Index Terms --> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Disk_Partitioning_Advanced_Storage_common-para-1.xml"/> + <!-- From this screen you can configure an iSCSI (SCSI over TCP/IP) target --> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Disk_Partitioning_Advanced_Storage_common-figure-1.xml"/> <!-- Advanced Storage Options --> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Disk_Partitioning_Advanced_Storage_common-para-1.xml"/> - <!-- From this screen you can configure an iSCSI (SCSI over TCP/IP) target --> + <section id="sn-netconfig_manual-configuration-x86"> + <xi:include href="Netconfig_common-title-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude%22/%3E + <!-- Manual configuration --> + <xi:include href="Netconfig_common-para-7.xml" xmlns:xi="http://www.w3.org/2001/XInclude%22/%3E + <!-- Installations that require certain advanced configurations cannot succeed without network connectivity --> + + <xi:include href="Netconfig_common-figure-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude%22/%3E + <!-- Manual network configuration --> + + <xi:include href="Netconfig_common-para-8.xml" xmlns:xi="http://www.w3.org/2001/XInclude%22/%3E + <!-- If your network does not have DHCP enabled, or if you need to override the DHCP settings, --> + + <xi:include href="Netconfig_common-para-9.xml" xmlns:xi="http://www.w3.org/2001/XInclude%22/%3E + <!-- Click <guilabel>OK</guilabel> to accept these settings and continue. --> + + </section> <section id="s1-advanced-storage-iSCSI-x86"> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Disk_Partitioning_Advanced_Storage_common-title-2.xml"/> @@ -43,12 +56,15 @@ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Disk_Partitioning_Advanced_Storage_common-para-4.xml"/> <!-- To configure an FCoE SAN... --> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Disk_Partitioning_Advanced_Storage_common-para-5.xml"/> + <!-- On the menu that appears in the next... --> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Disk_Partitioning_Advanced_Storage_common-figure-3.xml"/> <!-- Configure FCoE Parameters --> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Disk_Partitioning_Advanced_Storage_common-para-5.xml"/> - <!-- On the menu that appears in the next... --> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Disk_Partitioning_Advanced_Storage_common-para-6.xml"/> + <!-- DCB (Data Center Bridging) is a set of enhancements to the Ethernet protocols --> </section> - + </section> diff --git a/en-US/Disk_Partitioning_Advanced_Storage_common-para-6.xml b/en-US/Disk_Partitioning_Advanced_Storage_common-para-6.xml new file mode 100644 index 0000000..1b627b4 --- /dev/null +++ b/en-US/Disk_Partitioning_Advanced_Storage_common-para-6.xml @@ -0,0 +1,7 @@ +<?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> + <firstterm>Data Center Bridging</firstterm> (DCB) is a set of enhancements to the Ethernet protocols designed to increase the efficiency of Ethernet connections in storage networks and clusters. Enable or disable the installer's awareness of DCB with the checkbox in this dialog. +</para> diff --git a/en-US/Graphical_Installation-x86.xml b/en-US/Graphical_Installation-x86.xml index adc61ab..f5ed8ec 100644 --- a/en-US/Graphical_Installation-x86.xml +++ b/en-US/Graphical_Installation-x86.xml @@ -211,9 +211,6 @@ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Graphical_Installation_x86-Installation-methods.xml"/> <!-- Selecting an Installation Method --> - <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 --> @@ -223,6 +220,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/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/Netconfig_common-figure-2.xml b/en-US/Netconfig_common-figure-2.xml new file mode 100644 index 0000000..8d55bbb --- /dev/null +++ b/en-US/Netconfig_common-figure-2.xml @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" + "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [ +]> + +<figure float="0" > + <title>Enable Network Interface</title> + <mediaobject> + <imageobject><imagedata fileref="images/netconfig/net-edit.png" format="PNG"/></imageobject> + <textobject><para> + Enable Network Interface + </para> + </textobject> + </mediaobject> +</figure> + diff --git a/en-US/Netconfig_common-para-7.xml b/en-US/Netconfig_common-para-7.xml new file mode 100644 index 0000000..44ee0ab --- /dev/null +++ b/en-US/Netconfig_common-para-7.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" + "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [ +]> + +<para> + Use this dialog to configure the network interfaces through which the system will connect to networked storage devices. +</para> + diff --git a/en-US/Netconfig_common-para-8.xml b/en-US/Netconfig_common-para-8.xml new file mode 100644 index 0000000..e74b401 --- /dev/null +++ b/en-US/Netconfig_common-para-8.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" + "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [ +]> + +<para> + If your network does not have DHCP enabled, or if you need to override the DHCP settings, select the network interface that you plan to use from the <guilabel>Interfaces</guilabel> menu. Clear the checkbox for <guilabel>Use dynamic IP configuration (DHCP)</guilabel>. You can now enter an IPv4 address and netmask for this system in the form <replaceable>address</replaceable> / <replaceable>netmask</replaceable>, along with the gateway address and nameserver address for your network. +</para> + diff --git a/en-US/Netconfig_common-para-9.xml b/en-US/Netconfig_common-para-9.xml new file mode 100644 index 0000000..bfda3d4 --- /dev/null +++ b/en-US/Netconfig_common-para-9.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" + "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [ +]> + +<para> + Click <guilabel>OK</guilabel> to accept these settings and continue. +</para> + diff --git a/en-US/Netconfig_common-title-2.xml b/en-US/Netconfig_common-title-2.xml new file mode 100644 index 0000000..b374ddc --- /dev/null +++ b/en-US/Netconfig_common-title-2.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" + "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [ +]> + +<title>Enable Network Interfaces</title> + diff --git a/en-US/images/begininstall/nfs.png b/en-US/images/begininstall/nfs.png index 06c8595..4fdc008 100644 Binary files a/en-US/images/begininstall/nfs.png and b/en-US/images/begininstall/nfs.png differ diff --git a/en-US/images/begininstall/url.png b/en-US/images/begininstall/url.png index b5ba915..18f7e53 100644 Binary files a/en-US/images/begininstall/url.png and b/en-US/images/begininstall/url.png differ diff --git a/en-US/images/boot/boot_screen.png b/en-US/images/boot/boot_screen.png index b3b8dad..9bfcbed 100644 Binary files a/en-US/images/boot/boot_screen.png and b/en-US/images/boot/boot_screen.png differ diff --git a/en-US/images/firstboot/fb-license.png b/en-US/images/firstboot/fb-license.png index 21c4072..575b3a7 100644 Binary files a/en-US/images/firstboot/fb-license.png and b/en-US/images/firstboot/fb-license.png differ diff --git a/en-US/images/firstboot/fb-profile.png b/en-US/images/firstboot/fb-profile.png index 8b9a09d..b173bc4 100644 Binary files a/en-US/images/firstboot/fb-profile.png and b/en-US/images/firstboot/fb-profile.png differ diff --git a/en-US/images/firstboot/fb-welcome.png b/en-US/images/firstboot/fb-welcome.png index dd2d57d..46815ce 100644 Binary files a/en-US/images/firstboot/fb-welcome.png and b/en-US/images/firstboot/fb-welcome.png differ diff --git a/en-US/images/langselection/lang.png b/en-US/images/langselection/lang.png index cc981c8..7f28901 100644 Binary files a/en-US/images/langselection/lang.png and b/en-US/images/langselection/lang.png differ diff --git a/en-US/images/pkgselection/pkg-group.png b/en-US/images/pkgselection/pkg-group.png index d59bd11..5b44bd0 100644 Binary files a/en-US/images/pkgselection/pkg-group.png and b/en-US/images/pkgselection/pkg-group.png differ
docs-commits@lists.fedoraproject.org