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

[Chris Perry]

I've updated the file tips-specialchars.page to fix launchpad bug 1624778. The procedure is now correct for 16.04 (and presumably 16.10). Someone has already updated the equivalent GNOME help so in part I've copied that. Even for such a short piece of text I had some choices to make. Eg I don't see the point of listing the keys that can be set as the compose key so I've deleted that sentence. "Open <application-name>" is used elsewhere in the desktop help so that's what I've used in step 2. I use "select" as much as possible and only use "click" where "select" doesn't seem to make sense. Etc, Etc. I haven't checked or altered the other sections on the page. I deleted an obsolete comment.

[Gunnar Hjalmarsson (gunnarhj)]

Thanks, Chris! The branch and the merge proposal seem to be perfect in a technical sense. I haven't checked the actual content changes yet, but will do soon.

I'm not going to merge anything before we have added the updated translations for 16.10 to lp:ubuntu-docs, which will happen next Thursday or Friday.

[Gunnar Hjalmarsson (gunnarhj)]

I think the "Compose key" section looks good after your changes.

On 2016-09-24 20:37, clissold345 wrote:
> I don't see the point of listing the keys that can be set as the
> compose key so I've deleted that sentence.

Agreed.

> I deleted an obsolete comment.

Actually you replaced the obsolete comment with a new one. ;)

Comment sections are only present on pages where they are needed, and the revision history of the pages is available in the Bazaar branch. Consequently I would suggest that the whole comment section is removed instead.

To accomplish that change, I suggest that you remove the comment section, commit it as a separate revision in your local branch copy, and then push again.

review: Needs Fixing

[lp:~clissold345/ubuntu-docs/fix-for-1624778]

552. By Chris Perry on 2016-09-27

Removed <comment> section - no longer needed

[Gunnar Hjalmarsson (gunnarhj)]

Thanks for the update; looks good now.

review: Approve

=== modified file 'ubuntu-help/C/tips-specialchars.page'
--- ubuntu-help/C/tips-specialchars.page	2016-06-25 17:35:38 +0000
+++ ubuntu-help/C/tips-specialchars.page	2016-09-27 15:28:41 +0000
@@ -27,13 +27,6 @@
 
   <title>Enter special characters</title>
 
-  <comment>
-    <cite date="2012-02-19">shaunm</cite>
-    <p>Marking complete for 3.0. We didn't get keyboard-inputmethods in.
-    If we get it for 3.0.1, uncomment the last section, write something,
-    and link.</p>
-  </comment>
-
   <p>You can enter and view thousands of characters from most of the 
   world's writing systems, even those not found on your keyboard. This 
   page lists some different ways you can enter special characters.</p>
@@ -65,14 +58,12 @@
       <title>Define a compose key</title>
       <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>Click <gui>Keyboard Layout</gui>.</p></item>
-      <item><p>Click
-      <gui>Options</gui>.</p></item>
-      <item><p>Find the group called <gui>Compose key position</gui>.
-      Select the key or keys you would like to behave as a compose key.
-      You can choose keys like <key>Caps Lock</key>, either of the
-      <key>Alt</key> keys, or the menu key. Any keys you select will
-      then only work as a compose key, and will no longer work for their 
+      <item><p>Open <gui>Keyboard</gui>.</p></item>
+      <item><p>Select the <gui>Shortcuts</gui> tab.</p></item>
+      <item><p>Select the <gui>Typing</gui> category in the left pane.</p></item>
+      <item><p>Select <gui>Compose Key</gui> in the right pane.</p></item>
+      <item><p>Click on <gui>Disabled</gui> and select a key from the drop-down menu.
+      Note: The key you select will only work as a compose key, and will no longer work for its 
       original purpose.</p></item>
     </steps>
     <p>You can type many common characters using the compose key, for