[deployment-guide/comm-rel: 59/74] NetConf: complete wireless tab descriptions, +doc

dsilas dsilas at fedoraproject.org
Tue Jul 6 21:14:21 UTC 2010


commit 4cb5e8aadbcf2ce8a7259eff0ae0332a93524ab1
Author: Douglas Silas <dhensley at redhat.com>
Date:   Mon Jun 28 20:50:09 2010 +0200

    NetConf: complete wireless tab descriptions, +doc

 en-US/Network_Configuration.xml | 1807 ++++++++++++++++++++-------------------
 1 files changed, 925 insertions(+), 882 deletions(-)
---
diff --git a/en-US/Network_Configuration.xml b/en-US/Network_Configuration.xml
index ca8656a..ff3b9df 100644
--- a/en-US/Network_Configuration.xml
+++ b/en-US/Network_Configuration.xml
@@ -271,7 +271,7 @@ NetworkManager (pid  1527) is running...
           </term>
           <listitem>
             <para>Network hardware such as a Network Interface Card (NIC) 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 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>
+            <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
@@ -282,191 +282,188 @@ NetworkManager (pid  1527) is running...
     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>MTU</guilabel>
-        </term>
+            <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>MTU</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>
+          </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 wired connection. 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.</para>
+      <para>Then, to configure:</para>
+      <itemizedlist>
         <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>
-        </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 wired connection. 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.</para>
-    <para>Then, to configure:</para>
-    <itemizedlist>
-      <listitem>
-        <para>port-based Network Access Control (PNAC), click the <guilabel>802.1x Security</guilabel> tab and proceed to <xref
-            linkend="sec-Configuring_802.1x_Security"/>;
+          <para>port-based Network Access Control (PNAC), click the <guilabel>802.1x Security</guilabel> tab and proceed to <xref
+              linkend="sec-Configuring_802.1x_Security"/>;
           </para>
