Ubuntu Documentation

Merge lp:~clissold345/ubuntu-docs/minor-revision-of-second-section into lp:~ubuntu-core-doc/ubuntu-docs/trunk2017-07-10

  1. minor-revision-of-second-section
  2. Merge into trunk2017-07-10
Proposed by Chris Perry
Status: Merged
Merged at revision: 574
Proposed branch: lp:~clissold345/ubuntu-docs/minor-revision-of-second-section
Merge into: lp:~ubuntu-core-doc/ubuntu-docs/trunk2017-07-10
Diff against target: 234 lines (+153/-32)
2 files modified
ubuntu-help/C/disk-check.page (+7/-7)
ubuntu-help/C/mouse-mousekeys.page (+146/-25)
To merge this branch: bzr merge lp:~clissold345/ubuntu-docs/minor-revision-of-second-section
Reviewer Review Type Date Requested Status
Gunnar Hjalmarsson Approve
Review via email: mp+313002@code.launchpad.net

Description of the change

The GUI changed in 16.04 (or earlier) so the second section needs some minor revisions. I like the terms "health check" and "status" (even though the GUI doesn't use them) so I've kept them. I think the second paragraph (though it doesn't say so) must be talking about the SMART Data & Self Tests screen. I think the text as I've revised it is clear enough now - though of course it doesn't attempt to describe the data displayed on the screen.

I haven't checked the first section of the page. Gunnar checked it and revised it earlier this year, so it will be fine.

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

This looks good too. 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/disk-check.page'
2--- ubuntu-help/C/disk-check.page 2016-05-07 17:30:28 +0000
3+++ ubuntu-help/C/disk-check.page 2016-12-12 10:09:27 +0000
4@@ -73,16 +73,16 @@
5
6 <title>What if the disk isn't healthy?</title>
7
8- <p>Even if the <gui>SMART Status</gui> indicates that the disk <em>isn't</em>
9- healthy, there may be no cause for alarm. However, it's better to be prepared
10+ <p>Even if the <gui>SMART Assessment</gui> indicates that the disk <em>isn't</em>
11+ entirely healthy, there may be no cause for alarm. However, it's better to be prepared
12 with a <link xref="backup-why">backup</link> to prevent data loss.</p>
13
14- <p>If the status says "Pre-fail", the disk is still reasonably healthy but
15- signs of wear have been detected which mean it might fail in the near future.
16- If your hard disk (or computer) is a few years old, you are likely to see
17- this message on at least some of the health checks. You should
18+ <p>If the status of one or more of the health checks is "Pre-Fail", the disk is still reasonably healthy but
19+ signs of wear have been detected, which mean the disk might fail in the near future.
20+ If your disk (or computer) is a few years old, you are likely to see
21+ this status on some of the health checks. You should
22 <link xref="backup-how">backup your important files regularly</link> and check
23- the disk status periodically to see if it gets worse.</p>
24+ the disk periodically to see if it gets worse.</p>
25
26 <p>If it gets worse, you may wish to take the computer/hard disk to a
27 professional for further diagnosis or repair.</p>
28
29=== modified file 'ubuntu-help/C/mouse-mousekeys.page'
30--- ubuntu-help/C/mouse-mousekeys.page 2013-09-15 00:45:58 +0000
31+++ ubuntu-help/C/mouse-mousekeys.page 2016-12-12 10:09:27 +0000
32@@ -34,11 +34,13 @@
33 control the mouse pointer using the numeric keypad on your keyboard. This
34 feature is called <em>mouse keys</em>.</p>
35
36+<p>To enable mouse keys using the keyboard:</p>
37+
38 <steps>
39 <item><p>Tap the <key><link xref="windows-key">Super</link></key> key to open the <gui>Dash</gui>.</p></item>
40 <item><p>Type <input>Universal Access</input> and press <key>Enter</key> to open the Universal Access settings.</p></item>
41 <item><p>Press <key>Tab</key> once to select the <gui>Seeing</gui> tab.</p></item>
42- <item><p>Press <key>←</key> once to switch to the <gui>Pointing and Clicking</gui> tab.</p></item>
43+ <item><p>Press <key>←</key> twice to switch to the <gui>Pointing and Clicking</gui> tab.</p></item>
44 <item><p>Press <key>↓</key> once to select the <gui>Mouse Keys</gui> switch then press <key>Enter</key> to switch it on.</p></item>
45 <item>
46 <p>
47@@ -49,39 +51,157 @@
48 </steps>
49
50 <note style = "tip">
51- <p>These instructions provide the shortest way to enable mouse keys using
52- only the keyboard. Select <gui>Universal Access Settings</gui> to see more
53+ <p>The above instructions provide the shortest way to enable mouse keys using
54+ only the keyboard. See <gui>Universal Access</gui> settings for more
55 accessibility options.</p>
56 </note>
57
58-<p>
59-The keypad is a set of numerical buttons on your keyboard, usually arranged
60-into a square grid. If you have a keyboard without a keypad (such as a laptop
61-keyboard), you may need to hold down the function (<key>Fn</key>)
62+<p></p>
63+
64+<p>
65+The numeric keypad is a set of numerical buttons on your keyboard, usually arranged
66+into a square grid. With mouse keys there are three buttons: primary, alternate, and modifier. Initially the primary button is selected.
67+Here are some examples of how to use mouse keys:</p>
68+
69+<list type="circle">
70+
71+ <item><p>
72+Each number on the keypad (except 0 and 5) corresponds to a direction. For example, pressing
73+<key>8</key> will move the pointer upwards and pressing <key>2</key> will move
74+it downwards.
75+</p></item>
76+
77+ <item><p>
78+To click the selected button, press <key>5</key>.
79+</p></item>
80+
81+ <item><p>
82+To double-click the selected button, quickly press
83+<key>5</key> twice or press <key>+</key> once.
84+</p></item>
85+
86+ <item><p>
87+To right click,
88+press <key>-</key> to select the alternate button (if it is not already selected) and press <key>5</key>.
89+</p></item>
90+
91+ <item><p>
92+To middle click,
93+press <key>*</key> to select the modifier button (if it is not already selected) and press <key>5</key>.
94+</p></item>
95+
96+
97+ <item><p>
98+To drag and drop using the primary button,
99+press <key>/</key> to select the primary button (if it is not already selected),
100+press <key>0</key> to depress the button, drag the pointer to the required position, and
101+press <key>.</key> to release the button.
102+</p></item>
103+
104+
105+</list>
106+
107+<p>
108+ </p>
109+<p>Here is a table of mouse keys and their actions:</p>
110+
111+
112+<table frame="top bottom" rules="rows">
113+
114+ <tr>
115+ <td><p><em>Key</em></p></td>
116+ <td><p><em>Action</em></p></td>
117+ </tr>
118+ <tr>
119+ <td><p><key>8</key></p></td>
120+ <td><p>Pointer up</p></td>
121+ </tr>
122+ <tr>
123+ <td><p><key>2</key></p></td>
124+ <td><p>Pointer down</p></td>
125+ </tr>
126+ <tr>
127+ <td><p><key>6</key></p></td>
128+ <td><p>Pointer right</p></td>
129+ </tr>
130+ <tr>
131+ <td><p><key>4</key></p></td>
132+ <td><p>Pointer left</p></td>
133+ </tr>
134+
135+ <tr>
136+ <td><p><key>7</key></p></td>
137+ <td><p>Pointer up and left</p></td>
138+ </tr>
139+ <tr>
140+ <td><p><key>9</key></p></td>
141+ <td><p>Pointer up and right</p></td>
142+ </tr>
143+ <tr>
144+ <td><p><key>3</key></p></td>
145+ <td><p>Pointer down and right</p></td>
146+ </tr>
147+ <tr>
148+ <td><p><key>1</key></p></td>
149+ <td><p>Pointer down and left</p></td>
150+ </tr>
151+
152+ <tr>
153+ <td><p><key>/</key></p></td>
154+ <td><p>Select the primary button. On a mouse the primary button is usually the left button</p></td>
155+ </tr>
156+ <tr>
157+ <td><p><key>*</key></p></td>
158+ <td><p>Select the modifier button. On a mouse the modifier button (if present) is usually the middle button</p></td>
159+ </tr>
160+ <tr>
161+ <td><p><key>-</key></p></td>
162+ <td><p>Select the alternate button. On a mouse the alternate button is usually the right button</p></td>
163+ </tr>
164+ <tr>
165+ <td><p><key>5</key></p></td>
166+ <td><p>Click selected button</p></td>
167+ </tr>
168+
169+ <tr>
170+ <td><p><key>+</key></p></td>
171+ <td><p>Double click selected button</p></td>
172+ </tr>
173+ <tr>
174+ <td><p><key>0</key></p></td>
175+ <td><p>Depress selected button</p></td>
176+ </tr>
177+ <tr>
178+ <td><p><key>.</key></p></td>
179+ <td><p>Release selected button</p></td>
180+ </tr>
181+
182+</table>
183+
184+<p>
185+</p>
186+
187+<note>
188+<p>If you have a keyboard without a keypad (as with some laptops),
189+you may need to hold down the function (<key>Fn</key>)
190 key and use certain other keys on your keyboard as a keypad. If you use this
191-feature often on a laptop, you can purchase external USB keypads.
192-</p>
193-
194-<p>
195-Each number on the keypad corresponds to a direction. For example, pressing
196-<key>8</key> will move the pointer upwards and pressing <key>2</key> will move
197-it downwards. Press the <key>5</key> key to click once with the mouse, or
198-quickly press it twice to double-click.
199-</p>
200-
201-<p>
202-Most keyboards have a special key which
203-allows you to right-click; it is often near to the space bar. Note, however,
204-that this key responds to where your keyboard focus is, not where your mouse
205-pointer is. See <link xref="a11y-right-click"/> for information on how to
206-right-click by holding down <key>5</key> or the left mouse button.
207-</p>
208-
209+feature often, you may wish to purchase an external USB keypad.
210+</p>
211+</note>
212+
213+<p>
214+</p>
215+
216+<note>
217 <p>
218 If you want to use the keypad to type numbers while mouse keys is enabled, turn
219 <key>Num Lock</key> on. The mouse cannot be controlled with the keypad when
220 <key>Num Lock</key> is turned on, though.
221 </p>
222+</note>
223+
224+<p>
225+</p>
226
227 <note>
228 <p>
229@@ -90,4 +210,5 @@
230 </p>
231 </note>
232
233+
234 </page>

Subscribers

People subscribed via source and target branches