Bug 543933 - Build javadocs with Java 11

Fix javadoc warnings catched by Java 11 tool with XDoclint:html.

Change-Id: I5e8f0e808283a72dba52a3a3be7347daf6062fb6
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
diff --git a/bundles/org.eclipse.core.filesystem/src/org/eclipse/core/filesystem/EFS.java b/bundles/org.eclipse.core.filesystem/src/org/eclipse/core/filesystem/EFS.java
index b029a2a..78d839e 100644
--- a/bundles/org.eclipse.core.filesystem/src/org/eclipse/core/filesystem/EFS.java
+++ b/bundles/org.eclipse.core.filesystem/src/org/eclipse/core/filesystem/EFS.java
@@ -272,7 +272,6 @@
 	/**
 	 * Attribute constant (value 1 &lt;&lt;5) indicating that a
 	 * file is a symbolic link.
-	 * </p>
 	 * <p>
 	 * If this attribute is <code>true</code> for a given {@link IFileInfo}
 	 * instance, a String value may be associated with the attribute
@@ -309,7 +308,6 @@
 	/**
 	 * Attribute constant (value 1 &lt;&lt;6) for a string attribute indicating the
 	 * target file name of a symbolic link.
-	 * </p>
 	 * <p>
 	 * Note that setting the link target attribute does not cause a symbolic
 	 * link to be created, or changed to link to a different file.  Rather, this
diff --git a/bundles/org.eclipse.core.filesystem/src/org/eclipse/core/filesystem/IFileInfo.java b/bundles/org.eclipse.core.filesystem/src/org/eclipse/core/filesystem/IFileInfo.java
index 1764b7c..3b262ef 100644
--- a/bundles/org.eclipse.core.filesystem/src/org/eclipse/core/filesystem/IFileInfo.java
+++ b/bundles/org.eclipse.core.filesystem/src/org/eclipse/core/filesystem/IFileInfo.java
@@ -126,7 +126,6 @@
 	 * Sets the value of the specified attribute for this file info.  The attribute
 	 * must be one of the <code>EFS#ATTRIBUTE_*</code> constants.  
 	 * Note that not all attributes are applicable in a given file system.
-	 * </p>
 	 * <p>
 	 * Users must call {@link IFileStore#putInfo(IFileInfo, int, IProgressMonitor)}
 	 * before changes made to this info take effect in an underlying file.
diff --git a/bundles/org.eclipse.core.filesystem/src/org/eclipse/core/filesystem/IFileStore.java b/bundles/org.eclipse.core.filesystem/src/org/eclipse/core/filesystem/IFileStore.java
index 99f6ed8..c9141cd 100644
--- a/bundles/org.eclipse.core.filesystem/src/org/eclipse/core/filesystem/IFileStore.java
+++ b/bundles/org.eclipse.core.filesystem/src/org/eclipse/core/filesystem/IFileStore.java
@@ -227,7 +227,6 @@
 	 *       result = result.getChild(path.segment(i));
 	 *    return result;
 	 * </pre>
-	 * </p>
 	 * <p>
 	 * This is a handle-only method; a child is provided regardless
 	 * of whether this store or the child store exists, or whether this store
@@ -267,7 +266,6 @@
 	 * this store.  This is a handle-only method; a child is provided regardless
 	 * of whether this store or the child store exists, or whether this store
 	 * represents a directory or not.
-	 * </p>
 	 * 
 	 * @param name The name of the child store to return
 	 * @return A child file store.
@@ -308,7 +306,7 @@
 	/**
 	 * Returns whether this store is a parent of the provided store.  This
 	 * is equivalent to, but typically more efficient than, the following:
-	 * <code>
+	 * <pre><code>
 	 * while (true) {
 	 * 	other = other.getParent();
 	 * 	if (other == null)
@@ -316,7 +314,7 @@
 	 * 	if (this.equals(other))
 	 * 		return true;
 	 * }
-	 * </code>
+	 * </code></pre>
 	 * <p>
 	 * This is a handle only method; this test works regardless of whether
 	 * this store or the parameter store exists.
diff --git a/bundles/org.eclipse.core.filesystem/src/org/eclipse/core/filesystem/package.html b/bundles/org.eclipse.core.filesystem/src/org/eclipse/core/filesystem/package.html
index 2f6194d..baa2050 100644
--- a/bundles/org.eclipse.core.filesystem/src/org/eclipse/core/filesystem/package.html
+++ b/bundles/org.eclipse.core.filesystem/src/org/eclipse/core/filesystem/package.html
@@ -16,6 +16,6 @@
 
 <p>
 @since org.eclipse.core.filesystem 1.0
-<p>
+</p>
 </body>
 </html>
diff --git a/bundles/org.eclipse.core.filesystem/src/org/eclipse/core/filesystem/provider/package.html b/bundles/org.eclipse.core.filesystem/src/org/eclipse/core/filesystem/provider/package.html
index 5a73394..817e5b8 100644
--- a/bundles/org.eclipse.core.filesystem/src/org/eclipse/core/filesystem/provider/package.html
+++ b/bundles/org.eclipse.core.filesystem/src/org/eclipse/core/filesystem/provider/package.html
@@ -19,6 +19,6 @@
 
 <p>
 @since org.eclipse.core.filesystem 1.0
-<p>
+</p>
 </body>
 </html>
diff --git a/bundles/org.eclipse.core.resources/src/org/eclipse/core/resources/ICommand.java b/bundles/org.eclipse.core.resources/src/org/eclipse/core/resources/ICommand.java
index 9513991..c2d1ea3 100644
--- a/bundles/org.eclipse.core.resources/src/org/eclipse/core/resources/ICommand.java
+++ b/bundles/org.eclipse.core.resources/src/org/eclipse/core/resources/ICommand.java
@@ -38,7 +38,7 @@
 	 *		value type : <code>String</code>), or <code>null</code>
 	 * @see #setArguments(Map)
 	 */
-	Map<String,String> getArguments();
+	Map<String, String> getArguments();
 
 	/**
 	 * Returns the name of the builder to run for this command, or
@@ -55,7 +55,7 @@
 	 * By default, build commands respond to all kinds of builds.
 	 * </p>
 	 *
-	 * @param kind One of the <tt>*_BUILD</code> constants defined
+	 * @param kind One of the <code>*_BUILD</code> constants defined
 	 * on <code>IncrementalProjectBuilder</code>
 	 * @return <code>true</code> if this build command responds to the specified
 	 * kind of build, and <code>false</code> otherwise.
@@ -97,7 +97,7 @@
 	 *   both be of type <code>String</code>), or <code>null</code>
 	 * @see #getArguments()
 	 */
