Merge lp:~clissold345/ubuntu-docs/fixes-for-977251-and-1637126 into lp:~ubuntu-core-doc/ubuntu-docs/trunk2017-07-10

[Chris Perry]

I think the main thing is that net-wireless-edit-connection.html now corresponds much better to what the user sees on screen. I think I understand "Shared to other computers" and I've documented it very briefly.

I had a quick look at many of the other "wireless" pages and made some minor changes. For example, some pages were impacted by changes to the names of menu options (again "Wireless" changed to "Wi-Fi"). I also made some minor formatting changes.

One minor change worth mentioning may be that one of the "See also" links jumped into the middle of a page - it may be the only "See also" link that does that. It looked strange to me because it didn't have a summary line, so I changed it to link to the beginning of the page, and now it has a summary line.

[Gunnar Hjalmarsson (gunnarhj)]

Looks good to me; sensible consistency improvements. Thanks!

review: Approve

=== modified file 'ubuntu-help/C/net-problem.page'
--- ubuntu-help/C/net-problem.page	2013-09-15 18:32:55 +0000
+++ ubuntu-help/C/net-problem.page	2016-10-30 10:40:57 +0000
@@ -10,7 +10,7 @@
 
     <desc>
       <link xref="net-wireless-troubleshooting">Troubleshooting wireless connections</link>,
-      <link xref="net-wireless-find">finding your wifi network</link>…
+      <link xref="net-wireless-find">finding your Wi-Fi network</link>…
         </desc>
 
     <credit type="author">
@@ -21,4 +21,4 @@
 
 <title>Network problems</title>
 
-</page>
\ No newline at end of file
+</page>

=== modified file 'ubuntu-help/C/net-wireless-airplane.page'
--- ubuntu-help/C/net-wireless-airplane.page	2013-09-15 18:32:55 +0000
+++ ubuntu-help/C/net-wireless-airplane.page	2016-10-30 10:40:57 +0000
@@ -1,7 +1,9 @@
 <page xmlns="http://projectmallard.org/1.0/"
       type="topic" style="task"
       id="net-wireless-airplane">
+
   <info>
+
     <link type="guide" xref="net-wireless"/>
     <link type="seealso" xref="bluetooth-turn-on-off"/>
 
@@ -17,18 +19,20 @@
       <name>Ubuntu Documentation Team</name>
     </credit>
 
-    <desc>Click the network menu on the menu bar and uncheck Enable Wireless.</desc>
+    <desc>Click the network menu on the menu bar and uncheck Enable Wi-Fi.</desc>
+
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+
   </info>
 
 <title>Turn off wireless (airplane mode)</title>
 
 <p>If you have your computer on an airplane (or some other area where wireless connections are not allowed), you should switch off your wireless. You may also want to switch off your wireless for other reasons (to save battery power, for example). To do this:</p>
 
-<p>To do this, click the <gui>network menu</gui> on the menu bar and uncheck <gui>Enable Wireless</gui>. This will turn off your wireless connection until you switch it back on again.</p>
-
-<p>To turn wireless back on, click the <gui>network menu</gui> on the menu bar and select <gui>Enable Wireless</gui> so that it has a checkmark in front of it.</p>
-
-<note style="tip"><p>Your laptop may still be broadcasting if you have not turned off <link xref="bluetooth-turn-on-off">Bluetooth</link>.</p></note>
-
-</page>
\ No newline at end of file
+<p>To do this, click the <gui>network menu</gui> on the menu bar and uncheck <gui>Enable Wi-Fi</gui>. This will turn off your wireless connection until you switch it back on again.</p>
+
+<p>To turn wireless back on, click the <gui>network menu</gui> on the menu bar and select <gui>Enable Wi-Fi</gui> so that it has a checkmark in front of it.</p>
+
+<note style="tip"><p>Your computer may still be broadcasting if you have not turned off <link xref="bluetooth-turn-on-off">Bluetooth</link>.</p></note>
+
+</page>

=== modified file 'ubuntu-help/C/net-wireless-connect.page'
--- ubuntu-help/C/net-wireless-connect.page	2014-01-17 22:46:35 +0000
+++ ubuntu-help/C/net-wireless-connect.page	2016-10-30 10:40:57 +0000
@@ -32,7 +32,7 @@
    <p>If you have a wireless hardware switch on your computer, make sure that it is turned on.</p>
   </item>
   <item>
-    <p>Click the <gui>network menu</gui> in the <gui>menu bar</gui>, and click the name of the network you want to connect to.</p>
+    <p>Click the <gui>network menu</gui> in the menu 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, select <gui>More Networks</gui> to see if the network is further down the list. If you still don't see the network, 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>

