diff --git a/doc/org.eclipse.cdt.doc.user/contextHelp.xml b/doc/org.eclipse.cdt.doc.user/contextHelp.xml
deleted file mode 100644
index 35b56198a9f..00000000000
--- a/doc/org.eclipse.cdt.doc.user/contextHelp.xml
+++ /dev/null
@@ -1,170 +0,0 @@
-<contexts>
-<context id ="default_cs_help">
-   <description>Click below to see help.</description>
-   <topic href="default_cs_help.htm"
-   	label="Default Context Sensitive Help"/>
-</context>
-
-<context id ="cdt_u_newproj_buildset">
-   <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>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>Select a binary parser for the target platform. </description>
-   <topic href="cdt_u_newproj_parser_binary.htm"
-   	label="Binary Parser page, C/C++ Properties window"/>
-</context>
-
-<context id ="cdt_u_newproj_pathsymb">
-   <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>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>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>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>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="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="cdt_u_shared_lib_view.htm"
-   	label="Shared Libraries view"/>
-</context>
-
-<context id ="cdt_u_shared_lib_view_pref">
-   <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="cdt_u_signals_view.htm"
-   	label="Signals view"/>
-</context>
-
-<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="cdt_u_search.htm"
-   	label="C/C++ Search page, Search dialog box"/>
-</context>
-
-</contexts>
diff --git a/doc/org.eclipse.cdt.doc.user/contexts_CDT.xml b/doc/org.eclipse.cdt.doc.user/contexts_CDT.xml
index aba2b14bd43..637e2bebb1d 100644
--- a/doc/org.eclipse.cdt.doc.user/contexts_CDT.xml
+++ b/doc/org.eclipse.cdt.doc.user/contexts_CDT.xml
@@ -6,67 +6,85 @@
 **  All Rights Reserved * Licensed Materials - Property of IBM
 ******************************************************************
 -->
-
+<!DOCTYPE contexts 	[
+	<!ENTITY defaultCSHelp "Default Context Sensitive Help">
+	
+	<!ENTITY errorParsers "Error Parsers, C/C++ Properties window">
+	<!ENTITY binaryParser "Binary Parser page, C/C++ Properties window">
+	<!ENTITY targetPlatform "Target platform, C/C++ Properties window">
+	
+	<!ENTITY generalPage "General page, Preferences window">
+	<!ENTITY annotationsPage "Annotations page, Preferences window">
+	<!ENTITY colorsPage "Colors page, Preferences window">
+	<!ENTITY contentAssist "Content Assist page, Preferences window">
+	<!ENTITY codeTemplates "Code Templates page, Preferences window">
+	<!ENTITY searchPage "C/C++ Search page, Search dialog box">
+	
+	<!ENTITY outlineView "Outline view">
+	<!ENTITY projectsView "C/C++ Projects view">
+	<!ENTITY commonPage "Common page, Run/Debug dialog box">
+	
+]>
 <contexts>
 
 <context id ="default_cs_help">
    <description>Click below to see help.</description>
    <topic href="default_cs_help.htm"
-   	label="Default Context Sensitive Help"/>
+   	label="&defaultCSHelp;"/>
 </context>
 
 <context id ="cdt_error_parsers_page">
    <description>Control the build messages displayed in the Tasks view. </description>
    <topic href="reference/cdt_u_newproj_parser_error.htm"
-   	label="Error Parsers, C/C++ Properties window"/>
+   	label="&errorParsers;"/>
 </context>
 
 <context id ="cdt_binary_parser_page">
    <description>Select a binary parser for the target platform. </description>
    <topic href="reference/cdt_u_newproj_parser_binary.htm"
-   	label="Binary Parser page, C/C++ Properties window"/>
+   	label="&binaryParser;"/>
 </context>
 
 <context id ="man_proj_platform_help">
    <description>Select a target deployment platform. </description>
    <topic href="reference/cdt_u_newproj_platf.htm"