-	void setArguments(Map<String,String> args);
+	void setArguments(Map<String, String> args);
 
 	/**
 	 * Sets the name of the builder to run for this command.
@@ -137,7 +137,7 @@
 	 * </li>
 	 * </ul>
 	 *
-	 * @param kind One of the <tt>*_BUILD</code> constants defined
+	 * @param kind One of the <code>*_BUILD</code> constants defined
 	 * 		on <code>IncrementalProjectBuilder</code>
 	 * @param value <code>true</code> if this build command responds to the
 	 * 		specified kind of build, and <code>false</code> otherwise.
diff --git a/bundles/org.eclipse.core.resources/src/org/eclipse/core/resources/IContainer.java b/bundles/org.eclipse.core.resources/src/org/eclipse/core/resources/IContainer.java
index c595a6c..ac9cb61 100644
--- a/bundles/org.eclipse.core.resources/src/org/eclipse/core/resources/IContainer.java
+++ b/bundles/org.eclipse.core.resources/src/org/eclipse/core/resources/IContainer.java
@@ -230,11 +230,11 @@
 	/**
 	 * Returns the default charset for resources in this container.
 	 * <p>
-	 * This is a convenience method, fully equivalent to:
+	 * This is a convenience method, fully equivalent to:</p>
 	 * <pre>
 	 *   getDefaultCharset(true);
 	 * </pre>
-	 * </p><p>
+	 * <p>
 	 * Note that  this method does not check whether the result is a supported
 	 * charset name. Callers should be prepared to handle
 	 * <code>UnsupportedEncodingException</code> where this charset is used.
@@ -256,7 +256,7 @@
 	 * container exists, or <code>null</code> otherwise.
 	 * </p><p>
 	 * If checkImplicit is <code>true</code>, this method uses the following
-	 * algorithm to determine the charset to be returned:
+	 * algorithm to determine the charset to be returned:</p>
 	 * <ol>
 	 * <li>the one explicitly set by calling #setDefaultCharset
 	 * (with a non-null argument) on this container, if any, and this container
@@ -265,7 +265,7 @@
 	 * workspace root), or</li>
 	 * <li>the charset returned by ResourcesPlugin#getEncoding.</li>
 	 * </ol>
-	 *  </p><p>
+	 *  <p>
 	 * Note that  this method does not check whether the result is a supported
 	 * charset name. Callers should be prepared to handle
 	 * <code>UnsupportedEncodingException</code> where this charset is used.
@@ -352,11 +352,11 @@
 	 * in this resource, in no particular order.
 	 * <p>
 	 * This is a convenience method, fully equivalent to:
+	 * </p>
 	 * <pre>
 	 *   members(includePhantoms ? INCLUDE_PHANTOMS : IResource.NONE);
 	 * </pre>
 	 * Team-private member resources are <b>not</b> included in the result.
-	 * </p>
 	 *
 	 * @param includePhantoms <code>true</code> if phantom resources are
 	 *   of interest; <code>false</code> if phantom resources are not of
@@ -472,7 +472,8 @@
 	 * @deprecated Replaced by {@link #setDefaultCharset(String, IProgressMonitor)} which
 	 * 	is a workspace operation and reports changes in resource deltas.
 	 */
-	@Deprecated void setDefaultCharset(String charset) throws CoreException;
+	@Deprecated
+	void setDefaultCharset(String charset) throws CoreException;
 
 	/**
 	 * Sets the default charset for this container. Passing a value of <code>null</code>
@@ -555,6 +556,7 @@
 	 * @exception CoreException if this resource's filters could not be retrieved. Reasons include:
 	 * <ul>
 	 * <li> This resource is not a folder.</li>
+	 * </ul>
 	 *
 	 * @see #createFilter(int, FileInfoMatcherDescription, int, IProgressMonitor)
 	 * @see IResourceFilterDescription#delete(int, IProgressMonitor)
diff --git a/bundles/org.eclipse.core.resources/src/org/eclipse/core/resources/IFile.java b/bundles/org.eclipse.core.resources/src/org/eclipse/core/resources/IFile.java
index fd2dc17..6ac799a 100644
--- a/bundles/org.eclipse.core.resources/src/org/eclipse/core/resources/IFile.java
+++ b/bundles/org.eclipse.core.resources/src/org/eclipse/core/resources/IFile.java
@@ -49,7 +49,8 @@
 	 * @see IFile#getEncoding()
 	 * @deprecated see getEncoding for details
 	 */
-	@Deprecated int ENCODING_UNKNOWN = 0;
+	@Deprecated
+	int ENCODING_UNKNOWN = 0;
 	/**
 	 * Character encoding constant (value 1) which identifies
 	 * files that are encoded with the US-ASCII character encoding scheme.
@@ -57,7 +58,8 @@
 	 * @see IFile#getEncoding()
 	 * @deprecated see getEncoding for details
 	 */
-	@Deprecated int ENCODING_US_ASCII = 1;
+	@Deprecated
+	int ENCODING_US_ASCII = 1;
 	/**
 	 * Character encoding constant (value 2) which identifies
 	 * files that are encoded with the ISO-8859-1 character encoding scheme,
@@ -66,7 +68,8 @@
 	 * @see IFile#getEncoding()
 	 * @deprecated see getEncoding for details
 	 */
-	@Deprecated int ENCODING_ISO_8859_1 = 2;
+	@Deprecated
+	int ENCODING_ISO_8859_1 = 2;
 	/**
 	 * Character encoding constant (value 3) which identifies
 	 * files that are encoded with the UTF-8 character encoding scheme.
@@ -74,7 +77,8 @@
 	 * @see IFile#getEncoding()
 	 * @deprecated see getEncoding for details
 	 */
-	@Deprecated int ENCODING_UTF_8 = 3;
+	@Deprecated
+	int ENCODING_UTF_8 = 3;
 	/**
 	 * Character encoding constant (value 4) which identifies
 	 * files that are encoded with the UTF-16BE character encoding scheme.
@@ -82,7 +86,8 @@
 	 * @see IFile#getEncoding()
 	 * @deprecated see getEncoding for details
 	 */
-	@Deprecated int ENCODING_UTF_16BE = 4;
+	@Deprecated
+	int ENCODING_UTF_16BE = 4;
 	/**
 	 * Character encoding constant (value 5) which identifies
 	 * files that are encoded with the UTF-16LE character encoding scheme.
@@ -90,7 +95,8 @@
 	 * @see IFile#getEncoding()
 	 * @deprecated see getEncoding for details
 	 */
-	@Deprecated int ENCODING_UTF_16LE = 5;
+	@Deprecated
+	int ENCODING_UTF_16LE = 5;
 	/**
 	 * Character encoding constant (value 6) which identifies
 	 * files that are encoded with the UTF-16 character encoding scheme.
@@ -98,16 +104,17 @@
 	 * @see IFile#getEncoding()
 	 * @deprecated see getEncoding for details
 	 */
-	@Deprecated int ENCODING_UTF_16 = 6;
+	@Deprecated
+	int ENCODING_UTF_16 = 6;
 
 	/**
 	 * Appends the entire contents of the given stream to this file.
 	 * <p>
 	 * This is a convenience method, fully equivalent to:
+	 * </p>
 	 * <pre>
 	 *   appendContents(source, (keepHistory ? KEEP_HISTORY : IResource.NONE) | (force ? FORCE : IResource.NONE), monitor);
 	 * </pre>
-	 * </p>
 	 * <p>
 	 * This method changes resources; these changes will be reported
 	 * in a subsequent resource change event, including an indication
@@ -221,10 +228,10 @@
 	 * Creates a new file resource as a member of this handle's parent resource.
 	 * <p>
 	 * This is a convenience method, fully equivalent to:
+	 * </p>
 	 * <pre>
 	 *   create(source, (force ? FORCE : IResource.NONE), monitor);
 	 * </pre>
-	 * </p>
 	 * <p>
 	 * This method changes resources; these changes will be reported
 	 * in a subsequent resource change event, including an indication
@@ -511,10 +518,10 @@
 	 * Deletes this file from the workspace.
 	 * <p>
 	 * This is a convenience method, fully equivalent to:
+	 * </p>
 	 * <pre>
 	 *   delete((keepHistory ? KEEP_HISTORY : IResource.NONE) | (force ? FORCE : IResource.NONE), monitor);
 	 * </pre>
-	 * </p>
 	 * <p>
 	 * This method changes resources; these changes will be reported
 	 * in a subsequent resource change event, including an indication
@@ -551,11 +558,11 @@
 	 * file into characters.
 	 * <p>
 	 * This refinement of the corresponding {@link IEncodedStorage} method
-	 * is a convenience method, fully equivalent to:
+	 * is a convenience method, fully equivalent to:</p>
 	 * <pre>
 	 *   getCharset(true);
 	 * </pre>
-	 * </p><p>
+	 * <p>
 	 * <b>Note 1</b>:  this method does not check whether the result is a supported
 	 * charset name. Callers should be prepared to handle
 	 * <code>UnsupportedEncodingException</code> where this charset is used.
@@ -579,7 +586,8 @@
 	 * @see IContainer#getDefaultCharset()
 	 * @since 3.0
 	 */