=== modified file 'ubuntu-help/C/net-wireless-edit-connection.page'
--- ubuntu-help/C/net-wireless-edit-connection.page	2014-01-17 22:46:35 +0000
+++ ubuntu-help/C/net-wireless-edit-connection.page	2016-10-30 10:40:57 +0000
@@ -17,72 +17,85 @@
       <email>[e-mail]</email>
     </credit>
 
-    <desc>Learn what the options on the wireless connection editing screen mean.</desc>
+    <desc>Learn about the Wi-Fi connection settings.</desc>
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
     <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0"
                xmlns:xlink="http://www.w3.org/1999/xlink"
                xlink:type="simple" xlink:href="gnome-help.its"/>
   </info>
 
-<title>Edit a wireless connection</title>
+<title>Edit a Wi-Fi connection</title>
 
 <comment>
  <p>This topic needs significant revision to be comprehensive. A number of settings remain undocumented.</p>
 </comment>
 
-<p>This topic describes all of the options that are available when you edit
-a wireless network connection. To edit a connection, click the
-<gui>network menu</gui> in the menu bar and select <gui>Edit Connections</gui>.</p>
+<p>This topic describes many of the settings that are available when you edit
+a Wi-Fi connection. To edit a Wi-Fi connection, click the
+<gui>network menu</gui> in the menu bar and select <gui>Edit Connections</gui>, 
+then select the connection and click <gui>Edit</gui>.</p>
 
 <note>
  <p>Most networks will work fine if you leave these settings at their defaults, so you probably don't need to change any of them. Many of the options here are provided to give you greater control over more advanced networks.</p>
 </note>
 
 <section id="available">
- <title>Available to all users / Connect automatically</title>
+ <title>General</title>
  <terms>
   <item>
-   <title><gui>Connect automatically</gui></title>
+   <title><gui>Automatically connect to this network when it is available</gui></title>
    <p>Check this option if you would like the computer to try to connect to this wireless network whenever it is in range.</p>
-   <p>If several networks which are set to connect automatically are in range, the computer will connect to the first one shown in the <gui>Wireless</gui> tab in the <gui>Network Connections</gui> window. It won't disconnect from one available network to connect to a different one that has just come in range.</p>
+   <p>If several networks which are set to connect automatically are in range, the computer will connect to the first one shown in the <gui>Wi-Fi</gui> tab
+   in the <gui>Network Connections</gui> window. It won't disconnect from one available network to connect to a different one that has just come in range.</p>
   </item>
 
   <item>
-   <title><gui>Available to all users</gui></title>
-   <p>Check this if you would like all of the users on the computer to have access to this wireless network. If the network has a <link xref="net-wireless-wepwpa">WEP/WPA password</link> and you have checked this option, you will only need to enter the password once. All of the other users on your computer will be able to connect to the network without having to know the password themselves.</p>
-   <p>If this is checked, you need to be an <link xref="user-admin-explain">administrator</link> to change any of the settings for this network. You may be asked to enter your admin password.</p>
+   <title><gui>All users may connect to this network</gui></title>
+   <p>Check this option if you would like all users on the computer to have access to this wireless network.
+If the network has a <link xref="net-wireless-wepwpa">WEP/WPA password</link> and you have checked this option, you will only need to enter the password once.
+All of the other users on your computer will be able to connect to the network without having to know the password themselves.</p>
+   <p>If this option is checked, you need to be an <link xref="user-admin-explain">administrator</link> to change any of the settings for this network.
+You may be asked to enter your admin password.</p>
   </item>
  </terms>
 </section>
 
 <section id="wireless">
- <title>Wireless</title>
+ <title>Wi-Fi</title>
  <terms>
   <item>
    <title><gui>SSID</gui></title>
-   <p>This is the name of the wireless network you are connecting to, otherwise known as the <em>Service Set Identifier</em>. Don't change this unless you have changed the name of the wireless network (for example, by changing the settings of your wireless router or base station).</p>
+   <p>This is the name of the wireless network you are connecting to, otherwise known as the <em>Service Set Identifier</em>.
+Don't change this unless you have changed the name of the wireless network (for example,
+by changing the settings of your wireless router or base station).</p>
   </item>
 
   <item>
    <title><gui>Mode</gui></title>