-      </listitem>
-      <listitem>
-        <para>IPv4 settings for the connection, click the <guilabel>IPv4 Settings</guilabel> tab and proceed to <xref
-            linkend="sec-Configuring_IPv4_Settings"/>; or,
+        </listitem>
+        <listitem>
+          <para>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>IPv6 settings for the connection, click the <guilabel>IPv6 Settings</guilabel> tab and proceed to <xref
-            linkend="sec-Configuring_IPv6_Settings"/>.
+        </listitem>
+        <listitem>
+          <para>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
-    id="sec-Establishing_a_Wireless_Connection">
-    <title>Establishing a Wireless Connection</title>
-    <para>
-      <application>NetworkManager</application> makes configuring a wireless (also known as wi-fi or 802.1<replaceable>a/b/g/n</replaceable>) connection quick and simple. 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); and,</para>
-      </listitem>
-      <listitem>
-        <para>if the access point is secured, an authentication secret such as a key, passphrase, or digital certificate.</para>
-      </listitem>
-    </itemizedlist>
-    <para>To configure a mobile broadband (such as 3G) connection instead of a wireless one, refer to <xref
-        linkend="sec-Establishing_a_Mobile_Broadband_Connection"/>.</para>
-      <!--<para>There are two ways to create a connection for a wireless access point. The first (and easier) way is to simply try to connect to an available wireless access point (see <xref
-          linkend="bh-Quickly_Connecting_to_an_Existing_Access_Point"/>), and the second way is to create a new, blank connection and configure its settings (see <xref
-          linkend="bh-Creating_a_New_Wireless_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 left-click on the <application>NetworkManager</application> applet, locate the SSID of the access point in the list of <guilabel>Available</guilabel> networks, and click on it. If the access point is secured, a dialog prompts you for authentication.</para>
-    <mediaobject
-      id="mediaobj-Network_Configuration-NM-Wireless_authentication_required">
-      <imageobject>
-        <imagedata
-          align="center"
-          fileref="images/Network_Configuration-NM-Wireless_authentication_required.png"
-          format="PNG" />
-      </imageobject>
-      <caption>
-        <para>Authenticating with a wireless access point</para>
-      </caption>
-    </mediaobject>
-    <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>Wireless security</guilabel> dropdown. To see if there are multiple choices, click the <guilabel>Wireless security</guilabel> dropdown 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, refer to <xref
-        linkend="sec-Configuring_Wireless_Security"/>.</para>
-    <para>If <application>NetworkManager</application> connects to the access point succesfully, its applet icon will change into a graphical indicator of the wireless connection's signal strength.</para>
-    <mediaobject
-      id="mediaobj-Network_Configuration-NM_applet-signal_strength_75">
-      <imageobject>
-        <imagedata
-          align="center"
-          fileref="images/Network_Configuration-NM_applet-signal_strength_75.png"
-          format="PNG" />
-      </imageobject>
-      <caption>
-        <para>Applet icon indicating a wireless connection signal strength of 75%</para>
-      </caption>
-    </mediaobject>
-    <para>You can also edit the settings for one of these auto-created access point connections just as if you had <guilabel>Add</guilabel>ded it yourself. The <guilabel>Wireless</guilabel> tab of the <guilabel>Network Connections</guilabel> window lists all of the connections you have ever tried to connect to: <application>NetworkManager</application> names each of them <computeroutput>Auto&#160;<replaceable>&lt;SSID&gt;</replaceable>
-      </computeroutput>, where SSID is the <firstterm>Service Set identifier</firstterm> of the access point.</para>
-    <mediaobject
-      id="mediaobj-Network_Configuration-NM-Wireless_Auto_Connections_List">
-      <imageobject>
-        <imagedata
-          align="center"
-          fileref="images/Network_Configuration-NM-Wireless_Auto_Connections_List.png"
-          format="PNG" />
-      </imageobject>
-      <caption>
-        <para>Previous access points that have been connected to</para>
-      </caption>
-    </mediaobject>
-    <bridgehead
-      id="bh-Connecting_to_a_Hidden_Wireless_Network">Connecting to a Hidden Wireless Network</bridgehead>
-    <para>All access points have a <firstterm>Service Set identifier</firstterm> (SSID) 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, left-click <application>NetworkManager</application>'s applet icon and select <guilabel>Connect to Hidden Wireless 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>Wireless security</guilabel> method, enter the correct authentication secrets, and click <guibutton>Connect</guibutton>.</para>
-    <para>For more information on wireless security settings, refer to <xref
-        linkend="sec-Configuring_Wireless_Security"/>.</para>
-    <bridgehead
-      id="bh-Editing_a_Connection_or_Creating_a_Completely_New_One">Editing a Connection, or Creating a Completely New One</bridgehead>
-    <para>You can edit an existing connection that you have tried or succeeded in connecting to in the past by opening the <guilabel>Wireless</guilabel> tab of the <guilabel>Network Connections</guilabel>, selecting the connection by name (words which follow <computeroutput>Auto</computeroutput> refer to the SSID of an access point), and clicking <guilabel>Edit</guilabel>.</para>
-    <para>You can create a new connection by opening the <guilabel>Network Connections</guilabel> window, selecting the <guilabel>Wireless</guilabel> tab, and clicking the <guilabel>Add</guilabel> button.</para>
-    <para>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_and_Editing_Existing_Connections"/>.</para>
-    <mediaobject
-      id="mediaobj-Network_Configuration-NM-Editing_Wireless_Connection_1">
-      <imageobject>
-        <imagedata
-          align="center"
-          fileref="images/Network_Configuration-NM-Editing_Wireless_Connection_1.png"
-          format="PNG" />
-      </imageobject>
-      <caption>
-        <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 all connection types:</para>
-    <itemizedlist>
-      <listitem>
-        <para>
-          <guilabel>Connection name</guilabel> — You can customize the name under which this connection is listed in the <guilabel>Wireless</guilabel> tab of the <guilabel>Network Connections</guilabel> window by entering a descriptive name in the text-entry box. By default, wireless connections are named the same as the <firstterm>SSID</firstterm> of the wireless access point. You can rename the wireless connection without affecting its ability to connect, but it is recommended to retain the SSID name.</para>
-      </listitem>
-      <listitem>
-        <para>
-          <guilabel>Connect automatically</guilabel> — Check this box if you want <application>NetworkManager</application> to auto-connect to the this connection when it is—or becomes—available. Refer to <xref
-            linkend="sec-Connecting_to_a_Network_Automatically"/> for more information.</para>
-      </listitem>
-      <listitem>
-        <para>
-          <guilabel>Available to all users</guilabel> — check this box to create a connection available to all users on the system. Changing this setting may require root privileges. Refer to <xref
-            linkend="sec-User_and_System_Connections"/> for details.</para>
-      </listitem>
-    </itemizedlist>
-    <bridgehead
-      id="bh-Configuring_the_Wireless_Tab">Configuring the Wireless Tab</bridgehead>
-    <variablelist>
-      <varlistentry>
-        <term>
-          <guilabel>SSID</guilabel>
-        </term>
+        </listitem>
+      </itemizedlist>
+    </section>
+    <section
+      id="sec-Establishing_a_Wireless_Connection">
+      <title>Establishing a Wireless Connection</title>
+      <para>
+        <application>NetworkManager</application> makes configuring a wireless (also known as wi-fi or 802.1<replaceable>a/b/g/n</replaceable>) connection quick and simple. To establish a wireless connection, you need:</para>
+      <itemizedlist>
         <listitem>
-          <para>All access points have a <firstterm>Service Set identifier</firstterm> 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 (and authentication secrets).</para>
-          <para>For information on connecting to a hidden wireless network, refer to <xref
-              linkend="bh-Connecting_to_a_Hidden_Wireless_Network"/>.</para>
+          <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>
-      </varlistentry>
-      <varlistentry>
-        <term>
-          <guilabel>Mode</guilabel>
-        </term>
+        <listitem>
+          <para>a wireless access point to connect to (such as a wireless router); and,</para>
+        </listitem>
+        <listitem>
+          <para>if the access point is secured, an authentication secret such as a key, passphrase, or digital certificate.</para>
+        </listitem>
+      </itemizedlist>
+      <para>To configure a mobile broadband (such as 3G) connection instead of a wireless one, refer to <xref
+          linkend="sec-Establishing_a_Mobile_Broadband_Connection"/>.</para>
+      <bridgehead
+        id="bh-Quickly_Connecting_to_an_Available_Access_Point">Quickly Connecting to an Available Access Point</bridgehead>
+      <para>The easiest way to connect to an available access point is to left-click on the <application>NetworkManager</application> applet, locate the SSID of the access point in the list of <guilabel>Available</guilabel> networks, and click on it. If the access point is secured, a dialog prompts you for authentication.</para>
+      <mediaobject
+        id="mediaobj-Network_Configuration-NM-Wireless_authentication_required">
+        <imageobject>
+          <imagedata
+            align="center"
+            fileref="images/Network_Configuration-NM-Wireless_authentication_required.png"
+            format="PNG" />
+        </imageobject>
+        <caption>
+          <para>Authenticating with a wireless access point</para>
+        </caption>
+      </mediaobject>
+      <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>Wireless security</guilabel> dropdown. To see if there are multiple choices, click the <guilabel>Wireless security</guilabel> dropdown 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, refer to <xref
+          linkend="sec-Configuring_Wireless_Security"/>.</para>
+      <para>If <application>NetworkManager</application> connects to the access point succesfully, its applet icon will change into a graphical indicator of the wireless connection's signal strength.</para>
+      <mediaobject
+        id="mediaobj-Network_Configuration-NM_applet-signal_strength_75">
+        <imageobject>
+          <imagedata
+            align="center"
+            fileref="images/Network_Configuration-NM_applet-signal_strength_75.png"
+            format="PNG" />
+        </imageobject>
+        <caption>
+          <para>Applet icon indicating a wireless connection signal strength of 75%</para>
+        </caption>
+      </mediaobject>
+      <para>You can also edit the settings for one of these auto-created access point connections just as if you had <guilabel>Add</guilabel>ded it yourself. The <guilabel>Wireless</guilabel> tab of the <guilabel>Network Connections</guilabel> window lists all of the connections you have ever tried to connect to: <application>NetworkManager</application> names each of them <computeroutput>Auto&#160;<replaceable>&lt;SSID&gt;</replaceable>
+        </computeroutput>, where SSID is the <firstterm>Service Set identifier</firstterm> of the access point.</para>
+      <mediaobject
+        id="mediaobj-Network_Configuration-NM-Wireless_Auto_Connections_List">
+        <imageobject>
+          <imagedata
+            align="center"
+            fileref="images/Network_Configuration-NM-Wireless_Auto_Connections_List.png"
+            format="PNG" />
+        </imageobject>
+        <caption>
+          <para>Previous access points that have been connected to</para>
+        </caption>
+      </mediaobject>
+      <bridgehead
+        id="bh-Connecting_to_a_Hidden_Wireless_Network">Connecting to a Hidden Wireless Network</bridgehead>
+      <para>All access points have a <firstterm>Service Set identifier</firstterm> (SSID) 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, left-click <application>NetworkManager</application>'s applet icon and select <guilabel>Connect to Hidden Wireless 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>Wireless security</guilabel> method, enter the correct authentication secrets, and click <guibutton>Connect</guibutton>.</para>
+      <para>For more information on wireless security settings, refer to <xref
+          linkend="sec-Configuring_Wireless_Security"/>.</para>
+      <bridgehead
+        id="bh-Editing_a_Connection_or_Creating_a_Completely_New_One">Editing a Connection, or Creating a Completely New One</bridgehead>
+      <para>You can edit an existing connection that you have tried or succeeded in connecting to in the past by opening the <guilabel>Wireless</guilabel> tab of the <guilabel>Network Connections</guilabel>, selecting the connection by name (words which follow <computeroutput>Auto</computeroutput> refer to the SSID of an access point), and clicking <guilabel>Edit</guilabel>.</para>
+      <para>You can create a new connection by opening the <guilabel>Network Connections</guilabel> window, selecting the <guilabel>Wireless</guilabel> tab, and clicking the <guilabel>Add</guilabel> button.</para>
+      <para>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_and_Editing_Existing_Connections"/>.</para>
+      <mediaobject
+        id="mediaobj-Network_Configuration-NM-Editing_Wireless_Connection_1">
+        <imageobject>
+          <imagedata
+            align="center"
+            fileref="images/Network_Configuration-NM-Editing_Wireless_Connection_1.png"
+            format="PNG" />
+        </imageobject>
+        <caption>
+          <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 all connection types:</para>
+      <itemizedlist>
         <listitem>
           <para>
-            <guimenuitem>Infrastructure</guimenuitem> — Set <guilabel>Mode</guilabel> to <guimenuitem>Infrastructure</guimenuitem> if you are connecting to a wireless access point such as a router or a switch.</para>
-          <para>
-            <guimenuitem>Ad-hoc</guimenuitem> — Set <guilabel>Mode</guilabel> to <guimenuitem>Ad-hoc</guimenuitem> if you are creating a peer-to-peer network for two or more mobile devices to communicate directly with each other. If you use <guimenuitem>Ad-hoc</guimenuitem> mode, you must ensure that the same <guilabel>SSID</guilabel> is set for all participating wireless devices, and that they are all communicating over the same channel.</para>
+            <guilabel>Connection name</guilabel> — You can customize the name under which this connection is listed in the <guilabel>Wireless</guilabel> tab of the <guilabel>Network Connections</guilabel> window by entering a descriptive name in the text-entry box. By default, wireless connections are named the same as the <firstterm>SSID</firstterm> of the wireless access point. You can rename the wireless connection without affecting its ability to connect, but it is recommended to retain the SSID name.</para>
         </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>
-          <guilabel>BSSID</guilabel>
-        </term>
         <listitem>
-          <para>The Basic Service Set Identifier (BSSID) is the MAC address of the wireless access point you are connecting to when in <guilabel>Infrastructure</guilabel> mode. This field is blank by default, and you are able to connect to a wireless access point by <guilabel>SSID</guilabel> without having to specify its <guilabel>BSSID</guilabel>. </para>
-          <para>For ad-hoc networks, the BSSID is generated randomly. However, <application>NetworkManager</application> does not have the capability to generate the BSSID for an ad-hoc network.</para>
+          <para>
+            <guilabel>Connect automatically</guilabel> — Check this box if you want <application>NetworkManager</application> to auto-connect to the this connection when it is—or becomes—available. Refer to <xref
+              linkend="sec-Connecting_to_a_Network_Automatically"/> for more information.</para>
         </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>
-          <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 <computeroutput>00:1c:bf:02:f8:70</computeroutput>) immediately follows the <computeroutput>link/ether</computeroutput> keyword:</para>
-        <screen>~]#&#160;<command>ip addr</command>
+          <para>
+            <guilabel>Available to all users</guilabel> — check this box to create a connection available to all users on the system. Changing this setting may require root privileges. Refer to <xref
+              linkend="sec-User_and_System_Connections"/> for details.</para>
+        </listitem>
+      </itemizedlist>
+      <bridgehead
+        id="bh-Configuring_the_Wireless_Tab">Configuring the Wireless Tab</bridgehead>
+      <variablelist>
+        <varlistentry>
+          <term>
+            <guilabel>SSID</guilabel>
+          </term>
+          <listitem>
+            <para>All access points have a <firstterm>Service Set identifier</firstterm> 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 (and authentication secrets).</para>
+            <para>For information on connecting to a hidden wireless network, refer to <xref
+                linkend="bh-Connecting_to_a_Hidden_Wireless_Network"/>.</para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>
+            <guilabel>Mode</guilabel>
+          </term>
+          <listitem>
+            <para>
+              <guimenuitem>Infrastructure</guimenuitem> — Set <guilabel>Mode</guilabel> to <guimenuitem>Infrastructure</guimenuitem> if you are connecting to a wireless access point such as a router or a switch.</para>
+            <para>
+              <guimenuitem>Ad-hoc</guimenuitem> — Set <guilabel>Mode</guilabel> to <guimenuitem>Ad-hoc</guimenuitem> if you are creating a peer-to-peer network for two or more mobile devices to communicate directly with each other. If you use <guimenuitem>Ad-hoc</guimenuitem> mode, you must ensure that the same <guilabel>SSID</guilabel> is set for all participating wireless devices, and that they are all communicating over the same channel.</para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>
+            <guilabel>BSSID</guilabel>
+          </term>
+          <listitem>
+            <para>The Basic Service Set Identifier (BSSID) is the MAC address of the wireless access point you are connecting to when in <guilabel>Infrastructure</guilabel> mode. This field is blank by default, and you are able to connect to a wireless access point by <guilabel>SSID</guilabel> without having to specify its <guilabel>BSSID</guilabel>. </para>
+            <para>For ad-hoc networks, the BSSID is generated randomly. However, <application>NetworkManager</application> does not have the capability to generate the BSSID for an ad-hoc network.</para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>
+            <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 <computeroutput>00:1c:bf:02:f8:70</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
@@ -482,743 +479,789 @@ NetworkManager (pid  1527) is running...
     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>
