diff --git a/doc/org.eclipse.cdt.doc.user/contexts_CDT_DEBUGGER.xml b/doc/org.eclipse.cdt.doc.user/contexts_CDT_DEBUGGER.xml
index 85a30c756b2..bce86cf35b8 100644
--- a/doc/org.eclipse.cdt.doc.user/contexts_CDT_DEBUGGER.xml
+++ b/doc/org.eclipse.cdt.doc.user/contexts_CDT_DEBUGGER.xml
@@ -29,20 +29,17 @@
 
 <context id ="registers_view_context">
    <description>The registers view displays the register values of a selected stack frame. </description>
-   <topic href="reference/cdt_u_registersview.htm"
-   	label="&registersView;"/>
+   <topic href="reference/cdt_u_registersview.htm" label="Registers view"/>
 </context>
 
 <context id ="registers_preference_page_context">
    <description>Change the color in which register values are displayed. </description>
-   <topic href="reference/cdt_u_reg_view_pref.htm"
-   	label="&registersViewPrefs;"/>
+   <topic href="reference/cdt_u_reg_view_pref.htm" label="Registers preferences"/>
 </context>
 
 <context id ="MemoryView_context">
    <description>The memory view displays process memory. </description>
-   <topic href="reference/cdt_u_memoryview.htm"
-   	label="&memoryView;"/>
+   <topic href="reference/cdt_u_memoryview.htm" label="Memory view"/>
 </context>
 
 <context id="variable_view_context">
@@ -51,15 +48,14 @@
 
 <context id="disassembly_view_context">
    <description>This view displays the disassembly of your program.</description>
-   <topic href="reference/cdt_u_disassembly_view.htm"
-   	label="&disassemblyView;"/>
+   <topic href="reference/cdt_u_disassembly_view.htm" label="Disassembly view"/>
 </context>
 
 <context id="expression_view_context" >
    <description>This view shows the results of inspecting an expression or variable.</description>
 </context>
 
-<context id ="memory_preference_page_context">
+<context id="memory_preference_page_context" title="Traditional Memory Rendering">
    <description>Click below to see help</description>
    <topic href="reference/cdt_u_mem_view_pref.htm"
    	label="&memoryViewPrefs;"/>
@@ -67,14 +63,12 @@
 
 <context id ="modules_view_context">
    <description>Click below to see help</description>
-   <topic href="reference/cdt_u_modules_view.htm"
-   	label="&modulesView;"/>
+   <topic href="reference/cdt_u_modules_view.htm" label="Modules view"/>
 </context>
 
-<context id ="signals_view_context">
+<context id="signals_view_context" title="Signals">
    <description>Click below to see help</description>
-   <topic href="reference/cdt_u_signals_view.htm"
-   	label="&signalsView;"/>
+   <topic href="reference/cdt_u_signals_view.htm" label="Signals view"/>
 </context>
 
 <context id ="debug_view_context">
@@ -83,10 +77,9 @@
    	label="&debugView;"/>
 </context>
 
-<context id ="breakpoint_view_context">
+<context id="breakpoint_view_context" title="Breakpoints">
    <description>The Breakpoints view lists all the breakpoints you have set.</description>
-   <topic href="concepts/cdt_c_brkpnts.htm"
-   	label="&breakpoints;"/>
+   <topic href="concepts/cdt_c_brkpnts.htm" label="Breakpoints view (C/C++)"/>
 </context>
 
 <context id ="c_debug_preference_page_context">
@@ -119,10 +112,9 @@
    <topic href="reference/cdt_u_console_view.htm" label="Console view (C/C++)"/>
 </context>
 
-<context id ="executables_View_context">
+<context id="executables_View_context" title="Executables (C/C++)">
    <description>The Executables view provides a dynamic list of executables and their related source files.</description>
