[networking-guide] master: updates to GNOME and Wi-Fi descriptions (51a2925)

stephenw at fedoraproject.org stephenw at fedoraproject.org
Mon Jul 28 20:44:41 UTC 2014


Repository : http://git.fedorahosted.org/cgit/docs/networking-guide.git

On branch  : master

>---------------------------------------------------------------

commit 51a2925417327fba8ccf08b1c32b875c80558813
Author: Stephen Wadeley <swadeley at redhat.com>
Date:   Mon Jul 28 22:44:03 2014 +0200

    updates to GNOME and Wi-Fi descriptions
    
    after technical review by dcbw and jbenc


>---------------------------------------------------------------

 en-US/Configure_Networking.xml |   79 ++++++++++++++++++++--------------------
 1 files changed, 40 insertions(+), 39 deletions(-)

diff --git a/en-US/Configure_Networking.xml b/en-US/Configure_Networking.xml
index ecf7aa0..8df3a44 100644
--- a/en-US/Configure_Networking.xml
+++ b/en-US/Configure_Networking.xml
@@ -268,12 +268,12 @@ To restrict connections and networking, there are two options which can be used
         </listitem>
         <listitem>
           <para>
-            <guilabel>Make available to other users</guilabel> — Select this box to create a connection available to all users on the system. Changing this setting may require root privileges. See <xref linkend="sec-System-wide_and_Private_Connection_Profiles"/> for details. To prevent unexpected behavior during installation, ensure that this check box remains selected for any network interface that you configure.
+            <guilabel>Make available to other users</guilabel> — Select this box to create a connection available to all users on the system. Changing this setting may require root privileges. See <xref linkend="sec-System-wide_and_Private_Connection_Profiles"/> for details.
             </para>
         </listitem>
         <listitem>
           <para>
-            <guilabel>Automatically connect to VPN when using this connection</guilabel> — Select this box if you want <application>NetworkManager</application> to auto-connect to a VPN connection when it is available. Select the VPN from the dropdown menu.
+            <guilabel>Automatically connect to VPN when using this connection</guilabel> — Select this box if you want <application>NetworkManager</application> to auto-connect to the selected VPN connection when this connection profile is connected. Select the VPN from the drop-down menu.
           </para>
         </listitem>
       </itemizedlist>
@@ -308,12 +308,12 @@ To restrict connections and networking, there are two options which can be used
       id="sec-Configuring_a_Wi-Fi_Connection">
       <title>Configuring a Wi-Fi Connection</title>
       <para>
-        This section explains how to use <application>NetworkManager</application> to configure a Wi-Fi (also known as wireless or 802.1<replaceable>a/b/g/n</replaceable>) connection to an Access Point.</para>
+        This section explains how to use <application>NetworkManager</application> to configure a Wi-Fi (also known as wireless or 802.11<replaceable>a/b/g/n</replaceable>) connection to an Access Point.</para>
       <para>To configure a mobile broadband (such as 3G) connection, see <xref
           linkend="sec-Establishing_a_Mobile_Broadband_Connection"/>.</para>
       <bridgehead
         id="bh-Quickly_Connecting_to_an_Available_Access_Point">Quickly Connecting to an Available Access Point</bridgehead>
-      <para>The easiest way to connect to an available access point is to click on the network icon to activate the Notification Area applet, locate the <firstterm>Service Set Identifier</firstterm> (<acronym>SSID</acronym>) of the access point in the list of <guilabel>Wi-Fi</guilabel> networks, and click on it. A padlock symbol indicates the access point requires authentication. If the access point is secured, a dialog prompts you for an authentication key or password.</para>
+      <para>The easiest way to connect to an available access point is to click on the network connection icon to activate the Notification Area applet, locate the <firstterm>Service Set Identifier</firstterm> (<acronym>SSID</acronym>) of the access point in the list of <guilabel>Wi-Fi</guilabel> networks, and click on it. A padlock symbol indicates the access point requires authentication. If the access point is secured, a dialog prompts you for an authentication key or password.</para>
       <para>
         <application>NetworkManager</application> tries to auto-detect the type of security used by the access point. If there are multiple possibilities, <application>NetworkManager</application> guesses the security type and presents it in the <guilabel>Wi-Fi security</guilabel> drop-down menu. To see if there are multiple choices, click the <guilabel>Wi-Fi security</guilabel> drop-down menu and select the type of security the access point is using. If you are unsure, try connecting to each type in turn. Finally, enter the key or passphrase in the <guilabel>Password</guilabel> field. Certain password types, such as a 40-bit WEP or 128-bit WPA key, are invalid unless they are of a requisite length. The <guilabel>Connect</guilabel> button will remain inactive until you enter a key of the length required for the selected security type. To learn more about wireless security, see <xref
           linkend="sec-Configuring_Wi-Fi_Security"/>.</para>
