diff --git a/doc/org.eclipse.cdt.doc.user/contexts_CDT.xml b/doc/org.eclipse.cdt.doc.user/contexts_CDT.xml
index a268c5144de..88b33a9a387 100644
--- a/doc/org.eclipse.cdt.doc.user/contexts_CDT.xml
+++ b/doc/org.eclipse.cdt.doc.user/contexts_CDT.xml
@@ -70,7 +70,7 @@
 <context id ="c_editor_gen">
    <description>Click below to see help.</description>
    <topic href="reference/cdt_u_c_editor_gen.htm"
-   	label="C/C++ Editor Preferences"/>
+   	label="C/C++ Editor Advanced Preferences"/>
 </context>
 <context id ="c_editor_color">
    <description>Click below to see help.</description>
@@ -404,7 +404,7 @@
 </context>       
 <context id="cdt_u_prop_build_setting_errparser">
    <description></description>
-   <topic href="reference/cdt_u_prop_build_setting_errparser.htm"    	
+   <topic href="reference/cdt_u_prop_build_settings_errparser.htm"    	
    label="Error Parsers"/> 
 </context>       
 <context id="cdt_u_prop_build_toolchain">
@@ -496,6 +496,10 @@
    <description></description>
    <topic href="reference/cdt_u_pref_prop_pages.htm"    	
    label="Property Pages Settins tab"/> 
+</context>
+<context id="tasktags_preference_page_context" title="Task Tags (C/C++)">
+   <description>Create todo task tags.</description>
+   <topic href="reference/cdt_u_pref_task_tags.htm" label="Task Tags preference"/>
 </context>                   
 <context id="cdt_u_pref_wizard_defaults">
    <description></description>
diff --git a/doc/org.eclipse.cdt.doc.user/contexts_CDT_DEBUGGER.xml b/doc/org.eclipse.cdt.doc.user/contexts_CDT_DEBUGGER.xml
index 5d801719fcd..94e5ba230eb 100644
--- a/doc/org.eclipse.cdt.doc.user/contexts_CDT_DEBUGGER.xml
+++ b/doc/org.eclipse.cdt.doc.user/contexts_CDT_DEBUGGER.xml
@@ -125,5 +125,14 @@
    <topic href="reference/cdt_u_view_executables.htm.htm"
    	label="&executablesView;"/>
 </context>
+<context id="breakpoint_actions_page_help" title="Breakpoint Actions">
+   <description>Manage breakpoint actions.</description>
+   <topic href="reference/cdt_u_dbg_brkpt_actions.htm" label="Breakpoint Actions preferences"/>
+   <topic href="tasks/cdt_t_addrmv_brk_action.htm" label="Attaching and Removing Breakpoint Actions"/>
+</context>
+<context id="source_preference_page_context" title="Common Source Lookup Path">
+   <description>Manage common source paths.</description>
+   <topic href="reference/cdt_u_dbg_src.htm" label="Common Source Lookup Path"/>
+</context>
 
 </contexts>