-   	label="Target platform, C/C++ Properties window"/>
+   	label="&targetPlatform;"/>
 </context>
 
 <context id ="new_c_editor_pref_page_context">
    <description>Customize the appearance of the C/C++ Editor. </description>
    <topic href="reference/cdt_u_c_editor_gen.htm"
-   	label="General page, Preferences window"/>
+   	label="&generalPage;"/>
 </context>
 
 <context id ="new_c_editor_annotations_pref_page_context">
    <description>Customize the appearance of the C/C++ Editor. </description>
    <topic href="reference/cdt_u_c_editor_anno.htm"
-   	label="Annotations page, Preferences window"/>
+   	label="&annotationsPage;"/>
 </context>
 
 <context id ="new_c_editor_colors_pref_page_context">
    <description>Customize the appearance of the C/C++ editor. </description>
    <topic href="reference/cdt_u_c_editor_color.htm"
-   	label="Colors page, Preferences window"/>
+   	label="&colorsPage;"/>
 </context>
 
 <context id ="new_c_editor_content_assist_pref_page_context">
    <description>Customize how the Content Assist feature works. </description>
    <topic href="reference/cdt_u_c_editor_con_assist.htm"
-   	label="Content Assist page, Preferences window"/>
+   	label="&contentAssist;"/>
 </context>
 
 <context id ="new_c_templates_pref_page_context">
    <description>Create, edit, remove, import, or export code templates. </description>
    <topic href="reference/cdt_u_code_temp.htm"
-   	label="Code Templates page, Preferences window"/>
+   	label="&codeTemplates;"/>
 </context>
 
 <context id ="c_search_page">
    <description>Search for C/C++ elements. </description>
    <topic href="reference/cdt_u_search.htm"
-   	label="C/C++ Search page, Search dialog box"/>
+   	label="&searchPage;"/>
 </context>
 
 </contexts>
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 586e3a6ac2c..5d5eb0e454a 100644
--- a/doc/org.eclipse.cdt.doc.user/contexts_CDT_DEBUGGER.xml
+++ b/doc/org.eclipse.cdt.doc.user/contexts_CDT_DEBUGGER.xml
@@ -6,57 +6,71 @@
 **  All Rights Reserved * Licensed Materials - Property of IBM
 ******************************************************************
 -->
-
+<!DOCTYPE contexts [
+	<!ENTITY defaultCSHelp "Default Context Sensitive Help">
+	<!ENTITY registersView "Registers view">
+	<!ENTITY registersViewPrefs "Registers view preferences">
+	<!ENTITY memoryView "Memory view">
+	<!ENTITY memoryViewPrefs "Memory view preferences">
+	<!ENTITY sharedLibsView "Shared Libraries view">
+	<!ENTITY sharedLibsViewPrefs "Shared Libraries view preferences">
+	<!ENTITY signalsView "Signals view">
+    <!ENTITY debugPrefs "Debug preferences">
+]>
 <contexts>
 
 <context id ="default_cs_help">
    <description>Click below to see help.</description>
    <topic href="default_cs_help.htm"
-   	label="Default Context Sensitive Help"/>
+   	label="&defaultCSHelp;"/>
 </context>
 
 <context id ="registers_view_context">
    <description>The registers view displays the register values of a selected stack frame. </description>
    <topic href="reference/cdt_u_registersview.htm"
-   	label="Registers view"/>
+   	label="&registersView;"/>
 </context>
 
 <context id ="registers_preference_page_context">
    <description>Change the color in which register values are displayed. </description>
+   <topic href="reference/cdt_u_reg_view_pref.htm"
+   	label="&registersViewPrefs;"/>
 </context>
 
 <context id ="memory_view_context">
    <description>The memory view displays process memory. </description>
    <topic href="reference/cdt_u_memoryview.htm"
-   	label="Memory view"/>
+   	label="&memoryView;"/>
 </context>
 
 <context id ="memory_preference_page_context">
    <description>Click below to see help</description>
    <topic href="reference/cdt_u_mem_view_pref.htm"
