20918 Java preferences doc incomplete
diff --git a/bundles/org.eclipse.jdt.doc.user/contexts_JDT.xml b/bundles/org.eclipse.jdt.doc.user/contexts_JDT.xml
index 8d675aa..ece22cb 100644
--- a/bundles/org.eclipse.jdt.doc.user/contexts_JDT.xml
+++ b/bundles/org.eclipse.jdt.doc.user/contexts_JDT.xml
@@ -832,11 +832,13 @@
     
     <context id="sort_order_preference_page_context">
         <description>On this page you can indicate your preferences for sorting elements in views.  The same settings are also used by the Sort Members command.</description>
+        <topic label="Members Sort Order preference page" href="reference/preferences/java/appearance/ref-preferences-member-sort-order.htm"/>
         <topic label="Sorting elements in Java views" href="concepts/cjavaviews_sorting.htm"/>
     </context>
 
     <context id="type_filter_preference_page_context">
         <description>On this page you can indicate your preferences for filtering types from various lists.</description>
+        <topic label="Type Filters preference page" href="reference/preferences/java/appearance/ref-preferences-type-filters.htm"/>
     </context>
     
     <context id="tasktags_preference_page_context">
@@ -915,12 +917,15 @@
     <context id="code_templates_preference_context">
         <description>Specify the code templates used for code generation.</description>
         <topic label="Code Template Preferences" href="reference/ref-preferences-code-templates.htm"/>
-        <topic label="Code Style Preferences" href="reference/ref-preferences-code-generation.htm"/>
     </context>
 
     <context id="compiler_preference_page_context">
         <description>Specify the behavior of the JDT Java compiler.</description>
         <topic label="Java Compiler Preferences" href="reference/ref-preferences-compiler.htm"/>
+        <topic label="Building Preferences" href="reference/preferences/java/compiler/ref-preferences-building.htm"/>        
+        <topic label="Errors/Warnings Preferences" href="reference/preferences/java/compiler/ref-preferences-errors-warnings.htm"/>
+        <topic label="Javadoc Preferences" href="reference/preferences/java/compiler/ref-preferences-javadoc.htm" />
+        <topic label="Task Tags Preferences" href="reference/ref-preferences-task-tags.htm" />
         <topic label="Java Builder" href="concepts/concepts-4.htm"/>
     </context>
 
@@ -933,6 +938,7 @@
     <context id="new_java_project_preference_page_context">
         <description>Specify the settings to use when generating new Java projects.</description>
         <topic label="Java Projects" href="concepts/concepts-3.htm"/>
+        <topic label="Build Path preference page" href="reference/preferences/java/ref-preferences-build-path.htm"/>
     </context>
     
     <context id="javadoc_configuration_property_page_context">
@@ -945,7 +951,37 @@
         
     </context>
 
-
+    <context id="java_build_preference_page_context">
+        <description>Specify the behavior of the JDT Java builder on this preference site.</description>
+        <topic label="Building Preferences" href="reference/preferences/java/compiler/ref-preferences-building.htm"/> 
+    </context>
+    
+    <context id="problem_severities_preference_page_context">
+        <description>Specify the severities of the problems detected by the JDT Java compiler on this preference site.</description>
+        <topic label="Errors/Warnings Preferences" href="reference/preferences/java/compiler/ref-preferences-errors-warnings.htm"/> 
+    </context>
+    
+    <context id="javadoc_problems_preference_page_context">
+        <description>Specify the severities of the problems detected by the JDT Java compiler within javadoc comments on this preference site.</description>
+        <topic label="Javadoc Preferences" href="reference/preferences/java/compiler/ref-preferences-javadoc.htm"/> 
+    </context>
+    
+    <context id="java_build_property_page_context">
+        <description>Specify the behavior of the JDT Java builder on this preference site.</description>
+        <topic label="Building Preferences" href="reference/preferences/java/compiler/ref-preferences-building.htm"/> 
+    </context>
+    
+    <context id="problem_severities_property_page_context">
+        <description>Specify the severities of the problems detected by the JDT Java compiler on this preference site.</description>
+        <topic label="Errors/Warnings Preferences" href="reference/preferences/java/compiler/ref-preferences-errors-warnings.htm"/> 
+    </context>
+    
+    <context id="javadoc_problems_property_page_context">
+        <description>Specify the severities of the problems detected by the JDT Java compiler within javadoc comments on this preference site.</description>
+        <topic label="Javadoc Preferences" href="reference/preferences/java/compiler/ref-preferences-javadoc.htm"/> 
+    </context>
+    
+    
     <!-- Wizard pages -->
 
     <context id="new_javaproject_wizard_page_context">
@@ -1683,6 +1719,7 @@
     
     <context id="cp_userlibraries_preference_page_context">
         <description>User libraries can be added to a Java Build path and bundle a number of external archives. System libraries will be added to the boot class path when launched.</description>
+        <topic label="User Libraries preference page" href="reference/preferences/java/buildpath/ref-preferences-user-libraries.htm"/>
     </context>
     
     <context id="cp_edit_user_library">
