[deployment-guide/comm-rel-14: 659/677] NetConf: remove some unfinished sections

Jaromir Hradilek jhradile at fedoraproject.org
Sun Nov 14 23:57:51 UTC 2010


commit 26594e45e4392fe80b29e64f4b5b291216e8ce50
Author: Douglas Silas <dhensley at redhat.com>
Date:   Tue Nov 9 18:07:03 2010 +0100

    NetConf: remove some unfinished sections

 en-US/Network_Configuration.xml | 1045 +--------------------------------------
 1 files changed, 2 insertions(+), 1043 deletions(-)
---
diff --git a/en-US/Network_Configuration.xml b/en-US/Network_Configuration.xml
index 9b69636..0b04b93 100644
--- a/en-US/Network_Configuration.xml
+++ b/en-US/Network_Configuration.xml
@@ -215,1052 +215,11 @@ NetworkManager (pid  1527) is running...
       </procedure>
     </section>
   </section>
-  <section
-    id="sec-Establishing_Connections">
-    <title>Establishing Connections</title>
-    <section
-      id="sec-Establishing_a_Wired_Ethernet_Connection">
-      <title>Establishing a Wired (Ethernet) Connection</title>
-      <para>To establish an Ethernet connection, you need a network interface card (an NIC), a network cable (usually a Cat-5 cable), and a network to connect to (usually the Internet, through a router).</para>
-      <para>You can configure a wired connection by opening the <guilabel>Network Connections</guilabel> window and selecting the <guilabel>Wired</guilabel> tab. For more information on opening the <guilabel>Network Connections</guilabel> window via <application>NetworkManager</application>'s Notification Area applet, or by running a shell command, refer to <xref
-          linkend="sec-Configuring_New_and_Editing_Existing_Connections"/>.</para>
-      <mediaobject
-        id="mediaobj-Network_Configuration-NM-Editing_Wired_Connection_1">
-        <imageobject>
-          <imagedata
-            align="center"
-            fileref="images/Network_Configuration-NM-Editing_Wired_Connection_1.png"
-            format="PNG" />
-        </imageobject>
-        <caption>
-          <para>Editing the newly-created Wired connection 1</para>
-        </caption>
-      </mediaobject>
-      <para>The system startup scripts create and configure a single wired connection called <guilabel>System eth0</guilabel> by default on all systems.<!--It is recommended not to <guibutton>Edit</guibutton> or <guibutton>Delete</guibutton> the default <guilabel>System eth0</guilabel> connection, and the functionality to do so may be disabled in &MAJOROS;.--> Although you can edit <guilabel>System eth0</guilabel>, creating a new wired connection for your custom settings is recommended. You can create a new wired connection by selecting the <guilabel>Wired</guilabel> tab and clicking the <guibutton>Add</guibutton> button.</para>
-      <note
-        id="note-The_dialog_for_adding_and_editing_connections_is_the_same">
-        <title>The dialog for adding and editing connections is the same</title>
-        <para>When you add a new connection by clicking the <guibutton>Add</guibutton> button, <application>NetworkManager</application> creates a new configuration file for that connection and then opens the same dialog that is used for editing an existing connection. There is no difference between these dialogs. In effect, you are always editing a connection; the difference only lies in whether that connection previously existed or was just created by <application>NetworkManager</application> when you clicked <guibutton>Add</guibutton>.</para>
-      </note>
-      <bridgehead
-        id="bh-Configuring_the_Connection_Name_Auto-Connect_Behavior_and_Availability_Settings-wired">Configuring the Connection Name, Auto-Connect Behavior, and Availability Settings</bridgehead>
-      <para>Three settings in the <guilabel>Editing</guilabel> dialog are common to 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>Wired</guilabel> tab of the <guilabel>Network Connections</guilabel> window by entering a descriptive name in the text-entry box. For example, you could create a wired connection with custom settings for the office called <replaceable>Wired Office</replaceable>.</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_Wired_Tab">Configuring the Wired Tab</bridgehead>
-      <para>The final two configurable settings are located within the <guilabel>Wired</guilabel> tab itself: the first is a text-entry field where you can specify a MAC (Media Access Control) address, and the second allows you to specify the MTU (Maximum Transmission Unit) value. Normally, you can leave the <guilabel>MAC address</guilabel> field blank and the <guilabel>MTU</guilabel> set to <userinput>automatic</userinput>. These defaults will suffice unless you are associating a wired connection with a second or specific NIC, or performing advanced networking. In such cases, refer to the following descriptions:</para>
-      <variablelist>
-        <varlistentry>
-          <term>
-            <guilabel>MAC Address</guilabel>
-          </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>
-1: lo: &lt;LOOPBACK,UP,LOWER_UP&gt; mtu 16436 qdisc noqueue state UNKNOWN
-    link/loopback 00:00:00:00:00:00 brd 00:00:00:00:00:00
-    inet 127.0.0.1/8 scope host lo
-    inet6 ::1/128 scope host
-       valid_lft forever preferred_lft forever
-2: eth0: &lt;BROADCAST,MULTICAST,UP,LOWER_UP&gt; mtu 1500 qdisc pfifo_fast state UNKNOWN qlen 1000
-    link/ether <emphasis>52:54:00:26:9e:f1</emphasis> brd ff:ff:ff:ff:ff:ff
-    inet 192.168.122.251/24 brd 192.168.122.255 scope global eth0
-    inet6 fe80::5054:ff:fe26:9ef1/64 scope link
-       valid_lft forever preferred_lft forever</screen>
-            <para>A single system can have one or more NICs installed on it. The <guilabel>MAC address</guilabel> field therefore allows you to associate a specific NIC with a specific connection (or connections). As mentioned, you can determine the MAC address using the <command>ip addr</command> command, and then copy and paste that value into the <guilabel>MAC address</guilabel> text-entry field.</para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>
-            <guilabel>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>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,
-          </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_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>
-      <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>
-            <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
-    inet6 ::1/128 scope host
-       valid_lft forever preferred_lft forever
-2: eth0: &lt;BROADCAST,MULTICAST,UP,LOWER_UP&gt; mtu 1500 qdisc pfifo_fast state UNKNOWN qlen 1000
-    link/ether 52:54:00:26:9e:f1 brd ff:ff:ff:ff:ff:ff
-    inet 192.168.122.251/24 brd 192.168.122.255 scope global eth0
-    inet6 fe80::5054:ff:fe26:9ef1/64 scope link
-       valid_lft forever preferred_lft forever
-3: wlan0: &lt;BROADCAST,MULTICAST,UP,LOWER_UP&gt; mtu 1500 qdisc mq state UP qlen 1000
-    link/ether <emphasis>00:1c:bf:02:f8:70</emphasis> brd ff:ff:ff:ff:ff:ff
-    inet 10.200.130.67/24 brd 10.200.130.255 scope global wlan0
-    inet6 fe80::21c:bfff:fe02:f870/64 scope link
-       valid_lft forever preferred_lft forever</screen>
-            <para>A single system could have one or more wireless network adapters connected to it. The <guilabel>MAC address</guilabel> field therefore allows you to associate a specific wireless adapter with a specific connection (or connections). As mentioned, you can determine the MAC address using the <command>ip addr</command> command, and then copy and paste that value into the <guilabel>MAC address</guilabel> text-entry field.</para>
-          </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>
-      <para>You can use <application>NetworkManager</application>'s mobile broadband connection abilities to connect to the following <firstterm>2G</firstterm> and <firstterm>3G</firstterm> services:</para>
-      <itemizedlist>
-        <listitem>
-          <para>2G — <firstterm>GPRS</firstterm> (<firstterm>General Packet Radio Service</firstterm>) or <firstterm>EDGE</firstterm> (<firstterm>Enhanced Data Rates for GSM Evolution</firstterm>)</para>
-        </listitem>
-        <listitem>
-          <para>3G — <firstterm>UMTS</firstterm> (<firstterm>Universal Mobile Telecommunications System</firstterm>) or <firstterm>HSPA</firstterm> (<firstterm>High Speed Packet Access</firstterm>)
-          </para>
-        </listitem>
-      </itemizedlist>
-      <para>Your computer must have a device capable of mobile broadband capability which the system has recognized in order to create the connection. Such a device may be built into your computer (as is the case on many notebooks and netbooks), or may be provided as external hardware (such as a PC card, USB or phone modem).</para>
-      <!--<bridgehead
-        id="bh-Adding_a_New_Mobile_Broadband_Connection">Adding a New Mobile Broadband Connection</bridgehead>-->
-      <procedure
-        id="procedure-Adding_a_New_Mobile_Broadband_Connection">
-        <title>Adding a New Mobile Broadband Connection</title>
-        <para>You can configure a mobile broadband connection by opening the <guilabel>Network Connections</guilabel> window and selecting the <guilabel>Mobile Broadband</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>
-        <step>
-          <para>Click the <guibutton>Add</guibutton> button to open the <guilabel>Set up a Mobile Broadband Connection</guilabel> assistant.</para>
-        </step>
-        <step>
-          <para>Under <guilabel>Create a connection for this mobile broadband device</guilabel>, choose the 2G- or 3G-capable device you want to use with the connection. If the dropdown menu is inactive, this indicates that the system was unable to detect a device capable of mobile broadband. In this case, click <guilabel>Cancel</guilabel>, ensure that you do have a mobile broadband-capable device attached to, and recognized by, the computer, and then retry this procedure.</para>
-        </step>
-        <step>
-          <para>TBD</para>
-        </step>
-      </procedure>
-      <procedure
-        id="procedure-Editing_an_Existing_Mobile_Broadband_Connection">
-        <title>Editing an Existing Mobile Broadband Connection</title>
-        <para>Follow these steps to edit an existing mobile broadband connection.</para>
-        <step>
-          <para>Open the <guilabel>Network Connections</guilabel> window and select the <guilabel>Mobile Broadband</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>
-        </step>
-        <step>
-          <para>Select the connection you wish to edit and click the <guilabel>Edit</guilabel> button.</para>
-        </step>
-        <step>
-          <para>Configure the connection name, auto-connect behavior, and availability settings.</para>
-          <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>Mobile Broadband</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>
-        </step>
-        <step>
-          <para>Edit the mobile broadband-specific settings by referring to <xref
-              linkend="bh-Configuring_the_Mobile_Broadband_Tab"/>.</para>
-        </step>
-        <step>
-          <para>Once you have finished editing your new mobile broadband 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 mobile broadband 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>Point-to-point settings for the connection, click the <guilabel>PPP Settings</guilabel> tab and proceed to <xref
-                  linkend="sec-Configuring_PPP_Point-to-Point_Settings"/>;</para>
-            </listitem>
-            <listitem>
-              <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>
-        <!--</step>
-        <step>
-          <para>Proceed to <xref
-              linkend="bh-Saving_Your_New_or_Modified_Connection_and_Making_Further_Configurations-mobile_broadband"/>.</para>
-        </step>-->
-        </step>
-      </procedure>
-      <bridgehead
-        id="bh-Configuring_the_Mobile_Broadband_Tab">Configuring the Mobile Broadband Tab</bridgehead>
-      <para>If you have already added a new mobile broadband connection using the assistant (refer to <xref
-          linkend="procedure-Adding_a_New_Mobile_Broadband_Connection"/> for instructions), you can edit the <guilabel>Mobile Broadband</guilabel> tab to disable roaming if home network is not available, assign a network ID, or instruct <application>NetworkManager</application> to prefer a certain technology (such as 3G or 2G) when using the connection.</para>
-      <variablelist>
-        <varlistentry>
-          <term>
-            <guilabel>Number</guilabel>
-          </term>
-          <listitem>
-          <!--Number to dial when establishing a PPP data session with the GSM-based mobile broadband network. In most cases, leave the number blank and a number selecting the APN specified in the 'apn' property will be used automatically when required.-->
-            <para>The number that is dialed to establish a PPP connection with the GSM-based mobile broadband network. You can usually leave this field blank and simply enter the <guilabel>APN</guilabel> instead.</para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>
-            <guilabel>Username</guilabel>
-          </term>
-          <listitem>
-            <para>Enter the username used to authenticate with the network. Some providers do not provide a username, or accept any username when connecting to the network.</para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>
-            <guilabel>Password</guilabel>
-          </term>
-          <listitem>
-            <para>Enter the password used to authenticate with the network. Some providers do not provide a password, or accept any password.</para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>
-            <guilabel>APN</guilabel>
-          </term>
-          <listitem>
-          <!--The GPRS Access Point Name specifying the APN used when establishing a data session with the GSM-based network. The APN often determines how the user will be billed for their network usage and whether the user has access to the Internet or just a provider-specific walled-garden, so it is important to use the correct APN for the user's mobile broadband plan.-->
-            <para>Enter the <firstterm>APN</firstterm> (<firstterm>Access Point Name</firstterm>) used to establish a connection with the GSM-based network. Entering the correct APN for a connection is important because it often determines:</para>
-            <itemizedlist>
-              <listitem>
-                <para>how the user is billed for their network usage; and/or</para>
-              </listitem>
-              <listitem>
-                <para>whether the user has access to the Internet or to an intranet or subnetwork.</para>
-              </listitem>
-            </itemizedlist>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>
-            <guilabel>Network ID</guilabel>
-          </term>
-          <listitem>
-            <!--The Network ID (GSM LAI format, ie MCC-MNC) to force specific network registration. If the Network ID is specified, NetworkManager will attempt to force the device to register only on the specified network. This can be used to ensure that the device does not roam when direct roaming control of the device is not otherwise possible.-->
-            <para>Entering a <guilabel>Network ID</guilabel> causes <application>NetworkManager</application> to force the device to register only on a specific network. This can be used to ensure the connection does not roam when it is not possible to control roaming directly.</para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>
-            <guilabel>Type</guilabel>
-          </term>
-          <listitem>
-            	<!--Network preference to force the device to only use specific network technologies. The permitted values are: -1: any, 0: 3G only, 1: GPRS/EDGE only, 2: prefer 3G, and 3: prefer 2G. Note that not all devices allow network preference control.-->
-            <para>
-              <guilabel>Any</guilabel> — The default value of <guilabel>Any</guilabel> allows <application>NetworkManager</application>
-              <remark>TBD6: What is Any's behavior? Fastest to slowest? Is it therefore different from "Prefer 3G"?</remark>.
-              </para>
-            <para>
-              <guilabel>3G (UMTS/HSPA)</guilabel> — Force the connection to use only 3G network technologies.</para>
-            <para>
-              <guilabel>2G (GPRS/EDGE)</guilabel> — Force the connection to use only 2G network technologies.</para>
-            <para>
-              <guilabel>Prefer 3G (UMTS/HSPA)</guilabel> — First attempt to connect using a 3G technology such as HSPA or UMTS, and fall back to GPRS or EDGE only upon failure.</para>
-            <para>
-              <guilabel>Prefer 2G (GPRS/EDGE)</guilabel> — First attempt to connect using a 2G technology such as GPRS or EDGE, and fall back to HSPA or UMTS only upon failure.</para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>
-            <guilabel>Allow roaming if home network is not available</guilabel>
-          </term>
-          <listitem>
-            <!--see: "Avoiding the Roaming Shaft" at http://blogs.gnome.org/dcbw/2010/04/22/qualified-to-satisfy-you/-->
-            <para>Uncheck this box if you want <application>NetworkManager</application> to terminate the connection if you transition from the home network to a roaming one, thereby avoiding possible roaming charges. If the box is checked, <application>NetworkManager</application> will maintain the connection when it transitions from the home network to a roaming one, and vice versa.</para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>
-            <guilabel>PIN</guilabel>
-          </term>
-          <listitem>
-            <!--If the SIM is locked with a PIN it must be unlocked before any other operations are requested. Specify the PIN here to allow operation of the device.-->
-            <para>If your device's <firstterm>SIM</firstterm> (<firstterm>Subscriber Identity Module</firstterm>) is locked with a <firstterm>PIN</firstterm> (<firstterm>Personal Identification Number</firstterm>), enter the PIN so that <application>NetworkManager</application> can unlock the device. <application>NetworkManager</application> must unlock the SIM if it requires a PIN in order to use the device for any purpose.</para>
-          </listitem>
-        </varlistentry>
-      </variablelist>
-    </section>
-    <section
-      id="sec-Establishing_a_VPN_Connection">
-      <title>Establishing a VPN Connection</title>
-      <!--silas: introductiory info adapted from the RHEL6 Security Guide:
-      http://documentation-stage.bne.redhat.com/docs/en-US/Red_Hat_Enterprise_Linux/6/html/Security_Guide/sect-Security_Guide-Virtual_Private_Networks_VPNs.html-->
-      <para>Connecting to a Virtual Private Network (VPN) enables you to communicate securely between your Local Area Network (LAN), and another, remote LAN. After successfully establishing a VPN connection, a VPN router or gateway performs the following actions upon the packets you transmit:</para>
-      <orderedlist>
-        <listitem>
-          <para>it adds an <firstterm>Authentication Header</firstterm> for routing and authentication purposes;</para>
-        </listitem>
-        <listitem>
-          <para>it encrypts the packet data; and,</para>
-        </listitem>
-        <listitem>
-          <para>it encloses the data with an Encapsulating Security Payload (ESP), which constitutes the decryption and handling instructions.</para>
-        </listitem>
-      </orderedlist>
-      <para>The receiving VPN router strips the header information, decrypts the data, and routes it to its intended destination (either a workstation or other node on a network). Using a network-to-network connection, the receiving node on the local network receives the packets already decrypted and ready for processing. The encryption/decryption process in a network-to-network VPN connection is therefore transparent to clients.</para>
-      <para>Because they employ several layers of authentication and encryption, VPNs are a secure and effective means of connecting multiple remote nodes to act as a unified intranet. </para>
-      <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>
-      <procedure
-        id="procedure-Adding_a_New_VPN_Connection">
-        <title>Adding a New VPN Connection</title>
-        <para>You can configure a new VPN connection by opening the <guilabel>Network Connections</guilabel> window and selecting the <guilabel>VPN</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>
-        <step>
-          <para>Click the <guibutton>Add</guibutton> button to open the <guilabel>Choose a VPN Connection Type</guilabel> assistant.</para>
-        </step>
-        <step
-          id="Network_Configuration-VPN-step2">
-          <para>Select the type of VPN you are connecting to from the dropdown menu. Here are descriptions of the three VPN types:</para>
-          <para>Cisco Compatible VPN (vpnc) — </para>
-          <para>OpenVPN — </para>
-          <para>Point-to-Point Tunneling Protocol (pptp) — </para>
-          <para>After selecting the correct one, press the <guibutton>Create...</guibutton> button.</para>
-        </step>
-        <step>
-          <para>The <guilabel>Editing VPN Connection <replaceable>1</replaceable>
-            </guilabel> window then appears. This window presents settings customized for the type of VPN connection you selected in <xref
-              linkend="Network_Configuration-VPN-step2"/>.</para>
-        </step>
-      </procedure>
-      <para>You can configure a VPN connection by opening the <guilabel>Network Connections</guilabel> window and selecting the <guilabel>VPN</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 VPN connection; caption: Editing the newly-created VPN 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 VPN 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 VPN 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
     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 EAP-TLS authentication method is very strong, but also more complicated to set up. Using TLS security requires the overhead of a public key infrastructure (PKI) to manage certificates. The benefit to TLS security is that a compromised password does not allow access to the (W)LAN: an intruder must also have access to the authenticating client's private key.</para>