-   	label="Memory view preferences"/>
+   	label="&memoryViewPrefs;"/>
 </context>
 
 <context id ="shared_libraries_view_context">
    <description>Click below to see help</description>
    <topic href="reference/cdt_u_shared_lib_view.htm"
-   	label="Shared Libraries view"/>
+   	label="&sharedLibsView;"/>
 </context>
 
 <context id ="shared_libraries_preference_page_context">
    <description>Set the refresh preference for the Shared Libraries view. </description>
+   <topic href="reference/cdt_u_shared_lib_view_pref.htm"
+   	label="&sharedLibsViewPrefs;"/>
 </context>
 
 <context id ="signals_view_context">
    <description>Click below to see help</description>
    <topic href="reference/cdt_u_signals_view.htm"
-   	label="Signals view"/>
+   	label="&signalsView;"/>
 </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"
-   	label="Debug preferences"/>
+   	label="&debugPrefs;"/>
 </context>
 
 </contexts>
\ No newline at end of file
diff --git a/doc/org.eclipse.cdt.doc.user/contexts_CDT_DEBUGGER_MI.xml b/doc/org.eclipse.cdt.doc.user/contexts_CDT_DEBUGGER_MI.xml
index 6797b30ef9c..d5dcb0ddd76 100644
--- a/doc/org.eclipse.cdt.doc.user/contexts_CDT_DEBUGGER_MI.xml
+++ b/doc/org.eclipse.cdt.doc.user/contexts_CDT_DEBUGGER_MI.xml
@@ -6,17 +6,22 @@
 **  All Rights Reserved * Licensed Materials - Property of IBM
 ******************************************************************
 -->
-
+<!DOCTYPE contexts [
+	<!ENTITY defaultCSHelp "Default Context Sensitive Help">
+	<!ENTITY gdbmiPrefs "GDB MI Preference Page">
+]>
 <contexts>
 
 <context id ="default_cs_help">
    <description>Click below to see help.</description>
    <topic href="default_cs_help.htm"
-   	label="Default Context Sensitive Help"/>
+   	label="&defaultCSHelp;"/>
 </context>
 
-<context id ="reference/cdt_u_gdb_mi_pref">
+<context id ="mi_preference_page_context">
    <description>Enter a timeout value in milliseconds. </description>
+   <topic href="reference/cdt_u_gdb_mi_pref.htm"
+   	label="&gdbmiPrefs;"/>
 </context>
 
 </contexts>
diff --git a/doc/org.eclipse.cdt.doc.user/contexts_CDT_LAUNCH.xml b/doc/org.eclipse.cdt.doc.user/contexts_CDT_LAUNCH.xml
index ef5d68138c4..237ec12b472 100644
--- a/doc/org.eclipse.cdt.doc.user/contexts_CDT_LAUNCH.xml
+++ b/doc/org.eclipse.cdt.doc.user/contexts_CDT_LAUNCH.xml
@@ -6,43 +6,50 @@
 **  All Rights Reserved * Licensed Materials - Property of IBM
 ******************************************************************
 -->
-
+<!DOCTYPE contexts [
+	<!ENTITY defaultCSHelp "Default Context Sensitive Help">
+	<!ENTITY mainPage "Main page, Run/Debug dialog box">
+	<!ENTITY argsPage "Arguments page, Run/Debug dialog box">
+	<!ENTITY envPage "Environment page, Run/Debug dialog box">
+	<!ENTITY debuggerPage "Debugger page, Run/Debug dialog box">
+	<!ENTITY sourcePage "Source page, Run/Debug dialog box">
+]>
 <contexts>
 
 <context id ="default_cs_help">
    <description>Click below to see help.</description>
    <topic href="default_cs_help.htm"
-   	label="Default Context Sensitive Help"/>
+   	label="&defaultCSHelp;"/>
 </context>
 
 <context id ="launch_configuration_dialog_main_tab">
    <description>Provide information on the project and application you want to run or debug. </description>
    <topic href="reference/cdt_u_run_dbg_main.htm"