-   <p>Use this to specify whether you are connecting to an <gui>Infrastructure</gui> network (one where computers wirelessly connect to a central base station or router) or an <gui>Ad-hoc</gui> network (where there is no base station, and the computers in the network connect to one another). Most networks are infrastructure ones; you may wish to <link xref="net-wireless-adhoc">set-up your own ad-hoc network</link> though.</p>
-   <p>If you choose <gui>Ad-hoc</gui>, you will see two other options, <gui>Band</gui> and <gui>Channel</gui>. These determine which wireless frequency band the ad-hoc wireless network will operate on. Some computers are only able to work on certain bands (for example, only <gui>A</gui> or only <gui>B/G</gui>), so you might want to pick a band that all of the computers in the ad-hoc network can use. In busy places, there might be several wireless networks sharing the same channel; this might slow-down your connection, so you can change which channel you are using too.</p>
+   <p>Use this to specify whether you are connecting to an <gui>Infrastructure</gui> network
+(one where computers wirelessly connect to a central base station or router) or an <gui>Ad-hoc</gui> network
+(where there is no base station, and the computers in the network connect to one another). Most networks are
+infrastructure ones; you may wish to <link xref="net-wireless-adhoc">set-up your own ad-hoc network</link> though.</p>
+
+   <p>If you choose <gui>Ad-hoc</gui>, you will see two other options, <gui>Band</gui> and <gui>Channel</gui>. These determine which Wi-Fi frequency band
+the ad-hoc network will operate on. Some computers are only able to work on certain bands (for example, only <gui>A</gui> or only <gui>B/G</gui>), so you might want to pick a band that all of the computers in the ad-hoc network can use. In busy places, there might be several wireless networks sharing the same channel;
+this might slow-down your connection, so you can change which channel you are using too.</p>
   </item>
 
   <item>
    <title><gui>BSSID</gui></title>
