diff --git a/doc/org.eclipse.cdt.doc.user/contexts_CDT.xml b/doc/org.eclipse.cdt.doc.user/contexts_CDT.xml
new file mode 100644
index 00000000000..12002dbd60f
--- /dev/null
+++ b/doc/org.eclipse.cdt.doc.user/contexts_CDT.xml
@@ -0,0 +1,66 @@
+
+<?NLS TYPE="org.eclipse.help.contexts"?>
+
+<contexts>
+
+<context id ="default_cs_help">
+   <description>Click below to see help.</description>
+   <topic href="default_cs_help.htm"
+   	label="Default Context Sensitive Help"/>
+</context>
+
+<context id ="cdt_error_parsers_page">
+   <description>Control the build messages displayed in the Tasks view. </description>
+   <topic href="cdt_u_newproj_parser_error.htm"
+   	label="Error Parsers, C/C++ Properties window"/>
+</context>
+
+<context id ="cdt_binary_parser_page">
+   <description>Select a binary parser for the target platform. </description>
+   <topic href="cdt_u_newproj_parser_binary.htm"
+   	label="Binary Parser page, C/C++ Properties window"/>
+</context>
+
+<context id ="man_proj_platform_help">
+   <description>Select a target deployment platform. </description>
+   <topic href="cdt_u_newproj_platf.htm"
+   	label="Target platform, C/C++ Properties window"/>
+</context>
+
+<context id ="new_c_editor_pref_page_context">
+   <description>Customize the appearance of the C/C++ Editor. </description>
+   <topic href="cdt_u_c_editor_gen.htm"
+   	label="General page, Preferences window"/>
+</context>
+
+<context id ="new_c_editor_annotations_pref_page_context">
+   <description>Customize the appearance of the C/C++ Editor. </description>
+   <topic href="cdt_u_c_editor_anno.htm"
+   	label="Annotations page, Preferences window"/>
+</context>
+
+<context id ="new_c_editor_colors_pref_page_context">
+   <description>Customize the appearance of the C/C++ editor. </description>
+   <topic href="cdt_u_c_editor_color.htm"
+   	label="Colors page, Preferences window"/>
+</context>
+
+<context id ="new_c_editor_pref_page_context">
+   <description>Customize how the Content Assist feature works. </description>
+   <topic href="cdt_u_c_editor_con_assist.htm"
+   	label="Content Assist page, Preferences window"/>
+</context>
+
+<context id ="new_c_templates_pref_page_context">
+   <description>Create, edit, remove, import, or export code templates. </description>
+   <topic href="cdt_u_code_temp.htm"
+   	label="Code Templates page, Preferences window"/>
+</context>
+
+<context id ="c_search_page">
+   <description>Search for C/C++ elements. </description>
+   <topic href="cdt_u_search.htm"
+   	label="C/C++ Search page, Search dialog box"/>
+</context>
+
+</contexts>
diff --git a/doc/org.eclipse.cdt.doc.user/contexts_CDT_DEBUGGER.xml b/doc/org.eclipse.cdt.doc.user/contexts_CDT_DEBUGGER.xml
new file mode 100644
index 00000000000..e382e8be10d
--- /dev/null
+++ b/doc/org.eclipse.cdt.doc.user/contexts_CDT_DEBUGGER.xml
@@ -0,0 +1,57 @@
+<contexts>
+
+<context id ="default_cs_help">
+   <description>Click below to see help.</description>
+   <topic href="default_cs_help.htm"
+   	label="Default Context Sensitive Help"/>
+</context>
+
+<context id ="registers_view_context">
+   <description>The registers view displays the register values of a selected stack frame. </description>
+   <topic href="cdt_u_registersview.htm"
+   	label="Registers view"/>
+</context>
+
+<context id ="registers_preference_page_context">
+   <description>Change the color in which register values are displayed. </description>
+   <topic href="cdt_u_reg_view_pref.htm"
+   	label="Registers view preferences"/>
+</context>
+
+<context id ="memory_view_context">
+   <description>The memory view displays process memory. </description>
+   <topic href="cdt_u_memoryview.htm"
+   	label="Memory view"/>
+</context>
+
+<context id ="memory_preference_page_context">
+   <description>Click below to see help</description>
+   <topic href="cdt_u_mem_view_pref.htm"
+   	label="Memory view preferences"/>
+</context>
+
+<context id ="shared_libraries_view_context">
+   <description>Click below to see help</description>
+   <topic href="cdt_u_shared_lib_view.htm"
+   	label="Shared Libraries view"/>
+</context>
+
+<context id ="shared_libraries_preference_page_context">
+   <description>Set the refresh preference for the Shared Libraries view. </description>
+   <topic href="cdt_u_shared_lib_view_pref.htm"
+   	label="Shared Libraries view preferences"/>
+</context>
+
+<context id ="signals_view_context">
+   <description>Click below to see help</description>
+   <topic href="cdt_u_signals_view.htm"
+   	label="Signals view"/>
+</context>
+
+<context id ="c_debug_preference_page_context">
+   <description>View information about your program as you debug. </description>
+   <topic href="cdt_u_dbg_pref.htm"
+   	label="Debug preferences"/>
+</context>
+
+</contexts>
\ No newline at end of file
diff --git a/doc/org.eclipse.cdt.doc.user/contexts_CDT_DEBUGGER_MI.xml b/doc/org.eclipse.cdt.doc.user/contexts_CDT_DEBUGGER_MI.xml
new file mode 100644
index 00000000000..d0fad30aaf7
--- /dev/null
+++ b/doc/org.eclipse.cdt.doc.user/contexts_CDT_DEBUGGER_MI.xml
@@ -0,0 +1,15 @@
+<contexts>
+
+<context id ="default_cs_help">
+   <description>Click below to see help.</description>
+   <topic href="default_cs_help.htm"
+   	label="Default Context Sensitive Help"/>
+</context>
+
+<context id ="cdt_u_gdb_mi_pref">
+   <description>Enter a timeout value in milliseconds. </description>
+   <topic href="cdt_u_gdb_mi_pref.htm"
+   	label="GDB MI preference page"/>
+</context>
+
+</contexts>
diff --git a/doc/org.eclipse.cdt.doc.user/contexts_CDT_LAUNCH.xml b/doc/org.eclipse.cdt.doc.user/contexts_CDT_LAUNCH.xml
new file mode 100644
index 00000000000..e80a264e320
--- /dev/null
+++ b/doc/org.eclipse.cdt.doc.user/contexts_CDT_LAUNCH.xml
@@ -0,0 +1,39 @@
+<contexts>
+
+<context id ="default_cs_help">
+   <description>Click below to see help.</description>
+   <topic href="default_cs_help.htm"
+   	label="Default Context Sensitive Help"/>
+</context>
+
+<context id ="launch_configuration_dialog_main_tab">
+   <description>Provide information on the project and application you want to run or debug. </description>
+   <topic href="cdt_u_run_dbg_main.htm"
+   	label="Main page, Run/Debug dialog box"/>
+</context>
+
+<context id ="launch_configuration_dialog_arguments_tab">
+   <description>Provide information on the project and application you want to run or debug. </description>
+   <topic href="cdt_u_run_dbg_arg.htm"
+   	label="Arguments page, Run/Debug dialog box"/>
+</context>
+
+<context id ="launch_configuration_dialog_environment_tab">
+   <description>Set environment variables and values. </description>
+   <topic href="cdt_u_run_dbg_env.htm"
+   	label="Environment page, Run/Debug dialog box"/>
+</context>
+
+<context id ="launch_configuration_dialog_debugger_tab">
+   <description>Select a debugger. </description>
+   <topic href="cdt_u_run_dbg_dbg.htm"
+   	label="Debugger page, Run/Debug dialog box"/>
+</context>
+
+<context id ="launch_configuration_dialog_source_tab">
+   <description>Specify where the debugger should look for source files. </description>
+   <topic href="cdt_u_run_dbg_srce.htm"
+   	label="Source page, Run/Debug dialog box"/>
+</context>
+
+</contexts>
\ No newline at end of file
diff --git a/doc/org.eclipse.cdt.doc.user/contexts_CDT_make.xml b/doc/org.eclipse.cdt.doc.user/contexts_CDT_make.xml
new file mode 100644
index 00000000000..b73aff02625
--- /dev/null
+++ b/doc/org.eclipse.cdt.doc.user/contexts_CDT_make.xml
@@ -0,0 +1,21 @@
+<contexts>
+
+<context id ="default_cs_help">
+   <description>Click below to see help.</description>
+   <topic href="default_cs_help.htm"
+   	label="Default Context Sensitive Help"/>
+</context>
+
+<context id ="cdt_make_builder_page">
+   <description>Define the build settings for the current project. </description>
+   <topic href="cdt_u_newproj_buildset.htm"
+   	label="Make Builder page, C/C++ Properties window"/>
+</context>
+
+<context id ="cdt_paths_symbols_page">
+   <description>Enter include paths and symbols. </description>
+   <topic href="cdt_u_newproj_pathsymb.htm"
+   	label="Paths and Symbols page, C/C++ Properties window"/>
+</context>
+
+</contexts>
diff --git a/doc/org.eclipse.cdt.doc.user/doc.zip b/doc/org.eclipse.cdt.doc.user/doc.zip
index f790cb2d38c..72b990136aa 100644
Binary files a/doc/org.eclipse.cdt.doc.user/doc.zip and b/doc/org.eclipse.cdt.doc.user/doc.zip differ
diff --git a/doc/org.eclipse.cdt.doc.user/plugin.properties b/doc/org.eclipse.cdt.doc.user/plugin.properties
index 37cbef80a2e..1153b5c721b 100644
--- a/doc/org.eclipse.cdt.doc.user/plugin.properties
+++ b/doc/org.eclipse.cdt.doc.user/plugin.properties
@@ -1,31 +1,29 @@
 <?xml version="1.0"?>
 <csHelp>
    <csHelpTopic viewID="default_help" helpTopic="org.eclipse.cdt.doc.user.default_cs_help"/>