diff --git a/bundles/org.eclipse.jdt.doc.user/reference/preferences/java/appearance/ref-preferences-member-sort-order.htm b/bundles/org.eclipse.jdt.doc.user/reference/preferences/java/appearance/ref-preferences-member-sort-order.htm
new file mode 100644
index 0000000..80ab612
--- /dev/null
+++ b/bundles/org.eclipse.jdt.doc.user/reference/preferences/java/appearance/ref-preferences-member-sort-order.htm
@@ -0,0 +1,67 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2006. 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>Member Sort Order</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>Member Sort Order</h1>
+<p>Indicate your preferences for the Member Sort Order settings on the <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.jdt.ui.preferences.MembersOrderPreferencePage)")'> <img src="PLUGINS_ROOT/org.eclipse.help/command_link.png" alt="Opens the Member Sort Order preference page"><b> Java &gt; Appearance &gt; Member Sort Order </b></a> preference page.</p>
+<p>This settings are used by Java Views as well as by the Sort Members Action.</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">Choose the order in which members will be displayed.</td>
+			<td valign="top">
+			<dl>
+				<dt><strong>Up</strong></dt>
+				<dd>Move members of selected category closer to the beginning of a type.</dd>
+				<dt><strong>Down</strong></dt>
+				<dd>Move members of selected category closer to the end of a type.</dd>
+			</dl>
+			</td>
+			<td valign="top">Types, Static Fields, Static Initializers, Static Methods, Fields, Initializers, Constructors, Methods</td>
+		</tr>
+		<tr>
+			<td valign="top">
+			<p>Sort members in same category by visibility</p>
+			</td>
+			<td valign="top">
+			<p>If enabled, members of same category are sorted by visibility within the category.</p>
+			<dl>
+				<dt><strong>Up</strong></dt>
+				<dd>Move members of selected visibility closer to the beginning of a category.</dd>
+				<dt><strong>Down</strong></dt>
+				<dd>Move members of selected visibility closer to the end of a category.</dd>
+			</dl>
+			</td>
+			<td valign="top">
+			<p>Off</p>
+			<p>Public, Private, Protected, Default</p>
+			</td>
+		</tr>
+	</tbody>
+</table>
+<p><img src="../../../../images/ngrelc.png" alt="Related concepts" border="0"></p>
+<p><a href="../../../../concepts/cjavaviews.htm">Java views</a></p>
+<p><img src="../../../../images/ngrelr.png" alt="Related reference" border="0"></p>
+<p><a href="../../../../reference/ref-view-package-explorer.htm">Package Explorer view</a><br>
+<a href="../../../../reference/ref-menu-source.htm">Source Actions</a></p>
+</body>
+</html>
diff --git a/bundles/org.eclipse.jdt.doc.user/reference/preferences/java/appearance/ref-preferences-type-filters.htm b/bundles/org.eclipse.jdt.doc.user/reference/preferences/java/appearance/ref-preferences-type-filters.htm
new file mode 100644
index 0000000..8f55d8c
--- /dev/null
+++ b/bundles/org.eclipse.jdt.doc.user/reference/preferences/java/appearance/ref-preferences-type-filters.htm
@@ -0,0 +1,21 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2006. 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>Type Filters</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>Type Filters</h1>
+<p>Indicate your preferences for the Type Filters settings on the <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.jdt.ui.preferences.TypeFilterPreferencePage)")'> <img src="PLUGINS_ROOT/org.eclipse.help/command_link.png" alt="Opens the Type Filters	preference page"><b> Java &gt; Appearance &gt; Type Filters </b></a> preference page.</p>
+<p>Specify types and packages to hide in the 'Open Type' dialog and content assist or quick fix proposals on this preference site.</p>
+<p>The default is to hide nothing.</p>
+<p><img src="../../../../images/ngrelc.png" alt="Related concepts" border="0"></p>
+<p><a href="../../../../concepts/cquickfix.htm">Quick Fix</a></p>
+<p><img src="../../../../images/ngrelr.png" alt="Related reference" border="0"></p>
+<p><a href="../../../../reference/ref-148.htm">Open Type</a><br>
+<a href="../../../../reference/ref-143.htm">Content/Code Assist</a></p>
+</body>
+</html>
diff --git a/bundles/org.eclipse.jdt.doc.user/reference/preferences/java/buildpath/ref-preferences-user-libraries.htm b/bundles/org.eclipse.jdt.doc.user/reference/preferences/java/buildpath/ref-preferences-user-libraries.htm
new file mode 100644
index 0000000..867ecfd
--- /dev/null
+++ b/bundles/org.eclipse.jdt.doc.user/reference/preferences/java/buildpath/ref-preferences-user-libraries.htm
@@ -0,0 +1,20 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2006. 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>User Libraries</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>User Libraries</h1>
+<p>Indicate your preferences for the User Libraries settings on the <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.jdt.ui.preferences.UserLibraryPreferencePage)")'> <img src="PLUGINS_ROOT/org.eclipse.help/command_link.png" alt="Opens the User Libraries preference page">
+<b> Java &gt; Build Path &gt; User Libraries </b></a> preference page.</p>
+<p>A user library is a set of JAR files. A user library can be added to a projects build path
+through the build path properties page. The User Libraries preference page allows to define,
+edit, import, export, or remove user libraries.</p>
+<p><img src="../../../../images/ngrelr.png" alt="Related reference" border="0"></p>
+<p><a href="../../../../reference/ref-123.htm">Java Build Path page</a><br>
+</body>
+</html>
diff --git a/bundles/org.eclipse.jdt.doc.user/reference/preferences/java/compiler/ref-preferences-building.htm b/bundles/org.eclipse.jdt.doc.user/reference/preferences/java/compiler/ref-preferences-building.htm
new file mode 100644
index 0000000..9daeeca
--- /dev/null
+++ b/bundles/org.eclipse.jdt.doc.user/reference/preferences/java/compiler/ref-preferences-building.htm
@@ -0,0 +1,173 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2006. 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>Building</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>Building</h1>
+<p>Indicate your preferences for the Building settings on the <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.jdt.ui.preferences.JavaBuildPreferencePage)")'> <img src="PLUGINS_ROOT/org.eclipse.help/command_link.png" alt="Opens the Building preference page"><b> Java &gt; Compiler &gt; Building </b></a> preference page.</p>
+<p></p>
+<h3>General</h3>
+<p></p>
+<table border="1" cellspacing="0" cellpadding="5" width="100%">
+	<tr>
+		<th>
+		<p>Option</p>
+		</th>
+		<th>
+		<p>Description</p>
+		</th>
+		<th>
+		<p>Default</p>
+		</th>
+	</tr>
+	<tr>
+		<td valign="top">
+		<p>Maximum number of reported problems per compilation unit</p>
+		</td>
+		<td valign="top">
+		<p>Specifies how many problems should be reported for a compilation unit.</p>
+		</td>
+		<td valign="top">
+		<p>100</p>
+		</td>
+	</tr>
+	<tr>
+		<td valign="top">
+		<p>Treat configurable errors like fatal errors</p>
+		</td>
+		<td valign="top">
+		<p>When enabled, all generated errors, fatal or configurable, lead to non executable code.</p>
+		</td>
+		<td valign="top">
+		<p>On</p>
+		</td>
+	</tr>
+	<tr>
+		<td valign="top">
+		<p>Enable use of exclusion patterns in source folders</p>
+		</td>
+		<td valign="top">
+		<p>When disabled, no entry on a project classpath can be associated with an exclusion pattern.</p>
+		</td>
+		<td valign="top">
+		<p>On</p>
+		</td>
+	</tr>
+	<tr>
+		<td valign="top">
+		<p>Enable use of multiple output locations for source folders</p>
+		</td>
+		<td valign="top">
+		<p>When disabled, no entry on a project classpath can be associated with a specific output location, preventing thus usage of multiple output locations.</p>
+		</td>
+		<td valign="top">
+		<p>On</p>
+		</td>
+	</tr>
+</table>
+<h3>Build path problems</h3>
+<table border="1" cellspacing="0" cellpadding="5" width="100%">
+	<tr>
+		<td valign="top">
+		<p>Abort build when build path errors occur</p>
+		</td>
+		<td valign="top">
+		<p>Allow to toggle the builder to abort if the classpath is invalid.</p>
+		</td>
+		<td valign="top">
+		<p>On</p>
+		</td>
+	</tr>
+	<tr>
+		<td valign="top">
+		<p>Incomplete build path</p>
+		</td>
+		<td valign="top">
+		<p>Indicate the severity of the problem reported when an entry on the classpath does not exist, is not legitimate or is not visible (e.g. a reference project is closed).</p>
+		</td>
+		<td valign="top">
+		<p>Error</p>
+		</td>
+	</tr>
+	<tr>
+		<td valign="top">
+		<p>Circular dependencies</p>
+		</td>
+		<td valign="top">
+		<p>Indicate the severity of the problem reported when a project is involved in a cycle.</p>
+		</td>
+		<td valign="top">
+		<p>Error</p>
+		</td>
+	</tr>
+	<tr>
+		<td valign="top">
+		<p>Incompatible required binaries</p>
+		</td>
+		<td valign="top">
+		<p>Indicated the severity of the problem reported when a project requires incompatible binaries.</p>
+		</td>
+		<td valign="top">
+		<p>Ignore</p>
+		</td>
+	</tr>
+</table>
+<h3>Output folder</h3>
+<table border="1" cellspacing="0" cellpadding="5" width="100%">
+	<tr>
+		<td valign="top">
+		<p>Duplicated resources</p>
+		</td>
+		<td valign="top">
+		<p>Indicate the severity of the problem reported when more than one occurrence of a resource is to be copied into the output location.</p>
+		</td>
+		<td valign="top">
+		<p>Warning</p>
+		</td>
+	</tr>
+	<tr>
+		<td valign="top">
+		<p>Scrub output folders when cleaning projects</p>
+		</td>
+		<td valign="top">
+		<p>Indicate whether the Java Builder is allowed to clean the output folders when performing full build operations.</p>
+		</td>
+		<td valign="top">
+		<p>On</p>
+		</td>
+	</tr>
+	<tr>
+		<td valign="top">
+		<p>Rebuild class files modified by others</p>
+		</td>
+		<td valign="top">
+		<p>Indicate whether class files which have been modified by others should be rebuilded to undo the modification.</p>
+		</td>
+		<td valign="top">
+		<p>Off</p>
+		</td>
+	</tr>
+	<tr>
+		<td valign="top">
+		<p>Filtered resources</p>
+		</td>
+		<td valign="top">
+		<p>A comma separated list of file patterns which are not copied to the output folder.&nbsp;</p>
+		</td>
+		<td valign="top">
+		<p>Empty</p>
+		</td>
+	</tr>
+</table>
+<p><img src="../../../../images/ngrelc.png" alt="Related concepts" border="0"></p>
+<p><a href="../../../../concepts/concepts-4.htm">Java builder</a><br>
+<a href="../../../../concepts/filters.htm">Exclusion and inclusion filters</a><br>
+<a href="../../../../concepts/cbuildcp.htm">Build classpath</a>
+</p>
+</body>
+</html>
diff --git a/bundles/org.eclipse.jdt.doc.user/reference/preferences/java/compiler/ref-preferences-errors-warnings.htm b/bundles/org.eclipse.jdt.doc.user/reference/preferences/java/compiler/ref-preferences-errors-warnings.htm
new file mode 100644
index 0000000..9da5408
--- /dev/null
+++ b/bundles/org.eclipse.jdt.doc.user/reference/preferences/java/compiler/ref-preferences-errors-warnings.htm
@@ -0,0 +1,612 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2006. 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>Errors/Warnings</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>Errors/Warnings</h1>
+<p>Indicate your preferences for the Errors/Warnings settings on the <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.jdt.ui.preferences.ProblemSeveritiesPreferencePage)")'> <img src="PLUGINS_ROOT/org.eclipse.help/command_link.png" alt="Opens the Errors/Warnings preference page"> <b> Java &gt; Compiler &gt; Errors/Warnings </b></a> preference page.</p>
+<p></p>
+<h3>Code style</h3>
+<p></p>
+<table border="1" cellspacing="0" cellpadding="5" width="100%">
+	<tr>
+		<th>
+		<p>Option</p>
+		</th>
+		<th>
+		<p>Description</p>
+		</th>
+		<th>
+		<p>Default</p>
+		</th>
+	</tr>
+	<tr>
+		<td valign="top">
+		<p>Non-static access to a static member</p>
+		</td>
+		<td valign="top">
+		<p>When enabled, the compiler will issue an error or a warning whenever a static field or method is accessed with an expression receiver. A reference to a static member should be qualified with a type name.</p>
+		</td>
+		<td valign="top">
+		<p>Warning</p>
+		</td>
+	</tr>
+	<tr>
+		<td valign="top">
+		<p>Indirect access to a static member</p>
+		</td>
+		<td valign="top">
+		<p>When enabled, the compiler will issue an error or a warning whenever a static field or method is indirectly accessed. A static field of an interface should be qualified with the declaring type name.</p>
+		</td>
+		<td valign="top">
+		<p>Ignore</p>
+		</td>
+	</tr>
+	<tr>
+		<td valign="top">
+		<p>Unqualified access to instance field</p>
+		</td>
+		<td valign="top">
+		<p>When enabled, the compiler will issue an error or a warning whenever it encounters a field access which is not qualified (eg. misses a 'this').</p>
+		</td>
+		<td valign="top">
+		<p>Ignore</p>
+		</td>
+	</tr>
+	<tr>
+		<td valign="top">
+		<p>Undocumented empty block</p>
+		</td>
+		<td valign="top">
+		<p>When enabled, the compiler will issue an error or a warning whenever it encounters an empty block statement with no explaining comment.</p>
+		</td>
+		<td valign="top">
+		<p>Ignore</p>
+		</td>
+	</tr>
+	<tr>
+		<td valign="top">
+		<p>Access to a non-accessible member of an enclosing type</p>
+		</td>
+		<td valign="top">
+		<p>When enabled, the compiler will issue an error or a warning whenever it emulates access to a non-accessible member of an enclosing type. Such accesses can have performance implications.</p>
+		</td>
+		<td valign="top">
+		<p>Ignore</p>
+		</td>
+	</tr>
+	<tr>
+		<td valign="top">
+		<p>Method with a constructor name</p>
+		</td>
+		<td valign="top">
+		<p>Naming a method with a constructor name is generally considered poor style programming. When enabling this option, the compiler will signal such scenario either as an error or a warning.</p>
+		</td>
+		<td valign="top">
+		<p>Warning</p>
+		</td>
+	</tr>
+	<tr>
+		<td valign="top">
+		<p>Parameter assignment</p>
+		</td>
+		<td valign="top">
+		<p>Assigning a value to a parameter is generally considered poor style programming. When enabling this option, the compiler will signal such scenario either as an error or a warning.</p>
+		</td>
+		<td valign="top">
+		<p>Ignore</p>
+		</td>
+	</tr>
+	<tr>
+		<td valign="top">
+		<p>Non-externalized strings</p>
+		</td>
+		<td valign="top">
+		<p>When enabled, the compiler will issue an error or a warning for non externalized String literal (i.e. non tagged with //$NON-NLS-&lt;n&gt;$) or for non externalized String tags which do not belong to a String.</p>
+		</td>
+		<td valign="top">
+		<p>Ignore</p>
+		</td>
+	</tr>
+</table>
+<p></p>
+<h3>Potential programming problems</h3>
+<p></p>
+<table border="1" cellspacing="0" cellpadding="5" width="100%">
+	<tr>
+		<td valign="top">
+		<p>Serializable class without serialVersionUID</p>
+		</td>
+		<td valign="top">
+		<p>When enabled, the compiler will issue an error or a warning whenever a type implementing 'java.io.Serializable' does not contain a serialVersionUID field.</p>
+		</td>
+		<td valign="top">
+		<p>Warning</p>
+		</td>
+	</tr>
+	<tr>
+		<td valign="top">
+		<p>Assignment has no effect (eg. 'x = x')</p>
+		</td>
+		<td valign="top">
+		<p>When enabled, the compiler will issue an error or a warning whenever an assignment has no effect (eg. 'x = x').</p>
+		</td>
+		<td valign="top">
+		<p>Warning</p>
+		</td>
+	</tr>
+	<tr>
+		<td valign="top">
+		<p>Possible accidential boolean assigment (eg. 'if (a = b)')</p>
+		</td>
+		<td valign="top">
+		<p>When enabled, the compiler will issue an error or a warning whenever it encounters a possible accidential boolean assignment (eg. 'if (a = b)').</p>
+		</td>
+		<td valign="top">
+		<p>Ignore</p>
+		</td>
+	</tr>
+	<tr>
+		<td valign="top">
+		<p>'finally' does not complete normally</p>
+		</td>
+		<td valign="top">
+		<p>When enabled, the compiler will issue an error or a warning whenever a 'finally' statement does not complete normally (eg. contains a return statement).</p>
+		</td>
+		<td valign="top">
+		<p>Warning</p>
+		</td>
+	</tr>
+	<tr>
+		<td valign="top">
+		<p>Empty statement</p>
+		</td>
+		<td valign="top">
+		<p>When enabled, the compiler will issue an error or a warning whenever it encounters an empty statement (eg. a superfluos semicolon).</p>
+		</td>
+		<td valign="top">
+		<p>Ignore</p>
+		</td>
+	</tr>
+	<tr>
+		<td valign="top">
+		<p>Using a char array in string concatenation</p>
+		</td>
+		<td valign="top">
+		<p>When enabled, the compiler will issue an error or a warning whenever a char[] expression is used in String concatenations,</p>
+		<code>"hello" + new char[]{'w','o','r','l','d'}</code></td>
+		<td valign="top">
+		<p>Warning</p>
+		</td>
+	</tr>
+	<tr>
+		<td valign="top">
+		<p>Hidden catch blocks</p>
+		</td>
+		<td valign="top">
+		<p>Locally to a try statement, some catch blocks may hide others , eg.</p>
+		<code>try { throw new java.io.CharConversionException();</code><br>
+		<code>} catch (java.io.CharConversionException e) {</code><br>
+		<code>} catch (java.io.IOException e) {}.</code><br>
+		<br>
+		<p>When enabling this option, the compiler will issue an error or a warning for hidden catch blocks corresponding to checked exceptions.</p>
+		</td>
+		<td valign="top">
+		<p>Warning</p>
+		</td>
+	</tr>
+	<tr>
+		<td valign="top">
+		<p>Inexact type match for vararg arguments</p>
+		</td>
+		<td valign="top">
+		<p>When enabled, the compiler will issue an error or a warning whenever it encounters an inexact type match for vararg arguments.</p>
+		</td>
+		<td valign="top">
+		<p>Warning</p>
+		</td>
+	</tr>
+	<tr>
+		<td valign="top">
+		<p>Boxing and unboxing conversions</p>
+		</td>
+		<td valign="top">
+		<p>When enabled, the compiler will issue an error or a warning whenever it encounters a boxing or unboxing conversion. Autoboxing may affects performance negatively.</p>
+		</td>
+		<td valign="top">
+		<p>Ignore</p>
+		</td>
+	</tr>
+	<tr>
+		<td valign="top">
+		<p>Enum type constant not covered on 'switch'</p>
+		</td>
+		<td valign="top">
+		<p>When enabled, the compiler will issue an error or a warning whenever it encounters a switch statement which does not contain case statements for every enum constant of the referenced enum.</p>
+		</td>
+		<td valign="top">
+		<p>Ignore</p>
+		</td>
+	</tr>
+	<tr>
+		<td valign="top">
+		<p>'switch' case fall-through</p>
+		</td>
+		<td valign="top">
+		<p>When enabled, the compiler will issue an error or a warning whenever it encounters a switch case without a 'break' statement. Empty switch cases are allowed.</p>
+		</td>
+		<td valign="top">
+		<p>Ignore</p>
+		</td>
+	</tr>
+	<tr>
+		<td valign="top">
+		<p>Null reference</p>
+		</td>
+		<td valign="top">
+		<p>When enabled, the compiler will issue an error or a warning when it encounters that a local variable which may be null is dereferenced. Note that the analysis is fairly conservative, it only considers cases where there is something suspicious.</p>
+		</td>
+		<td valign="top">
+		<p>Ignore</p>
+		</td>
+	</tr>
+</table>
+<p></p>
+<h3>Name shadowing and conflicts</h3>
+<p></p>
+<table border="1" cellspacing="0" cellpadding="5" width="100%">
+	<tr>
+		<td valign="top">
+		<p>Field declaration hides another field or variable</p>
+		</td>
+		<td valign="top">
+		<p>When enabling this option, the compiler will issue an error or a warning if a field declaration hides another inherited field.</p>
+		</td>
+		<td valign="top">
+		<p>Ignore</p>
+		</td>
+	</tr>
+	<tr>
+		<td valign="top">
+		<p>Local variable declaration hides another field or variable</p>
+		</td>
+		<td valign="top">
+		<p>When enabling this option, the compiler will issue an error or a warning if a local variable declaration hides another field or variable.</p>
+		</td>
+		<td valign="top">
+		<p>Ignore</p>
+		</td>
+	</tr>
+	<tr>
+		<td valign="top">
+		<p>Include constructor or setter method parameters</p>
+		</td>
+		<td valign="top">
+		<p>When enabling this option, the compiler additionally will issue an error or a warning if a constructor or setter method parameter hides another field or variable.</p>
+		</td>
+		<td valign="top">
+		<p>Off</p>
+		</td>
+	</tr>
+	<tr>
+		<td valign="top">
+		<p>Type parameter hides another type</p>
+		</td>
+		<td valign="top">
+		<p>When enabling this option, the compiler will issue an error or a warning if eg. a type parameter of an inner class hides an outer type.</p>
+		</td>
+		<td valign="top">
+		<p>Warning</p>
+		</td>
+	</tr>
+	<tr>
+		<td valign="top">
+		<p>Methods overridden but not package visible</p>
+		</td>
+		<td valign="top">
+		<p>A package default method is not visible in a different package, and thus cannot be overridden. When enabling this option, the compiler will signal such scenario either as an error or a warning.</p>
+		</td>
+		<td valign="top">
+		<p>Warning</p>
+		</td>
+	</tr>
+	<tr>
+		<td valign="top">
+		<p>Interface method conflicts with protected 'Object' method</p>
+		</td>
+		<td valign="top">
+		<p>When enabled, the compiler will issue an error or a warning whenever an interface defines a method incompatible with a non-inherited Object method. Until this conflict is resolved, such an interface cannot be implemented, eg.</p>
+		<code>interface I {</code><br>
+		<code>&nbsp;&nbsp;&nbsp;int clone();</code><br>
+		<code>}</code><br>
+		<br>
+		</td>
+		<td valign="top">
+		<p>Warning</p>
+		</td>
+	</tr>
+</table>
+<p></p>
+<h3>Deprecated and restricted API</h3>
+<p></p>
+<table border="1" cellspacing="0" cellpadding="5" width="100%">
+	<tr>
+		<td valign="top">
+		<p>Deprecated API</p>
+		</td>
+		<td valign="top">
+		<p>When enabled, the compiler will signal use of deprecated API either as an error or a warning.</p>
+		</td>
+		<td valign="top">
+		<p>Warning</p>
+		</td>
+	</tr>
+	<tr>
+		<td valign="top">
+		<p>Signal use of deprecated API inside deprecated code</p>
+		</td>
+		<td valign="top">
+		<p>When enabled, the compiler will signal use of deprecated API inside deprecated code. The severity of the problem is controlled with option "Deprecated API".</p>
+		</td>
+		<td valign="top">
+		<p>Off</p>
+		</td>
+	</tr>
+	<tr>
+		<td valign="top">
+		<p>Signal overriding or implementing deprecated method</p>
+		</td>
+		<td valign="top">
+		<p>When enabled, the compiler will signal overriding or implementing a deprecated method The severity of the problem is controlled with option "Deprecated API".</p>
+		</td>
+		<td valign="top">
+		<p>Off</p>
+		</td>
+	</tr>
+	<tr>
+		<td valign="top">
+		<p>Forbidden reference (access rules)</p>
+		</td>
+		<td valign="top">
+		<p>When enabled, the compiler will signal a forbidden reference specified in the access rules.</p>
+		</td>
+		<td valign="top">
+		<p>Error</p>
+		</td>
+	</tr>
+	<tr>
+		<td valign="top">
+		<p>Discouraged reference (access rules)</p>
+		</td>
+		<td valign="top">
+		<p>When enabled, the compiler will signal a discouraged reference specified in the access rules.</p>
+		</td>
+		<td valign="top">
+		<p>Warning</p>
+		</td>
+	</tr>
+</table>
+<p></p>
+<h3>Unnecessary code</h3>
+<p></p>
+<table border="1" cellspacing="0" cellpadding="5" width="100%">
+	<tr>
+		<td valign="top">
+		<p>Local variable is never read</p>
+		</td>
+		<td valign="top">
+		<p>When enabled, the compiler will issue an error or a warning whenever a local variable is declared but never used within its scope.</p>
+		</td>
+		<td valign="top">
+		<p>Warning</p>
+		</td>
+	</tr>
+	<tr>
+		<td valign="top">
+		<p>Parameter is never read</p>
+		</td>
+		<td valign="top">
+		<p>When enabled, the compiler will issue an error or a warning whenever a parameter is declared but never used within its scope.</p>
+		</td>
+		<td valign="top">
+		<p>Ignore</p>
+		</td>
+	</tr>
+	<tr>
+		<td valign="top">
+		<p>Check overriding and implementing methods</p>
+		</td>
+		<td valign="top">
+		<p>When enabled, the compiler additionally will issue an error or a warning whenever a parameter is declared but never used within its scope in overriding or implementing methods.</p>
+		</td>
+		<td valign="top">
+		<p>Off</p>
+		</td>
+	</tr>
+	<tr>
+		<td valign="top">
+		<p>Unused import</p>
+		</td>
+		<td valign="top">
+		<p>When enabled, the compiler will issue an error or a warning for unused import reference.</p>
+		</td>
+		<td valign="top">
+		<p>Warning</p>
+		</td>
+	</tr>
+	<tr>
+		<td valign="top">
+		<p>Unused local or private members</p>
+		</td>
+		<td valign="top">
+		<p>When enabled, the compiler will issue an error or a warning whenever a local or private member is declared but never used within the same unit.</p>
+		</td>
+		<td valign="top">
+		<p>Warning</p>
+		</td>
+	</tr>
+	<tr>
+		<td valign="top">
+		<p>Unnecessary else statement</p>
+		</td>
+		<td valign="top">
+		<p>When enabled, the compiler will issue an error or a warning whenever it encounters an unnecessary else statement (eg. if (condition) return; else doSomething();).</p>
+		</td>
+		<td valign="top">
+		<p>Ignore</p>
+		</td>
+	</tr>
+	<tr>
+		<td valign="top">
+		<p>Unnecessary cast or 'instanceof' operation</p>
+		</td>
+		<td valign="top">
+		<p>When enabled, the compiler will issue an error or a warning whenever it encounters an unnecessary cast or 'instanceof' operation (eg. if (object instanceof Object) return;).</p>
+		</td>
+		<td valign="top">
+		<p>Ignore</p>
+		</td>
+	</tr>
+	<tr>
+		<td valign="top">
+		<p>Unnecessary declaration of thrown checked exception</p>
+		</td>
+		<td valign="top">
+		<p>When enabled, the compiler will issue an error or a warning whenever it encounters an unnecessary declaration of a thrown exception.</p>
+		</td>
+		<td valign="top">
+		<p>Ignore</p>
+		</td>
+	</tr>
+	<tr>
+		<td valign="top">
+		<p>Check overriding and implementing methods</p>
+		</td>
+		<td valign="top">
+		<p>When enabled, the compiler additionally will issue an error or a warning whenever it encounters an unnecessary declaration of a thrown exception in an overriding or implementing method.</p>
+		</td>
+		<td valign="top">
+		<p>Off</p>
+		</td>
+	</tr>
+	<tr>
+		<td valign="top">
+		<p>Unused break/continue label</p>
+		</td>
+		<td valign="top">
+		<p>When enabled, the compiler will issue an error or a warning whenever it encounters an unused 'break' or 'continue' label.</p>
+		</td>
+		<td valign="top">
+		<p>Warning</p>
+		</td>
+	</tr>
+</table>
+<p></p>
+<h3>Generic types</h3>
+<p></p>
+<table border="1" cellspacing="0" cellpadding="5" width="100%">
+	<tr>
+		<td valign="top">
+		<p>Unchecked generic type operation</p>
+		</td>
+		<td valign="top">
+		<p>When enabled, the compiler will issue an error or a warning whenever it encounters an unchecked generic type operation.</p>
+		</td>
+		<td valign="top">
+		<p>Warning</p>
+		</td>
+	</tr>
+	<tr>
+		<td valign="top">
+		<p>Usage of a raw type</p>
+		</td>
+		<td valign="top">
+		<p>When enabled, the compiler will issue an error or a warning whenever it encounters a usage of a raw type (i.e. List instead of List&lt;String&gt;).</p>
+		</td>
+		<td valign="top">
+		<p>Ignore</p>
+		</td>
+	</tr>
+	<tr>
+		<td valign="top">
+		<p>Generic type parameter declared with a final type bound</p>
+		</td>
+		<td valign="top">
+		<p>When enabled, the compiler will issue an error or a warning whenever it encounters a type bound involving a final type.</p>
+		</td>
+		<td valign="top">
+		<p>Warning</p>
+		</td>
+	</tr>
+</table>
+<p></p>
+<h3>Annotations</h3>
+<p></p>
+<table border="1" cellspacing="0" cellpadding="5" width="100%">
+	<tr>
+		<td valign="top">
+		<p>Missing '@Override' annotation</p>
+		</td>
+		<td valign="top">
+		<p>When enabled, the compiler will issue an error or a warning whenever it encounters a method overriding another implemented method, and the '@Override' annotation is missing.</p>
+		</td>
+		<td valign="top">
+		<p>Ignore</p>
+		</td>
+	</tr>
+	<tr>
+		<td valign="top">
+		<p>Missing '@Deprecated' annotation</p>
+		</td>
+		<td valign="top">
+		<p>When enabled, the compiler will issue an error or a warning whenever it encounters a deprecated type without additional '@Deprecated' annotation.</p>
+		</td>
+		<td valign="top">
+		<p>Ignore</p>
+		</td>
+	</tr>
+	<tr>
+		<td valign="top">
+		<p>Annotation is used as super interface</p>
+		</td>
+		<td valign="top">
+		<p>When enabled, the compiler will issue an error or a warning whenever it encounters a type implementing an annotation. Although possible, this is considered bad practice.</p>
+		</td>
+		<td valign="top">
+		<p>Warning</p>
+		</td>
+	</tr>
+	<tr>
+		<td valign="top">
+		<p>Unhandled warning tokens in '@SuppressWarnings'</p>
+		</td>
+		<td valign="top">
+		<p>When enabled, the compiler will issue an error or a warning whenever it encounters an unhandled warning token in a '@SuppressWarnings' annotation.</p>
+		</td>
+		<td valign="top">
+		<p>Warning</p>
+		</td>
+	</tr>
+	<tr>
+		<td valign="top">
+		<p>Enable '@SuppressWarnings' annotations</p>
+		</td>
+		<td valign="top">
+		<p>When enabled, the compiler will process '@SuppressWarnings' annotations.</p>
+		</td>
+		<td valign="top">
+		<p>On</p>
+		</td>
+	</tr>
+</table>
+<p><img src="../../../../images/ngrelc.png" alt="Related concepts" border="0"></p>
+<p><a href="../../../../../org.eclipse.platform.doc.user/concepts/cprbview.htm">Problems View</a><br>
+<a href="../../../../concepts/cquickfix.htm">Quick Fix</a><br>
+<a href="../../../../concepts/concepts-4.htm">Java builder</a></p>
+</body>
+</html>
diff --git a/bundles/org.eclipse.jdt.doc.user/reference/preferences/java/compiler/ref-preferences-javadoc.htm b/bundles/org.eclipse.jdt.doc.user/reference/preferences/java/compiler/ref-preferences-javadoc.htm
new file mode 100644
index 0000000..94ac88e
--- /dev/null
+++ b/bundles/org.eclipse.jdt.doc.user/reference/preferences/java/compiler/ref-preferences-javadoc.htm
@@ -0,0 +1,165 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2006. 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>Javadoc</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>Javadoc</h1>
+<p>Indicate your preferences for the Javadoc settings on the <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.jdt.ui.preferences.JavadocProblemsPreferencePage)")'> <img src="PLUGINS_ROOT/org.eclipse.help/command_link.png" alt="Opens the Javadoc preference page">
+<b> Java &gt; Compiler &gt; Javadoc </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>Process Javadoc comments (includes search and refactoring)</p>
+			</td>
+			<td valign="top">
+			<p>The builder detects problems in Javadoc comments if this option
+			is enabled.</p>
+			</td>
+			<td valign="top">
+			<p>On</p>
+			</td>
+		</tr>
+		<tr>
+			<td valign="top">
+			<p>Malformed Javadoc comments</p>
+			</td>
+			<td valign="top">
+			<p>When enabled, the compiler will issue an error or warning whenever it encounters a malformed Javadoc comment.</p>
+			</td>
+			<td valign="top">
+			<p>Ignore</p>
+			</td>
+		</tr>
+		<tr>
+			<td valign="top">
+			<p>Only consider members as visible as</p>
+			</td>
+			<td valign="top">
+			<p>The compiler does only check members with the specified or a broader visibility.</p>
+			</td>
+			<td valign="top">
+			<p>Public</p>
+			</td>
+		</tr>
+		<tr>
+			<td valign="top">
+			<p>Report errors in tags</p>
+			</td>
+			<td valign="top">
+			<p>When enabled, the compiler will issue an error or warning whenever it encounters an error in a Javadoc comment tag.</p>
+			</td>
+			<td valign="top">
+			<p>Off</p>
+			</td>
+		</tr>
+		<tr>
+			<td valign="top">
+			<p>Report non visible references</p>
+			</td>
+			<td valign="top">
+			<p>When enabled, the compiler will issue an error or warning whenever it encounters a reference to a non visible element.</p>
+			</td>
+			<td valign="top">
+			<p>Off</p>
+			</td>
+		</tr>
+		<tr>
+			<td valign="top">
+			<p>Report deprecated references</p>
+			</td>
+			<td valign="top">
+			<p>When enabled, the compiler will issue an error or warning whenever it encounters a reference to a deprecated element.</p>
+			</td>
+			<td valign="top">
+			<p>Off</p>
+			</td>
+		</tr>
+		<tr>
+			<td valign="top">
+			<p>Missing Javadoc tags</p>
+			</td>
+			<td valign="top">
+			<p>When enabled, the compiler will issue an error or warning whenever it encounters a missing Javadoc tag (i.e. missing @param tag for a parameter).</p>
+			</td>
+			<td valign="top">
+			<p>Ignore</p>
+			</td>
+		</tr>
+		<tr>
+			<td valign="top">
+			<p>Only consider members as visible as</p>
+			</td>
+			<td valign="top">
+			<p>The compiler does only check members with the specified or a broader visibility.</p>
+			</td>
+			<td valign="top">
+			<p>Public</p>
+			</td>
+		</tr>
+		<tr>
+			<td valign="top">
+			<p>Check overriding and implementing methods</p>
+			</td>
+			<td valign="top">
+			<p>When enabled, also overriding and implementing methods are checked for missing Javadoc tags.</p>
+			</td>
+			<td valign="top">
+			<p>Off</p>
+			</td>
+		</tr>
+		<tr>
+			<td valign="top">
+			<p>Missing Javadoc comments</p>
+			</td>
+			<td valign="top">
+			<p>When enabled, the compiler will issue an error or warning whenever it encounters a missing Javadoc comment for a Java member.</p>
+			</td>
+			<td valign="top">
+			<p>Ignore</p>
+			</td>
+		</tr>
+		<tr>
+			<td valign="top">
+			<p>Only consider members as visible as</p>
+			</td>
+			<td valign="top">
+			<p>The compiler does only check members with the specified or a broader visibility.</p>
+			</td>
+			<td valign="top">
+			<p>Public</p>
+			</td>
+		</tr>
+		<tr>
+			<td valign="top">
+			<p>Check overriding and implementing methods</p>
+			</td>
+			<td valign="top">
+			<p>When enabled, also overriding and implementing methods are checked for missing Javadoc comments.</p>
+			</td>
+			<td valign="top">
+			<p>Off</p>
+			</td>
+		</tr>
+	</tbody>
+</table>
+</body>
+</html>
diff --git a/bundles/org.eclipse.jdt.doc.user/reference/preferences/java/editor/ref-preferences-content-assist-advanced.htm b/bundles/org.eclipse.jdt.doc.user/reference/preferences/java/editor/ref-preferences-content-assist-advanced.htm
new file mode 100644
index 0000000..5ed34dc
--- /dev/null
+++ b/bundles/org.eclipse.jdt.doc.user/reference/preferences/java/editor/ref-preferences-content-assist-advanced.htm
@@ -0,0 +1,67 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2006. 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>Advanced</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>Advanced</h1>
+<p>Indicate your preferences for the Advanced settings on the <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.jdt.ui.preferences.CodeAssistPreferenceAdvanced)")'> <img src="PLUGINS_ROOT/org.eclipse.help/command_link.png" alt="Opens the Advanced preference page"> <b> Java &gt; Editor &gt; Content Assist &gt; Advanced </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>Select the proposal kinds contained in the 'default' content assist list</p>
+			</td>
+			<td valign="top">
+			<p>Select all the proposal kinds which are contained in the content assist list when invoking content assist the first time with Ctrl+Space.</p>
+			</td>
+			<td valign="top">
+			<p>Other Java Proposals, Template Proposals, Type Proposals</p>
+			</td>
+		</tr>
+		<tr>
+			<td valign="top">
+			<p>Content assist cycling</p>
+			</td>
+			<td valign="top">
+			<p>Select the proposal kinds to cycle through and the cycle order when repeatedly invoking content assist (Ctrl+Space). Select a proposal kind and invoke Up or Down to change the order.</p>
+			</td>
+			<td valign="top">
+			<p>Template Proposals</p>
+			</td>
+		</tr>
+		<tr>
+			<td valign="top">
+			<p>Timeout for fetching a parameter name from attached Javadoc</p>
+			</td>
+			<td valign="top">
+			<p>If a parameter name could not be fetched from attached Javadoc within the specified amount of time then the attempt to fetch it is abandoned. Increase the value if you have problems fetching the name, for instance due to a slow network connection.</p>
+			</td>
+			<td valign="top">
+			<p>50 ms</p>
+			</td>
+		</tr>
+	</tbody>
+</table>
+<p><img src="../../../../images/ngrelr.png" alt="Related reference" border="0"></p>
+<p><a href="../../../../reference/ref-143.htm">Content/Code Assist</a><br>
+<a href="../../../../reference/preferences/java/editor/ref-preferences-content-assist.htm">Content Assist preference page</a></p>
+</body>
+</html>
diff --git a/bundles/org.eclipse.jdt.doc.user/reference/preferences/java/editor/ref-preferences-content-assist.htm b/bundles/org.eclipse.jdt.doc.user/reference/preferences/java/editor/ref-preferences-content-assist.htm
new file mode 100644
index 0000000..7453951
--- /dev/null
+++ b/bundles/org.eclipse.jdt.doc.user/reference/preferences/java/editor/ref-preferences-content-assist.htm
@@ -0,0 +1,179 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2006. 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>Content Assist</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>Content Assist</h1>
+<p>Indicate your preferences for the Content Assist settings on the <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.jdt.ui.preferences.CodeAssistPreferencePage)")'> <img src="PLUGINS_ROOT/org.eclipse.help/command_link.png" alt="Opens the Content Assist preference page">
+<b> Java &gt; Editor &gt; Content Assist </b></a> preference page.</p>
+<table border="1" cellspacing="0" cellpadding="5" width="100%">
+	<thead>
+		<tr>
+			<th>
+			<p>Option</p>
+			</th>
+			<th>
+			<p>Description</p>
+			</th>
+			<th>
+			<p>Default</p>
+			</th>
+		</tr>
+	</thead>
+	<tbody>
+		<tr>
+			<td valign="top">Completion inserts/Completion overwrites</td>
+			<td valign="top">
+			<p>If <strong>Completion inserts</strong> is on, the completion text is inserted at the caret position, so it never overwrites any existing text. <br>
+			If <strong>Completion overwrites</strong> is on, the completion text replaces the characters following the caret position until the end of the word.</p>
+			<p>Note that pressing <strong>Ctrl</strong> when applying a completion proposal toggles between the two insertion modes.</p>
+			</td>
+			<td valign="top">
+			<p>Completion inserts</p>
+			</td>
+		</tr>
+		<tr>
+			<td valign="top">Insert single proposals automatically</td>
+			<td valign="top">
+			<p>If enabled, code assist will choose and insert automatically single proposals.</p>
+			</td>
+			<td valign="top">
+			<p>On</p>
+			</td>
+		</tr>
+		<tr>
+			<td valign="top">Insert common prefixes automatically</td>
+			<td valign="top">
+			<p>If enabled, code assist will automatically insert the common prefix of all possible completions similar to unix shell expansion. This can be used repeatedly, even while the code assist window is being displayed.</p>
+			</td>
+			<td valign="top">
+			<p>Off</p>
+			</td>
+		</tr>
+		<tr>
+			<td valign="top">Add import instead of qualified name</td>
+			<td valign="top">
+			<p>If enabled, type proposals which are in other packages will invoke the addition of the corresponding import declaration. Otherwise, the type will be inserted fully qualified.</p>
+			</td>
+			<td valign="top">
+			<p>On</p>
+			</td>
+		</tr>
+		<tr>
+			<td valign="top">Fill argument names on completion</td>
+			<td valign="top">
+			<p>If enabled, code assist will add the argument names when completing a method or generic type.</p>
+			</td>
+			<td valign="top">
+			<p>On</p>
+			</td>
+		</tr>
+		<tr>
+			<td valign="top">Guess filled method arguments</td>
+			<td valign="top">
+			<p>If enabled, code assist will try to guess method parameters from the context where a method proposal is inserted.</p>
+			</td>
+			<td valign="top">
+			<p>Off</p>
+			</td>
+		</tr>
+		<tr>
+			<td valign="top">Sort proposals</td>
+			<td valign="top">
+			<p>Select how the proposals should be sorted in the content assist pop up.</p>
+			</td>
+			<td valign="top">
+			<p>by relevance</p>
+			</td>
+		</tr>
+		<tr>
+			<td valign="top">Hide proposals not visible in the invocation context</td>
+			<td valign="top">
+			<p>If enabled, the Java element proposals are limited by the rules of visibility. For example, private field proposals of other classes would not be displayed.</p>
+			</td>
+			<td valign="top">
+			<p>On</p>
+			</td>
+		</tr>
+		<tr>
+			<td valign="top">Hide forbidden references</td>
+			<td valign="top">
+			<p>If enabled, references to Java elements forbidden by access rules are not displayed.</p>
+			</td>
+			<td valign="top">
+			<p>On</p>
+			</td>
+		</tr>
+		<tr>
+			<td valign="top">Hide discouraged references</td>
+			<td valign="top">
+			<p>If enabled, references to Java elements discouraged by access rules are not displayed.</p>
+			</td>
+			<td valign="top">
+			<p>Off</p>
+			</td>
+		</tr>
+		<tr>
+			<td valign="top">Hide deprecated references</td>
+			<td valign="top">
+			<p>If enabled, references to deprecated Java elements are not displayed.</p>
+			</td>
+			<td valign="top">
+			<p>Off</p>
+			</td>
+		</tr>
+		<tr>
+			<td valign="top">Show camel case matches</td>
+			<td valign="top">
+			<p>If enabled, camel case matches are displayed (i.e. NPE is expanded to NullPointerException).</p>
+			</td>
+			<td valign="top">
+			<p>On</p>
+			</td>
+		</tr>
+		<tr>
+			<td valign="top">Enable auto activation</td>
+			<td valign="top">
+			<p>If enabled, code assist can be invoked automatically.</p>
+			<p>The condition for automatic invocation is specified with the preferences <strong>Auto activation delay</strong>, <strong>Auto activation triggers for Java</strong> and <strong>Auto activation triggers for Javadoc</strong>.</p>
+			</td>
+			<td valign="top">
+			<p>On</p>
+			</td>
+		</tr>
+		<tr>
+			<td valign="top">Auto activation delay</td>
+			<td valign="top">
+			<p>If the time starting when an auto activation trigger character is encountered until a new character is typed exceeds the auto activation delay, code assist is invoked.</p>
+			</td>
+			<td valign="top">200</td>
+		</tr>
+		<tr>
+			<td valign="top">Auto activation triggers for Java</td>
+			<td valign="top">
+			<p>If one of the trigger characters is typed inside Java source code (but not inside a Javadoc comment) and no other character is typed before the auto activation delay times out, the code assist is invoked.</p>
+			</td>
+			<td valign="top">
+			<p>'.'</p>
+			</td>
+		</tr>
+		<tr>
+			<td valign="top">Auto activation triggers for Javadoc</td>
+			<td valign="top">
+			<p>If one of the trigger characters is typed inside a Java doc and no other character is typed before the auto activation delay times out, the code assist is invoked.</p>
+			</td>
+			<td valign="top">
+			<p>'@#'</p>
+			</td>
+		</tr>
+	</tbody>
+</table>
+<p><img src="../../../../images/ngrelr.png" alt="Related reference" border="0"></p>
+<p><a href="../../../../reference/ref-143.htm">Content/Code Assist</a></p>
+</body>
+</html>
diff --git a/bundles/org.eclipse.jdt.doc.user/reference/preferences/java/editor/ref-preferences-folding.htm b/bundles/org.eclipse.jdt.doc.user/reference/preferences/java/editor/ref-preferences-folding.htm
new file mode 100644
index 0000000..8a500a3
--- /dev/null
+++ b/bundles/org.eclipse.jdt.doc.user/reference/preferences/java/editor/ref-preferences-folding.htm
@@ -0,0 +1,99 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2006. 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>Folding</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>Folding</h1>
+<p>Indicate your preferences for the Folding settings on the <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.jdt.ui.preferences.FoldingPreferencePage)")'> <img src="PLUGINS_ROOT/org.eclipse.help/command_link.png" alt="Opens the Folding preference page"><b> Java &gt; Editor &gt; Folding </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>Enable folding</p>
+			</td>
+			<td valign="top">
+			<p>If enabled, different sections in the java editor can be folded and expanded.</p>
+			</td>
+			<td valign="top">
+			<p>On</p>
+			</td>
+		</tr>
+		<tr>
+			<td valign="top">
+			<p>Comments</p>
+			</td>
+			<td valign="top">
+			<p>If enabled, comments are folded when opening a new editor.</p>
+			</td>
+			<td valign="top">
+			<p>Off</p>
+			</td>
+		</tr>
+		<tr>
+			<td valign="top">
+			<p>Header Comments</p>
+			</td>
+			<td valign="top">
+			<p>If enabled, header Comments are folded when opening a new editor.</p>
+			</td>
+			<td valign="top">
+			<p>On</p>
+			</td>
+		</tr>
+		<tr>
+			<td valign="top">
+			<p>Inner types</p>
+			</td>
+			<td valign="top">
+			<p>If enabled, inner types are folded when opening a new editor.</p>
+			</td>
+			<td valign="top">
+			<p>Off</p>
+			</td>
+		</tr>
+		<tr>
+			<td valign="top">
+			<p>Members</p>
+			</td>
+			<td valign="top">
+			<p>If enabled, Java members are folded when opening a new editor.</p>
+			</td>
+			<td valign="top">
+			<p>Off</p>
+			</td>
+		</tr>
+		<tr>
+			<td valign="top">
+			<p>Imports</p>
+			</td>
+			<td valign="top">
+			<p>If enabled, imports are folded when opening a new editor.</p>
+			</td>
+			<td valign="top">
+			<p>On</p>
+			</td>
+		</tr>
+	</tbody>
+</table>
+<p><img src="../../../../images/ngrelr.png" alt="Related reference" border="0"></p>
+<p><a href="../../../../reference/ref-21.htm">Java Editor preference page</a></p>
+</body>
+</html>
diff --git a/bundles/org.eclipse.jdt.doc.user/reference/preferences/java/editor/ref-preferences-hovers.htm b/bundles/org.eclipse.jdt.doc.user/reference/preferences/java/editor/ref-preferences-hovers.htm
new file mode 100644
index 0000000..f5ba90c
--- /dev/null
+++ b/bundles/org.eclipse.jdt.doc.user/reference/preferences/java/editor/ref-preferences-hovers.htm
@@ -0,0 +1,71 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2006. 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>Hovers</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>Hovers</h1>
+<p>Indicate your preferences for the Hovers settings on the <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.jdt.ui.preferences.JavaEditorHoverPreferencePage)")'> <img src="PLUGINS_ROOT/org.eclipse.help/command_link.png" alt="Opens the Hovers preference page">
+<b> Java &gt; Editor &gt; Hovers </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>Expand vertical ruler icons upon hovering</p>
+			</td>
+			<td valign="top">
+			<p>If enabled, when there are multiple icons per line shown on vertical ruler, then the icons
+			are expanded when hovering over it. This allows to see all icons. Changing this preference does
+			not affect already opened editors.</p>
+			</td>
+			<td valign="top">
+			<p>Off</p>
+			</td>
+		</tr>
+		<tr>
+			<td valign="top">
+			<p>Show affordance in hover on how to make it sticky</p>
+			</td>
+			<td valign="top">
+			<p>If enabled, an additional text in hovers informs about how to make a hover
+			sticky. After making a hover sticky it is possible to copy its content to the clipboard.</p>
+			</td>
+			<td valign="top">
+			<p>On</p>
+			</td>
+		</tr>
+		<tr>
+			<td valign="top">
+			<p>Text Hover key modifier preferences</p>
+			</td>
+			<td valign="top">
+			<p>The selected hovers in this list are used to generate the hover content. A key modifier can be given to
+			each hover type to force the editor to only evaluate this hover when pressing the assigned key modifier.</p>
+			</td>
+			<td valign="top">
+			<p>Combined Hover, Source (with Shift)</p>
+			</td>
+		</tr>
+	</tbody>
+</table>
+<p><img src="../../../../images/ngrelr.png" alt="Related reference" border="0"></p>
+<p><a href="../../../../reference/ref-21.htm">Java Editor preference page</a></p>
+</body>
+</html>
diff --git a/bundles/org.eclipse.jdt.doc.user/reference/preferences/java/editor/ref-preferences-mark-occurrences.htm b/bundles/org.eclipse.jdt.doc.user/reference/preferences/java/editor/ref-preferences-mark-occurrences.htm
new file mode 100644
index 0000000..b342747
--- /dev/null
+++ b/bundles/org.eclipse.jdt.doc.user/reference/preferences/java/editor/ref-preferences-mark-occurrences.htm
@@ -0,0 +1,45 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2006. 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.jdt.ui.preferences.MarkOccurrencesPreferencePage)")'> <img src="PLUGINS_ROOT/org.eclipse.help/command_link.png" alt="Opens the Mark Occurrences preference page"> <b>Java &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, method, type or other element is referenced.</p>
+			</td>
+			<td valign="top">
+			<p>On</p>
+			</td>
+		</tr>
+	</tbody>
+</table>
+<p>A list of elements can be enabled and disabled on this preference page. All are enabled by default.</p>
+<p><img src="../../../../images/ngrelr.png" alt="Related reference" border="0"></p>
+<p><a href="../../../../reference/ref-21.htm">Java Editor preference page</a></p>
+</body>
+</html>
diff --git a/bundles/org.eclipse.jdt.doc.user/reference/preferences/java/editor/ref-preferences-syntax-coloring.htm b/bundles/org.eclipse.jdt.doc.user/reference/preferences/java/editor/ref-preferences-syntax-coloring.htm
new file mode 100644
index 0000000..add2a26
--- /dev/null
+++ b/bundles/org.eclipse.jdt.doc.user/reference/preferences/java/editor/ref-preferences-syntax-coloring.htm
@@ -0,0 +1,81 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2006. 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>Syntax Coloring</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>Syntax Coloring</h1>
+<p>Indicate your preferences for the Syntax Coloring settings on the <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.jdt.ui.preferences.JavaEditorColoringPreferencePage)")'> <img src="PLUGINS_ROOT/org.eclipse.help/command_link.png" alt="Opens the Syntax Coloring preference page"><b> Java &gt; Editor &gt; Syntax Coloring </b></a> preference page.</p>
+    <p>
+      Syntax Coloring specifies how Java source code is rendered. Note that general 
+      text editor settings such as the background color can be configured on the general 'Text Editors' preference pages. Fonts
+      may be configured on the general 'Colors and Fonts' preference page.
+    </p>
+    <table border="1" cellspacing="0" cellpadding="5" width="100%">
+      <thead>
+        <tr>
+          <th>
+            <p>
+              Option
+            </p>
+          </th>
+          <th>
+            <p>
+              Description
+            </p>
+          </th>
+          <th>
+            <p>
+              Default
+            </p>
+          </th>
+        </tr>
+      </thead>
+      <tbody>
+        <tr>
+          <td valign="top">
+            Element
+          </td>
+          <td valign="top">
+            <p>
+              Each category (<strong>Java</strong>, <strong>Javadoc</strong> and <strong>Comments</strong>)
+              contains a list of language elements that may be rendered with its own color and style.
+            </p>
+            <p>
+            Note that some semantic highlighting options can be disabled by the user in order to
+            ensure editor performance on low-end systems.
+            </p>
+          </td>
+          <td valign="top">
+            <p>
+              default colors and styles
+            </p>
+          </td>
+        </tr>
+        <tr>
+          <td valign="top">
+            Preview
+          </td>
+          <td valign="top">
+            <p>
+              Displays the preview of a Java source code respecting the current colors and styles.
+            </p>
+          </td>
+          <td valign="top">
+            <p>
+              n/a
+            </p>
+          </td>
+        </tr>
+      </tbody>
+    </table>
+<p><img src="../../../../images/ngrelc.png" alt="Related concepts" border="0"></p>
+<p><a href="../../../../concepts/concepts-7.htm">Java Editor</a></p>
+<p><img src="../../../../images/ngrelr.png" alt="Related reference" border="0"></p>
+<p><a href="../../../../reference/ref-21.htm">Java Editor preference page</a></p>
+</body>
+</html>
diff --git a/bundles/org.eclipse.jdt.doc.user/reference/preferences/java/editor/ref-preferences-typing.htm b/bundles/org.eclipse.jdt.doc.user/reference/preferences/java/editor/ref-preferences-typing.htm
new file mode 100644
index 0000000..d7a38ea
--- /dev/null
+++ b/bundles/org.eclipse.jdt.doc.user/reference/preferences/java/editor/ref-preferences-typing.htm
@@ -0,0 +1,111 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2006. 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>Typing</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>Typing</h1>
+<p>Indicate your preferences for the Typing settings on the <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.jdt.ui.preferences.SmartTypingPreferencePage)")'> <img src="PLUGINS_ROOT/org.eclipse.help/command_link.png" alt="Opens the Typing preference page"><b> Java &gt; Editor &gt; Typing </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>Automatically close</p>
+			</td>
+			<td valign="top">
+			<p>Select for which characters a closing character should be inserted when typing the opening character.</p>
+			</td>
+			<td valign="top">
+			<p>All on</p>
+			</td>
+		</tr>
+		<tr>
+			<td valign="top">
+			<p>Automatically insert at correct position</p>
+			</td>
+			<td valign="top">
+			<p>Select which characters should be automatically inserted when they are required.</p>
+			</td>
+			<td valign="top">
+			<p>All off</p>
+			</td>
+		</tr>
+		<tr>
+			<td valign="top">
+			<p>Tab key indents the current line</p>
+			</td>
+			<td valign="top">
+			<p>If enabled then the tab key can be used to indent the current line.</p>
+			</td>
+			<td valign="top">
+			<p>On</p>
+			</td>
+		</tr>
+		<tr>
+			<td valign="top">
+			<p>Adjust indentation</p>
+			</td>
+			<td valign="top">
+			<p>When pasting Java code from the clipboard adjust its indentation to the current
+			indentation level.</p>
+			</td>
+			<td valign="top">
+			<p>On</p>
+			</td>
+		</tr>
+		<tr>
+			<td valign="top">
+			<p>Update imports</p>
+			</td>
+			<td valign="top">
+			<p>When pasting Java code from the clipboard add the required import statements to the import section.</p>
+			</td>
+			<td valign="top">
+			<p>On</p>
+			</td>
+		</tr>
+		<tr>
+			<td valign="top">
+			<p>Wrap automatically</p>
+			</td>
+			<td valign="top">
+			<p>If enabled, string literals are wrapped when they exceed the max line length.</p>
+			</td>
+			<td valign="top">
+			<p>On</p>
+			</td>
+		</tr>
+		<tr>
+			<td valign="top">
+			<p>Escape text when pasting into a string literal</p>
+			</td>
+			<td valign="top">
+			<p>If enabled, special characters in pasted strings are escaped when they are pastet into an existing string literal.</p>
+			</td>
+			<td valign="top">
+			<p>Off</p>
+			</td>
+		</tr>
+	</tbody>
+</table>
+<p><img src="../../../../images/ngrelr.png" alt="Related reference" border="0"></p>
+<p><a href="../../../../reference/ref-21.htm">Java Editor preference page</a></p>
+</body>
+</html>
diff --git a/bundles/org.eclipse.jdt.doc.user/reference/preferences/java/ref-preferences-build-path.htm b/bundles/org.eclipse.jdt.doc.user/reference/preferences/java/ref-preferences-build-path.htm
new file mode 100644
index 0000000..3437908
--- /dev/null
+++ b/bundles/org.eclipse.jdt.doc.user/reference/preferences/java/ref-preferences-build-path.htm
@@ -0,0 +1,59 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2006. 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>Build Path</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>Build Path</h1>
+<p>Indicate your preferences for the Build Path settings on the <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.jdt.ui.preferences.BuildPathPreferencePage)")'> <img src="PLUGINS_ROOT/org.eclipse.help/command_link.png" alt="Opens the Build Path preference page"> <b> Java &gt; Build Path </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">Source and output folder</td>
+			<td valign="top">
+			<dl>
+				<dt><strong>Project</strong></dt>
+				<dd>Use the project root folder as the folder where java source files and the generated class files are stored by default.</dd>
+				<dt><strong>Folders</strong></dt>
+				<dd>Specify separate source and output folders to store the java source files separated from the generated class files.</dd>
+			</dl>
+			</td>
+			<td valign="top">Project</td>
+		</tr>
+		<tr>
+			<td valign="top">
+			<p>As JRE library use</p>
+			</td>
+			<td valign="top">
+			<p>Select what kind of JRE library should be used for newly created java projects.</p>
+			</td>
+			<td valign="top">
+			<p>JRE container</p>
+			</td>
+		</tr>
+	</tbody>
+</table>
+<p><img src="../../../images/ngrelc.png" alt="Related concepts" border="0"></p>
+<p><a href="../../../concepts/cclsspthv.htm">Classpath variables</a><br>
+</p>
+<p><img src="../../../images/ngrelr.png" alt="Related reference" border="0"></p>
+<p><a href="../../../reference/ref-121.htm">New Java Project Wizard</a><br></p>
+</body>
+</html>
diff --git a/bundles/org.eclipse.jdt.doc.user/reference/preferences/java/ref-preferences-properties-files-editor.htm b/bundles/org.eclipse.jdt.doc.user/reference/preferences/java/ref-preferences-properties-files-editor.htm
new file mode 100644
index 0000000..df01a08
--- /dev/null
+++ b/bundles/org.eclipse.jdt.doc.user/reference/preferences/java/ref-preferences-properties-files-editor.htm
@@ -0,0 +1,73 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2006. 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>Properties Files Editor</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>Properties Files Editor</h1>
+<p>Indicate your preferences for the Properties Files Editor settings on the <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.jdt.ui.preferences.PropertiesFileEditorPreferencePage)")'> <img src="PLUGINS_ROOT/org.eclipse.help/command_link.png" alt="Opens the Properties Files Editor preference page">
+<b> Java &gt; Properties Files Editor </b></a> preference page.</p>
+
+    <p>
+      Syntax Coloring specifies how Java source code is rendered. Note that general 
+      text editor settings such as the background color can be configured on the general 'Text Editors' preference pages.
+    </p>
+    <table border="1" cellspacing="0" cellpadding="5" width="100%">
+      <thead>
+        <tr>
+          <th>
+            <p>
+              Option
+            </p>
+          </th>
+          <th>
+            <p>
+              Description
+            </p>
+          </th>
+          <th>
+            <p>
+              Default
+            </p>
+          </th>
+        </tr>
+      </thead>
+      <tbody>
+        <tr>
+          <td valign="top">
+            Foreground
+          </td>
+          <td valign="top">
+            <p>
+              A list of language elements that may be rendered with its own color and style.
+            </p>
+          </td>
+          <td valign="top">
+            <p>
+              default colors and styles
+            </p>
+          </td>
+        </tr>
+        <tr>
+          <td valign="top">
+            Preview
+          </td>
+          <td valign="top">
+            <p>
+              Displays the preview of a properties file respecting the current colors and styles.
+            </p>
+          </td>
+          <td valign="top">
+            <p>
+              n/a
+            </p>
+          </td>
+        </tr>
+      </tbody>
+    </table>
+</body>
+</html>
diff --git a/bundles/org.eclipse.jdt.doc.user/reference/ref-13.htm b/bundles/org.eclipse.jdt.doc.user/reference/ref-13.htm
index 407d8fa..df522e9 100644
--- a/bundles/org.eclipse.jdt.doc.user/reference/ref-13.htm
+++ b/bundles/org.eclipse.jdt.doc.user/reference/ref-13.htm
@@ -20,9 +20,6 @@
       <b>Java</b></a> preference page.
     </p>
     <table border="1" cellspacing="0" cellpadding="5">
