GNOME.org
 

[gnome-user-docs] Some updates to net pages

commit 97cc544d50dfa97a9d31fad31e7c1f604c82a6ba
Author: Jeremy Bicha <jbicha ubuntu com>
Date:   Mon Sep 5 12:16:50 2011 -0400

    Some updates to net pages
    
    Unfortunately, I was having problems with nm-connection-editor today
    so several of these workflows still need to be checked

 gnome-help/C/net-adhoc.page                       |   28 ++++++++++----------
 gnome-help/C/net-email-virus.page                 |    5 ++-
 gnome-help/C/net-firewall-ports.page              |    1 +
 gnome-help/C/net-fixed-ip-address.page            |    6 ++--
 gnome-help/C/net-install-flash.page               |    2 +-
 gnome-help/C/net-install-moonlight.page           |    4 +-
 gnome-help/C/net-manual.page                      |    8 +++---
 gnome-help/C/net-no-wireless-connection.page.stub |    4 +-
 gnome-help/C/net-vpn-connect.page                 |    8 ++++-
 gnome-help/C/net-wireless-airplane.page           |    6 ++--
 gnome-help/C/net-wireless-hidden.page             |   10 +++---
 gnome-help/C/net-wireless-wepwpa.page             |    2 +-
 12 files changed, 45 insertions(+), 39 deletions(-)
---
diff --git a/gnome-help/C/net-adhoc.page b/gnome-help/C/net-adhoc.page
index 8302816..d3e3355 100644
--- a/gnome-help/C/net-adhoc.page
+++ b/gnome-help/C/net-adhoc.page
@@ -20,33 +20,33 @@
  <p>These instructions are outdated - at the moment there doesn't seem to be a way to create a new wireless network that you can then change to being Ad-Hoc. You used to be able to do this. This becomes an issue at step 3 in the steps list below.</p>
 </comment>
 
+<comment>
+ <cite>jbicha ubuntu com</cite>
+ <p>This definitely needs review. nm-connection-editor was not cooperating for me today but I think this comes closer to working. I think we should also integrate the security part into the main instructions.</p>
+</comment>
+
 <p>You can connect computers together by forming an <em>ad-hoc</em> wireless network. This is useful if one of the computers has a printer connected to it that you want to share, or if you want to transfer files between them, for example. With a normal (<em>infrastructure</em>) wireless network, you would connect both computers to a network provided by wireless base station or router. If you don't have a base station, however, an ad-hoc network will still allow you to connect the computers to each other.</p>
 
 <p>To set-up an ad-hoc wireless network:</p>
 <steps>
  <item>
-  <p>On one of the computers, click your name on the top bar and select <gui>System Settings</gui>.</p>
- </item>
- 
- <item>
-  <p>Open <gui>Network</gui> and select <gui>Wireless</gui> from the list on the left.</p>
+  <p>On one of the computers, click the network icon on the top bar and select <gui>Network Settings</gui>.</p>
  </item>
- 
+
  <item>
-  <!-- FIXME: Problem with instructions here, Add button not available any more. -->
-  <p>Go to the <gui>Wireless</gui> tab and click <gui>Add</gui>.</p>
+  <p>Select <gui>Wireless</gui> from the list on the left and click <gui>Configure</gui>.</p>
  </item>
- 
+
  <item>
-  <p>In the window that appears, choose a name for the wireless network and then go to the <gui>Wireless</gui> tab.</p>
+  <p>In the window that appears, switch to the Wireless tab and click <gui>Add</gui>.</p>
  </item>
- 
+
  <item>
   <p>Choose an <gui>SSID</gui>. This is the name of the network that other people will be able to see.</p>
  </item>
  
  <item>
-  <p>Change the <gui>Mode</gui> to <gui>Ad-hoc</gui> and leave the other settings at their defaults. Click <gui>Save</gui>.</p>
+  <p>Change the <gui>Mode</gui> to <gui>Ad-hoc</gui>. You may also want to switch to the <gui>Wireless Security</gui> tab and set the security protocol. Click <gui>Save</gui>.</p>
  </item>
  
  <item>