-   <csHelpTopic viewID="cdt_make_builder_page" helpTopic=".cdt_u_newproj_buildset"/>
-   <csHelpTopic viewID="cdt_error_parsers_page" helpTopic=".cdt_u_newproj_parser_error"/>
-   <csHelpTopic viewID="cdt_binary_parser_page" helpTopic=".cdt_u_newproj_parser_binary"/>
-   <csHelpTopic viewID="cdt_paths_symbols_page" helpTopic=".cdt_u_newproj_pathsymb"/>
-   <csHelpTopic viewID="Already has Workbench F1 help, need to hook up our own" helpTopic=".cdt_u_outlineview"/>
-   <csHelpTopic viewID="Already has Workbench F1 help, need to hook up our own" helpTopic=".cdt_u_cproj_view"/>
-   <csHelpTopic viewID="org.eclipse.cdt.debug.ui.registers_view_context" helpTopic=".cdt_u_registersview"/>
-   <csHelpTopic viewID="org.eclipse.cdt.debug.ui.registers_preference_page_context" helpTopic=".cdt_u_reg_view_pref"/>
-   <csHelpTopic viewID="org.eclipse.cdt.debug.ui.memory_view_context" helpTopic=".cdt_u_memoryview"/>
-   <csHelpTopic viewID="org.eclipse.cdt.debug.ui.memory_preference_page_context" helpTopic=".cdt_u_mem_view_pref"/>
-   <csHelpTopic viewID="org.eclipse.cdt.debug.ui.shared_libraries_view_context" helpTopic=".cdt_u_shared_lib_view"/>
-   <csHelpTopic viewID="org.eclipse.cdt.debug.ui.shared_libraries_preference_page_context" helpTopic=".cdt_u_shared_lib_view_pref"/>
-   <csHelpTopic viewID="org.eclipse.cdt.debug.ui.signals_view_context" helpTopic=".cdt_u_signals_view"/>
-   <csHelpTopic viewID="org.eclipse.cdt.debug.ui.c_debug_preference_page_context" helpTopic=".cdt_u_dbg_pref"/>
-   <csHelpTopic viewID="org.eclipse.cdt.debug.mi.ui.mi_preference_page_context" helpTopic=".cdt_u_gdb_mi_pref"/>
-   <csHelpTopic viewID="launch_configuration_dialog_main_tab" helpTopic=".cdt_u_run_dbg_main"/>
-   <csHelpTopic viewID="launch_configuration_dialog_arguments_tab" helpTopic=".cdt_u_run_dbg_arg"/>
-   <csHelpTopic viewID="launch_configuration_dialog_environment_tab" helpTopic=".cdt_u_run_dbg_env"/>
-   <csHelpTopic viewID="launch_configuration_dialog_debugger_tab" helpTopic=".cdt_u_run_dbg_dbg"/>
-   <csHelpTopic viewID="launch_configuration_dialog_source_tab" helpTopic=".cdt_u_run_dbg_srce"/>
-   <csHelpTopic viewID="QNX" helpTopic=".cdt_u_run_dbg_comm"/>
-   <csHelpTopic viewID="C_EDITOR_PREF_PAGE" helpTopic=".cdt_u_c_editor_gen"/>
-   <csHelpTopic viewID="C_EDITOR_PREF_PAGE" helpTopic=".cdt_u_c_editor_anno"/>
-   <csHelpTopic viewID="C_EDITOR_PREF_PAGE" helpTopic=".cdt_u_c_editor_color"/>
-   <csHelpTopic viewID="C_EDITOR_PREF_PAGE" helpTopic=".cdt_u_c_editor_con_assist"/>
-   <csHelpTopic viewID="TEMPLATE_PREFERENCE_PAGE" helpTopic=".cdt_u_code_temp"/>
-   <csHelpTopic viewID="C_SEARCH_PAGE" helpTopic=".cdt_u_search"/>
+   <csHelpTopic viewID="cdt_make_builder_page" helpTopic="cdt_u_newproj_buildset"/>
+   <csHelpTopic viewID="cdt_error_parsers_page" helpTopic="cdt_u_newproj_parser_error"/>
+   <csHelpTopic viewID="cdt_binary_parser_page" helpTopic="cdt_u_newproj_parser_binary"/>
+   <csHelpTopic viewID="cdt_paths_symbols_page" helpTopic="cdt_u_newproj_pathsymb"/>
+   <csHelpTopic viewID="man_proj_platform_help" helpTopic="cdt_u_newproj_platf"/>
+   <csHelpTopic viewID="registers_view_context" helpTopic="cdt_u_registersview"/>
+   <csHelpTopic viewID="registers_preference_page_context" helpTopic="cdt_u_reg_view_pref"/>
+   <csHelpTopic viewID="memory_view_context" helpTopic="cdt_u_memoryview"/>
+   <csHelpTopic viewID="memory_preference_page_context" helpTopic="cdt_u_mem_view_pref"/>
+   <csHelpTopic viewID="shared_libraries_view_context" helpTopic="cdt_u_shared_lib_view"/>
+   <csHelpTopic viewID="shared_libraries_preference_page_context" helpTopic="cdt_u_shared_lib_view_pref"/>
+   <csHelpTopic viewID="signals_view_context" helpTopic="cdt_u_signals_view"/>
+   <csHelpTopic viewID="c_debug_preference_page_context" helpTopic="cdt_u_dbg_pref"/>
+   <csHelpTopic viewID="mi_preference_page_context" helpTopic="cdt_u_gdb_mi_pref"/>
+   <csHelpTopic viewID="launch_configuration_dialog_main_tab" helpTopic="cdt_u_run_dbg_main"/>
+   <csHelpTopic viewID="launch_configuration_dialog_arguments_tab" helpTopic="cdt_u_run_dbg_arg"/>
+   <csHelpTopic viewID="launch_configuration_dialog_environment_tab" helpTopic="cdt_u_run_dbg_env"/>
+   <csHelpTopic viewID="launch_configuration_dialog_debugger_tab" helpTopic="cdt_u_run_dbg_dbg"/>
+   <csHelpTopic viewID="launch_configuration_dialog_source_tab" helpTopic="cdt_u_run_dbg_srce"/>
+   <csHelpTopic viewID="new_c_editor_pref_page_context" helpTopic="cdt_u_c_editor_gen"/>
+   <csHelpTopic viewID="new_c_editor_annotations_pref_page_context" helpTopic="cdt_u_c_editor_anno"/>
+   <csHelpTopic viewID="c_editor_colors_pref_page_context" helpTopic="cdt_u_c_editor_color"/>
+   <csHelpTopic viewID="C_EDITOR_PREF_PAGE" helpTopic="cdt_u_c_editor_con_assist"/>
+   <csHelpTopic viewID="new_c_templates_pref_page_context" helpTopic="cdt_u_code_temp"/>
+   <csHelpTopic viewID="c_search_page" helpTopic="cdt_u_search"/>
 </csHelp>
