[deployment-guide/comm-rel: 8/13] NetConfig: reorganize, revamp, add Wired and Wireless sections

dsilas dsilas at fedoraproject.org
Sun Jun 20 21:49:21 UTC 2010


commit dc77852b861aa994fdfa692069abe30bfacf6309
Author: Douglas Silas <dhensley at redhat.com>
Date:   Sun Jun 20 16:47:00 2010 +0200

    NetConfig: reorganize, revamp, add Wired and Wireless sections
    
    add NM applet state images; write Wired and Wireless sections; reorganize into Establishing Connections and Configuring Connections sections

 en-US/Network_Configuration.xml                    |  847 +++++++++++++-------
 .../Network_Configuration-NM-All_applet_states.png |  Bin 0 -> 11378 bytes
 ...Configuration-NM-Editing_Wired_Connection_1.png |  Bin 0 -> 56373 bytes
 ...figuration-NM-Editing_Wireless_Connection_1.png |  Bin 0 -> 76055 bytes
 4 files changed, 568 insertions(+), 279 deletions(-)
---
diff --git a/en-US/Network_Configuration.xml b/en-US/Network_Configuration.xml
index 16a5764..1a212cf 100644
--- a/en-US/Network_Configuration.xml
+++ b/en-US/Network_Configuration.xml
@@ -1,27 +1,22 @@
 <?xml version='1.0'?>
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-]>
-<!--WIRED
+]><!--WIRED
 Wired
 802.1x Security
 IPv4 Settings
 IPv6 Settings
-
 WIRELESS
 Wireless
 Wireless Security
 IPv4 Settings
 IPv6 Settings
-
 MOBILE BROADBAND
 Mobile Broadband
 PPP Settings
 IPv4 Settings
-
 VPN
 VPN
 IPv4 Settings
-
 DSL
 DSL
 Wired
@@ -60,19 +55,19 @@ NetworkManager (pid  1527) is running...
         linkend="ch-Controlling_Access_to_Services"/>.</para>
   </section>
   <section
-    id="sec-Interacting_with_the_NetworkManager_Applet">
-    <title>Interacting with the NetworkManager Applet</title>
-    <para>Users do not interact with the <application>NetworkManager</application> system service directly. Instead, you can perform network configuration tasks via <application>NetworkManager</application>'s Notification Area applet. The applet has multiple states that serve as visual indicators for the type of connection you are currently using.</para>
+    id="sec-Interacting_with_NetworkManager">
+    <title>Interacting with NetworkManager</title>
+    <para>Users do not interact with the <application>NetworkManager</application> system service directly. Instead, you can perform network configuration tasks via <application>NetworkManager</application>'s Notification Area applet. The applet has multiple states that serve as visual indicators for the type of connection you are currently using. Hover the pointer over the applet icon for tooltip information on the current connection state.</para>
     <mediaobject
-      id="mediaobj-Network_Configuration-NM-applet_states">
+      id="mediaobj-Network_Configuration-NM-All_applet_states">
       <imageobject>
         <imagedata
           align="center"
-          fileref="images/Network_Configuration-NM-applet_states.png"
+          fileref="images/Network_Configuration-NM-All_applet_states.png"
           format="PNG" />
       </imageobject>
       <caption>
-        <para>NetworkManager Applet States</para>
+        <para>NetworkManager applet states</para>
       </caption>
     </mediaobject>
     <para>If you do not see the <application>NetworkManager</application> applet in the GNOME panel, and assuming that the <application>NetworkManager</application> package is installed on your system, you can start the applet by running the following command as a normal user (not root):</para>
@@ -81,52 +76,76 @@ NetworkManager (pid  1527) is running...
     <para>After running this command, the applet will appear in your Notification Area. You can ensure that the applet runs each time you log in by clicking <menuchoice><guimenu>System</guimenu>
         <guisubmenu>Preferences</guisubmenu>
         <guimenuitem>Startup Applications</guimenuitem>
-      </menuchoice>, and, in the <guilabel>Startup Programs</guilabel> tab of the <guilabel>Startup Applications Preferences</guilabel> window, checking the box next to <application>NetworkManager</application>.</para>
-    <para>When you left-click on the applet, you are presented with a list of <guilabel>Wired</guilabel>, <guilabel>Wireless</guilabel> and <guilabel>Available Networks</guilabel>, and options for connecting to any configured Virtual Private Networks (VPNs), or to hidden or new wireless networks. When the number of available networks is long (as when there are many wireless access points in the area), the <guilabel>More networks</guilabel> expandable menu entry appears. If you are connected to a network, its name is presented in bold typeface under its network type, such as <guilabel>Wired</guilabel> or <guilabel>Wireless</guilabel>.</para>
-    <mediaobject
-      id="mediaobj-Network_Configuration-NM-left-click_menu">
-      <imageobject>
-        <imagedata
-          align="center"
-          fileref="images/Network_Configuration-NM-left-click_menu.png"
-          format="PNG" />
-      </imageobject>
-      <caption>
-        <para>The <application>NetworkManager</application> applet's left-click menu, showing wired, wireless and available networks, and configured VPN connections</para>
-      </caption>
-    </mediaobject>
-    <para>Next, right-click on the <application>NetworkManager</application> applet to open its context menu, which is the main point of entry for interacting with <application>NetworkManager</application> to configure the network.</para>
-    <mediaobject
-      id="mediaobj-Network_Configuration-NM-right-click_menu">
-      <imageobject>
-        <imagedata
-          align="center"
-          fileref="images/Network_Configuration-NM-right-click_menu.png"
-          format="PNG" />
-      </imageobject>
-      <caption>
-        <para>The NetworkManager context menu</para>
-      </caption>
-    </mediaobject>
-    <para>Ensure that the <guilabel>Enable Networking</guilabel> box is checked; if the system has detected a wireless card, then you will also see an <guilabel>Enable Wireless</guilabel> menu option, which you should check as well. <application>NetworkManager</application> notifies you of network connection status changes if you check the <guilabel>Enable Notifications</guilabel> box. Clicking the <guilabel>Connection Information</guilabel> entry presents an informative <guilabel>Connection Information</guilabel> window that lists the connection type and interface, your IP address and routing details, and so on. Useful network information is always two clicks away.</para>
-    <para>Finally, clicking on <guilabel>Edit Connections</guilabel> opens the <guilabel>Network Connections</guilabel> window, from where you can perform most of your network configuration tasks. Note that this window can also be opened by running, as a normal user:</para>
-    <screen>~]$&#160;<command>nm-connection-editor &amp;</command>
-    </screen>
-    <mediaobject
-      id="mediaobj-Network_Configuration-NM-Network_Connections">
-      <imageobject>
-        <imagedata
-          align="center"
-          fileref="images/Network_Configuration-NM-Network_Connections.png"
-          format="PNG" />
-      </imageobject>
-      <caption>
-        <para>Configure networks using the Network Connections window</para>
-      </caption>
-    </mediaobject>
+      </menuchoice> to open the <guilabel>Startup Applications Preferences</guilabel> window. Then, select the <guilabel>Startup Programs</guilabel> tab and check the box next to <application>NetworkManager</application>.</para>
     <section