-   	label="Main page, Run/Debug dialog box"/>
+   	label="&mainPage;"/>
 </context>
 
 <context id ="launch_configuration_dialog_arguments_tab">
    <description>Provide information on the project and application you want to run or debug. </description>
    <topic href="reference/cdt_u_run_dbg_arg.htm"
-   	label="Arguments page, Run/Debug dialog box"/>
+   	label="&argsPage;"/>
 </context>
 
 <context id ="launch_configuration_dialog_environment_tab">
    <description>Set environment variables and values. </description>
    <topic href="reference/cdt_u_run_dbg_env.htm"
-   	label="Environment page, Run/Debug dialog box"/>
+   	label="&envPage;"/>
 </context>
 
 <context id ="launch_configuration_dialog_debugger_tab">
    <description>Select a debugger. </description>
    <topic href="reference/cdt_u_run_dbg_dbg.htm"
-   	label="Debugger page, Run/Debug dialog box"/>
+   	label="&debuggerPage;"/>
 </context>
 
 <context id ="launch_configuration_dialog_source_tab">
    <description>Specify where the debugger should look for source files. </description>
    <topic href="reference/cdt_u_run_dbg_srce.htm"
-   	label="Source page, Run/Debug dialog box"/>
+   	label="&sourcePage;"/>
 </context>
 
 </contexts>
\ No newline at end of file
diff --git a/doc/org.eclipse.cdt.doc.user/contexts_CDT_make.xml b/doc/org.eclipse.cdt.doc.user/contexts_CDT_make.xml
index 779bc417d74..6e1cc71a9b0 100644
--- a/doc/org.eclipse.cdt.doc.user/contexts_CDT_make.xml
+++ b/doc/org.eclipse.cdt.doc.user/contexts_CDT_make.xml
@@ -6,25 +6,29 @@
 **  All Rights Reserved * Licensed Materials - Property of IBM
 ******************************************************************
 -->
-
+<!DOCTYPE contexts 	[
+	<!ENTITY defaultCSHelp "Default Context Sensitive Help">
+	<!ENTITY makeBuilder "Make Builder page, C/C++ Properties window">
+	<!ENTITY pathsSymbols "Paths and Symbols page, C/C++ Properties window">
+]>
 <contexts>
 
 <context id ="default_cs_help">
    <description>Click below to see help.</description>
    <topic href="default_cs_help.htm"
-   	label="Default Context Sensitive Help"/>
+   	label="&defaultCSHelp;"/>
 </context>
 
 <context id ="cdt_make_builder_page">
    <description>Define the build settings for the current project. </description>
    <topic href="reference/cdt_u_newproj_buildset.htm"
-   	label="Make Builder page, C/C++ Properties window"/>
+   	label="&makeBuilder;"/>
 </context>
 
 <context id ="cdt_paths_symbols_page">
    <description>Enter include paths and symbols. </description>
    <topic href="reference/cdt_u_newproj_pathsymb.htm"
-   	label="Paths and Symbols page, C/C++ Properties window"/>
+   	label="&pathsSymbols;"/>
 </context>
 
 </contexts>
diff --git a/doc/org.eclipse.cdt.doc.user/plugin.xml b/doc/org.eclipse.cdt.doc.user/plugin.xml
index d00aa02809e..c592a21ad87 100644
--- a/doc/org.eclipse.cdt.doc.user/plugin.xml
+++ b/doc/org.eclipse.cdt.doc.user/plugin.xml
@@ -2,9 +2,9 @@
 <?eclipse version="3.0"?>
 <plugin
    id="org.eclipse.cdt.doc.user"
-   name="C/C++ Development User Guide"
+   name="%pluginName"
    version="2.0.0"
-   provider-name="Rational Software: IBM Software Group">
+   provider-name="%providerName">
 
    <runtime>
    </runtime>