diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_o_proj_prop_pages.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_o_proj_prop_pages.htm
index 6675b8f2066..f86929cab23 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_o_proj_prop_pages.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_o_proj_prop_pages.htm
@@ -11,7 +11,7 @@
 <body>
 
 <h1>New CDT Project Wizard </h1>
-<p>In this section, learn about the C/C++ New CDT project wizard.</p>
+<p>In this section, learn about the C/C++ New CDT Project Wizard.</p>
 
 <p><img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_u_newproj_buildset.htm">New CDT Project Wizard preferences</a><br>
   <img src="../images/trans.gif" border="0" width="25" height="1" alt="">Makefile Project preferences<br>
@@ -19,7 +19,7 @@
   <img src="../images/trans.gif" border="0" width="25" height="1" alt=""><img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_u_newproj_parser_error.htm">Error Parsers preferences</a><br>
   <img src="../images/trans.gif" border="0" width="25" height="1" alt=""><img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_u_newproj_discovery_options.htm">Discovery Options preferences</a><br>
   <img src="../images/trans.gif" border="0" width="25" height="1" alt=""><img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_u_newproj_buildset.htm">Builder Settings preferences</a><br>
-  <img src="../images/trans.gif" border="0" width="25" height="1" alt=""><img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_u_discovery_preferences.htm">Behaviour preferences</a><br>
+  <img src="../images/trans.gif" border="0" width="25" height="1" alt=""><img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_u_newproj_behavior.htm">Behaviour preferences</a><br>
 </p>
 <p><img src="../images/nokiaCopyright.png" width="375" height="12" alt="Nokia Copyright Statement"><br>
 <img src="../images/ng00_04a.gif" ALT="IBM Copyright Statement" ></p>
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_o_ref.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_o_ref.htm
index e7d59b57345..ce25b6b3db6 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_o_ref.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_o_ref.htm
@@ -48,17 +48,18 @@
   <img src="../images/trans.gif" border="0" width="50" height="1" alt=""><a style="text-decoration:none" href="cdt_u_c_pref.htm">C/C++ preferences</a><br>
   <img src="../images/trans.gif" border="0" width="100" height="1" alt=""><a style="text-decoration:none" href="cdt_u_appearance_pref.htm">Appearance</a><br>
   <img src="../images/trans.gif" border="0" width="100" height="1" alt=""><a style="text-decoration:none" href="cdt_u_pref_build.htm">Build preferences</a><br>
+  <img src="../images/trans.gif" border="0" width="150" height="1" alt=""><a style="text-decoration:none" href="cdt_u_pref_build_vars.htm">Build Variables</a><br>
   <img src="../images/trans.gif" border="0" width="150" height="1" alt=""><a style="text-decoration:none" href="cdt_u_console_pref.htm">Console</a><br>
   <img src="../images/trans.gif" border="0" width="150" height="1" alt=""><a style="text-decoration:none" href="cdt_u_environment_pref.htm">Environment</a><br />
   <img src="../images/trans.gif" border="0" width="150" height="1" alt=""><a style="text-decoration:none" href="cdt_u_make_pref.htm">Make Targets</a><br>
   <img src="../images/trans.gif" border="0" width="150" height="1" alt=""><a style="text-decoration:none" href="cdt_u_makefile_settings_pref.htm">Makefile Editor</a><br>
   <img src="../images/trans.gif" border="0" width="200" height="1" alt=""><a style="text-decoration:none" href="cdt_u_make_settings_pref.htm">Settings</a><br>
+  <img src="../images/trans.gif" border="0" width="100" height="1" alt=""><a style="text-decoration:none" href="cdt_u_c_code_style_pref.htm">Code Style preferences</a><br>
+  <img src="../images/trans.gif" border="0" width="150" height="1" alt=""><a style="text-decoration:none" href="cdt_u_c_code_templates_pref.htm">Code Templates</a><br>
   <img src="../images/trans.gif" border="0" width="100" height="1" alt=""><a style="text-decoration:none" href="cdt_u_debug.htm">Debug preferences</a><br>
   <img src="../images/trans.gif" border="0" width="150" height="1" alt=""><a style="text-decoration:none" href="cdt_u_dbg_brkpt_actions.htm">Breakpoint Actions</a><br>
   <img src="../images/trans.gif" border="0" width="150" height="1" alt=""><a style="text-decoration:none" href="cdt_u_dbg_src.htm">Common Source Lookup Path</a><br>
   <img src="../images/trans.gif" border="0" width="150" height="1" alt=""><a style="text-decoration:none" href="cdt_u_gdb_mi.htm">GDB MI preferences</a><br>