-      </listitem>
-    </varlistentry>
-    <varlistentry>
-      <term>
-        <guilabel>MTU</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.-->	If set to a non-zero number, only packets of the specified size or smaller will be transmitted. Larger packets are broken up into multiple Ethernet frames. It is recommended to leave this setting on <guimenuitem>automatic</guimenuitem>.</para>
-      </listitem>
-    </varlistentry>
-  </variablelist>
-  <bridgehead
-    id="bh-Saving_Your_New_or_Modified_Connection_and_Making_Further_Configurations-wireless">Saving Your New (or Modified) Connection and Making Further Configurations</bridgehead>
-  <para>Once you have finished editing the wireless connection, click the <guibutton>Apply</guibutton> button and <application>NetworkManager</application> will immediately save your customized configuration. Given a correct configuration, you can successfully connect to your the modified connection by selecting it from the <application>NetworkManager</application> Notification Area applet. See <xref
-      linkend="sec-Connecting_to_a_Network"/> for details on selecting and connecting to a network.</para>
-  <para>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.</para>
-  <para>Then, to configure:</para>
-  <itemizedlist>
-    <listitem>
-      <para>security authentication for the wireless connection, click the <guilabel>Wireless Security</guilabel> tab and proceed to <xref
-          linkend="sec-Configuring_Wireless_Security"/>;</para>
-    </listitem>
-    <listitem>
-      <para>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>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
-  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-Configuring_New_and_Editing_Existing_Connections"/>.</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 all connection types:</para>
-  <itemizedlist>
-    <listitem>
-      <para>
-        <guilabel>Connection name</guilabel> — You can customize the name under which this connection is listed in the <guilabel>tab</guilabel> tab of the <guilabel>Network Connections</guilabel> window by entering a descriptive name in the text-entry box.</para>
-    </listitem>
-    <listitem>
-      <para>
-        <guilabel>Connect automatically</guilabel> — Check this box if you want <application>NetworkManager</application> to auto-connect to the this connection when it is—or becomes—available. Refer to <xref
-          linkend="sec-Connecting_to_a_Network_Automatically"/> for more information.</para>
-    </listitem>
-    <listitem>
-      <para>
-        <guilabel>Available to all users</guilabel> — check this box to create a connection available to all users on the system. Changing this setting may require root privileges. Refer to <xref
-          linkend="sec-User_and_System_Connections"/> for details.</para>
-    </listitem>
-  </itemizedlist>
-  <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 <replaceable>&lt;type&gt;</replaceable> connection. 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.</para>
-  <para>Then, to configure:</para>
-  <itemizedlist>
-    <listitem>
-      <para>;</para>
-    </listitem>
-    <listitem>
-      <para>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>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>Number</guilabel>
-      </term>
-      <listitem>
-        <para></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>
-    <varlistentry>
-      <term>
-        <guilabel>APN</guilabel>
-      </term>
-      <listitem>
-        <para></para>
-      </listitem>
-    </varlistentry>
-    <varlistentry>
-      <term>
-        <guilabel>Network ID</guilabel>
-      </term>
-      <listitem>
-        <para></para>
-      </listitem>
-    </varlistentry>
-    <varlistentry>
-      <term>
-        <guilabel>Type</guilabel>
-      </term>
-      <listitem>
-        <para></para>
-      </listitem>
-    </varlistentry>
-    <varlistentry>
-      <term>
-        <guilabel>PIN</guilabel>
-      </term>
-      <listitem>
-        <para></para>
-      </listitem>
-    </varlistentry>
-  </variablelist>
-</section>
-<section
-  id="sec-Establishing_a_VPN_Connection">
-  <title>Establishing a VPN Connection</title>
-  <para></para>
-  <variablelist>
-    <varlistentry>
-      <term>
-        <guilabel>Gateway</guilabel>
-      </term>
-      <listitem>
-        <para></para>
-      </listitem>
-    </varlistentry>
-    <varlistentry>
-      <term>
-        <guilabel>Group name</guilabel>
-      </term>
-      <listitem>
-        <para></para>
-      </listitem>
-    </varlistentry>
-    <varlistentry>
-      <term>
-        <guilabel>User password</guilabel>
-      </term>
-      <listitem>
-        <para></para>
-      </listitem>
-    </varlistentry>
-    <varlistentry>
-      <term>
-        <guilabel>Group password</guilabel>
-      </term>
-      <listitem>
-        <para></para>
-      </listitem>
-    </varlistentry>
-    <varlistentry>
-      <term>
-        <guilabel>User name</guilabel>
-      </term>
-      <listitem>
-        <para></para>
-      </listitem>
-    </varlistentry>
-    <varlistentry>
-      <term>
-        <guilabel>Domain</guilabel>
-      </term>
-      <listitem>
-        <para></para>
-      </listitem>
-    </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-Establishing_a_DSL_Connection">
-  <title>Establishing a DSL Connection</title>
-  <para></para>
-  <variablelist>
-    <varlistentry>
-      <term>
-        <guilabel>Username</guilabel>
-      </term>
-      <listitem>
-        <para></para>
-      </listitem>
-    </varlistentry>
-    <varlistentry>
-      <term>
-        <guilabel>Service</guilabel>
-      </term>
-      <listitem>
-        <para></para>
-      </listitem>
-    </varlistentry>
-    <varlistentry>
-      <term>
-        <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>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>
-      </term>
-      <listitem>
-        <para></para>
-      </listitem>
-    </varlistentry>
-    <varlistentry>
-      <term>
-        <guilabel>Use this connection only for resources on its network</guilabel>
-      </term>
-      <listitem>
-        <para></para>
-      </listitem>
-    </varlistentry>
-  </variablelist>
-</section>
-</section>
-<section
-id="sec-Configuring_Connection_Settings">
-<title>Configuring Connection Settings</title>
-<section
-  id="sec-Configuring_802.1x_Security">
-  <title>Configuring 802.1x Security</title>
-  <para>802.1x security is the name of the IEEE standard for 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-Configuring_New_and_Editing_Existing_Connections"/>) 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>
+            <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>
+          </listitem>
+        </varlistentry>
         <varlistentry>
           <term>
