diff --git a/doc/org.eclipse.cdt.doc.user/contextHelp.xml b/doc/org.eclipse.cdt.doc.user/contextHelp.xml
index c977043dc1f..f735ac6a5f4 100644
--- a/doc/org.eclipse.cdt.doc.user/contextHelp.xml
+++ b/doc/org.eclipse.cdt.doc.user/contextHelp.xml
@@ -5,4 +5,88 @@
    	label="Default Context Sensitive Help"/>
 </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"/>
+</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"/>
+</context>
+
+<context id ="cdt_u_newproj_parser_binary">
+   <description>Click below to see help</description>
+   <topic href="cdt_u_newproj_parser_binary.htm"
+   	label="Binary Parser page, C/C++ New Project wizard"/>
+</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"/>
+</context>
+
+<context id ="cdt_u_outlineview">
+   <description>Click below to see help</description>
+   <topic href="topic_under_dev.htm"
+   	label="Outline view"/>
+</context>
+
+<context id ="cdt_u_registersview">
+   <description>Click below to see help</description>
+   <topic href="topic_under_dev.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"
+   	label="Registers view preferences"/>
+</context>
+
+<context id ="cdt_u_memoryview">
+   <description>Click below to see help</description>
+   <topic href="topic_under_dev.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"
+   	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"
+   	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"
+   	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"
+   	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>
+
+<context id ="cdt_u_search">
+   <description>Click below to see help</description>
+   <topic href="topic_under_dev.htm"
+   	label="C/C++ Search page, Search dialog box"/>
+</context>
+
 </contexts>
diff --git a/doc/org.eclipse.cdt.doc.user/doc.zip b/doc/org.eclipse.cdt.doc.user/doc.zip
index 072a3f506a2..47d0d77ae8f 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 d08bb2dc56d..5384c160d0b 100644
--- a/doc/org.eclipse.cdt.doc.user/plugin.properties
+++ b/doc/org.eclipse.cdt.doc.user/plugin.properties
@@ -1,4 +1,18 @@
 <?xml version="1.0"?>
 <csHelp>
-   <csHelpTopic viewID="default_help" helpTopic="com.rational.xtools.umlvisualizer.doc.default_cs_help"/>
+   <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="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="QNX" helpTopic=".cdt_u_dbg_view"/>
+   <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 87a23a73177..31ac45b7778 100644
--- a/doc/org.eclipse.cdt.doc.user/toc.xml
+++ b/doc/org.eclipse.cdt.doc.user/toc.xml
@@ -3,31 +3,27 @@
 <!-- Defines topics that will be inserted under the C/C++ Development User Guide menu-->
 
 <toc id="cdt" label="C/C++ Development User Guide" topic="cdt_o_home.htm">
-     <topic label="Getting Started" href="cdt_o_getstart.htm">
-          <topic label="Overview of the CDT" href="cdt_c_over_cdt.htm"/>
-          <topic label="Working with existing code" href="cdt_w_existing_code.htm"/>
-          <topic label="What's new" href="cdt_c_whatsnew.htm"/>
-          <topic label="Tutorial" href="cdt_o_tutorial.htm">
-               <topic label="Setting build preferences" href="cdt_w_autobuild.htm"/>
-               <topic label="Creating your project" href="cdt_w_newproj.htm"/>
-               <topic label="Creating your C++ file" href="cdt_w_newcpp.htm"/>
-               <topic label="Creating your makefile" href="cdt_w_newmake.htm"/>
-               <topic label="Building your project" href="cdt_w_build.htm"/>
-               <topic label="Debugging your project" href="cdt_w_debug.htm"/>
-          </topic>
+     <topic label="Tutorial" href="cdt_o_tutorial.htm">
+          <topic label="Creating your project" href="cdt_w_newproj.htm"/>
+          <topic label="Creating your C++ file" href="cdt_w_newcpp.htm"/>
+          <topic label="Creating your makefile" href="cdt_w_newmake.htm"/>
+          <topic label="Building your project" href="cdt_w_build.htm"/>
+          <topic label="Debugging your project" href="cdt_w_debug.htm"/>
      </topic>
      <topic label="Concepts" href="cdt_o_concepts.htm">
