Index: trunk/src/org/openstreetmap/josm/actions/DistributeAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/DistributeAction.java	(revision 3755)
+++ trunk/src/org/openstreetmap/josm/actions/DistributeAction.java	(revision 3757)
@@ -31,5 +31,5 @@
         super(tr("Distribute Nodes"), "distribute", tr("Distribute the selected nodes to equal distances along a line."),
                 Shortcut.registerShortcut("tools:distribute", tr("Tool: {0}", tr("Distribute Nodes")), KeyEvent.VK_B, Shortcut.GROUP_EDIT), true);
-        putValue("help", ht("/Action/Distribute"));
+        putValue("help", ht("/Action/DistributeNodes"));
     }
 
Index: trunk/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java	(revision 3755)
+++ trunk/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java	(revision 3757)
@@ -29,5 +29,5 @@
         super(tr("Download parent ways/relations..."), "downloadreferrers", tr("Download primitives referring to one of the selected primitives"),
                 Shortcut.registerShortcut("file:downloadreferrers", tr("File: {0}", tr("Download parent ways/relations...")), KeyEvent.VK_D, Shortcut.GROUPS_ALT2+Shortcut.GROUP_HOTKEY), true);
-        putValue("help", ht("/Action/Downloadreferrers"));
+        putValue("help", ht("/Action/DownloadReferrers"));
     }
 
Index: trunk/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java	(revision 3755)
+++ trunk/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java	(revision 3757)
@@ -2,4 +2,5 @@
 package org.openstreetmap.josm.actions;
 
+import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
 import static org.openstreetmap.josm.tools.I18n.tr;
 
@@ -38,4 +39,5 @@
                 true /* register shortcut */
         );
+        putValue("help", ht("/Action/FullscreenView"));
         gd = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
         selected = Main.pref.getBoolean("draw.fullscreen", false);
Index: trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java	(revision 3755)
+++ trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java	(revision 3757)
@@ -54,5 +54,5 @@
         super(tr("Merge Nodes"), "mergenodes", tr("Merge nodes into the oldest one."),
                 Shortcut.registerShortcut("tools:mergenodes", tr("Tool: {0}", tr("Merge Nodes")), KeyEvent.VK_M, Shortcut.GROUP_EDIT), true);
-        putValue("help", ht("/Action/MergeNodesAction"));
+        putValue("help", ht("/Action/MergeNodes"));
     }
 
Index: trunk/src/org/openstreetmap/josm/actions/OpenFileAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/OpenFileAction.java	(revision 3755)
+++ trunk/src/org/openstreetmap/josm/actions/OpenFileAction.java	(revision 3757)
@@ -49,5 +49,5 @@
         super(tr("Open..."), "open", tr("Open a file."),
                 Shortcut.registerShortcut("system:open", tr("File: {0}", tr("Open...")), KeyEvent.VK_O, Shortcut.GROUP_MENU));
-        putValue("help", ht("/Action/OpenFile"));
+        putValue("help", ht("/Action/Open"));
 
     }
Index: trunk/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java	(revision 3755)
+++ trunk/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java	(revision 3757)
@@ -49,5 +49,5 @@
                         KeyEvent.VK_Q,
                         Shortcut.GROUP_EDIT), true);
-        putValue("help", ht("/Action/Orthogonalize"));
+        putValue("help", ht("/Action/OrthogonalizeShape"));
     }
 
Index: trunk/src/org/openstreetmap/josm/actions/SimplifyWayAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/SimplifyWayAction.java	(revision 3755)
+++ trunk/src/org/openstreetmap/josm/actions/SimplifyWayAction.java	(revision 3757)
@@ -91,5 +91,5 @@
                         options,
                         options[0],
-                        HelpUtil.ht("/Action/SimplifyAction#ConfirmDeleteNodesOutsideBoundingBoxes")
+                        HelpUtil.ht("/Action/SimplifyWay#ConfirmDeleteNodesOutsideBoundingBoxes")
         );
         return ret == 0;
@@ -102,5 +102,5 @@
                 tr("Warning"),
                 JOptionPane.WARNING_MESSAGE,
-                HelpUtil.ht("/Action/SimplifyAction#SelectAWayToSimplify")
+                HelpUtil.ht("/Action/SimplifyWay#SelectAWayToSimplify")
         );
     }
@@ -132,5 +132,5 @@
                 options,
                 options[0],
-                HelpUtil.ht("/Action/SimplifyAction#ConfirmSimplifyAll")
+                HelpUtil.ht("/Action/SimplifyWay#ConfirmSimplifyAll")
         );
         return ret == 0;
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java	(revision 3755)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java	(revision 3757)
@@ -73,5 +73,5 @@
 
         // -- help action
-        pnl.add(new SideButton(new ContextSensitiveHelpAction(HelpUtil.ht("/Dialog/ChangesetQuery"))));
+        pnl.add(new SideButton(new ContextSensitiveHelpAction(HelpUtil.ht("/Dialog/ChangesetQueryDialog"))));
 
         return pnl;
@@ -91,5 +91,5 @@
 
         // context sensitive help
-        HelpUtil.setHelpContext(getRootPane(), HelpUtil.ht("/Dialog/ChangesetQuery"));
+        HelpUtil.setHelpContext(getRootPane(), HelpUtil.ht("/Dialog/ChangesetQueryDialog"));
 
         addWindowListener(new WindowEventHandler());
Index: trunk/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java	(revision 3755)
+++ trunk/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java	(revision 3757)
@@ -127,5 +127,5 @@
                 specs,
                 specs[0],
-                ht("/Action/UploadAction#ChangesetFull")
+                ht("/Action/Upload#ChangesetFull")
         );
         switch(ret) {
Index: trunk/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java	(revision 3755)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java	(revision 3757)
@@ -321,6 +321,5 @@
                     tr("Update plugins"),
                     !failed.isEmpty() ? JOptionPane.WARNING_MESSAGE : JOptionPane.INFORMATION_MESSAGE,
-                            // FIXME: check help topic
-                            HelpUtil.ht("/Preferences/Plugin")
+                            HelpUtil.ht("/Preferences/Plugins")
             );
         }