-            <guilabel>Authentication</guilabel>
+            <guilabel>MTU</guilabel>
           </term>
           <listitem>
-            <para>
-              <guimenuitem>TLS</guimenuitem> — (Transport Layer Security) </para>
-            <para>
-              <guimenuitem>Tunneled TLS</guimenuitem> — </para>
-            <para>
-              <guimenuitem>Protected EAP (PEAP)</guimenuitem> — </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.-->	If set to a non-zero number, only packets of the specified size or smaller will be transmitted. Larger packets are broken up into multiple Ethernet frames. It is recommended to leave this setting on <guimenuitem>automatic</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>
+      </variablelist>
+      <bridgehead
+        id="bh-Saving_Your_New_or_Modified_Connection_and_Making_Further_Configurations-wireless">Saving Your New (or Modified) Connection and Making Further Configurations</bridgehead>
+      <para>Once you have finished editing the wireless connection, click the <guibutton>Apply</guibutton> button and <application>NetworkManager</application> will immediately save your customized configuration. Given a correct configuration, you can successfully connect to your the modified connection by selecting it from the <application>NetworkManager</application> Notification Area applet. See <xref
+          linkend="sec-Connecting_to_a_Network"/> for details on selecting and connecting to a network.</para>
+      <para>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.</para>
+      <para>Then, to configure:</para>
+      <itemizedlist>
         <listitem>