-  <img src="../images/trans.gif" border="0" width="100" height="1" alt=""><a style="text-decoration:none" href="cdt_u_c_code_style_pref.htm">Code Style preferences</a><br>
-  <img src="../images/trans.gif" border="0" width="150" height="1" alt=""><a style="text-decoration:none" href="cdt_u_c_code_templates_pref.htm">Code Templates</a><br>
   <img src="../images/trans.gif" border="0" width="100" height="1" alt=""><a style="text-decoration:none" href="cdt_u_c_editor_gen.htm">Editor preferences</a><br>
   <img src="../images/trans.gif" border="0" width="150" height="1" alt=""><a style="text-decoration:none" href="cdt_u_c_editor_con_assist.htm">Content Assist</a><br>
   <img src="../images/trans.gif" border="0" width="200" height="1" alt=""><a style="text-decoration:none" href="cdt_u_c_editor_con_assist_adv.htm">Advanced</a><br>
@@ -74,15 +75,18 @@
   <img src="../images/trans.gif" border="0" width="100" height="1" alt=""><a style="text-decoration:none" href="cdt_u_indexer_preference.html">Indexer</a><br>
   <img src="../images/trans.gif" border="0" width="100" height="1" alt=""><a style="text-decoration:none" href="cdt_u_language_mapping_pref.htm">Language Mappings</a><br>
   
+  <img src="../images/trans.gif" border="0" width="100" height="1" alt=""><a style="text-decoration:none" href="cdt_u_pref_wizard_toolchains.htm">New CDT Project Wizard preferences</a><br>
+  <img src="../images/trans.gif" border="0" width="150" height="1" alt=""><a style="text-decoration:none" href="cdt_o_proj_prop_pages.htm">Makefile Project</a><br>
+  <img src="../images/trans.gif" border="0" width="200" height="1" alt=""><a style="text-decoration:none" href="cdt_u_newproj_parser_binary.htm">Binary Parser tab</a><br>
+  <img src="../images/trans.gif" border="0" width="200" height="1" alt=""><a style="text-decoration:none" href="cdt_u_newproj_parser_error.htm">Error Parsers tab</a><br>
+  <img src="../images/trans.gif" border="0" width="200" height="1" alt=""><a style="text-decoration:none" href="cdt_u_discovery_preferences.htm">Discovery Options tab</a><br>
+  <img src="../images/trans.gif" border="0" width="200" height="1" alt=""><a style="text-decoration:none" href="cdt_u_newproj_buildset.htm">Builder Settings tab</a><br>
+  <img src="../images/trans.gif" border="0" width="200" height="1" alt=""><a style="text-decoration:none" href="cdt_u_newproj_behavior.htm">Behavior tab</a><br>
+
   <img src="../images/trans.gif" border="0" width="100" height="1" alt=""><a style="text-decoration:none" href="cdt_u_pref_prop_pages.htm">Property Pages Settings</a><br>
   	<img src="../images/trans.gif" border="0" width="150" height="1" alt=""><a style="text-decoration:none" href="cdt_u_pref_multi_cfg.htm">Multi-Configuration Edit</a><br>
   	
   <img src="../images/trans.gif" border="0" width="100" height="1" alt=""><a style="text-decoration:none" href="cdt_u_make_pref.htm"></a><br>