-   <topic href="reference/cdt_u_view_executables.htm.htm"
-   	label="&executablesView;"/>
+   <topic href="reference/cdt_u_view_executables.htm.htm" label="Executables view (C/C++)"/>
 </context>
 <context id="breakpoint_actions_page_help" title="Breakpoint Actions">
    <description>Manage breakpoint actions.</description>
diff --git a/doc/org.eclipse.cdt.doc.user/images/pref_traditional_memory prefs.png b/doc/org.eclipse.cdt.doc.user/images/pref_traditional_memory prefs.png
new file mode 100755
index 00000000000..c852c367fc2
Binary files /dev/null and b/doc/org.eclipse.cdt.doc.user/images/pref_traditional_memory prefs.png differ
diff --git a/doc/org.eclipse.cdt.doc.user/images/pref_traditional_memory_prefs.png b/doc/org.eclipse.cdt.doc.user/images/pref_traditional_memory_prefs.png
new file mode 100755
index 00000000000..17a1783ab6d
Binary files /dev/null and b/doc/org.eclipse.cdt.doc.user/images/pref_traditional_memory_prefs.png differ
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 6c573f37535..cd1f0c9d52d 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
@@ -27,7 +27,7 @@
   <img src="../images/trans.gif" border="0" width="50" height="1" alt=""><a style="text-decoration:none" href="cdt_o_dbg_view.htm">Debug Views</a><br>
 		<img src="../images/trans.gif" border="0" width="100" height="1" alt=""><a style="text-decoration:none" href="cdt_u_registersview.htm">Registers view</a><br>
 		<img src="../images/trans.gif" border="0" width="100" height="1" alt=""><a style="text-decoration:none" href="cdt_u_memoryview.htm">Memory view</a><br>
-		<img src="../images/trans.gif" border="0" width="100" height="1" alt=""><a style="text-decoration:none" href="cdt_u_mem_view_pref.htm">Memory view preferences</a><br>
+		<img src="../images/trans.gif" border="0" width="100" height="1" alt=""><a style="text-decoration:none" href="cdt_u_mem_view_pref.htm">Traditional Memory Rendering preferences</a><br>
 		<img src="../images/trans.gif" border="0" width="100" height="1" alt=""><a style="text-decoration:none" href="cdt_u_modules_view.htm">Modules view</a><br>
 		<img src="../images/trans.gif" border="0" width="100" height="1" alt=""><a style="text-decoration:none" href="cdt_u_signals_view.htm">Signals view</a><br>
 		<img src="../images/trans.gif" border="0" width="100" height="1" alt=""><a style="text-decoration:none" href="cdt_u_dbg_view.htm">Debug view</a><br>
@@ -56,10 +56,12 @@
   <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_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>
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_o_views.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_o_views.htm
index 9c789350afe..958492d1965 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_o_views.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_o_views.htm
@@ -30,7 +30,7 @@
 	<img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_o_dbg_view.htm">Debug views</a><br>
 		<img src="../images/trans.gif" border="0" width="50" height="1" alt=""><a style="text-decoration:none" href="cdt_u_registersview.htm">Registers view</a><br>
 		<img src="../images/trans.gif" border="0" width="50" height="1" alt=""><a style="text-decoration:none" href="cdt_u_memoryview.htm">Memory view</a><br>
-		<img src="../images/trans.gif" border="0" width="50" height="1" alt=""><a style="text-decoration:none" href="cdt_u_mem_view_pref.htm">Memory view preferences</a><br>
+		<img src="../images/trans.gif" border="0" width="50" height="1" alt=""><a style="text-decoration:none" href="cdt_u_mem_view_pref.htm">Traditional Memory Rendering preferences</a><br>
 		<img src="../images/trans.gif" border="0" width="50" height="1" alt=""><a style="text-decoration:none" href="cdt_u_modules_view.htm">Modules view</a><br>
 		<img src="../images/trans.gif" border="0" width="50" height="1" alt=""><a style="text-decoration:none" href="cdt_u_signals_view.htm">Signals view</a><br>
 		<img src="../images/trans.gif" border="0" width="50" height="1" alt=""><a style="text-decoration:none" href="cdt_u_dbg_view.htm">Debug view</a><br>
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_cproj_view.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_cproj_view.htm
index de44d35d19c..854f91d5d03 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_cproj_view.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_cproj_view.htm
@@ -27,7 +27,7 @@
 <p><img img src="../images/view_projects.png" alt="C/C++ Projects View"></p>
 
 