-          <para></para>
+          <para>security authentication for the wireless connection, click the <guilabel>Wireless Security</guilabel> tab and proceed to <xref
+              linkend="sec-Configuring_Wireless_Security"/>;</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>
+          <para>IPv4 settings for the connection, click the <guilabel>IPv4 Settings</guilabel> tab and proceed to <xref
+              linkend="sec-Configuring_IPv4_Settings"/>; or,
+          </para>
         </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>
-          <guilabel>CA certificate</guilabel>
-        </term>
         <listitem>
-          <para></para>
+          <para>IPv6 settings for the connection, click the <guilabel>IPv6 Settings</guilabel> tab and proceed to <xref
+              linkend="sec-Configuring_IPv6_Settings"/>.
+          </para>
         </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>
-          <guilabel>Inner authentication</guilabel>
-        </term>
+      </itemizedlist>
+    </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-Configuring_New_and_Editing_Existing_Connections"/>.</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-mobile_broadband">Configuring the Connection Name, Auto-Connect Behavior, and Availability Settings</bridgehead>
+      <para>Three settings in the <guilabel>Editing</guilabel> dialog are common to all connection types:</para>
+      <itemizedlist>
         <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>
+            <guilabel>Connection name</guilabel> — You can customize the name under which this connection is listed in the <guilabel>tab</guilabel> tab of the <guilabel>Network Connections</guilabel> window by entering a descriptive name in the text-entry box.</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>
+          <para>
+            <guilabel>Connect automatically</guilabel> — Check this box if you want <application>NetworkManager</application> to auto-connect to the this connection when it is—or becomes—available. Refer to <xref
+              linkend="sec-Connecting_to_a_Network_Automatically"/> for more information.</para>
         </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>
-          <guilabel>PEAP version</guilabel>
-        </term>
         <listitem>
-          <para></para>
+          <para>
+            <guilabel>Available to all users</guilabel> — check this box to create a connection available to all users on the system. Changing this setting may require root privileges. Refer to <xref
+              linkend="sec-User_and_System_Connections"/> for details.</para>
         </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>
-          <guilabel>Inner authentication</guilabel>
-        </term>
+      </itemizedlist>
+      <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-mobile_broadband">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 <replaceable>&lt;type&gt;</replaceable> connection. 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.</para>
+      <para>Then, to configure:</para>
+      <itemizedlist>
         <listitem>
-          <para>
-            <guimenuitem>MSCHAPv2</guimenuitem> — </para>
-          <para>
-            <guimenuitem>MD5</guimenuitem> — </para>
-          <para>
-            <guimenuitem>GTC</guimenuitem> — </para>
+          <para>;</para>
         </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>
