[user-guide] Replace 'Network Manager' with 'NetworkManager', in line with NetworkManager's own documentation.

Nathan Thomas nathant at fedoraproject.org
Sat Aug 13 12:57:22 UTC 2011


commit 9f4ed00d8d51c23c4f2b405aaa68ccd200d77b83
Author: Nathan Thomas <nathan at afternoondust.co.uk>
Date:   Sat Aug 13 14:56:26 2011 +0200

    Replace 'Network Manager' with 'NetworkManager', in line with NetworkManager's own documentation.

 en-US/Connecting_to_the_Internet.xml |   46 +++++++++++++++++-----------------
 1 files changed, 23 insertions(+), 23 deletions(-)
---
diff --git a/en-US/Connecting_to_the_Internet.xml b/en-US/Connecting_to_the_Internet.xml
index 3528d87..4e1fb8c 100644
--- a/en-US/Connecting_to_the_Internet.xml
+++ b/en-US/Connecting_to_the_Internet.xml
@@ -5,19 +5,19 @@
 <chapter id="chap-User_Guide-Connecting_to_the_Internet">
 	<title>Connecting to the Internet</title>
 	<section id="sect-User_Guide-Connecting_to_the_Internet-NM_Applet">
-		<title>The Network Manager Applet</title>
+		<title>The NetworkManager Applet</title>
 		<para>
-		<application>Network Manager</application>
+		<application>NetworkManager</application>
  has been the default network configuration application for the GNOME desktop since Fedora 11. This application can be used to configure a wide variety of network devices and connections that allow you to access the Internet. 
-<application>Network Manager</application>
+<application>NetworkManager</application>
  is used to configure all your network connections from wired to wireless network as well as xDSL, VPN, and mobile broadband with extend support for Bluetooth DUN.  
 And if you don't know about DNS, DHCP or pppoe, 
-<application>Network Manager</application> 
+<application>NetworkManager</application> 
  does it all for you. If you use your computer at home, and have an xDSL connection that is already working, you do not need to configure anything.  Just connect to the wired network.  
 With a wireless or broadband connection, the steps needed to setup them are simple and easy to do, just a few clicks and fill in your personal information.  
 		</para>
 	<para>
-	<application>Network Manager</application>
+	<application>NetworkManager</application>
 	 executes automatically when you start your session and it is visible in GNOME as the <application>nm-applet</application> icon on the top right of the desktop. 
 If you move the mouse over it, it shows the active connection. 
 	</para>
@@ -36,7 +36,7 @@ You can also <menuchoice> <guimenu>Enable Notifications</guimenu> </menuchoice>
 	<menuchoice> <guimenu>Connection Information</guimenu> </menuchoice>
 	or 
 	<menuchoice> <guimenu>Edit Connections...</guimenu> </menuchoice>
-	When editing connections, <application>Network Manager</application> opens in a new
+	When editing connections, <application>NetworkManager</application> opens in a new
  	window, in which you configure the network devices and connections.  
 	The <menuchoice> <guimenu>About</guimenu> </menuchoice> option 
  	provides information about the project and the people that created the application, with a link to the 
@@ -47,22 +47,22 @@ You can also <menuchoice> <guimenu>Enable Notifications</guimenu> </menuchoice>
 	Just like its GNOME counterpart, KDE provides an applet interface for NetworkManager, known as <application>KNetworkManager</application>. This application development was started by <ulink url="http://www.novell.com">Novell</ulink> and provides an integrated QT-based experience with similar usage and configuration as its GNOME counterpart, <application>nm-applet</application>. 
 	</para>
 <para>
-	For more information on <application>Network Manager</application> , you can refer to:
+	For more information on <application>NetworkManager</application> , you can refer to:
 </para>
 <itemizedlist>
 <listitem>
 <para>
-<ulink url="http://live.gnome.org/NetworkManager/">Network Manager Project Web-Site</ulink>
+<ulink url="http://live.gnome.org/NetworkManager/">NetworkManager Project Web-Site</ulink>
 </para>
 </listitem>
 <listitem>
 <para>
-<ulink url="http://live.gnome.org/DarrenAlbers/NetworkManagerFAQ">Network Manager FAQ</ulink>
+<ulink url="http://live.gnome.org/DarrenAlbers/NetworkManagerFAQ">NetworkManager FAQ</ulink>
 </para>
 </listitem>
 <listitem>
 <para>
-<ulink url="https://fedoraproject.org/wiki/NetworkManager_in_Fedora_13">Network Manager in Fedora 13</ulink> overview and interview with Dan Williams.
+<ulink url="https://fedoraproject.org/wiki/NetworkManager_in_Fedora_13">NetworkManager in Fedora 13</ulink> overview and interview with Dan Williams.
 </para>
 </listitem>
 <listitem>