-          <topic label="C/C++ Development perspective" href="cdt_c_perspect.htm"/>
+          <topic label="What's new" href="cdt_c_whatsnew.htm"/>
+          <topic label="CDT overview" href="cdt_c_over_cdt.htm"/>
+          <topic label="How to bring C/C++ source files into Eclipse" href="cdt_w_existing_code.htm"/>
           <topic label="CDT Projects" href="cdt_o_projects.htm">
-               <topic label="CDT Projects" href="cdt_c_projects.htm"/>
+               <topic label="CDT projects" href="cdt_c_projects.htm"/>
                <topic label="Project file views" href="cdt_c_proj_file_views.htm"/>
           </topic>
-          <topic label="Code entry" href="cdt_o_code_entry.htm">
+          <topic label="Coding aids" href="cdt_o_code_entry.htm">
                <topic label="Outline view" href="cdt_c_outlineview.htm"/>
                <topic label="Comments" href="cdt_c_comments.htm"/>
                <topic label="Content assist" href="cdt_c_content_assist.htm"/>
-               <topic label="Search" href="cdt_c_search.htm"/>
-               <topic label="Open Declarations" href="cdt_c_open_declarations.htm"/>
+               <topic label="C/C ++ search" href="cdt_c_search.htm"/>
+               <topic label="Open declarations" href="cdt_c_open_declarations.htm"/>
           </topic>
           <topic label="Build" href="cdt_o_build_conc.htm">
                <topic label="Build overview" href="cdt_c_build_over.htm"/>
@@ -39,47 +35,39 @@
      </topic>
      <topic label="Tasks" href="cdt_o_tasks.htm">
           <topic label="Updating the CDT" href="cdt_t_update_man.htm"/>
-          <topic label="Creating a project" href="cdt_o_new_projects.htm">
-               <topic label="Creating a Standard Make C or C++ Project" href="cdt_o_new_stand_projects.htm">
-                    <topic label="Naming a project" href="cdt_t_new_proj_name.htm"/>
-                    <topic label="Selecting referenced projects" href="cdt_t_new_proj_ref.htm"/>
-                    <topic label="Defining build settings" href="cdt_t_new_proj_build_set.htm"/>
-                    <topic label="Selecting a binary parser" href="cdt_t_new_proj_parser.htm"/>
-                    <topic label="Including paths and symbols" href="cdt_t_new_proj_paths.htm"/>
-               </topic>
-               <topic label="Creating a Managed Make C or C++ Project" href="cdt_o_new_man_projects.htm">
-                    <topic label="Naming a project" href="cdt_t_man_proj_name.htm"/>
-                    <topic label="Select a platform" href="cdt_t_man_proj_platf.htm"/>
-                    <topic label="Selecting referenced projects" href="cdt_t_new_proj_ref.htm"/>
-                    <topic label="Selecting a binary parser" href="cdt_t_new_proj_parser.htm"/>
-               </topic>
+          <topic label="Creating a project" href="cdt_t_proj_new.htm"/>
+          <topic label="Defining project properties" href="cdt_o_proj_prop.htm">
+               <topic label="Renaming a project" href="cdt_t_proj_rename.htm"/>
+               <topic label="Selecting referenced projects" href="cdt_t_proj_ref.htm"/>
+               <topic label="Defining build settings" href="cdt_t_proj_build_set.htm"/>
+               <topic label="Filtering errors" href="cdt_t_proj_error_parser.htm"/>
+               <topic label="Selecting a binary parser" href="cdt_t_proj_parser.htm"/>
+               <topic label="Including paths and symbols" href="cdt_t_proj_paths.htm"/>
+               <topic label="Select a deployment platform" href="cdt_t_proj_platf.htm"/>
           </topic>
           <topic label="Working with C/C++ project files" href="cdt_o_proj_files.htm">
                <topic label="Displaying C/C++ file components in the C/C++ Projects view" href="cdt_t_show_proj_files.htm"/>
