diff --git a/doc/org.eclipse.cdt.doc.user/help.css b/doc/org.eclipse.cdt.doc.user/help.css
index fc9c54455aa..28c9f006f67 100755
--- a/doc/org.eclipse.cdt.doc.user/help.css
+++ b/doc/org.eclipse.cdt.doc.user/help.css
@@ -42,8 +42,8 @@ th	     { font-weight: bold }
 	display: none;
 }
 
-.menu td { vertical-align: top; }
-td.menu_name {font-weight: bold;}
+.menu, .option td { vertical-align: top; }
+td.menu_name, td.option_name {font-weight: bold;}
 
 /* Mike Behm's addition to the style sheet */
 .userinput { font-family: monospace; }
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
old mode 100644
new mode 100755
index 1b7687dce23..1ebb1bea8b0
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/reference/cdt_u_c_editor_gen.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_gen.htm
old mode 100644
new mode 100755
index bc4e3f6f780..a004422136c
--- 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
@@ -1,72 +1,104 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd"> 
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html lang="en">
-
 <head>
-	<meta http-equiv="Content-Language" content="en-us">
-	<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>
+<meta http-equiv="Content-Language" content="en-us">
+<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 type="text/javascript"
+	src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
 </head>
 <body>
+	<div role="main">
+		<h1>Editor preferences</h1>
+		<p>
+			Use the <a class="command-link"
+				href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.cdt.ui.preferences.CEditorPreferencePage)")'><img
+				src="PLUGINS_ROOT/org.eclipse.help/command_link.png"
+				alt="command link" />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>
 
-<div role="main"><h1>Editor preferences</h1>
+		<table class="option" border="1" cellspacing="0">
+			<colgroup>
+				<col width="30%" valign="top">
+				<col width="70%" valign="top">
+			</colgroup>
+			<tbody>
+				<tr style="text-align: center;">
+					<th id="option"><strong>Option</strong></th>
+					<th id="description"><strong>Description</strong></th>
+				</tr>
+				<tr>
+					<td class="option_name" headers="option">Smart caret
+						positioning in identifiers</td>
+					<td headers="description">Treats CamelCase identifiers as
+						being made up of separate words.</td>
+				</tr>
+				<tr>
+					<td class="option_name" headers="option">Report problems as
+						you type</td>
+					<td headers="description">Problems found will be immediately
+						highlighted in the editor.</td>
+				</tr>
+				<tr>
+					<td class="option_name" headers="option">Highlight matching
+						brackets</td>
+					<td headers="description">When the cursor is beside a bracket,
+						the matching bracket is highlighted.</td>
+				</tr>
+				<tr>
+					<td class="option_name" headers="option">Highlight inactive
+						code</td>
+					<td headers="description">Highlights inactive code when the
+						cursor is positioned inside it.</td>
+				</tr>
+				<tr>
+					<td class="option_name" headers="option">Appearance color
+						options</td>
+					<td headers="description">Lists the items for which you can
+						specify a color.</td>
+				</tr>
+				<tr>
+					<td class="option_name" headers="option">Color</td>
+					<td headers="description">Specifies the color in which to
+						display the selected item.</td>
+				</tr>
+				<tr>
+					<td class="option_name" headers="option">Documentation tool
+						comments</td>
+					<td headers="description">Specifies which documentation tool
+						should be used to determine editor presentation and behaviors.
+						This enables editor features such as content-assist, documentation
+						comment generation and syntax highlighting. The particular tool
+						selected here will be used for files that are not associated with
+						a project, or where no project level preference has been set.</td>
+				</tr>
+			</tbody>
+		</table>
 