-      <caption>
-        Java Preferences
-      </caption>
       <thead>
         <tr>
           <th>
@@ -51,7 +48,7 @@
           <td valign="top">
             <dl>
               <dt>
-                <strong>Go into the selected element:</strong>
+                <strong>Go into the selected element</strong>
               </dt>
               <dd>
                 When you double click a container, a <strong>Go Into</strong> command is executed.
@@ -59,7 +56,7 @@
                 See <strong>Go Into</strong> from the <a href="ref-menu-navigate.htm">Navigate</a> menu.
               </dd>
               <dt>
-                <strong>Expand the selected element:</strong>
+                <strong>Expand the selected element</strong>
               </dt>
               <dd>
                  When you double click a container, it is expanded and its children are revealed.
@@ -108,12 +105,13 @@
                 <strong>Save all modified resources automatically prior to refactoring</strong>
               </dt>
               <dd>
-                  If this option is turned on, all refactorings prompt whether any modified files should be saved before opening the refactoring wizard.
+                  If this option is turned off, all refactorings prompt whether any modified files should be saved before opening the refactoring wizard.
+                  If it is turned on, all modified files are saved without prompting prior to opening a refactoring wizard.
               </dd>
               </dl>
           </td>
           <td valign="top">
-            On
+            Off
           </td>
         </tr>
 
