diff --git a/doc/org.eclipse.cdt.doc.user/contexts_CDT.xml b/doc/org.eclipse.cdt.doc.user/contexts_CDT.xml
index c386ab1c6a2..a0c1b1a1ab1 100644
--- a/doc/org.eclipse.cdt.doc.user/contexts_CDT.xml
+++ b/doc/org.eclipse.cdt.doc.user/contexts_CDT.xml
@@ -27,25 +27,25 @@
    	label="Target platform, C/C++ Properties window"/>
 </context>
 
-<context id ="c_editor_pref_page">
+<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 ="c_editor_annotations_pref_page">
+<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 ="c_editor_colors_pref_page">
+<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 ="c_editor_content_assist_pref_page">
+<context id ="new_c_editor_content_assist_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"/>
diff --git a/doc/org.eclipse.cdt.doc.user/doc.zip b/doc/org.eclipse.cdt.doc.user/doc.zip
index 72b990136aa..0690e7dcee0 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 81229ce7d76..66740877105 100644
--- a/doc/org.eclipse.cdt.doc.user/plugin.properties
+++ b/doc/org.eclipse.cdt.doc.user/plugin.properties
@@ -20,10 +20,10 @@
    <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="c_editor_pref_page" helpTopic="cdt_u_c_editor_gen"/>
-   <csHelpTopic viewID="c_editor_annotations_pref_page" helpTopic="cdt_u_c_editor_anno"/>
-   <csHelpTopic viewID="c_editor_colors_pref_page" helpTopic="cdt_u_c_editor_color"/>
-   <csHelpTopic viewID="c_editor_content_assist_pref_page" helpTopic="cdt_u_c_editor_con_assist"/>
+   <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="new_c_editor_colors_pref_page_context" helpTopic="cdt_u_c_editor_color"/>
+   <csHelpTopic viewID="new_c_editor_content_assist_pref_page_context" 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/toc.xml b/doc/org.eclipse.cdt.doc.user/toc.xml
index fd021cc7072..4599ad11bb6 100644
--- a/doc/org.eclipse.cdt.doc.user/toc.xml
+++ b/doc/org.eclipse.cdt.doc.user/toc.xml
@@ -77,9 +77,9 @@
                </topic>
           </topic>
           <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="Selecting a run or 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="Creating a run or 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"/>
@@ -98,7 +98,7 @@
                <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"/>
+               <topic label="Adding expressions" href="cdt_t_expressions.htm"/>
                <topic label="Working with registers" href="cdt_t_registers.htm"/>
                <topic label="Working with memory" href="cdt_t_memory.htm"/>
           </topic>
@@ -113,7 +113,6 @@
           </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"/>
@@ -132,13 +131,13 @@
                <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="C/C++ editor, code templates and search 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 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>
-          <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>