diff --git a/doc/org.eclipse.cdt.doc.user/images/cdt_pref_brk_action.png b/doc/org.eclipse.cdt.doc.user/images/cdt_pref_brk_action.png
index c05e5880691..2ce105461ed 100644
Binary files a/doc/org.eclipse.cdt.doc.user/images/cdt_pref_brk_action.png and b/doc/org.eclipse.cdt.doc.user/images/cdt_pref_brk_action.png differ
diff --git a/doc/org.eclipse.cdt.doc.user/images/cdt_pref_file_types.png b/doc/org.eclipse.cdt.doc.user/images/cdt_pref_file_types.png
index cde4df22115..e65ff03cd9e 100644
Binary files a/doc/org.eclipse.cdt.doc.user/images/cdt_pref_file_types.png and b/doc/org.eclipse.cdt.doc.user/images/cdt_pref_file_types.png differ
diff --git a/doc/org.eclipse.cdt.doc.user/images/debug_pref.png b/doc/org.eclipse.cdt.doc.user/images/debug_pref.png
index 4748077f13e..31cf49179e9 100644
Binary files a/doc/org.eclipse.cdt.doc.user/images/debug_pref.png and b/doc/org.eclipse.cdt.doc.user/images/debug_pref.png differ
diff --git a/doc/org.eclipse.cdt.doc.user/images/debug_src_pref.png b/doc/org.eclipse.cdt.doc.user/images/debug_src_pref.png
index db6981a0833..d52c50b6f6b 100644
Binary files a/doc/org.eclipse.cdt.doc.user/images/debug_src_pref.png and b/doc/org.eclipse.cdt.doc.user/images/debug_src_pref.png differ
diff --git a/doc/org.eclipse.cdt.doc.user/images/editor_general_preferences.png b/doc/org.eclipse.cdt.doc.user/images/editor_general_preferences.png
index 77b104b229a..1b7687dce23 100644
Binary files a/doc/org.eclipse.cdt.doc.user/images/editor_general_preferences.png and b/doc/org.eclipse.cdt.doc.user/images/editor_general_preferences.png differ
diff --git a/doc/org.eclipse.cdt.doc.user/images/view_language_mappings_prefs.png b/doc/org.eclipse.cdt.doc.user/images/view_language_mappings_prefs.png
index 4488e0ce68b..55f871307fc 100644
Binary files a/doc/org.eclipse.cdt.doc.user/images/view_language_mappings_prefs.png and b/doc/org.eclipse.cdt.doc.user/images/view_language_mappings_prefs.png differ
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_gen.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_gen.htm
index 5aff16b0510..44aa9982a77 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_gen.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_gen.htm
@@ -6,21 +6,26 @@
 	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 	<title>Editor 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>Editor preferences</h1>
 
-<p>Use the <strong>Editor</strong> preference panel to control the appearance of text highlighting in C/C++ editors.</p>
-<p><img src="../images/editor_general_preferences.png" alt="Editor Preferences Dialog Box"></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.CEditorPreferencePage)")'>Editor</a> preference panel to control the appearance of text highlighting in C/C++ editors.</p>
+<p><img src="../images/editor_general_preferences.png" alt="Editor Preferences Panel"></p>
 
-<table width="600px" cellpadding="5" cellspacing="0" border="1" >
+<table width="600px" cellpadding="4" cellspacing="0" border="1" fgcolor="DDD">
 	<caption><strong>Editor Preference Options</strong></caption>
 	<colgroup>
 		<col width="30%" valign="top" >
 		<col width="70%" valign="top" >
 	</colgroup>
 	<tbody>
+		<tr align="center">
+			<td><strong>Options</strong></td>
+			<td><strong>Description</strong></td>
+		</tr>
 		<tr>
 			<td><strong>Smart caret positioning in identifiers</strong></td>
 			<td>If enabled, there are additional word boundaries inside identifiers.</td>
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_file_types.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_file_types.htm
index 5ef502337bf..d997908a7ca 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_file_types.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_file_types.htm
@@ -4,21 +4,38 @@
 <head>
 	<meta http-equiv="Content-Language" content="en-us">
 	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-	<title>C/C++ File Types page, Preferences window</title>
+	<title>File Types preference (C/C++)</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>C/C++ File Types page, Preferences window</h1>
+<h1>File Types preference (C/C++)</h1>
 