-<p>Use the <img src="../images/command_link.png" 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="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 style="text-align:center;">
-			<th id="option"><strong>Option</strong></th>
-			<th id="description"><strong>Description</strong></th>
-		</tr>
-		<tr>
-			<td headers="option"><strong>Smart caret positioning in identifiers</strong></td>
-			<td headers="description">If enabled, there are additional word boundaries inside identifiers.</td>
-		</tr>
-		<tr>
-			<td headers="option"><strong>Highlight matching brackets</strong></td>
-			<td headers="description">When the cursor is beside a bracket, the matching bracket is highlighted.</td>
-		</tr>
-		<tr>
-			<td headers="option"><strong>Highlight inactive code</strong></td>
-			<td headers="description">Highlights inactive code when the cursor is positioned inside it.</td>
-		</tr>
-		<tr>
-			<td headers="option"><strong>Appearance color options</strong></td>
-			<td headers="description">Lists the items for which you can specify a color.</td>
-		</tr>
-		<tr>
-			<td headers="option"><strong>Color</strong></td>
-			<td headers="description">Specifies the color in which to display the selected item.</td>
-		</tr>
-		<tr>
-			<td headers="option"><strong>Documentation tool comments</strong></td>
-			<td headers="description">Specifies which documentation tool should be used to determine editor presentation and behaviors. This
-			enables editor features such as content-assist, documentation comment generation and syntax highlighting. The particular
-			tool selected here will be used for files that are not associated with a project, or where no project level preference has
-			been set.</td>
-		</tr>
-	</tbody>
-</table>
-
-<p><img src="../images/ngconcepts.gif" ALT="Related concepts" width="143" height="21"> <br>
-<a href="../concepts/cdt_o_code_entry.htm">Coding aids</a></p>
-<p><img src="../images/ngtasks.gif" ALT="Related tasks" width="143" height="21">
-<br>
-<a href="../tasks/cdt_t_cust_cpp_editor.htm">Customizing the C/C++ editor</a></p>
-<p><img src="../images/ngref.gif" ALT="Related reference" width="143" height="21">
-<br>
-<a href="cdt_o_ceditor_pref.htm">C/C++ editor preferences</a></p>
-	<hr>
-<img src="../images/ng00_04a.gif" ALT="IBM Copyright Statement" >
-
-</div></body>
-
-</html>
\ No newline at end of file
+		<p>
+			<img src="../images/ngconcepts.gif" ALT="Related concepts"
+				width="143" height="21"> <br> <a
+				href="../concepts/cdt_o_code_entry.htm">Coding aids</a>
+		</p>
+		<p>
+			<img src="../images/ngtasks.gif" ALT="Related tasks" width="143"
+				height="21"> <br> <a
+				href="../tasks/cdt_t_cust_cpp_editor.htm">Customizing the C/C++
+				editor</a>
+		</p>
+		<p>
+			<img src="../images/ngref.gif" ALT="Related reference" width="143"
+				height="21"> <br> <a href="cdt_o_ceditor_pref.htm">C/C++
+				editor preferences</a>
+		</p>
+		<hr>
+		<img alt="IBM Copyright Statement" src="../images/ng00_04a.gif">
+	</div>
+</body>
+</html>

Option	Description
Smart caret + positioning in identifiers	Treats CamelCase identifiers as + being made up of separate words.
Report problems as + you type	Problems found will be immediately + highlighted in the editor.
Highlight matching + brackets	When the cursor is beside a bracket, + the matching bracket is highlighted.
Highlight inactive + code	Highlights inactive code when the + cursor is positioned inside it.
Appearance color + options	Lists the items for which you can + specify a color.
Color	Specifies the color in which to + display the selected item.
Documentation tool + comments	Specifies which documentation tool + should be used to determine editor presentation and behaviors. + This enables editor features such as content-assist, documentation + comment generation and syntax highlighting. The particular tool + selected here will be used for files that are not associated with + a project, or where no project level preference has been set.
Option	Description
Smart caret positioning in identifiers	If enabled, there are additional word boundaries inside identifiers.
Highlight matching brackets	When the cursor is beside a bracket, the matching bracket is highlighted.
Highlight inactive code	Highlights inactive code when the cursor is positioned inside it.
Appearance color options	Lists the items for which you can specify a color.
Color	Specifies the color in which to display the selected item.
Documentation tool comments	Specifies which documentation tool should be used to determine editor presentation and behaviors. This - enables editor features such as content-assist, documentation comment generation and syntax highlighting. The particular - tool selected here will be used for files that are not associated with a project, or where no project level preference has - been set.