@@ -343,7 +343,7 @@ To restrict connections and networking, there are two options which can be used
           <para>Select the <guilabel>Wi-Fi</guilabel> menu entry.</para>
         </step>
         <step>
-          <para>Click the Wi-Fi network you want to connect to. A padlock symbol indicates a key or password is required.</para>
+          <para>Click the Wi-Fi connection profile on the right-hand side menu you want to connect to. A padlock symbol indicates a key or password is required.</para>
         </step>
         <step>
           <para>
@@ -374,7 +374,7 @@ To restrict connections and networking, there are two options which can be used
             <guilabel>BSSID</guilabel>
           </term>
           <listitem>
-            <para>The <firstterm>Basic Service Set Identifier</firstterm> (<acronym>BSSID</acronym>) is the MAC address of the specific wireless access point you are connecting to when in <guilabel>Infrastructure</guilabel> mode. This field is blank by default, and you are able to connect to a wireless access point by <guilabel>SSID</guilabel> without having to specify its <guilabel>BSSID</guilabel>. If the BSSID is specified, it will force the system to associate to a specific access point only.</para>
+            <para>The <firstterm>Basic Service Set Identifier</firstterm> (<acronym>BSSID</acronym>) is the MAC address, also known as a <firstterm>hardware address</firstterm>, of the specific wireless access point you are connecting to when in <guilabel>Infrastructure</guilabel> mode. This field is blank by default, and you are able to connect to a wireless access point by <guilabel>SSID</guilabel> without having to specify its <guilabel>BSSID</guilabel>. If the BSSID is specified, it will force the system to associate to a specific access point only.</para>
             <para>For ad-hoc networks, the <guilabel>BSSID</guilabel> is generated randomly by the <application>mac80211</application> subsystem when the ad-hoc network is created. It is not displayed by <application>NetworkManager</application></para>
           </listitem>
         </varlistentry>
@@ -425,14 +425,15 @@ To restrict connections and networking, there are two options which can be used
         </listitem>
         <listitem>
           <para>
-            <guilabel>Make available to all users</guilabel> — Select this box to create a connection available to all users on the system. Changing this setting may require root privileges. See <xref
-              linkend="sec-System-wide_and_Private_Connection_Profiles"/> for details. To prevent unexpected behavior during installation, ensure that this check box remains selected for any network interface that you configure.</para>
+            <guilabel>Make available to other users</guilabel> — Select this box to create a connection available to all users on the system. Changing this setting may require root privileges. See <xref
+              linkend="sec-System-wide_and_Private_Connection_Profiles"/> for details.
+              </para>
         </listitem>
       </itemizedlist>
 
       <bridgehead
         id="bh-Saving_Your_New_or_Modified_Connection_and_Making_Further_Configurations-wireless">Saving Your New (or Modified) Connection and Making Further Configurations</bridgehead>
-      <para>Once you have finished editing the wireless connection, click the <guibutton>Apply</guibutton> button and <application>NetworkManager</application> will immediately save your customized configuration. Given a correct configuration, you can successfully connect to your the modified connection by selecting it from the Notification Area applet. See <xref
+      <para>Once you have finished editing the wireless connection, click the <guibutton>Apply</guibutton> button and <application>NetworkManager</application> will save your customized configuration. Given a correct configuration, you can connect to your modified connection by selecting it from the Notification Area applet. See <xref
           linkend="sec-Connecting_to_a_Network_Using_a_GUI"/> for details on selecting and connecting to a network.</para>
       <para>You can further configure an existing connection by selecting it in the <guilabel>Network</guilabel> window and clicking the gear wheel icon to reveal the connection details.</para>
       <para>Then, to configure:</para>
@@ -466,10 +467,10 @@ To restrict connections and networking, there are two options which can be used
           <para>it encrypts the packet data; and,</para>
         </listitem>
         <listitem>