@@ -76,10 +76,10 @@ You can also <menuchoice> <guimenu>Enable Notifications</guimenu> </menuchoice>
 </itemizedlist>
 </section>
 <section id="sect-User_Guide-Connecting_to_the_Internet-NM_window">
-<title>The Network Manager window</title>
+<title>The NetworkManager window</title>
 <para>
-	To access to the <application>Network Manager</application>
- window to setup your network devices and connections, right-click on the Network Manager applet icon then select <menuchoice><guimenu>Edit Connections...</guimenu></menuchoice>.
+	To access to the <application>NetworkManager</application>
+ window to setup your network devices and connections, right-click on the NetworkManager applet icon then select <menuchoice><guimenu>Edit Connections...</guimenu></menuchoice>.
 </para>
 <important>
 <title>Be root to save your configurations</title>
@@ -88,7 +88,7 @@ You can also <menuchoice> <guimenu>Enable Notifications</guimenu> </menuchoice>
 </para>
 </important>
 <para>
-	When editing, in the <application>Network Manager</application> window, you will find these items:
+	When editing, in the <application>NetworkManager</application> window, you will find these items:
 </para>
 <itemizedlist>
 <listitem>
@@ -101,7 +101,7 @@ You can also <menuchoice> <guimenu>Enable Notifications</guimenu> </menuchoice>
 <para>
 <guilabel>Connect automatically</guilabel>
 : If checked, 
-<application>Network Manager</application>
+<application>NetworkManager</application>
  will activate this connection when its network resources are available. If unchecked, the connection must be manually activated by you.
 </para>
 </listitem>
@@ -109,7 +109,7 @@ You can also <menuchoice> <guimenu>Enable Notifications</guimenu> </menuchoice>
 <para>
 <guilabel>Available to all users</guilabel>
 : If checked, 
-<application>Network Manager</application>
+<application>NetworkManager</application>
  gives all users access to this network connection.
 </para>
 </listitem>
@@ -207,14 +207,14 @@ The <guilabel>IPv6 Settings</guilabel> tab similarly allows the configuration of
 <para>
 <!-- copied & pasted from features 13 -->
 				Once your card is inserted, you can easily create a Mobile Broadband connection, as indicated below. For many mobile broadband cards, 
-<application>Network Manager</application>
+<application>NetworkManager</application>
  can visualize in the NM applet icon, cellular signal strength and technology, and listen for signal strength changes or poll modem-manager for such changes while connected. In this way, you are able to know when the device has a signal and if it is roaming or not.
 			
 	</para>
 	<para>
-	<application>Network Manager</application>
+	<application>NetworkManager</application>
  	uses the gnome-bluetooth plugin to help to configure your Mobile Broadband with the service provider. Also, if you have a Bluetooth adapter and a mobile phone (GPRS) that supports Bluetooth DUN, you can pair the phone with the computer, and let 
-	<application>Network Manager</application>
+	<application>NetworkManager</application>
  	recognize your mobile phone; at the end of the pairing process you'll see a screen with checkbox that says 
 	<menuchoice><guimenu>Access the Internet using your mobile phone</guimenu></menuchoice>. After checking that box, a progress indicator will appear and say 
 <menuchoice><guimenu>Detecting phone configuration</guimenu></menuchoice>. 
@@ -232,7 +232,7 @@ The <guilabel>IPv6 Settings</guilabel> tab similarly allows the configuration of
 <section id="sect-User_Guide-Connecting_to_the_Internet-Mobile_Broadband-New_Connection">
 	<title>Create a Mobile Broadband network connection</title>
 	<para>
-	Right-click on the <application>Network Manager</application> applet Icon and select 
+	Right-click on the <application>NetworkManager</application> applet Icon and select 
 	<menuchoice><guimenu>Edit Connections...</guimenu></menuchoice> then select the 
 	<guilabel>Mobile Broadband</guilabel> tab, and click on the <guilabel>Add</guilabel> button. 
 	A wizard will open that will assist you in the configuration and ask for information about your provider. Specifically, you should know:
@@ -500,16 +500,16 @@ For most providers, the <guilabel>Service</guilabel> entry should be left blank.
 </itemizedlist>
 </section>
 <section id="sect-User_Guide-Connecting_to_the_Internet-NM_CLI">
-<title>Network Manager in a CLI</title>
+<title>NetworkManager in a CLI</title>
 <para>
-For those users who prefer the command line, Fedora 13 introduced two new tools for managing networks with Network Manager at the command line.
+For those users who prefer the command line, Fedora 13 introduced two new tools for managing networks with NetworkManager at the command line.
 </para>
 <section id="sect-User_Guide-Connecting_to_the_Internet-nmcli">
 <title>nmcli</title>
 <para>
 <command>nmcli</command>
 , is the console command that makes 
-<application>Network Manager</application>
+<application>NetworkManager</application>
  available in a console. 
 <command>nmcli</command>
  has the following format: nmcli [OPTIONS] OBJECT { COMMAND | help }.


More information about the docs-commits mailing list