-  <img src="../images/trans.gif" border="0" width="100" height="1" alt=""><a style="text-decoration:none" href="cdt_o_proj_prop_pages.htm">New Make Projects properties preferences</a><br>
-  <img src="../images/trans.gif" border="0" width="150" height="1" alt=""><a style="text-decoration:none" href="cdt_u_newproj_buildset.htm">Make Builder preferences</a><br>
-  <img src="../images/trans.gif" border="0" width="150" height="1" alt=""><a style="text-decoration:none" href="cdt_u_newproj_parser_error.htm">Error Parser preferences</a><br>
-  <img src="../images/trans.gif" border="0" width="150" height="1" alt=""><a style="text-decoration:none" href="cdt_u_newproj_parser_binary.htm">Binary Parser preferences</a><br>
-  <img src="../images/trans.gif" border="0" width="150" height="1" alt=""><a style="text-decoration:none" href="cdt_u_discovery_preferences.htm">Discovery Options preferences</a><br>
   <img src="../images/trans.gif" border="0" width="50" height="1" alt=""><a style="text-decoration:none" href="cdt_u_properties.htm">C/C++ Properties</a><br>
   <img src="../images/trans.gif" border="0" width="100" height="1" alt=""><a style="text-decoration:none" href="cdt_o_prop_proj.htm">C/C++ Project Properties</a><br>
   <img src="../images/trans.gif" border="0" width="100" height="1" alt=""><a style="text-decoration:none" href="cdt_o_prop_folder.htm">C/C++ Folder Properties</a><br>
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_newproj_behavior.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_newproj_behavior.htm
index 75bfd31cb0f..8e783eb0fdb 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_newproj_behavior.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_newproj_behavior.htm
@@ -10,9 +10,9 @@
 <body>
 
 <h1>Makefile Project - Behavior page</h1>
-<p>You can define build behavior on the <strong>Behavior</strong> page of the <strong>Makefile Project</strong> panel in the  <strong>Preferences</strong> window.</p>
+<p>Use the <b>Behaviour</b> page in 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.managedbuilder.ui.preferences.PrefPage_NewCDTProject)")'>Makefile Projects</a> preference panel to define build behavior.</p>
 <p><img src="../images/new_make-behavior.png" width="540" height="516" alt="Makefile project - behavior page"></p>
-<table width="600px" cellpadding="5" cellspacing="0" border="1" >
+<table width="600px" cellpadding="5" cellspacing="0" border="1" fgcolor="DDD" >
   <caption>
   <strong>Makefile Project - Behavior options</strong>
   </caption>
@@ -20,6 +20,12 @@
   <col width="30%" valign="top" >
   <col width="70%" valign="top" >
   </colgroup>
+	<thead>
+		<tr>
+			<th><b>Option</b></th>
+			<th><b>Description</b></th>
+		</tr>
+	</thead>
   <tbody>
     <tr>
       <td valign="top"><strong>Stop on first build error </strong></td>
@@ -63,8 +69,9 @@
 <a href="../tasks/cdt_t_proj_build_set.htm">Defining Project Build settings</a></p>
 <p><img border="0" src="../images/ngref.gif" ALT="Related reference" width="143" height="21"> <br>
   <a href="cdt_o_proj_prop_pages.htm">New CDT Project Wizard</a></p>
-<img src="../images/nokiaCopyright.png" alt="Nokia Copyright Statement" width="255" height="14"><br>
-<img src="../images/ng00_04a.gif" ALT="IBM Copyright Statement" > 
+<hr>
+<img src="../images/ng00_04a.gif" ALT="IBM Copyright Statement" > <br />
+<img src="../images/nokiaCopyright.png" alt="Nokia Copyright Statement" width="375" height="12">
 
 </body>
 
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_newproj_buildset.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_newproj_buildset.htm
index e9a0a266889..cf1731a8f36 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_newproj_buildset.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_newproj_buildset.htm
@@ -6,11 +6,12 @@
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Makefile Project - Builder Settings page</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>Makefile Project - Builder Settings page</h1>
-<p>You can define build settings on the <strong>Builder Settings</strong> page of the <strong>Makefile Project</strong> preference panel in the  <strong>Preferences</strong> window.</p>
+<p>Use the <b>Builder Settings</b> page in 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.managedbuilder.ui.preferences.PrefPage_NewCDTProject)")'>Makefile Projects</a> preference panel to define build settings.</p>
 <p><img src="../images/new_make-builder.png" alt="Make Builder Preferences window" width="544" height="518"></p>
 <table width="600px" cellpadding="5" cellspacing="0" border="1" >
   <caption>
@@ -20,6 +21,12 @@
   <col width="30%" valign="top" >
   <col width="70%" valign="top" >
   </colgroup>
+	<thead>
+		<tr>
+			<th><b>Option</b></th>
+			<th><b>Description</b></th>
+		</tr>
+	</thead>
   <tbody>
     <tr>
       <td valign="top"><strong>Builder type </strong></td>