-          <para>it encloses the data with an Encapsulating Security Payload (ESP), which constitutes the decryption and handling instructions.</para>
+          <para>it encloses the data in packets according to the Encapsulating Security Payload (ESP) protocol, which constitutes the decryption and handling instructions.</para>
         </listitem>
       </orderedlist>
-      <para>The receiving VPN router strips the header information, decrypts the data, and routes it to its intended destination (either a workstation or other node on a network). Using a network-to-network connection, the receiving node on the local network receives the packets already decrypted and ready for processing. The encryption/decryption process in a network-to-network VPN connection is therefore transparent to clients.</para>
+      <para>The receiving VPN router strips the header information, decrypts the data, and routes it to its intended destination (either a workstation or other node on a network). Using a network-to-network connection, the receiving node on the local network receives the packets already decrypted and ready for processing. The encryption and decryption process in a network-to-network VPN connection is therefore transparent to clients.</para>
       <para>Because they employ several layers of authentication and encryption, VPNs are a secure and effective means of connecting multiple remote nodes to act as a unified intranet.</para>
 
       <procedure
@@ -541,7 +542,7 @@ To restrict connections and networking, there are two options which can be used
         </listitem>
         <listitem>
           <para>
-            <guilabel>All users may connect to this network</guilabel> — Select this box to create a connection available to all users on the system. Changing this setting may require root privileges. See <xref linkend="sec-System-wide_and_Private_Connection_Profiles"/> for details. To prevent unexpected behavior during installation, ensure that this check box remains selected for any network interface that you configure.
+            <guilabel>All users may connect to this network</guilabel> — Select this box to create a connection available to all users on the system. Changing this setting may require root privileges. See <xref linkend="sec-System-wide_and_Private_Connection_Profiles"/> for details.
             </para>
         </listitem>
         <listitem>
@@ -678,10 +679,10 @@ To restrict connections and networking, there are two options which can be used
       <para>You can use <application>NetworkManager</application>'s mobile broadband connection abilities to connect to the following <firstterm>2G</firstterm> and <firstterm>3G</firstterm> services:</para>
       <itemizedlist>
         <listitem>
-          <para>2G — <firstterm>GPRS</firstterm> (<firstterm>General Packet Radio Service</firstterm>) or <firstterm>EDGE</firstterm> (<firstterm>Enhanced Data Rates for GSM Evolution</firstterm>)</para>
+          <para>2G — <firstterm>GPRS</firstterm> (<firstterm>General Packet Radio Service</firstterm>), <firstterm>EDGE</firstterm> (<firstterm>Enhanced Data Rates for GSM Evolution</firstterm>), or CDMA (Code Division Multiple Access).</para>
         </listitem>
         <listitem>
-          <para>3G — <firstterm>UMTS</firstterm> (<firstterm>Universal Mobile Telecommunications System</firstterm>) or <firstterm>HSPA</firstterm> (<firstterm>High Speed Packet Access</firstterm>)
+          <para>3G — <firstterm>UMTS</firstterm> (<firstterm>Universal Mobile Telecommunications System</firstterm>), <firstterm>HSPA</firstterm> (<firstterm>High Speed Packet Access</firstterm>), or EVDO (EVolution Data-Only).
           </para>
         </listitem>
       </itemizedlist>
@@ -705,7 +706,7 @@ To restrict connections and networking, there are two options which can be used
         <para>Click <guibutton>Create</guibutton> to open the <guilabel>Set up a Mobile Broadband Connection</guilabel> assistant.</para>
         </step>
         <step>
-          <para>Under <guilabel>Create a connection for this mobile broadband device</guilabel>, choose the 2G- or 3G-capable device you want to use with the connection. If the dropdown menu is inactive, this indicates that the system was unable to detect a device capable of mobile broadband. In this case, click <guilabel>Cancel</guilabel>, ensure that you do have a mobile broadband-capable device attached and recognized by the computer and then retry this procedure. Click the <guilabel>Continue</guilabel> button.</para>
+          <para>Under <guilabel>Create a connection for this mobile broadband device</guilabel>, choose the 2G- or 3G-capable device you want to use with the connection. If the drop-down menu is inactive, this indicates that the system was unable to detect a device capable of mobile broadband. In this case, click <guilabel>Cancel</guilabel>, ensure that you do have a mobile broadband-capable device attached and recognized by the computer and then retry this procedure. Click the <guilabel>Continue</guilabel> button.</para>
         </step>
         <step>
           <para>Select the country where your service provider is located from the list and click the <guilabel>Continue</guilabel> button.</para>
