diff --git a/doc/org.eclipse.cdt.doc.user/images/cdt_pref_new_task_tag_dlg.png b/doc/org.eclipse.cdt.doc.user/images/cdt_pref_new_task_tag_dlg.png
new file mode 100755
index 00000000000..2235581638e
Binary files /dev/null and b/doc/org.eclipse.cdt.doc.user/images/cdt_pref_new_task_tag_dlg.png differ
diff --git a/doc/org.eclipse.cdt.doc.user/images/cdt_pref_task_tags.png b/doc/org.eclipse.cdt.doc.user/images/cdt_pref_task_tags.png
new file mode 100755
index 00000000000..e7299985c19
Binary files /dev/null and b/doc/org.eclipse.cdt.doc.user/images/cdt_pref_task_tags.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 ce25b6b3db6..ca9b76ae143 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
@@ -86,6 +86,8 @@
   <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_pref_task_tags.htm">Task Tags</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="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>
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_pref_task_tags.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_pref_task_tags.htm
new file mode 100644
index 00000000000..b59982c460b
--- /dev/null
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_pref_task_tags.htm
@@ -0,0 +1,79 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html lang="en">
+
+<head>
+	<meta http-equiv="Content-Language" content="en-us">
+	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+	<title>Task Tags 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>Task Tags 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.ui.preferences.TodoTaskPreferencePage)")'>Task Tags</a> preference panel to configure global todo tags for C/C++ editor views.</p>
+<p><img src="../images/cdt_pref_task_tags.png"  alt="Task Tags Preferences"></p>
+<table border="1" cellspacing="0" cellpadding="5" width="600" fgcolor="DDD" >
+	<caption><strong>Task Tags 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>
+			<td valign="top">
+			<b>New...</b>
+			</td>
+			<td valign="top">Opens the <b>New Task Tag</b> dialog box to create a new todo task tag.<br />
+			<p><img src="../images/cdt_pref_new_task_tag_dlg.png"  alt="New Task Tag Dialog Box"></p>
+			</td>
+		</tr>
+		<tr>
+			<td valign="top" >
+			<b>Edit...</b></td>
+			<td valign="top">
+			Opens the <b>Edit Task Tag</b> dialog box to modify the selected tag.
+			</td>
+		</tr>
+		<tr>
+			<td valign="top" >
+			<b>Remove</b>
+			</td>
+			<td valign="top">
+			Removes the selected task tag.
+			</td>
+		</tr>
+		<tr>
+			<td valign="top" >
+			<b>Default</b>
+			</td>
+			<td valign="top">
+			Sets the selected task tag as the default tag. The default tags appears in <b>bold</b> text.
+			</td>
+		</tr>
+		<tr>
+			<td valign="top" >
+			<b>Case sensitive task tag names</b>
+			</td>
+			<td valign="top">
+			Enable to enter task tags using the same case as the tag. Disable to always use the defined case for the tags.
+			</td>
+		</tr>
+	</tbody>
+</table>
+
+<p><img border="0" src="../images/ngref.gif" ALT="Related reference" width="143" height="21"><br />
+<a href="cdt_o_ref.htm">Reference</a>
+<hr>
+<img src="../images/nokiaCopyright.png" ALT="Nokia Copyright Statement" >
+
+</body>
+
+</html>
diff --git a/doc/org.eclipse.cdt.doc.user/topics_Reference.xml b/doc/org.eclipse.cdt.doc.user/topics_Reference.xml
index d96170938f8..3e3dba52fba 100644
--- a/doc/org.eclipse.cdt.doc.user/topics_Reference.xml
+++ b/doc/org.eclipse.cdt.doc.user/topics_Reference.xml
@@ -110,6 +110,8 @@
 		<topic label="Property Pages Settings" href="reference/cdt_u_pref_prop_pages.htm">
 			<topic label="Multiple Configurations Edit" href="reference/cdt_u_pref_multi_cfg.htm"/>
 	    </topic>
+  <topic href="reference/cdt_u_pref_task_tags.htm" label="Task Tags">
+  </topic>
 	</topic>
 	
 	<!-- PROJECT PROPERTIES TOPICS -->

Option	Description
+ New... +	Opens the New Task Tag dialog box to create a new todo task tag. + +
+ Edit...	+ Opens the Edit Task Tag dialog box to modify the selected tag. +
+ Remove +	+ Removes the selected task tag. +
+ Default +	+ Sets the selected task tag as the default tag. The default tags appears in bold text. +
+ Case sensitive task tag names +	+ Enable to enter task tags using the same case as the tag. Disable to always use the defined case for the tags. +