@@ -55,8 +62,9 @@
 <a href="../tasks/cdt_t_proj_build_set.htm">Defining Project Build settings</a></p>
 <p><img border="0" src="../images/ngref.gif" ALT="Related reference" width="143" height="21"> <br>
   <a href="cdt_o_proj_prop_pages.htm">New CDT Project Wizard</a></p>
-<img src="../images/nokiaCopyright.png" alt="Nokia Copyright Statement" width="255" height="14"><br>
-<img src="../images/ng00_04a.gif" ALT="IBM Copyright Statement" >
+<hr>
+<img src="../images/ng00_04a.gif" ALT="IBM Copyright Statement" > <br />
+<img src="../images/nokiaCopyright.png" alt="Nokia Copyright Statement" width="375" height="12">
 </body>
 
 </html>
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_newproj_discovery_options.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_newproj_discovery_options.htm
index 76192fe9fa1..1aaa6298a07 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_newproj_discovery_options.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_newproj_discovery_options.htm
@@ -6,12 +6,13 @@
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Makefile Project - Discovery Options page</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>Makefile Project - Discovery Options page</h1>
 
-<p>You can configure various options for the scanner configuration on the <strong>Discovery Options</strong> page of the <strong>Makefile Project</strong> panel in the <strong>Preferences</strong> window.</p>
+<p>Use the <b>Discovery Options</b> page in 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.managedbuilder.ui.preferences.PrefPage_NewCDTProject)")'>Makefile Projects</a> preference panel to configure various options for the scanner configuration.</p>
 <p><img src="../images/new_make_disc_options.png" width="540" height="516" alt="Makefile project - discovery options page"></p>
 <table width="600px" cellpadding="5" cellspacing="0" border="1" >
   <caption>
@@ -21,6 +22,12 @@
   <col width="30%" valign="top" >
   <col width="70%" valign="top" >
   </colgroup>
+	<thead>
+		<tr>
+			<th><b>Option</b></th>
+			<th><b>Description</b></th>
+		</tr>
+	</thead>
   <tbody>
     <tr>
       <td valign="top"><strong>Discovery profiles scope </strong></td>
@@ -65,8 +72,9 @@
 <p><img border="0" src="../images/ngref.gif" ALT="Related reference" width="143" height="21">
 <br>
 <a href="cdt_o_proj_prop_pages.htm">New CDT Project Wizard</a></p>
-<img src="../images/nokiaCopyright.png" alt="Nokia Copyright Statement" width="255" height="14"><br>
-<img src="../images/ng00_04a.gif" ALT="IBM Copyright Statement" > 
+<hr>
+<img src="../images/ng00_04a.gif" ALT="IBM Copyright Statement" > <br />
+<img src="../images/nokiaCopyright.png" alt="Nokia Copyright Statement" width="375" height="12">
 
 </body>
 
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_newproj_parser_binary.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_newproj_parser_binary.htm
index 653e02056a2..873acaa8d38 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_newproj_parser_binary.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_newproj_parser_binary.htm
@@ -6,14 +6,15 @@
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Makefile Project - Binary Parsers page</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>Makefile Project - Binary Parsers page</h1>
 
-<p>You can view a list of binary parsers on the <strong>Binary Parser</strong> page of the <strong>Makefile Project</strong> preference panel in the <strong>Preferences</strong> window.</p>
-<p><img src="../images/new_make-binary_parser.png"  alt="Binary Parser Preferences Window" width="733" height="611" ></p>
+<p>Use the <b>Binary Parser</b> page in 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.managedbuilder.ui.preferences.PrefPage_NewCDTProject)")'>Makefile Project</a> preference panel to manage the binary parsers available to projects.</p>
+<p><img src="../images/new_make-binary_parser.png"  alt="Binary Parser Preferences Panel" width="733" height="611" ></p>
 <table width="600px" cellpadding="5" cellspacing="0" border="1" >
   <caption>
   <strong>Makefile Project - Binary Parsers options</strong>
@@ -22,6 +23,12 @@
   <col width="30%" valign="top" >
   <col width="70%" valign="top" >
   </colgroup>
+	<thead>
+		<tr>
+			<th><b>Option</b></th>
+			<th><b>Description</b></th>
+		</tr>
+	</thead>
   <tbody>
     <tr>
       <td valign="top"><strong>Binary Parser</strong></td>
@@ -49,8 +56,9 @@
 <a href="../tasks/cdt_t_proj_parser.htm">Selecting a binary parser</a></p>
 <p><img border="0" src="../images/ngref.gif" ALT="Related reference" width="143" height="21"> <br>
   <a href="cdt_o_proj_prop_pages.htm">New CDT Project Wizard</a></p>