-<h2>C/C++ Projects toolbar</h2>
+<h2>C/C++ Projects toolbar options</h2>
 <p>The table below lists the toolbar options displayed in the C/C++ Projects view.</p>
 
 <p><table border="1" cellpadding="3" cellspacing="0" width="600px" bordercolor="#DDDDDD" >
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_dissassembly_view.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_dissassembly_view.htm
index 79482be8d26..07e7cbba3e8 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_dissassembly_view.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_dissassembly_view.htm
@@ -46,9 +46,9 @@
 <p><img border="0" src="../images/ngconcepts.gif" ALT="Related concepts" width="143" height="21"> <br>
   <a href="../concepts/cdt_c_dbg_info.htm">Debug information</a></p>
 <p><img border="0" src="../images/ngref.gif" ALT="Related reference" width="143" height="21"> <br>
-  <a href="cdt_o_views.htm">Views</a></p>
+  <a href="cdt_o_views.htm">C/C++ Views</a></p>
 	<hr>
-<img src="../images/nokiaCopyright.png" alt="Nokia Copyright Statement" width="255" height="14" > 
+<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_mem_view_pref.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mem_view_pref.htm
index 7ee1937f95d..5af91ed1399 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mem_view_pref.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mem_view_pref.htm
@@ -6,34 +6,82 @@
 <meta name="GENERATOR" content="Microsoft FrontPage 5.0">
 <meta name="ProgId" content="FrontPage.Editor.Document">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Memory view preferences</title>
+<title>Traditional Memory Rendering 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>Memory view preferences</h1>
+<h1>Traditional Memory Rendering preferences</h1>
 
-<p>You can change the appearance of the memory view.</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.memory.traditional.TraditionalRenderingPreferencePage)")'>Traditional Memory Rendering</a> preference panel to change the appearance of the <a href="cdt_u_memoryview.htm">Memory</a> view when displaying memory in traditional mode.</p>
+<p><img img src="../images/pref_traditional_memory_prefs.png" alt="C/C++ Projects View"></p>
+
+<h2>Traditional Memory Rendering preference options</h2>
+<p>The table below lists the  options displayed in the Traditional Memory Rendering Preferences.</p>
+
+<p><table border="1" cellpadding="3" cellspacing="0" width="600px" bordercolor="#DDDDDD" >
+	<caption><strong>Traditional Memory Rendering Preferences Options</strong></caption>
+	<colgroup>
+		<col width="25%" valign="top" >
+		<col width="75%" valign="top" >
+	</colgroup>
+ 	<tr>
+		<th>Option</th>	
+		<th>Description</th>
+	 </tr>
+	<tr>
+		<td valign="top"><strong>Use Global Text Color</strong></td>
+		<td valign="top">Toggles the use of the global Text Color option.</td>
+	</tr>
+	<tr>
+		<td valign="top"><strong>Text Color</strong></td>
+		<td valign="top">Changes the color of the text.</td>
+	</tr>
+	<tr>
+		<td valign="top"><strong>Brighten Alternate Cells</strong></td>
+		<td valign="top">Set the brightness used to highlight alternate cells.</td>
+	</tr>
+	<tr>
+		<td valign="top"><strong>Use Global Background Color</strong></td>
+		<td valign="top">Toggles the use of the global Background Text Color option.</td>
+	</tr>
+	<tr>
+		<td valign="top"><strong>Background Color</strong></td>
+		<td valign="top">Changes the background color.</td>
+	</tr>
+	<tr>
+		<td valign="top"><strong>Changed Color</strong></td>
+		<td valign="top">Set the color used to display changed memory locations.</td>
+	</tr>
+	<tr>
+		<td valign="top"><strong>Edit Color</strong></td>
+		<td valign="top">Set the color used to show edited memory locations.</td>
+	</tr>
+	<tr>
+		<td valign="top"><strong>Use Global Selection Color</strong></td>
+		<td valign="top">Toggles the use of the global selection color option</td>
+	</tr>
+	<tr>
+		<td valign="top"><strong>Selection Color</strong></td>
+		<td valign="top">Set the color used to select memory locations.</td>
+	</tr>
+	<tr>
+		<td valign="top"><strong>Edit Buffer</strong></td>
+		<td valign="top">Set how the edit buffer should behave:
+			<ul>
+				<li><strong>Save on Enter, Cancel on Focus Lost</strong></li>
+				<li><strong>Save on Enter or Focus Lost</strong></li>
+			</ul>
+		</td>
+	</tr>
+	<tr>
+		<td valign="top"><strong>History Trails Levels</strong></td>
+		<td valign="top">Set the number of history levels to retain.</td>
+	</tr>
+</table><p></p>
 