@@ -142,7 +140,7 @@
           <td valign="top">
              <dl>
               <dt>
-                <strong>Clear all 'do not show' settings and show all hidden dialogs again</strong>
+                <strong>Clear all 'do not show again' settings and show all hidden dialogs again</strong>
               </dt>
               <dd>
                   If pressed, all 'do not show' settings are cleared.
diff --git a/bundles/org.eclipse.jdt.doc.user/reference/ref-21.htm b/bundles/org.eclipse.jdt.doc.user/reference/ref-21.htm
index d669429..d7e1220 100644
--- a/bundles/org.eclipse.jdt.doc.user/reference/ref-21.htm
+++ b/bundles/org.eclipse.jdt.doc.user/reference/ref-21.htm
@@ -4,14 +4,14 @@
 <meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2005. 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>
-      Java editor
+      Editor
     </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"> </script>
   </head>
   <body>
     <h1>
-      Java editor
+      Editor
     </h1>
     <p>
       The following Java editor preferences can be set on the
@@ -21,23 +21,19 @@
       and its sub-pages.
     </p>
     <ul>
-      <li><a href="#appearance">Appearance and Navigation</a></li>
-      <li><a href="#codeassist">Code Assist</a></li>
-      <li><a href="#syntaxcoloring">Syntax Coloring</a></li>
+      <li><a href="../reference/preferences/java/editor/ref-preferences-content-assist.htm">Content Assist</a></li>
+      <li><a href="../reference/preferences/java/editor/ref-preferences-content-assist-advanced.htm">Content Assist Advanced</a></li>
+      <li><a href="../reference/preferences/java/editor/ref-preferences-folding.htm">Folding</a></li>
+      <li><a href="../reference/preferences/java/editor/ref-preferences-hovers.htm">Hovers</a></li>
+      <li><a href="../reference/preferences/java/editor/ref-preferences-mark-occurrences.htm">Mark Occurrences</a></li>
+      <li><a href="../reference/preferences/java/editor/ref-preferences-syntax-coloring.htm">Syntax Coloring</a></li>
+      <li><a href="../reference/ref-preferences-templates.htm">Templates</a></li>
+      <li><a href="../reference/preferences/java/editor/ref-preferences-typing.htm">Typing</a></li>
     </ul>
     <p>
       Note that some options that are generally applicable to text editors can be configured on the text editor preference page.
     </p>
