diff --git a/doc/org.eclipse.cdt.doc.user/contextHelp.xml b/doc/org.eclipse.cdt.doc.user/contextHelp.xml
index f735ac6a5f4..35b56198a9f 100644
--- a/doc/org.eclipse.cdt.doc.user/contextHelp.xml
+++ b/doc/org.eclipse.cdt.doc.user/contextHelp.xml
@@ -6,86 +6,164 @@
 </context>
 
 <context id ="cdt_u_newproj_buildset">
-   <description>Click below to see help</description>
-   <topic href="topic_under_dev.htm"
-   	label="Make Builder page, C/C++ New Project wizard"/>
+   <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_u_newproj_parser_error">
-   <description>Click below to see help</description>
-   <topic href="topic_under_dev.htm"
-   	label="Error Parsers, C/C++ New Project wizard"/>
+   <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_u_newproj_parser_binary">
-   <description>Click below to see help</description>
+   <description>Select a binary parser for the target platform. </description>
    <topic href="cdt_u_newproj_parser_binary.htm"
-   	label="Binary Parser page, C/C++ New Project wizard"/>
+   	label="Binary Parser page, C/C++ Properties window"/>
 </context>
 
 <context id ="cdt_u_newproj_pathsymb">
-   <description>Click below to see help</description>
-   <topic href="topic_under_dev.htm"
-   	label="Paths and Symbols page, C/C++ New Project wizard"/>
+   <description>Enter include paths and symbols. </description>
+   <topic href="cdt_u_newproj_pathsymb.htm"
+   	label="Paths and Symbols page, C/C++ Properties window"/>
 </context>
 
 <context id ="cdt_u_outlineview">
-   <description>Click below to see help</description>
-   <topic href="topic_under_dev.htm"
+   <description>View C/C++ file components. </description>
+   <topic href="cdt_u_outlineview.htm"
    	label="Outline view"/>
 </context>
 
+<context id ="cdt_u_cproj_view">
+   <description>Create and manage C/C++ files. </description>
+   <topic href="cdt_u_cproj_view.htm"
+   	label="C/C++ Projects view"/>
+</context>
+
 <context id ="cdt_u_registersview">
-   <description>Click below to see help</description>
-   <topic href="topic_under_dev.htm"
+   <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 ="cdt_u_reg_view_pref">
-   <description>Click below to see help</description>
-   <topic href="topic_under_dev.htm"
+   <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 ="cdt_u_memoryview">
-   <description>Click below to see help</description>
-   <topic href="topic_under_dev.htm"
+   <description>The memory view displays process memory. </description>
+   <topic href="cdt_u_memoryview.htm"
    	label="Memory view"/>
 </context>
 
 <context id ="cdt_u_mem_view_pref">
    <description>Click below to see help</description>
-   <topic href="topic_under_dev.htm"
+   <topic href="cdt_u_mem_view_pref.htm"
    	label="Memory view preferences"/>
 </context>
 
 <context id ="cdt_u_shared_lib_view">
    <description>Click below to see help</description>
-   <topic href="topic_under_dev.htm"
+   <topic href="cdt_u_shared_lib_view.htm"
    	label="Shared Libraries view"/>
 </context>
 
 <context id ="cdt_u_shared_lib_view_pref">
-   <description>Click below to see help</description>
-   <topic href="topic_under_dev.htm"
+   <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 ="cdt_u_signals_view">
    <description>Click below to see help</description>
-   <topic href="topic_under_dev.htm"
+   <topic href="cdt_u_signals_view.htm"
    	label="Signals view"/>
 </context>
 
-<context id ="cdt_u_dbg_view">
-   <description>Click below to see help</description>
-   <topic href="topic_under_dev.htm"
-   	label="Debug view"/>
+<context id ="cdt_u_dbg_pref">
+   <description>View information about your program as you debug. </description>
+   <topic href="cdt_u_dbg_pref.htm"
+   	label="Debug preferences"/>
+</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>
+
+<context id ="cdt_u_run_dbg_main">
+   <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 ="cdt_u_run_dbg_arg">
+   <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 ="cdt_u_run_dbg_env">
+   <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 ="cdt_u_run_dbg_dbg">
+   <description>Select a debugger. </description>
+   <topic href="cdt_u_run_dbg_dbg.htm"
+   	label="Debugger page, Run/Debug dialog box"/>
+</context>
+
+<context id ="cdt_u_run_dbg_srce">
+   <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>
+
+<context id ="cdt_u_run_dbg_comm">
+   <description>Specify where your run configuration is stored. </description>
+   <topic href="cdt_u_run_dbg_comm.htm"
+   	label="Common page, Run/Debug dialog box"/>
+</context>
+
+<context id ="cdt_u_c_editor_gen">
+   <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 ="cdt_u_c_editor_anno">
+   <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 ="cdt_u_c_editor_color">
+   <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 ="cdt_u_c_editor_con_assist">
+   <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 ="cdt_u_code_temp">
+   <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 ="cdt_u_search">
    <description>Click below to see help</description>
