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 809b855635a..e82399fc0e1 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/reference/cdt_u_c_editor_con_assist.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_con_assist.htm
index 0668a223319..0476fb46767 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_con_assist.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_con_assist.htm
@@ -6,49 +6,55 @@
 	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 	<title>Content Assist preferences</title>
 	<link rel="stylesheet" type="text/css" href="../help.css">
+	<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
 </head>
 <body>
 
 <h1>Content Assist preferences</h1>
 
-<p>You can customize the Content Assist feature on the <strong>Contents Assist</strong> panel of the Preferences window. To change the Content Assist preferences click
-<strong>Window &gt; Preferences &gt; C/C++ &gt; Editor &gt; Content Assist.</strong></p>
+<p>Use the <img src="../images/command_link.png" border="0" alt="" /> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.cdt.ui.preferences.CodeAssistPreferencePage)")'>Content Assist</a> panel to customize the Content Assist feature in C/C++ editors.</p>
 <p><img src="../images/contentAssist_preferences.png" alt="Content Assist Preferences Dialog Box"></p>
 
-<table width="600px" cellpadding="5" cellspacing="0" border="1" >
+<table width="600px" cellpadding="5" cellspacing="0" border="1" fgcolor="#DDD" >
 	<caption><strong>Content Assist Preference Options</strong></caption>
 	<colgroup>
 		<col width="30%" valign="top" >
 		<col width="70%" valign="top" >
 	</colgroup>
-	<tbody>
+	<thead>
 		<tr>
+			<th><b>Option</b></th>
+			<th><b>Description</b></th>
+		</tr>
+	</thead>
+	<tbody>
+		<tr valign="top" >
 			<td><strong>Insert single proposals automatically</strong></td>
 			<td>Inserts an element into your code when the Content Assist feature finds only one proposal.</td>
 		</tr>
-		<tr>
+		<tr valign="top">
 			<td><strong>Insert common prefixes automatically</strong></td>
 			<td>Inserts common prefixes.</td>
 		</tr>
-		<tr>
+		<tr valign="top">
 			<td><strong>Completion Proposal Filter</strong></td>
 			<td>Completion proposal filters may have been supplied with your Eclipse CDT distribution.
 		Completion proposal filters can sort and order the proposals provided by the Content Assist feature to best suit your needs.
 		Select the desired content assist filter from the list of available filters.</td>
 		</tr>
-		<tr>
+		<tr valign="top">
 			<td><strong>Enable "." as trigger</strong></td>
 			<td>Enable to use "." as a trigger for auto-completion.</td>
 		</tr>
-		<tr>
+		<tr valign="top">
 			<td><strong>Enable "->" as trigger</strong></td>
 			<td>Enable to use "->" as a trigger for auto-completion.</td>
 		</tr>
-		<tr>
+		<tr valign="top">
 			<td><strong>Enable "::" as trigger</strong></td>
 			<td>Enable to use "::" as a trigger for auto-completion.</td>
 		</tr>
-		<tr>
+		<tr valign="top">
 			<td><strong>delay (ms)</strong></td>
 			<td>Specifies the number of milliseconds before Content Assist is activated.</td>
 		</tr>
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_con_assist_adv.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_con_assist_adv.htm
index 52c06134a4e..f8d9db234fc 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_con_assist_adv.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_con_assist_adv.htm
@@ -6,34 +6,41 @@
 	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 	<title>Advanced preferences</title>
 	<link rel="stylesheet" type="text/css" href="../help.css">
+	<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
 </head>
 <body>
 
 <h1>Advanced preferences</h1>
 
-<p>Use the <strong>Advanced</strong> panel in the Preferences window to configure the behavior of the Content Assist (Ctrl+Space) command.</p>
+<p>Use the <img src="../images/command_link.png" border="0" alt="" /> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.cdt.ui.preferences.CodeAssistPreferenceAdvanced)")'>Advanced</a> panel in the <b>Preferences</b> window to configure the behavior of the Content Assist (<tt>Ctrl+Space</tt>) command.</p>
 <p><img src="../images/contentAssist_adv_preferences.png" alt="Content Assist Preferences Dialog Box"></p>
 
-<table width="600px" cellpadding="5" cellspacing="0" border="1" >
+<table width="600px" cellpadding="5" cellspacing="0" border="1" fgcolor="#DDD" >
 	<caption><strong>Advanced Content Assist Preference Options</strong></caption>
 	<colgroup>
 		<col width="30%" valign="top" >
 		<col width="70%" valign="top" >
 	</colgroup>
-	<tbody>
+	<thead>
 		<tr>
+			<th><b>Option</b></th>
+			<th><b>Description</b></th>
+		</tr>
+	</thead>
+	<tbody>
+		<tr valign="top" >
 			<td><strong>Default Proposal Kindsy</strong></td>
 			<td>Specifies the types of proposals Content Assist uses and the key bindings assigned.</td>
 		</tr>
-		<tr>
+		<tr valign="top" >
 			<td><strong>Content Assist Cycling</strong></td>
 			<td>Specifies the order and types of proposals Content Assist will cycle through.</td>
 		</tr>
-		<tr>
+		<tr valign="top" >
 			<td><strong>Up</strong></td>
 			<td>Moves the selected proposal item up in the cycling list.</td>
 		</tr>
-		<tr>
+		<tr valign="top" >
 			<td><strong>Down</strong></td>
 			<td>Moves the selected proposal item down in the cycling list.</td>
 		</tr>
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_code_temp.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_code_temp.htm
index b2a31ee7cad..5372b868604 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_code_temp.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_code_temp.htm
@@ -12,7 +12,7 @@
 
 <h1>Templates preferences</h1>
 
-<p>Use the <img src="../images/command_link.png" border="0" alt="" /> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.cdt.ui.preferences.CodeTemplatePreferencePage)")'>Templates</a> preference panel to manipulate any of the common templates predefined within CDT or create your own. To modify, delete, export, 
+<p>Use the <img src="../images/command_link.png" border="0" alt="" /> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.cdt.ui.preferences.TemplatePreferencePage)")'>Templates</a> preference panel to manipulate any of the common templates predefined within CDT or create your own. To modify, delete, export, 
 import, or create your own templates click <strong>Window &gt; Preferences &gt; C/C++ &gt; Templates</strong>.</p>
 <p><img src="../images/code_templates.png"  alt="Templates Preferences"></p>
 	<table width="600px" cellpadding="5" cellspacing="0" border="1" >

Option	Description
Insert single proposals automatically	Inserts an element into your code when the Content Assist feature finds only one proposal.
Insert common prefixes automatically	Inserts common prefixes.
Completion Proposal Filter	Completion proposal filters may have been supplied with your Eclipse CDT distribution. Completion proposal filters can sort and order the proposals provided by the Content Assist feature to best suit your needs. Select the desired content assist filter from the list of available filters.
Enable "." as trigger	Enable to use "." as a trigger for auto-completion.
Enable "->" as trigger	Enable to use "->" as a trigger for auto-completion.
Enable "::" as trigger	Enable to use "::" as a trigger for auto-completion.
delay (ms)	Specifies the number of milliseconds before Content Assist is activated.
Option	Description
Default Proposal Kindsy	Specifies the types of proposals Content Assist uses and the key bindings assigned.
Content Assist Cycling	Specifies the order and types of proposals Content Assist will cycle through.
Up	Moves the selected proposal item up in the cycling list.
Down	Moves the selected proposal item down in the cycling list.