[networking-guide] master: updates from my upstream version (6089567)

stephenw at fedoraproject.org stephenw at fedoraproject.org
Fri Jan 2 07:54:11 UTC 2015


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

On branch  : master

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

commit 608956764c1dcfcd93aa93f8c165b03c736d7b44
Author: Stephen Wadeley <swadeley at redhat.com>
Date:   Thu Jan 1 18:00:46 2015 +0100

    updates from my upstream version
    
    some style changes, minor improvements. Changed some
    bridgheads to sec due to numbering problems in publican


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

 en-US/Configure_Networking.xml |  124 ++++++++++++++++++++--------------------
 1 files changed, 62 insertions(+), 62 deletions(-)

diff --git a/en-US/Configure_Networking.xml b/en-US/Configure_Networking.xml
index 42c00de..11c3c80 100644
--- a/en-US/Configure_Networking.xml
+++ b/en-US/Configure_Networking.xml
@@ -33,7 +33,7 @@
     Enable and use dynamic assignment of <systemitem class="protocol">IP</systemitem> addresses and other network information whenever there is no compelling reason not to. The time saved in planning and documenting manual settings can be better spent elsewhere. The <firstterm>dynamic host control protocol</firstterm> (<acronym>DHCP</acronym>) is a traditional method of dynamically assigning network configurations to hosts. See <xref linkend="sec-dhcp-why" /> for more information on this subject.
     </para>
     <para>
-      Note that <application>NetworkManager</application> will start the <systemitem class="protocol">DHCP</systemitem> client, <application>dhclient</application>, automatically.
+      <application>NetworkManager</application> will by default call the <systemitem class="protocol">DHCP</systemitem> client, <application>dhclient</application>, when a profile has been set to obtain addresses automatically, or when an interface configuration file has BOOTPROTO set to <literal>dhcp</literal>. Where <systemitem class="protocol">DHCP</systemitem> is required, an instance of <systemitem class="service">dhclient</systemitem> is started for every Internet protocol, <systemitem class="protocol">IPv4</systemitem> and <systemitem class="protocol">IPv6</systemitem>, on an interface. Where <application>NetworkManager</application> is not running, or not managing an interface, then the legacy network service will call instances of <systemitem class="service">dhclient</systemitem> as required.
     </para>
 </section>
 <section id="sec-Selecting_Network_Configuration_Methods">
@@ -60,13 +60,13 @@
 <section id="sec-Using_NetworkManager_with_the_GNOME_Graphical_User_Interface">
   <title>Using NetworkManager with the GNOME Graphical User Interface</title>
 <para>
-    As of <application>Fedora 20</application>, <application>NetworkManager</application> does not have its own graphical user interface (GUI). The <guilabel>Network</guilabel> settings configuration tool is provided as part of the new GNOME <application>control-center</application> GUI. The old <application>nm-connection-editor</application> GUI is still available for certain tasks.
+    As of <application>Fedora 20</application>, <application>NetworkManager</application>'s own graphical user interface (GUI) is not used by default. The <guilabel>Network</guilabel> settings configuration tool is provided as part of the new GNOME <application>control-center</application> GUI. The old <application>nm-connection-editor</application> GUI is still available for certain tasks.
   </para>
   <section
       id="sec-Connecting_to_a_Network_Using_a_GUI">
       <title>Connecting to a Network Using a GUI</title>
            <para>
-        Access the <guilabel>Network</guilabel> settings window of the <application>control-center</application> application as follow:</para>
+        Access the <guilabel>Network</guilabel> settings window of the <application>control-center</application> application as follows:</para>
         <itemizedlist>
         <listitem>
      <para>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="sec-Configuring_New_and_Editing_Existing_Connections" /></para>
@@ -94,7 +94,7 @@
       </mediaobject>
     </figure>
   <para>