@@ -754,7 +755,7 @@ To restrict connections and networking, there are two options which can be used
         </listitem>
         <listitem>
           <para>
-            <guilabel>All users may connect to this network</guilabel> — Select this box to create a connection available to all users on the system. Changing this setting may require root privileges. See <xref linkend="sec-System-wide_and_Private_Connection_Profiles"/> for details. To prevent unexpected behavior during installation, ensure that this check box remains selected for any network interface that you configure.
+            <guilabel>All users may connect to this network</guilabel> — Select this box to create a connection available to all users on the system. Changing this setting may require root privileges. See <xref linkend="sec-System-wide_and_Private_Connection_Profiles"/> for details.
             </para>
         </listitem>
         <listitem>
@@ -946,7 +947,7 @@ To restrict connections and networking, there are two options which can be used
         </listitem>
         <listitem>
           <para>
-            <guilabel>All users may connect to this network</guilabel> — Select this box to create a connection available to all users on the system. Changing this setting may require root privileges. See <xref linkend="sec-System-wide_and_Private_Connection_Profiles"/> for details. To prevent unexpected behavior during installation, ensure that this check box remains selected for any network interface that you configure.
+            <guilabel>All users may connect to this network</guilabel> — Select this box to create a connection available to all users on the system. Changing this setting may require root privileges. See <xref linkend="sec-System-wide_and_Private_Connection_Profiles"/> for details.
             </para>
         </listitem>
         <listitem>
@@ -1021,21 +1022,21 @@ To restrict connections and networking, there are two options which can be used
     id="sec-Configuring_Connection_Settings">
     <title>Configuring Connection Settings</title>
     <section
-      id="sec-Configuring_802.1x_Security">
-      <title>Configuring 802.1x Security</title>
-      <para>802.1x security is the name of the IEEE standard for <firstterm>port-based Network Access Control</firstterm> (<acronym>PNAC</acronym>). Simply put, 802.1x security is a way of controlling access to a <firstterm>logical network</firstterm> from a physical one. All clients who want to join the logical network must authenticate with the server (a router, for example) using the correct 802.1x authentication method.</para>
-      <para>802.1x security is most often associated with securing wireless networks (WLANs), but can also be used to prevent intruders with physical access to the network (LAN) from gaining entry. In the past, <systemitem class="protocol">DHCP</systemitem> servers were configured not to lease <systemitem class="protocol">IP</systemitem> addresses to unauthorized users, but for various reasons this practice is both impractical and insecure, and thus is no longer recommended. Instead, 802.1x security is used to ensure a logically-secure network through port-based authentication.</para>
-      <para>802.1x provides a framework for WLAN and LAN access control and serves as an envelope for carrying one of the Extensible Authentication Protocol (EAP) types. An EAP type is a protocol that defines how WLAN security is achieved on the network.</para>
-      <para>You can configure 802.1x security for a wired or wireless connection type by opening the <guilabel>Network</guilabel> window (see <xref linkend="sec-Connecting_to_a_Network_Using_a_GUI"/>) and following the applicable procedure below. Press the <keycap>Super</keycap> key to enter the Activities Overview, type <command>control network</command> and then press <keycap>Enter</keycap>. The <guilabel>Network</guilabel> settings tool appears. Proceed to <xref linkend="procedure-For_a_Wired_Connection" /> or <xref linkend="procedure-For_a_Wireless_Connection" />:</para>
+      id="sec-Configuring_802.1X_Security">
+      <title>Configuring 802.1X Security</title>
+      <para>802.1X security is the name of the IEEE standard for <firstterm>port-based Network Access Control</firstterm> (<acronym>PNAC</acronym>). It is also called <firstterm>WPA Enterprise</firstterm>. Simply put, 802.1X security is a way of controlling access to a <firstterm>logical network</firstterm> from a physical one. All clients who want to join the logical network must authenticate with the server (a router, for example) using the correct 802.1X authentication method.</para>
+      <para>802.1X security is most often associated with securing wireless networks (WLANs), but can also be used to prevent intruders with physical access to the network (LAN) from gaining entry. In the past, <systemitem class="protocol">DHCP</systemitem> servers were configured not to lease <systemitem class="protocol">IP</systemitem> addresses to unauthorized users, but for various reasons this practice is both impractical and insecure, and thus is no longer recommended. Instead, 802.1X security is used to ensure a logically-secure network through port-based authentication.</para>
+      <para>802.1X provides a framework for WLAN and LAN access control and serves as an envelope for carrying one of the Extensible Authentication Protocol (EAP) types. An EAP type is a protocol that defines how security is achieved on the network.</para>
+      <para>You can configure 802.1X security for a wired or wireless connection type by opening the <guilabel>Network</guilabel> window (see <xref linkend="sec-Connecting_to_a_Network_Using_a_GUI"/>) and following the applicable procedure below. Press the <keycap>Super</keycap> key to enter the Activities Overview, type <command>control network</command> and then press <keycap>Enter</keycap>. The <guilabel>Network</guilabel> settings tool appears. Proceed to <xref linkend="procedure-For_a_Wired_Connection" /> or <xref linkend="procedure-For_a_Wireless_Connection" />:</para>
 
       <procedure
         id="procedure-For_a_Wired_Connection">
         <title>For a Wired Connection</title>
         <step>