-    <h2 class="Head">
-      <a name="appearance">Appearance and Navigation</a>
-    </h2>
-    <p>
-      Java editor appearance and navigation options.
-    </p>
     <table border="1" cellspacing="0" cellpadding="5" width="100%">
-      <caption>
-        Appearance and Navigation
-      </caption>
       <thead>
         <tr>
           <th>Option</th>
@@ -165,334 +161,6 @@
         </tr>
       </tbody>
     </table>
-    <h2 class="Head">
-      <a name="codeassist">Code assist</a>
-    </h2>
-    <p>
-      Configures <strong>Code Assist</strong> behavior.
-    </p>
-    <table border="1" cellspacing="0" cellpadding="5" width="100%">
-      <caption>
-        Code Assist
-      </caption>
-      <thead>
-        <tr>
-          <th>
-            <p>
-              Option
-            </p>
-          </th>
-          <th>
-            <p>
-              Description
-            </p>
-          </th>
-          <th>
-            <p>
-              Default
-            </p>
-          </th>
-        </tr>
-      </thead>
-      <tbody>
-        <tr>
-          <td valign="top">
-            Completion inserts/Completion overwrites
-          </td>
-          <td valign="top">
-            <p>
-              If <strong>Completion inserts</strong> is on, the completion text is inserted at the caret position,
-              so it never overwrites any existing text.
-              <br>
-              If <strong>Completion overwrites</strong> is on, the completion text replaces the characters
-              following the caret position until the end of the word.
-            </p>
-            <p>
-            Note that pressing <strong>Ctrl</strong> when applying a completion proposal toggles between
-            the two insertion modes.
-            </p>
-          </td>
-          <td valign="top">
-            <p>
-              Completion inserts
-            </p>
-          </td>
-        </tr>
-        <tr>
-          <td valign="top">
-            Insert single proposals automatically
-          </td>
-          <td valign="top">
-            <p>
-              If enabled, code assist will choose and insert automatically single proposals.
-            </p>
-          </td>
-          <td valign="top">
-            <p>
-              On
-            </p>
-          </td>
-        </tr>
-        <tr>
-          <td valign="top">
-            Insert common prefixes automatically
-          </td>
-          <td valign="top">
-            <p>
-              If enabled, code assist will automatically insert the common prefix of all possible completions similar
-              to unix shell expansion. This can be used repeatedly, even while the code assist window is being
-              displayed.
-            </p>
-          </td>
-          <td valign="top">
-            <p>
-              Off
-            </p>
-          </td>
-        </tr>
-        <tr>
-          <td valign="top">
-            Automatically add import instead of qualified name
-          </td>
-          <td valign="top">
-            <p>
-              If enabled, type proposals which are in other packages will invoke the addition of the corresponding import declaration. Otherwise, the type will be inserted fully
-              qualified.
-            </p>
-          </td>
-          <td valign="top">
-            <p>
-              On
-            </p>
-          </td>
-        </tr>
-        <tr>
-          <td valign="top">
-            Fill argument names on completion
-          </td>
-          <td valign="top">
-            <p>
-              If enabled, code assist will add the argument names when completing a method or generic type.
-            </p>
-          </td>
-          <td valign="top">
-            <p>
-              Off
-            </p>
-          </td>
-        </tr>
-        <tr>
-          <td valign="top">
-            Guess filled method arguments
-          </td>
-          <td valign="top">
-            <p>
-              If enabled, code assist will try to guess method parameters from the context where a method proposal is inserted.
-            </p>
-          </td>
-          <td valign="top">
-            <p>
-              Off
-            </p>
-          </td>
-        </tr>
-        <tr>
-          <td valign="top">
-            Present proposals in alphabetical order
-          </td>
-          <td valign="top">
-            <p>
-              If enabled, the proposals are sorted in alphabetical order.
-            </p>
-          </td>
-          <td valign="top">
-            <p>
-              Off
-            </p>
-          </td>
-        </tr>
-         <tr>
-          <td valign="top">
-            Hide proposals not visible in the invocation context
-          </td>
-          <td valign="top">
-            <p>
-              If enabled, the Java element proposals are limited by the rules of visibility. For example, private field proposals of other classes would not be displayed.
-            </p>
-          </td>
-          <td valign="top">
-            <p>
-              On
-            </p>
-          </td>
-        </tr>
-         <tr>
-          <td valign="top">
-            Hide forbidden references
-          </td>
-          <td valign="top">
-            <p>
-              If enabled, references to Java elements forbidden by access rules are not displayed.
-            </p>
-          </td>
-          <td valign="top">
-            <p>
-              On
-            </p>
-          </td>
-        </tr>
-         <tr>
-          <td valign="top">
-            Hide discouraged references
-          </td>
-          <td valign="top">
-            <p>
-              If enabled, references to Java elements discouraged by access rules are not displayed.
-            </p>
-          </td>
-          <td valign="top">
-            <p>
-              Off
-            </p>
-          </td>
-        </tr>
-        <tr>
-          <td valign="top">
-            Enable auto activation
-          </td>
-          <td valign="top">
-            <p>
-              If enabled, code assist can be invoked automatically.
-            </p>
-            <p>
-              The condition for automatic invocation is specified with the preferences <strong>Auto activation delay</strong>, <strong>Auto activation triggers for Java</strong>
-              and <strong>Auto activation triggers for Javadoc</strong>.
-            </p>
-          </td>
-          <td valign="top">
-            <p>
-              On
-            </p>
-          </td>
-        </tr>
-        <tr>
-          <td valign="top">
-            Auto activation delay
-          </td>
-          <td valign="top">
-            <p>
-              If the time starting when an auto activation trigger character is encountered until a new character is typed exceeds the auto activation delay, code assist is
-              invoked.
-            </p>
-          </td>
-          <td valign="top">
-            200
-          </td>
-        </tr>
-        <tr>
-          <td valign="top">
-            Auto activation triggers for Java
-          </td>
-          <td valign="top">
-            <p>
-              If one of the trigger characters is typed inside Java source code (but not inside a Javadoc comment) and no other character is typed before the auto activation delay
-              times out, the code assist is invoked.
-            </p>
-          </td>
-          <td valign="top">
-            <p>
-              '.'
-            </p>
-          </td>
-        </tr>
-        <tr>
-          <td valign="top">
-            Auto activation triggers for Javadoc
-          </td>
-          <td valign="top">
-            <p>
-              If one of the trigger characters is typed inside a Java doc and no other character is typed before the auto activation delay times out, the code assist is invoked.
-            </p>
-          </td>
-          <td valign="top">
-            <p>
-              '@#'
-            </p>
-          </td>
-        </tr>
-        
-      </tbody>
-    </table>
-
-    <h2 class="Head">
-      <a name="syntaxcoloring">Syntax Coloring</a>
-    </h2>
-    <p>
-      <strong>Syntax Coloring</strong> specifies how Java source code is rendered. Note that general 
-      text editor settings such as the background color can be configured on the general 'Text Editors' preference pages. Fonts
-      may be configured on the general 'Colors and Fonts' preference page.
-    </p>
-    <table border="1" cellspacing="0" cellpadding="5" width="100%">
-      <caption>
-        Syntax Coloring
-      </caption>
-      <thead>
-        <tr>
-          <th>
-            <p>
-              Option
-            </p>
-          </th>
-          <th>
-            <p>
-              Description
-            </p>
-          </th>
-          <th>
-            <p>
-              Default
-            </p>
-          </th>
-        </tr>
-      </thead>
-      <tbody>
-        <tr>
-          <td valign="top">
-            Element
-          </td>
-          <td valign="top">
-            <p>
-              Each category (<strong>Java</strong>, <strong>Javadoc</strong> and <strong>Comments</strong>)
-              contains a list of language elements that may be rendered with its own color and style.
-            </p>
-            <p>
-            Note that some semantic highlighting options can be disabled by the user in order to
-            ensure editor performance on low-end systems.
-            </p>
-          </td>
-          <td valign="top">
-            <p>
-              default colors and styles
-            </p>
-          </td>
-        </tr>
-        <tr>
-          <td valign="top">
-            Preview
-          </td>
-          <td valign="top">
-            <p>
-              Displays the preview of a Java source code respecting the current colors and styles.
-            </p>
-          </td>
-          <td valign="top">
-            <p>
-              n/a
-            </p>
-          </td>
-        </tr>
-      </tbody>
-    </table>
     <p>
       <img src="../images/ngrelc.png" alt="Related concepts" border="0" >
     </p>