-    The <guilabel>Network</guilabel> settings window has a menu on the left-hand side showing the available network devices or interfaces. This includes software interfaces such as for VLANs, bridges, bonds, and teams. On the right-hand side, the <firstterm>connection profiles</firstterm> are shown for the selected network device or interface. A profile is a named collection of settings that can be applied to an interface. Below that is a plus and a minus button for adding and deleting new network connections, and on the right a gear wheel icon will appear for editing the connection details of the selected network device or VPN connection. To add a new connection, click the plus symbol to open the <guilabel>Add Network Connection</guilabel> window and proceed to <xref linkend="bh-Configuring_a_New_Connection" />.</para>
+    The <guilabel>Network</guilabel> settings window has a menu on the left-hand side showing the available network devices or interfaces. This includes software interfaces such as for VLANs, bridges, bonds, and teams. On the right-hand side, the <firstterm>connection profiles</firstterm> are shown for the selected network device or interface. A profile is a named collection of settings that can be applied to an interface. Below that is a plus and a minus button for adding and deleting new network connections, and on the right a gear wheel icon will appear for editing the connection details of the selected network device or VPN connection. To add a new connection, click the plus symbol to open the <guilabel>Add Network Connection</guilabel> window and proceed to <xref linkend="sec-Configuring_a_New_Connection" />.</para>
   <bridgehead id="bh-Editing_an_Existing_Connection">Editing an Existing Connection</bridgehead>
   <para>Clicking on the gear wheel icon of an existing connection profile in the <guilabel>Network</guilabel> settings window opens the <guilabel>Network</guilabel> details window, from where you can perform most network configuration tasks such as <systemitem class="protocol">IP</systemitem> addressing, <systemitem class="protocol">DNS</systemitem>, and routing configuration.</para>
         <figure id="exam-Configuring_New_and_Editing_Existing_Connections_Network-Details-Window">
@@ -110,7 +110,7 @@
         <textobject><para>A screen shot of GNOME's Network Interface Detail window. The menu is on the left.</para></textobject>
       </mediaobject>
     </figure>
-    <bridgehead id="bh-Configuring_a_New_Connection">Configuring a New Connection</bridgehead>
+    <section id="sec-Configuring_a_New_Connection"><title>Configuring a New Connection</title>
     <para>
        In the <guilabel>Network</guilabel> settings window, click the plus sign below the menu to open the <guilabel>Add Network Connection</guilabel> window. This displays a list of connection types that can be added.
     </para>
@@ -143,6 +143,7 @@
         </listitem>
         </itemizedlist>
     </section>
+    </section>
 
     <section
       id="sec-Connecting_to_a_Network_Automatically">
@@ -164,7 +165,7 @@
           <para>Select the <guilabel>Identity</guilabel> menu entry on the left. The <guilabel>Network</guilabel> window changes to the identity view.</para>
         </step>
         <step>
-          <para>Select <guilabel>Connect automatically</guilabel> to cause <application>NetworkManager</application> to auto-connect to the connection whenever <application>NetworkManager</application> detects that it is available. Clear the check box if you do not want <application>NetworkManager</application> to connect automatically. If the check box is clear, you will have to select that connection manually in the network applet menu to cause it to connect.</para>
+          <para>Select <guilabel>Connect automatically</guilabel> to cause <application>NetworkManager</application> to auto-connect to the connection whenever <application>NetworkManager</application> detects that it is available. Clear the check box if you do not want <application>NetworkManager</application> to connect automatically. If the check box is clear, you will have to select that connection manually in the network settings tool to cause it to connect.</para>
         </step>
       </procedure>
     </section>
@@ -216,7 +217,7 @@ To restrict connections and networking, there are two options which can be used
           <para>Select the <guilabel>Identity</guilabel> menu entry on the left. The <guilabel>Network</guilabel> window changes to the identity view.</para>
         </step>
         <step>
-          <para>Select the <guilabel>Make available to other users</guilabel> check box to cause <application>NetworkManager</application> to make the connection available system-wide. Depending on system policy, you may then be prompted for the root password by the <application>PolicyKit</application> application. If so, enter the <systemitem class="username">root</systemitem> password to finalize the change.</para>
+          <para>Select the <guilabel>Make available to other users</guilabel> check box to cause <application>NetworkManager</application> to make the connection available system-wide. Depending on system policy, you may then be prompted for an administrator or <systemitem class="username">root</systemitem> password by the <application>polkit</application> application. If so, enter the appropriate password to finalize the changes.</para>
           <para>Conversely, clear the <guilabel>Make available to other users</guilabel> check box to make the connection user-specific.</para>
         </step>
       </procedure>