-          <para>Select a <guilabel>Wired</guilabel> connection in the left pane of the <guilabel>Network</guilabel> window.</para>
+          <para>Select a <guilabel>Wired</guilabel> network interface from the left-hand-side menu.</para>
         </step>
         <step>
-          <para>Either click on <guibutton>Add Profile</guibutton> to add a new network connection for which you want to configure 802.1x security, or select an existing connection and click the gear wheel icon.</para>
+          <para>Either click on <guibutton>Add Profile</guibutton> to add a new network connection profile for which you want to configure 802.1X security, or select an existing connection profile and click the gear wheel icon.</para>
         </step>
         <step>
           <para>Then select <guilabel>Security</guilabel> and set the symbolic power button to <guilabel>ON</guilabel> to enable settings configuration.</para>
@@ -1049,13 +1050,13 @@ To restrict connections and networking, there are two options which can be used
         id="procedure-For_a_Wireless_Connection">
         <title>For a Wireless Connection</title>
         <step>
-          <para>Select a <guilabel>Wireless</guilabel> connection in the left pane of the <guilabel>Network</guilabel> window and, if necessary, set the symbolic power button to <guilabel>ON</guilabel>.</para>
+          <para>Select a <guilabel>Wireless</guilabel> network interface from the left-hand-side menu. If necessary, set the symbolic power button to <guilabel>ON</guilabel> and check that your hardware switch is on.</para>
         </step>
         <step>
-          <para>Either select the connection name of a new connection, or click the gear wheel icon of an existing connection, for which you want to configure 802.1x security. In the case of a new connection complete any authentication steps to complete the connection and then click the gear wheel icon.</para>
+          <para>Either select the connection name of a new connection, or click the gear wheel icon of an existing connection profile, for which you want to configure 802.1X security. In the case of a new connection, complete any authentication steps to complete the connection and then click the gear wheel icon.</para>
         </step>
         <step>
-          <para>Then select <guilabel>Security</guilabel>.</para>
+          <para>Select <guilabel>Security</guilabel>.</para>
           </step>
           <step>
           <para>
@@ -1416,7 +1417,7 @@ To restrict connections and networking, there are two options which can be used
     <section
       id="sec-Configuring_IPv4_Settings">
       <title>Configuring IPv4 Settings</title>