-<dl>
-  <dt>Text Color</dt>
-  <dd>Changes the color of the text.</dd>
-  <dt>Background Color</dt>
-  <dd>Changes the background color.</dd>
-  <dt>Address Color</dt>
-  <dd>Changes the color of the memory address text.</dd>
-  <dt>Changed Value color</dt>
-  <dd>Changes the color of values.</dd>
-  <dt>Font</dt>
-  <dd>Changes the font.</dd>
-  <dt>Padding Character</dt>
-  <dd>Specifies the character to use for padded values.</dd>
-  <dt>Auto-refresh by default</dt>
-  <dd>Updates the view automatically.</dd>
-  <dt>Show ASCII by default</dt>
-  <dd>Displays values in ASCII.</dd>
-</dl>
 
 <p><img border="0" src="../images/ngconcepts.gif" ALT="Related concepts" width="143" height="21">
 <br>
@@ -43,8 +91,10 @@
 <a href="../tasks/cdt_t_memory.htm">Working with memory</a></p>
 <p><img border="0" src="../images/ngref.gif" ALT="Related reference" width="143" height="21">
 <br>
-<a href="cdt_o_views.htm">Views</a></p>
-<img src="../images/ng00_04a.gif" ALT="IBM Copyright Statement" > 
+<a href="cdt_o_views.htm">C/C++ Views</a></p>
+<hr />
+<img src="../images/ng00_04a.gif" ALT="IBM Copyright Statement" > <br />
+<img src="../images/nokiaCopyright.png" ALT="Nokia Copyright Statement" >
 
 </body>
 
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_modules_view.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_modules_view.htm
index 2a081adbc14..4d0f69cc797 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_modules_view.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_modules_view.htm
@@ -5,8 +5,9 @@
 <meta http-equiv="Content-Language" content="en-us">
 <meta name="GENERATOR" content="Microsoft FrontPage 5.0">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Shared Libraries view</title>
+<title>Modules view</title>
 <link rel="stylesheet" type="text/css" href="../help.css">
+<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
 </head>
  
 
@@ -14,7 +15,7 @@
 
 <h1>Modules view</h1>
 
-<p>The <strong>Modules</strong> view of the Debug
+<p>The <img src="../images/command_link.png" border="0" alt="" /> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.views.showView(org.eclipse.ui.views.showView.viewId=org.eclipse.debug.ui.ModuleView)")'>Modules</a> view of the Debug
 perspective lets you view information about the modules loaded in the current
 debug session, including executables and shared libraries. The view consists
 of two areas: the modules tree and the detail pane. The detail pane displays
@@ -24,19 +25,19 @@ source files, etc.</p>
 
 <img src="../images/view_modules.png" alt="Modules view"></img>
 