@@ -234,8 +235,8 @@ To restrict connections and networking, there are two options which can be used
 </para>
       <para>When you add a new connection by clicking the <guibutton>Add Profile</guibutton> button, <application>NetworkManager</application> creates a new configuration file for that connection and then opens the same dialog that is used for editing an existing connection. The difference between these dialogs is that an existing connection profile has a <guilabel>Details</guilabel> and <guilabel>Reset</guilabel> menu entry. In effect, you are always editing a connection profile; the difference only lies in whether that connection previously existed or was just created by <application>NetworkManager</application> when you clicked <guibutton>Add Profile</guibutton>.</para>
 
-      <bridgehead
-        id="bh-Configuring_the_Connection_Name_Auto-Connect_Behavior_and_Availability_Settings-wired">Configuring the Connection Name, Auto-Connect Behavior, and Availability Settings</bridgehead>
+   <section id="sec-Configuring_the_Connection_Name_Auto-Connect_Behavior_and_Availability_Settings-wired">
+   <title>Configuring the Connection Name, Auto-Connect Behavior, and Availability Settings</title>
  <para>Many settings in the <guilabel>Editing</guilabel> dialog are common to all connection types, see the <guilabel>Identity</guilabel> view if using the GNOME tool or the <guilabel>General</guilabel> tab if using <application>nm-connection-editor</application>:
       </para>
       <itemizedlist>
@@ -261,7 +262,7 @@ To restrict connections and networking, there are two options which can be used
         </listitem>
          <listitem>
           <para>
-            <guilabel>Firewall Zone</guilabel> — If required, select a different firewall zone to apply. See the <citetitle pubwork="book"><ulink url="https://access.redhat.com/site/documentation/en-US/Red_Hat_Enterprise_Linux/7/html/Security_Guide/">Red&nbsp;Hat Enterprise Linux 7 Security Guide</ulink></citetitle> for more information on firewall zones.
+            <guilabel>Firewall Zone</guilabel> — If required, select a different firewall zone to apply. See the <citetitle pubwork="book"><ulink url="https://access.redhat.com/documentation/en-US/Red_Hat_Enterprise_Linux/7/html/Security_Guide/">Red&nbsp;Hat Enterprise&nbsp;Linux&nbsp;7 Security Guide</ulink></citetitle> for more information on firewall zones.
           </para>
         </listitem>
         <listitem>
@@ -306,6 +307,7 @@ To restrict connections and networking, there are two options which can be used
         </listitem>
       </itemizedlist>
     </section>
+    </section>
 
     <section
       id="sec-Configuring_a_Wi-Fi_Connection">
@@ -316,34 +318,36 @@ To restrict connections and networking, there are two options which can be used
           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 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>The easiest way to connect to an available access point is to click on the network connection icon to activate the network connection, 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
+        <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. For WPA-PSK security (WPA with a passphrase) no choice is necessary. For WPA Enterprise (802.1X) you have to specifically select the security, because that cannot be auto-detected. 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>
 
 
-      <para>If <application>NetworkManager</application> connects to the access point successfully, the Notification Area applet icon will change into a graphical indicator of the wireless connection's signal strength.</para>
-      <para>You can also edit the settings for one of these auto-created access point connections just as if you had added it yourself. The <guilabel>Wi-Fi</guilabel> page of the <guilabel>Network</guilabel> window has a <guilabel>History</guilabel> button. Clicking this reveals a list of all the connections you have ever tried to connect to. See <xref linkend="bh-Editing_a_Connection_or_Creating_a_Completely_New_One" /></para>
+      <para>If <application>NetworkManager</application> connects to the access point successfully, the network connection icon will change into a graphical indicator of the wireless connection's signal strength.</para>
+      <para>You can also edit the settings for one of these auto-created access point connections just as if you had added it yourself. The <guilabel>Wi-Fi</guilabel> page of the <guilabel>Network</guilabel> window has a <guilabel>History</guilabel> button. Clicking it reveals a list of all the connections you have ever tried to connect to. See <xref linkend="sec-Editing_a_Connection_or_Creating_a_Completely_New_One" /></para>
 
-        <bridgehead
-        id="bh-Connecting_to_a_Hidden_Wi-Fi_Network">Connecting to a Hidden Wi-Fi Network</bridgehead>
+   <section id="sec-Connecting_to_a_Hidden_Wi-Fi_Network">
+   <title>Connecting to a Hidden Wi-Fi Network</title>
       <para>All access points have a <firstterm>Service Set Identifier</firstterm> (<acronym>SSID</acronym>) to identify them. However, an access point may be configured not to broadcast its SSID, in which case it is <emphasis>hidden</emphasis>, and will not show up in <application>NetworkManager</application>'s list of <guilabel>Available</guilabel> networks. You can still connect to a wireless access point that is hiding its SSID as long as you know its SSID, authentication method, and secrets.</para>