-      <para>The <guilabel>IPv4 Settings</guilabel> tab allows you to configure the method by which you connect to the Internet and enter <systemitem class="protocol">IP</systemitem> address, route, and <systemitem class="protocol">DNS</systemitem> information as required. The <guilabel>IPv4 Settings</guilabel> tab is available when you create and modify one of the following connection types: wired, wireless, mobile broadband, VPN or DSL. If you need to configure <systemitem class="protocol">IPv6</systemitem> addresses, see <xref linkend="sec-Configuring_IPv6_Settings"/>. If you need to configure static routes, which can be done by clicking on the <guibutton>Routes</guibutton> button, see <xref linkend="sec-Configuring_Routes"/>.</para>
+      <para>The <guilabel>IPv4 Settings</guilabel> tab allows you to configure the method used to connect to a network, to enter <systemitem class="protocol">IP</systemitem> address, route, and <systemitem class="protocol">DNS</systemitem> information as required. The <guilabel>IPv4 Settings</guilabel> tab is available when you create and modify one of the following connection types: wired, wireless, mobile broadband, VPN or DSL. If you need to configure <systemitem class="protocol">IPv6</systemitem> addresses, see <xref linkend="sec-Configuring_IPv6_Settings"/>. If you need to configure static routes, click the <guibutton>Routes</guibutton> button and proceed to <xref linkend="sec-Configuring_Routes"/>.</para>
       <para>If you are using <systemitem class="protocol">DHCP</systemitem> to obtain a dynamic <systemitem class="protocol">IP</systemitem> address from a <systemitem class="protocol">DHCP</systemitem> server, you can simply set <guilabel>Method</guilabel> to <guimenuitem>Automatic (DHCP)</guimenuitem>.</para>
       <bridgehead
         id="bh-Setting_the_Method">Setting the Method</bridgehead>
@@ -1446,34 +1447,34 @@ To restrict connections and networking, there are two options which can be used
           <term>Wired, Wireless and DSL Connection Methods</term>
           <listitem>
             <para>
-              <guimenuitem>Manual</guimenuitem> — Choose this option if the network you are connecting to does not have a <systemitem class="protocol">DHCP</systemitem> server and you want to assign <systemitem class="protocol">IP</systemitem> addresses manually.</para>
+              <guimenuitem>Manual</guimenuitem> — Choose this option if you want to assign <systemitem class="protocol">IP</systemitem> addresses manually.</para>
           </listitem>
         </varlistentry>
         <varlistentry>
           <term>Mobile Broadband Connection Methods</term>
           <listitem>
             <para>
-              <guimenuitem>Automatic (PPP)</guimenuitem> — Choose this option if the network you are connecting to uses a <systemitem class="protocol">DHCP</systemitem> server to assign <systemitem class="protocol">IP</systemitem> addresses.</para>
+              <guimenuitem>Automatic (PPP)</guimenuitem> — Choose this option if the network you are connecting to assigns your <systemitem class="protocol">IP</systemitem> address and <systemitem class="protocol">DNS</systemitem> servers automatically.</para>
             <para>
-              <guimenuitem>Automatic (PPP) addresses only</guimenuitem> — Choose this option if the network you are connecting to uses a <systemitem class="protocol">DHCP</systemitem> server to assign <systemitem class="protocol">IP</systemitem> addresses but you want to assign <systemitem class="protocol">DNS</systemitem> servers manually.</para>
+              <guimenuitem>Automatic (PPP) addresses only</guimenuitem> — Choose this option if the network you are connecting to assigns your <systemitem class="protocol">IP</systemitem> address automatically, but you want to manually specify <systemitem class="protocol">DNS</systemitem> servers.</para>
           </listitem>
         </varlistentry>
         <varlistentry>
           <term>VPN Connection Methods</term>
           <listitem>
             <para>
-              <guimenuitem>Automatic (VPN)</guimenuitem> — Choose this option if the network you are connecting to uses a <systemitem class="protocol">DHCP</systemitem> server to assign <systemitem class="protocol">IP</systemitem> addresses.</para>
+              <guimenuitem>Automatic (VPN)</guimenuitem> — Choose this option if the network you are connecting to assigns your <systemitem class="protocol">IP</systemitem> address and <systemitem class="protocol">DNS</systemitem> servers automatically.</para>
             <para>
-              <guimenuitem>Automatic (VPN) addresses only</guimenuitem> — Choose this option if the network you are connecting to uses a <systemitem class="protocol">DHCP</systemitem> server to assign <systemitem class="protocol">IP</systemitem> addresses but you want to assign <systemitem class="protocol">DNS</systemitem> servers manually.</para>
+              <guimenuitem>Automatic (VPN) addresses only</guimenuitem> — Choose this option if the network you are connecting to assigns your <systemitem class="protocol">IP</systemitem> address automatically, but you want to manually specify <systemitem class="protocol">DNS</systemitem> servers.</para>
           </listitem>
         </varlistentry>
         <varlistentry>
           <term>DSL Connection Methods</term>
           <listitem>
             <para>