-<img src="../images/nokiaCopyright.png" alt="Nokia Copyright Statement" width="255" height="14"><br>
-<img src="../images/ng00_04a.gif" ALT="IBM Copyright Statement" >
+  <hr>
+<img src="../images/ng00_04a.gif" ALT="IBM Copyright Statement" ><br />
+<img src="../images/nokiaCopyright.png" alt="Nokia Copyright Statement" width="375" height="12">
 </body>
 
 </html>
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_newproj_parser_error.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_newproj_parser_error.htm
index 8ee51ba13eb..02b1d6434b3 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_newproj_parser_error.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_newproj_parser_error.htm
@@ -6,16 +6,17 @@
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Makefile Project - Error Parsers page </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>Makefile Project - Error Parsers page </h1>
 
-<p>You can view a list of the filters that detect error patterns in the build output log, on the <strong>Error Parsers</strong> page of the <strong>Makefile Project</strong> panel in the <strong>Preferences</strong> window.</p>
+<p>Use the <b>Error Parsers</b> page in 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.managedbuilder.ui.preferences.PrefPage_NewCDTProject)")'>Makefile Projects</a> preference panel to view a list of the filters that detect error patterns in the build output log.</p>
 
 <p><img src="../images/new_make-error_parser.png" alt="Make Error Parser Preferences Dialog Box" width="540" height="516"></p>
-<table width="600px" cellpadding="5" cellspacing="0" border="1" >
+<table width="600px" cellpadding="5" cellspacing="0" border="1" fgcolor="DDD" >
   <caption>
   <strong>Makefile Project - Error Parser options</strong>
   </caption>
@@ -23,6 +24,12 @@
   <col width="30%" valign="top" >
   <col width="70%" valign="top" >
   </colgroup>
+	<thead>
+		<tr>
+			<th><b>Option</b></th>
+			<th><b>Description</b></th>
+		</tr>
+	</thead>
   <tbody>
     <tr>
       <td valign="top"><strong>Error Parsers</strong></td>
@@ -54,8 +61,9 @@
 <a href="../tasks/cdt_t_proj_error_parser.htm">Filtering errors</a></p>
 <p><img border="0" src="../images/ngref.gif" ALT="Related reference" width="143" height="21"> <br>
   <a href="cdt_o_proj_prop_pages.htm">New CDT Project Wizard</a></p>
-<img src="../images/nokiaCopyright.png" alt="Nokia Copyright Statement" width="255" height="14"><br>
-<img src="../images/ng00_04a.gif" ALT="IBM Copyright Statement" > 
+<hr>
+<img src="../images/ng00_04a.gif" ALT="IBM Copyright Statement" > <br />
+<img src="../images/nokiaCopyright.png" alt="Nokia Copyright Statement" width="375" height="12">
 
 </body>
 
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_pref_wizard_toolchains.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_pref_wizard_toolchains.htm
index db8130676f6..dd4b0041e96 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_pref_wizard_toolchains.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_pref_wizard_toolchains.htm
@@ -4,36 +4,59 @@
 <head>
 	<meta http-equiv="Content-Language" content="en-us">
 	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-	<title>CDT Project Wizard Toolchains preferences</title>
+	<title>New CDT Project Wizard 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>CDT Project Wizard Toolchains preferences</h1>
+<h1>New CDT Project Wizard preferences</h1>
 
-<p>These settings define which toolchains are selected in CDT New Project Wizard by default.<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.managedbuilder.ui.preferences.PrefPage_NewCDTWizard)")'>New CDT Project Wizard</a> to define which toolchains are selected in <b>New CDT Project Wizard</b> by default.<p>
 <p><img src="../images/cdt_pref-wizard-toolchains.png" alt="CDT Project Wizard Toolchains preferences tab"></p>