@@ -67,11 +67,11 @@
  
  <steps>
   <item>
-   <p>Click the network icon on the top bar and click <gui>Edit Connections</gui>.</p>
+   <p>Click the network icon on the top bar and click <gui>Network Settings</gui>.</p>
   </item>
   
   <item>
-   <p>Go to the <gui>Wireless</gui> tab, select the ad-hoc wireless network and click <gui>Edit</gui>.</p>
+   <p>Go to the <gui>Wireless</gui> tab, select the ad-hoc wireless network and click <gui>Configure</gui>.</p>
   </item>
   
   <item>
diff --git a/gnome-help/C/net-email-virus.page b/gnome-help/C/net-email-virus.page
index 52142a9..fcd2113 100644
--- a/gnome-help/C/net-email-virus.page
+++ b/gnome-help/C/net-email-virus.page
@@ -3,6 +3,7 @@
       id="net-email-virus">
   <info>
     <link type="guide" xref="net-email"/>
+    <link type="guide" xref="net-security"/>
     <link type="seealso" xref="net-antivirus"/>
 
     
@@ -11,13 +12,13 @@
       <email>philbull gmail com</email>
     </credit>
 
-    <desc>Change the default email client by going to <gui>System Info</gui> in the <gui>System Settings</gui>.</desc>
+    <desc>Viruses are unlikely to infect your Linux computer but could infect other people you email.</desc>
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
   </info>
 
 <title>Do I need to scan my emails for viruses?</title>
 
-<p>Viruses are programs which causes problems if they manage to find their way onto your computer. A common way of them getting onto your computer is through email messages.</p>
+<p>Viruses are programs which cause problems if they manage to find their way onto your computer. A common way of them getting onto your computer is through email messages.</p>
 
 <p>Viruses which can affect computers running Linux are quite rare, so you are <link xref="net-antivirus">unlikely to get a virus through email or otherwise</link>. If you receive an email with a virus hidden in it, it will probably have no effect on your computer. As such, you probably don't need to scan your email for viruses.</p>
 
diff --git a/gnome-help/C/net-firewall-ports.page b/gnome-help/C/net-firewall-ports.page
index 41b4040..4473616 100644
--- a/gnome-help/C/net-firewall-ports.page
+++ b/gnome-help/C/net-firewall-ports.page
@@ -4,6 +4,7 @@
 
   <info>
     <link type="guide" xref="net-security"/>
+    <link type="seealso" xref="net-firewall-on-off"/>
     <desc>You need to specify the right network port to enable/disable network access for a program with your firewall.</desc>
     <credit type="author">
       <name>Paul W. Frields</name>
diff --git a/gnome-help/C/net-fixed-ip-address.page b/gnome-help/C/net-fixed-ip-address.page
index d559011..6f67de8 100644
--- a/gnome-help/C/net-fixed-ip-address.page
+++ b/gnome-help/C/net-fixed-ip-address.page
@@ -20,11 +20,11 @@
 
 <steps>
 <item><p>Click the <gui>network icon</gui> in the <gui>top bar</gui>, and select <gui>Network Settings</gui>.</p></item>
-<item><p>Select the network connection from the list (<gui>Wired</gui> or <gui>Wireless</gui>) and click <gui>Options</gui>.</p></item>
+<item><p>Select the network connection from the list (<gui>Wired</gui> or <gui>Wireless</gui>) and click <gui>Configure</gui>.</p></item>
 <item><p>Click on the <gui>IPv4 Settings</gui> tab and change the <gui>Method</gui> to <em>Manual</em>.</p></item>
 <item><p>If no connection information is listed in the <gui>Addresses</gui> list, or if you want to set up a new connection, click <gui>Add</gui>.</p></item>