-<p>You can define which file extensions are linked to specific languages.</p>
-<p><img src="../images/cdt_pref_file_types.png" alt="File Types Preferences Dialog Box"></p>
-<dl>
-  <dt>New</dt>
-  <dd>Add a new File Type definition.</dd>
-  <dt>Remove</dt>
-  <dd>Remove the currently selected File Type definition.</dd>
-</dl>
+<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.CFileTypesPreferences)")'>File Types</a> preference panel to define which file extensions are linked to specific languages.</p>
+<p><img src="../images/cdt_pref_file_types.png" alt="File Types Preferences Preference Panel"></p>
+
+<table width="600px" cellpadding="4" cellspacing="0" border="1" fgcolor="DDD">
+	<caption><strong>File Types Preference Options</strong></caption>
+	<colgroup>
+		<col width="35%" valign="top" >
+		<col width="65%" valign="top" >
+	</colgroup>
+	<tbody>
+		<tr align="center">
+			<td><strong>Options</strong></td>
+			<td><strong>Description</strong></td>
+		</tr>
+		<tr>
+			<td><strong>New...</strong></td>
+			<td>Add a new File Type definition.</td>
+		</tr>
+		<tr>
+			<td><b>Remove</b></td>
+			<td>Remove the currently selected File Type definition.</td>
+		</tr>
+	</tbody>
+</table>
 
 <p><img border="0" src="../images/ngconcepts.gif" ALT="Related concepts" width="143" height="21"> <br>
 <a href="../concepts/cdt_o_code_entry.htm">Coding aids</a></p>
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_dbg_brkpt_actions.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_dbg_brkpt_actions.htm
index eed298139fe..d4309744661 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_dbg_brkpt_actions.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_dbg_brkpt_actions.htm
@@ -6,32 +6,36 @@
 	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 	<title>Breakpoint Actions 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>Breakpoint Actions preferences</h1>
 
-<p>Use the <strong>Breakpoint Actions</strong>  page in the Preferences window to create, edit, and remove breakpoint actions. The breakpoint actions defined here are available to all projects in the current workspace.</p>
-<p><img src="../images/cdt_pref_brk_action.png" width="581" height="527" alt="Breakpoint Actions preference page"></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.debug.ui.breakpointactions.ActionsPreferencePage)")'>Breakpoint Actions</a>  page in the <b>Preferences</b> window to create, edit, and remove breakpoint actions. The breakpoint actions defined here are available to all projects in the current workspace.</p>
+<p><img src="../images/cdt_pref_brk_action.png" alt="Breakpoint Actions preference page"></p>
 
-<table width="600px" cellpadding="5" cellspacing="0" border="1" >
+<table width="600px" cellpadding="4" cellspacing="0" border="1" >
 	<caption><strong>Breakpoint Actions Preference Options</strong></caption>
 	<colgroup>
 		<col width="30%" valign="top" >
 		<col width="70%" valign="top" >
 	</colgroup>
 	<tbody>
-		<tr>
-			<td width="30%" valign="top"><strong>New...</strong></td>
-			<td valign="top"><p>To create a new breakpoint action, click <strong>New</strong>. </p>
-	        </td>
+		<tr align="center" >
+			<td><strong>Options</strong></td>
+			<td><strong>Description</strong></td>
 		</tr>
 		<tr>
-			<td width="30%" valign="top"><strong>Edit...</strong></td>
+			<td valign="top"><strong>New...</strong></td>
+			<td valign="top">To create a new breakpoint action, click <strong>New</strong>.</td>
+		</tr>
+		<tr>
+			<td valign="top"><strong>Edit...</strong></td>
 			<td valign="top">To edit the currently selected action, click <strong>Edit</strong>. In the  Action dialog box that appears, edit the action settings, then click <strong>OK</strong>. </td>
 		</tr>
 		<tr>
-			<td width="30%" valign="top"><strong>Delete</strong></td>
+			<td valign="top"><strong>Delete</strong></td>
 			<td valign="top">To delete the currently selected action, click <strong>Delete</strong>. </td>
 		</tr>
 	</tbody>
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_dbg_src.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_dbg_src.htm
index 27b2a53f41c..84705760098 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_dbg_src.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_dbg_src.htm
@@ -6,14 +6,15 @@
 	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 	<title>Common Source Lookup Path 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>Common Source Lookup Path preference</h1>
 
-<p>Use the <strong>Common Source Lookup Path</strong> preference page to add or remove source containers.</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.debug.ui.SourcePreferencePage)")'>Common Source Lookup Path</a> preference page to add or remove source containers.</p>
 
-<p><img src="../images/debug_src_pref.png"  alt="Debug Source Code Locations Preferences" width="627" height="544"></p>
+<p><img src="../images/debug_src_pref.png"  alt="Debug Source Code Locations Preferences" ></p>
 
   <table width="600px" cellpadding="5" cellspacing="0" border="1" >
     <caption>