-	@Override String getCharset() throws CoreException;
+	@Override
+	String getCharset() throws CoreException;
 
 	/**
 	 * Returns the name of a charset to be used when decoding the contents of this
@@ -590,7 +598,7 @@
 	 * exists, or <code>null</code> otherwise.
 	 * </p><p>
 	 * If checkImplicit is <code>true</code>, this method uses the following
-	 * algorithm to determine the charset to be returned:
+	 * algorithm to determine the charset to be returned:</p>
 	 * <ol>
 	 * <li>the charset defined by calling #setCharset, if any, and this file
 	 * exists, or</li>
@@ -599,7 +607,7 @@
 	 * <li>the default encoding for this file's parent (as defined by
 	 * <code>IContainer#getDefaultCharset</code>).</li>
 	 * </ol>
-	 * </p><p>
+	 * <p>
 	 * <b>Note 1</b>:  this method does not check whether the result is a supported
 	 * charset name. Callers should be prepared to handle
 	 * <code>UnsupportedEncodingException</code> where this charset is used.
@@ -628,7 +636,7 @@
 	 * Returns the name of a charset to be used to encode the given contents
 	 * when saving to this file. This file does not have to exist. The character stream is <em>not</em> automatically closed.
 	 * <p>
-	 * This method uses the following algorithm to determine the charset to be returned:
+	 * This method uses the following algorithm to determine the charset to be returned:</p>
 	 * <ol>
 	 * <li>if this file exists, the charset returned by IFile#getCharset(false), if one is defined, or</li>
 	 * <li>the charset automatically discovered based on the file name and the given contents,
@@ -636,7 +644,7 @@
 	 * <li>the default encoding for the parent resource (as defined by
 	 * <code>IContainer#getDefaultCharset</code>).</li>
 	 * </ol>
-	 * </p><p>
+	 * <p>
 	 * <b>Note</b>:  this method does not check whether the result is a supported
 	 * charset name. Callers should be prepared to handle
 	 * <code>UnsupportedEncodingException</code> where this charset is used.
@@ -693,10 +701,10 @@
 	 * <p>
 	 * This refinement of the corresponding {@link IStorage} method
 	 * is a convenience method returning an open input stream.  It's equivalent to:
+	 * </p>
 	 * <pre>
 	 *   getContents(RefreshManager#PREF_LIGHTWEIGHT_AUTO_REFRESH);
 	 * </pre>
-	 * </p>
 	 * <p>
 	 * If lightweight auto-refresh is not enabled this method will throw a CoreException
 	 * when opening out-of-sync resources.
@@ -719,7 +727,8 @@
 	 *       {@link ResourcesPlugin#PREF_LIGHTWEIGHT_AUTO_REFRESH} is disabled).</li>
 	 * </ul>
 	 */
-	@Override InputStream getContents() throws CoreException;
+	@Override
+	InputStream getContents() throws CoreException;
 
 	/**
 	 * This refinement of the corresponding <code>IStorage</code> method
@@ -772,7 +781,8 @@
 	 * </ul>
 	 * @deprecated use {@link #getCharset} instead
 	 */
-	@Deprecated int getEncoding() throws CoreException;
+	@Deprecated
+	int getEncoding() throws CoreException;
 
 	/**
 	 * Returns the full path of this file.
@@ -784,7 +794,8 @@
 	 * @see IResource#getFullPath()
 	 * @see IStorage#getFullPath()
 	 */
-	@Override IPath getFullPath();
+	@Override
+	IPath getFullPath();
 
 	/**
 	 * Returns a list of past states of this file known to this workspace.
@@ -813,7 +824,8 @@
 	 * @see IResource#getName()
 	 * @see IStorage#getName()
 	 */
-	@Override String getName();
+	@Override
+	String getName();
 
 	/**
 	 * Returns whether this file is read-only.
@@ -824,16 +836,17 @@
 	 * @see IStorage#isReadOnly()
 	 */
 	@SuppressWarnings("deprecation")
-	@Override boolean isReadOnly();
+	@Override
+	boolean isReadOnly();
 
 	/**
 	 * Moves this resource to be at the given location.
 	 * <p>
 	 * This is a convenience method, fully equivalent to:
+	 * </p>
 	 * <pre>
 	 *   move(destination, (keepHistory ? KEEP_HISTORY : IResource.NONE) | (force ? FORCE : IResource.NONE), monitor);
 	 * </pre>
-	 * </p>
 	 * <p>
 	 * This method changes resources; these changes will be reported
 	 * in a subsequent resource change event, including an indication
@@ -891,7 +904,8 @@
 	 * @deprecated Replaced by {@link #setCharset(String, IProgressMonitor)} which
 	 * 	is a workspace operation and reports changes in resource deltas.
 	 */
-	@Deprecated void setCharset(String newCharset) throws CoreException;
+	@Deprecated
+	void setCharset(String newCharset) throws CoreException;
 
 	/**
 	 * Sets the charset for this file. Passing a value of <code>null</code>
@@ -928,10 +942,10 @@
 	 * Sets the contents of this file to the bytes in the given input stream.
 	 * <p>
 	 * This is a convenience method, fully equivalent to:
+	 * </p>
 	 * <pre>
 	 *   setContents(source, (keepHistory ? KEEP_HISTORY : IResource.NONE) | (force ? FORCE : IResource.NONE), monitor);
 	 * </pre>
-	 * </p>
 	 * <p>
 	 * This method changes resources; these changes will be reported
 	 * in a subsequent resource change event, including an indication
@@ -970,10 +984,10 @@
 	 * Sets the contents of this file to the bytes in the given file state.
 	 * <p>
 	 * This is a convenience method, fully equivalent to:
+	 * </p>
 	 * <pre>
 	 *   setContents(source, (keepHistory ? KEEP_HISTORY : IResource.NONE) | (force ? FORCE : IResource.NONE), monitor);
 	 * </pre>
-	 * </p>
 	 * <p>
 	 * This method changes resources; these changes will be reported
 	 * in a subsequent resource change event, including an indication
diff --git a/bundles/org.eclipse.core.resources/src/org/eclipse/core/resources/IFilterMatcherDescriptor.java b/bundles/org.eclipse.core.resources/src/org/eclipse/core/resources/IFilterMatcherDescriptor.java
index 7936cb8..9328f4a 100644
--- a/bundles/org.eclipse.core.resources/src/org/eclipse/core/resources/IFilterMatcherDescriptor.java
+++ b/bundles/org.eclipse.core.resources/src/org/eclipse/core/resources/IFilterMatcherDescriptor.java
@@ -56,7 +56,7 @@
 
 	/**
 	 * Returns the argument type expected by this filter. The result will be one of the
-	 * <tt>ARGUMENT_TYPE_*</tt> constants declared on this class.
+	 * <code>ARGUMENT_TYPE_*</code> constants declared on this class.
 	 * @return The argument type of this filter extension
 	 */
 	String getArgumentType();
diff --git a/bundles/org.eclipse.core.resources/src/org/eclipse/core/resources/IFolder.java b/bundles/org.eclipse.core.resources/src/org/eclipse/core/resources/IFolder.java
index 4e0975b..e5ea414 100644
--- a/bundles/org.eclipse.core.resources/src/org/eclipse/core/resources/IFolder.java
+++ b/bundles/org.eclipse.core.resources/src/org/eclipse/core/resources/IFolder.java
@@ -40,10 +40,10 @@
 	 * Creates a new folder resource as a member of this handle's parent resource.
 	 * <p>
 	 * This is a convenience method, fully equivalent to:
+	 * </p>
 	 * <pre>
 	 *   create((force ? FORCE : IResource.NONE), local, monitor);
 	 * </pre>
-	 * </p>
 	 * <p>
 	 * This method changes resources; these changes will be reported
 	 * in a subsequent resource change event, including an indication
@@ -344,10 +344,10 @@
 	 * Deletes this resource from the workspace.
 	 * <p>
 	 * This is a convenience method, fully equivalent to:
+	 * </p>
 	 * <pre>
 	 *   delete((keepHistory ? KEEP_HISTORY : IResource.NONE) | (force ? FORCE : IResource.NONE), monitor);
 	 * </pre>
-	 * </p>
 	 * <p>
 	 * This method changes resources; these changes will be reported
 	 * in a subsequent resource change event, including an indication
@@ -416,10 +416,10 @@
 	 * Moves this resource so that it is located at the given path.
 	 * <p>
 	 * This is a convenience method, fully equivalent to:
+	 * </p>
 	 * <pre>
 	 *   move(destination, (keepHistory ? KEEP_HISTORY : IResource.NONE) | (force ? FORCE : IResource.NONE), monitor);
 	 * </pre>
