diff --git a/doc/org.eclipse.cdt.doc.user/concepts/cdt_o_build_conc.htm b/doc/org.eclipse.cdt.doc.user/concepts/cdt_o_build_conc.htm
index ff88bbbc3bd..51bd95f3aa4 100644
--- a/doc/org.eclipse.cdt.doc.user/concepts/cdt_o_build_conc.htm
+++ b/doc/org.eclipse.cdt.doc.user/concepts/cdt_o_build_conc.htm
@@ -13,8 +13,6 @@
Build
This section describes the build views and terminology.
-Error Parsing
-Invoking Make
Building C/C++ Projects
Manage Build Extensibility Document
diff --git a/doc/org.eclipse.cdt.doc.user/concepts/cdt_o_code_entry.htm b/doc/org.eclipse.cdt.doc.user/concepts/cdt_o_code_entry.htm
index 7231a7ce8c2..65f71dde099 100644
--- a/doc/org.eclipse.cdt.doc.user/concepts/cdt_o_code_entry.htm
+++ b/doc/org.eclipse.cdt.doc.user/concepts/cdt_o_code_entry.htm
@@ -16,9 +16,6 @@
Comments
Content Assist
Templates
-Error Parsing
-Invoking Make
-
diff --git a/doc/org.eclipse.cdt.doc.user/concepts/cdt_o_concepts.htm b/doc/org.eclipse.cdt.doc.user/concepts/cdt_o_concepts.htm
index bb6e1b21a17..8fc274e60ec 100644
--- a/doc/org.eclipse.cdt.doc.user/concepts/cdt_o_concepts.htm
+++ b/doc/org.eclipse.cdt.doc.user/concepts/cdt_o_concepts.htm
@@ -23,8 +23,6 @@
Comments
Content Assist
Templates
- Error Parsing
- Invoking Make
Editing C/C++ Files
C/C++ editor
C++
@@ -45,6 +43,8 @@
Breakpoints
Debug overview
Debug information
+ Error Parsing
+ Invoking Make
C/C++ search
C/C++ Indexer
C/C++ Indexer Problem Reporting
diff --git a/doc/org.eclipse.cdt.doc.user/concepts/cdt_o_dbg_concepts.htm b/doc/org.eclipse.cdt.doc.user/concepts/cdt_o_dbg_concepts.htm
index afc9817679e..3f926c8acb2 100644
--- a/doc/org.eclipse.cdt.doc.user/concepts/cdt_o_dbg_concepts.htm
+++ b/doc/org.eclipse.cdt.doc.user/concepts/cdt_o_dbg_concepts.htm
@@ -16,6 +16,8 @@
Breakpoints
Debug overview
Debug information
+Error Parsing
+Invoking Make
diff --git a/doc/org.eclipse.cdt.doc.user/concepts/cdt_o_projects.htm b/doc/org.eclipse.cdt.doc.user/concepts/cdt_o_projects.htm
deleted file mode 100644
index 2ae1e7b1627..00000000000
--- a/doc/org.eclipse.cdt.doc.user/concepts/cdt_o_projects.htm
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-
-
-
-CDT projects
-
-
-
-CDT Projects
-This section provides information on C/C++ project files and project-related C/C++ views.
-
- CDT projects
- Project file views
-
-
-
-
-
\ No newline at end of file
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_anno.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_anno.htm
deleted file mode 100644
index cee0a18a5d9..00000000000
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_anno.htm
+++ /dev/null
@@ -1,52 +0,0 @@
-
-
-
-
-
-
- Annotations page, Preferences window
-
-
-
-
-
-
-Annotations page, Preferences window
-
-You can customize the appearance of annotations in the C/C++ editor on the Annotations page of the Preferences Window.
-
-
-
- Annotation Presentation Options
- Lists items, such as breakpoints, bookmarks, or index markers, for which you can specify a color.
- Show in Text
- Displays in the text the selected type of annotation. The corresponding text is underlined.
- Show in Overview Ruler
- Displays the selected annotation type in the overview ruler.
- Annotations Color
- Specifies the color in which to display the selected item.
-
-
-
-Coding aids
-
-
-Customizing the C/C++ editor
-
-
-C/C++ editor preferences
-
-
-
-
-
\ No newline at end of file
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_gdb_mi_pref.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_gdb_mi_pref.htm
deleted file mode 100644
index 3a4428891fb..00000000000
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_gdb_mi_pref.htm
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-
-
-
-
-
-GDB MI
-
-
-
-
-
-Debug view preference
-
-
-
-
-
-
\ No newline at end of file
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mprop_build_manage.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mprop_build_manage.htm
deleted file mode 100644
index fc9af363dfd..00000000000
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mprop_build_manage.htm
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
-
-
-
-
- C/C++ Project Properties, Managed, Build
-
-
-
-
-C/C++ Project Properties, Managed, Build, Manage
-Customizes your active configuration, output and make command.
-
-
-
- Artifact Name Select the name of the build executable.
- Artifact Extension Select the executable extension.
- Make Command You can select the make command and options.
- Manage Configurations ???
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_newproj_incl_path.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_newproj_incl_path.htm
deleted file mode 100644
index 58f7712954c..00000000000
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_newproj_incl_path.htm
+++ /dev/null
@@ -1,55 +0,0 @@
-
-
-
-
-
-
-Paths and symbols page, C/C++ Properties window
-
-
-
-
-
-Manage include paths dialog box
-
-You can manage include paths from the Manage include paths dialog box.
-
-
-
- New
- Enter a new include path.
- Edit
- Modify selected include path.
- Remove
- Remove selected include path.
- Restore
- Restore a previously removed include path.
- Delete
- Delete an include path.
- Delete All
- Delete all include paths.
-
-
-
-
-
-Build overview
-
-
-Including paths and symbols
-
-
-Project properties
-
-
-
-
-
\ No newline at end of file
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_newproj_pathsymb.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_newproj_pathsymb.htm
deleted file mode 100644
index 988c436e5da..00000000000
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_newproj_pathsymb.htm
+++ /dev/null
@@ -1,49 +0,0 @@
-
-
-
-
-
-
-Paths and symbols page, C/C++ Properties window
-
-
-
-
-
-
-Paths and Symbols page, C/C++ Preferences window
-
-You can define include paths and preprocessor symbols on the Paths and Symbols page of the C/C++ Preferences window.
-
-
-
- Automate scanner configuration discovery
- Select this checkbox to configure the scanner discovery to run automatically.
- Options
- Click this button to open the Scanner Configuration Discovery options.
- Manage
- Click these buttons to open the Manage include paths or Manage defined symbols windows.
-
-
-
-
-Build overview
-
-
-Including paths and symbols
-
-
-Project properties
-
-
-
-
-
\ No newline at end of file
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_outlineview.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_outlineview.htm
deleted file mode 100644
index 140781fcccf..00000000000
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_outlineview.htm
+++ /dev/null
@@ -1,170 +0,0 @@
-
-
-
-
-
-
-Outline view
-
-
-
-
-
-Outline view
-
-The Outline view displays an outline of a structured C/C++ file that is currently
-open in the editor area, by listing the structural elements.
-
-
-
-
-Outline view toolbar icons
-
-The table below lists the icons displayed in the Outline view toolbar.
-
-
-
- Icon
- Description
-
-
-
- Hide Fields
-
-
-
- Hide Static Members
-
-
-
- Hide Non-Public Members
-
-
-
- Sort items alphabetically
-
-
-
-
-Outline view icons
-
-The table below lists the icons displayed in the Outline view.
-
-
-
- Icon
- Description
-
-
-
-
- C or C++ file
-
-
-
-
- Class
-
-
-
-
- Namespace
-
-
-
-
- Include
-
-
-
-
- Enum
-
-
-
-
- Enumerator
-
-
-
-
- Field
-
-
-
-
- Field private
-
-
-
-
- Field protected
-
-
-
-
- Field public
-
-
-
-
- Include
-
-
-
-
- Method private
-
-
-
-
- Method protected
-
-
-
-
- Method public
-
-
-
-
- Struct
-
-
-
-
- Type definition
-
-
-
-
- Union
-
-
-
-
- Variable
-
-
-
-
-Outline view
-
-
-Displaying C/C++ file components in the
-C/C++ Projects view
-
-
-Views
-
-
-
-
\ No newline at end of file
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_reg_view_pref.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_reg_view_pref.htm
deleted file mode 100644
index 78f6eff145f..00000000000
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_reg_view_pref.htm
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
-
-
-
-
-Registers view preferences
-
-
-
-
-
-Registers view preferences
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/doc/org.eclipse.cdt.doc.user/tasks/cdt_o_proj_prop.htm b/doc/org.eclipse.cdt.doc.user/tasks/cdt_o_proj_prop.htm
deleted file mode 100644
index cd29cf0829e..00000000000
--- a/doc/org.eclipse.cdt.doc.user/tasks/cdt_o_proj_prop.htm
+++ /dev/null
@@ -1,66 +0,0 @@
-
-
-
-
-
-
-
-
-Defining project properties
-
-
-
-
-
-Defining project properties
-This section explains how to define project properties.
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/doc/org.eclipse.cdt.doc.user/tasks/cdt_o_tutorial.htm b/doc/org.eclipse.cdt.doc.user/tasks/cdt_o_tutorial.htm
deleted file mode 100644
index b02d8d70f1a..00000000000
--- a/doc/org.eclipse.cdt.doc.user/tasks/cdt_o_tutorial.htm
+++ /dev/null
@@ -1,66 +0,0 @@
-
-
-
-
-
-
-
-
-Tutorial
-
-
-
-
-
-Tutorial
- This tutorial guides you through the basic steps to get started
-with the C/C++ Development Toolkit (CDT) by creating a HelloWorld
-project on Windows.
-Before you begin
-You need to install and configure the following utilities:
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_add_includes.htm b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_add_includes.htm
deleted file mode 100644
index 2e7f9b0d3cb..00000000000
--- a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_add_includes.htm
+++ /dev/null
@@ -1,38 +0,0 @@
-
-
-
-
-
-
-Adding #include directivess
-
-
-
-
-
-Adding #include directives
-
-You can quickly add an #include
-
-directive for any documented function:
-
-
-
-In the C/C++ editor, select the function name
-(excluding the parentheses or any leading tabs or spaces).
-Right-click and choose Add Include .
-The #include statement
-for the selected function name is added to the top of the file,
-if it is not already there.
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/doc/org.eclipse.cdt.doc.user/topics_Getting_Started.xml b/doc/org.eclipse.cdt.doc.user/topics_Getting_Started.xml
index e89f9e3c994..b18aceee316 100644
--- a/doc/org.eclipse.cdt.doc.user/topics_Getting_Started.xml
+++ b/doc/org.eclipse.cdt.doc.user/topics_Getting_Started.xml
@@ -3,8 +3,8 @@
-
-
+
+