-<item><p>Enter the <em>IP Address</em>, <em>Net Mask</em>, and <em>Gateway</em> information into the appropriate boxes. How you choose these will depend on your network set-up; there are specific rules governing which IP addresses and net masks are valid for a given network.</p></item>
-<item><p>If necessary, enter a <em>Domain Name Server</em> address into the <gui>DNS servers</gui> box. This is the IP address of a server which looks-up domain names; most corporate networks and internet providers have dedicated DNS servers.</p></item>
+<item><p>Enter the <em>IP Address</em>, <em>Netmask</em>, and <em>Gateway</em> information into the appropriate boxes. How you choose these will depend on your network setup; there are specific rules governing which IP addresses and netmasks are valid for a given network.</p></item>
+<item><p>If necessary, enter a <em>Domain Name Server</em> address into the <gui>DNS servers</gui> box. This is the IP address of a server which looks up domain names; most corporate networks and internet providers have dedicated DNS servers.</p></item>
 <item><p>Click <gui>Save</gui>. The network connection should now have a fixed IP address.</p></item>
 </steps>
 
diff --git a/gnome-help/C/net-install-flash.page b/gnome-help/C/net-install-flash.page
index 151939b..4c9adc2 100644
--- a/gnome-help/C/net-install-flash.page
+++ b/gnome-help/C/net-install-flash.page
@@ -54,7 +54,7 @@
 <section id="alternatives">
  <title>Open-source alternatives to Flash</title>
  <p>A handful of free, open-source alternatives to Flash are available. These tend to work better than the Flash plug-in in some ways (for example, by handling sound playback better), but worse in others (for example, by not being able to display some of the more complicated Flash pages on the web).</p>
- <p>You might like to try one of these out if you are dissatisfied with the Flash player, or would like to use as much open-source software as possible on your computer. Here are a few of the options:</p>
+ <p>You might like to try one of these if you are dissatisfied with the Flash player, or if you would like to use as much open-source software as possible on your computer. Here are a few of the options:</p>
  <list style="compact">
   <item><p>Gnash</p></item>
   <item><p>LightSpark</p></item>
diff --git a/gnome-help/C/net-install-moonlight.page b/gnome-help/C/net-install-moonlight.page
index b5c7f12..9fc959e 100644
--- a/gnome-help/C/net-install-moonlight.page
+++ b/gnome-help/C/net-install-moonlight.page
@@ -10,7 +10,7 @@
       <email>philbull gmail com</email>
     </credit>
 
-    <desc>Some website use Silverlight to display web pages. The Moonlight plug-in lets you view these pages.</desc>
+    <desc>Some websites use Silverlight to display web pages. The Moonlight plug-in lets you view these pages.</desc>
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
   </info>
 
@@ -29,6 +29,6 @@
 
 <p>Some Linux distributions have a copy of Moonlight that you can install using their software installer; just open the installer and search for <input>Silverlight</input> or <input>Moonlight</input>.</p>
 
-<p>If your distribution doesn't have a Moonlight software package, see the <link href="http://www.mono-project.com/Moonlight";>Moonlight website</link> for more information and installation instructions.</p>
+<p>If your distribution doesn't have a Moonlight software package, see the <link href="http://www.go-mono.com/moonlight/";>Moonlight website</link> for more information and installation instructions.</p>
 
 </page>
diff --git a/gnome-help/C/net-manual.page b/gnome-help/C/net-manual.page
index 8feec53..972b8ba 100644
--- a/gnome-help/C/net-manual.page
+++ b/gnome-help/C/net-manual.page
@@ -22,19 +22,19 @@
 
 <steps>
  <item>
-  <p>Click the network icon on the top bar and click <gui>Edit Connections</gui>.</p>
+  <p>Click the network icon on the top bar and click <gui>Network Settings</gui>.</p>
  </item>
  
  <item>
