[gnome-user-docs] Total rewrite of net-adhoc, some updates to net pages



commit 33da011818acba99fdfebfb895a1086a46577710
Author: Shaun McCance <shaunm gnome org>
Date:   Mon Sep 26 23:00:02 2011 -0400

    Total rewrite of net-adhoc, some updates to net pages

 gnome-help/C/net-adhoc.page            |   94 +++++++++++---------------------
 gnome-help/C/net-proxy.page            |   12 ++++-
 gnome-help/C/net-wireless-connect.page |    7 ++-
 gnome-help/C/net-wireless-hidden.page  |    7 ++-
 gnome-help/C/net-wireless.page         |    5 ++
 5 files changed, 55 insertions(+), 70 deletions(-)
---
diff --git a/gnome-help/C/net-adhoc.page b/gnome-help/C/net-adhoc.page
index d3e3355..ff2760d 100644
--- a/gnome-help/C/net-adhoc.page
+++ b/gnome-help/C/net-adhoc.page
@@ -4,84 +4,52 @@
   <info>
     <link type="guide" xref="net-wireless"/>
 
+    <revision pkgversion="3.2" date="2011-09-26" status="review"/>
+
     <credit type="author">
       <name>Phil Bull</name>
       <email>philbull gmail com</email>
     </credit>
+    <credit type="author">
+      <name>Shaun McCance</name>
+      <email>shaunm gnome org</email>
+    </credit>
+
+    <desc>Use an ad-hoc network to allow other devices to connect to you
+    and your network connections.</desc>
 
-    <desc>You can connect computers together by forming an <em>ad-hoc</em> wireless network.</desc>
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
   </info>
 
-<title>Connect directly to another computer with a wireless connection</title>
+<title>Create a wireless hotspot</title>
 
-<comment>
- <cite>philbull gmail com</cite>
- <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>
+<p>You can use your computer as a wireless hotspot. This allows other devices to
+connect to you without a separate network, and allows you to share an internet
+connection you've made with another interface, such as to a wired network or
+over the cullular network.</p>
 
 <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>
+<cite date="2011-09-26">shaunm</cite>
+<p>Things I'm not sure about: Is this actually ad-hoc? It seems to use the
+same icon. What happens if you have multiple wireless adapters? Ought to be
+able to share wireless to wireless, I think, but I don't know what the UI
+looks like. Also, does any of this work? I couldn't successfully test.</p>
+<p>Also, looks like there's no page to set the device name. Make one, then
+link below where it says the name of the network is your device name.</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 the network icon on the top bar and select <gui>Network Settings</gui>.</p>
- </item>
-
- <item>
-  <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, 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>. 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>
-  <p>On the other computer, click the network icon on the top bar and look for a network with the SSID you chose. It might take a minute or two to appear in the list.</p>
-  <p>Click it to connect to the ad-hoc network. Once connected, you will be able to access network shares and so on, like you would if both computers were connected to a conventional wireless network.</p>
- </item>
+  <item><p>Click the network icon on the top bar and select <gui>Network Settings</gui>.</p></item>
+  <item><p>Select <gui>Wireless</gui> on the left.</p></item>
+  <item><p>Click the <gui>Use as Hotspot</gui> button.</p></item>
+  <item><p>If you are already connected to a wireless network, you will be asked
+  if you want to disconnect from that network. A single wireless adapter can only
+  connect to or create one network at a time. Click <gui>Create Hotspot</gui> to
+  confirm.</p></item>
 </steps>
 
-<p>These instructions will be different if one of the computers is not running Linux. You may find it easiest to set-up the ad-hoc network on the Linux computer and connect to it using the other computer.</p>
-
-<p>Also note that some wireless network cards do not support ad-hoc networking, so you will not be able to use them to create an ad-hoc network.</p>
-
-<section id="security">
- <title>Securing an ad-hoc network</title>
- <p>Anyone in the area will be able to connect to your ad-hoc network, so it's not very secure. You can add a <link xref="net-wireless-wepwpa">WEP/WPA password</link> to the network to protect it from unauthorized access.</p>
- 
- <p>To add a password:</p>
- 
- <steps>
-  <item>
-   <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>Configure</gui>.</p>
-  </item>
-  
-  <item>
-   <p>Go to the <gui>Wireless Security</gui> tab and change the <gui>Security</gui> from <gui>None</gui>. WPA is a good, secure choice, but some older wireless cards do not support it so you might have to use WEP instead.</p>
-  </item>
-  
-  <item>
-   <p>Choose your own password and then click <gui>Save</gui>. The other computers connected to the ad-hoc connection will have to reconnect and you'll have to enter the password on each of them.</p>
-  </item>
- </steps>
-</section>
+<p>A network name (SSID) and security key are automatically generated.
+The network name will be based on the name of your computer. Other devices
+will need this information to connect to the hotspot you've just created.</p>
 
 </page>
diff --git a/gnome-help/C/net-proxy.page b/gnome-help/C/net-proxy.page
index 615241b..ea86158 100644
--- a/gnome-help/C/net-proxy.page
+++ b/gnome-help/C/net-proxy.page
@@ -3,7 +3,8 @@
       id="net-proxy">
   <info>
     <link type="guide" xref="net-general"/>