-<dl>
-  <dt>Project types:</dt>
-  <dd>The same project types list as shown in Project Wizard.</dd>
-  <dt>Toolchain:</dt>
-  <dd>The same list of toolchains as shown in Project Wizard.</dd>
-  <dt>Make toolchain(s) preferred</dt>
-  <dd>Makes selected toolchain(s) preferred.<br>
-     In this tab, preferred toolchains are marked by arrow icon ("&gt;").<br>
-     In Project Wizard dialog, preferred toolchain is selected by default.<br>
-     If there are more than one toolchain preferred, the first of them will be selected.<br>
-     If there are no toolchains preferred, the first in the whole list will be selected.
-  </dd>
-  <dt>Make toolchain(s) not preferred</dt>
-  <dd>Removes preference mark from selected toolchain(s).</dd>
-  <dt>Show project types and toolchains only if they are supported on the platform</dt>
-  <dd>The same control as on Project Wizard page. Defines whether unsupported project types and toolchains are hidden or shown.</dd>
-  <dt>Restore Defaults</dt>
-  <dd>Sets all parameters to default values</dd>
-  <dt>Apply</dt>
-  <dd>Saves current settings.</dd>
-</dl>
+
+
+<table width="600px" cellpadding="5" cellspacing="0" border="1" fgcolor="DDD" >
+	<caption><strong>New CDT Project Wizard Preference Options</strong></caption>
+	<colgroup>
+		<col width="30%" valign="top" >
+		<col width="70%" valign="top" >
+	</colgroup>
+	<thead>
+		<tr>
+			<th><b>Option</b></th>
+			<th><b>Description</b></th>
+		</tr>
+	</thead>
+	<tbody>
+		<tr valign="top" >
+			<td><b>Project types</b></td>
+			<td>The same project types list as shown in <a href="cdt_u_new_proj_wiz.htm">Project Wizard</a>.</td>
+		</tr>
+		<tr valign="top" >
+			<td><b>Toolchain</b></td>
+			<td>The same list of toolchains as shown in Project Wizard.</td>
+		</tr>
+		<tr valign="top" >
+			<td><b>Make toolchain(s) preferred</b></td>
+			<td>Makes the selected toolchain(s) preferred.<br>
+			<ul>
+		     <li>Preferred toolchains are marked by arrow icon ("&gt;").</li>
+		     <li>In the Project Wizard dialog, preferred toolchain is selected by default.</li>
+		     <li>If there are more than one toolchain preferred, the first of them is selected.</li>
+		     <li>If there are no toolchains preferred, the first in the whole list is selected.</li>
+		     </ul></td>
+		</tr>
+		<tr valign="top" >
+			<td><b>Make toolchain(s) not preferred</b></td>
+			<td>Removes preference mark from selected toolchain(s).</td>
+		</tr>
+		<tr valign="top" >
+			<td><b>Show project types and toolchains only if they are supported on the platform</b></td>
+			<td>The same control as on Project Wizard page. Defines whether unsupported project types and toolchains are hidden or shown.</td>
+		</tr>
+	</tbody>
+</table>
 
 </body>
 
diff --git a/doc/org.eclipse.cdt.doc.user/topics_Reference.xml b/doc/org.eclipse.cdt.doc.user/topics_Reference.xml
index de13b4db9ae..d96170938f8 100644
--- a/doc/org.eclipse.cdt.doc.user/topics_Reference.xml
+++ b/doc/org.eclipse.cdt.doc.user/topics_Reference.xml
@@ -95,7 +95,7 @@
 		<topic label="Indexer" href="reference/cdt_u_indexer_preference.html"/>
 		<topic label="Language Mappings" href="reference/cdt_u_language_mapping_pref.htm"/>
 		
-		<topic label="New CDT project wizard">
+		<topic label="New CDT Project Wizard">
             <topic label="Preferred Toolchains tab" href="reference/cdt_u_pref_wizard_toolchains.htm"/> 
             <topic label="Wizard Defaults tab" href="reference/cdt_u_pref_wizard_defaults.htm"/> 
 			<topic label="Makefile Project pages" >

Option	Description
Project types	The same project types list as shown in Project Wizard.
Toolchain	The same list of toolchains as shown in Project Wizard.
Make toolchain(s) preferred	Makes the selected toolchain(s) preferred. + + Preferred toolchains are marked by arrow icon (">"). + In the Project Wizard dialog, preferred toolchain is selected by default. + If there are more than one toolchain preferred, the first of them is selected. + If there are no toolchains preferred, the first in the whole list is selected. +
Make toolchain(s) not preferred	Removes preference mark from selected toolchain(s).
Show project types and toolchains only if they are supported on the platform	The same control as on Project Wizard page. Defines whether unsupported project types and toolchains are hidden or shown.