[gnome-devel-docs] hig3: Use guiseq and keyseq in more places

[David King <davidk src gnome org>]

commit d8922651b136001d78b695453eb06662e6cd00eb
Author: David King <amigadave amigadave com>
Date:   Fri Aug 15 19:37:30 2014 +0100

    hig3: Use guiseq and keyseq in more places

 hig3/C/keyboard-input.page |   12 ++++++------
 hig3/C/menu-bars.page      |    4 ++--
 hig3/C/search.page         |    2 +-
 hig3/C/toolbars.page       |    2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)
---
diff --git a/hig3/C/keyboard-input.page b/hig3/C/keyboard-input.page
index 4f8f5d0..06e0729 100644
--- a/hig3/C/keyboard-input.page
+++ b/hig3/C/keyboard-input.page
@@ -64,8 +64,8 @@
 Do not assign system-level shortcut keys. These use the Super (sometimes knows as the windows key) key as a 
modifier.</p></item>
 <item><p>Only assign shortcut keys to the most commonly-used actions in your application. Do not try to 
assign a keyboard shortcut to everything.</p></item>
 <item><p>Do not use the standard GNOME application shortcut keys for different functions. This helps to 
reinforce consistency between all GNOME applications.</p></item>
-<item><p>Use Ctrl+letter in preference to other combinations when choosing new shortcut keys and 
Shift+Ctrl+letter for functions that reverse or extend another function. For example, Ctrl+Z and Shift+Ctrl+Z 
for Undo and Redo.</p></item>
-<item><p>New shortcut keys should be as mnemonic as possible, as these will be easier to learn and remember. 
For example, Ctrl+E would be a good shortcut for a menu item called Edit Page.</p></item>
+<item><p>Use Ctrl+letter in preference to other combinations when choosing new shortcut keys and 
Shift+Ctrl+letter for functions that reverse or extend another function. For example, 
<keyseq><key>Ctrl</key><key>Z</key></keyseq> and <keyseq><key>Shift</key><key>Ctrl</key><key>Z</key></keyseq> 
for <gui>Undo</gui> and <gui>Redo</gui>.</p></item>
+<item><p>New shortcut keys should be as mnemonic as possible, as these will be easier to learn and remember. 
For example, <keyseq><key>Ctrl</key><key>E</key></keyseq> would be a good shortcut for a menu item called 
<gui>Edit Page</gui>.</p></item>
 <item><p>Shortcuts that can be easily used with one hand are preferable for common operations.</p></item>
 <item><p>Do not use Alt+key combinations for shortcut keys, as these may conflict with access 
keys.</p></item>
 </list>
