diff --git a/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_templates.htm b/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_templates.htm
index a41a63e54ea..c289db3eb18 100644
--- a/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_templates.htm
+++ b/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_templates.htm
@@ -28,8 +28,8 @@ The templates that begin with that character appear. Double-click on a template
 </p>
 
 <p><img border="0" src="../images/ngtasks.gif" ALT="Related tasks" width="143" height="21">
-<br><a href="../tasks/cdt_t_contentassist.htm">Creating and editing templates</a>
-<br><a href="../tasks/cdt_t_add_codetemp.htm">Using templates</a>
+<br><a href="../tasks/cdt_t_add_codetemp.htm">Creating and editing templates</a>
+<br><a href="../tasks/cdt_t_contentassist.htm">Using templates</a>
 <br><a href="../tasks/cdt_t_imp_code_temp.htm">Importing and exporting templates</a>
 </p>
 
diff --git a/doc/org.eclipse.cdt.doc.user/images/contentAssist_preferences.png b/doc/org.eclipse.cdt.doc.user/images/contentAssist_preferences.png
index 7d93c11ae83..809b855635a 100644
Binary files a/doc/org.eclipse.cdt.doc.user/images/contentAssist_preferences.png and b/doc/org.eclipse.cdt.doc.user/images/contentAssist_preferences.png differ
diff --git a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_contentassist.htm b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_contentassist.htm
index a2159bcf466..920f0c70018 100644
--- a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_contentassist.htm
+++ b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_contentassist.htm
@@ -37,23 +37,16 @@ commonly-used snippets of code.</p>
 <p>To set Content Assist preferences:</p>
 <ol>
   <li>Click <b>Window &gt; Preferences</b>.</li>
-  <li>Expand <b>C/C++</b>, and click <b>C/C++ Editor</b>.</li>
-  <li>Click the <b>Content Assist</b> tab.<br>
+  <li>Expand <b>C/C++</b> and <b>Editor</b>.</li>
+  <li>Select <b>Content Assist</b>.<br>
   <img src="../images/contentAssist_preferences.png"  alt="Content Assist Preferences"></li>
-  <li>Do  the following: 
+  <li>Do the following: 
   <ul>
-    <li>To change the scope from which Content Assist retrieves its proposals, select 
-	either <b>Search current file and included files</b> or <b>Search current project</b> 
-	by selecting the appropriate the radio button.</li>
 	<li>To insert an element when you open Content Assist and it is the only 
     item in the list, select the <b>Insert single proposals automatically</b> check box.</li>
-    <li>To automatically insert a proposal, if it is the only one found when Content Assist is invoked, select the <b>Enable auto activation</b> checkbox.</li>
+    <li>To automatically insert a common prefix of all proposals, select the <b>Insert common prefixes automatically</b> checkbox.</li>
     <li>To display proposals in alphabetical order, rather than by relevance, select the <b>Present proposals in alphabetical order</b> checkbox. </li>
-    <li>To change the amount of time Content Assist is permitted to parse proposals enter the value for <b>Content Assist parsing timeout</b> in the text box area.</li>
-	<li>Enable Auto activation of content assist for ".", "->" or "::" triggers by selecting the appropriate checkboxes.</li>
-	<li>To change the delay	before Content Assist is automatically invoked for the triggers (shown above), enter the new delay in the <b>Auto activation delay</b> text box area.</li>
-	<li>To change the background color of the Content Assist dialog box, click the color palette button.</li>
-    <li>To change the foreground color of the Content Assist dialog box, click the color palette button.</li>
+	<li>To change <b>Auto-Activation</b> of content assist for ".", "->" or "::" triggers, select the appropriate checkboxes.</li>
   </ul>
   </li>
   <li>Click <b>OK</b>.</li>