-  <p>Find the network connection that you want to set-up manually. For example, if you plug-in to the network with a cable, look at the <gui>Wired</gui> tab.</p>
+  <p>Find the network connection that you want to setup manually. For example, if you plug in to the network with a cable, look at the <gui>Wired</gui> tab.</p>
  </item>
  
  <item>
-  <p>Click the connection you want to edit to select it, then click <gui>Edit</gui>.</p>
+  <p>Click the connection you want to edit to select it, then click <gui>Configure</gui>.</p>
  </item>
  
  <item>
-  <p>Go to the <gui>IPv4 Settings</gui> tab and change the <gui>Method</gui> option to <gui>Manual</gui>.</p>
+  <p>Go to the <gui>IPv4 Settings</gui> tab and change the <gui>Method</gui> to <gui>Manual</gui>.</p>
  </item>
  
  <item>
diff --git a/gnome-help/C/net-no-wireless-connection.page.stub b/gnome-help/C/net-no-wireless-connection.page.stub
index 7796ae8..7b3dd66 100644
--- a/gnome-help/C/net-no-wireless-connection.page.stub
+++ b/gnome-help/C/net-no-wireless-connection.page.stub
@@ -2,8 +2,8 @@
       type="topic" style="problem"
       id="net-no-wireless-connection">
   <info>
-    <link type="guide" xref="net-problem"/>
-    <link type="guide" xref="net-wireless"/>
+    <link type="guide" xref="net#problem"/>
+    <link type="guide" xref="net#wireless"/>
     <revision pkgversion="3.0" date="2011-03-20" status="stub"/>
 
     <credit type="author">
diff --git a/gnome-help/C/net-vpn-connect.page b/gnome-help/C/net-vpn-connect.page
index 2beac78..7c826d9 100644
--- a/gnome-help/C/net-vpn-connect.page
+++ b/gnome-help/C/net-vpn-connect.page
@@ -29,8 +29,12 @@
 
 <steps>
  <item>
-  <p>Click the network icon on the top bar and, under <gui>VPN Connections</gui>, select <gui>Configure VPN</gui>.</p>
+  <p>Click the network icon on the top bar and select  <gui>Network Settings</gui>.</p>
  </item>
+
+ <item>
+  <p>In the list on the left, click the <gui>+</gui> button
+  to add a new connection.</p></item>
  
  <item>
   <p>Click <gui>Add</gui> and choose which kind of VPN connection you have.</p>
@@ -45,7 +49,7 @@
  </item>
  
  <item>
-  <p>Hopefully, you will successfully connect to the VPN. If not, you may need to double-check the VPN settings you entered. You can do this by clicking the network icon, clicking <gui>Edit Connections</gui> and going to the <gui>VPN</gui> tab.</p>
+  <p>Hopefully, you will successfully connect to the VPN. If not, you may need to double-check the VPN settings you entered. You can do this by clicking the network icon, clicking <gui>Network Settings</gui> and going to the <gui>VPN</gui> tab.</p>
  </item>
  
  <item>
diff --git a/gnome-help/C/net-wireless-airplane.page b/gnome-help/C/net-wireless-airplane.page
index d9b060b..260c5db 100644
--- a/gnome-help/C/net-wireless-airplane.page
+++ b/gnome-help/C/net-wireless-airplane.page
@@ -10,7 +10,7 @@
       <email>gnome-doc-list gnome org</email>
     </credit>
 
-    <desc>Open the Network settings and switch Airplane Mode to ON.</desc>
+    <desc>Open Network Settings and switch Airplane Mode to ON.</desc>
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
   </info>
 
@@ -20,10 +20,10 @@
 
 <steps>
  <item>
-  <p>Click your name on the top bar and select <gui>System Settings</gui>.</p>
+  <p>Click the network icon on the top bar and select <gui>Network Settings</gui>.</p>
  </item>
  <item>
-  <p>Open <gui>Network</gui> and switch <gui>Airplane Mode</gui> to <gui>ON</gui>. This will turn off your wireless connection until you switch off airplane mode again.</p>
+  <p>Switch <gui>Airplane Mode</gui> to <gui>ON</gui>. This will turn off your wireless connection until you switch off airplane mode again.</p>
  </item>
 </steps>
 