-        <variablelist>
-          <varlistentry>
-            <term>
-              <guilabel>Identity</guilabel>
-            </term>
-            <listitem>
-              <para></para>
-            </listitem>
-          </varlistentry>
-          <varlistentry>
-            <term>
-              <guilabel>User certificate</guilabel>
-            </term>
-            <listitem>
-              <para></para>
-            </listitem>
-          </varlistentry>
-          <varlistentry>
-            <term>
-              <guilabel>CA certificate</guilabel>
-            </term>
-            <listitem>
-              <para></para>
-            </listitem>
-          </varlistentry>
-          <varlistentry>
-            <term>
-              <guilabel>Private key</guilabel>
-            </term>
-            <listitem>
-              <para></para>
-            </listitem>
-          </varlistentry>
-          <varlistentry>
-            <term>
-              <guilabel>Private key password</guilabel>
-            </term>
-            <listitem>
-              <para></para>
-            </listitem>
-          </varlistentry>
-        </variablelist>
-      </section>
-      <section
-        id="sec-Configuring_Tunneled_TLS_Settings">
-        <title>Configuring Tunneled TLS Settings</title>
-        <para></para>
-        <remark>Which version of TTLS does NM use? v0 or v1?</remark>
-        <variablelist>
-          <varlistentry>
-            <term>
-              <guilabel>Anonymous identity</guilabel>
-            </term>
-            <listitem>
-              <para></para>
-            </listitem>
-          </varlistentry>
-          <varlistentry>
-            <term>
-              <guilabel>CA certificate</guilabel>
-            </term>
-            <listitem>
-              <para></para>
-            </listitem>
-          </varlistentry>
-          <varlistentry>
-            <term>
-              <guilabel>Inner authentication</guilabel>
-            </term>
-            <listitem>
-              <para>
-                <guimenuitem>PAP</guimenuitem> — </para>
-              <para>
-                <guimenuitem>MSCHAP</guimenuitem> — </para>
-              <para>
-                <guimenuitem>MSCHAPv2</guimenuitem> — </para>
-              <para>
-                <guimenuitem>CHAP</guimenuitem> — </para>
-            </listitem>
-          </varlistentry>
-          <varlistentry>
-            <term>
-              <guilabel>Username</guilabel>
-            </term>
-            <listitem>
-              <para></para>
-            </listitem>
-          </varlistentry>
-          <varlistentry>
-            <term>
-              <guilabel>Password</guilabel>
-            </term>
-            <listitem>
-              <para></para>
-            </listitem>
-          </varlistentry>
-        </variablelist>
-      </section>
-      <section
-        id="sec-Configuring_Protected_EAP_PEAP_Settings">
-        <title>Configuring Protected EAP (PEAP) Settings</title>
-        <variablelist>
-          <varlistentry>
-            <term>
-              <guilabel>Anonymous Identity</guilabel>
-            </term>
-            <listitem>
-              <para></para>
-            </listitem>
-          </varlistentry>
-          <varlistentry>
-            <term>
-              <guilabel>CA certificate</guilabel>
-            </term>
-            <listitem>
-              <para></para>
-            </listitem>
-          </varlistentry>
-          <varlistentry>
-            <term>
-              <guilabel>PEAP version</guilabel>
-            </term>
-            <listitem>
-              <para></para>
-            </listitem>
-          </varlistentry>
-          <varlistentry>
-            <term>
-              <guilabel>Inner authentication</guilabel>
-            </term>
-            <listitem>
-              <para>
-                <guimenuitem>MSCHAPv2</guimenuitem> — </para>
-              <para>
-                <guimenuitem>MD5</guimenuitem> — </para>
-              <para>
-                <guimenuitem>GTC</guimenuitem> — </para>
-            </listitem>
-          </varlistentry>
-          <varlistentry>
-            <term>
-              <guilabel>Username</guilabel>
-            </term>
-            <listitem>
-              <para></para>
-            </listitem>
-          </varlistentry>
-          <varlistentry>
-            <term>
-              <guilabel>Password</guilabel>
-            </term>
-            <listitem>
-              <para></para>
-            </listitem>
-          </varlistentry>
-        </variablelist>
-      </section>
-    </section>
-    <section
-      id="sec-Configuring_Wireless_Security">
-      <title>Configuring Wireless Security</title>
-      <variablelist>
-        <varlistentry>
-          <term>
-            <guilabel>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
@@ -1275,7 +234,7 @@ NetworkManager (pid  1527) is running...
           <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>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 <xref linkend="sec-Configuring_IPv6_Settings"/>.<!-- If you need to configure static routes, which can be done by clicking on the <guibutton>Routes</guibutton> button, 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>


More information about the docs-commits mailing list