-   <p>This is the <em>Basic Service Set Identifier</em>. The SSID (see above) is the name of the network which humans are intended to read; the BSSID is a name which the computer understands (it's a string of letters and numbers that is supposed to be unique to the wireless network). If a <link xref="net-wireless-hidden">network is hidden</link>, it will not have an SSID but it will have a BSSID.</p>
+   <p>This is the <em>Basic Service Set Identifier</em>. The SSID (see above) is the name of the network which humans are intended to read; the BSSID is a name which the computer understands (it's a string of letters and numbers that is supposed to be unique to the network). If a <link xref="net-wireless-hidden">network is hidden</link>, it will not have an SSID but it will have a BSSID.</p>
   </item>
 
   <item>
-   <title><gui>Device MAC address</gui></title>
+   <title><gui>Device</gui></title>
    <p>A <link xref="net-macaddress">MAC address</link> is a code which identifies a piece of network hardware (for example, a wireless card, an Ethernet network card or a router). Every device that you can connect to a network has a unique MAC address which was given to it in the factory.</p>
    <p>This option can be used to change the MAC address of your network card.</p>
   </item>
 
   <item>
    <title><gui>Cloned MAC address</gui></title>
-   <p>Your network hardware (wireless card) can pretend to have a different MAC address. This is useful if you have a device or service which will only communicate with a certain MAC address (for example, a cable broadband modem). If you put that MAC address into the <gui>cloned MAC address</gui> box, the device/service will think that your computer has the cloned MAC address rather than its real one.</p>
+   <p>Your network hardware (in this case a wireless card) can pretend to have a different MAC address. This is useful if you have a device or service which will only communicate with a certain MAC address (for example, a cable broadband modem). If you put that MAC address into the <gui>cloned MAC address</gui> box, the device/service will think that your computer has the cloned MAC address rather than its real one.</p>
   </item>
 
   <item>
@@ -94,12 +107,12 @@
 </section>
 
 <section id="security">
- <title>Wireless Security</title>
+ <title>Wi-Fi Security</title>
  <terms>
   <item>
    <title><gui>Security</gui></title>
-   <p>This defines what sort of <em>encryption</em> your wireless network uses. Encrypted connections help protect your wireless connection from being intercepted, so other people can't "listen in" and see what websites you're visiting and so on.</p>
-   <p>Some types of encryption are stronger than others, but may not be supported by older wireless networking equipment. You'll normally need to type a password for the connection; more sophisticated types of security may also require a username and a digital "certificate". See <link xref="net-wireless-wepwpa" /> for more information on popular types of wireless encryption.</p>
+   <p>This defines what sort of <em>encryption</em> your wireless network uses. Encrypted connections help protect your Wi-Fi connection from being intercepted, so other people can't "listen in" and see what websites you're visiting and so on.</p>
+   <p>Some types of encryption are stronger than others, but may not be supported by older wireless networking equipment. You'll normally need to type a password for the connection; more sophisticated types of security may also require a username and a digital "certificate". See <link xref="net-wireless-wepwpa" /> for more information on popular types of Wi-Fi encryption.</p>
   </item>
  </terms>
 </section>
@@ -124,12 +137,12 @@
 
   <item>
    <title><gui>Automatic (DHCP) addresses only</gui></title>
-   <p>If you choose this setting, your computer will get its IP address from a DHCP server, but you will have to manually define other details (like which DNS server to use).</p>
+   <p>If you choose this method, your computer will get its IP address from a DHCP server, but you will have to manually define other details (like which DNS server to use).</p>
   </item>
 
   <item>
    <title><gui>Manual</gui></title>
-   <p>Choose this option if you would like to define all of the network settings yourself, including which IP address the computer should use.</p>
+   <p>Choose this method if you would like to define all of the network settings yourself, including which IP address the computer should use.</p>
   </item>
 
   <item>
@@ -138,8 +151,14 @@
   </item>
 
   <item>
+   <title><gui>Shared to other computers</gui></title>
+   <p>This method will allow other computers to use the connection.</p>
+  </item>
+
+
+  <item>
    <title><gui>Disabled</gui></title>
-   <p>This option will disable the network connection and prevent you from connecting to it. Note that <gui>IPv4</gui> and <gui>IPv6</gui> are treated as separate connections even though they are for the same network card. If you have one enabled, you may wish to set the other to disabled.</p>
+   <p>This method will disable the network connection and prevent your computer from using it. Note that <gui>IPv4</gui> and <gui>IPv6</gui> are treated as separate connections even though they are for the same network card. If you have one enabled, you may wish to set the other to disabled.</p>
   </item>
 
  </terms>
@@ -151,7 +170,7 @@
 <cite>shaunm</cite>
 <p>The list of methods is a bit different</p>
 </comment>
- <p>This is similar to the <gui>IPv4</gui> tab except it deals with the newer IPv6 standard. Very modern networks use IPv6, but IPv4 is still more popular at the moment.</p>
+ <p>This is similar to the <gui>IPv4 Settings</gui> tab except it deals with the newer IPv6 standard. Very modern networks use IPv6, but IPv4 is still more popular at the moment.</p>
 </section>
 
 </page>

=== modified file 'ubuntu-help/C/net-wireless-hidden.page'
--- ubuntu-help/C/net-wireless-hidden.page	2014-01-17 22:46:35 +0000
+++ ubuntu-help/C/net-wireless-hidden.page	2016-10-30 10:40:57 +0000
@@ -1,9 +1,10 @@
 <page xmlns="http://projectmallard.org/1.0/"
       type="topic" style="task"
       id="net-wireless-hidden">
+
   <info>
     <link type="guide" xref="net-wireless"/>
-    <link type="seealso" xref="net-wireless-edit-connection#wireless"/>
+    <link type="seealso" xref="net-wireless-edit-connection"/>
 
     <revision pkgversion="3.4.0" date="2012-02-19" status="outdated"/>
     <revision version="13.10" date="2013-09-15" status="review"/>
@@ -17,8 +18,10 @@
       <name>Ubuntu Documentation Team</name>
     </credit>
 
-    <desc>Click the <gui>network menu</gui> on the menu bar and select <gui>Connect to Hidden Wireless Network</gui>.</desc>
+    <desc>Click the network menu on the menu bar and select Connect to Hidden Wi-Fi Network.</desc>
+
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+
   </info>
 
 <title>Connect to a hidden wireless network</title>
@@ -27,7 +30,7 @@
 
 <steps>
  <item>
-  <p>Click the <gui>network menu</gui> on the menu bar and select <gui>Connect to Hidden Wireless Network</gui>.</p>
+  <p>Click the <gui>network menu</gui> on the menu bar and select <gui>Connect to Hidden Wi-Fi Network</gui>.</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>

=== modified file 'ubuntu-help/C/net-wireless.page'
--- ubuntu-help/C/net-wireless.page	2014-01-17 22:46:35 +0000
+++ ubuntu-help/C/net-wireless.page	2016-10-30 10:40:57 +0000
@@ -11,7 +11,7 @@
     <link type="seealso" xref="net-problem"/>
 
     <desc>
-      <link xref="net-wireless-connect">Connect to wifi</link>,
+      <link xref="net-wireless-connect">Connect to Wi-Fi</link>,
       <link xref="net-wireless-hidden">Hidden networks</link>,
       <link xref="net-wireless-edit-connection">Edit connection settings</link>,
       <link xref="net-wireless-disconnecting">Disconnecting</link>…