-      <para>To connect to a hidden wireless network, 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> window appears. Select <guilabel>Wi-Fi</guilabel> from the menu and then select <guilabel>Connect to Hidden Network</guilabel> to cause a dialog to appear. If you have connected to the hidden network before, use the <guilabel>Connection</guilabel> dropdown to select it, and click <guibutton>Connect</guibutton>. If you have not, leave the <guilabel>Connection</guilabel> dropdown as <guimenuitem>New</guimenuitem>, enter the SSID of the hidden network, select its <guilabel>Wi-Fi security</guilabel> method, enter the correct authentication secrets, and click <guibutton>Connect</guibutton>.</para>
+      <para>To connect to a hidden wireless network, 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> window appears. Select <guilabel>Wi-Fi</guilabel> from the menu and then select <guilabel>Connect to Hidden Network</guilabel> to cause a dialog to appear. If you have connected to the hidden network before, use the <guilabel>Connection</guilabel> drop-down to select it, and click <guibutton>Connect</guibutton>. If you have not, leave the <guilabel>Connection</guilabel> drop-down as <guimenuitem>New</guimenuitem>, enter the SSID of the hidden network, select its <guilabel>Wi-Fi security</guilabel> method, enter the correct authentication secrets, and click <guibutton>Connect</guibutton>.</para>
       <para>For more information on wireless security settings, see <xref
           linkend="sec-Configuring_Wi-Fi_Security"/>.</para>
-      <bridgehead
-        id="bh-Editing_a_Connection_or_Creating_a_Completely_New_One">Editing a Connection, or Creating a Completely New One</bridgehead>
+    </section>
+
+   <section id="sec-Editing_a_Connection_or_Creating_a_Completely_New_One">
+   <title>Editing a Connection, or Creating a Completely New One</title>
       <para>You can edit an existing connection that you have tried or succeeded in connecting to in the past by opening the <guilabel>Wi-Fi</guilabel> page of the <guilabel>Network</guilabel> dialog and selecting the gear wheel icon to the right of the Wi-Fi connection name. If the network is not currently in range, click <guilabel>History</guilabel> to display past connections. When you click the gear wheel icon the editing connection dialog appears. The <guilabel>Details</guilabel> window shows the connection details.</para>
 
 
-      <para>To configure a new connection whose SSID is in range, first attempt to connect to it by opening the <guilabel>Network</guilabel> window, selecting the <guilabel>Wi-Fi</guilabel> menu entry, and clicking the connection name (by default, the same as the SSID). If the SSID is not in range, see <xref linkend="bh-Connecting_to_a_Hidden_Wi-Fi_Network" />. If the SSID is in range, the procedure is as follows:</para>
+      <para>To configure a new connection whose SSID is in range, first attempt to connect to it by opening the <guilabel>Network</guilabel> window, selecting the <guilabel>Wi-Fi</guilabel> menu entry, and clicking the connection name (by default, the same as the SSID). If the SSID is not in range, see <xref linkend="sec-Connecting_to_a_Hidden_Wi-Fi_Network" />. If the SSID is in range, the procedure is as follows:</para>
 
           <procedure>
            <step>
           <para>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.</para>
         </step>
         <step>
-          <para>Select the <guilabel>Wi-Fi</guilabel> menu entry.</para>
+          <para>Select the <guilabel>Wi-Fi</guilabel> interface from the left-hand-side menu entry.</para>
         </step>
         <step>
           <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>
@@ -386,24 +390,10 @@ To restrict connections and networking, there are two options which can be used
             <guilabel>MAC address</guilabel>
           </term>
           <listitem>