-      id="sec-System_and_User_Connections">
-      <title>System and User Connections</title>
+      id="sec-Connecting_to_a_Network">
+      <title>Connecting to a Network</title>
+      <para>When you left-click on the applet icon, you are presented with:</para>
+      <itemizedlist>
+        <listitem>
+          <para>a list of categorized networks you are currently connected to (such as <guilabel>Wired</guilabel> and <guilabel>Wireless</guilabel>);</para>
+        </listitem>
+        <listitem>
+          <para>a list of all <guilabel>Available Networks</guilabel>
+            <application>NetworkManager</application> has detected;</para>
+        </listitem>
+        <listitem>
+          <para>options for connecting to any configured Virtual Private Networks (VPNs); and,</para>
+        </listitem>
+        <listitem>
+          <para>options for connecting to hidden or new wireless networks.</para>
+        </listitem>
+      </itemizedlist>
+      <para>When many networks are available (as when there are many wireless access points in the area), the <guilabel>More networks</guilabel> expandable menu entry appears. If you are connected to a network, its name is presented in bold typeface under its network type, such as <guilabel>Wired</guilabel> or <guilabel>Wireless</guilabel>.</para>
+      <mediaobject
+        id="mediaobj-Network_Configuration-NM-left-click_menu">
+        <imageobject>
+          <imagedata
+            align="center"
+            fileref="images/Network_Configuration-NM-left-click_menu.png"
+            format="PNG" />
+        </imageobject>
+        <caption>
+          <para>The <application>NetworkManager</application> applet's left-click menu, showing all available and connected-to networks</para>
+        </caption>
+      </mediaobject>
+    </section>
+    <section
+      id="sec-Configuring_New_Connections">
+      <title>Configuring New Connections</title>
+      <para>Next, right-click on the <application>NetworkManager</application> applet to open its context menu, which is the main point of entry for interacting with <application>NetworkManager</application> to configure connections.</para>
+      <mediaobject
+        id="mediaobj-Network_Configuration-NM-right-click_menu">
+        <imageobject>
+          <imagedata
+            align="center"
+            fileref="images/Network_Configuration-NM-right-click_menu.png"
+            format="PNG" />
+        </imageobject>
+        <caption>
+          <para>The NetworkManager applet's context menu</para>
+        </caption>
+      </mediaobject>
+      <para>Ensure that the <guilabel>Enable Networking</guilabel> box is checked. if the system has detected a wireless card, then you will also see an <guilabel>Enable Wireless</guilabel> menu option. Check the <guilabel>Enable Wireless</guilabel> checkbox as well. <application>NetworkManager</application> notifies you of network connection status changes if you check the <guilabel>Enable Notifications</guilabel> box. Clicking the <guilabel>Connection Information</guilabel> entry presents an informative <guilabel>Connection Information</guilabel> window that lists the connection type and interface, your IP address and routing details, and so on. Useful network information is thus always two clicks away.</para>
+      <para>Finally, clicking on <guilabel>Edit Connections</guilabel> opens the <guilabel>Network Connections</guilabel> window, from where you can perform most of your network configuration tasks. Note that this window can also be opened by running, as a normal user:</para>
+      <screen>~]$&#160;<command>nm-connection-editor &amp;</command>
+      </screen>
+      <mediaobject
+        id="mediaobj-Network_Configuration-NM-Network_Connections">
+        <imageobject>
+          <imagedata
+            align="center"
+            fileref="images/Network_Configuration-NM-Network_Connections.png"
+            format="PNG" />
+        </imageobject>
+        <caption>
+          <para>Configure networks using the Network Connections window</para>
+        </caption>
+      </mediaobject>
+    </section>
+    <section
+      id="sec-User_and_System_Connections">
+      <title>User and System Connections</title>
       <para>
         <application>NetworkManager</application> allows users to modify network connections so that they are <emphasis>user connections</emphasis> or <emphasis>system connections</emphasis>. Users may or may not need root privileges to create and modify system connections; this is determined by the system-specific policy that the administrator has configured. <application>NetworkManager</application>'s default policy enables users to create and modify user connections, but requires them to have root privileges to add, modify or delete system connections.</para>
       <para>User connections are so called because they are specific to the user who creates them. In contrast to system connections, whose configurations are stored under the <filename>/etc/sysconfig/networking/</filename> directory (mainly in <filename>ifcfg-<replaceable>&lt;network_type&gt;</replaceable>
@@ -213,7 +232,7 @@ NetworkManager (pid  1527) is running...
             <entry
               valign="middle">
               <xref
-                linkend="sec-Configuring_the_Wired_Tab"/>
+                linkend="sec-Establishing_a_Wired_Ethernet_Connection"/>
             </entry>
             <entry
               valign="middle"></entry>
@@ -230,7 +249,7 @@ NetworkManager (pid  1527) is running...
             <entry
               valign="middle">
               <xref
-                linkend="sec-Configuring_the_802.1x_Security_Tab"/>
+                linkend="sec-Configuring_802.1x_Security"/>
             </entry>
             <entry
               valign="middle"></entry>
@@ -248,9 +267,8 @@ NetworkManager (pid  1527) is running...
               valign="middle"></entry>
             <entry
               valign="middle">
-              <xref
-                linkend="sec-Configuring_the_Wireless_Tab"/>
-            </entry>
+              <!--<xref
+                linkend="sec-Configuring_the_Wireless_Tab"/>--></entry>
             <entry
               valign="middle"></entry>
             <entry
@@ -266,7 +284,7 @@ NetworkManager (pid  1527) is running...
             <entry
               valign="middle">
               <xref
-                linkend="sec-Configuring_the_Wireless_Security_Tab"/>
+                linkend="sec-Configuring_Wireless_Security"/>
             </entry>
             <entry
               valign="middle"></entry>
@@ -284,9 +302,8 @@ NetworkManager (pid  1527) is running...
               valign="middle"></entry>
             <entry
               valign="middle">
-              <xref
-                linkend="sec-Configuring_the_Mobile_Broadband_Tab"/>
-            </entry>
+              <!--<xref
+                linkend="sec-Configuring_the_Mobile_Broadband_Tab"/>--></entry>
             <entry
               valign="middle"></entry>
             <entry
@@ -302,7 +319,7 @@ NetworkManager (pid  1527) is running...
             <entry
               valign="middle">
               <xref
-                linkend="sec-Configuring_the_PPP_Settings_Tab"/>
+                linkend="sec-Configuring_PPP_Point-to-Point_Settings"/>
             </entry>
             <entry
               valign="middle"></entry>
@@ -320,9 +337,8 @@ NetworkManager (pid  1527) is running...
               valign="middle"></entry>
             <entry
               valign="middle">
-              <xref
-                linkend="sec-Configuring_the_VPN_Tab"/>
-            </entry>
+              <!--<xref
+                linkend="sec-Configuring_the_VPN_Tab"/>--></entry>
             <entry
               valign="middle"></entry>
           </row>
@@ -339,9 +355,8 @@ NetworkManager (pid  1527) is running...
               valign="middle"></entry>
             <entry
               valign="middle">
-              <xref
-                linkend="sec-Configuring_the_DSL_Tab"/>
-            </entry>
+              <!--<xref
+                linkend="sec-Configuring_the_DSL_Tab"/>--></entry>
           </row>
           <row>
             <entry
@@ -352,7 +367,7 @@ NetworkManager (pid  1527) is running...
               namest="col2"
               valign="middle">
               <xref
-                linkend="sec-Configuring_the_IPv4_Settings_Tab"/>
+                linkend="sec-Configuring_IPv4_Settings"/>
             </entry>
             <!--<entry
               valign="middle">
@@ -384,7 +399,7 @@ NetworkManager (pid  1527) is running...
               namest="col2"
               valign="middle">
               <xref
-                linkend="sec-Configuring_the_IPv6_Settings_Tab"/>
+                linkend="sec-Configuring_IPv6_Settings"/>
             </entry>
             <!--<entry
               valign="middle">
@@ -405,136 +420,173 @@ NetworkManager (pid  1527) is running...
       id="sec-Establishing_a_Wired_Ethernet_Connection">
       <title>Establishing a Wired (Ethernet) Connection</title>
       <para>To establish an Ethernet connection, you need a network interface card (an NIC), a network cable (usually a Cat-5 cable), and a network to connect to (usually the Internet, through a router).</para>
-    </section>
-    <section
-      id="sec-Establishing_a_Wireless_Connection">
-      <title>Establishing a Wireless Connection</title>
-      <para></para>
-    </section>
-    <section
-      id="sec-Establishing_a_Mobile_Broadband_Connection">
-      <title>Establishing a Mobile Broadband Connection</title>
-      <para></para>
-    </section>
-    <section
-      id="sec-Establishing_a_VPN_Connection">
-      <title>Establishing a VPN Connection</title>
-      <para></para>
-    </section>
-    <section
-      id="sec-Establishing_a_DSL_Connection">
-      <title>Establishing a DSL Connection</title>
-      <para></para>
-    </section>
-    <section
-      id="sec-Establishing_Routes">
-      <title>Establishing Routes</title>
+      <para>You can configure a wired connection by opening the <guilabel>Network Connections</guilabel> window and selecting the <guilabel>Wired</guilabel> tab. For more information on opening the <guilabel>Network Connections</guilabel> window via <application>NetworkManager</application>'s Notification Area applet, or by running a shell command, refer to <xref
+          linkend="sec-Configuring_New_Connections"/>.</para>
       <mediaobject
-        id="mediaobj-Network_Configuration-NM-System_eth0-Routes">
+        id="mediaobj-Network_Configuration-NM-Editing_Wired_Connection_1">
         <imageobject>
           <imagedata
             align="center"
-            fileref="images/Network_Configuration-NM-System_eth0-Routes.png"
+            fileref="images/Network_Configuration-NM-Editing_Wired_Connection_1.png"
             format="PNG" />
         </imageobject>
         <caption>
-          <para>Configuring static network routes</para>
+          <para>Editing the newly-created Wired connection 1</para>
         </caption>
       </mediaobject>
+      <para>
+        <application>NetworkManager</application> creates a single wired connection by default on all systems. It is labeled <guilabel>System eth0</guilabel>. It is recommended not to <guibutton>Edit</guibutton> or <guibutton>Delete</guibutton> the default <guilabel>System eth0</guilabel> connection, and the functionality to do so may be disabled in &MAJOROS;. Instead, you should create a new wired connection by ensuring the <guilabel>Wired</guilabel> tab is selected and then clicking the <guibutton>Add</guibutton> button.</para>
+      <note
+        id="note-The_dialog_for_adding_and_editing_connections_is_the_same">
+        <title>The dialog for adding and editing connections is the same</title>
+        <para>When you add a new connection by clicking the <guibutton>Add</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. There is no difference between these dialogs. In effect, you are always editing a connection; the difference only lies in whether that connection previously existed or was just created by <application>NetworkManager</application> when you clicked <guibutton>Add</guibutton>.</para>
+      </note>
+      <!--<para>The <guilabel>Wired</guilabel> tab contains five configurable items of interest. Three of these lie exterior to the <guilabel>Wired</guilabel> tab itself (and the other tabs) and are therefore independent of settings in the <guilabel>Wired</guilabel>, <guilabel>802.1x Security</guilabel>, <guilabel>IPv4 Settings</guilabel> or <guilabel>IPv6 Settings</guilabel> tabs. The first two of these general settings are found at the top of the dialog: <guilabel>Connection name</guilabel> and <guilabel>Connect automatically</guilabel>. </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>
+      <para>Three settings in the <guilabel>Editing</guilabel> dialog are common to most connection types: <guilabel>Connection name</guilabel>, <guilabel>Connect automatically</guilabel> and <guilabel>Available to all users</guilabel>.</para>
+      <para>You can customize the name under which the connection is listed in the <guilabel>Network Connections</guilabel> window by editing the <guilabel>Connection name</guilabel> text field. For example, you could create a custom wired connection for the office with different configuration settings and name it <replaceable>Office Ethernet</replaceable>. Click the <guilabel>Connect automatically</guilabel> checkbox if you want <application>NetworkManager</application> to always attempt to use the connection being edited when you have an Ethernet cable plugged into the computer. Finally, at the bottom of the dialog box, you can specify whether the connection you are configuring should be user-specific or system-wide. Refer to <xref
+          linkend="sec-User_and_System_Connections"/> for more information on this setting.</para>
+      <bridgehead
+        id="bh-Configuring_the_Wired_Tab">Configuring the Wired Tab</bridgehead>
+      <para>The final two configurable settings are located within the <guilabel>Wired</guilabel> tab itself: the first is a text-entry field where you can specify a MAC (Media Access Control) address, and the second allows you to specify the MTU (Maximum Transmission Unit) value. Normally, you can leave the <guilabel>MAC address</guilabel> field blank and the <guilabel>MTU</guilabel> set to <userinput>automatic</userinput>. These defaults will suffice unless you are associating a wired connection with a second or specific NIC, or performing advanced networking. In such cases, refer to the following descriptions:</para>
       <variablelist>
         <varlistentry>
           <term>
-            <guilabel>Addresses</guilabel>
-          </term>
-          <listitem>
-            <para>
-              <guimenuitem>Address</guimenuitem> — </para>
-            <para>
-              <guimenuitem>Prefix</guimenuitem> — </para>
-            <para>
-              <guimenuitem>Gateway</guimenuitem> — </para>
-            <para>
-              <guimenuitem>Metric</guimenuitem> — </para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>
-            <guilabel>Ignore automatically obtained routes</guilabel>
+            <guilabel>MAC Address</guilabel>
           </term>
           <listitem>
-            <para></para>
+            <para>Network hardware such as a Network Interface Card (NIC) has a unique MAC (Media Access Control) address 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 eth0 interface (which is <computeroutput> 52:54:00:26:9e:f1</computeroutput>) 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 <emphasis>52:54:00:26:9e:f1</emphasis> 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</screen>
+            <para>A single system can have one or more NICs installed on it. The <guilabel>MAC address</guilabel> field therefore allows you to associate a specific NIC 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>
           </listitem>
         </varlistentry>
         <varlistentry>
           <term>
-            <guilabel>Use this connection only for resources on its network</guilabel>
+            <guilabel>MTU</guilabel>
           </term>
           <listitem>
-            <para></para>
+            <para>The MTU (Maximum Transmission Unit) value represents the size in bytes of the largest packet that the connection will use to transmit. This value defaults to <constant>1500</constant> when using IPv4, or a variable number <constant>1280</constant> or higher for IPv6, and does not generally need to be specified or changed.</para>
           </listitem>
         </varlistentry>
       </variablelist>
+      <bridgehead
+        id="bh-Saving_Your_New_or_Modified_Connection_and_Making_Further_Configurations-Wired">Saving Your New (or Modified) Connection and Making Further Configurations</bridgehead>
+      <para>Once you have finished editing your new wired connection, click the <guibutton>Apply</guibutton> button and <application>NetworkManager</application> will immediately save your customized configuration. Given a correct configuration, you can connect to your new or customized connection by selecting it from the <application>NetworkManager</application> Notification Area applet. See <xref
+          linkend="sec-Connecting_to_a_Network"/> for information on using your new or altered connection.</para>
+      <para>At this point, you have created a new, functional wired connection. If you need to, you can further configure your connection by selecting it in the <guilabel>Network Connections</guilabel> window and clicking <guilabel>Edit</guilabel> to return to the <guilabel>Editing</guilabel> dialog. Then:</para>
+      <itemizedlist>
+        <listitem>
+          <para>to configure <firstterm>port-based Network Access Control</firstterm> (PNAC), click the <guilabel>802.1x Security</guilabel> tab and proceed to <xref
+              linkend="sec-Configuring_802.1x_Security"/>;
+          </para>
+        </listitem>
+        <listitem>
+          <para>to configure IPv4 settings for the connection, click the <guilabel>IPv4 Settings</guilabel> tab and proceed to <xref
+              linkend="sec-Configuring_IPv4_Settings"/>; or,
+          </para>
+        </listitem>
+        <listitem>
+          <para>to configure IPv6 settings for the connection, click the <guilabel>IPv6 Settings</guilabel> tab and proceed to <xref
+              linkend="sec-Configuring_IPv6_Settings"/>.
+          </para>
+        </listitem>
+      </itemizedlist>
     </section>
-  </section>
-  <section
-    id="sec-Configuring_NetworkManager_Connection_Settings">
-    <title>Configuring NetworkManager Connection Settings</title>
     <section
-      id="sec-Configuring_the_Wired_Tab">
-      <title>Configuring the Wired Tab</title>
-      <para>The <guilabel>Wired</guilabel> tab contains two configurable parameters: one for the MAC (Media Access Control) address, and another for the MTU (Maximum Transmission Unit) value:</para>
+      id="sec-Establishing_a_Wireless_Connection">
+      <title>Establishing a Wireless Connection</title>
+      <remark>What is a <replaceable>&lt;type&gt;</replaceable> connection</remark>
+      <para>To establish a wireless connection, you need:</para>
+      <itemizedlist>
+        <listitem>
+          <para>a computer capable of wi-fi connectivity (such as a laptop with an integrated 802.1<replaceable>x</replaceable> card or chip);</para>
+        </listitem>
+        <listitem>
+          <para>a wireless access point to connect to (such as a wireless router);</para>
+        </listitem>
+        <listitem>
+          <para>and, depending on the security settings of the access point, an authentication secret such as a key, passphrase, or digital certificate.</para>
+        </listitem>
+      </itemizedlist>
+      <para>You can configure a wireless connection by opening the <guilabel>Network Connections</guilabel> window and selecting the <guilabel>Wireless</guilabel> tab. For more information on opening the <guilabel>Network Connections</guilabel> window via <application>NetworkManager</application>'s Notification Area applet, or by running a shell command, refer to <xref
+          linkend="sec-Configuring_New_Connections"/>.</para>
       <mediaobject
-        id="mediaobj-Network_Configuration-NM-Edit_System_eth0-Wired">
+        id="mediaobj-Network_Configuration-NM-Editing_Wireless_Connection_1">
         <imageobject>
           <imagedata
             align="center"
-            fileref="images/Network_Configuration-NM-Edit_System_eth0-Wired.png"
+            fileref="images/Network_Configuration-NM-Editing_Wireless_Connection_1.png"
             format="PNG" />
         </imageobject>
         <caption>
-          <para>Editing the System eth0 wired network connection</para>
+          <para>Editing the newly-created Wireless connection 1</para>
         </caption>
       </mediaobject>
+      <bridgehead
+        id="bh-Configuring_the_Connection_Name_Auto-Connect_Behavior_and_Availability_Settings-wireless">Configuring the Connection Name, Auto-Connect Behavior, and Availability Settings</bridgehead>
+      <para>Three settings in the <guilabel>Editing</guilabel> dialog are common to most connection types: <guilabel>Connection name</guilabel>, <guilabel>Connect automatically</guilabel> and <guilabel>Available to all users</guilabel>.</para>
+      <para>You can customize the name under which the connection is listed in the <guilabel>Network Connections</guilabel> window by editing the <guilabel>Connection name</guilabel> text field. For example, you could create a custom wireless connection and, for its name, use a memorable combination of its SSID and physical location. Click the <guilabel>Connect automatically</guilabel> checkbox if you want <application>NetworkManager</application> to always attempt to use the connection being edited when the wireless access point is available. Finally, at the bottom of the dialog box, you can specify a user-specific or system-wide connection. Refer to <xref
+          linkend="sec-User_and_System_Connections"/> for more information on this setting.</para>
+      <bridgehead
+        id="bh-Configuring_the_Wireless_Tab">Configuring the Wireless Tab</bridgehead>
+      <remark>describe tab-specific settings here</remark>
+      <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 your new wireless connection, click the <guibutton>Apply</guibutton> button and <application>NetworkManager</application> will immediately save your customized configuration. Given a correct configuration, you can connect to your new or customized connection by selecting it from the <application>NetworkManager</application> Notification Area applet. See <xref
+          linkend="sec-Connecting_to_a_Network"/> for information on using your new or altered connection.</para>
+      <para>At this point, you have created a new, functional wireless connection. If you need to, you can further configure your connection by selecting it in the <guilabel>Network Connections</guilabel> window and clicking <guilabel>Edit</guilabel> to return to the <guilabel>Editing</guilabel> dialog. Then:</para>
+      <itemizedlist>
+        <listitem>
+          <para>to configure wireless security settings, click the <guilabel>Wireless Security</guilabel> tab and proceed to <xref
+              linkend="sec-Configuring_Wireless_Security"/>;
+          </para>
+        </listitem>
+        <listitem>
+          <para>to configure IPv4 settings for the connection, click the <guilabel>IPv4 Settings</guilabel> tab and proceed to <xref
+              linkend="sec-Configuring_IPv4_Settings"/>; or,
+          </para>
+        </listitem>
+        <listitem>
+          <para>to configure IPv6 settings for the connection, click the <guilabel>IPv6 Settings</guilabel> tab and proceed to <xref
+              linkend="sec-Configuring_IPv6_Settings"/>.
+          </para>
+        </listitem>
+      </itemizedlist>
       <variablelist>
         <varlistentry>
           <term>
-            <guilabel>MAC Address</guilabel>
-          </term>
-          <listitem>
-            <para>Network hardware such as a Network Interface Card (NIC) has a unique MAC (Media Access Control) address that identifies it to the system. Running the <command>ifconfig</command> command will show the MAC address associated with each interface: <computeroutput>HWaddr 00:1C:25:14:4A:E0</computeroutput> for example.</para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>
-            <guilabel>MTU</guilabel>
+            <guilabel>SSID</guilabel>
           </term>
           <listitem>
-            <para>The MTU (Maximum Transmission Unit) value represents the size in bytes of the largest packet that the connection will use to transmit. This value defaults to <constant>1500</constant> when using IPv4, or a variable number <constant>1280</constant> or higher for IPv6, and does not generally need to be specified or changed.</para>
+            <para></para>
           </listitem>
         </varlistentry>
-      </variablelist>
-    </section>
-    <section
-      id="sec-Configuring_the_802.1x_Security_Tab">
-      <title>Configuring the 802.1x Security Tab</title>
-      <para>802.1x security is most often associated with securing wireless networks, but can also be used to prevent intruders with physical access to the network from gaining entry. In the past, DHCP servers were configured not to lease IP addresses to unauthorized users, but this practice is impractical and insecure, and thus not recommended. Instead, 802.1x security is used to ensure a logically secure network.</para>
-      <variablelist>
         <varlistentry>
           <term>
-            <guilabel>Authentication</guilabel>
+            <guilabel>Mode</guilabel>
           </term>
           <listitem>
             <para>
-              <guimenuitem>TLS</guimenuitem> — (Transport Layer Security)</para>
-            <para>
-              <guimenuitem>Tunneled TLS</guimenuitem> — </para>
+              <guimenuitem>Infrastructure</guimenuitem> — </para>
             <para>
-              <guimenuitem>Protected EAP (PEAP)</guimenuitem> — </para>
+              <guimenuitem>Ad-hoc</guimenuitem> — </para>
           </listitem>
         </varlistentry>
         <varlistentry>
           <term>
-            <guilabel>Identity</guilabel>
+            <guilabel>BSSID</guilabel>
           </term>
           <listitem>
             <para></para>
@@ -542,7 +594,7 @@ NetworkManager (pid  1527) is running...
         </varlistentry>
         <varlistentry>
           <term>
-            <guilabel>User certificate</guilabel>
+            <guilabel>MAC address</guilabel>
           </term>
           <listitem>
             <para></para>
@@ -550,15 +602,54 @@ NetworkManager (pid  1527) is running...
         </varlistentry>
         <varlistentry>
           <term>
-            <guilabel>CA certificate</guilabel>
+            <guilabel>MTU</guilabel>
           </term>
           <listitem>
             <para></para>
           </listitem>
         </varlistentry>
+      </variablelist>
+    </section>
+    <section
+      id="sec-Establishing_a_Mobile_Broadband_Connection">
+      <title>Establishing a Mobile Broadband Connection</title>
+      <remark>What is a <replaceable>&lt;type&gt;</replaceable> connection</remark>
+      <remark>To establish a wireless connection, you need a computer capable of wi-fi connectivity, a wireless access point to connect to, and the passphrase of the access point unless it is open and unsecured.</remark>
+      <para>You can configure a <replaceable>&lt;type&gt;</replaceable> connection by opening the <guilabel>Network Connections</guilabel> window and selecting the <guilabel>tab</guilabel> tab. For more information on opening the <guilabel>Network Connections</guilabel> window via <application>NetworkManager</application>'s Notification Area applet, or by running a shell command, refer to <xref
+          linkend="sec-Interacting_with_NetworkManager"/>.</para>
+      <remark>image editing a <replaceable>&lt;type&gt;</replaceable> connection; caption: Editing the newly-created <replaceable>&lt;type&gt;</replaceable> connection 1</remark>
+      <bridgehead
+        id="bh-Configuring_the_Connection_Name_Auto-Connect_Behavior_and_Availability_Settings-tab_name">Configuring the Connection Name, Auto-Connect Behavior, and Availability Settings</bridgehead>
+      <para>Three settings in the <guilabel>Editing</guilabel> dialog are common to most connection types: <guilabel>Connection name</guilabel>, <guilabel>Connect automatically</guilabel> and <guilabel>Available to all users</guilabel>.</para>
+      <para>You can customize the name under which the connection is listed in the <guilabel>Network Connections</guilabel> window by editing the <guilabel>Connection name</guilabel> text field. For example, you could create a custom <replaceable>&lt;type&gt;</replaceable> connection for the office with different configuration settings and name it <replaceable>name</replaceable>. Click the <guilabel>Connect automatically</guilabel> checkbox if you want <application>NetworkManager</application> to always attempt to use the connection being edited when <remark>you have an Ethernet cable plugged into the computer</remark>. Finally, at the bottom of the dialog box, you can specify a user-specific or system-wide connection. Refer to <xref
+          linkend="sec-User_and_System_Connections"/> for more information on this setting.</para>
+      <bridgehead>Configuring the <replaceable>&lt;tab&gt;</replaceable> Tab</bridgehead>
+      <remark>describe tab-specific settings here</remark>
+      <bridgehead
+        id="bh-Saving_Your_New_or_Modified_Connection_and_Making_Further_Configurations-tab_name">Saving Your New (or Modified) Connection and Making Further Configurations</bridgehead>
+      <para>Once you have finished editing your new <replaceable>&lt;type&gt;</replaceable> connection, click the <guibutton>Apply</guibutton> button and <application>NetworkManager</application> will immediately save your customized configuration. Given a correct configuration, you can connect to your new or customized connection by selecting it from the <application>NetworkManager</application> Notification Area applet. See <xref
+          linkend="sec-Connecting_to_a_Network"/> for information on using your new or altered connection.</para>
+      <para>At this point, you have created a new, functional <replaceable>&lt;type&gt;</replaceable> connection. If you need to, you can further configure your connection by selecting it in the <guilabel>Network Connections</guilabel> window and clicking <guilabel>Edit</guilabel> to return to the <guilabel>Editing</guilabel> dialog. Then:</para>
+      <itemizedlist>
+        <listitem>
+          <para>to configure <remark>settings type</remark>, click the <guilabel>tab_name</guilabel> tab and proceed to <remark>xref</remark>;
+          </para>
+        </listitem>
+        <listitem>
+          <para>to configure IPv4 settings for the connection, click the <guilabel>IPv4 Settings</guilabel> tab and proceed to <xref
+              linkend="sec-Configuring_IPv4_Settings"/>; or,
+          </para>
+        </listitem>
+        <listitem>
+          <para>to configure IPv6 settings for the connection, click the <guilabel>IPv6 Settings</guilabel> tab and proceed to <xref
+              linkend="sec-Configuring_IPv6_Settings"/>.
+          </para>
+        </listitem>
+      </itemizedlist>
+      <variablelist>
         <varlistentry>
           <term>
-            <guilabel>Private key</guilabel>
+            <guilabel>Number</guilabel>
           </term>
           <listitem>
             <para></para>
@@ -566,22 +657,15 @@ NetworkManager (pid  1527) is running...
         </varlistentry>
         <varlistentry>
           <term>
-            <guilabel>Private key password</guilabel>
+            <guilabel>Username</guilabel>
           </term>
           <listitem>
             <para></para>
           </listitem>
         </varlistentry>
-      </variablelist>
-    </section>
-    <section
-      id="sec-Configuring_the_Wireless_Tab">
-      <title>Configuring the Wireless Tab</title>
-      <para></para>
-      <variablelist>
         <varlistentry>
           <term>
-            <guilabel>SSID</guilabel>
+            <guilabel>Password</guilabel>
           </term>
           <listitem>
             <para></para>
@@ -589,18 +673,15 @@ NetworkManager (pid  1527) is running...
         </varlistentry>
         <varlistentry>
           <term>
-            <guilabel>Mode</guilabel>
+            <guilabel>APN</guilabel>
           </term>
           <listitem>
-            <para>
-              <guimenuitem>Infrastructure</guimenuitem> — </para>
-            <para>
-              <guimenuitem>Ad-hoc</guimenuitem> — </para>
+            <para></para>
           </listitem>
         </varlistentry>
         <varlistentry>
           <term>
-            <guilabel>BSSID</guilabel>
+            <guilabel>Network ID</guilabel>
           </term>
           <listitem>
             <para></para>
@@ -608,7 +689,7 @@ NetworkManager (pid  1527) is running...
         </varlistentry>
         <varlistentry>
           <term>
-            <guilabel>MAC address</guilabel>
+            <guilabel>Type</guilabel>
           </term>
           <listitem>
             <para></para>
@@ -616,7 +697,7 @@ NetworkManager (pid  1527) is running...
         </varlistentry>
         <varlistentry>
           <term>
-            <guilabel>MTU</guilabel>
+            <guilabel>PIN</guilabel>
           </term>
           <listitem>
             <para></para>
@@ -625,47 +706,21 @@ NetworkManager (pid  1527) is running...
       </variablelist>
     </section>
     <section
-      id="sec-Configuring_the_Wireless_Security_Tab">
-      <title>Configuring the Wireless Security Tab</title>
+      id="sec-Establishing_a_VPN_Connection">
+      <title>Establishing a VPN Connection</title>
       <para></para>
       <variablelist>
         <varlistentry>
           <term>
-            <guilabel>Security</guilabel>
+            <guilabel>Gateway</guilabel>
           </term>
           <listitem>
-            <para>
-              <guimenuitem>None</guimenuitem> — </para>
-            <para>
-              <guimenuitem>WEP 40/128-bit Key</guimenuitem> — </para>
-            <para>
-              <guimenuitem>WEP 128-bit Passphrase</guimenuitem> — </para>
-            <para>
-              <guimenuitem>LEAP</guimenuitem> — </para>
-            <para>
-              <guimenuitem>Dynamic WEP (802.1x)</guimenuitem> — </para>
-            <para>
-              <guimenuitem>WPA &amp; WPA2 Personal</guimenuitem> — </para>
-            <para>
-              <guimenuitem>WPA &amp; WPA2 Enterprise</guimenuitem> — </para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>Password</term>
-          <listitem>
             <para></para>
           </listitem>
         </varlistentry>
-      </variablelist>
-    </section>
-    <section
-      id="sec-Configuring_the_Mobile_Broadband_Tab">
-      <title>Configuring the Mobile Broadband Tab</title>
-      <para></para>
-      <variablelist>
         <varlistentry>
           <term>
-            <guilabel>Number</guilabel>
+            <guilabel>Group name</guilabel>
           </term>
           <listitem>
             <para></para>
@@ -673,7 +728,7 @@ NetworkManager (pid  1527) is running...
         </varlistentry>
         <varlistentry>
           <term>
-            <guilabel>Username</guilabel>
+            <guilabel>User password</guilabel>
           </term>
           <listitem>
             <para></para>
@@ -681,7 +736,7 @@ NetworkManager (pid  1527) is running...
         </varlistentry>
         <varlistentry>
           <term>
-            <guilabel>Password</guilabel>
+            <guilabel>Group password</guilabel>
           </term>
           <listitem>
             <para></para>
@@ -689,7 +744,7 @@ NetworkManager (pid  1527) is running...
         </varlistentry>
         <varlistentry>
           <term>
-            <guilabel>APN</guilabel>
+            <guilabel>User name</guilabel>
           </term>
           <listitem>
             <para></para>
@@ -697,7 +752,7 @@ NetworkManager (pid  1527) is running...
         </varlistentry>
         <varlistentry>
           <term>
-            <guilabel>Network ID</guilabel>
+            <guilabel>Domain</guilabel>
           </term>
           <listitem>
             <para></para>
@@ -705,30 +760,42 @@ NetworkManager (pid  1527) is running...
         </varlistentry>
         <varlistentry>
           <term>
-            <guilabel>Type</guilabel>
+            <guilabel>Encryption Method</guilabel>
           </term>
           <listitem>
-            <para></para>
+            <para>
+              <guimenuitem>Secure (default)</guimenuitem> — </para>
+            <para>
+              <guimenuitem>Weak (use with caution)</guimenuitem> — </para>
+            <para>
+              <guimenuitem>None (completely insecure)</guimenuitem> — </para>
           </listitem>
         </varlistentry>
         <varlistentry>
           <term>
-            <guilabel>PIN</guilabel>
+            <guilabel>NAT traversal</guilabel>
           </term>
           <listitem>
-            <para></para>
+            <para>
+              <guimenuitem>Cisco UDP (default)</guimenuitem> — </para>
+            <para>
+              <guimenuitem>NAT-T</guimenuitem> — </para>
+            <para>
+              <guimenuitem>Disabled</guimenuitem> — </para>
+            <para>
+              <guilabel>Disable Dead Peer Detection</guilabel> — </para>
           </listitem>
         </varlistentry>
       </variablelist>
     </section>
     <section
-      id="sec-Configuring_the_PPP_Settings_Tab">
-      <title>Configuring the PPP Settings Tab</title>
+      id="sec-Establishing_a_DSL_Connection">
+      <title>Establishing a DSL Connection</title>
       <para></para>
       <variablelist>
         <varlistentry>
           <term>
-            <guilabel>Configure Methods</guilabel>
+            <guilabel>Username</guilabel>
           </term>
           <listitem>
             <para></para>
@@ -736,7 +803,7 @@ NetworkManager (pid  1527) is running...
         </varlistentry>
         <varlistentry>
           <term>
-            <guilabel>Use point-to-point encryption (MPPE)</guilabel>
+            <guilabel>Service</guilabel>
           </term>
           <listitem>
             <para></para>
@@ -744,23 +811,48 @@ NetworkManager (pid  1527) is running...
         </varlistentry>
         <varlistentry>
           <term>
-            <guilabel>Allow BSD data compression</guilabel>
+            <guilabel>Password</guilabel>
           </term>
           <listitem>
             <para></para>
           </listitem>
         </varlistentry>
+      </variablelist>
+    </section>
+    <section
+      id="sec-Establishing_Routes">
+      <title>Establishing Routes</title>
+      <mediaobject
+        id="mediaobj-Network_Configuration-NM-System_eth0-Routes">
+        <imageobject>
+          <imagedata
+            align="center"
+            fileref="images/Network_Configuration-NM-System_eth0-Routes.png"
+            format="PNG" />
+        </imageobject>
+        <caption>
+          <para>Configuring static network routes</para>
+        </caption>
+      </mediaobject>
+      <variablelist>
         <varlistentry>
           <term>
-            <guilabel>Allow Deflate data compression</guilabel>
+            <guilabel>Addresses</guilabel>
           </term>
           <listitem>
-            <para></para>
+            <para>
+              <guimenuitem>Address</guimenuitem> — </para>
+            <para>
+              <guimenuitem>Prefix</guimenuitem> — </para>
+            <para>
+              <guimenuitem>Gateway</guimenuitem> — </para>
+            <para>
+              <guimenuitem>Metric</guimenuitem> — </para>
           </listitem>
         </varlistentry>
         <varlistentry>
           <term>
-            <guilabel>Use TCP header compression</guilabel>
+            <guilabel>Ignore automatically obtained routes</guilabel>
           </term>
           <listitem>
             <para></para>
@@ -768,7 +860,7 @@ NetworkManager (pid  1527) is running...
         </varlistentry>
         <varlistentry>
           <term>
-            <guilabel>Send PPP echo packets</guilabel>
+            <guilabel>Use this connection only for resources on its network</guilabel>
           </term>
           <listitem>
             <para></para>
@@ -776,38 +868,269 @@ NetworkManager (pid  1527) is running...
         </varlistentry>
       </variablelist>
     </section>
+  </section>
+  <section
+    id="sec-Configuring_Connection_Settings">
+    <title>Configuring Connection Settings</title>
     <section
-      id="sec-Configuring_the_VPN_Tab">
-      <title>Configuring the VPN Tab</title>
-      <para></para>
-      <variablelist>
+      id="sec-Configuring_802.1x_Security">
+      <title>Configuring 802.1x Security</title>
+      <para>802.1x security is the name of the IEEE standard for port-based Network Access Control (PNAC). Simply put, 802.1x security is a way of defining a <firstterm>logical network</firstterm> out of 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, DHCP servers were configured not to lease IP addresses to unauthorized users, but 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 Connections</guilabel> window (refer to <xref
+          linkend="sec-Interacting_with_NetworkManager"/>) and following the applicable procedure:</para>
+      <procedure
+        id="procedure-For_a_wired_connection...">
+        <title>For a wired connection...</title>
+        <step>
+          <para>Select the <guilabel>Wired</guilabel> tab.</para>
+        </step>
+        <step>
+          <para>Either click on <guibutton>Add</guibutton> to add a new network connection for which you want to configure 802.1x security, or select an existing connection and click <guibutton>Edit</guibutton>.</para>
+        </step>
+        <step>
+          <para>Then select the <guilabel>802.1x Security</guilabel> tab and check the <guilabel>Use 802.1x security for this connection</guilabel> checkbox to enable settings configuration.</para>
+        </step>
+        <step>
+          <para>Proceed to </para>
+        </step>
+      </procedure>
+      <procedure
+        id="procedure-For_a_wireless_connection...">
+        <title>For a wireless connection...</title>
+        <step>
+          <para>Select the <guilabel>Wireless</guilabel> tab.</para>
+        </step>
+        <step>
+          <para>Either click on <guibutton>Add</guibutton> to add a new network connection for which you want to configure 802.1x security, or select an existing connection and click <guibutton>Edit</guibutton>.</para>
+        </step>
+        <step>
+          <para>Then click the <guilabel>Security</guilabel> dropdown and choose one of the following security methods: <guimenuitem>LEAP</guimenuitem>, <guimenuitem>Dynamic WEP (802.1x)</guimenuitem>, or <guimenuitem>WPA &amp; WPA2 Enterprise</guimenuitem>.</para>
+        </step>
+        <step>
+          <para>Refer to  for descriptions of which EAP types correspond to your selection in the <guilabel>Security</guilabel> dropdown.</para>
+        </step>
+      </procedure>
+<!--      <variablelist>
         <varlistentry>
           <term>
-            <guilabel>Gateway</guilabel>
+            <guilabel>Authentication</guilabel>
           </term>
           <listitem>
-            <para></para>
+            <para>
+              <guimenuitem>TLS</guimenuitem> — (Transport Layer Security) </para>
+            <para>
+              <guimenuitem>Tunneled TLS</guimenuitem> — </para>
+            <para>
+              <guimenuitem>Protected EAP (PEAP)</guimenuitem> — </para>
           </listitem>
         </varlistentry>
+      </variablelist>-->
+      <section
+        id="sec-Configuring_TLS_Transport_Level_Security_Settings">
+        <title>Configuring TLS (Transport Level Security) Settings</title>
+        <para>With Transport Level Security, the client and server mutually authenticate using the TLS protocol. The server demonstrates that it holds a digital certificate, the client proves its own identity using its client-side certificate, and key information is exchanged. Once authentication is complete, the TLS tunnel is no longer used. Instead, the client and server use the exchanged keys to encrypt data using AES, TKIP or WEP.</para>
+        <para>The fact that certificates must be distributed to all clients who want to authenticate means that the the EAP-TLS authentication method is very strong, but also more complicated to set up. Using TLS security requires the overhead of a public key infrastructure (PKI) to manage certificates. The benefit to TLS security is that a compromised password does not allow access to the (W)LAN: an intruder must also have access to the authenticating client's private key.</para>
+        <variablelist>
+          <varlistentry>
+            <term>
+              <guilabel>Identity</guilabel>
+            </term>
+            <listitem>
+              <para></para>
+            </listitem>
+          </varlistentry>
+          <varlistentry>
+            <term>
+              <guilabel>User certificate</guilabel>
+            </term>
+            <listitem>
+              <para></para>
+            </listitem>
+          </varlistentry>
+          <varlistentry>
+            <term>
+              <guilabel>CA certificate</guilabel>
+            </term>
+            <listitem>
+              <para></para>
+            </listitem>
+          </varlistentry>
+          <varlistentry>
+            <term>
+              <guilabel>Private key</guilabel>
+            </term>
+            <listitem>
+              <para></para>
+            </listitem>
+          </varlistentry>
+          <varlistentry>
+            <term>
+              <guilabel>Private key password</guilabel>
+            </term>
+            <listitem>
+              <para></para>
+            </listitem>
+          </varlistentry>
+        </variablelist>
+      </section>
+      <section
+        id="sec-Configuring_Tunneled_TLS_Settings">
+        <title>Configuring Tunneled TLS Settings</title>
+        <para></para>
+        <remark>Which version of TTLS does NM use? v0 or v1?</remark>
+        <variablelist>
+          <varlistentry>
+            <term>
+              <guilabel>Anonymous identity</guilabel>
+            </term>
+            <listitem>
+              <para></para>
+            </listitem>
+          </varlistentry>
+          <varlistentry>
+            <term>
+              <guilabel>CA certificate</guilabel>
+            </term>
+            <listitem>
+              <para></para>
+            </listitem>
+          </varlistentry>
+          <varlistentry>
+            <term>
+              <guilabel>Inner authentication</guilabel>
+            </term>
+            <listitem>
+              <para>
+                <guimenuitem>PAP</guimenuitem> — </para>
+              <para>
+                <guimenuitem>MSCHAP</guimenuitem> — </para>
+              <para>
+                <guimenuitem>MSCHAPv2</guimenuitem> — </para>
+              <para>
+                <guimenuitem>CHAP</guimenuitem> — </para>
+            </listitem>
+          </varlistentry>
+          <varlistentry>
+            <term>
+              <guilabel>Username</guilabel>
+            </term>
+            <listitem>
+              <para></para>
+            </listitem>
+          </varlistentry>
+          <varlistentry>
+            <term>
+              <guilabel>Password</guilabel>
+            </term>
+            <listitem>
+              <para></para>
+            </listitem>
+          </varlistentry>
+        </variablelist>
+      </section>
+      <section
+        id="sec-Configuring_Protected_EAP_PEAP_Settings">
+        <title>Configuring Protected EAP (PEAP) Settings</title>
+        <variablelist>
+          <varlistentry>
+            <term>
+              <guilabel>Anonymous Identity</guilabel>
+            </term>
+            <listitem>
+              <para></para>
+            </listitem>
+          </varlistentry>
+          <varlistentry>
+            <term>
+              <guilabel>CA certificate</guilabel>
+            </term>
+            <listitem>
+              <para></para>
+            </listitem>
+          </varlistentry>
+          <varlistentry>
+            <term>
+              <guilabel>PEAP version</guilabel>
+            </term>
+            <listitem>
+              <para></para>
+            </listitem>
+          </varlistentry>
+          <varlistentry>
+            <term>
+              <guilabel>Inner authentication</guilabel>
+            </term>
+            <listitem>
+              <para>
+                <guimenuitem>MSCHAPv2</guimenuitem> — </para>
+              <para>
+                <guimenuitem>MD5</guimenuitem> — </para>
+              <para>
+                <guimenuitem>GTC</guimenuitem> — </para>
+            </listitem>
+          </varlistentry>
+          <varlistentry>
+            <term>
+              <guilabel>Username</guilabel>
+            </term>
+            <listitem>
+              <para></para>
+            </listitem>
+          </varlistentry>
+          <varlistentry>
+            <term>
+              <guilabel>Password</guilabel>
+            </term>
+            <listitem>
+              <para></para>
+            </listitem>
+          </varlistentry>
+        </variablelist>
+      </section>
+    </section>
+    <section
+      id="sec-Configuring_Wireless_Security">
+      <title>Configuring Wireless Security</title>
+      <variablelist>
         <varlistentry>
           <term>
-            <guilabel>Group name</guilabel>
+            <guilabel>Security</guilabel>
           </term>
           <listitem>
-            <para></para>
+            <para>
+              <guimenuitem>None</guimenuitem> — </para>
+            <para>
+              <guimenuitem>WEP 40/128-bit Key</guimenuitem> — </para>
+            <para>
+              <guimenuitem>WEP 128-bit Passphrase</guimenuitem> — </para>
+            <para>
+              <guimenuitem>LEAP</guimenuitem> — </para>
+            <para>
+              <guimenuitem>Dynamic WEP (802.1x)</guimenuitem> — </para>
+            <para>
+              <guimenuitem>WPA &amp; WPA2 Personal</guimenuitem> — </para>
+            <para>
+              <guimenuitem>WPA &amp; WPA2 Enterprise</guimenuitem> — </para>
           </listitem>
         </varlistentry>
         <varlistentry>
-          <term>
-            <guilabel>User password</guilabel>
-          </term>
+          <term>Password</term>
           <listitem>
             <para></para>
           </listitem>
         </varlistentry>
+      </variablelist>
+    </section>
+    <section
+      id="sec-Configuring_PPP_Point-to-Point_Settings">
+      <title>Configuring PPP (Point-to-Point) Settings</title>
+      <para></para>
+      <variablelist>
         <varlistentry>
           <term>
-            <guilabel>Group password</guilabel>
+            <guilabel>Configure Methods</guilabel>
           </term>
           <listitem>
             <para></para>
@@ -815,7 +1138,7 @@ NetworkManager (pid  1527) is running...
         </varlistentry>
         <varlistentry>
           <term>
-            <guilabel>User name</guilabel>
+            <guilabel>Use point-to-point encryption (MPPE)</guilabel>
           </term>
           <listitem>
             <para></para>
@@ -823,7 +1146,7 @@ NetworkManager (pid  1527) is running...
         </varlistentry>
         <varlistentry>
           <term>
-            <guilabel>Domain</guilabel>
+            <guilabel>Allow BSD data compression</guilabel>
           </term>
           <listitem>
             <para></para>
@@ -831,42 +1154,7 @@ NetworkManager (pid  1527) is running...
         </varlistentry>
         <varlistentry>
           <term>
-            <guilabel>Encryption Method</guilabel>
-          </term>
-          <listitem>
-            <para>
-              <guimenuitem>Secure (default)</guimenuitem> — </para>
-            <para>
-              <guimenuitem>Weak (use with caution)</guimenuitem> — </para>
-            <para>
-              <guimenuitem>None (completely insecure)</guimenuitem> — </para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>
-            <guilabel>NAT traversal</guilabel>
-          </term>
-          <listitem>
-            <para>
-              <guimenuitem>Cisco UDP (default)</guimenuitem> — </para>
-            <para>
-              <guimenuitem>NAT-T</guimenuitem> — </para>
-            <para>
-              <guimenuitem>Disabled</guimenuitem> — </para>
-            <para>
-              <guilabel>Disable Dead Peer Detection</guilabel> — </para>
-          </listitem>
-        </varlistentry>
-      </variablelist>
-    </section>
-    <section
-      id="sec-Configuring_the_DSL_Tab">
-      <title>Configuring the DSL Tab</title>
-      <para></para>
-      <variablelist>
-        <varlistentry>
-          <term>
-            <guilabel>Username</guilabel>
+            <guilabel>Allow Deflate data compression</guilabel>
           </term>
           <listitem>
             <para></para>
@@ -874,7 +1162,7 @@ NetworkManager (pid  1527) is running...
         </varlistentry>
         <varlistentry>
           <term>
-            <guilabel>Service</guilabel>
+            <guilabel>Use TCP header compression</guilabel>
           </term>
           <listitem>
             <para></para>
@@ -882,7 +1170,7 @@ NetworkManager (pid  1527) is running...
         </varlistentry>
         <varlistentry>
           <term>
-            <guilabel>Password</guilabel>
+            <guilabel>Send PPP echo packets</guilabel>
           </term>
           <listitem>
             <para></para>
@@ -891,8 +1179,8 @@ NetworkManager (pid  1527) is running...
       </variablelist>
     </section>
     <section
-      id="sec-Configuring_the_IPv4_Settings_Tab">
-      <title>Configuring the IPv4 Settings Tab</title>
+      id="sec-Configuring_IPv4_Settings">
+      <title>Configuring IPv4 Settings</title>
       <mediaobject
         id="mediaobj-Network_Configuration-NM-IPv4_Settings">
         <imageobject>
@@ -965,8 +1253,8 @@ NetworkManager (pid  1527) is running...
       </variablelist>
     </section>
     <section
-      id="sec-Configuring_the_IPv6_Settings_Tab">
-      <title>Configuring the IPv6 Settings Tab</title>
+      id="sec-Configuring_IPv6_Settings">
+      <title>Configuring IPv6 Settings</title>
       <variablelist>
         <varlistentry>
           <term>
@@ -1006,8 +1294,9 @@ NetworkManager (pid  1527) is running...
   <section
     id="sec-NetworkManager_Architecture">
     <title>NetworkManager Architecture</title>
-    <para>silas: incorporate relevant material in not too much detail from: <ulink
-        url="http://live.gnome.org/NetworkManagerConfiguration">wiki</ulink>.</para>
+    <para>See <ulink
+        url="http://live.gnome.org/NetworkManagerConfiguration"/>
+    </para>
   </section>
 </chapter>
 <!--<section
diff --git a/en-US/images/Network_Configuration-NM-All_applet_states.png b/en-US/images/Network_Configuration-NM-All_applet_states.png
new file mode 100644
index 0000000..e5c7782
Binary files /dev/null and b/en-US/images/Network_Configuration-NM-All_applet_states.png differ
diff --git a/en-US/images/Network_Configuration-NM-Editing_Wired_Connection_1.png b/en-US/images/Network_Configuration-NM-Editing_Wired_Connection_1.png
new file mode 100644
index 0000000..60dee58
Binary files /dev/null and b/en-US/images/Network_Configuration-NM-Editing_Wired_Connection_1.png differ
diff --git a/en-US/images/Network_Configuration-NM-Editing_Wireless_Connection_1.png b/en-US/images/Network_Configuration-NM-Editing_Wireless_Connection_1.png
new file mode 100644
index 0000000..d26d73a
Binary files /dev/null and b/en-US/images/Network_Configuration-NM-Editing_Wireless_Connection_1.png differ


More information about the docs-commits mailing list