diff --git a/doc/org.eclipse.cdt.doc.user/doc.zip b/doc/org.eclipse.cdt.doc.user/doc.zip
index 600238fa8af..5b261237b0f 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/plugin.xml b/doc/org.eclipse.cdt.doc.user/plugin.xml
index b86a1c8af3d..998afd390f0 100644
--- a/doc/org.eclipse.cdt.doc.user/plugin.xml
+++ b/doc/org.eclipse.cdt.doc.user/plugin.xml
@@ -9,7 +9,7 @@
 
    name = "C/C++ Development User Guide"
    id = "org.eclipse.cdt.doc.user"
-   version = "1.2.0.9"
+   version = "1.2.0.18"
   provider-name = "Rational Software: IBM Software Group">
    <!-- Configure the help contribution for this plugin --> 
    <!-- This part should be in a documentation plugin -->
diff --git a/doc/org.eclipse.cdt.doc.user/toc.xml b/doc/org.eclipse.cdt.doc.user/toc.xml
index 2edd47a1e7b..ec34718722f 100644
--- a/doc/org.eclipse.cdt.doc.user/toc.xml
+++ b/doc/org.eclipse.cdt.doc.user/toc.xml
@@ -7,7 +7,7 @@
           <topic label="Overview of the CDT" href="cdt_c_over_cdt.htm"/>
           <topic label="What's new" href="cdt_c_whatsnew.htm"/>
           <topic label="Tutorial" href="cdt_o_tutorial.htm">
-               <topic label="Automatically building your project" href="cdt_w_autobuild.htm"/>
+               <topic label="Setting build preferences" href="cdt_w_autobuild.htm"/>
                <topic label="Creating your project" href="cdt_w_newproj.htm"/>
                <topic label="Creating your C++ file" href="cdt_w_newcpp.htm"/>
                <topic label="Creating your make file" href="cdt_w_newmake.htm"/>
@@ -19,23 +19,18 @@
           <topic label="CDT user interface" href="cdt_c_perspect.htm"/>
           <topic label="Projects" href="cdt_c_projects.htm"/>
           <topic label="Project file views" href="cdt_c_proj_file_views.htm"/>
-          <topic label="Code entry" href="topic_under_dev.htm">
-               <topic label="Outline view" href="topic_under_dev.htm"/>
-               <topic label="Comments" href="topic_under_dev.htm"/>
-               <topic label="Content assist" href="topic_under_dev.htm"/>
-               <topic label="Code templates" href="topic_under_dev.htm"/>
-          </topic>
-          <topic label="Build" href="topic_under_dev.htm">
-               <topic label="C/C++ makefile" href="topic_under_dev.htm"/>
-               <topic label="Build output" href="topic_under_dev.htm"/>
-          </topic>
-          <topic label="Debug" href="topic_under_dev.htm">
-               <topic label="Debug view" href="topic_under_dev.htm"/>
-               <topic label="Variables view" href="topic_under_dev.htm"/>
-               <topic label="Breakpoints view" href="topic_under_dev.htm"/>
-               <topic label="Expressions view" href="topic_under_dev.htm"/>
-               <topic label="Registers view" href="topic_under_dev.htm"/>
-               <topic label="Console view" href="topic_under_dev.htm"/>
+          <topic label="Code entry" href="cdt_code_entry.htm">
+               <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="Code Templates" href="cdt_c_code_temp.htm"/>
+               <topic label="Hover help" href="cdt_c_hov_help.htm"/>
+               <topic label="Build overview" href="cdt_c_build_over.htm"/>
+               <topic label="Debug overview" href="cdt_c_over_dbg.htm"/>
+               <topic label="Debug information" href="cdt_c_dbg_view.htm"/>
+               <topic label="Variables" href="cdt_c_variables.htm"/>
+               <topic label="Expressions" href="cdt_c_expressions.htm"/>
+               <topic label="Registers" href="cdt_c_registers.htm"/>
                <topic label="Memory view" href="topic_under_dev.htm"/>
                <topic label="Threads and monitors" href="topic_under_dev.htm"/>
                <topic label="Signals" href="topic_under_dev.htm"/>
@@ -74,7 +69,9 @@
                <topic label="Commenting out code" href="topic_under_dev.htm"/>
                <topic label="Using Content Assist to finish function names" href="topic_under_dev.htm"/>
                <topic label="Adding #include directives" href="topic_under_dev.htm"/>
-               <topic label="Using Code Templates to insert snippets" href="topic_under_dev.htm"/>
+               <topic label="Working with variables" href="topic_under_dev.htm"/>
+               <topic label="Adding a code template" href="topic_under_dev.htm"/>
+               <topic label="Inserting a code template" href="topic_under_dev.htm"/>
                <topic label="Opening on selection" href="topic_under_dev.htm"/>
                <topic label="Resuming at line" href="topic_under_dev.htm"/>
                <topic label="Adding an expression" href="topic_under_dev.htm"/>
@@ -82,14 +79,16 @@
           </topic>
           <topic label="Building" href="topic_under_dev.htm">
                <topic label="Setting a build order" href="topic_under_dev.htm"/>
-               <topic label="Automatically building" href="topic_under_dev.htm"/>
+               <topic label="Automatically building open projects" href="topic_under_dev.htm"/>
                <topic label="Manually building" href="topic_under_dev.htm"/>
+               <topic label="Autosaving on a manual build" href="topic_under_dev.htm"/>
                <topic label="Viewing build information" href="topic_under_dev.htm"/>
                <topic label="Stopping on error" href="topic_under_dev.htm"/>
                <topic label="Specifying a build command" href="topic_under_dev.htm"/>
                <topic label="Adding a make target" href="topic_under_dev.htm"/>
                <topic label="Interpreting build messages" href="topic_under_dev.htm"/>
                <topic label="Managing make output in the C-Build view" href="topic_under_dev.htm">
+                    <topic label="Customizing the C-Build view" href="topic_under_dev.htm"/>
                     <topic label="Clearing the C-Build view before building" href="topic_under_dev.htm"/>
                     <topic label="Opening the C-Build view when building" href="topic_under_dev.htm"/>
                     <topic label="Displaying the C-Build view on top when building" href="topic_under_dev.htm"/>
@@ -116,9 +115,9 @@
                <topic label="Running and debugging subsequent times" href="topic_under_dev.htm"/>
                <topic label="Setting execution options" href="topic_under_dev.htm"/>
           </topic>
-          <topic label="Source Control??" href="topic_under_dev.htm"/>
      </topic>
      <topic label="Reference" href="topic_under_dev.htm">
+          <topic label="Code template examples" href="topic_under_dev.htm"/>
           <topic label="User Interface Reference" href="topic_under_dev.htm">
                <topic label="New Project dialog box" href="topic_under_dev.htm">
                     <topic label="Standard Make C++ Project" href="topic_under_dev.htm">