-          <guilabel>Username</guilabel>
-        </term>
         <listitem>
-          <para></para>
+          <para>IPv4 settings for the connection, click the <guilabel>IPv4 Settings</guilabel> tab and proceed to <xref
+              linkend="sec-Configuring_IPv4_Settings"/>; or,
+          </para>
         </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>
-          <guilabel>Password</guilabel>
-        </term>
         <listitem>
-          <para></para>
+          <para>IPv6 settings for the connection, click the <guilabel>IPv6 Settings</guilabel> tab and proceed to <xref
+              linkend="sec-Configuring_IPv6_Settings"/>.
+          </para>
         </listitem>
-      </varlistentry>
-    </variablelist>
+      </itemizedlist>
+      <variablelist>
+        <varlistentry>
+          <term>
+            <guilabel>Number</guilabel>
+          </term>
+          <listitem>
+            <para></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>
+        <varlistentry>
+          <term>
+            <guilabel>APN</guilabel>
+          </term>
+          <listitem>
+            <para></para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>
+            <guilabel>Network ID</guilabel>
+          </term>
+          <listitem>
+            <para></para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>
+            <guilabel>Type</guilabel>
+          </term>
+          <listitem>
+            <para></para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>
+            <guilabel>PIN</guilabel>
+          </term>
+          <listitem>
+            <para></para>
+          </listitem>
+        </varlistentry>
+      </variablelist>
+    </section>
+    <section
+      id="sec-Establishing_a_VPN_Connection">
+      <title>Establishing a VPN 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-Configuring_New_and_Editing_Existing_Connections"/>.</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-vpn">Configuring the Connection Name, Auto-Connect Behavior, and Availability Settings</bridgehead>
+        <para>Three settings in the <guilabel>Editing</guilabel> dialog are common to all connection types:</para>
+        <itemizedlist>
+          <listitem>
+            <para>
+              <guilabel>Connection name</guilabel> — You can customize the name under which this connection is listed in the <guilabel>tab</guilabel> tab of the <guilabel>Network Connections</guilabel> window by entering a descriptive name in the text-entry box.</para>
+          </listitem>
+          <listitem>
+            <para>
+              <guilabel>Connect automatically</guilabel> — Check this box if you want <application>NetworkManager</application> to auto-connect to the this connection when it is—or becomes—available. Refer to <xref
+                linkend="sec-Connecting_to_a_Network_Automatically"/> for more information.</para>
+          </listitem>
+          <listitem>
+            <para>
+              <guilabel>Available to all users</guilabel> — check this box to create a connection available to all users on the system. Changing this setting may require root privileges. Refer to <xref
+                linkend="sec-User_and_System_Connections"/> for details.</para>
+          </listitem>
+        </itemizedlist>
+        <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-vpn">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 <replaceable>&lt;type&gt;</replaceable> connection. 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.</para>
+        <para>Then, to configure:</para>
+        <itemizedlist>
+          <listitem>
+            <para>;</para>
+          </listitem>
+          <listitem>
+            <para>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>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>Gateway</guilabel>
+          </term>
+          <listitem>
+            <para></para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>
+            <guilabel>Group name</guilabel>
+          </term>
+          <listitem>
+            <para></para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>
+            <guilabel>User password</guilabel>
+          </term>
+          <listitem>
+            <para></para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>
+            <guilabel>Group password</guilabel>
+          </term>
+          <listitem>
+            <para></para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>
+            <guilabel>User name</guilabel>
+          </term>
+          <listitem>
+            <para></para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>
+            <guilabel>Domain</guilabel>
+          </term>
+          <listitem>
+            <para></para>
+          </listitem>
+        </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-Establishing_a_DSL_Connection">
+      <title>Establishing a DSL Connection</title>
+      <para></para>
+      <variablelist>
+        <varlistentry>
+          <term>
+            <guilabel>Username</guilabel>
+          </term>
+          <listitem>
+            <para></para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>
+            <guilabel>Service</guilabel>
+          </term>
+          <listitem>
+            <para></para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>
+            <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>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>
+          </term>
+          <listitem>
+            <para></para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>
+            <guilabel>Use this connection only for resources on its network</guilabel>
+          </term>
+          <listitem>
+            <para></para>
+          </listitem>
+        </varlistentry>
+      </variablelist>
+    </section>
   </section>