-              <guimenuitem>Automatic (PPPoE)</guimenuitem> — Choose this option if the network you are connecting to uses a <systemitem class="protocol">DHCP</systemitem> server to assign <systemitem class="protocol">IP</systemitem> addresses.</para>
+              <guimenuitem>Automatic (PPPoE)</guimenuitem> — Choose this option if the network you are connecting to assigns your <systemitem class="protocol">IP</systemitem> address and <systemitem class="protocol">DNS</systemitem> servers automatically.</para>
             <para>
-              <guimenuitem>Automatic (PPPoE) addresses only</guimenuitem> — Choose this option if the network you are connecting to uses a <systemitem class="protocol">DHCP</systemitem> server to assign <systemitem class="protocol">IP</systemitem> addresses but you want to assign <systemitem class="protocol">DNS</systemitem> servers manually.</para>
+              <guimenuitem>Automatic (PPPoE) addresses only</guimenuitem> — Choose this option if the network you are connecting to assigns your <systemitem class="protocol">IP</systemitem> address automatically, but you wish to manually specify <systemitem class="protocol">DNS</systemitem> servers.</para>
           </listitem>
         </varlistentry>
       </variablelist>
@@ -1522,9 +1523,9 @@ To restrict connections and networking, there are two options which can be used
  <section
       id="sec-Configuring_Routes">
       <title>Configuring Routes</title>
-      <para>A host's routing table will be automatically populated with routes to directly connected networks. The routes are learned by observing the network interfaces when they are <quote>up</quote>. This section describes entering static routes to networks or hosts which can be reached by traversing an intermediate network or connection, such as a VPN tunnel or leased line. In order to reach a remote network or host, the system is given the address of a gateway to which traffic should be sent.</para>
+      <para>A host's routing table will be automatically populated with routes to directly connected networks. The routes are learned by examining the network interfaces when they are <quote>up</quote>. This section describes entering static routes to networks or hosts which can be reached by traversing an intermediate network or connection, such as a VPN tunnel or leased line. In order to reach a remote network or host, the system is given the address of a gateway to which traffic should be sent.</para>
       <para>
-        When a host's interface is configured by <systemitem class="protocol">DHCP</systemitem>, an address of a gateway that leads to an upstream network or the Internet is usually assigned. This gateway is usually referred to as the default gateway as it is the gateway to use if no better route is known to the system (and present in the routing table). Network administrators often use the first host <systemitem class="protocol">IP</systemitem> address in the network as the gateway address; for example, <systemitem class="ipaddress">192.168.10.1</systemitem>. Not to be confused by the address which represents the network itself; in this example, <systemitem class="ipaddress">192.168.10.0</systemitem>.
+        When a host's interface is configured by <systemitem class="protocol">DHCP</systemitem>, an address of a gateway that leads to an upstream network or the Internet is usually assigned. This gateway is usually referred to as the default gateway as it is the gateway to use if no better route is known to the system (and present in the routing table). Network administrators often use the first or last host <systemitem class="protocol">IP</systemitem> address in the network as the gateway address; for example, <systemitem class="ipaddress">192.168.10.1</systemitem> or <systemitem class="ipaddress">192.168.10.254</systemitem>. Not to be confused by the address which represents the network itself; in this example, <systemitem class="ipaddress">192.168.10.0</systemitem>, or the subnet's broadcast address; in this example <systemitem class="ipaddress">192.168.10.255</systemitem>.
       </para>
       <bridgehead id="Configuring_Static_Routes">Configuring Static Routes</bridgehead>
       <para>
@@ -1551,7 +1552,7 @@ To restrict connections and networking, there are two options which can be used
             <guibutton>Automatic</guibutton>
           </term>
           <listitem>
-            <para>Ensure this is <guilabel>ON</guilabel> to use manually entered routes for this connection.</para>
+            <para>When Automatic is <guilabel>ON</guilabel>, routes from <systemitem class="protocol">RA</systemitem> or <systemitem class="protocol">DHCP</systemitem> are used, but you can also add additional static routes. When <guilabel>OFF</guilabel>, only static routes you define are used.</para>
           </listitem>
         </varlistentry>
         <varlistentry>



More information about the docs-commits mailing list