Bug 310419 - Remove keyboard and mouse shortcuts for other browsers from docs. r=steffen

browser/locales/en-US/chrome/help/mouse_shortcuts.xhtml

@@ -21,17 +21,13 @@ Contributors:
 <h1>&brandFullName; Mouse Shortcuts</h1>
 
 <p class="noMargin">This is a list of the most common mouse shortcuts in
-  &brandFullName; and their equivalents in Internet Explorer and Opera. The
+  &brandFullName;.</p>
-  shortcuts are for Windows, but most of the &brandShortName; shortcuts should
-  work on Linux too.</p>
 
-<table border="1" width="100%">
+<table border="1">
   <thead>
     <tr>
       <th>Command</th>
-      <th>&brandShortName;</th>
+      <th>Shortcut</th>
-      <th>Internet Explorer</th>
-      <th>Opera</th>
     </tr>
   </thead>
   <tbody>
@@ -41,20 +37,14 @@ Contributors:
         <span class="mac">&ctrlKey;+Scroll Down</span>
         <span class="noMac">&shiftKey;+Scroll Down</span>
       </td>
-      <td><span class="noMac">&shiftKey;+Scroll Down</span></td>
-      <td>&shiftKey;+Scroll Down</td>
     </tr>
     <tr>
       <td>Close Tab</td>
       <td>Middle-click on Tab</td>
-      <td>&nbsp;</td>
-      <td>&shiftKey;+Left-click</td>
     </tr>
     <tr>
       <td>Decrease Text Size</td>
       <td>&accelKey;+Scroll up</td>
-      <td><span class="noMac">&accelKey;+Scroll up</span></td>
-      <td>&accelKey;+Scroll up</td>
     </tr>
     <tr>
       <td>Forward</td>
@@ -62,68 +52,48 @@ Contributors:
         <span class="mac">&ctrlKey;+Scroll up</span>
         <span class="noMac">&shiftKey;+Scroll up</span>
       </td>
-      <td><span class="noMac">&shiftKey;+Scroll up</span></td>
-      <td>&shiftKey;+Scroll up</td>
     </tr>
     <tr>
       <td>Increase Text Size</td>
       <td>&accelKey;+Scroll down</td>
-      <td><span class="noMac">&accelKey;+Scroll down</span></td>
-      <td>&accelKey;+Scroll down</td>
     </tr>
     <tr>
       <td>New Tab</td>
       <td>Double-Click on Tab Bar</td>
-      <td>&nbsp;</td>
-      <td>Double-Click on Tab Bar</td>
     </tr>
     <tr>
       <td>Open in Background Tab</td>
       <td>&accelKey;+Left-click<br/>Middle-click</td>
-      <td>&nbsp;</td>
-      <td>&accelKey;+&shiftKey;+Left-click<br/>Middle-click</td>
     </tr>
     <tr>
       <td>Open in Foreground Tab</td>
       <td>&accelKey;+&shiftKey;+Left-click<br/>&shiftKey;+
         Middle-click</td>
-      <td>&nbsp;</td>
-      <td>&shiftKey;+Left-click</td>
     </tr>
     <tr>
       <td>Open in New Window</td>
       <td>&shiftKey;+Left-click</td>
-      <td>&shiftKey;+Left-click</td>
-      <td>&nbsp;</td>
     </tr>
     <tr class="unix">
       <td>Paste URL and Go</td>
       <td>Middle-click on Tab</td>
-      <td>&nbsp;</td>
-      <td>&nbsp;</td>
     </tr>
     <tr>
       <td>Reload (override cache)</td>
       <td>&shiftKey;+Reload button</td>
-      <td>&shiftKey;+Reload button</td>
-      <td>&nbsp;</td>
     </tr>
     <tr>
       <td>Save Page As</td>
       <td>&altKey;+Left-click</td>
-      <td>&nbsp;</td>
-      <td>&nbsp;</td>
     </tr>
     <tr>
       <td>Scroll line by line</td>
       <td>&altKey;+Scroll</td>
-      <td>&nbsp;</td>
-      <td>&nbsp;</td>
     </tr>
   </tbody>
 </table>
 
