Fixes incorrect command-links on editor pref panels

9 files changed, 10 insertions, 9 deletions

diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_color.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_color.htm
index ab620369538..81981a9bdd5 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_color.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_color.htm
@@ -13,7 +13,7 @@
 
 <h1>Syntax Coloring 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.internal.ui.preferences.CEditorColoringPreferencePage)")'>Syntax Coloring</a> preference panel to specify how C/C++ source code is rendered. Each element category (Code, Comments, and Preprocessor) contains a list of language elements that may be rendered with its own color and style.</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.CEditorColoringPreferencePage)")'>Syntax Coloring</a> preference panel to specify how C/C++ source code is rendered. Each element category (Code, Comments, and Preprocessor) contains a list of language elements that may be rendered with its own color and style.</p>
 	<p>Note that general text editor settings such as the background color can be configured on the general <strong>Text Editors</strong> preference pages. Fonts may be configured on the general <strong>Colors and Fonts</strong> preference page</p>
 	<p><img src="../images/editor_color_preferences.png" alt="Syntax Coloring Preferences Page"></p>
 
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_folding.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_folding.htm
index 32392687f5c..274b7e160ed 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_folding.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_folding.htm
@@ -12,7 +12,7 @@
 
 <h1>Folding 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.internal.ui.preferences.FoldingPreferencePage)")'>Folding</a> preference panel to customize the C/C++ editor folding behavior.</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.FoldingPreferencePage)")'>Folding</a> preference panel to customize the C/C++ editor folding behavior.</p>
 <p><img src="../images/editor_folding_preferences.png" alt="Editor Folding Preferences Window"></p>
 <table width="600px" cellpadding="5" cellspacing="0" border="1" >
 	<caption><strong>Folding Preference Options</strong></caption>
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_hov.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_hov.htm
index 3950ea97c0c..f366964b1f0 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_hov.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_hov.htm
@@ -12,7 +12,7 @@
 
 <h1>Hovers 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.internal.ui.preferences.CEditorHoverPreferencePage)")'>Hovers</a> preference panel to customize the C/C++ editor hover behavior.</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.HoverPreferencePage)")'>Hovers</a> preference panel to customize the C/C++ editor hover behavior.</p>
 <p><img src="../images/editor_hover_preferences.png" alt="Editor Hover Preferences Panel"></p>
 <table width="600px" cellpadding="4" cellspacing="0" border="1" fgcolor="DDD" >
 	<caption><strong>Hovers Preference Options</strong></caption>
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_save_actions.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_save_actions.htm
index abdfef3cce9..258820479a3 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_save_actions.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_save_actions.htm
@@ -12,7 +12,7 @@
 
 <h1>Save actions</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.internal.ui.preferences.SaveActionsPreferencePage)")'>Save Actions</a> preference panel to configure actions performed by the C/C++ editor while saving a file.</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.SaveActionsPreferencePage)")'>Save Actions</a> preference panel to configure actions performed by the C/C++ editor while saving a file.</p>
 <p><img src="../images/editor_save_actions_preferences.png"  alt="Save Actions Preferences"></p>
 
 <table width="600px" cellpadding="5" cellspacing="0" border="1" >
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_scalability.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_scalability.htm
index 2b04e7dfd99..91a87f645f0 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_scalability.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_scalability.htm
@@ -12,7 +12,7 @@
 
 <h1>Scalability 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.internal.ui.preferences.ScalabilityPreferencePage)")'>Scalability</a> preference panel to configure options for dealing with large source files.</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.ScalabilityPreferencePage)")'>Scalability</a> preference panel to configure options for dealing with large source files.</p>
 <p><img src="../images/editor_scalability_preferences.png"  alt="Scalability Preferences"></p>
 
 <table width="600px" cellpadding="5" cellspacing="0" border="1" >
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_typing.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_typing.htm
index 8ac43713caf..ea794fb1926 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_typing.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_typing.htm
@@ -12,7 +12,7 @@
 
 <h1>Typing 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.internal.ui.preferences.SmartTypingPreferencePage)")'>Typing</a> preference panel to assist in formatting input as you type.</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.SmartTypingPreferencePage)")'>Typing</a> preference panel to assist in formatting input as you type.</p>
 <p><img src="../images/editor_typing_preferences.png"  alt="Typing Preferences"></p>
 
 <table width="600px" cellpadding="5" cellspacing="0" border="1" >
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 63e47337721..d3588af938f 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.internal.ui.preferences.CTemplatePreferencePage)")'>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.CTemplatePreferencePage)")'>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" >
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 a29c8e48d87..79482be8d26 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
@@ -6,12 +6,13 @@
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Disassembly view</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>Disassembly view</h1>
 
-<p>The <strong>Disassembly</strong> view shows the loaded program as assembler instructions mixed with source code for comparison. The currently executing line is indicated by an arrow marker and highlighted in the view. You can do the following tasks in the Disassembly view:</p>
+<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=com.nokia.carbide.cpp.project.ui.views.SymbianProjectNavigatorView)")'>Disassembly</a> view shows the loaded program as assembler instructions mixed with source code for comparison. The currently executing line is indicated by an arrow marker and highlighted in the view. You can do the following tasks in the Disassembly view:</p>
 <ul>
   <li>Set breakpoints at the start of any assembler instruction</li>
   <li>Enable and disable  breakpoints and their set their properties </li>
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_dsfgdb.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_dsfgdb.htm
index 26d7154c1d3..e47b8a03878 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_dsfgdb.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_dsfgdb.htm
@@ -26,7 +26,7 @@ The page is accessible at:
   <dt>Terminate GDB when last process exits</dt>
   <dd>When checked, the CDT debugger will terminate the GDB host processs after all the target processes it is debugging have terminated. Otherwise it will leave it running.</dd>
   <dt>Use enhanced debug hover</dt>
-  <dd>When checked, hovering over an expression in the editor during a debug session will bring up an <i>enhanced</i> expression evaluation control. Otherwise, a more basic control is used. This, of course, assumes that you have the debugger's hovering capability turned on in C/C++ > Editor > Hovers. If not, this checkbox has no effect.
+  <dd>When checked, hovering over an expression in the editor during a debug session will bring up an <i>enhanced</i> expression evaluation control. Otherwise, a more basic control is used. This, of course, assumes that you have the debugger's hovering capability turned on in C/C++ > Editor > Hovers. If not, this checkbox has no effect.<br />
 	<img src="../images/cdt_debug_hover_modes.png"  alt="debug hover modes">
   </dd>
 </dl>