Merge lp:~clissold345/ubuntu-docs/minor-revisions-to-net-wirelss-adhoc into lp:~ubuntu-core-doc/ubuntu-docs/trunk2017-07-10

Proposed by Chris Perry
Status: Merged
Merged at revision: 570
Proposed branch: lp:~clissold345/ubuntu-docs/minor-revisions-to-net-wirelss-adhoc
Merge into: lp:~ubuntu-core-doc/ubuntu-docs/trunk2017-07-10
Diff against target: 44 lines (+13/-8)
1 file modified
ubuntu-help/C/net-wireless-adhoc.page (+13/-8)
To merge this branch: bzr merge lp:~clissold345/ubuntu-docs/minor-revisions-to-net-wirelss-adhoc
Reviewer Review Type Date Requested Status
Gunnar Hjalmarsson Approve
Review via email: mp+310636@code.launchpad.net

Description of the change

Checked using Ubuntu 16.04.

The only essential change was to change the name of the button in step 4.

The changes to the first paragraph mainly copy the text displayed in the dialog box when the user executes the steps. It's clearer if the desktop help and text in dialog box (more or less) agree.

I made a few other small changes. Eg I reminded the user that he/she can change the SSID and security key if they want to. They don't have to accept the generated values.

To post a comment you must log in.
Revision history for this message
Gunnar Hjalmarsson (gunnarhj) wrote :

Sounds good to me; please go ahead and push. Thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ubuntu-help/C/net-wireless-adhoc.page'
2--- ubuntu-help/C/net-wireless-adhoc.page 2014-01-17 22:46:35 +0000
3+++ ubuntu-help/C/net-wireless-adhoc.page 2016-11-11 11:10:45 +0000
4@@ -25,9 +25,8 @@
5 <title>Create a wireless hotspot</title>
6
7 <p>You can use your computer as a wireless hotspot. This allows other devices to
8-connect to you without a separate network, and allows you to share an internet
9-connection you've made with another interface, such as to a wired network or
10-over the cellular network.</p>
11+connect to your computer without a separate network. If your computer has a connection to the internet other than wireless,
12+you can use the wireless hotspot to share your internet connection with other devices.</p>
13
14 <comment>
15 <cite date="2012-02-19">shaunm</cite>
16@@ -40,17 +39,23 @@
17 </comment>
18
19 <steps>
20+
21 <item><p>Click the icon at the very right of the menu bar and select <gui>System Settings</gui>.</p></item>
22+
23 <item><p>Open <gui>Network</gui> and select <gui>Wireless</gui> on the left.</p></item>
24- <item><p>Click the <gui>Use as Hotspot</gui> button.</p></item>
25+
26+ <item><p>Click the <gui>Use as Hotspot...</gui> button.</p></item>
27+
28 <item><p>If you are already connected to a wireless network, you will be asked
29 if you want to disconnect from that network. A single wireless adapter can only
30- connect to or create one network at a time. Click <gui>Create Hotspot</gui> to
31+ connect to or create one network at a time. Click <gui>Turn On</gui> to
32 confirm.</p></item>
33+
34 </steps>
35
36-<p>A network name (SSID) and security key are automatically generated.
37-The network name will be based on the name of your computer. Other devices
38-will need this information to connect to the hotspot you've just created.</p>
39+<p>A wireless network name (SSID) and security key are automatically generated.
40+The SSID is based on the name of your computer. Other devices
41+will need the SSID and security key in order to connect to the hotspot you've just created.
42+If you wish to, you can change the SSID and security key.</p>
43
44 </page>

Subscribers

People subscribed via source and target branches