-               <topic label="Converting to a C or C++ Project" href="cdt_t_conv_proj.htm"/>
-               <topic label="Creating a .cpp file" href="cdt_t_new_cpp.htm"/>
+               <topic label="Assigning a C or C++ nature to a project" href="cdt_t_conv_proj.htm"/>
+               <topic label="Creating a C/C++ file" href="cdt_t_new_cpp.htm"/>
                <topic label="Creating a makefile" href="cdt_t_new_make.htm"/>
-               <topic label="Hiding files by type" href="cdt_t_prvw_hide_files.htm"/>
-               <topic label="Searching" href="cdt_t_search.htm"/>
-               <topic label="Opening declarations" href="cdt_t_open_declarations.htm"/>
+               <topic label="Hiding files by type in the C/C++ Projects view" href="cdt_t_prvw_hide_files.htm"/>
           </topic>
           <topic label="Writing code" href="cdt_o_write_code.htm">
                <topic label="Customizing the C/C++ editor" href="cdt_t_cust_cpp_editor.htm"/>
-               <topic label="Adding #include directives" href="cdt_t_addincludedirectives.htm"/>
                <topic label="Commenting out code" href="cdt_t_comment_out.htm"/>
+               <topic label="Shifting lines of code to the right or left" href="cdt_t_shift_code.htm"/>
+               <topic label="Searching for C/C++ elements" href="cdt_t_search.htm"/>
+               <topic label="Navigating to C/C++ declarations" href="cdt_t_open_declarations.htm"/>
                <topic label="Working with content assist" href="cdt_o_con_assist.htm">
                     <topic label="Using Content Assist" href="cdt_t_contentassist.htm"/>
                     <topic label="Creating and editing code templates" href="cdt_t_add_codetemp.htm"/>
                     <topic label="Importing and exporting code templates" href="cdt_t_imp_code_temp.htm"/>
                </topic>
-               <topic label="Shifting lines of code to the right or left" href="cdt_t_shift_code.htm"/>
           </topic>
-          <topic label="Building" href="cdt_o_build_task.htm">
+          <topic label="Building projects" href="cdt_o_build_task.htm">
                <topic label="Setting a build order" href="cdt_t_setbuildorder.htm"/>
-               <topic label="Automatically building when resources are modified" href="cdt_t_autobuild.htm"/>
                <topic label="Manually building" href="cdt_t_manualbuild.htm"/>
                <topic label="Autosaving on a manual build" href="cdt_t_autosave.htm"/>
-               <topic label="Specifying build settings" href="cdt_t_build_set.htm"/>
                <topic label="Adding 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">
@@ -88,27 +76,26 @@
                     <topic label="Setting reminders" href="cdt_t_setreminder.htm"/>
                </topic>
           </topic>
-          <topic label="Running" href="cdt_o_run.htm">
-               <topic label="Creating or editing a run configuration" href="cdt_o_run_config.htm">
-                    <topic label="Creating a run configuration" href="cdt_t_new_run_config.htm"/>
+          <topic label="Running and Debugging" href="cdt_o_run.htm">
+               <topic label="Selecting a run/debug configuration" href="cdt_t_run_config.htm"/>
+               <topic label="Creating or editing a run/debug configuration" href="cdt_o_run_config.htm">
+                    <topic label="Creating a run/debug configuration" href="cdt_t_new_run_config.htm"/>
                     <topic label="Selecting an application to run" href="cdt_t_run_main.htm"/>
                     <topic label="Specifying execution arguments" href="cdt_t_run_arg.htm"/>
                     <topic label="Setting environment variables" href="cdt_t_run_env.htm"/>
-                    <topic label="Selecting a debugger" href="cdt_t_run_dbg.htm"/>
+                    <topic label="Defining debug settings" href="cdt_t_run_dbg.htm"/>
                     <topic label="Specifying the location of source files" href="cdt_t_run_source.htm"/>
                     <topic label="Specifying the location of the run configuration" href="cdt_t_run_com.htm"/>
                </topic>