diff --git a/gnome-help/C/net-wireless-hidden.page b/gnome-help/C/net-wireless-hidden.page
index 6cfd01e..9d224f2 100644
--- a/gnome-help/C/net-wireless-hidden.page
+++ b/gnome-help/C/net-wireless-hidden.page
@@ -11,20 +11,20 @@
       <email>gnome-doc-list gnome org</email>
     </credit>
 
-    <desc>Click the network icon on the top bar and select <gui>Connect to Hidden Wireless Network</gui>.</desc>
+    <desc>Open <gui>Network Settings</gui> and connect to an <gui>Other</gui> wireless network.</desc>
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
   </info>
 
 <title>Connect to a hidden wireless network</title>
 
-<p>It is possible to set-up a wireless network so that it is "hidden" - that is, it won't show up in the list of networks which is displayed when you click the network icon on the top bar (or the list of wireless networks on any other computer). To connect to a hidden wireless network:</p>
+<p>It is possible to set up a wireless network so that it is "hidden." Hidden networks won't show up in the list of networks that are displayed when you click the network icon on the top bar (or the list of wireless networks on any other computer). To connect to a hidden wireless network:</p>
 
 <steps>
  <item>
-  <p>Click your name on the top bar and select <gui>System Settings</gui>.</p>
+  <p>Click the network icon on the top bar and select <gui>Network Settings</gui>.</p>
  </item>
  <item>
-  <p>Open <gui>Network</gui> and select <gui>Wireless</gui> from the list on the left.</p>
+  <p>Select <gui>Wireless</gui> from the list on the left.</p>
  </item>
  <item>
   <p>Select <gui>Other</gui> from the <gui>Network Name</gui> drop-down list.</p>
@@ -34,7 +34,7 @@
  </item>
 </steps>
 
-<p>You may have to check the settings of the wireless base station/router to see what the network name is. It is sometimes called the <em>BSSID</em> (Service Set Identifier), and looks something like this: <gui>02:00:01:02:03:04</gui>.</p>
+<p>You may have to check the settings of the wireless base station/router to see what the network name is. It is sometimes called the <em>BSSID</em> (Basic Service Set Identifier), and looks something like this: <gui>02:00:01:02:03:04</gui>.</p>
 
 <p>You should also check the wireless base station's security settings; look for terms like WEP and WPA.</p>
 
diff --git a/gnome-help/C/net-wireless-wepwpa.page b/gnome-help/C/net-wireless-wepwpa.page
index f012ee3..410132c 100644
--- a/gnome-help/C/net-wireless-wepwpa.page
+++ b/gnome-help/C/net-wireless-wepwpa.page
@@ -16,7 +16,7 @@
 
 <title>What do WEP and WPA mean?</title>
 
-<p>WEP and WPA (along with WPA2) are names for different encryption tools used to secure your wireless connection. Encryption scrambles the network connection so that no-one can "listen in" to it and look at which web pages you are viewing, for example. WEP stands for <em>Wired Equivalent Privacy</em>, and WPA stands for <em>Wireless Protected Access</em>. WPA2 is the second version of the WPA standard.</p>
+<p>WEP and WPA (along with WPA2) are names for different encryption tools used to secure your wireless connection. Encryption scrambles the network connection so that no one can "listen in" to it and look at which web pages you are viewing, for example. WEP stands for <em>Wired Equivalent Privacy</em>, and WPA stands for <em>Wireless Protected Access</em>. WPA2 is the second version of the WPA standard.</p>
 
 <p>Using <em>some</em> encryption is always better than using none, but WEP is the least secure of these standards, and you should not use it if you can avoid it. WPA2 is the most secure of the three. If your wireless card and router support WPA2, that is what you should use when setting up your wireless network.</p>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]