[install-guide] Began update of network config section
Jack Reed
jjr at fedoraproject.org
Mon Oct 8 05:53:52 UTC 2012
commit 052b1672475fbd0239ac5089168d7f52527e7d02
Author: Jack Reed <jreed at redhat.com>
Date: Mon Oct 8 15:53:10 2012 +1000
Began update of network config section
en-US/Netconfig-x86.xml | 12 ++++++------
en-US/Netconfig_common-figure-1.xml | 6 +++---
en-US/Netconfig_common-para-10.xml | 2 +-
en-US/Netconfig_common-para-12.xml | 2 +-
en-US/Netconfig_common-section-2.xml | 10 +++++-----
en-US/Netconfig_common-title-1.xml | 2 +-
.../netconfig/network-connections-802.1x.png | Bin 58156 -> 34701 bytes
.../netconfig/network-connections-ethernet.png | Bin 0 -> 27058 bytes
.../network-connections-ipv4-manual-routes.png | Bin 19711 -> 15113 bytes
.../netconfig/network-connections-ipv4-manual.png | Bin 36786 -> 33824 bytes
.../netconfig/network-connections-ipv6-ignore.png | Bin 32549 -> 30555 bytes
.../network-connections-ipv6-manual-routes.png | Bin 29316 -> 15189 bytes
en-US/images/netconfig/networkconfig.png | Bin 0 -> 48677 bytes
13 files changed, 17 insertions(+), 17 deletions(-)
---
diff --git a/en-US/Netconfig-x86.xml b/en-US/Netconfig-x86.xml
index 3f8626a..b9ab5b2 100644
--- a/en-US/Netconfig-x86.xml
+++ b/en-US/Netconfig-x86.xml
@@ -18,8 +18,8 @@
<xi:include href="Netconfig_common-para-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<!-- Setup prompts you to supply a host name and domain name for this computer, -->
- <xi:include href="Netconfig_common-note-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <!-- Valid Hostnames -->
+ <!-- <xi:include href="Netconfig_common-note-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ Valid Hostnames -->
<xi:include href="Netconfig_common-figure-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<!-- Setting the hostname -->
@@ -43,11 +43,11 @@
<xi:include href="Netconfig_common-para-10.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<!-- To configure a network connection manually -->
- <xi:include href="Netconfig_common-figure-3.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <!-- Configuring network connections -->
+ <!-- <xi:include href="Netconfig_common-figure-3.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ Configuring network connections -->
- <xi:include href="Netconfig_common-para-11.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <!-- To add a new connection, click -->
+ <!-- <xi:include href="Netconfig_common-para-11.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ To add a new connection, click -->
<para>
When you have finished editing network settings, click <guibutton>Apply</guibutton> to save the new configuration. If you reconfigured a device that was already active during installation, you must restart the device to use the new configuration — refer to <xref linkend="restart-network-device-x86"/>.
diff --git a/en-US/Netconfig_common-figure-1.xml b/en-US/Netconfig_common-figure-1.xml
index dfe568f..00a0b7e 100644
--- a/en-US/Netconfig_common-figure-1.xml
+++ b/en-US/Netconfig_common-figure-1.xml
@@ -4,14 +4,14 @@
%BOOK_ENTITIES;
]>
<figure float="0">
- <title>Setting the hostname</title>
+ <title>Network configuration</title>
<mediaobject>
<imageobject>
- <imagedata fileref="images/netconfig/hostname-no-localhost.png" format="PNG" width="444" />
+ <imagedata fileref="images/netconfig/networkconfig.png" format="PNG" width="444" />
</imageobject>
<textobject>
<para>
- Setting the hostname
+ Network configuration
</para>
</textobject>
diff --git a/en-US/Netconfig_common-para-10.xml b/en-US/Netconfig_common-para-10.xml
index 03050fc..5236005 100644
--- a/en-US/Netconfig_common-para-10.xml
+++ b/en-US/Netconfig_common-para-10.xml
@@ -4,6 +4,6 @@
%BOOK_ENTITIES;
]>
<para>
- To configure a network connection manually, click the button <guibutton>Configure Network</guibutton>. The <guilabel>Network Connections</guilabel> dialog appears that allows you to configure wired, wireless, mobile broadband, VPN, and DSL connections for the system using the <application>NetworkManager</application> tool. A full description of all configurations possible with <application>NetworkManager</application> is beyond the scope of this guide. This section only details the most typical scenario of how to configure wired connections during installation. Configuration of other types of network is broadly similar, although the specific parameters that you must configure are necessarily different.
+ To configure the selected network connection manually, click the button <guibutton>Configure</guibutton>. A <guilabel>Network Manager</guilabel> dialog appears that allows you to configure the selected connection. The configuration options presented will depend on whether the connection is wired, wireless, mobile broadband, VPN, or DSL. A full description of all configurations possible with <application>NetworkManager</application> is beyond the scope of this guide. This section only details the most typical scenario of how to configure wired connections during installation. Configuration of other types of network is broadly similar, although the specific parameters that you must configure are necessarily different.
</para>
diff --git a/en-US/Netconfig_common-para-12.xml b/en-US/Netconfig_common-para-12.xml
index 8bbf025..ca8d32f 100644
--- a/en-US/Netconfig_common-para-12.xml
+++ b/en-US/Netconfig_common-para-12.xml
@@ -4,6 +4,6 @@
%BOOK_ENTITIES;
]>
<para>
- Select <guilabel>Start automatically</guilabel> to start the connection automatically when the system boots.
+ Select <guilabel>Connect automatically</guilabel> to start the connection automatically when the system boots.
</para>
diff --git a/en-US/Netconfig_common-section-2.xml b/en-US/Netconfig_common-section-2.xml
index 5085984..d9151f2 100644
--- a/en-US/Netconfig_common-section-2.xml
+++ b/en-US/Netconfig_common-section-2.xml
@@ -4,19 +4,19 @@
%BOOK_ENTITIES;
]>
<section>
- <title>The Wired tab</title>
+ <title>The Ethernet tab</title>
<para>
- Use the <guilabel>Wired</guilabel> tab to specify or change the <firstterm>media access control</firstterm> (MAC) address for the network adapter, and either set the <firstterm>maximum transmission unit</firstterm> (MTU, in bytes) that can pass through the interface.
+ Use the <guilabel>Ethernet</guilabel> tab to specify or change the <firstterm>media access control</firstterm> (MAC) address for the network adapter, and either set the <firstterm>maximum transmission unit</firstterm> (MTU, in bytes) that can pass through the interface.
</para>
<figure float="0">
- <title>The Wired tab</title>
+ <title>The Ethernet tab</title>
<mediaobject>
<imageobject>
- <imagedata fileref="images/netconfig/network-connections-wired.png" format="PNG" width="444" />
+ <imagedata fileref="images/netconfig/network-connections-ethernet.png" format="PNG" width="444" />
</imageobject>
<textobject>
<para>
- The Wired tab
+ The Ethernet tab
</para>
</textobject>
diff --git a/en-US/Netconfig_common-title-1.xml b/en-US/Netconfig_common-title-1.xml
index c0e7cf3..ed5f371 100644
--- a/en-US/Netconfig_common-title-1.xml
+++ b/en-US/Netconfig_common-title-1.xml
@@ -3,5 +3,5 @@
<!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Guide.ent">
%BOOK_ENTITIES;
]>
-<title>Setting the Hostname</title>
+<title>Network configuration</title>
diff --git a/en-US/images/netconfig/network-connections-802.1x.png b/en-US/images/netconfig/network-connections-802.1x.png
index 74654a7..d5971fe 100644
Binary files a/en-US/images/netconfig/network-connections-802.1x.png and b/en-US/images/netconfig/network-connections-802.1x.png differ
diff --git a/en-US/images/netconfig/network-connections-ethernet.png b/en-US/images/netconfig/network-connections-ethernet.png
new file mode 100644
index 0000000..2d8ec4f
Binary files /dev/null and b/en-US/images/netconfig/network-connections-ethernet.png differ
diff --git a/en-US/images/netconfig/network-connections-ipv4-manual-routes.png b/en-US/images/netconfig/network-connections-ipv4-manual-routes.png
index d1048f1..913f734 100644
Binary files a/en-US/images/netconfig/network-connections-ipv4-manual-routes.png and b/en-US/images/netconfig/network-connections-ipv4-manual-routes.png differ
diff --git a/en-US/images/netconfig/network-connections-ipv4-manual.png b/en-US/images/netconfig/network-connections-ipv4-manual.png
index 04e1cf4..56c5330 100644
Binary files a/en-US/images/netconfig/network-connections-ipv4-manual.png and b/en-US/images/netconfig/network-connections-ipv4-manual.png differ
diff --git a/en-US/images/netconfig/network-connections-ipv6-ignore.png b/en-US/images/netconfig/network-connections-ipv6-ignore.png
index b2dbb9d..f617042 100644
Binary files a/en-US/images/netconfig/network-connections-ipv6-ignore.png and b/en-US/images/netconfig/network-connections-ipv6-ignore.png differ
diff --git a/en-US/images/netconfig/network-connections-ipv6-manual-routes.png b/en-US/images/netconfig/network-connections-ipv6-manual-routes.png
index ece4d93..f2242d4 100644
Binary files a/en-US/images/netconfig/network-connections-ipv6-manual-routes.png and b/en-US/images/netconfig/network-connections-ipv6-manual-routes.png differ
diff --git a/en-US/images/netconfig/networkconfig.png b/en-US/images/netconfig/networkconfig.png
new file mode 100644
index 0000000..86511db
Binary files /dev/null and b/en-US/images/netconfig/networkconfig.png differ
More information about the docs-commits
mailing list