Merge lp:~clissold345/ubuntu-docs/fix-for-1617718 into lp:~ubuntu-core-doc/ubuntu-docs/trunk2017-07-10

[Chris Perry]

The bug poster (Oxwivi) says that the multi-finger tap for middle-click doesn't work as documented (on touchpads that support multi-finger taps of course). So the current help is definitely wrong. The bug mentions middle-click but the help is wrong for right-click too.

I've checked on my laptop and this works:

- To right-click, tap once in the bottom right-hand corner.

- To middle-click, tap once in the top right-hand corner.

I'm assuming that all touchpads can detect taps in the corners. I've updated the help so that it describes right-clicks and middle-clicks from the touchpad as given above. I'm using the terms "middle-click" and "right-click".

In mouse-middle-click.page I've revised the section on applications so that it doesn't mention mice (since middle-click isn't necessarily generated by a mouse). I deleted the word "advanced" since I don't think it adds anything. I haven't tried to check all the details given about applications.

In mouse-touchpad-click.page the first sentence describes the page as a whole, then a sub section starts, so I've added markup to indicate a new section. The note given on the first procedure wasn't needed in my opinion so I've deleted it. I haven't checked or altered the sections "Two finger scroll" or "Content sticks to fingers".

I did a validate. No errors were reported.

[Gunnar Hjalmarsson (gunnarhj)]

This makes sense to me.

While I'm going to merge this branch, I subscribed Oxwivi (the bug reporter). So @Oxwivi, if you find that there is something left unaddressed, please let us know.

Thanks for the great work, Chris!

review: Approve

[Oxwivi (oxwivi)]

I'm sorry for my late response. I don't see any issues with the change
either (though it's already too late to get a word in). Thank you for for
responding to my bug report and fixing it.

On Tue, Oct 11, 2016 at 9:25 PM <email address hidden> wrote:

> The proposal to merge lp:~clissold345/ubuntu-docs/fix-for-1617718 into
> lp:ubuntu-docs has been updated.
>
> Status: Needs review => Merged
>
> For more details, see:
>
> https://code.launchpad.net/~clissold345/ubuntu-docs/fix-for-1617718/+merge/308003
> --
> You are subscribed to branch lp:~clissold345/ubuntu-docs/fix-for-1617718.
>

[Gunnar Hjalmarsson (gunnarhj)]

No, it's not too late, Oxwivi. We can make further changes if needed. :)

[Oxwivi (oxwivi)]

Ah, I mean, merge proposal's already up...

Anyway, I think there was a specific term for the middle-click's clipboard
(which I don't recall). While it's not important, maybe it'd be good to
include it, so the user knows what to call it if there's any question or
issues about it.

On Tue, Oct 11, 2016 at 9:45 PM Gunnar Hjalmarsson <
<email address hidden>> wrote:

> No, it's not too late, Oxwivi. We can make further changes if needed. :)
> --
>
> https://code.launchpad.net/~clissold345/ubuntu-docs/fix-for-1617718/+merge/308003
> You are subscribed to branch lp:~clissold345/ubuntu-docs/fix-for-1617718.
>

[Gunnar Hjalmarsson (gunnarhj)]

Okay.. I for one am not aware of a specific term. Just googled and found <http://askubuntu.com/q/167570> where they talk about some distinction between the X clipboard and the desktop environment clipboard. However, that would be 'too technical' for the desktop guide.

=== modified file 'ubuntu-help/C/mouse-middleclick.page'
--- ubuntu-help/C/mouse-middleclick.page	2013-10-23 04:16:46 +0000
+++ ubuntu-help/C/mouse-middleclick.page	2016-10-09 11:44:53 +0000
@@ -29,7 +29,7 @@
 
 <title>Middle-click</title>
 
-<p>Many mice and some touchpads have a middle mouse button. On a mouse
+<p>Many mice have a middle mouse button. On a mouse
 with a scroll wheel, you can usually press directly down on the scroll
 wheel to middle-click. If you don't have a middle mouse button, you
 can press the left and right mouse buttons at the same time to
@@ -37,22 +37,22 @@
 can try following <link href="https://wiki.ubuntu.com/X/Quirks#A2-button_Mice">
 these instructions</link>.</p>
 
-<p>On touchpads that support multi-finger taps, you can tap with three
-fingers at once to middle-click. You have to
+<p>Some touchpads have a middle mouse button and some do not.
+ On touchpads that don't have a middle mouse button you can middle-click
+ by tapping once in the top right-hand corner of the touchpad. You have to
 <link xref="mouse-touchpad-click">enable tap clicking</link> in the
 touchpad settings for this to work.</p>
 
-<p>Many applications use middle-click for advanced click shortcuts.</p>
+<p>Many applications use middle-click for shortcuts:</p>
 
 <list>
   <item><p>One common shortcut is to paste selected text. (This is sometimes
   called primary selection paste.) Select the text you want to paste, then go
   to where you want to paste it and middle-click. The selected text is pasted
-  at the mouse position.</p>
-  <p>Pasting text with your middle mouse button is completely separate
+  at the cursor position.</p>
+  <p>Pasting text using middle-click is completely separate
   from the normal clipboard. Selecting text does not copy it to your
-  clipboard. This quick method of pasting only works with the middle
-  mouse button.</p></item>
+  clipboard. This quick method of pasting only works with middle-click.</p></item>
 
   <item><p>On scrollbars and sliders, a regular click in the empty space moves
   by a set amount (such as one page) in the direction you clicked. You can also
@@ -66,8 +66,8 @@
  the <gui>Launcher</gui> on the left, or in
   the <gui>Dash</gui>.</p></item>
 
-  <item><p>Most web browsers allow you to open links in tabs quickly with the
-  middle mouse button. Just click any link with your middle mouse button, and
+  <item><p>Most web browsers allow you to open links in tabs quickly with middle-click.
+  Just middle-click any link, and
   it will open in a new tab. Be careful clicking the link in the <app>Firefox</app>
   web browser, though. In <app>Firefox</app>, if you middle-click anywhere except
   on a link, it will try to load your selected text as a URL, as if you used
@@ -80,7 +80,7 @@
   will open the file, just as if you had double-clicked.</p></item>
 </list>
 
-<p>Some specialized applications allow you to use the middle mouse
-button for other functions. Search your application's help for
+<p>Some specialized applications allow you to use middle-click
+for other functions. Search your application's help for
 <em>middle-click</em> or <em>middle mouse button</em>.</p>
 </page>
 
=== modified file 'ubuntu-help/C/mouse-touchpad-click.page'
--- ubuntu-help/C/mouse-touchpad-click.page	2013-10-23 04:16:46 +0000
+++ ubuntu-help/C/mouse-touchpad-click.page	2016-10-09 11:44:53 +0000
@@ -22,37 +22,31 @@
 
 <title>Click, drag, or scroll with the touchpad</title>
 
-<p>You can click, double-click, drag, and scroll using only your
+<p>If your system has a touchpad, you can click, double-click, drag, and scroll using only your
 touchpad, without separate hardware buttons.</p>
 
+<section id="clickordrag">
+
+<title>Click or drag</title>
+
+<p>You can click or drag using your touchpad.</p>
+
 <steps>
   <item><p>Click the icon at the very right of the <gui>menu bar</gui> and select <gui>System Settings</gui>.</p></item>
   <item><p>Open <gui>Mouse &amp; Touchpad</gui>.</p></item>
-  <item><p>In the <gui>Touchpad</gui> section, check <gui>Tap to click</gui>.</p>
-    <note>
-      <p>The <gui>Touchpad</gui> section only appears if your system has a
-      touchpad.</p>
-    </note>
-  </item>
+  <item><p>In the <gui>Touchpad</gui> section, check <gui>Tap to click</gui>.</p></item>
 </steps>
 
 <list>
-<item><p>To click, tap on the touchpad.</p></item>
+<item><p>To click, tap once (but not in the bottom or top right-hand corners).</p></item>
 <item><p>To double-click, tap twice.</p></item>
-<item><p>To drag an item, double-tap but don't lift your finger after the second tap.
+<item><p>To drag an item, tap twice but don't lift your finger after the second tap.
 Drag the item where you want it, then lift your finger to drop.</p></item>
-<item><p>If your touchpad supports multi-finger taps, right-click by tapping with
-two fingers at once. Otherwise, you still need to use hardware buttons to
-right-click. See <link xref="a11y-right-click"/> for a method of right-clicking
-without a second mouse button.</p></item>
-<item><p>If your touchpad supports multi-finger taps,
-<link xref="mouse-middleclick">middle-click</link> by tapping with three fingers
-at once.</p></item>
+<item><p>To right-click, tap once in the bottom right-hand corner.</p></item>
+<item><p>To middle-click, tap once in the top right-hand corner.</p></item>
 </list>
 
-<note><p>When tapping or dragging with multiple fingers, make sure your fingers
-are spread far enough apart. If your fingers are too close, your computer may
-think they're a single finger.</p></note>
+</section>
 
 <section id="twofingerscroll">
 
@@ -87,6 +81,7 @@
 <note><p>Two-finger scrolling may not work on all touchpads.</p></note>
 
 </section>
+
 <section id="contentsticks">
 
 <title>Content sticks to fingers</title>
@@ -107,4 +102,4 @@
 </note>
 </section>
 
-</page>
 \ No newline at end of file
+</page>