Bug 253693 - [Mac] Cmd+? should bring up Help Contents. r=mconnor,josh a=asa

browser/base/content/baseMenuOverlay.xul

@@ -72,11 +72,12 @@
             <menuitem oncommand="openHelp('firefox-help', 'chrome://browser/locale/help/help.rdf');"
 #ifdef XP_MACOSX
                       label="&helpContentsMac.label;"
+                      key="key_openHelpMacFrontend"/>
 #else
                       label="&helpContents.label;"
-#endif
                       accesskey="&helpContents.accesskey;"
                       key="key_openHelp"/>
+#endif
 # Show IE Users menu item on Windows only
 #ifdef XP_WIN
             <menuitem label="&helpForIEUsers.label;"
@@ -107,8 +108,18 @@
 # VK_HELP doesn't work on other platforms yet
 #ifdef XP_MACOSX
             keycode="&openHelpMac.commandkey;"/>
+# On mac, we support both the help key and Cmd+?
+# ...Map Cmd+Shift+/, show Cmd+?
+# (that's for en-US, it might be different for other keyboard layouts)
+        <key id="key_openHelpMac"
+             oncommand="openHelp('firefox-help');"
+             keycode="&openHelpMac2.commandkey;"
+             modifiers="&openHelpMac2.modifiers;"/>
+        <key id="key_openHelpMacFrontend"
+             key="&openHelpMac2.frontendCommandkey;"
+             modifiers="&openHelpMac2.frontendModifiers;"/>
 #else
-            keycode="&openHelp.commandkey;"/>
+             keycode="&openHelp.commandkey;"/>
 #endif
     </keyset>
 

browser/locales/en-US/chrome/browser/baseMenuOverlay.dtd

@@ -19,5 +19,13 @@
 <!ENTITY helpForIEUsers.accesskey "I">
 <!ENTITY openHelp.commandkey      "VK_F1">
 <!ENTITY openHelpMac.commandkey   "VK_HELP">
+<!-- LOCALIZATION NOTE openHelpMac2.commandkey and openHelpMac2.modifiers
+                       are all the necessary keys to hit OS X's open-help 
+                       keyboard (visible) shortcut (that's Cmd+? for most locales) -->
+<!ENTITY openHelpMac2.commandkey           "/">
+<!ENTITY openHelpMac2.modifiers            "accel,shift">
+<!ENTITY openHelpMac2.frontendCommandkey   "?">
+<!ENTITY openHelpMac2.frontendModifiers    "accel">
+
 <!ENTITY promote.label            "Promote &brandShortName;">
 <!ENTITY promote.accesskey        "P">