-<h3>Modules view toolbar icons</h3>
+<h3>Modules view toolbar options</h3>
 
 <p>The table below lists the icons displayed in the Modules view toolbar.</p>
 
 <table border="1" cellpadding="5" cellspacing="0" style="border-collapse: collapse" bordercolor="#999999" width="600">
 <tr>
-  <td width="10%" align="left"><strong>Command</strong></td>
+  <td width="10%" align="left"><strong>Icon</strong></td>
   <td width="30%"><strong>Name</strong></td>
   <td width="60%"><strong>Description</strong></td>
 </tr>
 <tr>
   <td><img border="0" src="../images/icon_load_all_modules.png" alt="Load Symbols for all modules icon"></td>
-  <td>Load Symbols for All Modules</td>
+  <td><strong>Load Symbols for All Modules</strong></td>
   <td>Loads the symbols of the all modules involved in the current session. This option does not affect the modules whose symbols are already loaded.</td>
 </tr>
 </table>
@@ -47,24 +48,19 @@ source files, etc.</p>
 
 <table border="1" cellpadding="5" cellspacing="0" style="border-collapse: collapse" bordercolor="#999999" width="600">
 <tr>
-  <td width="10%" align="left"><strong>Command</strong></td>
+  <td width="10%" align="left"><strong>Icon</strong></td>
   <td width="30%"><strong>Name</strong></td>
   <td width="60%"><strong>Description</strong></td>
 </tr>
 <tr>
   <td><img border="0" src="../images/icon_load_all_modules.png"  alt="load symbols for all icon"></td>
-  <td>Load Symbols for All</td>
+  <td><strong>Load Symbols for All</strong></td>
   <td>Loads the symbols of the all modules involved in the current session. This option does not affect the modules whose symbols are already loaded.</td>
 </tr>
-<tr>
-  <td><img border="0" src="../images/icon_load_all_modules.png" alt="Load Symbols icon"></td>
-  <td>Load Symbols</td>
-  <td>Loads the symbols of the module. The symbols will be loaded from the file specified in the module's properties.</td>
-</tr>
 <tr>
   <td>&nbsp;</td>
-  <td>Properties...</td>
-  <td>Opens the Properties dialog for the module.</td>
+  <td><strong>Find...</strong></td>
+  <td>Opens the Find dialog box to search the Modules view.</td>
 </tr>
 </table>
 
@@ -76,8 +72,10 @@ source files, etc.</p>
 <a href="../tasks/cdt_o_debug.htm">Debugging</a></p>
 <p><img border="0" src="../images/ngref.gif" ALT="Related reference" width="143" height="21">
 <br>
-<a href="cdt_o_views.htm">Views</a></p>
-<img src="../images/ng00_04a.gif" ALT="IBM Copyright Statement" >
+<a href="cdt_o_views.htm">C/C++ Views</a></p>
+<hr />
+<img src="../images/ng00_04a.gif" ALT="IBM Copyright Statement" ><br />
+<img src="../images/nokiaCopyright.png" ALT="Nokia Copyright Statement" >
 
 </body>
 
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_signals_view.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_signals_view.htm
index d38a124e27a..e1dfe36cbec 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_signals_view.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_signals_view.htm
@@ -14,10 +14,14 @@
 
 <h1>Signals view</h1>
 
-<p>The <strong>Signals</strong> view of the Debug perspective lets you view the signals defined on the selected debug target and how the 
+<p>The <img src="../images/command_link.png" border="0" alt="" /> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.views.showView(org.eclipse.ui.views.showView.viewId=org.eclipse.cdt.debug.ui.SignalsView)")'>Signals</a> view of the Debug perspective lets you view the signals defined on the selected debug target and how the 
 debugger handles each one.</p>
   <p><img src="../images/view_signals.png" width="440" height="251"  alt="Signals View"></p>
