diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/ICHelpContextIds.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/ICHelpContextIds.java
index 7f9fb1f6237..0eea6b39633 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/ICHelpContextIds.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/ICHelpContextIds.java
@@ -46,7 +46,7 @@ public interface ICHelpContextIds {
 	public static final String PREVIOUS_PROBLEM_ACTION= PREFIX + "previous_problem_action";	//$NON-NLS-1$
 	public static final String GOTO_NEXT_ERROR_ACTION= PREFIX + "goto_next_error_action"; 	 //$NON-NLS-1$	
 	public static final String GOTO_PREVIOUS_ERROR_ACTION=	PREFIX + "goto_previous_error_action"; 	 //$NON-NLS-1$	
-	public static final String TOGGLE_MARK_OCCURRENCES_ACTION= PREFIX + "toggle_mark_occurrences_action"; //$NON-NLS-1$
+	public static final String TOGGLE_MARK_OCCURRENCES_ACTION= PREFIX + "toggle_mark_occurrences_action_context"; //$NON-NLS-1$
 
 	// Preference/property pages
 	public static final String C_PREF_PAGE = PREFIX + "c_pref"; //$NON-NLS-1$
diff --git a/doc/org.eclipse.cdt.doc.user/contexts_CDT.xml b/doc/org.eclipse.cdt.doc.user/contexts_CDT.xml
index 99b6e9f95b5..e8d707f1708 100644
--- a/doc/org.eclipse.cdt.doc.user/contexts_CDT.xml
+++ b/doc/org.eclipse.cdt.doc.user/contexts_CDT.xml
@@ -346,5 +346,8 @@
     <description>Specify the templates used for code generation and new files.</description>
     <topic label="Code Templates Preferences" href="reference/cdt_u_c_code_templates_pref.htm"/>
 </context>
+<context id="toggle_mark_occurrences_action_context">
+    <description>Allows you to switch mark occurrences on and off.</description>
+</context>
 
 </contexts>
diff --git a/doc/org.eclipse.cdt.doc.user/images/mark_occurrences.png b/doc/org.eclipse.cdt.doc.user/images/mark_occurrences.png
new file mode 100644
index 00000000000..6cef6c72c3e
Binary files /dev/null and b/doc/org.eclipse.cdt.doc.user/images/mark_occurrences.png differ
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_o_ceditor_pref.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_o_ceditor_pref.htm
index fb587552654..4c364ecfa25 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_o_ceditor_pref.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_o_ceditor_pref.htm
@@ -19,6 +19,7 @@
 		&nbsp;&nbsp;&nbsp;&nbsp;<img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_u_c_editor_con_assist_adv.htm">Advanced preferences</a><br>
 		<img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_u_c_editor_folding.htm">Folding preferences</a><br>
 		<img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_u_c_editor_hov.htm">Hovers preferences</a><br>
+		<img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_u_c_editor_mark_occurrences.htm">Mark Occurrences preferences</a><br>
 		<img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_u_c_editor_color.htm">Syntax Coloring preferences</a><br>
 		<img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_u_code_temp.htm">Templates preferences</a><br>
 		<img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_u_c_editor_typing.htm">Typing preferences</a>
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 723c0d91f92..2b49b242fc5 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
@@ -57,6 +57,7 @@
 			<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 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_folding.htm">Folding 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_hov.htm">Hovers 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_mark_occurrences.htm">Mark Occurrences 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_color.htm">Syntax Coloring preferences</a><br>
 		<img src="../images/trans.gif" border="0" width="150" height="1" alt=""><a style="text-decoration:none" href="cdt_u_code_temp.htm">Templates 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_typing.htm">Typing preferences</a><br>
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_mark_occurrences.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_mark_occurrences.htm
new file mode 100644
index 00000000000..55bf0b721a8
--- /dev/null
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_mark_occurrences.htm
@@ -0,0 +1,52 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2008. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<title>Mark Occurrences</title>
+<link rel="stylesheet" href="../../../../book.css" charset="ISO-8859-1" type="text/css">
+<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"> </script>
+</head>
+<body>
+<h1>Mark Occurrences</h1>
+<p>Indicate your preferences for the Mark Occurrences settings on the <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.cdt.ui.preferences.MarkOccurrencesPreferencePage)")'> <img src="PLUGINS_ROOT/org.eclipse.help/command_link.png" alt="Opens the Mark Occurrences preference page"> <b>C/C++ &gt; Editor &gt; Mark Occurrences</b></a> preference page.</p>
+<table border="1" cellspacing="0" cellpadding="5">
+	<thead>
+		<tr>
+			<th>
+			<p>Option</p>
+			</th>
+			<th>
+			<p>Description</p>
+			</th>
+			<th>
+			<p>Default</p>
+			</th>
+		</tr>
+	</thead>
+	<tbody>
+		<tr>
+			<td valign="top">
+			<p>Mark occurrences of the selected element in the current file</p>
+			</td>
+			<td valign="top">
+			<p>If enabled, then you'll see within a file, where a variable, function, method, type, macro or other element is referenced.</p>
+			</td>
+			<td valign="top">
+			<p>On</p>
+			</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>
+<p><img border="0" 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 border="0" 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>
+
+</body>
+</html>
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_toolbar.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_toolbar.htm
index c3ee533603f..ad118522043 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_toolbar.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_toolbar.htm
@@ -83,7 +83,7 @@
 	<tr>
 		<td align="center" valign="top"><img src="../images/icon_open_element.png"></td>
 		<td valign="top">Open Element</td>