diff --git a/bundles/org.eclipse.jdt.doc.user/reference/ref-22.htm b/bundles/org.eclipse.jdt.doc.user/reference/ref-22.htm
index 94b670a..dcee5c2 100644
--- a/bundles/org.eclipse.jdt.doc.user/reference/ref-22.htm
+++ b/bundles/org.eclipse.jdt.doc.user/reference/ref-22.htm
@@ -22,9 +22,6 @@
       defines how the Organize Imports command generates the import statements in a compilation unit.
     </p>
     <table border="1" cellspacing="0" cellpadding="5">
-      <caption>
-        Organize Imports Preferences
-      </caption>
       <thead>
         <tr>
           <th rowspan="1" colspan="1">
diff --git a/bundles/org.eclipse.jdt.doc.user/reference/ref-preferences-code-generation.htm b/bundles/org.eclipse.jdt.doc.user/reference/ref-preferences-code-generation.htm
index 4ccf6fc..d091c5b 100644
--- a/bundles/org.eclipse.jdt.doc.user/reference/ref-preferences-code-generation.htm
+++ b/bundles/org.eclipse.jdt.doc.user/reference/ref-preferences-code-generation.htm
@@ -66,7 +66,7 @@
 	<tbody>
 		<tr>
 			<td valign="top" width="25%">
-			<p>Qualify field accesses with 'this'</p>
+			<p>Qualify all generated field accesses with 'this.'</p>
 			</td>
 			<td valign="top">
 			<p>If selected, field accesses are always prefixed with 'this', regardless whether the name of the field is unique in the scope of the field access or not.</p>
@@ -77,7 +77,7 @@
 		</tr>
 		<tr>
 			<td valign="top" width="25%">
-			<p>Use 'is' prefix for getters returning boolean</p>
+			<p>Use 'is' prefix for getters that return boolean</p>
 			</td>
 			<td valign="top">
 			<p>If selected, the names of getter methods of boolean type are prefixed with 'is' rather than 'get'.</p>
@@ -88,7 +88,7 @@
 		</tr>
 		<tr>
 			<td valign="top" width="25%">
-			<p>Add comments for new methods and types</p>
+			<p>Automatically add comments for new methods and types</p>
 			</td>
 			<td valign="top">
 			<p>If selected, newly generated methods and types are automatically generated with comments where appropriate. See the
diff --git a/bundles/org.eclipse.jdt.doc.user/reference/ref-preferences-code-templates.htm b/bundles/org.eclipse.jdt.doc.user/reference/ref-preferences-code-templates.htm
index 606998e..4988e58 100644
--- a/bundles/org.eclipse.jdt.doc.user/reference/ref-preferences-code-templates.htm
+++ b/bundles/org.eclipse.jdt.doc.user/reference/ref-preferences-code-templates.htm
@@ -38,7 +38,7 @@
 			<p>Edit...</p>
 			</td>
 			<td valign="top">
-			<p>Opens a dialog to edit the currently selected code template.</p>
+			<p>Opens the Code Template dialog to edit the currently selected code template.</p>
 			</td>
 		</tr>
 		<tr>
diff --git a/bundles/org.eclipse.jdt.doc.user/reference/ref-preferences-compiler.htm b/bundles/org.eclipse.jdt.doc.user/reference/ref-preferences-compiler.htm
index df501da..0f28228 100644
--- a/bundles/org.eclipse.jdt.doc.user/reference/ref-preferences-compiler.htm
+++ b/bundles/org.eclipse.jdt.doc.user/reference/ref-preferences-compiler.htm
@@ -19,26 +19,8 @@
     <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.jdt.ui.preferences.CompliancePreferencePage)")'>
     <img src="PLUGINS_ROOT/org.eclipse.help/command_link.png" alt="Opens the Java Compiler preference page">
     <b>Java &gt; Compiler</b></a> preference page
-    lets you configure the various settings related to compiling, building and checking Java source code.</p>
-    <p>
-      The Java compiler preferences are separated in the following sections:
-    </p>
-    <ul>
-      <li>
-        General
-      </li>
-      <li>
-        Building
-      </li>
-      <li>
-        Errors/Warnings
-      </li>
-    </ul>
-	
-    <h2 class="Head">
-      General
-    </h2>
-               <p><h3>JDK Compliance</h3></p>
+    lets you configure the various settings related to compiling of Java source code and class file generation.</p>
+               <h3>JDK Compliance</h3>
     <table border="1" cellspacing="0" cellpadding="5" width="100%">
       <tr>
         <th>
@@ -249,1032 +231,6 @@
         </td>
       </tr>
     </table>