-	 * </p>
 	 * <p>
 	 * This method changes resources; these changes will be reported
 	 * in a subsequent resource change event, including an indication
diff --git a/bundles/org.eclipse.core.resources/src/org/eclipse/core/resources/IPathVariableManager.java b/bundles/org.eclipse.core.resources/src/org/eclipse/core/resources/IPathVariableManager.java
index 69fe97f..27591d2 100644
--- a/bundles/org.eclipse.core.resources/src/org/eclipse/core/resources/IPathVariableManager.java
+++ b/bundles/org.eclipse.core.resources/src/org/eclipse/core/resources/IPathVariableManager.java
@@ -76,7 +76,6 @@
 	 * Sets the path variable with the given name to be the specified value.
 	 * Depending on the value given and if the variable is currently defined
 	 * or not, there are several possible outcomes for this operation:
-	 * <p>
 	 * <ul>
 	 * <li>A new variable will be created, if there is no variable defined with
 	 * the given name, and the given value is not <code>null</code>.
@@ -106,13 +105,13 @@
 	 * </ul>
 	 * @deprecated use {@link #setURIValue(String, URI)} instead.
 	 */
-	@Deprecated void setValue(String name, IPath value) throws CoreException;
+	@Deprecated
+	void setValue(String name, IPath value) throws CoreException;
 
 	/**
 	 * Sets the path variable with the given name to be the specified value.
 	 * Depending on the value given and if the variable is currently defined
 	 * or not, there are several possible outcomes for this operation:
-	 * <p>
 	 * <ul>
 	 * <li>A new variable will be created, if there is no variable defined with
 	 * the given name, and the given value is not <code>null</code>.
@@ -153,7 +152,8 @@
 	 *    variable defined with the given name
 	 * @deprecated use {@link #getURIValue(String)} instead.
 	 */
-	@Deprecated IPath getValue(String name);
+	@Deprecated
+	IPath getValue(String name);
 
 	/**
 	 * Returns the value of the path variable with the given name. If there is
@@ -245,13 +245,14 @@
 	 * <p>TEMP/foo  => c:/temp/foo</p>
 	 * <p>BACKUP  => /tmp/backup</p>
 	 * <p>BACKUP/bar.txt  => /tmp/backup/bar.txt</p>
-	 * <p>SOMEPATH/foo => SOMEPATH/foo</p></p>
+	 * <p>SOMEPATH/foo => SOMEPATH/foo</p>
 	 *
 	 * @param path the path to be resolved
 	 * @return the resolved path or <code>null</code>
 	 * @deprecated use {@link #resolveURI(URI)} instead.
 	 */
-	@Deprecated IPath resolvePath(IPath path);
+	@Deprecated
+	IPath resolvePath(IPath path);
 
 	/**
 	 * Returns <code>true</code> if the given variable is defined and
diff --git a/bundles/org.eclipse.core.resources/src/org/eclipse/core/resources/IProject.java b/bundles/org.eclipse.core.resources/src/org/eclipse/core/resources/IProject.java
index 04ca7b8..eddfbca 100644
--- a/bundles/org.eclipse.core.resources/src/org/eclipse/core/resources/IProject.java
+++ b/bundles/org.eclipse.core.resources/src/org/eclipse/core/resources/IProject.java
@@ -282,13 +282,14 @@
 	 * <p>
 	 * If the project content area does not contain a project description file,
 	 * an initial project description file is written in the project content area
-	 * with the following information:
+	 * with the following information:</p>
 	 * <ul>
 	 * <li>no references to other projects</li>
 	 * <li>no natures</li>
 	 * <li>an empty build spec</li>
 	 * <li>an empty comment</li>
 	 * </ul>
+	 * <p>
 	 * If there is an existing project description file, it is not overwritten.
 	 * </p>
 	 * <p>
@@ -386,13 +387,13 @@
 	 * No action is taken if this project does not exist.
 	 * <p>
 	 * This is a convenience method, fully equivalent to:
+	 * </p>
 	 * <pre>
 	 *   delete(
 	 *     (deleteContent ? IResource.ALWAYS_DELETE_PROJECT_CONTENT : IResource.NEVER_DELETE_PROJECT_CONTENT )
 	 *        | (force ? FORCE : IResource.NONE),
 	 *     monitor);
 	 * </pre>
-	 * </p>
 	 * <p>
 	 * This method is long-running; progress and cancellation are provided
 	 * by the given progress monitor.
@@ -702,8 +703,8 @@
 	/**
 	 * Returns true if the project nature specified by the given
 	 * nature extension id is enabled for this project, and false otherwise.
-	 * <p>
-	 * <ul>Reasons for a nature not to be enabled include:
+	 * <p>Reasons for a nature not to be enabled include:</p>
+	 * <ul>
 	 * <li> The nature is not available in the install.</li>
 	 * <li> The nature has not been added to this project.</li>
 	 * <li> The nature has a prerequisite that is not enabled
@@ -713,7 +714,6 @@
 	 * 	to that set.</li>
 	 * <li> The prerequisites for the nature form a cycle.</li>
 	 * </ul>
-	 * </p>
 	 * @param natureId the nature extension identifier
 	 * @return <code>true</code> if the given nature is enabled for this project
 	 * @exception CoreException if this method fails. Reasons include:
@@ -768,10 +768,10 @@
 	 * the given description.
 	 * <p>
 	 * This is a convenience method, fully equivalent to:
+	 * </p>
 	 * <pre>
 	 *   move(description, (force ? FORCE : IResource.NONE), monitor);
 	 * </pre>
-	 * </p>
 	 * <p>
 	 * This method changes resources; these changes will be reported
 	 * in a subsequent resource change event that will include
@@ -818,20 +818,21 @@
 	 * <p>
 	 * When a project is opened for the first time, initial information about the
 	 * project's existing resources can be obtained in the following ways:
+	 * </p>
 	 * <ul>
 	 * <li>If a {@link #loadSnapshot(int, URI, IProgressMonitor)} call has been made
 	 * before the open, resources are restored from that file (a file written by
 	 * {@link #saveSnapshot(int, URI, IProgressMonitor)}). When the snapshot includes
 	 * resource tree information and can be loaded without error, no refresh is initiated,
-	 * so the project's resource tree will match what the snapshot provides.
+	 * so the project's resource tree will match what the snapshot provides.</li>
 	 * <li>Otherwise, when the {@link IResource#BACKGROUND_REFRESH} flag is specified,
 	 * resources on disk will be added to the project in the background after
 	 * this method returns. Child resources of the project may not be available
-	 * until this background refresh completes.
+	 * until this background refresh completes.</li>
 	 * <li>Otherwise, resource information is obtained with a refresh operation in the
-	 * foreground, before this method returns.
+	 * foreground, before this method returns.</li>
 	 * </ul>
-	 * </p>
+	 * <p>
 	 * This method changes resources; these changes will be reported
 	 * in a subsequent resource change event that includes
 	 * an indication that the project has been opened and its resources
@@ -917,10 +918,10 @@
 	 * description. This project should exist and be open.
 	 * <p>
 	 * This is a convenience method, fully equivalent to:
+	 * </p>
 	 * <pre>
 	 *   setDescription(description, KEEP_HISTORY, monitor);
 	 * </pre>
-	 * </p>
 	 * <p>
 	 * This method requires the {@link IWorkspaceRoot} scheduling rule.
 	 * </p>
diff --git a/bundles/org.eclipse.core.resources/src/org/eclipse/core/resources/IResource.java b/bundles/org.eclipse.core.resources/src/org/eclipse/core/resources/IResource.java
index 864b9b4..6e56049 100644
--- a/bundles/org.eclipse.core.resources/src/org/eclipse/core/resources/IResource.java
+++ b/bundles/org.eclipse.core.resources/src/org/eclipse/core/resources/IResource.java
@@ -311,13 +311,14 @@
 	 * supply a bit mask with no bits set.
 	 * <p>
 	 * Example usage:
-	 * <code>
-	 * <pre>
-	 *    delete(IResource.NONE, null)
-	 * </pre>
-	 * </code>
 	 * </p>
 	 *
+	 * <pre>
+	 * <code>
+	 *    delete(IResource.NONE, null)
+	 * </code>
+	 * </pre>
+	 *
 	 * @since 2.0
 	 */
 	int NONE = 0;
@@ -511,10 +512,10 @@
 	 * </p>
 	 * <p>
 	 * This is a convenience method, fully equivalent to:
+	 * </p>
 	 * <pre>
 	 *   accept(visitor, depth, includePhantoms ? IContainer.INCLUDE_PHANTOMS : IResource.NONE);
 	 * </pre>
-	 * </p>
 	 *
 	 * @param visitor the visitor
 	 * @param depth the depth to which members of this resource should be
@@ -637,10 +638,10 @@
 	 * Makes a copy of this resource at the given path.
 	 * <p>
 	 * This is a convenience method, fully equivalent to:
+	 * </p>
 	 * <pre>
 	 *   copy(destination, (force ? FORCE : IResource.NONE), monitor);
 	 * </pre>
-	 * </p>
 	 * <p>
 	 * This operation changes resources; these changes will be reported
 	 * in a subsequent resource change event that will include
@@ -696,10 +697,10 @@
 	 * <p>
 	 * Calling this method with a one segment absolute destination path is
 	 * equivalent to calling:
+	 * </p>
 	 * <pre>
 	 *   copy(workspace.newProjectDescription(folder.getName()),updateFlags,monitor);
 	 * </pre>
-	 * </p>
 	 * <p> When a resource is copied, its persistent properties are copied with it.
 	 * Session properties and markers are not copied.
 	 * </p>
@@ -813,10 +814,10 @@
 	 * Makes a copy of this project using the given project description.
 	 * <p>
 	 * This is a convenience method, fully equivalent to:
+	 * </p>
 	 * <pre>
 	 *   copy(description, (force ? FORCE : IResource.NONE), monitor);
 	 * </pre>
-	 * </p>
 	 * <p>
 	 * This operation changes resources; these changes will be reported
 	 * in a subsequent resource change event that will include
@@ -964,10 +965,10 @@
 	 * Deletes this resource from the workspace.
 	 * <p>
 	 * This is a convenience method, fully equivalent to:
+	 * </p>
 	 * <pre>
 	 *   delete(force ? FORCE : IResource.NONE, monitor);
 	 * </pre>
-	 * </p>
 	 * <p>
 	 * This method changes resources; these changes will be reported
 	 * in a subsequent resource change event.
@@ -1418,6 +1419,7 @@
 	 * </p>
 	 * <p>
 	 * The following things affect a resource's modification stamp:
+	 * </p>
 	 * <ul>
 	 * <li>creating a non-project resource (changes from {@link #NULL_STAMP})</li>
 	 * <li>changing the contents of a file</li>
@@ -1441,7 +1443,6 @@
 	 * <li>saving the workspace</li>
 	 * <li>shutting down and re-opening a workspace</li>
 	 * </ul>
-	 * </p>
 	 *
 	 * @return the modification stamp, or {@link #NULL_STAMP} if this resource either does
 	 *    not exist or exists as a closed project
@@ -1626,28 +1627,29 @@
 	 * Gets this resource's extended attributes from the file system,
 	 * or <code>null</code> if the attributes could not be obtained.
 	 * <p>
-	 * Reasons for a <code>null</code> return value include:
+	 * Reasons for a <code>null</code> return value include:</p>
 	 * <ul>
 	 * <li> This resource does not exist.</li>
 	 * <li> This resource is not local.</li>
 	 * <li> This resource is a project that is not open.</li>
 	 * </ul>
-	 * </p><p>
+	 * <p>
 	 * Attributes that are not supported by the underlying file system
 	 * will have a value of <code>false</code>.
 	 * </p><p>
-	 * Sample usage: <br>
-	 * <br>
+	 * Sample usage:
+	 * </p>
+	 * <pre>
 	 * <code>
-	 *  IResource resource; <br>
-	 *  ... <br>
-	 *  ResourceAttributes attributes = resource.getResourceAttributes(); <br>
+	 *  IResource resource;
+	 *  ...
+	 *  ResourceAttributes attributes = resource.getResourceAttributes();
 	 *  if (attributes != null) {
-	 *     attributes.setExecutable(true); <br>
-	 *     resource.setResourceAttributes(attributes); <br>
+	 *     attributes.setExecutable(true);
+	 *     resource.setResourceAttributes(attributes);
 	 *  }
 	 * </code>
-	 * </p>
+	 * </pre>
 	 *
 	 * @return the extended attributes from the file system, or
 	 * <code>null</code> if they could not be obtained
@@ -1695,14 +1697,12 @@
 	/**
 	 * Returns the type of this resource.
 	 * The returned value will be one of {@link #FILE}, {@link #FOLDER}, {@link #PROJECT}, {@link #ROOT}.
-	 * <p>
 	 * <ul>
 	 * <li> All resources of type {@link #FILE} implement {@link IFile}.</li>
 	 * <li> All resources of type {@link #FOLDER} implement {@link IFolder}.</li>
 	 * <li> All resources of type {@link #PROJECT} implement {@link IProject}.</li>
 	 * <li> All resources of type {@link #ROOT} implement {@link IWorkspaceRoot}.</li>
 	 * </ul>
-	 * </p>
 	 * <p>
 	 * This is a resource handle operation; the resource need not exist in the workspace.
 	 * </p>
@@ -1936,7 +1936,7 @@
 	 * are considered to be in sync with the local file system.
 	 * <p>
 	 * A resource is considered to be in sync if all of the following
-	 * conditions are true:
+	 * conditions are true:</p>
 	 * <ul>
 	 * <li>The resource exists in both the workspace and the file system.</li>
 	 * <li>The timestamp in the file system has not changed since the
@@ -1944,6 +1944,7 @@
 	 * <li>The resource in the workspace is of the same type as the corresponding
 	 * file in the file system (they are either both files or both folders).</li>
 	 * </ul>
+	 * <p>
 	 *  A resource is also considered to be in sync if it is missing from both
 	 * the workspace and the file system.  In all other cases the resource is
 	 * considered to be out of sync.
@@ -2004,10 +2005,10 @@
 	 * Moves this resource so that it is located at the given path.
 	 * <p>
 	 * This is a convenience method, fully equivalent to:
+	 * </p>
 	 * <pre>
 	 *   move(destination, force ? FORCE : IResource.NONE, monitor);
 	 * </pre>
-	 * </p>
 	 * <p>
 	 * This method changes resources; these changes will be reported
 	 * in a subsequent resource change event that will include
@@ -2069,12 +2070,12 @@
 	 * <p>
 	 * Calling this method with a one segment absolute destination path is
 	 * equivalent to calling:
+	 * </p>
 	 * <pre>
 	 IProjectDescription description = getDescription();
 	 description.setName(path.lastSegment());
 	 move(description, updateFlags, monitor);
 	 * </pre>
-	 * </p>
 	 * <p> When a resource moves, its session and persistent properties move with
 	 * it. Likewise for all other attributes of the resource including markers.
 	 * </p>
@@ -2187,10 +2188,10 @@
 	 * description.
 	 * <p>
 	 * This is a convenience method, fully equivalent to:
+	 * </p>
 	 * <pre>
 	 *   move(description, (keepHistory ? KEEP_HISTORY : IResource.NONE) | (force ? FORCE : IResource.NONE), monitor);
 	 * </pre>
-	 * </p>
 	 * <p>
 	 * This operation changes resources; these changes will be reported
 	 * in a subsequent resource change event that will include
@@ -2652,7 +2653,7 @@
 	 *
 	 * @param readOnly <code>true</code> to set it to read-only,
 	 *		<code>false</code> to unset
-	 * @deprecated use <tt>IResource#setResourceAttributes(ResourceAttributes)</tt>
+	 * @deprecated use <code>IResource#setResourceAttributes(ResourceAttributes)</code>
 	 */
 	@Deprecated
 	void setReadOnly(boolean readOnly);
diff --git a/bundles/org.eclipse.core.resources/src/org/eclipse/core/resources/IResourceDelta.java b/bundles/org.eclipse.core.resources/src/org/eclipse/core/resources/IResourceDelta.java
index 278b985..bb7989f 100644
--- a/bundles/org.eclipse.core.resources/src/org/eclipse/core/resources/IResourceDelta.java
+++ b/bundles/org.eclipse.core.resources/src/org/eclipse/core/resources/IResourceDelta.java
@@ -229,10 +229,11 @@
 	 * resource delta. If the visitor returns <code>true</code>,
 	 * the resource delta's children are also visited.
 	 * <p>
-	 * This is a convenience method, fully equivalent to:
+	 * This is a convenience method, fully equivalent to:</p>
 	 * <pre>
 	 *   accept(visitor, includePhantoms ? INCLUDE_PHANTOMS : IResource.NONE);
 	 * </pre>
+	 * <p>
 	 * Although the visitor will be invoked for this resource delta, it will not be
 	 * invoked for any team-private member resources.
 	 * </p>
@@ -312,10 +313,11 @@
 	 * which were added, removed, or changed. Returns an empty
 	 * array if there are no affected children.
 	 * <p>
-	 * This is a convenience method, fully equivalent to:
+	 * This is a convenience method, fully equivalent to:</p>
 	 * <pre>
 	 *   getAffectedChildren(ADDED | REMOVED | CHANGED, IResource.NONE);
 	 * </pre>
+	 * <p>
 	 * Team-private member resources are <b>not</b> included in the result; neither are
 	 * phantom resources.
 	 * </p>
@@ -334,10 +336,11 @@
 	 * by the bitwise or of <code>IResourceDelta</code> kind constants.
 	 * Returns an empty array if there are no affected children.
 	 * <p>
-	 * This is a convenience method, fully equivalent to:
+	 * This is a convenience method, fully equivalent to:</p>
 	 * <pre>
 	 *   getAffectedChildren(kindMask, IResource.NONE);
 	 * </pre>
+	 * <p>
 	 * Team-private member resources are <b>not</b> included in the result.
 	 * </p>
 	 *
@@ -444,7 +447,7 @@
 	 * <li><code>COPIED_FROM</code> - Change constant (bit mask) indicating that the resource was copied from another location.
 	 * The location in the "before" state can be retrieved using <code>getMovedFromPath()</code>.</li>
 	 * </ul>
-	 *
+	 * <p>
 	 * A simple move operation would result in the following delta information.
 	 * If a resource is moved from A to B (with no other changes to A or B),
 	 * then A will have kind <code>REMOVED</code>, with flag <code>MOVED_TO</code>,
diff --git a/bundles/org.eclipse.core.resources/src/org/eclipse/core/resources/ISaveParticipant.java b/bundles/org.eclipse.core.resources/src/org/eclipse/core/resources/ISaveParticipant.java
index 75418a9..95fc653 100644
--- a/bundles/org.eclipse.core.resources/src/org/eclipse/core/resources/ISaveParticipant.java
+++ b/bundles/org.eclipse.core.resources/src/org/eclipse/core/resources/ISaveParticipant.java
@@ -89,7 +89,7 @@
 	 * snapshots and project saves: the participant must absolutely guarantee that any
 	 * important user data it has gathered will not be irrecoverably lost
 	 * in the event of a crash. The only difference is in the space-time
-	 * tradeoffs that the participant should make.
+	 * tradeoffs that the participant should make.</p>
 	 * <ul>
 	 * <li>Full saves: the participant is
 	 * encouraged to save additional non-essential information that will aid
@@ -116,11 +116,10 @@
 	 * that information is non-essential; in the unlikely event of a crash,
 	 * the image should be rebuilt either from scratch or from the last saved
 	 * state.
-	 * </p>
 	 * <p>
 	 * The following snippet shows how a plug-in participant would write
 	 * its important state to a file whose name is based on the save
-	 * number for this save operation.
+	 * number for this save operation.</p>
 	 * <pre>
 	 *     Plugin plugin = ...; // known
 	 *     int saveNumber = context.getSaveNumber();
@@ -131,6 +130,7 @@
 	 *     context.needSaveNumber();
 	 *     context.needDelta(); // optional
 	 * </pre>
+	 * <p>
 	 * When the plug-in is reactivated in a subsequent workspace session,
 	 * it needs to re-register to participate in workspace saves. When it
 	 * does so, it is handed back key information about what state it had last
@@ -139,6 +139,7 @@
 	 * information is still available.
 	 * The following snippet shows what a participant plug-in would
 	 * need to do if and when it is reactivated:
+	 * </p>
 	 * <pre>
 	 *     IWorkspace ws = ...; // known
 	 *     Plugin plugin = ...; // known
@@ -165,7 +166,6 @@
 	 *         ss.processResourceChangeEvents(listener);
 	 *     }
 	 * </pre>
-	 * </p>
 	 *
 	 * @param context the save context object
 	 * @exception CoreException if this method fails
diff --git a/bundles/org.eclipse.core.resources/src/org/eclipse/core/resources/ISavedState.java b/bundles/org.eclipse.core.resources/src/org/eclipse/core/resources/ISavedState.java
index 3fdec39..175df52 100644
--- a/bundles/org.eclipse.core.resources/src/org/eclipse/core/resources/ISavedState.java
+++ b/bundles/org.eclipse.core.resources/src/org/eclipse/core/resources/ISavedState.java
@@ -62,9 +62,9 @@
 	 * method is run, the delta is forgotten. Subsequent calls to this method
 	 * will have no effect.
 	 * <p>
-	 * No notification is received in the following cases:
+	 * No notification is received in the following cases:</p>
 	 * <ul>
-	 * <li>if a saved state was never recorded ({@link ISaveContext#needDelta()}</code>
+	 * <li>if a saved state was never recorded ({@link ISaveContext#needDelta()}
 	 * 		was not called) </li>
 	 * <li>a saved state has since been forgotten (using {@link IWorkspace#forgetSavedTree(String)}) </li>
 	 * <li>a saved state has been deemed too old or has become invalid</li>
diff --git a/bundles/org.eclipse.core.resources/src/org/eclipse/core/resources/IWorkspace.java b/bundles/org.eclipse.core.resources/src/org/eclipse/core/resources/IWorkspace.java
index e0af83a..41b6c02 100644
--- a/bundles/org.eclipse.core.resources/src/org/eclipse/core/resources/IWorkspace.java
+++ b/bundles/org.eclipse.core.resources/src/org/eclipse/core/resources/IWorkspace.java
@@ -103,12 +103,12 @@
 	 * no effect if an identical listener is already registered.
 	 * <p>
 	 * This method is equivalent to:
+	 * </p>
 	 *
 	 * <pre>
 	 * addResourceChangeListener(listener, IResourceChangeEvent.PRE_CLOSE | IResourceChangeEvent.PRE_DELETE | IResourceChangeEvent.POST_CHANGE);
 	 * </pre>
 	 *
-	 * </p>
 	 *
 	 * @param listener the listener
 	 * @see IResourceChangeListener
@@ -442,12 +442,12 @@
 	 * the corresponding originals.
 	 * <p>
 	 * This is a convenience method, fully equivalent to:
+	 * </p>
 	 *
 	 * <pre>
 	 * copy(resources, destination, (force ? IResource.FORCE : IResource.NONE), monitor);
 	 * </pre>
 	 *
-	 * </p>
 	 * <p>
 	 * This method changes resources; these changes will be reported in a
 	 * subsequent resource change event that will include an indication that the
@@ -484,6 +484,7 @@
 	 * This method can be expressed as a series of calls to
 	 * <code>IResource.copy(IPath,int,IProgressMonitor)</code>, with "best
 	 * effort" semantics:
+	 * </p>
 	 * <ul>
 	 * <li>Resources are copied in the order specified, using the given update
 	 * flags.</li>
@@ -497,7 +498,6 @@
 	 * <li>This method also fails if one or more of the individual resource
 	 * copy steps fails.</li>
 	 * </ul>
-	 * </p>
 	 * <p>
 	 * After successful completion, corresponding new resources will now exist
 	 * as members of the resource at the given path.
@@ -560,12 +560,12 @@
 	 * Deletes the given resources.
 	 * <p>
 	 * This is a convenience method, fully equivalent to:
+	 * </p>
 	 *
 	 * <pre>
 	 * delete(resources, IResource.KEEP_HISTORY | (force ? IResource.FORCE : IResource.NONE), monitor);
 	 * </pre>
 	 *
-	 * </p>
 	 * <p>
 	 * This method changes resources; these changes will be reported in a
 	 * subsequent resource change event.
@@ -600,6 +600,7 @@
 	 * </p>
 	 * <p>
 	 * The semantics of multiple deletion are:
+	 * </p>
 	 * <ul>
 	 * <li>Resources are deleted in the order presented, using the given update
 	 * flags.</li>
@@ -612,7 +613,6 @@
 	 * deletions fails; that is, if at least one of the resources in the list
 	 * still exists at the end of this method.</li>
 	 * </ul>
-	 * </p>
 	 * <p>
 	 * This method changes resources; these changes will be reported in a
 	 * subsequent resource change event.
@@ -805,7 +805,7 @@
 	 * <li>The project description file does not exist.</li>
 	 * <li>The file cannot be opened or read.</li>
 	 * <li>The file cannot be parsed as a legal project description.</li>
-	 * </li>
+	 * </ul>
 	 * @see #newProjectDescription(String)
 	 * @see IProject#getDescription()
 	 * @since 2.0
@@ -829,7 +829,7 @@
 	 * <ul>
 	 * <li>The stream could not be read.</li>
 	 * <li>The stream does not contain a legal project description.</li>
-	 * </li>
+	 * </ul>
 	 * @see #newProjectDescription(String)
 	 * @see IProject#getDescription()
 	 * @see IWorkspace#loadProjectDescription(IPath)
@@ -843,12 +843,12 @@
 	 * same.
 	 * <p>
 	 * This is a convenience method, fully equivalent to:
+	 * </p>
 	 *
 	 * <pre>
 	 * move(resources, destination, IResource.KEEP_HISTORY | (force ? IResource.FORCE : IResource.NONE), monitor);
 	 * </pre>
 	 *
-	 * </p>
 	 * <p>
 	 * This method changes resources; these changes will be reported in a
 	 * subsequent resource change event that will include an indication that the
@@ -887,6 +887,7 @@
 	 * <p>
 	 * This method can be expressed as a series of calls to
 	 * <code>IResource.move</code>, with "best effort" semantics:
+	 * </p>
 	 * <ul>
 	 * <li>Resources are moved in the order specified.</li>
 	 * <li>Duplicate resources are only moved once.</li>
@@ -903,7 +904,6 @@
 	 * <li>History is kept for moved files. When projects are moved, no history
 	 * is kept</li>
 	 * </ul>
-	 * </p>
 	 * <p>
 	 * After successful completion, the resources and descendents will no longer
 	 * exist; but corresponding new resources will now exist as members of the
@@ -998,13 +998,13 @@
 	 * projects.
 	 * <p>
 	 * The project description is initialized to:
+	 * </p>
 	 * <ul>
 	 * <li>the given project name</li>
 	 * <li>no references to other projects</li>
 	 * <li>an empty build spec</li>
 	 * <li>an empty comment</li>
 	 * </ul>
-	 * </p>
 	 * <p>
 	 * The returned value is writeable.
 	 * </p>
@@ -1126,12 +1126,12 @@
 	 * Runs the given action as an atomic workspace operation.
 	 * <p>
 	 * This is a convenience method, fully equivalent to:
+	 * </p>
 	 *
 	 * <pre>
 	 * workspace.run(action, workspace.getRoot(), IWorkspace.AVOID_UPDATE, monitor);
 	 * </pre>
 	 *
-	 * </p>
 	 *
 	 * @param action the action to perform
 	 * @param monitor a progress monitor, or <code>null</code> if progress
@@ -1202,7 +1202,7 @@
 	 * themselves and their persistent properties, are written to disk
 	 * immediately; other data are kept in volatile memory and only written to
 	 * disk periodically; and other data are maintained in memory and never
-	 * written out. The following table summarizes what gets saved when:
+	 * written out. The following table summarizes what gets saved when:</p>
 	 * <ul>
 	 * <li>creating or deleting resource - immediately</li>
 	 * <li>setting contents of file - immediately</li>
@@ -1214,6 +1214,7 @@
 	 * <li>shape of the workspace resource tree -<code>save</code></li>
 	 * <li>list of active plug-ins - never</li>
 	 * </ul>
+	 * <p>
 	 * Resource-based plug-in also have data with varying degrees of importance.
 	 * Each plug-in gets to decide the policy for protecting its data, either
 	 * immediately, never, or at <code>save</code> time. For the latter, the
@@ -1311,17 +1312,18 @@
 	 * </li>
 	 * <li>The workspace save operation returns.</li>
 	 * </ul>
-	 * <li>If it failed:
-	 * <ul>
+	 * <li>If it failed:</li>
+	 * <li><ul>
 	 * <li>The workspace previous state is restored.</li>
 	 * <li>In prerequisite-before-dependent order, each registered workspace
 	 * save participant is sent <code>rollback(context)</code>, passing in
 	 * its own context object.
-	 * <ul>
+	 * </li>
+	 * <li><ul>
 	 * <li>Plug-in may perform clean up by deleting newly-created but obsolete
 	 * state file in its plug-in state area.</li>
 	 * <li>Plug-in resumes its normal activities.</li>
-	 * </ul>
+	 * </ul></li><li>
 	 * If <code>rollback</code> fails (throws an exception), the problem is
 	 * logged and the participant is marked as unstable. (The state number in
 	 * the save table is rolled back anyway.)</li>
@@ -1329,7 +1331,6 @@
 	 * </ul>
 	 * </li>
 	 * </ul>
-	 * </p>
 	 * <p>
 	 * After a full save, the platform can be shutdown. This will cause the
 	 * Resources plug-in and all the other plug-ins to shutdown, without
@@ -1411,7 +1412,6 @@
 	 * "core" (i.e., head-less) clients can use it. Similarly, it is located
 	 * outside the VCM component for the convenience of clients that must also
 	 * operate in configurations without VCM.)
-	 * </p>
 	 * <p>
 	 * A client (such as an editor) should perform a <code>validateEdit</code>
 	 * on a file whenever it finds itself in the following position: (a) the
@@ -1530,16 +1530,15 @@
 	 * </ul>
 	 * <p>
 	 * This method also checks that the given resource can legally become a
-	 * linked resource. This includes the following restrictions:
+	 * linked resource. This includes the following restrictions:</p>
 	 * <ul>
 	 * <li>must have a project as its immediate parent</li>
 	 * <li>project natures and the team hook may disallow linked resources on
 	 * projects they are associated with</li>
 	 * <li>the global workspace preference to disable linking,
 	 * <code>ResourcesPlugin.PREF_DISABLE_LINKING</code> must not be set to
-	 * &quot;true&quot;</li>.
+	 * &quot;true&quot;</li>
 	 * </ul>
-	 * </p>
 	 * <p>
 	 * This method will return a status with severity <code>IStatus.ERROR</code>
 	 * if the location does not obey the above rules. Also, this method will
@@ -1581,9 +1580,8 @@
 	 * projects they are associated with</li>
 	 * <li>the global workspace preference to disable linking,
 	 * <code>ResourcesPlugin.PREF_DISABLE_LINKING</code> must not be set to
-	 * &quot;true&quot;</li>.
+	 * &quot;true&quot;</li>
 	 * </ul>
-	 * </p>
 	 * <p>
 	 * This method will return a status with severity <code>IStatus.ERROR</code>
 	 * if the location does not obey the above rules. Also, this method will
@@ -1642,6 +1640,7 @@
 	 * constraints are satisfied within the given set.
 	 * <p>
 	 * The following conditions apply to validation of a set of natures:
+	 * </p>
 	 * <ul>
 	 * <li>all natures in the set exist in the plug-in registry
 	 * <li>all prerequisites of each nature are present in the set
@@ -1650,7 +1649,6 @@
 	 * inclusion in the same group.
 	 * <li>there are no two natures in the set with the same id
 	 * </ul>
-	 * </p>
 	 * <p>
 	 * An empty nature set is always valid.
 	 * </p>
@@ -1669,6 +1667,7 @@
 	 * In addition to the restrictions for paths in general (see
 	 * <code>IPath.isValidPath</code>), a resource path should also obey the
 	 * following rules:
+	 * </p>
 	 * <ul>
 	 * <li>a resource path should be an absolute path with no device id
 	 * <li>its segments should be valid names according to
@@ -1680,7 +1679,6 @@
 	 * <li>the second through penultimate segments should be valid folder names
 	 * <li>the last segment should be a valid name of the given type
 	 * </ul>
-	 * </p>
 	 * <p>
 	 * Note: this method does not consider whether a resource at the specified
 	 * path exists.
@@ -1720,7 +1718,6 @@
 	 * <li>must not be the same as or a child of the location of any existing
 	 * linked resource in the given project</li>
 	 * </ul>
-	 * </p>
 	 * <p>
 	 * Note: this method does not consider whether files or directories exist in
 	 * the file system at the specified path.
@@ -1751,7 +1748,6 @@
 	 * <li>must not be the same as or a child of the location of any existing
 	 * linked resource in the given project</li>
 	 * </ul>
-	 * </p>
 	 * <p>
 	 * Note: this method does not consider whether files or directories exist in
 	 * the file system at the specified path.
diff --git a/bundles/org.eclipse.core.resources/src/org/eclipse/core/resources/IWorkspaceRoot.java b/bundles/org.eclipse.core.resources/src/org/eclipse/core/resources/IWorkspaceRoot.java
index a7dc559..971896b 100644
--- a/bundles/org.eclipse.core.resources/src/org/eclipse/core/resources/IWorkspaceRoot.java
+++ b/bundles/org.eclipse.core.resources/src/org/eclipse/core/resources/IWorkspaceRoot.java
@@ -43,13 +43,13 @@
 	 * itself.
 	 * <p>
 	 * This is a convenience method, fully equivalent to:
+	 * </p>
 	 * <pre>
 	 *   delete(
 	 *     (deleteContent ? IResource.ALWAYS_DELETE_PROJECT_CONTENT : IResource.NEVER_DELETE_PROJECT_CONTENT )
 	 *        | (force ? FORCE : IResource.NONE),
 	 *     monitor);
 	 * </pre>
-	 * </p>
 	 * <p>
 	 * This method changes resources; these changes will be reported
 	 * in a subsequent resource change event.
@@ -115,7 +115,8 @@
 	 * @since 2.1
 	 * @deprecated use {@link #findContainersForLocationURI(URI)} instead
 	 */
-	@Deprecated IContainer[] findContainersForLocation(IPath location);
+	@Deprecated
+	IContainer[] findContainersForLocation(IPath location);
 
 	/**
 	 * Returns the handles to all the resources (workspace root, project,
@@ -216,7 +217,8 @@
 	 * @since 2.1
 	 * @deprecated use {@link #findFilesForLocationURI(URI)} instead
 	 */
-	@Deprecated IFile[] findFilesForLocation(IPath location);
+	@Deprecated
+	IFile[] findFilesForLocation(IPath location);
 
 	/**
 	 * Returns the handles of all files that are mapped to the given URI.
@@ -386,7 +388,7 @@
 	/**
 	 * Returns the collection of projects which exist under this root.
 	 * The projects can be open or closed.
-	 * </p><p>
+	 * <p>
 	 * If the {@link #INCLUDE_HIDDEN} flag is specified in the member flags, hidden
 	 * projects will be included along with the others. If the {@link #INCLUDE_HIDDEN} flag
 	 * is not specified (recommended), the result will omit any hidden projects.
diff --git a/bundles/org.eclipse.core.resources/src/org/eclipse/core/resources/IncrementalProjectBuilder.java b/bundles/org.eclipse.core.resources/src/org/eclipse/core/resources/IncrementalProjectBuilder.java
index 62ffa3e..a7710c5 100644
--- a/bundles/org.eclipse.core.resources/src/org/eclipse/core/resources/IncrementalProjectBuilder.java
+++ b/bundles/org.eclipse.core.resources/src/org/eclipse/core/resources/IncrementalProjectBuilder.java
@@ -155,7 +155,6 @@
 	 * were created by previous invocations of the builder. The platform will
 	 * take care of discarding the builder's last built state (there is no need
 	 * to call <code>forgetLastBuiltState</code>).
-	 * </p>
 	 * <p>
 	 * This method is called as a result of invocations of
 	 * <code>IWorkspace.build</code> or <code>IProject.build</code> where
@@ -363,9 +362,10 @@
 	 * Subclasses are free to extend this method to pick up initialization
 	 * parameters from the plug-in plug-in manifest (<code>plugin.xml</code>)
 	 * file, but should be sure to invoke this method on their superclass.
-	 * <p>
+	 * </p><p>
 	 * For example, the following method looks for a boolean-valued parameter
 	 * named "trace":
+	 * </p>
 	 *
 	 * <pre>
 	 * public void setInitializationData(IConfigurationElement cfig, String propertyName, Object data) throws CoreException {
@@ -377,7 +377,6 @@
 	 * 	}
 	 * }
 	 * </pre>
-	 * </p>
 	 * @throws CoreException if fails.
 	 */
 	@Override
@@ -411,6 +410,7 @@
 	 * rule to be modified.
 	 * <p>
 	 * <strong>Notes:</strong>
+	 * </p>
 	 * <ul>
 	 * <li>
 	 * The rule may be <i>relaxed</i> and in some cases let the builder be scheduled in
@@ -429,7 +429,6 @@
 	 * concurrently with the build.
 	 * </li>
 	 * </ul>
-	 * </p>
 	 * <p>
 	 * Subclasses may override this method.
 	 * </p>
diff --git a/bundles/org.eclipse.core.resources/src/org/eclipse/core/resources/filtermatchers/package.html b/bundles/org.eclipse.core.resources/src/org/eclipse/core/resources/filtermatchers/package.html
index 7f43f8e..82c70d9 100644
--- a/bundles/org.eclipse.core.resources/src/org/eclipse/core/resources/filtermatchers/package.html
+++ b/bundles/org.eclipse.core.resources/src/org/eclipse/core/resources/filtermatchers/package.html
@@ -15,7 +15,7 @@
 to be implemented and used by plug-ins using the <tt>filterMatchers</tt> extension point.
 <p>
 @since 3.6
-<p>
+</p>
 
 </body>
 </html>
diff --git a/bundles/org.eclipse.core.resources/src/org/eclipse/core/resources/mapping/package.html b/bundles/org.eclipse.core.resources/src/org/eclipse/core/resources/mapping/package.html
index c321461..2f7f2a9 100644
--- a/bundles/org.eclipse.core.resources/src/org/eclipse/core/resources/mapping/package.html
+++ b/bundles/org.eclipse.core.resources/src/org/eclipse/core/resources/mapping/package.html
@@ -21,7 +21,7 @@
 and its subclasses.
 <p>
 @since 3.2
-<p>
+</p>
 
 </body>
 </html>
diff --git a/bundles/org.eclipse.core.resources/src/org/eclipse/core/resources/refresh/package.html b/bundles/org.eclipse.core.resources/src/org/eclipse/core/resources/refresh/package.html
index 4d3a2fe..9c961d6 100644
--- a/bundles/org.eclipse.core.resources/src/org/eclipse/core/resources/refresh/package.html
+++ b/bundles/org.eclipse.core.resources/src/org/eclipse/core/resources/refresh/package.html
@@ -17,7 +17,7 @@
 have occurred externally in the file system.
 <p>
 @since 3.0
-<p>
+</p>
 
 </body>
 </html>
diff --git a/bundles/org.eclipse.core.resources/src/org/eclipse/core/resources/variableresolvers/package.html b/bundles/org.eclipse.core.resources/src/org/eclipse/core/resources/variableresolvers/package.html
index 6a477ad..e47f5b7 100644
--- a/bundles/org.eclipse.core.resources/src/org/eclipse/core/resources/variableresolvers/package.html
+++ b/bundles/org.eclipse.core.resources/src/org/eclipse/core/resources/variableresolvers/package.html
@@ -15,7 +15,7 @@
 to be implemented and used by plug-ins using the <tt>variableResolvers</tt> extension point.
 <p>
 @since 3.6
-<p>
+</p>
 
 </body>
 </html>