[install-guide] Added section on network configuration into Quickstart Guide
pbokoc
pbokoc at fedoraproject.org
Mon Jul 1 21:12:58 UTC 2013
commit c10cc9bc4035693dbe482e556e9c932de4b1d231
Author: Petr Bokoc <pbokoc at redhat.com>
Date: Mon Jul 1 23:12:50 2013 +0200
Added section on network configuration into Quickstart Guide
en-US/Installation_Quick_Start_Guide.xml | 2 +
en-US/Netconfig-x86.xml | 48 +++++++++++++++---------------
2 files changed, 26 insertions(+), 24 deletions(-)
---
diff --git a/en-US/Installation_Quick_Start_Guide.xml b/en-US/Installation_Quick_Start_Guide.xml
index 22c4309..c93a25f 100644
--- a/en-US/Installation_Quick_Start_Guide.xml
+++ b/en-US/Installation_Quick_Start_Guide.xml
@@ -28,6 +28,8 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Assign_Storage_Devices-x86.xml"/> -->
<xi:include href="Time_Zone-x86.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+
+ <xi:include href="Netconfig-x86.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="Disk_Partitioning_Setup-x86.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
diff --git a/en-US/Netconfig-x86.xml b/en-US/Netconfig-x86.xml
index a37ec32..cf4e847 100644
--- a/en-US/Netconfig-x86.xml
+++ b/en-US/Netconfig-x86.xml
@@ -18,11 +18,11 @@
<xi:include href="Netconfig_common-para-20.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<!-- Select Network Configuration from the Installation Summary Menu -->
- <xi:include href="Netconfig_common-para-21.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="Netconfig_common-para-21.xml" xmlns:xi="http://www.w3.org/2001/XInclude" condition="install-guide" />
<!-- Detected network connections will be listed in the left-hand pane -->
- <xi:include href="Netconfig_common-figure-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="Netconfig_common-figure-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" condition="install-guide" />
<!-- Setting the hostname -->
<xi:include href="Netconfig_common-para-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
@@ -31,20 +31,20 @@
<xi:include href="Netconfig_common-note-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<!-- Valid Hostnames -->
- <xi:include href="Netconfig_common-para-6.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="Netconfig_common-para-6.xml" xmlns:xi="http://www.w3.org/2001/XInclude" condition="install-guide" />
<!-- If your Fedora system is connected directly to the Internet, -->
- <xi:include href="Netconfig_common-note-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="Netconfig_common-note-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude" condition="install-guide" />
<!-- Modem Configuration -->
- <section id="sn-Netconfig-x86-edit">
- <xi:include href="Netconfig_common-title-3.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <section id="sn-Netconfig-x86-edit" condition="install-guide" >
+ <xi:include href="Netconfig_common-title-3.xml" xmlns:xi="http://www.w3.org/2001/XInclude" condition="install-guide" />
<!-- Edit Network Connections -->
- <xi:include href="Netconfig-common-tip-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="Netconfig-common-tip-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude" condition="install-guide" />
<!-- system-config-network -->
- <xi:include href="Netconfig_common-para-10.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="Netconfig_common-para-10.xml" xmlns:xi="http://www.w3.org/2001/XInclude" condition="install-guide" />
<!-- To configure a network connection manually -->
<!-- <xi:include href="Netconfig_common-figure-3.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
@@ -53,52 +53,52 @@
<!-- <xi:include href="Netconfig_common-para-11.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
To add a new connection, click -->
- <para>
+ <para condition="install-guide">
When you have finished editing network settings, click <guibutton>Save</guibutton> to save the new configuration. If you reconfigured a device that was already active during installation, you must restart the device in order to use the new configuration in the installer environment. Use the <guibutton>ON/OFF</guibutton> switch on the <guilabel>Network Configuration</guilabel> screen to restart the device.
</para>
- <xi:include href="Netconfig_common-note-3.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="Netconfig_common-note-3.xml" xmlns:xi="http://www.w3.org/2001/XInclude" condition="install-guide" />
<!-- When configuring a wireless connection -->
- <xi:include href="Netconfig_common-section-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="Netconfig_common-section-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" condition="install-guide" />
<!-- Common options -->
- <xi:include href="Netconfig_common-section-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="Netconfig_common-section-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude" condition="install-guide" />
<!-- The Wired tab -->
- <xi:include href="Netconfig_common-section-3.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="Netconfig_common-section-3.xml" xmlns:xi="http://www.w3.org/2001/XInclude" condition="install-guide" />
<!-- The 802.1x Security tab -->
- <section>
- <xi:include href="Netconfig_common-title-4.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <section condition="install-guide" >
+ <xi:include href="Netconfig_common-title-4.xml" xmlns:xi="http://www.w3.org/2001/XInclude" condition="install-guide" />
<!-- The IPv4 Settings tab -->
- <xi:include href="Netconfig_common-para-14.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="Netconfig_common-para-14.xml" xmlns:xi="http://www.w3.org/2001/XInclude" condition="install-guide" />
<!-- On the <guilabel>IPv4 Settings</guilabel> tab -->
- <xi:include href="Netconfig_common-para-16.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="Netconfig_common-para-16.xml" xmlns:xi="http://www.w3.org/2001/XInclude" condition="install-guide" />
<!-- Use the Method drop-down menu -->
- <xi:include href="Netconfig_common-variablelist-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="Netconfig_common-variablelist-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude" condition="install-guide" />
<!-- Automatic (DHCP) -->
- <xi:include href="Netconfig_common-para-17.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="Netconfig_common-para-17.xml" xmlns:xi="http://www.w3.org/2001/XInclude" condition="install-guide" />
<!-- If you selected a method that requires you -->
- <xi:include href="Netconfig_common-para-18.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="Netconfig_common-para-18.xml" xmlns:xi="http://www.w3.org/2001/XInclude" condition="install-guide" />
<!-- Optionally, enter a name for this network connection -->
- <xi:include href="Netconfig_common-para-19.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="Netconfig_common-para-19.xml" xmlns:xi="http://www.w3.org/2001/XInclude" condition="install-guide" />
<!-- Deselect the Require IPv4 addressing for this connection to complete -->
- <xi:include href="Netconfig_common-figure-4.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="Netconfig_common-figure-4.xml" xmlns:xi="http://www.w3.org/2001/XInclude" condition="install-guide" />
<!-- The IPv4 Settings tab -->
- <xi:include href="Netconfig_common-section-4.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="Netconfig_common-section-4.xml" xmlns:xi="http://www.w3.org/2001/XInclude" condition="install-guide" />
<!-- Editing IPv4 Routes -->
</section>
- <xi:include href="Netconfig_common-section-5.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="Netconfig_common-section-5.xml" xmlns:xi="http://www.w3.org/2001/XInclude" condition="install-guide" />
<!-- The IPv6 settings tab -->
<!-- <xi:include href="Netconfig_restart_network_device-x86.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> -->
More information about the docs-commits
mailing list