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 817e5b8..ef5517c 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
@@ -14,8 +14,8 @@
 This API is used by plug-ins that are installing file system implementations
 that interact with some specific backing store.  These implementations are
 accessed by clients using the generic file system API in the 
-<tt>org.eclipse.core.filesystem</tt> package.  File system implementations
-are installed using the <tt>filesystems</tt> extension point.
+<code>org.eclipse.core.filesystem</code> package.  File system implementations
+are installed using the <code>filesystems</code> extension point.
 
 <p>
 @since org.eclipse.core.filesystem 1.0
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 82c70d9..b89fee5 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
@@ -12,7 +12,7 @@
 <h2>Package Specification</h2>
 <p>
 This package specifies the APIs in the Resources plug-in that are intended 
-to be implemented and used by plug-ins using the <tt>filterMatchers</tt> extension point.
+to be implemented and used by plug-ins using the <code>filterMatchers</code> extension point.
 <p>
 @since 3.6
 </p>
diff --git a/bundles/org.eclipse.core.resources/src/org/eclipse/core/resources/mapping/RemoteResourceMappingContext.java b/bundles/org.eclipse.core.resources/src/org/eclipse/core/resources/mapping/RemoteResourceMappingContext.java
index 9f227e3..86c6cf4 100644
--- a/bundles/org.eclipse.core.resources/src/org/eclipse/core/resources/mapping/RemoteResourceMappingContext.java
+++ b/bundles/org.eclipse.core.resources/src/org/eclipse/core/resources/mapping/RemoteResourceMappingContext.java
@@ -83,7 +83,6 @@
 	 * the base members cannot be computed, in which case clients should call
 	 * {@link #fetchMembers(IContainer, IProgressMonitor)} which returns the
 	 * combined members for the base and remote.
-	 * </p>
 	 * <p>
 	 * This method may be long running as a server may need to be contacted to
 	 * obtain the members of the base resource.
@@ -175,7 +174,6 @@
 	 * the remote members cannot be computed, in which case clients should call
 	 * {@link #fetchMembers(IContainer, IProgressMonitor)} which returns the
 	 * combined members for the base and remote.
-	 * </p>
 	 * <p>
 	 * This method may be long running as a server may need to be contacted to
 	 * obtain the members of the remote resource.
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 2f7f2a9..4132c77 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
@@ -13,11 +13,11 @@
 <p>
 This package specifies the APIs in the Resources plug-in that are used to integrate
 application models with the workspace.  This API introduces the notion of a 
-<tt>ResourceMapping</tt> that defines the relationship between an application
-model object and a set of underlying resources, and a <tt>ResourceTraversal</tt>
+<code>ResourceMapping</code> that defines the relationship between an application
+model object and a set of underlying resources, and a <code>ResourceTraversal</code>
 that describes the exact resources corresponding to a given application model object.
 The relationship between an application model and underlying resources can vary
-depending a <i>context</i>.  This notion is captured by <tt>ResourceMappingContext</tt>
+depending a <i>context</i>.  This notion is captured by <code>ResourceMappingContext</code>
 and its subclasses.
 <p>
 @since 3.2
diff --git a/bundles/org.eclipse.core.resources/src/org/eclipse/core/resources/package.html b/bundles/org.eclipse.core.resources/src/org/eclipse/core/resources/package.html
index 6fe0b74..94d0f77 100644
--- a/bundles/org.eclipse.core.resources/src/org/eclipse/core/resources/package.html
+++ b/bundles/org.eclipse.core.resources/src/org/eclipse/core/resources/package.html
@@ -12,7 +12,7 @@
 <h2>
 Package Specification</h2>
 This package specifies the principal API for the Resources plug-in.&nbsp;
-The resources plug-in defines the notions of <tt>Workspaces</tt> and <tt>Resources</tt>.&nbsp;
+The resources plug-in defines the notions of <code>Workspaces</code> and <code>Resources</code>.&nbsp;
 The workspace's resource model is very similar to a file system.&nbsp;
 All resources are backed by a real file or directory in some backing file
 system.&nbsp; They are stored in their native form (i.e., no extra bytes
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 9c961d6..ce272fd 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
@@ -12,7 +12,7 @@
 <h2>Package Specification</h2>
 <p>
 This package specifies the APIs in the Resources plug-in that are intended 
-to be implemented and used by plug-ins using the <tt>refreshProviders</tt> extension point.
+to be implemented and used by plug-ins using the <code>refreshProviders</code> extension point.
 This extension point is used by plug-ins to notify the workspace of changes that
 have occurred externally in the file system.
 <p>
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 e47f5b7..a4ca848 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
@@ -12,7 +12,7 @@
 <h2>Package Specification</h2>
 <p>
 This package specifies the APIs in the Resources plug-in that are intended 
-to be implemented and used by plug-ins using the <tt>variableResolvers</tt> extension point.
+to be implemented and used by plug-ins using the <code>variableResolvers</code> extension point.
 <p>
 @since 3.6
 </p>