@@ -314,7 +314,7 @@ Do not assign system-level shortcut keys. These use the Super (sometimes knows a
 </tbody>
 </table>
 
-<p>If your application requires both Edit ▸ Find and Edit ▸ Search menu items, use Shift+Ctrl+F as the 
shortcut for Search.</p>
+<p>If your application requires both <guiseq><gui>Edit</gui><gui>Find</gui></guiseq> and 
<guiseq><gui>Edit</gui><gui>Search</gui></guiseq> menu items, use 
<keyseq><key>Shift</key><key>Ctrl</key><key>F</key></keyseq> as the shortcut for <gui>Search</gui>.</p>
 
 </section>
 
@@ -337,7 +337,7 @@ Do not assign system-level shortcut keys. These use the Super (sometimes knows a
 </tr>
 <tr>
 <td><p><gui>Zoom Out</gui></p></td>
-<td><p><keyseq><key>Ctrlr</key><key>-</key></keyseq></p></td>
+<td><p><keyseq><key>Ctrl</key><key>-</key></keyseq></p></td>
 <td><p>Zoom out of the document</p></td>
 </tr>
 <tr>
@@ -358,7 +358,7 @@ Do not assign system-level shortcut keys. These use the Super (sometimes knows a
 </tbody>
 </table>
 
-<p>If your application requires both <gui>View ▸ Reload</gui> and <gui>View ▸ Refresh</gui> menu items, use 
Shift+Ctrl+R as the shortcut for <gui>Reload</gui>.</p>
+<p>If your application requires both <guiseq><gui>View</gui><gui>Reload</gui></guiseq> and 
<guiseq><gui>View</gui><gui>Refresh</gui></guiseq> menu items, use 
<keyseq><key>Shift</key><key>Ctrl</key><key>R</key></keyseq> as the shortcut for <gui>Reload</gui>.</p>
 
 </section>
 
@@ -387,7 +387,7 @@ Do not assign system-level shortcut keys. These use the Super (sometimes knows a
 </tbody>
 </table>
 
-<p>If your application requires both <gui>Format ▸ Bold</gui> and <gui>Bookmarks ▸ Edit Bookmarks…</gui> 
menu items, use <keyseq><key>Shift</key><key>Ctrl</key><key>D</key></keyseq> as the shortcut for <gui>Edit 
Bookmarks</gui>.</p>
+<p>If your application requires both <guiseq><gui>Format</gui><gui>Bold</gui></guiseq> and 
<guiseq><gui>Bookmarks</gui><gui>Edit Bookmarks…</gui></guiseq> menu items, use 
<keyseq><key>Shift</key><key>Ctrl</key><key>D</key></keyseq> as the shortcut for <gui>Edit 
Bookmarks</gui>.</p>
 
 </section>
 
diff --git a/hig3/C/menu-bars.page b/hig3/C/menu-bars.page
index 96376f5..b5dbe47 100644
--- a/hig3/C/menu-bars.page
+++ b/hig3/C/menu-bars.page
@@ -368,7 +368,7 @@
 
 <p>Where applicable, provide items on the <gui>Edit</gui> menu that insert special objects such as images, 
links, GUI controls or the current date and time.</p>
 
-<p>If you have up to three types of object that can be inserted, add them as individual items to this menu, 
for example <gui>Insert Image</gui>, or <gui>Insert External Link</gui>. If you have between three and six 
types, place them on an <gui>Edit ▸ Insert</gui> submenu. If you have more than six, add a separate 
<gui>Insert</gui> menu to the menubar.</p>
+<p>If you have up to three types of object that can be inserted, add them as individual items to this menu, 
for example <gui>Insert Image</gui>, or <gui>Insert External Link</gui>. If you have between three and six 
types, place them on an <guiseq><gui>Edit</gui><gui>Insert</gui></guiseq> submenu. If you have more than six, 
add a separate <gui>Insert</gui> menu to the menubar.</p>
 
 </section>
 
@@ -377,7 +377,7 @@
 <section id="view">
 <title>View</title>
 
-<p>The <gui>View</gui> menu contains only items that affect the user's view of the current document. Do not 
place any items on the <gui>View</gui> menu that affect the content of the current document. (Exception: 
<gui>View ▸ Reload</gui> may change the current contents if, for example, the document is a webpage that has 
been recently updated on the server).</p>
+<p>The <gui>View</gui> menu contains only items that affect the user's view of the current document. Do not 
place any items on the <gui>View</gui> menu that affect the content of the current document. (Exception: 
<guiseq><gui>View</gui><gui>Reload</gui></guiseq> may change the current contents if, for example, the 
document is a webpage that has been recently updated on the server).</p>
 
 <table>
 <thead>
diff --git a/hig3/C/search.page b/hig3/C/search.page
index 7a6c76b..d61e3e7 100644
--- a/hig3/C/search.page
+++ b/hig3/C/search.page
@@ -38,7 +38,7 @@ In primary windows, the search bar is typically hidden until it is activated by
 
 <list>
 <item><p>Typing when a text entry field is not focused should activate search, and the entered text should 
be added to the search field. This is called "type to search".</p></item>
-<item><p>The keyboard shortcut for search (Ctrl+F).</p></item>
+<item><p>The keyboard shortcut for search (<keyseq><key>Ctrl</key><key>F</key></keyseq>).</p></item>
 <item><p>A search button in the header bar should allow the search bar to be displayed (the search button 
should toggle).</p></item>
 </list>
 
diff --git a/hig3/C/toolbars.page b/hig3/C/toolbars.page
index 9935aeb..8946168 100644
--- a/hig3/C/toolbars.page
+++ b/hig3/C/toolbars.page
@@ -32,7 +32,7 @@
 <item><p>Only include controls for the most important functions. Having too many toolbar controls reduces 
their efficiency by making them harder to find, and too many rows of toolbars reduces the amount of screen 
space available to the rest of the application.</p></item>
 <item><p>Utilise conventions for toolbars to increase familiarity. For example, the main toolbar in an 
office application will nearly always have New, Open and Save as its first three toolbar buttons. Similarly, 
the first few buttons in a browser application should always include Back, Forward, Stop and Reload, in that 
order.</p></item>
 <item><p>Place only the most commonly-used application functions on your toolbars. Don't just add buttons 
for every menu item.</p></item>
-<item><p>If you are using a <link xref="menu-bars">menu bar</link>, ensure that it includes all the 
functions that appear on you toolbar, either directly (i.e. an equivalent menu item) or indirectly (e.g. in 
the Options ▸ Settings dialog).</p></item>
+<item><p>If you are using a <link xref="menu-bars">menu bar</link>, ensure that it includes all the 
functions that appear on you toolbar, either directly (i.e. an equivalent menu item) or indirectly (e.g. in 
the <guiseq><gui>Options</gui><gui>Settings</gui></guiseq> dialog).</p></item>
 <item><p>Toolbars shouldn't include buttons for <gui>Help</gui>, <gui>Close</gui> or <gui>Quit</gui>, as 
these are rarely used and the space is better used for more useful controls. Similarly, only provide buttons 
for <gui>Undo</gui>, <gui>Redo</gui> and the standard clipboard functions if there is space on the toolbar to 
do so without sacrificing more useful, application-specific controls.</p></item>
 <item><p>Toolbar <link xref="buttons">buttons</link> should have a relief, and icon buttons should use <link 
xref="icons-and-artwork#color-vs-symbolic">symbolic icons</link>.</p></item>
 </list>