@@ -24,9 +25,13 @@
       <col width="70%" valign="top" >
     </colgroup>
     <tbody>
+      <tr align="center">
+        <td valign="top"><strong>Options</strong></td>
+        <td><strong>Description</strong></td>
+      </tr>
       <tr>
         <td width="99" valign="top"><strong>Add...</strong></td>
-        <td width="475"><p>Opens the <strong>Add Source</strong> dialog to insert a new source container of one of the following types:</p>
+        <td width="475">Opens the <strong>Add Source</strong> dialog to insert a new source container of one of the following types:<br /><br />
           <ul>
 		  <li>File System Directory</li>
 		  <li>Path Mapping</li>
@@ -38,11 +43,11 @@
       </tr>
       <tr>
         <td valign="top"><strong>Edit...</strong></td>
-        <td>Opens the <strong>Edit File System Director</strong>y dialog to modify the currently selected souce container.</td>
+        <td>Opens the <strong>Edit File System Director</strong>y dialog to modify the currently selected source container.</td>
       </tr>
       <tr>
         <td valign="top"><strong>Remove</strong></td>
-        <td>Remove the currently selected souce container.</td>
+        <td>Remove the currently selected source container.</td>
       </tr>
       <tr>
         <td valign="top"><strong>Up</strong></td>
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_debug.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_debug.htm
index 1dd9229d80c..70ecf6b9232 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_debug.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_debug.htm
@@ -4,34 +4,64 @@
 <head>
 	<meta http-equiv="Content-Language" content="en-us">
 	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-	<title>Debug page, Preferences window</title>
+	<title>Debug 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>Debug page, Preferences window</h1>
-
-<p>You can manipulate any of the common predefined debug settings by clicking <strong>Window &gt; Preferences &gt; C/C++ &gt; Debug</strong>.</p>
+<h1>Debug 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.debug.ui.CDebugPreferencePage)")'>Debug</a> preference panel in the <b>Preferences</b> window to manage common globally defined debug settings.</p>
 <img src="../images/debug_pref.png"  alt="Debug Preferences">
-<dl>
-  <dt>Show Full Paths</dt>
-  <dd>Select this checkbox to show the full path to files and directories.</dd>
-  <dt>Default variable format:</dt>
-  <dd>Select the default variable format from either Natural, Decimal or Hexidecimal.</dd>
-  <dt>Default expression format:</dt>
-  <dd>Select the default expression format from either Natural, Decimal or Hexidecimal.</dd>
-  <dt>Default register format:</dt>
-  <dd>Select the default register format from either Natural, Decimal or Hexidecimal.</dd>
-  <dt>Maximum number of instructions:</dt>
-  <dd>Enter the maximum number of disassembly instruction to be shown in the Disassembly view.</dd>
-  <dt>Color of source lines:</dt>
-  <dd>Select the color of source lines in the mixed source/disassembly mode.</dd>
-</dl>
+
+<p />
+<table width="600px" cellpadding="4" cellspacing="0" border="1" fgcolor="DDD">
+	<caption><b>Debug Preference Options</b></caption>
+	<colgroup>
+		<col width="35%" valign="top" >
+		<col width="65%" valign="top" >
+	</colgroup>
+	<tbody>
+		<tr align="center">
+			<td ><b>Options</b></td>
+			<td ><b>Description</b></td>
+		</tr>
+		<tr>
+			<td><b>Show Full Paths</b></td>
+			<td>Select this checkbox to show the full path to files and directories.</td>
+		</tr>
+		<tr>
+			<td><b>Default variable format</b></td>
+			<td>Select the default variable format from either Natural, Hexidecimal, Decimal or binary.</td>
+		</tr>
+		<tr>
+			<td><b>Default expression format</b></td>
+			<td>Select the default expression format from either Natural, Hexidecimal, Decimal or binary.</td>
+		</tr>
+		<tr>
+			<td><b>Default register format</b></td>
+			<td>Select the default register format from either Natural, Hexidecimal, Decimal or binary.</td>
+		</tr>
+		<tr>
+			<td><b>Character encoding</b></td>
+			<td>Select a character encoding scheme from the dropdown list.</td>
+		</tr>
+		<tr>
+			<td><b>Maximum number of displayed instructions</b></td>
+			<td>Enter the maximum number of disassembly instruction to be shown in the Disassembly view.</td>
+		</tr>
+		<tr>
+			<td><b>Color of source lines</b></td>
+			<td>Select the color of source lines in the mixed source/disassembly mode.</td>
+		</tr>
+		<tr>
+			<td><b>Show source files in binaries</b></td>
+			<td>Select this checkbox to show the source files in binaries.</td>
+		</tr>
+	</tbody>
+</table>
 
 <p><img src="../images/ng00_04a.gif" ALT="IBM Copyright Statement" ></p>
