diff --git a/doc/org.eclipse.cdt.doc.user/doc.zip b/doc/org.eclipse.cdt.doc.user/doc.zip
index 154703aa4bd..ad8462758e9 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 f801d79e8e2..de9e4419d74 100644
--- a/doc/org.eclipse.cdt.doc.user/toc.xml
+++ b/doc/org.eclipse.cdt.doc.user/toc.xml
@@ -5,7 +5,7 @@
 <toc id="cdt" label="C/C++ Development User Guide" topic="cdt_o_home.htm">
      <topic label="Getting Started" href="cdt_o_getstart.htm">
           <topic label="Overview of the CDT" href="cdt_c_over_cdt.htm"/>
-          <topic label="Legacy code" href="cdt_c_legacy_code.htm"/>
+          <topic label="Working with existing code" href="cdt_w_existing_code.htm"/>
           <topic label="What's new" href="cdt_c_whatsnew.htm"/>
           <topic label="Tutorial" href="cdt_o_tutorial.htm">
                <topic label="Setting build preferences" href="cdt_w_autobuild.htm"/>
@@ -26,7 +26,6 @@
                <topic label="Outline view" href="cdt_c_outlineview.htm"/>
                <topic label="Comments" href="cdt_c_comments.htm"/>
                <topic label="Content assist" href="cdt_c_content_assist.htm"/>
-               <topic label="Function information" href="cdt_c_hov_help.htm"/>
                <topic label="Search" href="cdt_c_search.htm"/>
                <topic label="Open Declarations" href="cdt_c_open_declarations.htm"/>
           </topic>
@@ -35,7 +34,7 @@
           </topic>
           <topic label="Debug" href="cdt_o_dbg_concepts.htm">
                <topic label="Debug overview" href="cdt_c_over_dbg.htm"/>
-               <topic label="Debug information" href="cdt_c_dbg_view.htm"/>
+               <topic label="Debug information" href="cdt_c_dbg_info.htm"/>
           </topic>
      </topic>
      <topic label="Tasks" href="cdt_o_tasks.htm">
@@ -62,6 +61,7 @@
                <topic label="Creating a makefile" href="cdt_t_new_make.htm"/>
                <topic label="Hiding files by type" href="cdt_t_prvw_hide_files.htm"/>
                <topic label="Searching" href="cdt_t_search.htm"/>
+               <topic label="Opening declarations" href="cdt_t_open_declarations.htm"/>
           </topic>
           <topic label="Writing code" href="cdt_o_write_code.htm">
                <topic label="Customizing the C/C++ editor" href="cdt_t_cust_cpp_editor.htm"/>
@@ -106,7 +106,6 @@
                     <topic label="Adding watchpoints" href="cdt_t_add_watch.htm"/>
                     <topic label="Removing breakpoints and watchpoints" href="cdt_t_rem_wtch_brk.htm"/>
                     <topic label="Enabling and disabling breakpoints" href="cdt_t_endis_able_brk_wtch.htm"/>
-                    <topic label="Setting conditions" href="cdt_t_cond_watch_brkpnts.htm"/>
                </topic>
                <topic label="Controlling your debug execution" href="cdt_t_controldebug.htm"/>
                <topic label="Stepping into assembler functions" href="cdt_t_disassembly.htm"/>