diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/ICDebugHelpContextIds.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/ICDebugHelpContextIds.java
index 0da8416e80f..3dc14d81de6 100644
--- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/ICDebugHelpContextIds.java
+++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/ICDebugHelpContextIds.java
@@ -7,6 +7,7 @@
  *
  * Contributors:
  *     QNX Software Systems - Initial API and implementation
+ *     Markus Schorn (Wind River Systems)
  *******************************************************************************/
 
 package org.eclipse.cdt.debug.internal.ui;
@@ -52,7 +53,10 @@ public interface ICDebugHelpContextIds {
     public static final String SHOW_COLUMNS_ACTION = PREFIX + "show_columns_context"; //$NON-NLS-1$;
 
 	// Views & Editors
-	public static final String MEMORY_VIEW = PREFIX + "memory_view_context"; //$NON-NLS-1$
+	/** 
+	 * The memory view is part of the platform, the context id is assigned there.
+	 */
+	public static final String MEMORY_VIEW = PREFIX + "MemoryView_context"; //$NON-NLS-1$
 	public static final String SHARED_LIBRARIES_VIEW = PREFIX + "shared_libraries_view_context"; //$NON-NLS-1$
 	public static final String MODULES_VIEW = PREFIX + "modules_view_context"; //$NON-NLS-1$
 	public static final String SIGNALS_VIEW = PREFIX + "signals_view_context"; //$NON-NLS-1$
diff --git a/doc/org.eclipse.cdt.doc.user/contexts_CDT.xml b/doc/org.eclipse.cdt.doc.user/contexts_CDT.xml
index 89f93f51059..2a6f4da3f9b 100644
--- a/doc/org.eclipse.cdt.doc.user/contexts_CDT.xml
+++ b/doc/org.eclipse.cdt.doc.user/contexts_CDT.xml
@@ -33,11 +33,6 @@
    <topic href="reference/cdt_u_editor_view.htm"
    	label="Editor view"/>
 </context>
-<context id ="console_view">
-   <description>Click below to see help.</description>
-   <topic href="reference/cdt_u_console_view.htm"
-   	label="Console view"/>
-</context>
 <context id ="problems_view">
    <description>Click below to see help.</description>
    <topic href="reference/cdt_u_problems_view.htm"
@@ -53,41 +48,6 @@
    <topic href="reference/cdt_u_search_view.htm"
    	label="Search view"/>
 </context>
-<context id ="registers_view">
-   <description>Click below to see help.</description>
-   <topic href="reference/cdt_u_registersview.htm"
-   	label="Registers view"/>
-</context>
-<context id ="memory_view">
-   <description>Click below to see help.</description>
-   <topic href="reference/cdt_u_memoryview.htm"
-   	label="Memory view"/>
-</context>
-<context id ="mem_view_pref">
-   <description>Click below to see help.</description>
-   <topic href="reference/cdt_u_mem_view_pref.htm"
-   	label="Memory view preferences"/>
-</context>
-<context id ="modules_view">
-   <description>Click below to see help.</description>
-   <topic href="reference/cdt_u_modules_view.htm"
-   	label="Modules view"/>
-</context>
-<context id ="signals_view">
-   <description>Click below to see help.</description>
-   <topic href="reference/cdt_u_signals_view.htm"
-   	label="Signals view"/>
-</context>
-<context id ="dbg_view">
-   <description>Click below to see help.</description>
-   <topic href="reference/cdt_u_dbg_view.htm"
-   	label="Debug view"/>
-</context>
-<context id ="dbg_pref">
-   <description>Click below to see help.</description>
-   <topic href="reference/cdt_u_dbg_pref.htm"
-   	label="Debug preferences"/>
-</context>
 <context id ="find_replace">
    <description>Click below to see help.</description>
    <topic href="reference/cdt_u_find_replace.htm"
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 de8d7aa2930..39cc3544c0f 100644
--- a/doc/org.eclipse.cdt.doc.user/contexts_CDT_DEBUGGER.xml
+++ b/doc/org.eclipse.cdt.doc.user/contexts_CDT_DEBUGGER.xml
@@ -15,10 +15,14 @@
 	<!ENTITY modulesView "Modules view">
 	<!ENTITY sharedLibsViewPrefs "Shared Libraries view preferences">
 	<!ENTITY signalsView "Signals view">
+	<!ENTITY disassemblyView "Disassembly view">
+	<!ENTITY breakpoints "Breakpoints">
+    <!ENTITY debugView "Debug view">
     <!ENTITY debugPrefs "Debug preferences">
     <!ENTITY srcPrefs "Source Code Locations">
     <!ENTITY importExe "Import C/C++ Executable Files">
     <!ENTITY chooseProj "Choose Project">
+	<!ENTITY consoleView "Console view">
 ]>
 <contexts>
 
@@ -40,12 +44,26 @@
    	label="&registersViewPrefs;"/>
 </context>
 
-<context id ="memory_view_context">
+<context id ="MemoryView_context">
    <description>The memory view displays process memory. </description>
    <topic href="reference/cdt_u_memoryview.htm"
    	label="&memoryView;"/>
 </context>
 
+<context id="variable_view_context">
+   <description>This view displays the variables in your program.</description>
+</context>
+
+<context id="disassembly_view_context">
+   <description>This view displays the disassembly of your program.</description>
+   <topic href="reference/cdt_u_disassembly_view.htm"
+   	label="&disassemblyView;"/>
+</context>
+
+<context id="expression_view_context" >
+   <description>This view shows the results of inspecting an expression or variable.</description>
+</context>
+
 <context id ="memory_preference_page_context">
    <description>Click below to see help</description>
    <topic href="reference/cdt_u_mem_view_pref.htm"
@@ -64,6 +82,18 @@
    	label="&signalsView;"/>
 </context>
 
+<context id ="debug_view_context">
+   <description>Click below to see help.</description>
+   <topic href="reference/cdt_u_dbg_view.htm"
+   	label="&debugView;"/>
+</context>
+
+<context id ="breakpoint_view_context">
+   <description>The Breakpoints view lists all the breakpoints you have set.</description>
+   <topic href="concepts/cdt_c_brkpnts.htm"
+   	label="&breakpoints;"/>
+</context>
+
 <context id ="c_debug_preference_page_context">
    <description>View information about your program as you debug. </description>
    <topic href="reference/cdt_u_dbg_pref.htm"
@@ -88,4 +118,11 @@
 	   label="&chooseProj;"/>
 </context>
 
+<!-- Note: context id for console view is defined in org.eclipse.ui.console -->
+<context id ="console_view_context">
+   <description>Click below to see help.</description>
+   <topic href="reference/cdt_u_console_view.htm"
+   	label="&consoleView;"/>
+</context>
+
 </contexts>
diff --git a/doc/org.eclipse.cdt.doc.user/plugin.xml b/doc/org.eclipse.cdt.doc.user/plugin.xml
index 99420d0de24..ba7d9f8fe87 100644
--- a/doc/org.eclipse.cdt.doc.user/plugin.xml
+++ b/doc/org.eclipse.cdt.doc.user/plugin.xml
@@ -48,6 +48,14 @@
       <contexts
             file="contexts_CDT_DEBUGGER.xml"
             plugin="org.eclipse.cdt.debug.ui">
+      </contexts>
+	  <contexts 
+	  		file="contexts_CDT_DEBUGGER.xml" 
+	  		plugin="org.eclipse.debug.ui"> 
+      </contexts>
+      <contexts
+      		file="contexts_CDT_DEBUGGER.xml" 
+      		plugin="org.eclipse.ui.console"> 
       </contexts>
    </extension>
    <extension