-            <para>Like an Ethernet Network Interface Card (NIC), a wireless adapter has a unique MAC address (Media Access Control; also known as a <firstterm>hardware address</firstterm>) that identifies it to the system. Running the <command>ip addr</command> command will show the MAC address associated with each interface. For example, in the following <command>ip addr</command> output, the MAC address for the <computeroutput>wlan0</computeroutput> interface (which is <systemitem class="etheraddress">00:1c:bf:02:f8:70</systemitem>) immediately follows the <computeroutput>link/ether</computeroutput> keyword:</para>
-            <screen>~]#&#160;<command>ip addr</command>
-1: lo: &lt;LOOPBACK,UP,LOWER_UP&gt; mtu 16436 qdisc noqueue state UNKNOWN
-    link/loopback 00:00:00:00:00:00 brd 00:00:00:00:00:00
-    inet 127.0.0.1/8 scope host lo
-    inet6 ::1/128 scope host
-       valid_lft forever preferred_lft forever
-2: eth0: &lt;BROADCAST,MULTICAST,UP,LOWER_UP&gt; mtu 1500 qdisc pfifo_fast state UNKNOWN qlen 1000
-    link/ether 52:54:00:26:9e:f1 brd ff:ff:ff:ff:ff:ff
-    inet 192.168.122.251/24 brd 192.168.122.255 scope global eth0
-    inet6 fe80::5054:ff:fe26:9ef1/64 scope link
-       valid_lft forever preferred_lft forever
-3: wlan0: &lt;BROADCAST,MULTICAST,UP,LOWER_UP&gt; mtu 1500 qdisc mq state UP qlen 1000
-    link/ether <emphasis>00:1c:bf:02:f8:70</emphasis> brd ff:ff:ff:ff:ff:ff
-    inet 10.200.130.67/24 brd 10.200.130.255 scope global wlan0
-    inet6 fe80::21c:bfff:fe02:f870/64 scope link
-       valid_lft forever preferred_lft forever</screen>
-            <para>A single system could have one or more wireless network adapters connected to it. The <guilabel>MAC address</guilabel> field therefore allows you to associate a specific wireless adapter with a specific connection (or connections). As mentioned, you can determine the MAC address using the <command>ip addr</command> command, and then copy and paste that value into the <guilabel>MAC address</guilabel> text-entry field.</para>
+            <para>
+            Select the MAC address, also known as a <firstterm>hardware address</firstterm>, of the Wi-Fi interface to use.</para>
+        
+            <para>A single system could have one or more wireless network adapters connected to it. The <guilabel>MAC address</guilabel> field therefore allows you to associate a specific wireless adapter with a specific connection (or connections).</para>
           </listitem>
         </varlistentry>
         <varlistentry>
@@ -412,7 +402,7 @@ To restrict connections and networking, there are two options which can be used
           </term>
           <listitem>
             <para>
-              A cloned MAC address to use in place of the real hardware address.
+              A cloned MAC address to use in place of the real hardware address. Leave blank unless required.
             </para>
           </listitem>
         </varlistentry>
@@ -436,7 +426,7 @@ To restrict connections and networking, there are two options which can be used
 
       <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 to save your configuration. Given a correct configuration, you can connect to your 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 to save your configuration. Given a correct configuration, you can connect to your modified connection by selecting it from the GNOME Shell notification area menu in the top right-hand corner of the screen. Click in the top right-hand side corner to open the menu. Select <guimenuitem>Wi-Fi</guimenuitem>. 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>
@@ -457,10 +447,18 @@ To restrict connections and networking, there are two options which can be used
         </listitem>
       </itemizedlist>
     </section>
+    </section>
 
 <section
       id="sec-Establishing_a_VPN_Connection">
       <title>Establishing a VPN Connection</title>
+  <!--<para>
+     IPsec, provided by <application>Libreswan</application> (a fork of Openswan), is the preferred method for creating a VPN in Fedora. The GNOME graphical user interface tool described below requires the <package>NetworkManager-libreswan-gnome</package> package. If required, to ensure this package is installed issue the following command as <systemitem class="username">root</systemitem>:
+          <screen>~]#&nbsp;<command>yum install NetworkManager-libreswan-gnome</command></screen>
+ </para>
+<para>
+See <citetitle pubwork="book">&MAJOROSVER; System Administrator's Guide</citetitle> for more information on how to install new packages in &MAJOROSVER;.
+</para>-->
       <para>Establishing a Virtual Private Network (VPN) enables communication between your Local Area Network (LAN), and another, remote LAN. This is done by setting up a tunnel across an intermediate network such as the Internet. The VPN tunnel that is set up typically uses authentication and encryption. After successfully establishing a VPN connection using a secure tunnel, a VPN router or gateway performs the following actions upon the packets you transmit:</para>
       <orderedlist>
         <listitem>