-  <table width="600px" cellpadding="5" cellspacing="0" border="1" >
+  
+<h2>Signals view toolbar options</h2>
+<p>The table below lists the toolbar options displayed in the Signals view.</p>
+
+  <table width="600px" cellpadding="5" cellspacing="0" border="1" bordercolor="#DDDDDD" >
     <caption>
       <strong>Signals Columns</strong>
     </caption>
@@ -49,15 +53,16 @@ debugger handles each one.</p>
   </table>
   <h3>Signals view context menu commands </h3>
   <p>The Signals view context menu commands   include:</p>
-  <table width="600" cellpadding="5" cellspacing="0" border="1" >
+  <table width="600" cellpadding="5" cellspacing="0" border="1" bordercolor="#DDDDDD" >
     <colgroup>
-    <col width="30%" valign="top" >
+    <col width="5%" valign="top" >
+    <col width="25%" valign="top" >
     <col width="70%" valign="top" >
     </colgroup>
     <tbody>
       <tr>
         <td valign="top"><center>
-          <strong>Command</strong>
+          <strong>Icon</strong>
         </center>        </td>
         <td valign="top"><center>
           <strong>Name</strong>
@@ -93,9 +98,11 @@ debugger handles each one.</p>
 <a href="../tasks/cdt_o_debug.htm">Debugging</a></p>
 <p><img border="0" src="../images/ngref.gif" ALT="Related reference" width="143" height="21">
 <br>
-<a href="cdt_o_views.htm">Views</a></p>
-<p><img src="../images/nokiaCopyright.png" alt="Nokia Copyright Statement" ><br>
-<img src="../images/ng00_04a.gif" ALT="IBM Copyright Statement" ></p>
+<a href="cdt_o_views.htm">C/C++ Views</a></p>
+<hr />
+<p>
+<img src="../images/ng00_04a.gif" ALT="IBM Copyright Statement" ><br>
+<img src="../images/nokiaCopyright.png" alt="Nokia Copyright Statement" ></p>
 </body>
 
 </html>
\ No newline at end of file
diff --git a/doc/org.eclipse.cdt.doc.user/topics_Reference.xml b/doc/org.eclipse.cdt.doc.user/topics_Reference.xml
index 3e3dba52fba..f3f20063ece 100644
--- a/doc/org.eclipse.cdt.doc.user/topics_Reference.xml
+++ b/doc/org.eclipse.cdt.doc.user/topics_Reference.xml
@@ -27,7 +27,7 @@
 	<topic label="Debug views" href="reference/cdt_o_dbg_view.htm">
 		<topic label="Registers view" href="reference/cdt_u_registersview.htm"/>
 		<topic label="Memory view" href="reference/cdt_u_memoryview.htm"/>
-		<topic label="Memory view preferences" href="reference/cdt_u_mem_view_pref.htm"/>
+		<topic label="Traditional Memory Rendering preferences" href="reference/cdt_u_mem_view_pref.htm"/>
 		<topic label="Disassembly view" href="reference/cdt_u_dissassembly_view.htm"/>
 		<topic label="Modules view" href="reference/cdt_u_modules_view.htm"/>
 		<topic label="Signals view" href="reference/cdt_u_signals_view.htm"/>

Option	Description
Use Global Text Color	Toggles the use of the global Text Color option.
Text Color	Changes the color of the text.
Brighten Alternate Cells	Set the brightness used to highlight alternate cells.
Use Global Background Color	Toggles the use of the global Background Text Color option.
Background Color	Changes the background color.
Changed Color	Set the color used to display changed memory locations.
Edit Color	Set the color used to show edited memory locations.
Use Global Selection Color	Toggles the use of the global selection color option
Selection Color	Set the color used to select memory locations.
Edit Buffer	Set how the edit buffer should behave: + + Save on Enter, Cancel on Focus Lost + Save on Enter or Focus Lost + +
History Trails Levels	Set the number of history levels to retain.
Command	Icon	Name	Description
	Load Symbols for All Modules	Load Symbols for All Modules	Loads the symbols of the all modules involved in the current session. This option does not affect the modules whose symbols are already loaded.