-<div class="contentsBox"><em>06 October 2004</em></div>
+<div class="contentsBox"><em>14 October 2005</em></div>
 <p>Copyright &copy; 2003-2005 Contributors to the Mozilla Help Viewer Project.</p>
 
 </body>

browser/locales/en-US/chrome/help/shortcuts.xhtml

@@ -24,28 +24,25 @@ Contributors:
 
 <h1>&brandFullName; Keyboard Shortcuts</h1>
 
-<p>This is a list of the most common keyboard shortcuts in &brandFullName;
+<p>This is a list of the most common keyboard shortcuts in &brandFullName;.
-  compared with the shortcuts to equivalent actions in Internet Explorer and
+  <span class="unix">If you have enabled Emacs-style text editing shortcuts
-  Opera.  <span class="unix">If you have enabled Emacs-style text editing
+  in GNOME, they will also work in &brandShortName;.  When an Emacs text
-  shortcuts in GNOME, they will also work in &brandShortName;.  When an Emacs
+  editing shortcut conflicts with the default shortcuts (as occurs with
-  text editing shortcut conflicts with the default shortcuts (as occurs with
   &accelKey;+<kbd>K</kbd>), the Emacs shortcut will take preference if
   focus is inside a textbox (which would include the location bar and search
   bar).  In such cases you should use the alternate keyboard shortcut
   if one is listed below.</span></p>
 
-<table border="1" width="100%">
+<table border="1">
   <thead>
     <tr>
       <th>Command</th>
-      <th>&brandShortName;</th>
+      <th>Shortcut</th>
-      <th>Internet Explorer</th>
-      <th>Opera</th>
     </tr>
   </thead>
   <tbody>
     <tr>
-      <th colspan="4">Navigation</th>
+      <th colspan="2">Navigation</th>
     </tr>
     <tr>
       <td>Back</td>
@@ -64,12 +61,6 @@ Contributors:
           &accelKey;+<kbd>Left Arrow</kbd>
         </span>
       </td>
-      <td><kbd>Backspace</kbd><br/>
-        &altKey;+<kbd>Left Arrow</kbd></td>
-      <td><kbd>Backspace</kbd><br/>
-        &altKey;+<kbd>Left Arrow</kbd><br/>
-        &accelKey;+<kbd>Left Arrow</kbd><br/>
-        <kbd>Z</kbd></td>
     </tr>
     <tr>
       <td>Forward</td>
@@ -88,234 +79,159 @@ Contributors:
           &accelKey;+<kbd>Right Arrow</kbd>
         </span>
       </td>
-      <td>&shiftKey;+<kbd>Backspace</kbd><br />
-        &altKey;+<kbd>Right Arrow</kbd></td>
-      <td>&shiftKey;+<kbd>Backspace</kbd><br />
-        &altKey;+<kbd>Right Arrow</kbd><br />
-        &accelKey;+<kbd>Right Arrow</kbd><br />
-        <kbd>X</kbd></td>
     </tr>
     <tr>
       <td>Home</td>
       <td>&altKey;+<kbd>Home</kbd></td>
-      <td>&altKey;+<kbd>Home</kbd></td>
-      <td>&accelKey;+<kbd>Space</kbd></td>
     </tr>
     <tr>
       <td>Open File</td>
       <td>&accelKey;+<kbd>O</kbd></td>
-      <td>&accelKey;+<kbd>O</kbd></td>
-      <td>&accelKey;+<kbd>O</kbd></td>
     </tr>
     <tr>
       <td>Reload</td>
       <td><kbd>F5<br/></kbd>
         &accelKey;+<kbd>R</kbd></td>
-      <td><kbd>F5</kbd><br />
-        &accelKey;+<kbd>R</kbd></td>
-      <td><kbd>F5</kbd><br />
-        &accelKey;+<kbd>R</kbd></td>
     </tr>
     <tr>
       <td>Reload (override cache)</td>
       <td><span class="noMac">&accelKey;+<kbd>F5</kbd><br/></span>
         &accelKey;+&shiftKey;+<kbd>R</kbd></td>
-      <td>&accelKey;+<kbd>F5</kbd></td>
-      <td>&nbsp;</td>
     </tr>
     <tr>
       <td>Stop</td>
       <td><span class="mac">&accelKey;+<kbd>.</kbd><br/></span>
         <kbd>Esc</kbd></td>
-      <td><kbd>Esc</kbd></td>
-      <td><kbd>Esc</kbd></td>
     </tr>
   </tbody>
   <tbody>
     <tr>
-      <th colspan="4">Current Page</th>
+      <th colspan="2">Current Page</th>
     </tr>
     <tr>
       <td>Go to Bottom of Page</td>
       <td><kbd>End</kbd></td>
-      <td><kbd>End</kbd></td>
-      <td><kbd>End</kbd></td>
     </tr>
     <tr>
       <td>Go to Top of Page</td>
       <td><kbd>Home</kbd></td>
-      <td><kbd>Home</kbd></td>
-      <td><kbd>Home</kbd></td>
     </tr>
     <tr>
       <td>Move to Next Frame</td>
       <td><kbd>F6</kbd></td>
-      <td>&nbsp;</td>
-      <td>&nbsp;</td>
     </tr>
     <tr>
       <td>Move to Previous Frame</td>
       <td>&shiftKey;+<kbd>F6</kbd></td>
-      <td>&nbsp;</td>
-      <td>&nbsp;</td>
     </tr>
     <tr class="noWin">
       <td>Page Info</td>
       <td>&accelKey;+<kbd>I</kbd></td>
-      <td>&nbsp;</td>
-      <td>&accelKey;+<kbd>8</kbd></td>
     </tr>
     <tr>
       <td>Page Source</td>
       <td>&accelKey;+<kbd>U</kbd></td>
-      <td>&nbsp;</td>
-      <td>&accelKey;+<kbd>F3</kbd></td>
     </tr>
     <tr>
       <td>Print</td>
       <td>&accelKey;+<kbd>P</kbd></td>
-      <td>&accelKey;+<kbd>P</kbd></td>
-      <td>&accelKey;+<kbd>P</kbd></td>
     </tr>
     <tr>
       <td>Save Page As</td>
       <td>&accelKey;+<kbd>S</kbd></td>
-      <td>&nbsp;</td>
-      <td>&accelKey;+<kbd>S</kbd></td>
     </tr>
     <tr>
       <td>Text Size: Decrease</td>
       <td>&accelKey;+<kbd>-</kbd></td>
-      <td>&nbsp;</td>
-      <td><kbd>9</kbd></td>
     </tr>
     <tr>
       <td>Text Size: Increase</td>
       <td>&accelKey;+<kbd>+</kbd></td>
-      <td>&nbsp;</td>
-      <td><kbd>0</kbd></td>
     </tr>
     <tr>
       <td>Text Size: Restore</td>
       <td>&accelKey;+<kbd>0</kbd></td>
-      <td>&nbsp;</td>
-      <td><kbd>6</kbd></td>
     </tr>
   </tbody>
   <tbody>
     <tr>
-      <th colspan="4">Editing</th>
+      <th colspan="2">Editing</th>
     </tr>
     <tr>
       <td>Copy</td>
       <td>&accelKey;+<kbd>C</kbd></td>
-      <td>&accelKey;+<kbd>C</kbd></td>
-      <td>&accelKey;+<kbd>C</kbd></td>
     </tr>
     <tr>
       <td>Cut</td>
       <td>&accelKey;+<kbd>X</kbd></td>
-      <td>&accelKey;+<kbd>X</kbd></td>
-      <td>&accelKey;+<kbd>X</kbd></td>
     </tr>
     <tr>
       <td>Delete</td>
       <td><kbd>Delete</kbd></td>
-      <td><kbd>Delete</kbd></td>
-      <td><kbd>Delete</kbd></td>
     </tr>
     <tr>
       <td>Paste</td>
       <td>&accelKey;+<kbd>V</kbd></td>
-      <td>&accelKey;+<kbd>V</kbd></td>
-      <td>&accelKey;+<kbd>V</kbd></td>
     </tr>
     <tr>
       <td>Redo</td>
       <td><span class="win">&accelKey;+<kbd>Y</kbd></span>
         <span class="noWin">&accelKey;+&shiftKey;+<kbd>Z</kbd></span></td>
-      <td>&accelKey;+<kbd>Y</kbd></td>
-      <td>&accelKey;+<kbd>Y</kbd><br/>
-        &accelKey;+&shiftKey;+<kbd>Z</kbd></td>
     </tr>
     <tr>
       <td>Select All</td>
       <td>&accelKey;+<kbd>A</kbd></td>
-      <td>&accelKey;+<kbd>A</kbd></td>
-      <td>&accelKey;+<kbd>A</kbd></td>
     </tr>
     <tr>
       <td>Undo</td>
       <td>&accelKey;+<kbd>Z</kbd></td>
-      <td>&accelKey;+<kbd>Z</kbd></td>
-      <td>&accelKey;+<kbd>Z</kbd></td>
     </tr>
   </tbody>
   <tbody>
     <tr>
-      <th colspan="4">Search</th>
+      <th colspan="2">Search</th>
     </tr>
     <tr>
       <td>Find</td>
       <td>&accelKey;+<kbd>F</kbd></td>
-      <td>&accelKey;+<kbd>F</kbd></td>
-      <td>&accelKey;+<kbd>F</kbd></td>
     </tr>
     <tr>
       <td>Find Again</td>
       <td><kbd>F3</kbd><br/>
         &accelKey;+<kbd>G</kbd></td>
-      <td>&nbsp;</td>
-      <td><kbd>F3</kbd></td>
     </tr>
     <tr>
       <td>Find As You Type Link</td>
       <td><kbd>'</kbd></td>
-      <td>&nbsp;</td>
-      <td><kbd>,</kbd><br/>
-        &shiftKey;+<kbd>/</kbd></td>
     </tr>
     <tr>
       <td>Find As You Type Text</td>
       <td><kbd>/</kbd></td>
-      <td>&nbsp;</td>
-      <td>&nbsp;</td>
     </tr>
     <tr>
       <td>Find Previous</td>
       <td>&shiftKey;+<kbd>F3</kbd></td>
-      <td>&nbsp;</td>
-      <td>&shiftKey;+<kbd>F3</kbd></td>
     </tr>
     <tr>
       <td>Web Search</td>
       <td>&accelKey;+<kbd>K</kbd>
         <span class="win"><br/>&accelKey;+<kbd>E</kbd></span>
         <span class="unix"><br/>&accelKey;+<kbd>J</kbd></span></td>
-      <td>&accelKey;+<kbd>E</kbd></td>
-      <td>&shiftKey;+<kbd>F8</kbd></td>
     </tr>
   </tbody>
   <tbody id="windows_tabs">
     <tr>
-      <th colspan="4">Windows &amp; Tabs</th>
+      <th colspan="2">Windows &amp; Tabs</th>
     </tr>
     <tr>
       <td>Close Tab</td>
       <td>&accelKey;+<kbd>W</kbd>
         <span class="noMac"><br/>&ctrlKey;+<kbd>F4</kbd></span></td>
-      <td>&nbsp;</td>
-      <td>&accelKey;+<kbd>W</kbd><br/>
-        &accelKey;+<kbd>F4</kbd></td>
     </tr>
     <tr>
       <td>Close Window</td>
       <td>&accelKey;+&shiftKey;+<kbd>W</kbd>
         <span class="noMac"><br/>&altKey;+<kbd>F4</kbd></span></td>
-      <td>&accelKey;+<kbd>W</kbd>
-        <span class="noMac"><br/>&altKey;+<kbd>F4</kbd></span></td>
-      <td>&accelKey;+<kbd>W</kbd><br/>
-        &altKey;+<kbd>F4</kbd></td>
     </tr>
     <!-- LOCALIZATION NOTE:
          "Left"/"Up" and "Right"/"Down" might need special treatment
@@ -325,200 +241,134 @@ Contributors:
       <td>Move Tab Left (when tab is focused)</td>
       <td>&accelKey;+<kbd>Left Arrow</kbd><br/>
           &accelKey;+<kbd>Up Arrow</kbd></td>
-      <td>&nbsp;</td>
-      <td>&nbsp;</td>
     </tr>
     <tr>
       <td>Move Tab Right (when tab is focused)</td>
       <td>&accelKey;+<kbd>Right Arrow</kbd><br/>
           &accelKey;+<kbd>Down Arrow</kbd></td>
-      <td>&nbsp;</td>
-      <td>&nbsp;</td>
     </tr>
     <tr>
       <td>Move Tab to Beginning (when tab is focused)</td>
       <td>&accelKey;+<kbd>Home</kbd></td>
-      <td>&nbsp;</td>
-      <td>&nbsp;</td>
     </tr>
     <tr>
       <td>Move Tab to End (when tab is focused)</td>
       <td>&accelKey;+<kbd>End</kbd></td>
-      <td>&nbsp;</td>
-      <td>&nbsp;</td>
     </tr>
     <tr>
       <td>New Tab</td>
       <td>&accelKey;+<kbd>T</kbd></td>
-      <td>&nbsp;</td>
-      <td>&accelKey;+&altKey;+<kbd>N</kbd></td>
     </tr>
     <tr>
       <td>New Window</td>
       <td>&accelKey;+<kbd>N</kbd></td>
-      <td>&accelKey;+<kbd>N</kbd></td>
-      <td>&accelKey;+&altKey;+<kbd>N</kbd></td>
     </tr>
     <tr>
       <td>Next Tab</td>
       <td><span class="noMac">&ctrlKey;+<kbd>Tab</kbd></span>
         <span class="mac">&accelKey;+&altKey;+Right Arrow</span><br/>
         &ctrlKey;+<kbd>Page Down</kbd></td>
-      <td>&nbsp;</td>
-      <td><span class="noMac">&accelKey;+<kbd>Tab</kbd></span>
-        <span class="mac">&altKey;+<kbd>Tab</kbd></span><br/>
-        &altKey;+<kbd>Page Down</kbd><br/>
-        &accelKey;+<kbd>F6</kbd><br/>
-        <kbd>2</kbd></td>
     </tr>
     <tr>
       <td>Open Address in New Tab</td>
       <td>&altKey;+&enterKey;</td>
-      <td>&nbsp;</td>
-      <td>&shiftKey;+&enterKey;</td>
     </tr>
     <tr>
       <td>Previous Tab</td>
       <td><span class="noMac">&ctrlKey;+&shiftKey;+<kbd>Tab</kbd></span>
         <span class="mac">&accelKey;+&altKey;+Left Arrow</span><br/>
         &ctrlKey;+<kbd>Page Up</kbd></td>
-      <td>&nbsp;</td>
-      <td><span class="noMac">&accelKey;+&shiftKey;+<kbd>Tab</kbd></span>
-        <span class="mac">&altKey;+&shiftKey;+<kbd>Tab</kbd></span><br/>
-        &altKey;+<kbd>Page Up</kbd><br/>
-        &accelKey;+&shiftKey;+<kbd>F6</kbd><br/>
-        <kbd>I</kbd></td>
     </tr>
     <tr>
       <td>Select Tab (1 to 9)</td>
       <td><span class="noUnix">&accelKey;</span><span
         class="unix">&altKey;</span>+(<kbd>1</kbd> to <kbd>9</kbd>)</td>
-      <td>&nbsp;</td>
-      <td>&nbsp;</td>
     </tr>
   </tbody>
   <tbody>
     <tr>
-      <th colspan="4">Tools</th>
+      <th colspan="2">Tools</th>
     </tr>
     <tr class="noUnix">
       <td>Bookmark All Tabs</td>
       <td>&accelKey;+&shiftKey;+<kbd>D</kbd></td>
-      <td>&nbsp;</td>
-      <td>&nbsp;</td>
     </tr>
     <tr>
       <td>Bookmark This Page</td>
       <td>&accelKey;+<kbd>D</kbd></td>
-      <td>&accelKey;+<kbd>D</kbd></td>
-      <td>&accelKey;+<kbd>T</kbd></td>
     </tr>
     <tr>
       <td>Bookmarks</td>
       <td>&accelKey;+<kbd>B</kbd>
         <span class="win"><br/>&accelKey;+<kbd>I</kbd></span></td>
-      <td>&accelKey;+<kbd>I</kbd></td>
-      <td><kbd>F4</kbd><br/>
-        &accelKey;+&altKey;+<kbd>B</kbd><br/>
-        &accelKey;+<kbd>1</kbd></td>
     </tr>
     <tr>
       <td>Caret Browsing</td>
       <td><kbd>F7</kbd></td>
-      <td>&nbsp;</td>
-      <td>&nbsp;</td>
     </tr>
     <tr>
       <td>Downloads</td>
       <td><span class="noUnix">&accelKey;+<kbd>J</kbd></span>
         <span class="unix">&accelKey;+<kbd>Y</kbd></span></td>
-      <td>&nbsp;</td>
-      <td>&accelKey;+&altKey;+<kbd>T</kbd><br/>
-        &accelKey;+<kbd>5</kbd></td>
     </tr>
     <tr>
       <td>History</td>
       <td><span class="noMac">&accelKey;+<kbd>H</kbd></span>
         <span class="mac">&accelKey;+&shiftKey;+<kbd>H</kbd></span></td>
-      <td>&accelKey;+<kbd>H</kbd></td>
-      <td>&accelKey;+&altKey;+<kbd>H</kbd><br/>
-        &accelKey;+<kbd>4</kbd></td>
     </tr>
     <tr>
       <td>Clear Private Data</td>
       <td>&accelKey;+&shiftKey;+<kbd>Del</kbd></td>
-      <td>&nbsp;</td>
-      <td>&nbsp;</td>
     </tr>
   </tbody>
   <tbody>
     <tr>
-      <th colspan="4">Miscellaneous</th>
+      <th colspan="2">Miscellaneous</th>
     </tr>
     <tr>
       <td>Complete .com Address</td>
       <td>&accelKey;+&enterKey;</td>
-      <td>&accelKey;+&enterKey;</td>
-      <td>&enterKey;</td>
     </tr>
     <tr>
       <td>Complete .net Address</td>
       <td>&shiftKey;+&enterKey;</td>
-      <td>&nbsp;</td>
-      <td>&nbsp;</td>
     </tr>
     <tr>
       <td>Complete .org Address</td>
       <td>&accelKey;+&shiftKey;+&enterKey;</td>
-      <td>&nbsp;</td>
-      <td>&nbsp;</td>
     </tr>
     <tr>
       <td>Delete Selected Autocomplete Entry</td>
       <td>&shiftKey;+<kbd>Del</kbd></td>
-      <td><kbd>Del</kbd></td>
-      <td>&nbsp;</td>
     </tr>
     <tr class="noMac">
       <td>Full Screen</td>
       <td><kbd>F11</kbd></td>
-      <td><kbd>F11</kbd></td>
-      <td><kbd>F11</kbd></td>
     </tr>
     <tr>
       <td>New Message</td>
       <td>&accelKey;<span class="mac">+&shiftKey;</span>+<kbd>M</kbd></td>
-      <td>&nbsp;</td>
-      <td>&accelKey;+<kbd>E</kbd></td>
     </tr>
     <tr>
       <td>Select Location Bar</td>
       <td><span class="noMac">&altKey;+<kbd>D</kbd><br/></span>
         <kbd>F6</kbd><br />
         &accelKey;+<kbd>L</kbd></td>
-      <td>&altKey;+<kbd>D</kbd><br />
-        <kbd>F6</kbd><br />
-        <kbd>F4</kbd><br />
-        &accelKey;+<kbd>Tab</kbd></td>
-      <td>&accelKey;+<kbd>H</kbd><br />
-        <kbd>F8</kbd></td>
     </tr>
     <tr>
-      <td>Select Previous Search Engine (when Search Bar is focused)</td>
+      <td>Select Previous Search Engine<br/>
+        (when Search Bar is focused)</td>
       <td>&accelKey;+<kbd>Up Arrow</kbd></td>
-      <td>&nbsp;</td>
-      <td>&nbsp;</td>
     </tr>
     <tr>
-      <td>Select Next Search Engine (when Search Bar is focused)</td>
+      <td>Select Next Search Engine<br/>
+        (when Search Bar is focused)</td>
       <td>&accelKey;+<kbd>Down Arrow</kbd></td>
-      <td>&nbsp;</td>
-      <td>&nbsp;</td>
     </tr>
   </tbody>
 </table>
 
-<div class="contentsBox"><em>14 August 2005</em></div>
+<div class="contentsBox"><em>14 October 2005</em></div>
 <p>Copyright &copy; 2003-2005 Contributors to the Mozilla Help Viewer Project.</p>
 
 </body>