@@ -520,7 +518,7 @@ To restrict connections and networking, there are two options which can be used
           <para>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.</para>
         </step>
         <step>
-          <para>Select the <guilabel>VPN</guilabel> connection you wish to edit from the left hand menu.</para>
+          <para>Select the <guilabel>VPN</guilabel> connection you want to edit from the left hand menu.</para>
         </step>
         <step>
           <para>Click the <guilabel>Configure</guilabel> button.</para>
@@ -548,7 +546,7 @@ To restrict connections and networking, there are two options which can be used
         </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 a VPN connection when it is available. Select the VPN from the drop-down menu.
           </para>
         </listitem>
          <listitem>
@@ -721,8 +719,7 @@ To restrict connections and networking, there are two options which can be used
         <para>Review and confirm the settings and then click the <guilabel>Apply</guilabel> button.</para>
         </step>
         <step>
-          <para>Edit the mobile broadband-specific settings by referring to <xref
-              linkend="bh-Configuring_the_Mobile_Broadband_Tab"/>.</para>
+          <para>Edit the mobile broadband-specific settings by referring to <xref linkend="sec-Configuring_the_Mobile_Broadband_Tab"/>.</para>
         </step>
       </procedure>
 
@@ -737,7 +734,7 @@ To restrict connections and networking, there are two options which can be used
           <para>Select the <guilabel>Mobile Broadband</guilabel> tab.</para>
         </step>
         <step>
-          <para>Select the connection you wish to edit and click the <guilabel>Edit</guilabel> button.</para>
+          <para>Select the connection you want to edit and click the <guilabel>Edit</guilabel> button.</para>
         </step>
         <step>
           <para>Configure the connection name, auto-connect behavior, and availability settings.</para>
@@ -761,7 +758,7 @@ To restrict connections and networking, there are two options which can be used
         </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 a VPN connection when it is available. Select the VPN from the drop-down menu.
           </para>
         </listitem>
          <listitem>
@@ -773,8 +770,7 @@ To restrict connections and networking, there are two options which can be used
         </step>
 
         <step>
-          <para>Edit the mobile broadband-specific settings by referring to <xref
-              linkend="bh-Configuring_the_Mobile_Broadband_Tab"/>.</para>
+          <para>Edit the mobile broadband-specific settings by referring to <xref linkend="sec-Configuring_the_Mobile_Broadband_Tab"/>.</para>
         </step>
         </procedure>
 
@@ -787,7 +783,7 @@ To restrict connections and networking, there are two options which can be used
           <para>Then, to configure:</para>
           <itemizedlist>
             <listitem>
-              <para>Point-to-point settings for the connection, click the <guilabel>PPP Settings</guilabel> tab and proceed to <xref
+              <para><emphasis role="bold">Point-to-point</emphasis> settings for the connection, click the <guilabel>PPP Settings</guilabel> tab and proceed to <xref
                   linkend="sec-Configuring_PPP_Point-to-Point_Settings"/>;</para>
             </listitem>
             <listitem>
@@ -802,8 +798,8 @@ To restrict connections and networking, there are two options which can be used
             </listitem>
           </itemizedlist>
 
-             <bridgehead
-        id="bh-Configuring_the_Mobile_Broadband_Tab">Configuring the Mobile Broadband Tab</bridgehead>
+  <section id="sec-Configuring_the_Mobile_Broadband_Tab">
+  <title>Configuring the Mobile Broadband Tab</title>
       <para>If you have already added a new mobile broadband connection using the assistant (see <xref linkend="procedure-Adding_a_New_Mobile_Broadband_Connection"/> for instructions), you can edit the <guilabel>Mobile Broadband</guilabel> tab to disable roaming if home network is not available, assign a network ID, or instruct <application>NetworkManager</application> to prefer a certain technology (such as 3G or 2G) when using the connection.</para>
       <variablelist>
         <varlistentry>
@@ -889,6 +885,10 @@ To restrict connections and networking, there are two options which can be used
           </listitem>
         </varlistentry>
       </variablelist>
+        <para>
+          CDMA and EVDO have fewer options. They do not have the <option>APN</option>, <option>Network ID</option>, or <option>Type</option> options.
+        </para>
+    </section>
     </section>
 
 <section