diff --git a/doc/org.eclipse.cdt.doc.user/plugin.xml b/doc/org.eclipse.cdt.doc.user/plugin.xml
index 0e3b35b210b..48c54e581d1 100644
--- a/doc/org.eclipse.cdt.doc.user/plugin.xml
+++ b/doc/org.eclipse.cdt.doc.user/plugin.xml
@@ -9,7 +9,7 @@
 
    name = "C/C++ Development User Guide"
    id = "org.eclipse.cdt.doc.user"
-   version = "1.0"
+   version = "1.2.0.57"
   provider-name = "Rational Software: IBM Software Group">
    <!-- Configure the help contribution for this plugin --> 
    <!-- This part should be in a documentation plugin -->
@@ -17,12 +17,18 @@
        <toc file="toc.xml" primary="true" /> 
    </extension>
    <extension point="org.eclipse.help.contexts">
-       <contexts file="contextHelp.xml" plugin="org.eclipse.cdt.ui"/> 
+       <contexts file="contexts_CDT.xml" plugin="org.eclipse.cdt.ui"/> 
    </extension>
    <extension point="org.eclipse.help.contexts">
-       <contexts file="contextHelp.xml" plugin="org.eclipse.debug.ui"/> 
+       <contexts file="contexts_CDT_DEBUGGER.xml" plugin="org.eclipse.cdt.debug.ui"/> 
    </extension>
    <extension point="org.eclipse.help.contexts">
-       <contexts file="contextHelp.xml" plugin="org.eclipse.cdt.debug.ui"/> 
+       <contexts file="contexts_CDT_DEBUGGER_MI.xml" plugin="org.eclipse.cdt.debug.mi.ui"/> 
+   </extension>
+   <extension point="org.eclipse.help.contexts">
+       <contexts file="contexts_CDT_make.xml" plugin="org.eclipse.cdt.make.ui"/> 
+   </extension>
+   <extension point="org.eclipse.help.contexts">
+       <contexts file="contexts_CDT_LAUNCH.xml" plugin="org.eclipse.cdt.launch"/> 
    </extension>
 </plugin>