-    
+
+    <revision pkgversion="3.2" date="2011-09-26" status="incomplete"/>    
 
     <credit type="author">
       <name>Phil Bull</name>
@@ -16,6 +17,15 @@
 
 <title>What is a proxy?</title>
 
+<comment>
+<cite date="2011-09-26">shaunm</cite>
+<p>We have <gui>Network proxy</gui> in the network system settings now.
+Repurpose this page as a task like "Set proxy settings". Maybe include
+snippets from below to explain what a proxy is, but be more concise and
+make it clear why a user would ever want to touch those settings, i.e.
+because they're in an environment that forces them to.</p>
+</comment>
+
 <p>A <em>web proxy</em> filters websites that you look at. They are commonly used in businesses and at public wireless hotspots to control what websites you can look at, prevent you from accessing the internet without logging-in, or to do security checks on websites.</p>
 
 <p>When you go to a website, the text and images on that website pass through the proxy first before reaching your computer. The proxy will scan the contents of the website and will decide whether to display it or whether to show you a different page, for example.</p>
diff --git a/gnome-help/C/net-wireless-connect.page b/gnome-help/C/net-wireless-connect.page
index 6932052..d766099 100644
--- a/gnome-help/C/net-wireless-connect.page
+++ b/gnome-help/C/net-wireless-connect.page
@@ -6,7 +6,8 @@
     <link type="seealso" xref="net-wireless-troubleshooting"/>
     <link type="seealso" xref="net-passwordok-noconnect"/>
     <link type="seealso" xref="net-wireless-disconnecting"/>
-    
+
+    <revision pkgversion="3.2" date="2011-09-26" status="final"/>
 
     <credit type="author">
       <name>GNOME Documentation Project</name>
@@ -23,7 +24,7 @@
 
 <steps>
   <item>
-   <p>Click on the network icon in the top bar and click the name of the network you want to connect to.</p>
+   <p>Click on the network icon on the top bar and click the name of the network you want to connect to.</p>
    <p>If the name of the network isn't in the list, try clicking <gui>More</gui> to see if the network is further down the list. If you still don't see the it, you may be out of range or the network <link xref="net-wireless-hidden">might be hidden</link>.</p>
   </item>
   <item><p>If the network is protected by a password (<link xref="net-wireless-wepwpa">encryption key</link>), enter the password when prompted and click <gui>Connect</gui>.</p>
@@ -34,7 +35,7 @@
   </item>
 </steps>
 
-<p>If the connection is not successful, you <link xref="net-passwordok-noconnect">may be asked for your password again</link> or it might just tell you that the connection has been disconnected. There are a number of things that could have caused this to happen - you could have entered the wrong password, the wireless signal could be too weak, or your computer's wireless card might have a problem, for example. See <link xref="net-wireless-troubleshooting" /> for more help.</p>
+<p>If the connection is not successful, you <link xref="net-passwordok-noconnect">may be asked for your password again</link> or it might just tell you that the connection has been disconnected. There are a number of things that could have caused this to happen. You could have entered the wrong password, the wireless signal could be too weak, or your computer's wireless card might have a problem, for example. See <link xref="net-wireless-troubleshooting" /> for more help.</p>
 
 <p>A stronger connection to a wireless network does not necessarily mean that you have a faster internet connection, or that you will have faster download speeds. The wireless connection connects your computer to the <em>device which provides the internet connection</em> (like a router or modem), but the two connections are actually different, and so will run at different speeds.</p>
 
diff --git a/gnome-help/C/net-wireless-hidden.page b/gnome-help/C/net-wireless-hidden.page
index 9d224f2..eeaaeae 100644
--- a/gnome-help/C/net-wireless-hidden.page
+++ b/gnome-help/C/net-wireless-hidden.page
@@ -5,6 +5,7 @@
     <link type="guide" xref="net-wireless"/>
     <link type="seealso" xref="net-editcon#wireless"/>
     
+    <revision pkgversion="3.2" date="2011-09-26" status="final"/>
 
     <credit type="author">
       <name>GNOME Documentation Project</name>
@@ -30,13 +31,13 @@
   <p>Select <gui>Other</gui> from the <gui>Network Name</gui> drop-down list.</p>
  </item>
  <item>
-  <p>In the window that appears, type the network name, choose the type of wireless security and click <gui>Connect</gui>.</p>
+  <p>In the window that appears, type the network name, choose the type of wireless security, and click <gui>Connect</gui>.</p>
  </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> (Basic 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 or 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>
+<p>You should also check the wireless base station's security settings. Look for terms like WEP and WPA.</p>
 
 <note>
  <p>You may think that hiding your wireless network will improve security by preventing people who don't know about it from connecting. In practice, this is not the case; the network is slightly harder to find but it is still detectable.</p>
diff --git a/gnome-help/C/net-wireless.page b/gnome-help/C/net-wireless.page
index a21ab46..a5065e6 100644
--- a/gnome-help/C/net-wireless.page
+++ b/gnome-help/C/net-wireless.page
@@ -24,4 +24,9 @@
 
 <title>Wireless Networking</title>
 
+<comment>
+<cite date="2011-09-26">shaunm</cite>
+<p>Could use some organization</p>
+</comment>
+
 </page>



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]