-		<td valign="top">Brings up the Open Element selection dialog to open a type in the editor. 
+		<td valign="top">Brings up the Open Element selection dialog to open an element in the editor. 
                     The Open Elements selection dialog shows all elements existing in the workspace. </td>
 	</tr>
 	<tr>
@@ -106,15 +106,20 @@
 		<td valign="top">Modify working set</td>
 		<td valign="top">Modify workbench working set.</td>
 	</tr>
+	<tr>
+		<td align="center" valign="top"><img src="../images/mark_occurrences.png"></td>
+		<td valign="top">Toggle Mark Occurrences</td>
+		<td valign="top">Turns <a href="cdt_u_c_editor_mark_occurrences.htm">mark occurrences</a> on and off in the C/C++ editor.</td>
+	</tr>
 	<tr>
 		<td align="center" valign="top"><img src="../images/icon_ws_chars.png"></td>
-		<td valign="top">Show Whitspace characters</td>
+		<td valign="top">Show Whitespace Characters</td>
 		<td valign="top">Displays whitespace characters in the editor.</td>
 	</tr>
 	<tr>
 		<td align="center" valign="top"><img src="../images/icon_show_selected.png"></td>
 		<td valign="top">Show Selected Element</td>
-		<td valign="top">Show source of Selected Element only</td>
+		<td valign="top">Show source of selected element only</td>
 	</tr>
 	<tr>
 		<td align="center" valign="top"><img src="../images/icon_annotation_next.png"></td>
diff --git a/doc/org.eclipse.cdt.doc.user/topics_Reference.xml b/doc/org.eclipse.cdt.doc.user/topics_Reference.xml
index e623682d393..cd70ed7d01e 100644
--- a/doc/org.eclipse.cdt.doc.user/topics_Reference.xml
+++ b/doc/org.eclipse.cdt.doc.user/topics_Reference.xml
@@ -69,6 +69,7 @@
 			</topic>
 			<topic label="Folding preferences" href="reference/cdt_u_c_editor_folding.htm"/>
 			<topic label="Hovers preferences" href="reference/cdt_u_c_editor_hov.htm"/>
+			<topic label="Mark Occurrences preferences" href="reference/cdt_u_c_editor_mark_occurrences.htm"/>
 			<topic label="Syntax Coloring preferences" href="reference/cdt_u_c_editor_color.htm"/>
 			<topic label="Templates preferences" href="reference/cdt_u_code_temp.htm"/>
 			<topic label="Typing preferences" href="reference/cdt_u_c_editor_typing.htm"/>