diff --git a/bundles/org.eclipse.platform.doc.user/images/content_type.png b/bundles/org.eclipse.platform.doc.user/images/content_type.png
index 6d46301..659e843 100644
--- a/bundles/org.eclipse.platform.doc.user/images/content_type.png
+++ b/bundles/org.eclipse.platform.doc.user/images/content_type.png
Binary files differ
diff --git a/bundles/org.eclipse.platform.doc.user/reference/ref-content-type.htm b/bundles/org.eclipse.platform.doc.user/reference/ref-content-type.htm
index 5c2ec21..d571ad4 100644
--- a/bundles/org.eclipse.platform.doc.user/reference/ref-content-type.htm
+++ b/bundles/org.eclipse.platform.doc.user/reference/ref-content-type.htm
@@ -13,7 +13,7 @@
 <h1 class="Head">Content Types preference page</h1>
 
 <p class="Para">The <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ui.preferencePages.ContentTypes)")'><img src="PLUGINS_ROOT/org.eclipse.help/command_link.png" alt="command link"><strong>General &gt; Content Types</strong></a>
-  preference page enables you to edit content types and their associated file names and character sets.
+  preference page enables you to edit content types and their associated file names, editors and character sets.
   You can also associate arbitrary file names or file extensions with content types. 
   A <i>content type</i> acts as a description 
   of a certain class of files (for instance, XML files). Eclipse uses this description 
@@ -24,18 +24,26 @@
   &gt; Preferences &gt; General &gt; Content Types</strong>. 
 </p>
 
-<p>The <b>Content Types</b> preference page:
-</p>
-
 <p><img src="../images/content_type.png" alt="Content types preference page">
 </p>
 
+<h2>Manage content type definitions</h2>
+<p class="Para">You can define new content types from this preference page. On the right
+of the tree showing all content types, click on <b>Add Root...</b> or <b>Add Child...</b>
+(in case a content type is already selected) to define a new content type. You'll then be asked for the name.
+</p>
+<p>Content types that were created manually from the preference page are stored in the user data area.</p>
+<p>Content types that were created manually can be removed thanks to the <b>Remove</b> button. Removing a content
+type definition also removes all children content type definitions. Content type that were defined by plug-ins cannot
+be removed.</p>
+
+<h2>Associating content types with file name or extension</h2>
 <p class="Para">By selecting a content type in the topmost tree, you can alter 
   the file names and extensions that are associated with it. 
 </p>
 
 <p class="note"><strong>Note:</strong> 
-  Certain items will be marked as "locked". An item is locked if it is one of 
+  Certain name specification will show a "lock" icon. An item is locked if it is one of 
   the associations provided by the plug-in that declares the content type. In 
   other words, you can remove only user-contributed associations.
 </p>
@@ -47,7 +55,22 @@
 <p><img src="../images/Image201_contenttype.png" alt="New file type dialog" border="0">
 </p>
 
-<p class="Para">In addition to adding and removing file names or extensions, you 
+<h2>Associating editors with content types</h2>
+<p class="Para">The second list below the content types tree shows the editors that are directly
+declared as suitable to open the given content type. Editors associated with parent content types
+are also valid editors for the children content type, although they are not shown there.
+</p>
+<p>For any content type, you can declare a new editor association using the <b>Add...</b> button
+besides the list of editors. This button will let you pick a new editor to associate with the
+selected content type.</p>
+<p><img src="../images/Image202_editorsel.png" alt="Editor selection dialog" border="0">
+</p>
+<p>Those user-defined editor associations are stored in the user data area.</p>
+<p>Editor associations defined manually can be removed thanks to the <b>Remove</b> button. Editor associations
+that were defined by a plug-in are locked and cannot be removed.</p>
+
+<h2>Define default encoding for content type</h2>
+<p class="Para">You 
   can also set the default encoding for a given content type. To do this, simply 
   enter the encoding name in the provided field and click <strong>Update</strong>.
 </p>