-   <topic href="topic_under_dev.htm"
+   <topic href="cdt_u_search.htm"
    	label="C/C++ Search page, Search dialog box"/>
 </context>
 
diff --git a/doc/org.eclipse.cdt.doc.user/doc.zip b/doc/org.eclipse.cdt.doc.user/doc.zip
index 47d0d77ae8f..f790cb2d38c 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 5384c160d0b..37cbef80a2e 100644
--- a/doc/org.eclipse.cdt.doc.user/plugin.properties
+++ b/doc/org.eclipse.cdt.doc.user/plugin.properties
@@ -6,6 +6,7 @@
    <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"/>
@@ -13,6 +14,18 @@
    <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="QNX" helpTopic=".cdt_u_dbg_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"/>
 </csHelp>
diff --git a/doc/org.eclipse.cdt.doc.user/toc.xml b/doc/org.eclipse.cdt.doc.user/toc.xml
index 31ac45b7778..fd021cc7072 100644
--- a/doc/org.eclipse.cdt.doc.user/toc.xml
+++ b/doc/org.eclipse.cdt.doc.user/toc.xml
@@ -68,7 +68,7 @@
                <topic label="Setting a build order" href="cdt_t_setbuildorder.htm"/>
                <topic label="Manually building" href="cdt_t_manualbuild.htm"/>
                <topic label="Autosaving on a manual build" href="cdt_t_autosave.htm"/>
-               <topic label="Adding a make target" href="cdt_t_addmaketarget.htm"/>
+               <topic label="Creating a make target" href="cdt_t_addmaketarget.htm"/>
                <topic label="Customizing the C-Build view" href="cdt_t_cbuild_pref.htm"/>
                <topic label="Viewing and managing compile errors" href="cdt_o_tasksview.htm">
                     <topic label="Jumping to errors" href="cdt_t_jumperror.htm"/>
@@ -103,49 +103,42 @@
                <topic label="Working with memory" href="cdt_t_memory.htm"/>
           </topic>
      </topic>
-     <topic label="Reference" href="topic_under_dev.htm">
-          <topic label="User Interface Reference" href="topic_under_dev.htm">
-               <topic label="New Project wizard" href="topic_under_dev.htm">
-                    <topic label="Make Builder page, C/C++ New Project wizard" href="topic_under_dev.htm"/>
-                    <topic label="Error Parsers, C/C++ New Project wizard" href="topic_under_dev.htm"/>
-                    <topic label="Paths and Symbols page, C/C++ New Project wizard" href="topic_under_dev.htm"/>
-                    <topic label="Target platform, C/C++ New Project wizard" href="topic_under_dev.htm"/>
-               </topic>
-               <topic label="Views" href="topic_under_dev.htm">
-                    <topic label="Outline view" href="topic_under_dev.htm"/>
-                    <topic label="C/C++ Projects view" href="topic_under_dev.htm"/>
-                    <topic label="C-Build view" href="topic_under_dev.htm"/>
-                    <topic label="Make Targets view" href="topic_under_dev.htm"/>
-                    <topic label="Debug views" href="topic_under_dev.htm">
-                         <topic label="Registers view" href="topic_under_dev.htm"/>
-                         <topic label="Registers view preferences" href="topic_under_dev.htm"/>
-                         <topic label="Memory view" href="topic_under_dev.htm"/>
-                         <topic label="Memory view preferences" href="topic_under_dev.htm"/>
-                         <topic label="Shared Libraries view" href="topic_under_dev.htm"/>
-                         <topic label="Shared Libraries view preferences" href="topic_under_dev.htm"/>
-                         <topic label="Signals view" href="topic_under_dev.htm"/>
-                         <topic label="Variables view" href="topic_under_dev.htm"/>
-                         <topic label="Debug view" href="topic_under_dev.htm"/>
-                         <topic label="Debug preferences" href="topic_under_dev.htm"/>
-                         <topic label="GDB MI preference page" href="topic_under_dev.htm"/>
-                    </topic>
-               </topic>
-               <topic label="Run and Debug" href="topic_under_dev.htm">
-                    <topic label="Main page, Run/Debug dialog box" href="topic_under_dev.htm"/>
-                    <topic label="Arguments page, Run/Debug dialog box" href="topic_under_dev.htm"/>
-                    <topic label="Environment page, Run/Debug dialog box" href="topic_under_dev.htm"/>
-                    <topic label="Debugger page, Run/Debug dialog box" href="topic_under_dev.htm"/>
-                    <topic label="Source page, Run/Debug dialog box" href="topic_under_dev.htm"/>
-                    <topic label="Common page, Run/Debug dialog box" href="topic_under_dev.htm"/>
-               </topic>
-               <topic label="C/C++ editor" href="topic_under_dev.htm">
-                    <topic label="General page, Preferences window" href="topic_under_dev.htm"/>
-                    <topic label="Annotations page, Preferences window" href="topic_under_dev.htm"/>
-                    <topic label="Colors page, Preferences window" href="topic_under_dev.htm"/>
-                    <topic label="Code Assist page, Preferences window" href="topic_under_dev.htm"/>
-               </topic>
-               <topic label="Code Templates page, Preferences window" href="topic_under_dev.htm"/>
-               <topic label="C/C++ Search page, Search dialog box" href="topic_under_dev.htm"/>
+     <topic label="Reference" href="cdt_o_ref.htm">
+          <topic label="Project properties" href="cdt_o_proj_prop_pages.htm">
+               <topic label="Make Builder page, C/C++ Properties window" href="cdt_u_newproj_buildset.htm"/>
+               <topic label="Error Parsers, C/C++ Properties window" href="cdt_u_newproj_parser_error.htm"/>
+               <topic label="Binary Parser page, C/C++ Properties window" href="cdt_u_newproj_parser_binary.htm"/>
+               <topic label="Paths and Symbols page, C/C++ Properties window" href="cdt_u_newproj_pathsymb.htm"/>
+               <topic label="Target platform, C/C++ Properties window" href="cdt_u_newproj_platf.htm"/>
           </topic>
