diff --git a/doc/org.eclipse.cdt.doc.user/doc.zip b/doc/org.eclipse.cdt.doc.user/doc.zip
index 5640f1136eb..9126f984b93 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/toc.xml b/doc/org.eclipse.cdt.doc.user/toc.xml
index 2acc8df6eb9..3188adfe302 100644
--- a/doc/org.eclipse.cdt.doc.user/toc.xml
+++ b/doc/org.eclipse.cdt.doc.user/toc.xml
@@ -42,17 +42,17 @@
           <topic label="Updating the CDT" href="cdt_t_update_man.htm"/>
           <topic label="Creating a project" href="cdt_o_new_projects.htm">
                <topic label="Creating a Standard Make C or C++ Project" href="cdt_o_new_stand_projects.htm">
-                    <topic label="Naming a new project" href="cdt_t_new_proj_1.htm"/>
-                    <topic label="Selecting referenced projects" href="cdt_t_new_proj_2.htm"/>
-                    <topic label="Defining build settings" href="cdt_t_new_proj_3.htm"/>
-                    <topic label="Selecting a binary parser" href="cdt_t_new_proj_4.htm"/>
-                    <topic label="Including paths and symbols" href="cdt_t_new_proj_5.htm"/>
+                    <topic label="Naming a project" href="cdt_t_new_proj_name.htm"/>
+                    <topic label="Selecting referenced projects" href="cdt_t_new_proj_ref.htm"/>
+                    <topic label="Defining build settings" href="cdt_t_new_proj_build_set.htm"/>
+                    <topic label="Selecting a binary parser" href="cdt_t_new_proj_parser.htm"/>
+                    <topic label="Including paths and symbols" href="cdt_t_new_proj_paths.htm"/>
                </topic>
                <topic label="Creating a Managed Make C or C++ Project" href="cdt_o_new_man_projects.htm">
-                    <topic label="Creating a managed make C++ Project/Naming a project" href="cdt_t_man_proj_1.htm"/>
-                    <topic label="Select a platform" href="cdt_t_man_proj_2.htm"/>
-                    <topic label="Selecting referenced projects" href="cdt_t_new_proj_2.htm"/>
-                    <topic label="Selecting a binary parser" href="cdt_t_new_proj_4.htm"/>
+                    <topic label="Naming a project" href="cdt_t_man_proj_name.htm"/>
+                    <topic label="Select a platform" href="cdt_t_man_proj_platf.htm"/>
+                    <topic label="Selecting referenced projects" href="cdt_t_new_proj_ref.htm"/>
+                    <topic label="Selecting a binary parser" href="cdt_t_new_proj_parser.htm"/>
                </topic>
           </topic>
           <topic label="Working with C/C++ project files" href="cdt_o_proj_files.htm">
@@ -87,7 +87,18 @@
                     <topic label="Setting reminders" href="cdt_t_setreminder.htm"/>
                </topic>
           </topic>
-          <topic label="Running a program" href="cdt_t_run_prog.htm"/>
+          <topic label="Running" href="">
+               <topic label="Creating or editing a run configuration" href="cdt_o_run.htm">
+                    <topic label="Creating a run 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"/>
+                    <topic label="Selecting a debugger" href="cdt_t_run_dbg.htm"/>
+                    <topic label="Specifying the location of source files" href="cdt_t_run_source.htm"/>
+                    <topic label="Specifying the location of the run configuration" href="cdt_t_run_com.htm"/>
+               </topic>
+          </topic>
+          <topic label="Selecting a run configuration" href="cdt_t_run_config.htm"/>
           <topic label="Debugging" href="cdt_o_runanddebug.htm">
                <topic label="Debugging a program" href="cdt_t_debug_prog.htm"/>
                <topic label="Working with breakpoints and watchpoints" href="cdt_o_brkpnts_watch.htm">