Merge

src/macosx/classes/com/apple/laf/AquaComboBoxUI.java

@@ -273,7 +273,7 @@ public class AquaComboBoxUI extends BasicComboBoxUI implements Sizeable {
 
         actionMap.put("aquaSelectNext", highlightNextAction);
         actionMap.put("aquaSelectPrevious", highlightPreviousAction);
-        actionMap.put("aquaEnterPressed", triggerSelectionAction);
+        actionMap.put("enterPressed", triggerSelectionAction);
         actionMap.put("aquaSpacePressed", toggleSelectionAction);
 
         actionMap.put("aquaSelectHome", highlightFirstAction);

src/macosx/classes/com/apple/laf/AquaKeyBindings.java

@@ -214,7 +214,7 @@ public class AquaKeyBindings {
             "PAGE_DOWN", "aquaSelectPageDown",
             "HOME", "aquaSelectHome",
             "END", "aquaSelectEnd",
-            "ENTER", "aquaEnterPressed",
+            "ENTER", "enterPressed",
             "UP", "aquaSelectPrevious",
             "KP_UP", "aquaSelectPrevious",
             "DOWN", "aquaSelectNext",

src/share/classes/sun/launcher/resources/launcher.properties

@@ -47,9 +47,13 @@ java.launcher.opt.footer     =\    -cp <class search path of directories and zip
 \                  enable verbose output\n\
 \    -version      print product version and exit\n\
 \    -version:<value>\n\
+\                  Warning: this feature is deprecated and will be removed\n\
+\                  in a future release.\n\
 \                  require the specified version to run\n\
 \    -showversion  print product version and continue\n\
 \    -jre-restrict-search | -no-jre-restrict-search\n\
+\                  Warning: this feature is deprecated and will be removed\n\
+\                  in a future release.\n\
 \                  include/exclude user private JREs in the version search\n\
 \    -? -help      print this help message\n\
 \    -X            print help on non-standard options\n\