-
-
 </body>
-
 </html>
\ No newline at end of file
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_language_mapping_pref.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_language_mapping_pref.htm
index d741356d80b..e2434972629 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_language_mapping_pref.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_language_mapping_pref.htm
@@ -6,24 +6,29 @@
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Language Mappings 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>Language Mappings preferences</h1>
 
-<p>Customize the use of C/C++ language associations in the <strong>Language Mappings</strong> preference panel for the workspace. </p>
-<p><img src="../images/view_language_mappings_prefs.png" width="627" height="544" alt="Language Mappings preferences"></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.LanguageMappings)")'>Language Mappings</a> preference panel to customize the use of C/C++ language associations for the workspace. </p>
+<p><img src="../images/view_language_mappings_prefs.png" alt="Language Mappings preferences"></p>
 
-<table width="600" cellpadding="5" cellspacing="0" border="1" >
+<table width="600" cellpadding="5" cellspacing="0" border="1" fgcolor="DDD" >
 	<caption>
-	<strong>Language Mappings  Options</strong>
+	<strong>Language Mappings Preference Options</strong>
 	</caption>
 	<colgroup>
 		<col width="30%" valign="top" >
 		<col width="70%" valign="top" >
 	</colgroup>
 	<tbody>
+		<tr align="center">
+			<td><strong>Options</strong></td>
+			<td><strong>Description</strong></td>
+		</tr>
 		<tr>
 			<td width="171" valign="top"><strong>Content Type </strong></td>
 			<td width="503" valign="top">The content type associated with the language. </td>
@@ -33,13 +38,13 @@
 			<td valign="top">The language associated with the content type. </td>
 		</tr>
 		<tr>
-			<td valign="top"><strong>Add</strong></td>
-			<td valign="top"><p>Click to show the <strong>Add Mapping</strong> dialog where you define the content type and language associated with it. </p>
-		    <p align="center"><img src="../images/view_add_mapping.png" width="216" height="134" alt="Add Mapping dialog"></p></td>
+			<td valign="top"><strong>Add...</strong></td>
+			<td valign="top">Click to show the <strong>Add Mapping</strong> dialog where you define the content type and language associated with it.<br />
+		    <p align="center"><img src="../images/view_add_mapping.png" alt="Add Mapping dialog"></p></td>
 		</tr>
 		<tr>
 		  <td valign="top"><strong>Remove</strong></td>
-		  <td valign="top">Click to remove the selected langauge mapping. </td>
+		  <td valign="top">Click to remove the selected language mapping. </td>
 	  </tr>
 	</tbody>
 </table>

Options	Description
Smart caret positioning in identifiers	If enabled, there are additional word boundaries inside identifiers.
Options	Description
New...	Add a new File Type definition.
Remove	Remove the currently selected File Type definition.
New...	To create a new breakpoint action, click New. -
Options	Description
Edit...	New...	To create a new breakpoint action, click New.
Edit...	To edit the currently selected action, click Edit. In the Action dialog box that appears, edit the action settings, then click OK.
Delete	Delete	To delete the currently selected action, click Delete.
Options	Description
Add...	Opens the Add Source dialog to insert a new source container of one of the following types: +	Opens the Add Source dialog to insert a new source container of one of the following types: File System Directory Path Mapping @@ -38,11 +43,11 @@
Edit...	Opens the Edit File System Directory dialog to modify the currently selected souce container.	Opens the Edit File System Directory dialog to modify the currently selected source container.
Remove	Remove the currently selected souce container.	Remove the currently selected source container.
Up
Options	Description
Show Full Paths	Select this checkbox to show the full path to files and directories.
Default variable format	Select the default variable format from either Natural, Hexidecimal, Decimal or binary.
Default expression format	Select the default expression format from either Natural, Hexidecimal, Decimal or binary.
Default register format	Select the default register format from either Natural, Hexidecimal, Decimal or binary.
Character encoding	Select a character encoding scheme from the dropdown list.
Maximum number of displayed instructions	Enter the maximum number of disassembly instruction to be shown in the Disassembly view.
Color of source lines	Select the color of source lines in the mixed source/disassembly mode.
Show source files in binaries	Select this checkbox to show the source files in binaries.
Options	Description
Content Type	The content type associated with the language.	The language associated with the content type.
Add	Click to show the Add Mapping dialog where you define the content type and language associated with it. -	Add...	Click to show the Add Mapping dialog where you define the content type and language associated with it. +
Remove	Click to remove the selected langauge mapping.	Click to remove the selected language mapping.