-</section>
-<section
-  id="sec-Configuring_Wireless_Security">
-  <title>Configuring Wireless Security</title>
-  <variablelist>
-    <varlistentry>
-      <term>
-        <guilabel>Security</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_PPP_Point-to-Point_Settings">
-  <title>Configuring PPP (Point-to-Point) Settings</title>
-  <para></para>
-  <variablelist>
-    <varlistentry>
-      <term>
-        <guilabel>Configure Methods</guilabel>
-      </term>
-      <listitem>
-        <para></para>
-      </listitem>
-    </varlistentry>
-    <varlistentry>
-      <term>
-        <guilabel>Use point-to-point encryption (MPPE)</guilabel>
-      </term>
-      <listitem>
-        <para></para>
-      </listitem>
-    </varlistentry>
-    <varlistentry>
-      <term>
-        <guilabel>Allow BSD data compression</guilabel>
-      </term>
-      <listitem>
-        <para></para>
-      </listitem>
-    </varlistentry>
-    <varlistentry>
-      <term>
-        <guilabel>Allow Deflate data compression</guilabel>
-      </term>
-      <listitem>
-        <para></para>
-      </listitem>
-    </varlistentry>
-    <varlistentry>
-      <term>
-        <guilabel>Use TCP header compression</guilabel>
-      </term>
-      <listitem>
-        <para></para>
-      </listitem>
-    </varlistentry>
-    <varlistentry>
-      <term>
-        <guilabel>Send PPP echo packets</guilabel>
-      </term>
-      <listitem>
+  <section
+    id="sec-Configuring_Connection_Settings">
+    <title>Configuring Connection Settings</title>
+    <section
+      id="sec-Configuring_802.1x_Security">
+      <title>Configuring 802.1x Security</title>
+      <para>802.1x security is the name of the IEEE standard for 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-Configuring_New_and_Editing_Existing_Connections"/>) 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>Authentication</guilabel>
+          </term>
+          <listitem>
+            <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>
-      </listitem>
-    </varlistentry>
-  </variablelist>
-</section>
-<section
-  id="sec-Configuring_IPv4_Settings">
-  <title>Configuring IPv4 Settings</title>
-  <mediaobject
-    id="mediaobj-Network_Configuration-NM-IPv4_Settings">
-    <imageobject>
-      <imagedata
-        align="center"
-        fileref="images/Network_Configuration-NM-IPv4_Settings.png"
-        format="PNG" />
-    </imageobject>
-    <caption>
-      <para>Editing the IPv4 Settings Tab</para>
-    </caption>
-  </mediaobject>
-  <para>The <guilabel>IPv4 Settings</guilabel> tab allows you to configure the method by which you connect to the Internet and enter IP address, route, and DNS information as required. The <guilabel>IPv4 Settings</guilabel> tab is available when you create and modify one of the following connection types: wired, wireless, mobile broadband, VPN or DSL. If you need to configure IPv6 addresses, refer to ???. If you need to configure static routes, which can be done by clicking on the <guibutton>Routes</guibutton> button, refer to ???.</para>
-  <para>If you are using DHCP to obtain a dynamic IP address from a DHCP server, you can simply set <guilabel>Method</guilabel> to <guimenuitem>Automatic (DHCP)</guimenuitem>.</para>
-  <bridgehead
-    id="bh-Setting_the_Method">Setting the Method</bridgehead>
-  <variablelist
-    id="varlist-Available_IPv4_Methods_by_Connection_Type">
-    <title>Available IPv4 Methods by Connection Type</title>
-    <para>When you click the <guilabel>Method</guilabel> dropdown menu, depending on the type of connection you are configuring, you are able to select one of the following IPv4 connection methods. All of the methods are listed here according to which connection type or types they are associated with.</para>
-    <varlistentry>
-      <term>
-        <guilabel>Method</guilabel>
-      </term>
-      <listitem>
-        <para>
-          <guimenuitem>Automatic (DHCP)</guimenuitem> — Choose this option if the network you are connecting to uses a DHCP server to assign IP addresses. You do not need to fill in the <guilabel>DHCP client ID</guilabel> field.</para>
-        <para>
-          <guimenuitem>Automatic (DHCP) addresses only</guimenuitem> —</para>
-        <para>
-          <guimenuitem>Link-Local Only</guimenuitem> —</para>
-        <para>
-          <guimenuitem>Shared to other computers</guimenuitem> — </para>
-      </listitem>
-    </varlistentry>
-    <varlistentry>
-      <term>Wired, Wireless and DSL Connection Methods</term>
-      <listitem>
-        <para>
-          <guimenuitem>Manual</guimenuitem> — </para>
-      </listitem>
-    </varlistentry>
-    <varlistentry>
-      <term>Mobile Broadband Connection Methods</term>
-      <listitem>
-        <para>
-          <guimenuitem>Automatic (PPP)</guimenuitem> — </para>
-        <para>
-          <guimenuitem>Automatic (PPP) addresses only</guimenuitem> — </para>
-      </listitem>
-    </varlistentry>
-    <varlistentry>
-      <term>VPN Connection Methods</term>
-      <listitem>
-        <para>
-          <guimenuitem>Automatic (VPN)</guimenuitem> — </para>
-        <para>
-          <guimenuitem>Automatic (VPN) addresses only</guimenuitem> — </para>
-      </listitem>
-    </varlistentry>
-    <varlistentry>
-      <term>DSL Connection Methods</term>
-      <listitem>
-        <para>
-          <guimenuitem>Automatic (PPPoE)</guimenuitem> — </para>
-        <para>
-          <guimenuitem>Automatic (PPPoE) addresses only</guimenuitem> — </para>
-      </listitem>
-    </varlistentry>
-  </variablelist>
-</section>
-<section
-  id="sec-Configuring_IPv6_Settings">
-  <title>Configuring IPv6 Settings</title>
-  <variablelist>
-    <varlistentry>
-      <term>
-        <guilabel>Method</guilabel>
-      </term>
-      <listitem>
-        <para>
-          <guimenuitem>Ignore</guimenuitem> — </para>
-        <para>
-          <guimenuitem>Automatic</guimenuitem> — </para>
-        <para>
-          <guimenuitem>Automatic, addresses only</guimenuitem> — </para>
-        <para>
-          <guimenuitem>Manual</guimenuitem> — </para>
-        <para>
-          <guimenuitem>Link-Local Only</guimenuitem> — </para>
-        <para>
-          <guimenuitem>Shared to other computers</guimenuitem> — </para>
-      </listitem>
-    </varlistentry>
-    <varlistentry>
-      <term>
-        <guilabel>Addresses</guilabel>
-      </term>
-      <listitem>
-        <para>
-          <guimenuitem>DNS servers</guimenuitem> — </para>
-        <para>
-          <guimenuitem>Search domains</guimenuitem> — </para>
-      </listitem>
-    </varlistentry>
-  </variablelist>
+        <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>Security</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_PPP_Point-to-Point_Settings">
+      <title>Configuring PPP (Point-to-Point) Settings</title>
+      <para></para>
+      <variablelist>
+        <varlistentry>
+          <term>
+            <guilabel>Configure Methods</guilabel>
+          </term>
+          <listitem>
+            <para></para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>
+            <guilabel>Use point-to-point encryption (MPPE)</guilabel>
+          </term>
+          <listitem>
+            <para></para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>
+            <guilabel>Allow BSD data compression</guilabel>
+          </term>
+          <listitem>
+            <para></para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>
+            <guilabel>Allow Deflate data compression</guilabel>
+          </term>
+          <listitem>
+            <para></para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>
+            <guilabel>Use TCP header compression</guilabel>
+          </term>
+          <listitem>
+            <para></para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>
+            <guilabel>Send PPP echo packets</guilabel>
+          </term>
+          <listitem>
+            <para></para>
+          </listitem>
+        </varlistentry>
+      </variablelist>
+    </section>
+    <section
+      id="sec-Configuring_IPv4_Settings">
+      <title>Configuring IPv4 Settings</title>
+      <mediaobject
+        id="mediaobj-Network_Configuration-NM-IPv4_Settings">
+        <imageobject>
+          <imagedata
+            align="center"
+            fileref="images/Network_Configuration-NM-IPv4_Settings.png"
+            format="PNG" />
+        </imageobject>
+        <caption>
+          <para>Editing the IPv4 Settings Tab</para>
+        </caption>
+      </mediaobject>
+      <para>The <guilabel>IPv4 Settings</guilabel> tab allows you to configure the method by which you connect to the Internet and enter IP address, route, and DNS information as required. The <guilabel>IPv4 Settings</guilabel> tab is available when you create and modify one of the following connection types: wired, wireless, mobile broadband, VPN or DSL. If you need to configure IPv6 addresses, refer to ???. If you need to configure static routes, which can be done by clicking on the <guibutton>Routes</guibutton> button, refer to ???.</para>
+      <para>If you are using DHCP to obtain a dynamic IP address from a DHCP server, you can simply set <guilabel>Method</guilabel> to <guimenuitem>Automatic (DHCP)</guimenuitem>.</para>
+      <bridgehead
+        id="bh-Setting_the_Method">Setting the Method</bridgehead>
+      <variablelist
+        id="varlist-Available_IPv4_Methods_by_Connection_Type">
+        <title>Available IPv4 Methods by Connection Type</title>
+        <para>When you click the <guilabel>Method</guilabel> dropdown menu, depending on the type of connection you are configuring, you are able to select one of the following IPv4 connection methods. All of the methods are listed here according to which connection type or types they are associated with.</para>
+        <varlistentry>
+          <term>
+            <guilabel>Method</guilabel>
+          </term>
+          <listitem>
+            <para>
+              <guimenuitem>Automatic (DHCP)</guimenuitem> — Choose this option if the network you are connecting to uses a DHCP server to assign IP addresses. You do not need to fill in the <guilabel>DHCP client ID</guilabel> field.</para>
+            <para>
+              <guimenuitem>Automatic (DHCP) addresses only</guimenuitem> —</para>
+            <para>
+              <guimenuitem>Link-Local Only</guimenuitem> —</para>
+            <para>
+              <guimenuitem>Shared to other computers</guimenuitem> — </para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>Wired, Wireless and DSL Connection Methods</term>
+          <listitem>
+            <para>
+              <guimenuitem>Manual</guimenuitem> — </para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>Mobile Broadband Connection Methods</term>
+          <listitem>
+            <para>
+              <guimenuitem>Automatic (PPP)</guimenuitem> — </para>
+            <para>
+              <guimenuitem>Automatic (PPP) addresses only</guimenuitem> — </para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>VPN Connection Methods</term>
+          <listitem>
+            <para>
+              <guimenuitem>Automatic (VPN)</guimenuitem> — </para>
+            <para>
+              <guimenuitem>Automatic (VPN) addresses only</guimenuitem> — </para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>DSL Connection Methods</term>
+          <listitem>
+            <para>
+              <guimenuitem>Automatic (PPPoE)</guimenuitem> — </para>
+            <para>
+              <guimenuitem>Automatic (PPPoE) addresses only</guimenuitem> — </para>
+          </listitem>
+        </varlistentry>
+      </variablelist>
+    </section>
+    <section
+      id="sec-Configuring_IPv6_Settings">
+      <title>Configuring IPv6 Settings</title>
+      <variablelist>
+        <varlistentry>
+          <term>
+            <guilabel>Method</guilabel>
+          </term>
+          <listitem>
+            <para>
+              <guimenuitem>Ignore</guimenuitem> — </para>
+            <para>
+              <guimenuitem>Automatic</guimenuitem> — </para>
+            <para>
+              <guimenuitem>Automatic, addresses only</guimenuitem> — </para>
+            <para>
+              <guimenuitem>Manual</guimenuitem> — </para>
+            <para>
+              <guimenuitem>Link-Local Only</guimenuitem> — </para>
+            <para>
+              <guimenuitem>Shared to other computers</guimenuitem> — </para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>
+            <guilabel>Addresses</guilabel>
+          </term>
+          <listitem>
+            <para>
+              <guimenuitem>DNS servers</guimenuitem> — </para>
+            <para>
+              <guimenuitem>Search domains</guimenuitem> — </para>
+          </listitem>
+        </varlistentry>
+      </variablelist>
       <!--<para>For information on configuring static routes for the network connection, go to <xref
           linkend="sec-Configuring_Routes"/>.</para>-->
-</section>
-</section>
-<section
-id="sec-NetworkManager_Architecture">
-<title>NetworkManager Architecture</title>
-<para>See <ulink
-    url="http://live.gnome.org/NetworkManagerConfiguration"/>
-</para>
-</section>
+    </section>
+  </section>
+  <section
+    id="sec-NetworkManager_Architecture">
+    <title>NetworkManager Architecture</title>
+    <para>See <ulink
+        url="http://live.gnome.org/NetworkManagerConfiguration"/>
+    </para>
+  </section>
 </chapter>
 <!--<section
     id="sec-Configuring_IPv4_Settings">


More information about the docs-commits mailing list