-	
-    <h2 class="Head">
-      Building
-    </h2>
-    <h3>General</h3>
-    <table border="1" cellspacing="0" cellpadding="5" width="100%">
-      <tr>
-        <th>
-          <p>
-            Option
-          </p>
-        </th>
-        <th>
-          <p>
-            Description
-          </p>
-        </th>
-        <th>
-          <p>
-            Default
-          </p>
-        </th>
-      </tr>
-            <tr>
-        <td valign="top">
-          <p>
-            Maximum number of reported problems per compilation unit
-          </p>
-        </td>
-        <td valign="top">
-          <p>
-            Specifies how many problems should be reported for a compilation unit.
-          </p>
-        </td>
-        <td valign="top">
-          <p>
-            100
-          </p>
-        </td>
-      </tr>
-      <tr>
-        <td valign="top">
-          <p>
-            Enable using exclusion patterns in source folders
-          </p>
-        </td>
-        <td valign="top">
-          <p>
-            When disabled, no entry on a project classpath can be associated with
-			an exclusion pattern.
-          </p>
-        </td>
-        <td valign="top">
-          <p>
-            On
-          </p>
-        </td>
-      </tr>
-      <tr>
-        <td valign="top">
-          <p>
-            Enable using multiple output locations for source folders
-          </p>
-        </td>
-        <td valign="top">
-          <p>
-             When disabled, no entry on a project classpath can be associated with
-	         a specific output location, preventing thus usage of multiple output locations.
-          </p>
-        </td>
-        <td valign="top">
-          <p>
-            On
-          </p>
-        </td>
-      </tr>
-      </table>
-    <h3>Build path problems</h3>
-    <table border="1" cellspacing="0" cellpadding="5" width="100%">
-          <tr>
-        <td valign="top">
-          <p>
-            Abort building on build path errors
-          </p>
-        </td>
-        <td valign="top">
-          <p>
-            Allow to toggle the builder to abort if the classpath is invalid.
-          </p>
-        </td>
-        <td valign="top">
-          <p>
-            On
-          </p>
-        </td>
-      </tr>
-      <tr>
-        <td valign="top">
-          <p>
-            Incomplete build path
-          </p>
-        </td>
-        <td valign="top">
-          <p>
-            Indicate the severity of the problem reported when an entry on the classpath does not exist,
-            is not legitimate or is not visible (e.g. a reference project is closed).
-          </p>
-        </td>
-        <td valign="top">
-          <p>
-            Error
-          </p>
-        </td>
-      </tr>
-      <tr>
-        <td valign="top">
-          <p>
-            Circular dependencies
-          </p>
-        </td>
-        <td valign="top">
-          <p>
-            Indicate the severity of the problem reported when a project is involved in a cycle.
-          </p>
-        </td>
-        <td valign="top">
-          <p>
-            Error
-          </p>
-        </td>
-      </tr>
-       <tr>
-        <td valign="top">
-          <p>
-            Incompatible required binaries
-          </p>
-        </td>
-        <td valign="top">
-          <p>
-            Indicated the severity of the problem reported when a project requires incompatible binaries.
-          </p>
-        </td>
-        <td valign="top">
-          <p>
-            Ignore
-          </p>
-        </td>
-      </tr>
-       </table>
-    <h3>Output folder</h3>
-    <table border="1" cellspacing="0" cellpadding="5" width="100%">
-      <tr>
-        <td valign="top">
-          <p>
-            Duplicated resources
-          </p>
-        </td>
-        <td valign="top">
-          <p>
-            Indicate the severity of the problem reported when more than one occurrence of a resource
-            is to be copied into the output location.
-          </p>
-        </td>
-        <td valign="top">
-          <p>
-            Warning
-          </p>
-        </td>
-      </tr>
-      <tr>
-        <td valign="top">
-          <p>
-            Scrub output folders when cleaning projects
-          </p>
-        </td>
-        <td valign="top">
-          <p>
-            Indicate whether the Java Builder is allowed to clean the output folders
-	 	    when performing full build operations.
-          </p>
-        </td>
-        <td valign="top">
-          <p>
-            On
-          </p>
-        </td>
-      </tr>
-      <tr>
-        <td valign="top">
-          <p>
-            Filtered resources
-          </p>
-        </td>
-        <td valign="top">
-          <p>
-            A comma separated list of file patterns which are not copied to the output folder.&nbsp;
-          </p>
-        </td>
-        <td valign="top">
-          <p>
-            ''
-          </p>
-        </td>
-      </tr>
-    </table>
-    <h2 class="Head">
-      Errors/Warnings
-    </h2>
-    <h3>Code style</h3>
-    <table border="1" cellspacing="0" cellpadding="5" width="100%">
-      <tr>
-        <th>
-          <p>
-            Option
-          </p>
-        </th>
-        <th>
-          <p>
-            Description
-          </p>
-        </th>
-        <th>
-          <p>
-            Default
-          </p>
-        </th>
-      </tr>
-            <tr>
-        <td valign="top">
-          <p>
-            Non-static access to a static member
-          </p>
-        </td>
-        <td valign="top">
-          <p>
-            When enabled, the compiler will issue an error or a warning whenever a static field or method is accessed with an expression receiver.
-            A reference to a static member should be qualified with a type name.
-          </p>
-        </td>
-        <td valign="top">
-          <p>
-            Warning
-          </p>
-        </td>
-      </tr>
-                  <tr>
-        <td valign="top">
-          <p>
-            Indirect access to a static member
-          </p>
-        </td>
-        <td valign="top">
-          <p>
-            When enabled, the compiler will issue an error or a warning whenever a static field or method is indirectly accessed. A static field of an interface should
-            be qualified with the declaring type name.
-          </p>
-        </td>
-        <td valign="top">
-          <p>
-            Warning
-          </p>
-        </td>
-      </tr>
-            <tr>
-        <td valign="top">
-          <p>
-            Unqualified access to instance field
-          </p>
-        </td>
-        <td valign="top">
-          <p>
-            When enabled, the compiler will issue an error or a warning whenever it encounters a field access which is not qualified (eg. misses a 'this').
-          </p>
-        </td>
-        <td valign="top">
-          <p>
-            Ignore
-          </p>
-        </td>
-      </tr>
-            <tr>
-        <td valign="top">
-          <p>
-            Undocumented empty block
-          </p>
-        </td>
-        <td valign="top">
-          <p>
-            When enabled, the compiler will issue an error or a warning whenever it encounters an empty block statement with no explaining comment.
-          </p>
-        </td>
-        <td valign="top">
-          <p>
-            Ignore
-          </p>
-        </td>
-      </tr>
-      <tr>
-        <td valign="top">
-          <p>
-            Access to a non-accessible member of an enclosing type
-          </p>
-        </td>
-        <td valign="top">
-          <p>
-            When enabled, the compiler will issue an error or a warning whenever it emulates access to a non-accessible member of an enclosing type. Such accesses can have
-            performance implications.
-          </p>
-        </td>
-        <td valign="top">
-          <p>
-            Ignore
-          </p>
-        </td>
-      </tr>
-      <tr>
-        <td valign="top">
-          <p>
-            Methods with a constructor name
-          </p>
-        </td>
-        <td valign="top">
-          <p>
-            Naming a method with a constructor name is generally considered poor style programming. When enabling this option, the compiler will signal such scenario either as an
-            error or a warning.
-          </p>
-        </td>
-        <td valign="top">
-          <p>
-            Warning
-          </p>
-        </td>
-      </tr>
-            <tr>
-        <td valign="top">
-          <p>
-            Usage of non-externalized strings
-          </p>
-        </td>
-        <td valign="top">
-          <p>
-            When enabled, the compiler will issue an error or a warning for non externalized String literal (i.e. non tagged with //$NON-NLS-&lt;n&gt;$).&nbsp;
-          </p>
-        </td>
-        <td valign="top">
-          <p>
-            Ignore
-          </p>
-        </td>
-      </tr>
-          </table>
-    <h3>Potential programming problems</h3>
-    <table border="1" cellspacing="0" cellpadding="5" width="100%">
-      <tr>
-        <td valign="top">
-          <p>
-            Serializable class without serialVersionUID
-          </p>
-        </td>
-        <td valign="top">
-          <p>
-            When enabled, the compiler will issue an error or a warning whenever a type implementing 'java.io.Serializable' does not contain a serialVersionUID field.
-          </p>
-        </td>
-        <td valign="top">
-          <p>
-            Warning
-          </p>
-        </td>
-      </tr>
-      <tr>
-        <td valign="top">
-          <p>
-            Assignment has no effect (eg. 'x = x')
-          </p>
-        </td>
-        <td valign="top">
-          <p>
-            When enabled, the compiler will issue an error or a warning whenever an assignment has no effect (eg. 'x = x').
-          </p>
-        </td>
-        <td valign="top">
-          <p>
-            Warning
-          </p>
-        </td>
-      </tr>
-            <tr>
-        <td valign="top">
-          <p>
-            Possible accidential boolean assigment (eg. 'if (a = b)')
-          </p>
-        </td>
-        <td valign="top">
-          <p>
-            When enabled, the compiler will issue an error or a warning whenever if encounters a possible accidential boolean assignment (eg. 'if (a = b)').
-          </p>
-        </td>
-        <td valign="top">
-          <p>
-            Warning
-          </p>
-        </td>
-      </tr>
-                  <tr>
-        <td valign="top">
-          <p>
-            'finally' does not complete normally
-          </p>
-        </td>
-        <td valign="top">
-          <p>
-            When enabled, the compiler will issue an error or a warning whenever a 'finally' statement does not complete normally (eg. contains a return statement).
-          </p>
-        </td>
-        <td valign="top">
-          <p>
-            Warning
-          </p>
-        </td>
-      </tr>
-            <tr>
-        <td valign="top">
-          <p>
-            Empty statement
-          </p>
-        </td>
-        <td valign="top">
-          <p>
-            When enabled, the compiler will issue an error or a warning whenever it encounters an empty statement (eg. a superfluos semicolon).
-          </p>
-        </td>
-        <td valign="top">
-          <p>
-            Ignore
-          </p>
-        </td>
-      </tr>
-      <tr>
-        <td valign="top">
-          <p>
-            Using a char array in string concatenation
-          </p>
-        </td>
-        <td valign="top">
-          <p>
-            When enabled, the compiler will issue an error or a warning whenever a char[] expression is used in String concatenations, 
-          </p>
-            <code>"hello" + new char[]{'w','o','r','l','d'}</code>
-        </td>
-        <td valign="top">
-          <p>
-            Warning
-          </p>
-        </td>
-      </tr>
-                  <tr>
-        <td valign="top">
-          <p>
-            Hidden catch blocks
-          </p>
-        </td>
-        <td valign="top">
-          <p>
-            Locally to a try statement, some catch blocks may hide others , eg.
-          </p>
-          <code>try { throw new java.io.CharConversionException();</code><br>
-           <code>} catch (java.io.CharConversionException e) {</code><br>
-           <code>} catch (java.io.IOException e) {}.</code><br>
-          <br>
-           
-          <p>
-            When enabling this option, the compiler will issue an error or a warning for hidden catch blocks corresponding to checked exceptions.
-          </p>
-        </td>
-        <td valign="top">
-          <p>
-            Warning
-          </p>
-        </td>
-      </tr>
-    </table>
-    <h3>Name shadowing and conflicts</h3>
-    <table border="1" cellspacing="0" cellpadding="5" width="100%">
-              <tr>
-        <td valign="top">
-          <p>
-            Field declaration hides another field or variable
-          </p>
-        </td>
-        <td valign="top">
-          <p>
-            When enabling this option, the compiler will issue an error or a warning if a field declaration hides another inherited field.
-          </p>
-        </td>
-        <td valign="top">
-          <p>
-            Ignore
-          </p>
-        </td>
-      </tr>
-                    <tr>
-        <td valign="top">
-          <p>
-            Local variable declaration hides another field or variable
-          </p>
-        </td>
-        <td valign="top">
-          <p>
-            When enabling this option, the compiler will issue an error or a warning if a local variable declaration hides another field or variable.
-          </p>
-        </td>
-        <td valign="top">
-          <p>
-            Ignore
-          </p>
-        </td>
-      </tr>
-                    <tr>
-        <td valign="top">
-          <p>
-            Include constructor or setter method parameters
-          </p>
-        </td>
-        <td valign="top">
-          <p>
-            When enabling this option, the compiler additionally will issue an error or a warning if a constructor or setter method parameter hides another field or variable.
-          </p>
-        </td>
-        <td valign="top">
-          <p>
-            Off
-          </p>
-        </td>
-      </tr>
-          <tr>
-        <td valign="top">
-          <p>
-            Type parameter hides another type
-          </p>
-        </td>
-        <td valign="top">
-          <p>
-            When enabling this option, the compiler will issue an error or a warning if eg. a type parameter of an inner class hides an outer type.
-          </p>
-        </td>
-        <td valign="top">
-          <p>
-            Warning
-          </p>
-        </td>
-      </tr>
-      <tr>
-        <td valign="top">
-          <p>
-            Methods overridden but not package visible
-          </p>
-        </td>
-        <td valign="top">
-          <p>
-            A package default method is not visible in a different package, and thus cannot be overridden. When enabling this option, the compiler will signal such scenario either
-            as an error or a warning.
-          </p>
-        </td>
-        <td valign="top">
-          <p>
-            Warning
-          </p>
-        </td>
-      </tr>
-
-      <tr>
-        <td valign="top">
-          <p>
-            Conflict of interface method with protected 'Object' method
-          </p>
-        </td>
-        <td valign="top">
-          <p>
-            When enabled, the compiler will issue an error or a warning whenever an interface defines a method incompatible with a 
-            non-inherited Object method. Until this conflict is resolved, such an interface cannot be implemented, eg.
-          </p>
-          <code>interface I {</code><br>
-          <code>&nbsp;&nbsp;&nbsp;int clone();</code><br>
-          <code>}</code><br>
-          <br>
-        </td>
-        <td valign="top">
-          <p>
-            Warning
-          </p>
-        </td>
-      </tr>
-          </table>
-    <h3>Name shadowing and conflicts</h3>
-    <table border="1" cellspacing="0" cellpadding="5" width="100%">
-    
-      <tr>
-        <td valign="top">
-          <p>
-            Deprecated API
-          </p>
-        </td>
-        <td valign="top">
-          <p>
-            When enabled, the compiler will signal use of deprecated API either as an error or a warning.
-          </p>
-        </td>
-        <td valign="top">
-          <p>
-            Warning
-          </p>
-        </td>
-      </tr>
-      <tr>
-        <td valign="top">
-          <p>
-            Signal use of deprecated API inside deprecated code
-          </p>
-        </td>
-        <td valign="top">
-          <p>
-            When enabled, the compiler will signal use of deprecated API inside deprecated code.
-            The severity of the problem is controlled with option "Deprecated API".
-          </p>
-        </td>
-        <td valign="top">
-          <p>
-            Off
-          </p>
-        </td>
-      </tr>
-            <tr>
-        <td valign="top">
-          <p>
-            Signal overriding or implementing deprecated method
-          </p>
-        </td>
-        <td valign="top">
-          <p>
-            When enabled, the compiler will signal overriding or implementing a deprecated method
-            The severity of the problem is controlled with option "Deprecated API".
-          </p>
-        </td>
-        <td valign="top">
-          <p>
-            Off
-          </p>
-        </td>
-      </tr>
-                  <tr>
-        <td valign="top">
-          <p>
-            Forbidden reference (access rules)
-          </p>
-        </td>
-        <td valign="top">
-          <p>
-            When enabled, the compiler will signal a forbidden reference specified in the access rules.
-          </p>
-        </td>
-        <td valign="top">
-          <p>
-            Error
-          </p>
-        </td>
-      </tr>
-                  <tr>
-        <td valign="top">
-          <p>
-            Discouraged reference (access rules)
-          </p>
-        </td>
-        <td valign="top">
-          <p>
-            When enabled, the compiler will signal a discouraged reference specified in the access rules.
-          </p>
-        </td>
-        <td valign="top">
-          <p>
-            Warning
-          </p>
-        </td>
-      </tr>          
-      </table>
-   <h3>Unnecessary code</h3>
-    <table border="1" cellspacing="0" cellpadding="5" width="100%">
-                      <tr>
-        <td valign="top">
-          <p>
-            Local variable is never read
-          </p>
-        </td>
-        <td valign="top">
-          <p>
-            When enabled, the compiler will issue an error or a warning 
-            whenever a local variable is declared but never used within the its scope.
-          </p>
-        </td>
-        <td valign="top">
-          <p>
-            Warning
-          </p>
-        </td>
-      </tr>
-                            <tr>
-        <td valign="top">
-          <p>
-           Parameter is never read
-          </p>
-        </td>
-        <td valign="top">
-          <p>
-            When enabled, the compiler will issue an error or a warning 
-            whenever a parameter is declared but never used within the its scope.
-          </p>
-        </td>
-        <td valign="top">
-          <p>
-            Ignore
-          </p>
-        </td>
-      </tr>     
-                                  <tr>
-        <td valign="top">
-          <p>
-           Check overriding and implementing methods
-          </p>
-        </td>
-        <td valign="top">
-          <p>
-            When enabled, the compiler additionally will issue an error or a warning 
-            whenever a parameter is declared but never used within the its scope in overriding or implementing methods.
-          </p>
-        </td>
-        <td valign="top">
-          <p>
-            Off
-          </p>
-        </td>
-      </tr>     
-          <tr>
-        <td valign="top">
-          <p>
-            Unused imports
-          </p>
-        </td>
-        <td valign="top">
-          <p>
-            When enabled, the compiler will issue an error or a warning for unused import reference.
-          </p>
-        </td>
-        <td valign="top">
-          <p>
-            Warning
-          </p>
-        </td>
-      </tr>
-      <tr>
-        <td valign="top">
-          <p>
-            Unused local or private members
-          </p>
-        </td>
-        <td valign="top">
-          <p>
-            When enabled, the compiler will issue an error or a warning whenever a local or private member is declared but never used within the same unit.            
-          </p>
-        </td>
-        <td valign="top">
-          <p>
-            Warning
-          </p>
-        </td>
-      </tr>
-            <tr>
-        <td valign="top">
-          <p>
-            Unnecessary else statement
-          </p>
-        </td>
-        <td valign="top">
-          <p>
-            When enabled, the compiler will issue an error or a warning whenever it encounters an unnecessary else statement (eg. if (condition) return; else doSomething();).
-          </p>
-        </td>
-        <td valign="top">
-          <p>
-            Ignore
-          </p>
-        </td>
-      </tr>
-            <tr>
-        <td valign="top">
-          <p>
-            Unnecessary cast or 'instanceof' operation
-          </p>
-        </td>
-        <td valign="top">
-          <p>
-            When enabled, the compiler will issue an error or a warning whenever it encounters an unnecessary cast or 'instanceof' operation (eg. if (object instanceof Object) return;).
-          </p>
-        </td>
-        <td valign="top">
-          <p>
-            Ignore
-          </p>
-        </td>
-      </tr>
-                  <tr>
-        <td valign="top">
-          <p>
-            Unnecessary declaration of thrown checked exception
-          </p>
-        </td>
-        <td valign="top">
-          <p>
-            When enabled, the compiler will issue an error or a warning whenever it encounters an unnecessary declaration of a thrown exception.
-          </p>
-        </td>
-        <td valign="top">
-          <p>
-            Ignore
-          </p>
-        </td>
-      </tr>
-                                        <tr>
-        <td valign="top">
-          <p>
-           Check overriding and implementing methods
-          </p>
-        </td>
-        <td valign="top">
-          <p>
-            When enabled, the compiler additionally will issue an error or a warning 
-            whenever it encounters an unnecessary declaration of a thrown exception in an overriding or implementing method.
-          </p>
-        </td>
-        <td valign="top">
-          <p>
-            Off
-          </p>
-        </td>
-      </tr>     
-    </table>
-     <p><h3>J2SE 5.0 options</h3></p>
-    <table border="1" cellspacing="0" cellpadding="5" width="100%">
-                      <tr>
-        <td valign="top">
-          <p>
-           Unchecked generic type operation
-          </p>
-        </td>
-        <td valign="top">
-          <p>
-            When enabled, the compiler will issue an error or a warning whenever it encounters an unchecked generic type operation.
-          </p>
-        </td>
-        <td valign="top">
-          <p>
-            Warning
-          </p>
-        </td>
-      </tr>
-       <tr>
-        <td valign="top">
-          <p>
-           Generic type parameter declared with a final type bound
-          </p>
-        </td>
-        <td valign="top">
-          <p>
-            When enabled, the compiler will issue an error or a warning whenever it encounters a type bound involving a final type.
-          </p>
-        </td>
-        <td valign="top">
-          <p>
-            Warning
-          </p>
-        </td>
-      </tr>
-       <tr>
-        <td valign="top">
-          <p>
-           Inexact type match for vararg arguments
-          </p>
-        </td>
-        <td valign="top">
-          <p>
-            When enabled, the compiler will issue an error or a warning whenever it encounters an 
-            inexact type match for vararg arguments.
-          </p>
-        </td>
-        <td valign="top">
-          <p>
-            Warning
-          </p>
-        </td>
-      </tr>
-             <tr>
-        <td valign="top">
-          <p>
-          Boxing and unboxing conversions
-          </p>
-        </td>
-        <td valign="top">
-          <p>
-            When enabled, the compiler will issue an error or a warning whenever it encounters a boxing or
-            unboxing conversion. Autoboxing may affects performance negatively.
-          </p>
-        </td>
-        <td valign="top">
-          <p>
-            Ignore
-          </p>
-        </td>
-      </tr>
-                 <tr>
-        <td valign="top">
-          <p>
-          Missing '@Override' annotation
-          </p>
-        </td>
-        <td valign="top">
-          <p>
-            When enabled, the compiler will issue an error or a warning whenever it encounters a method overriding another
-            implemented method, and the '@Override' annotation is missing.
-          </p>
-        </td>
-        <td valign="top">
-          <p>
-            Ignore
-          </p>
-        </td>
-      </tr>
-                   <tr>
-        <td valign="top">
-          <p>
-          Missing '@Deprecated' annotation
-          </p>
-        </td>
-        <td valign="top">
-          <p>
-            When enabled, the compiler will issue an error or a warning whenever it encounters a deprecated
-            type without additional '@Deprecated' annotation.
-          </p>
-        </td>
-        <td valign="top">
-          <p>
-            Ignore
-          </p>
-        </td>
-      </tr>
-                  <tr>
-        <td valign="top">
-          <p>
-          Annotation is used as super interface
-          </p>
-        </td>
-        <td valign="top">
-          <p>
-            When enabled, the compiler will issue an error or a warning whenever it encounters a type implementing 
-            an annotation. Although possible, this is considered bad practice.
-          </p>
-        </td>
-        <td valign="top">
-          <p>
-            Warning
-          </p>
-        </td>
-      </tr>
-                        <tr>
-        <td valign="top">
-          <p>
-          Not all enum constants covered on 'switch'
-          </p>
-        </td>
-        <td valign="top">
-          <p>
-            When enabled, the compiler will issue an error or a warning whenever it encounters a switch statement which 
-            does not contain case statements for every enum constant of the referenced enum.
-          </p>
-        </td>
-        <td valign="top">
-          <p>
-            Ignore
-          </p>
-        </td>
-      </tr>
-                              <tr>
-        <td valign="top">
-          <p>
-          Unhandled warning tokens in '@SuppressWarnings'
-          </p>
-        </td>
-        <td valign="top">
-          <p>
-            When enabled, the compiler will issue an error or a warning whenever it encounters an unhandled
-            warning token in a '@SuppressWarnings' annotation.
-          </p>
-        </td>
-        <td valign="top">
-          <p>
-            Warning
-          </p>
-        </td>
-      </tr>
-                              <tr>
-        <td valign="top">
-          <p>
-          Enable '@SuppressWarnings' annotations
-          </p>
-        </td>
-        <td valign="top">
-          <p>
-            When enabled, the compiler will process '@SuppressWarnings' annotations.
-          </p>
-        </td>
-        <td valign="top">
-          <p>
-            On
-          </p>
-        </td>
-      </tr>
-    </table>
-
     <p>
       <img src="../images/ngrelc.png" alt="Related concepts" border="0" ></p>
       <p>
@@ -1289,9 +245,12 @@
       <img border="0"  src="../images/ngrelr.png" alt="Related reference"></p>
       <p>
       <a href="../reference/ref-15.htm">Classpath Variables preferences</a><br>
-	  <a href="../reference/ref-123.htm">Java Build Path properties</a>
+	  <a href="../reference/ref-123.htm">Java Build Path properties</a><br>
+	  <a href="../reference/preferences/java/compiler/ref-preferences-building.htm">Building preference page</a><br>
+	  <a href="../reference/preferences/java/compiler/ref-preferences-errors-warnings.htm">Errors/Warnings preference page</a><br>
+	  <a href="../reference/preferences/java/compiler/ref-preferences-javadoc.htm">Javadoc preference page</a><br>
+	  <a href="../reference/ref-preferences-task-tags.htm">Task Tags preference page</a>
     </p>
-    
   </body>
 </html>
 
diff --git a/bundles/org.eclipse.jdt.doc.user/reference/ref-preferences-templates.htm b/bundles/org.eclipse.jdt.doc.user/reference/ref-preferences-templates.htm
index df0b896..841caa6 100644
--- a/bundles/org.eclipse.jdt.doc.user/reference/ref-preferences-templates.htm
+++ b/bundles/org.eclipse.jdt.doc.user/reference/ref-preferences-templates.htm
@@ -48,7 +48,7 @@
           </td>
           <td valign="top">
             <p>
-              Opens a dialog to create a new template.
+              Opens the Template dialog to create a new template.
             </p>
           </td>
         </tr>
@@ -60,7 +60,7 @@
           </td>
           <td valign="top">
             <p>
-              Opens a dialog to edit the currently selected template.
+              Opens the Template dialog to edit the currently selected template.
             </p>
           </td>
         </tr>
diff --git a/bundles/org.eclipse.jdt.doc.user/topics_Reference.xml b/bundles/org.eclipse.jdt.doc.user/topics_Reference.xml
index 33f377f4..3823e00 100644
--- a/bundles/org.eclipse.jdt.doc.user/topics_Reference.xml
+++ b/bundles/org.eclipse.jdt.doc.user/topics_Reference.xml
@@ -82,21 +82,39 @@
 -->
 	<topic label="Preferences" >
 		<topic label="Java" href="reference/ref-13.htm" >
-			<topic label="Appearance" href="reference/ref-preferences-appearance.htm" />
-			<topic label="Classpath Variables" href="reference/ref-15.htm" />
+			<topic label="Appearance" href="reference/ref-preferences-appearance.htm">
+				<topic label="Member Sort Order" href="reference/preferences/java/appearance/ref-preferences-member-sort-order.htm" />
+				<topic label="Type Filters" href="reference/preferences/java/appearance/ref-preferences-type-filters.htm" />
+			</topic>
+			<topic label="Build Path" href="reference/preferences/java/ref-preferences-build-path.htm">
+				<topic label="Classpath Variables" href="reference/ref-15.htm" />
+				<topic label="User Libraries" href="reference/preferences/java/buildpath/ref-preferences-user-libraries.htm" />
+			</topic>
 			<topic label="Code Style" href="reference/ref-preferences-code-generation.htm">
 				<topic label="Code Templates" href="reference/ref-preferences-code-templates.htm" />
 				<topic label="Formatter" href="reference/ref-17.htm" />
 				<topic label="Organize Imports" href="reference/ref-22.htm" />
 			</topic>
 			<topic label="Compiler" href="reference/ref-preferences-compiler.htm">
+				<topic label="Building" href="reference/preferences/java/compiler/ref-preferences-building.htm" />
+				<topic label="Errors/Warnings" href="reference/preferences/java/compiler/ref-preferences-errors-warnings.htm" />
+				<topic label="Javadoc" href="reference/preferences/java/compiler/ref-preferences-javadoc.htm" />
 				<topic label="Task Tags" href="reference/ref-preferences-task-tags.htm" />
 			</topic>
-			<topic label="Installed JREs" href="reference/ref-19.htm" />
-			<topic label="Java Editor" href="reference/ref-21.htm" >
+			<topic label="Editor" href="reference/ref-21.htm" >
+	  			<topic label="Content Assist" href="reference/preferences/java/editor/ref-preferences-content-assist.htm">
+	  				<topic label="Advanced" href="reference/preferences/java/editor/ref-preferences-content-assist-advanced.htm" />
+	  			</topic>
+	  			<topic label="Folding" href="reference/preferences/java/editor/ref-preferences-folding.htm" />
+	  			<topic label="Hovers" href="reference/preferences/java/editor/ref-preferences-hovers.htm" />
+	  			<topic label="Mark Occurrences" href="reference/preferences/java/editor/ref-preferences-mark-occurrences.htm" />
+	  			<topic label="Syntax Coloring" href="reference/preferences/java/editor/ref-preferences-syntax-coloring.htm" />
 	  			<topic label="Templates" href="reference/ref-preferences-templates.htm" />
+	  			<topic label="Typing" href="reference/preferences/java/editor/ref-preferences-typing.htm" />
 			</topic>
+			<topic label="Installed JREs" href="reference/ref-19.htm" />
 			<topic label="JUnit" href="reference/ref-preferences-junit.htm" />
+			<topic label="Properties Files Editor" href="reference/preferences/java/ref-preferences-properties-files-editor.htm" />
 		</topic>
 		<topic label="Run/Debug" href="reference/preferences/ref-debug.htm">
 			<topic label="Console" href="reference/preferences/ref-console.htm"/>