commit 8e7fdd683a15f1f4faddda3c29e5db40ebd6e304
Author: Stephen Wadeley <swadeley(a)redhat.com>
Date: Tue Jun 18 00:03:47 2013 +0200
Updates for Fedora 18: Removing Screenshots, fixing text.
en-US/NetworkManager.xml | 76 ++++++++++++++++++++++++++++------------------
1 files changed, 46 insertions(+), 30 deletions(-)
---
diff --git a/en-US/NetworkManager.xml b/en-US/NetworkManager.xml
index c583b78..870390e 100644
--- a/en-US/NetworkManager.xml
+++ b/en-US/NetworkManager.xml
@@ -124,6 +124,7 @@ NetworkManager.service - Network Manager
<para>Finally, clicking on the <guilabel>Network
Settings</guilabel> menu entry opens the <guilabel>Network</guilabel>
window, from where you can view some basic network configuration information and initiate
configuration tasks.</para><!--<para>Note that the Network Connections
window can be opened by running, as a normal user:</para>
<screen>~]$ <command>nm-connection-editor
&</command>
</screen>-->
+ <!-- Removing as out of date for Fedora 18
<figure id="exam-Network_Configuration_NM_Network_Wired_Gnome3">
<title>Configure networks using the Network window</title>
<mediaobject
@@ -136,7 +137,7 @@ NetworkManager.service - Network Manager
</imageobject>
<textobject><para>A screen shot of NetworkManager's Network
window.</para></textobject>
</mediaobject>
- </figure>
+ </figure> -->
<para>Then, to configure:</para>
<itemizedlist>
<listitem>
@@ -178,17 +179,20 @@ NetworkManager.service - Network Manager
<step>
<para>Click <guilabel>Network
Settings</guilabel>.</para>
- <para>The <guilabel>Network </guilabel> window
appears.</para>
+ <para>The <guilabel>Network</guilabel> window
appears.</para>
</step>
<step>
<para>Select the type of connection from the left-hand-side
menu.</para>
</step>
<step>
- <para>Click on <guilabel>Configure</guilabel></para>
+ <para>Click on <guilabel>Options</guilabel>. The
<guilabel>Editing</guilabel> window appears.</para>
</step>
-
<step>
- <para>Select <guilabel>Connect automatically</guilabel> to
cause <application>NetworkManager</application> to auto-connect to the
connection whenever <application>NetworkManager</application> detects that it
is available. Unselect the checkbox if you do not want
<application>NetworkManager</application> to connect automatically. If the box
is unchecked, you will have to select that connection manually in the
<application>NetworkManager</application> applet's initial menu to cause
it to connect.</para>
+ <para>Click on the <guilabel>General</guilabel>
tab.</para>
+ </step>
+
+ <step>
+ <para>Select <guilabel>Automatically connect to this network when
it is available</guilabel> to cause
<application>NetworkManager</application> to auto-connect to the connection
whenever <application>NetworkManager</application> detects that it is
available. Unselect the checkbox if you do not want
<application>NetworkManager</application> to connect automatically. If the box
is unchecked, you will have to select that connection manually in the
<application>NetworkManager</application> applet's initial menu to cause
it to connect.</para>
</step>
</procedure>
</section>
@@ -207,6 +211,7 @@ NetworkManager.service - Network Manager
<para>System connections, on the other hand, become available at boot time
and can be used by other users on the system without first logging in to a desktop
session.</para>
<para>
<application>NetworkManager</application> can quickly and
conveniently convert user to system connections and vice versa. Converting a user
connection to a system connection causes
<application>NetworkManager</application> to create the relevant interface
configuration files under the
<filename>/etc/sysconfig/network-scripts/</filename> directory, and to delete
the GConf settings from the user's session. Conversely, converting a system to a
user-specific connection causes <application>NetworkManager</application> to
remove the system-wide configuration files and create the corresponding GConf/GNOME
keyring settings.</para>
+ <!-- Removing as out-of-date for Fedora 18
<figure id="exam-User_and_System_Connections">
<title>The <guilabel>Available to all users</guilabel> checkbox
controls whether connections are user-specific or system-wide</title>
<mediaobject
@@ -219,7 +224,7 @@ NetworkManager.service - Network Manager
</imageobject>
<textobject><para>A screen shot of the Available to all users
checkbox</para></textobject>
</mediaobject>
- </figure>
+ </figure> -->
<procedure
id="procedure-Changing_a_Connection_to_be_User-Specific_instead_of_System-Wide_or_Vice-Versa">
<title>Changing a Connection to be User-Specific instead of System-Wide, or
Vice-Versa</title>
@@ -235,12 +240,14 @@ NetworkManager.service - Network Manager
<para>Select the menu entry for the type of network connection you want
to configure.</para>
</step>
<step>
- <para>Select the <guilabel>Configure</guilabel>
button.</para>
+ <para>Select the <guilabel>Options</guilabel>
button.</para>
+ </step>
+ <step>
+ <para>Select the <guilabel>General</guilabel>
tab.</para>
</step>
-
<step>
- <para>Check the <guilabel>Available to all users</guilabel>
checkbox to ask <application>NetworkManager</application> to make the
connection a system-wide connection. Depending on system policy, you may then be prompted
for the root password by the <application>PolicyKit</application> application.
If so, enter the root password to finalize the change.</para>
- <para>Conversely, uncheck the <guilabel>Available to all
users</guilabel> checkbox to make the connection user-specific.</para>
+ <para>Check the <guilabel>All users may connect to this
network</guilabel> checkbox to ask
<application>NetworkManager</application> to make the connection a system-wide
connection. Depending on system policy, you may then be prompted for the root password by
the <application>PolicyKit</application> application. If so, enter the root
password to finalize the change.</para>
+ <para>Conversely, uncheck the <guilabel>All users may connect to
this network</guilabel> checkbox to make the connection user-specific.</para>
</step>
</procedure>
</section>
@@ -258,8 +265,9 @@ NetworkManager.service - Network Manager
</screen>
-->
<para>
- Select the <guilabel>Wired</guilabel> menu entry and then click
<guilabel>Configure</guilabel>.
- </para>
+ Select the <guilabel>Wired</guilabel> menu entry and then click
<guilabel>Options</guilabel>.
+ </para>
+ <!-- Removing as out-of-date for Fedora 18
<figure id="exam-Establishing_a_Wired_Ethernet_Connection">
<title>Editing the newly-created Wired connection 1</title>
<mediaobject
@@ -272,12 +280,12 @@ NetworkManager.service - Network Manager
</imageobject>
<textobject><para>A screen shot of Network Manager's Wired
tab</para></textobject>
</mediaobject>
- </figure>
- <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>
+ </figure> -->
+ <para>The system startup scripts create and configure a single wired
connection called <guilabel>em1</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 the default connection, creating a new wired
connection for your custom settings is recommended. You can create a new wired connection
by changing the connection name and clicking the <guibutton>Save</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>
+ <para>When you add a new connection by clicking the
<guibutton>Save</guibutton> button,
<application>NetworkManager</application> creates a new configuration file for
that connection and uses 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>Save</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>
@@ -285,17 +293,20 @@ NetworkManager.service - Network Manager
<itemizedlist>
<listitem>
<para>
- <guilabel>Connection name</guilabel> — Enter a descriptive name
for your network connection. This name will be used to list this connection in the
<guilabel>Wired</guilabel> tab of the <guilabel>Network
Connections</guilabel> window.
+ At the top of the window, above the tabs:
+ <guilabel>Connection name</guilabel> — Enter a descriptive name
for your network connection. This name will be used to list this connection in the
<guilabel>Network</guilabel> window.
</para>
</listitem>
<listitem>
<para>
- <guilabel>Connect automatically</guilabel> — Check this box if
you want <application>NetworkManager</application> to auto-connect to this
connection when it is available. Refer to <xref
+ On the <guilabel>General</guilabel> tab:
+ <guilabel>Automatically connect to this network when it is
available</guilabel> — Check this box if you want
<application>NetworkManager</application> to auto-connect to this connection
when it is 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
+ On the <guilabel>General</guilabel> tab:
+ <guilabel>All users may connect to this network</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>
@@ -421,7 +432,7 @@ NetworkManager.service - Network Manager
<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, click
<application>NetworkManager</application>'s applet icon and then click
<guilabel>Network Settings</guilabel>. The
<guilabel>Network</guilabel> window appears. Select the
<guilabel>Wireless</guilabel> menu entry and then click to the right of the
<guilabel>Network Name</guilabel> to activate the drop-down list. Select
<guilabel>Other</guilabel>. The <guilabel>Hidden wireless
network</guilabel> dialog window appears.</para>
+ <para>To connect to a hidden wireless network, click
<application>NetworkManager</application>'s applet icon and then click
<guilabel>Network Settings</guilabel>. The
<guilabel>Network</guilabel> window appears. Select the
<guilabel>Wireless</guilabel> menu entry and then the
<guilabel>Wireless</guilabel> connections are displayed. Select
<guilabel>Connect to a Hidden Network</guilabel>. The <guilabel>Hidden
Wi-Fi network</guilabel> dialog window appears.</para>
<figure id="exam-Establishing_a_Wireless_Connection_Wireless-Tab">
<title>Hidden wireless network dialog window</title>
<mediaobject
@@ -456,18 +467,20 @@ NetworkManager.service - Network Manager
<para>Click on the <application>NetworkManager</application>
applet icon in the Notification Area and click <guilabel>Network
Settings</guilabel>. The <guilabel>Network</guilabel> window
appears.</para>
</step>
<step>
- <para>Select the <guilabel>Wireless</guilabel> menu
entry.</para>
+ <para>Select the <guilabel>Wireless</guilabel> menu entry.
The list of available SSIDs appears</para>
+ </step>
+ <step>
+ <para>Select the SSID you want to connect to. You may be prompted for a
password or encryption keys.</para>
</step>
<step>
- <para>Click to the right of the <guilabel>Network
Name</guilabel> to activate the drop-down list.</para>
- </step>
- <step>
- <para>Select the SSID you want to connect to.</para>
+ <para>Click the arrow to the right of the SSID to configure the
connection. The <guilabel>Network</guilabel> window displays connection status
and essential information for the connection.</para>
</step>
<step>
- <para>Click the <guibutton>Configure</guibutton> button. The
editing a wireless connection window appears.</para>
+ <para>Select the <guilabel>Settings</guilabel> button. The
<guilabel>Editing</guilabel> window appears.</para>
</step>
- </procedure>
+
+ </procedure>
+ <!-- removing as not valid for Fedora 18
<figure id="exam-Network_Connections_Window_Wireless-Tab">
<title>Editing the newly-created Wireless connection</title>
<mediaobject
@@ -480,23 +493,26 @@ NetworkManager.service - Network Manager
</imageobject>
<textobject><para>A screen shot of the NetworkManager's editing a
wireless connection window. The Wireless tab has been selected on the
left.</para></textobject>
</mediaobject>
- </figure>
+ </figure> -->
<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> — Enter a descriptive name
for your network connection. This name will be used to list this connection in the
<guilabel>Wireless</guilabel> tab of the <guilabel>Network
Connections</guilabel> window. 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, as in the example
above, but it is recommended to retain the SSID name.</para>
+ At the top of the window, above the tabs:
+ <guilabel>Connection name</guilabel> — Enter a descriptive name
for your network connection. This name will be used to list this connection in the
<guilabel>Network</guilabel> window. 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, as
in the example above, 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 this
connection when it is available. Refer to <xref
+ On the <guilabel>General</guilabel> tab:
+ <guilabel>Automatically connect to this network when it is
available</guilabel> — Check this box if you want
<application>NetworkManager</application> to auto-connect to this connection
when it is 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
+ On the <guilabel>General</guilabel> tab:
+ <guilabel>All users may connect to this network</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>