@@ -927,7 +927,7 @@ To restrict connections and networking, there are two options which can be used
           <para>Press the <keycap>Super</keycap> key to enter the Activities Overview, type <command>nm-connection-editor</command> and then press <keycap>Enter</keycap>. The <guilabel>Network Connections</guilabel> tool appears.</para>
         </step>
          <step>
-          <para>Select the connection you wish to edit and click the <guilabel>Edit</guilabel> button.</para>
+          <para>Select the connection you want to edit and click the <guilabel>Edit</guilabel> button.</para>
         </step>
         </procedure>
 
@@ -953,7 +953,7 @@ To restrict connections and networking, there are two options which can be used
         </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 a VPN connection when it is available. Select the VPN from the drop-down menu.
           </para>
         </listitem>
          <listitem>
@@ -1002,13 +1002,13 @@ To restrict connections and networking, there are two options which can be used
           <itemizedlist>
               <listitem>
               <para>
-                The MAC address and MTU settings, click the <guilabel>Wired</guilabel> tab and proceed to <xref
-                  linkend="bh-Configuring_the_Connection_Name_Auto-Connect_Behavior_and_Availability_Settings-wired" />;
+                <emphasis role="bold">The MAC address and MTU</emphasis> settings, click the <guilabel>Wired</guilabel> tab and proceed to <xref
+                  linkend="sec-Configuring_the_Connection_Name_Auto-Connect_Behavior_and_Availability_Settings-wired" />;
                 </para>
               </listitem>
 
             <listitem>
-              <para>Point-to-point settings for the connection, click the <guilabel>PPP Settings</guilabel> tab and proceed to <xref
+              <para><emphasis role="bold">Point-to-point</emphasis> settings for the connection, click the <guilabel>PPP Settings</guilabel> tab and proceed to <xref
                   linkend="sec-Configuring_PPP_Point-to-Point_Settings"/>;</para>
             </listitem>
             <listitem>
@@ -1475,7 +1475,7 @@ To restrict connections and networking, there are two options which can be used
             <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 assigns your <systemitem class="protocol">IP</systemitem> address automatically, but you wish to manually specify <systemitem class="protocol">DNS</systemitem> servers.</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 want to manually specify <systemitem class="protocol">DNS</systemitem> servers.</para>
           </listitem>
         </varlistentry>
       </variablelist>
@@ -1494,13 +1494,13 @@ To restrict connections and networking, there are two options which can be used
             <para>
               <guimenuitem>Ignore</guimenuitem> — Choose this option if you want to ignore <systemitem class="protocol">IPv6</systemitem> settings for this connection.</para>
             <para>
-              <guimenuitem>Automatic</guimenuitem> — Choose this option to use <firstterm>router advertisement</firstterm> (RA) to create an automatic, stateless configuration.</para>
+              <guimenuitem>Automatic</guimenuitem> — Choose this option to use <firstterm>SLAAC</firstterm> to create an automatic, stateless configuration based on the hardware address and <firstterm>router advertisements</firstterm> (RA).</para>
             <para>
-              <guimenuitem>Automatic, 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, addresses only</guimenuitem> — Choose this option if the network you are connecting to uses <firstterm>router advertisements</firstterm> (RA) to create an automatic, stateless configuration, but you want to assign <systemitem class="protocol">DNS</systemitem> servers manually.</para>
             <para>
-              <guimenuitem>Automatic, DHCP only</guimenuitem> — Choose this option to not use RA, but request information from DHCPv6 directly to create a stateful configuration.</para>
+              <guimenuitem>Automatic, DHCP only</guimenuitem> — Choose this option to not use RA, but request information from <systemitem class="protocol">DHCPv6</systemitem> directly to create a stateful configuration.</para>
             <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>
             <para>
               <guimenuitem>Link-Local Only</guimenuitem> — Choose this option if the network you are connecting to does not have a <systemitem class="protocol">DHCP</systemitem> server and you do not want to assign <systemitem class="protocol">IP</systemitem> addresses manually. Random addresses will be assigned as per <ulink url="http://www.rfc-editor.org/info/rfc4862"><citetitle pubwork="webpage">RFC 4862</citetitle></ulink> with prefix <systemitem class="ipaddress">FE80::0</systemitem>.</para>
           </listitem>



More information about the docs-commits mailing list