-          </topic>
-          <topic label="Selecting a run configuration" href="cdt_t_run_config.htm"/>
-          <topic label="Debugging" href="cdt_o_debug.htm">
-               <topic label="Debugging a program" href="cdt_t_debug_prog.htm"/>
-               <topic label="Working with breakpoints and watchpoints" href="cdt_o_brkpnts_watch.htm">
+               <topic label="Debugging" href="cdt_o_debug.htm"/>
+               <topic label="Debugging a program" href="cdt_t_debug_prog.htm">
+                    <topic label="Working with breakpoints and watchpoints" href="cdt_o_brkpnts_watch.htm"/>
                     <topic label="Adding breakpoints" href="cdt_t_add_brkpnts.htm"/>
                     <topic label="Adding watchpoints" href="cdt_t_add_watch.htm"/>
                     <topic label="Removing breakpoints and watchpoints" href="cdt_t_rem_wtch_brk.htm"/>
                     <topic label="Enabling and disabling breakpoints" href="cdt_t_endis_able_brk_wtch.htm"/>
                </topic>
-               <topic label="Controlling your debug execution" href="cdt_t_controldebug.htm"/>
+               <topic label="Controlling debug execution in the debug view" href="cdt_t_controldebug.htm"/>
                <topic label="Stepping into assembler functions" href="cdt_t_disassembly.htm"/>
                <topic label="Working with variables" href="cdt_t_variables.htm"/>
                <topic label="Working with expressions" href="cdt_t_expressions.htm"/>
@@ -118,56 +105,47 @@
      </topic>
      <topic label="Reference" href="topic_under_dev.htm">
           <topic label="User Interface Reference" href="topic_under_dev.htm">
-               <topic label="New Project dialog box" href="topic_under_dev.htm">
-                    <topic label="Standard Make C++ Project" href="topic_under_dev.htm">
-                         <topic label="Projects Tab, New Project Dialog Box" href="topic_under_dev.htm"/>
-                         <topic label="Build Settings Tab, New Project Dialog Box" href="topic_under_dev.htm"/>
-                    </topic>
-                    <topic label="Convert to a C or C++ Project" href="topic_under_dev.htm"/>
-                    <topic label="Managed Make C++ Project" href="topic_under_dev.htm">
-                         <topic label="Projects Tab, New Project Dialog Box" href="topic_under_dev.htm"/>
-                    </topic>
+               <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="C/C++ editor" href="topic_under_dev.htm"/>
-               <topic label="C/C++ views" href="topic_under_dev.htm">
+               <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 Perspective" href="topic_under_dev.htm">
-                         <topic label="Debug view" href="cdt_u_dbg_view.htm"/>
-                         <topic label="Debug launch controls" href="cdt_u_debuglaunch.htm"/>
-                         <topic label="Memory 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="Breakpoints view" href="topic_under_dev.htm"/>
-                         <topic label="Expressions 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="Outline view" href="topic_under_dev.htm"/>
-               <topic label="Tasks view" href="topic_under_dev.htm"/>
-               <topic label="Preferences" href="topic_under_dev.htm">
-                    <topic label="Build Console" href="topic_under_dev.htm"/>
-                    <topic label="C/C++ Editor" href="topic_under_dev.htm">
-                         <topic label="General Tab, Preferences Dialog Box" href="topic_under_dev.htm"/>
-                         <topic label="Annotations Tab, Preferences Dialog Box" href="topic_under_dev.htm"/>
-                         <topic label="Colors Tab, Preferences Dialog Box" href="topic_under_dev.htm"/>
-                         <topic label="Code Assist Tab, Preferences Dialog Box" href="topic_under_dev.htm"/>
-                    </topic>
-                    <topic label="Code Templates" href="topic_under_dev.htm"/>
-                    <topic label="Debug" href="topic_under_dev.htm"/>
-                    <topic label="Task Tags" href="topic_under_dev.htm"/>
+               <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="Menus" href="topic_under_dev.htm">
-                    <topic label="File" href="topic_under_dev.htm"/>
-                    <topic label="Edit" href="topic_under_dev.htm"/>
-                    <topic label="Navigate" href="topic_under_dev.htm"/>
-                    <topic label="Search" href="topic_under_dev.htm"/>
-                    <topic label="Project" href="topic_under_dev.htm"/>
-                    <topic label="Run" href="topic_under_dev.htm"/>
-                    <topic label="Window" href="topic_under_dev.htm"/>
-                    <topic label="Help" href="topic_under_dev.htm"/>
+               <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>
      </topic>
 </toc>