+          <topic label="Views" href="cdt_o_views.htm">
+               <topic label="Outline view" href="cdt_u_outlineview.htm"/>
+               <topic label="C/C++ Projects view" href="cdt_u_cproj_view.htm"/>
+               <topic label="Debug views" href="cdt_o_dbg_view.htm">
+                    <topic label="Registers view" href="cdt_u_registersview.htm"/>
+                    <topic label="Memory view" href="cdt_u_memoryview.htm"/>
+                    <topic label="Memory view preferences" href="cdt_u_mem_view_pref.htm"/>
+                    <topic label="Shared Libraries view" href="cdt_u_shared_lib_view.htm"/>
+                    <topic label="Signals view" href="cdt_u_signals_view.htm"/>
+                    <topic label="Debug view" href="cdt_u_dbg_view.htm"/>
+                    <topic label="Debug preferences" href="cdt_u_dbg_pref.htm"/>
+               </topic>
+          </topic>
+          <topic label="Run and Debug" href="cdt_o_run_dbg_pages.htm">
+               <topic label="Main page, Run/Debug dialog box" href="cdt_u_run_dbg_main.htm"/>
+               <topic label="Arguments page, Run/Debug dialog box" href="cdt_u_run_dbg_arg.htm"/>
+               <topic label="Environment page, Run/Debug dialog box" href="cdt_u_run_dbg_env.htm"/>
+               <topic label="Debugger page, Run/Debug dialog box" href="cdt_u_run_dbg_dbg.htm"/>
+               <topic label="Source page, Run/Debug dialog box" href="cdt_u_run_dbg_srce.htm"/>
+               <topic label="Common page, Run/Debug dialog box" href="cdt_u_run_dbg_comm.htm"/>
+          </topic>
+          <topic label="C/C++ editor, code templates and search preferences preferences" href="cdt_o_ceditor_pref.htm">
+               <topic label="General page, Preferences window" href="cdt_u_c_editor_gen.htm"/>
+               <topic label="Annotations page, Preferences window" href="cdt_u_c_editor_anno.htm"/>
+               <topic label="Colors page, Preferences window" href="cdt_u_c_editor_color.htm"/>
+               <topic label="Content Assist page, Preferences window" href="cdt_u_c_editor_con_assist.htm"/>
+          </topic>
+          <topic label="Code Templates page, Preferences window" href="cdt_u_code_temp.htm"/>
+          <topic label="C/C++ Search page, Search dialog box" href="cdt_u_search.htm"/>
      </topic>
 </toc>