You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juneau.apache.org by ja...@apache.org on 2022/10/16 20:40:19 UTC

[juneau] branch master updated: Remove {@del taglet

This is an automated email from the ASF dual-hosted git repository.

jamesbognar pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/juneau.git


The following commit(s) were added to refs/heads/master by this push:
     new ff96b1422 Remove {@del taglet
ff96b1422 is described below

commit ff96b1422766ccd36e9ab5c308ab4764d32298fa
Author: JamesBognar <ja...@salesforce.com>
AuthorDate: Sun Oct 16 16:39:54 2022 -0400

    Remove {@del taglet
---
 juneau-doc/docs/ReleaseNotes/5.0.0.00.html         |   10 +-
 juneau-doc/docs/ReleaseNotes/5.0.0.02.html         |    2 +-
 juneau-doc/docs/ReleaseNotes/5.0.0.03.html         |    4 +-
 juneau-doc/docs/ReleaseNotes/5.0.0.04.html         |    6 +-
 juneau-doc/docs/ReleaseNotes/5.0.0.05.html         |    4 +-
 juneau-doc/docs/ReleaseNotes/5.0.0.07.html         |   36 +-
 juneau-doc/docs/ReleaseNotes/5.0.0.09.html         |   16 +-
 juneau-doc/docs/ReleaseNotes/5.0.0.10.html         |    8 +-
 juneau-doc/docs/ReleaseNotes/5.0.0.11.html         |    4 +-
 juneau-doc/docs/ReleaseNotes/5.0.0.12.html         |    4 +-
 juneau-doc/docs/ReleaseNotes/5.0.0.13.html         |    6 +-
 juneau-doc/docs/ReleaseNotes/5.0.0.14.html         |   12 +-
 juneau-doc/docs/ReleaseNotes/5.0.0.15.html         |    6 +-
 juneau-doc/docs/ReleaseNotes/5.0.0.16.html         |    2 +-
 juneau-doc/docs/ReleaseNotes/5.0.0.18.html         |    2 +-
 juneau-doc/docs/ReleaseNotes/5.0.0.19.html         |    8 +-
 juneau-doc/docs/ReleaseNotes/5.0.0.20.html         |   16 +-
 juneau-doc/docs/ReleaseNotes/5.0.0.21.html         |    6 +-
 juneau-doc/docs/ReleaseNotes/5.0.0.23.html         |    2 +-
 juneau-doc/docs/ReleaseNotes/5.0.0.24.html         |    8 +-
 juneau-doc/docs/ReleaseNotes/5.0.0.26.html         |    8 +-
 juneau-doc/docs/ReleaseNotes/5.0.0.27.html         |    4 +-
 juneau-doc/docs/ReleaseNotes/5.0.0.29.html         |    6 +-
 juneau-doc/docs/ReleaseNotes/5.0.0.30.html         |    2 +-
 juneau-doc/docs/ReleaseNotes/5.0.0.31.html         |    2 +-
 juneau-doc/docs/ReleaseNotes/5.0.0.32.html         |    4 +-
 juneau-doc/docs/ReleaseNotes/5.0.0.33.html         |   12 +-
 juneau-doc/docs/ReleaseNotes/5.0.0.34.html         |   38 +-
 juneau-doc/docs/ReleaseNotes/5.0.0.35.html         |    2 +-
 juneau-doc/docs/ReleaseNotes/5.0.0.36.html         |    4 +-
 juneau-doc/docs/ReleaseNotes/5.1.0.00.html         |   12 +-
 juneau-doc/docs/ReleaseNotes/5.1.0.01.html         |    2 +-
 juneau-doc/docs/ReleaseNotes/5.1.0.03.html         |   24 +-
 juneau-doc/docs/ReleaseNotes/5.1.0.04.html         |    4 +-
 juneau-doc/docs/ReleaseNotes/5.1.0.05.html         |   12 +-
 juneau-doc/docs/ReleaseNotes/5.1.0.06.html         |   10 +-
 juneau-doc/docs/ReleaseNotes/5.1.0.07.html         |   10 +-
 juneau-doc/docs/ReleaseNotes/5.1.0.08.html         |    4 +-
 juneau-doc/docs/ReleaseNotes/5.1.0.09.html         |    4 +-
 juneau-doc/docs/ReleaseNotes/5.1.0.10.html         |   24 +-
 juneau-doc/docs/ReleaseNotes/5.1.0.11.html         |   28 +-
 juneau-doc/docs/ReleaseNotes/5.1.0.12.html         |    4 +-
 juneau-doc/docs/ReleaseNotes/5.1.0.13.html         |   14 +-
 juneau-doc/docs/ReleaseNotes/5.1.0.14.html         |   14 +-
 juneau-doc/docs/ReleaseNotes/5.1.0.15.html         |   28 +-
 juneau-doc/docs/ReleaseNotes/5.1.0.16.html         |   22 +-
 juneau-doc/docs/ReleaseNotes/5.1.0.17.html         |   78 +-
 juneau-doc/docs/ReleaseNotes/5.1.0.18.html         |   12 +-
 juneau-doc/docs/ReleaseNotes/5.1.0.19.html         |   12 +-
 juneau-doc/docs/ReleaseNotes/5.1.0.20.html         |   48 +-
 juneau-doc/docs/ReleaseNotes/5.2.0.0.html          |  424 +--
 juneau-doc/docs/ReleaseNotes/5.2.0.1.html          |   42 +-
 juneau-doc/docs/ReleaseNotes/6.0.0.html            |  108 +-
 juneau-doc/docs/ReleaseNotes/6.0.1.html            |    8 +-
 juneau-doc/docs/ReleaseNotes/6.1.0.html            |  116 +-
 juneau-doc/docs/ReleaseNotes/6.2.0.html            |  188 +-
 juneau-doc/docs/ReleaseNotes/6.3.0.html            |  314 +-
 juneau-doc/docs/ReleaseNotes/6.3.1.html            |   72 +-
 juneau-doc/docs/ReleaseNotes/6.4.0.html            |  120 +-
 juneau-doc/docs/ReleaseNotes/7.0.0.html            |    8 +-
 juneau-doc/docs/ReleaseNotes/7.0.1.html            |   14 +-
 juneau-doc/docs/ReleaseNotes/7.1.0.html            |  236 +-
 juneau-doc/docs/ReleaseNotes/7.2.0.html            |  328 +--
 juneau-doc/docs/ReleaseNotes/7.2.1.html            |    6 +-
 juneau-doc/docs/ReleaseNotes/8.0.0.html            |   10 +-
 juneau-doc/docs/ReleaseNotes/8.1.0.html            |  102 +-
 juneau-doc/docs/ReleaseNotes/8.1.1.html            |   30 +-
 juneau-doc/docs/ReleaseNotes/8.1.2.html            |   28 +-
 juneau-doc/docs/ReleaseNotes/8.1.3.html            |   22 +-
 juneau-doc/docs/ReleaseNotes/8.2.0.html            |  200 +-
 .../26.jm.XmlDetails/07.jm.XmlNamespaces.html      |    2 +-
 .../01.jmr.RdfDetails/06.jmr.RootProperty.html     |    2 +-
 .../01.jmr.RdfDetails/07.jmr.TypedLiterals.html    |    2 +-
 .../08.juneau-rest-server/12.jrs.SvlVariables.html |    2 +-
 .../12.juneau-microservice-core/05.jmc.Config.html |    2 +-
 .../01.msm.Installing.html                         |    2 +-
 .../org/apache/juneau/doc/internal/DelTag.java     |   99 -
 juneau-doc/src/main/javadoc/overview.html          | 3026 ++++++++++----------
 pom.xml                                            |    3 -
 79 files changed, 3015 insertions(+), 3111 deletions(-)

diff --git a/juneau-doc/docs/ReleaseNotes/5.0.0.00.html b/juneau-doc/docs/ReleaseNotes/5.0.0.00.html
index d364f33f7..8a96410e6 100644
--- a/juneau-doc/docs/ReleaseNotes/5.0.0.00.html
+++ b/juneau-doc/docs/ReleaseNotes/5.0.0.00.html
@@ -39,11 +39,11 @@
 		</li>
 		<li>
 			Simplified Filter API for handling non-standard POJOs.<br>
-			The API for handling non-standard POJOs has been simplified by introducing the concept of a {@del Transform} class, which is associated with the <c>BeanContext</c> class (and thus the Serializer and Parser classes too) through the <c>BeanContext.addTransforms(Class[])</c> method.<br>
-			Two new subclasses of {@del Transform}:
+			The API for handling non-standard POJOs has been simplified by introducing the concept of a <del>Transform</del> class, which is associated with the <c>BeanContext</c> class (and thus the Serializer and Parser classes too) through the <c>BeanContext.addTransforms(Class[])</c> method.<br>
+			Two new subclasses of <del>Transform</del>:
 			<ul>
-				<li>{@del oaj.transform.BeanFilter} - Filter POJO beans.</li>
-				<li>{@del oaj.transform.PojoSwap} - Filter POJOs that aren't beans.</li>
+				<li><del>BeanFilter</del> - Filter POJO beans.</li>
+				<li><del>PojoSwap</del> - Filter POJOs that aren't beans.</li>
 			</ul>
 			This new API replaces the previous separate <c>Cast</c> and <c>BeanFilter</c> APIs which were considerably more complicated and puts them under a common API. 
 		</li>
@@ -85,7 +85,7 @@
 			JSON-schema support.
 		</li>
 		<li>
-			New {@del oaj.utils.PojoIntrospector} class.
+			New <del>PojoIntrospector</del> class.
 		</li>
 		<li>
 			Significant REST servlet API improvements.
diff --git a/juneau-doc/docs/ReleaseNotes/5.0.0.02.html b/juneau-doc/docs/ReleaseNotes/5.0.0.02.html
index 12e6ca1d2..0d7f38b83 100644
--- a/juneau-doc/docs/ReleaseNotes/5.0.0.02.html
+++ b/juneau-doc/docs/ReleaseNotes/5.0.0.02.html
@@ -40,7 +40,7 @@
 		</li>
 		<li> 
 			Support for parsing into beans with read-only properties.<br>
-			New {@del @BeanConstructor} annotation allows you to specify bean property values to be passed in through a constructor.
+			New <del>@BeanConstructor</del> annotation allows you to specify bean property values to be passed in through a constructor.
 		</li>
 		<li> 
 			Separated the rest library into separate independent client and server libraries.<br>
diff --git a/juneau-doc/docs/ReleaseNotes/5.0.0.03.html b/juneau-doc/docs/ReleaseNotes/5.0.0.03.html
index 369dbf2ac..d20d5be60 100644
--- a/juneau-doc/docs/ReleaseNotes/5.0.0.03.html
+++ b/juneau-doc/docs/ReleaseNotes/5.0.0.03.html
@@ -22,13 +22,13 @@
 	<ul class='spaced-list'>
 		<li>
 			Support for parsing into read-only beans (i.e. beans with only getters, property values set through constructor args).<br>
-			To support this, the {@del @BeanConstructor} annotation has been added.
+			To support this, the <del>@BeanConstructor</del> annotation has been added.
 		</li>
 		<li>
 			Merged separate settings classes back into their base classes (simplifies the API).
 		</li>
 		<li>
-			{@del oaj.serializer.SerializerGroup SerializerGroups} and {@del oaj.parser.ParserGroup ParserGroups} now share {@link oaj.BeanContext BeanContexts} to reduce memory consumption of class type metadata.	
+			<del>SerializerGroup SerializerGroups</del> and <del>ParserGroup ParserGroups</del> now share {@link oaj.BeanContext BeanContexts} to reduce memory consumption of class type metadata.	
 		</li>	
 	</ul>
 </div>
\ No newline at end of file
diff --git a/juneau-doc/docs/ReleaseNotes/5.0.0.04.html b/juneau-doc/docs/ReleaseNotes/5.0.0.04.html
index e53cae247..cef72aff0 100644
--- a/juneau-doc/docs/ReleaseNotes/5.0.0.04.html
+++ b/juneau-doc/docs/ReleaseNotes/5.0.0.04.html
@@ -21,12 +21,12 @@
 	</p>
 	<ul class='spaced-list'>
 		<li>
-			New {@del oajr.annotation.RestMethod @RestMethod} annotation on {@del oajr.RestServlet} methods.<br>
+			New <del>RestMethod @RestMethod</del> annotation on <del>RestServlet</del> methods.<br>
 			Allows the usage of URL pattern matching and automatic conversion of URL variables to arguments passed to method handlers.<br>
-			See {@del oajr.RestServlet} for more information.
+			See <del>RestServlet</del> for more information.
 		</li>
 		<li>
-			Enhancements to {@del BeanContext#convertToType(Object,Class)} to be able to convert <c>Strings</c> to classes with 
+			Enhancements to <del>BeanContext.convertToType(Object,Class)</del>to be able to convert <c>Strings</c> to classes with 
 			<c>fromString(String)</c>/<c>valueOf(String)</c> static methods or <c>T(String)</c> constructors.
 		</li>	
 	</ul>
diff --git a/juneau-doc/docs/ReleaseNotes/5.0.0.05.html b/juneau-doc/docs/ReleaseNotes/5.0.0.05.html
index e18637c31..dbe8ef9d5 100644
--- a/juneau-doc/docs/ReleaseNotes/5.0.0.05.html
+++ b/juneau-doc/docs/ReleaseNotes/5.0.0.05.html
@@ -22,8 +22,8 @@
 	<ul class='spaced-list'>
 		<li>New <c><ja>@RestChild</ja></c> annotation for identifying child resources.</li>
 		<li>
-			New <c>traversable</c> and <c>filterable</c> attributes added to {@del oajr.annotation.RestMethod @RestMethod} annotation.<br>
-			Eliminates the need for {@del PojoResource} and {@del FilteredRestResource} classes.
+			New <c>traversable</c> and <c>filterable</c> attributes added to <del>RestMethod @RestMethod</del> annotation.<br>
+			Eliminates the need for <del>PojoResource</del> and <del>FilteredRestResource</del> classes.
 		</li>
 		<li>Simplified client API.  Easier to use when making multiple connections to the same server.</li>
 		<li>Support for pluggable authentication in the client API.</li>
diff --git a/juneau-doc/docs/ReleaseNotes/5.0.0.07.html b/juneau-doc/docs/ReleaseNotes/5.0.0.07.html
index 25ad5d543..0489177fd 100644
--- a/juneau-doc/docs/ReleaseNotes/5.0.0.07.html
+++ b/juneau-doc/docs/ReleaseNotes/5.0.0.07.html
@@ -66,22 +66,22 @@
 			New configurable property classes for everything are now structured better and easier to locate and identify through the following new classes:
 			<ul>
 				<li>{@link oaj.BeanContext}</li>
-				<li>{@del SerializerContext}</li>
-				<li>{@del ParserContext}</li>
+				<li><del>SerializerContext</del></li>
+				<li><del>ParserContext</del></li>
 			</ul>		
 		</li>
 		<li>
 			Enhancements to {@link oaj.BeanContext}:
 			<ul>
 				<li>
-					Ability to mark bean properties as hidden using {@del @BeanProperty(hidden)} so that they don't get serialized.
+					Ability to mark bean properties as hidden using <del>@BeanProperty(hidden)</del> so that they don't get serialized.
 				</li>
 				<li>
 					Simplified <c>ClassType</c> {@link oaj.ClassMeta} API.<br>
 					Combined 4 classes into a single class.
 				</li>
 				<li>
-					New {@del @Bean#filter} and {@del @BeanProperty#filter} annotations.<br>
+					New <del>@Bean.filter</del>and <del>@BeanProperty.filter</del>annotations.<br>
 					Used for defining filters on bean classes and bean properties instead of just globally through <c>BeanContext.addTransforms(Class[])</c>.
 				</li>
 				<li>
@@ -89,13 +89,13 @@
 					Used for customizing bean property names.
 				</li>
 				<li>
-					New {@del @BeanProperty#beanUri} and {@del @BeanProperty#id} annotations.<br>
+					New <del>@BeanProperty.beanUri</del>and <del>@BeanProperty.id</del>annotations.<br>
 					Used for associating beans with URLs and IDs.<br>
 					Used by XML serializer to add a url attribute on a bean element.<br>
 					Used by RDF/XML serializer to construct <c>rdf:resource</c> attributes.
 				</li>
 				<li>
-					New {@del BeanProperty#properties()} annotation.
+					New <del>BeanProperty.properties()</del>annotation.
 					Used for limiting properties on child elements.
 				</li>	
 			</ul>
@@ -123,38 +123,38 @@
 	<h5 class='topic w800'>REST server updates</h5>
 	<ul class='spaced-list'>
 			<li>
-			Support for overriding bean context and serializer properties in a REST method call through new {@del RestResponse#setProperty(String,Object)} method.<br>
+			Support for overriding bean context and serializer properties in a REST method call through new <del>RestResponse.setProperty(String,Object)</del>method.<br>
 			For example, allows you to control whitespace options on a per-request basis.
 		</li>
 		<li>
 			Several new annotations on REST servlets:
 			<ul>
-				<li>{@del @RestResource#filters} - Associate post-formatting filters on a resource level.</li>
-				<li>{@del @RestResource#guards} - Associate resource-level guards.</li>
-				<li>{@del @RestResource#messages} - Associate a resource bundle with a REST servlet.  Comes with several convenience methods for looking up messages for the client locale.</li>
-				<li>{@del @RestResource#properties} - Override default bean context, serializer, and parser properties though an annotation.</li>
+				<li><del>@RestResource.filters</del>- Associate post-formatting filters on a resource level.</li>
+				<li><del>@RestResource.guards</del>- Associate resource-level guards.</li>
+				<li><del>@RestResource.messages</del>- Associate a resource bundle with a REST servlet.  Comes with several convenience methods for looking up messages for the client locale.</li>
+				<li><del>@RestResource.properties</del>- Override default bean context, serializer, and parser properties though an annotation.</li>
 			</ul> 
 		</li>
 		<li>
 			Several new annotations on REST methods:
 			<ul>
 				<li><c>@RestMethod(filters)</c> - Associate post-formatting filters on a method level.</li>
-				<li>{@del oajr.annotation.RestMethod#guards() @RestMethod(guards)} - Associate method-level guards.</li>
+				<li><del>RestMethod.guards() @RestMethod(guards)</del> - Associate method-level guards.</li>
 			</ul>
 		</li>
 		<li>				
 			New annotations on REST method parameters with automatic conversion:
 			<ul>
-				<li>{@del @Attr} - A parameter or URL variable value as a parsed POJO.</li>
-				<li>{@del @Param} - A query parameter value as a parsed POJO.</li>
-				<li>{@del @PathRemainder}- The remainder after a URL pattern match as a String.</li>
-				<li>{@del @Header} - An HTTP header value as a parsed POJO.</li>
-				<li>{@del @Content} - The HTTP content as a parsed POJO.</li>
+				<li><del>@Attr</del> - A parameter or URL variable value as a parsed POJO.</li>
+				<li><del>@Param</del> - A query parameter value as a parsed POJO.</li>
+				<li><del>@PathRemainder</del>- The remainder after a URL pattern match as a String.</li>
+				<li><del>@Header</del> - An HTTP header value as a parsed POJO.</li>
+				<li><del>@Content</del>- The HTTP content as a parsed POJO.</li>
 				<li>{@link oajr.annotation.Method @Method} - The HTTP method name as a String.</li>
 			</ul>
 		</li>
 		<li>
-			HTTP response content POJOs can now simply be returned from methods instead of calling {@del oajr.RestResponse#setOutput(Object)}.		
+			HTTP response content POJOs can now simply be returned from methods instead of calling <del>RestResponse#setOutput(Object)</del>.		
 		</li>	
 	</ul>
 </div>
\ No newline at end of file
diff --git a/juneau-doc/docs/ReleaseNotes/5.0.0.09.html b/juneau-doc/docs/ReleaseNotes/5.0.0.09.html
index 14b30f983..05ce5c73a 100644
--- a/juneau-doc/docs/ReleaseNotes/5.0.0.09.html
+++ b/juneau-doc/docs/ReleaseNotes/5.0.0.09.html
@@ -32,18 +32,18 @@
 		</li>
 		<li>Support for fluent-style bean setters (setters that return the bean itself).</li>
 		<li>Ability to use {@link oaj.annotation.Bean @Bean} annotation to override bean identification settings.</li>
-		<li>New {@del oaj.ObjectMap#cast(Class)} method to convert <c>ObjectMaps</c> directly to beans.</li>
+		<li>New <del>ObjectMap.cast(Class)</del>method to convert <c>ObjectMaps</c> directly to beans.</li>
 	</ul>
 	<h5 class='topic w800'>REST server API changes</h5>
 	<ul class='spaced-list'>
 		<li>Build-in default <c>OPTIONS</c> pages.</li>
-		<li>New {@del @RestResource#defaultRequestHeaders} and {@del @RestResource#defaultResponseHeaders} annotations.</li>
-		<li>New {@del oajr.annotation.RestMethod#serializers() @RestMethod(serializers)} and {@del oajr.annotation.RestMethod#parsers() @RestMethod(parsers)} annotations.</li>
-		<li>New {@del oajr.annotation.RestMethod#properties() @RestMethod(properties)} annotation.</li>
-		<li>New {@del @RestMethod(defaultRequestHeaders)} annotation.</li>
-		<li>New {@del oajr.annotation.RestMethod#matchers() @RestMethod(matchers)} annotation and {@link oajr.RestMatcher} class.</li>
-		<li><c>Readers</c> and <c>InputStreams</c> can be specified on {@del @Content} annotated parameters.</li>
-		<li>New {@del @HasParam} annotation.</li>
+		<li>New <del>@RestResource.defaultRequestHeaders</del>and <del>@RestResource.defaultResponseHeaders</del>annotations.</li>
+		<li>New <del>RestMethod.serializers() @RestMethod(serializers)</del>and <del>RestMethod.parsers() @RestMethod(parsers)</del>annotations.</li>
+		<li>New <del>RestMethod.properties() @RestMethod(properties)</del> annotation.</li>
+		<li>New <del>@RestMethod(defaultRequestHeaders)</del>annotation.</li>
+		<li>New <del>RestMethod.matchers() @RestMethod(matchers)</del> annotation and {@link oajr.RestMatcher} class.</li>
+		<li><c>Readers</c> and <c>InputStreams</c> can be specified on <del>@Content</del> annotated parameters.</li>
+		<li>New <del>@HasParam</del>annotation.</li>
 		<li>Full RFC2616 support for matching <c>Accept</c> headers to serializers.</li>		
 	</ul>
 	<h5 class='topic w800'>Other notes</h5>
diff --git a/juneau-doc/docs/ReleaseNotes/5.0.0.10.html b/juneau-doc/docs/ReleaseNotes/5.0.0.10.html
index 1e2a907bf..617147441 100644
--- a/juneau-doc/docs/ReleaseNotes/5.0.0.10.html
+++ b/juneau-doc/docs/ReleaseNotes/5.0.0.10.html
@@ -21,18 +21,18 @@
 	</p>
 	<h5 class='topic w800'>Core API changes</h5>
 	<ul class='spaced-list'>
-		<li>New {@del oaj.ObjectMap#findKeyIgnoreCase(String)} method.
+		<li>New <del>ObjectMap.findKeyIgnoreCase(String)</del>method.
 		<li>HtmlSerializer will now create 2-dimensional tables for collections of mixed beans/maps if all object have the same set of property names/keys.</li>
 	</ul>
 	<h5 class='topic w800'>REST server API changes</h5>
 	<ul class='spaced-list'>
 		<li>New <c>RestServletProperties</c> class that defines all the class-level properties that can be set on the servlet.</li>
-		<li>Properties can be set through {@del @RestResource#properties} annotation, or new {@del RestServlet#setProperty(String,Object)} method.</li>
+		<li>Properties can be set through <del>@RestResource.properties</del>annotation, or new <del>RestServlet.setProperty(String,Object)</del>method.</li>
 		<li>New <js>"?noTrace"</js> URL parameter to prevent stack traces from being logged (for JUnit testing of error conditions).</li>
 		<li>New <c>RestServletProperties.REST_useStackTraceHashes</c> property to prevent the same stack trace from being logged multiple times.</li>
 		<li>New <c>RestServletProperties.REST_renderResponseStackTraces</c> property for preventing stack traces in responses for security reasons.</li>
-		<li>New overridable <c>RestServlet.onError(HttpServletRequest,HttpServletResponse,RestException,boolean)</c> and {@del RestServlet#onSuccess(RestRequest,RestResponse,long)} methods for plugging in your own logging and peformance monitoring.</li>
-		<li>Eliminated <c>RestServlet.getInitParams()</c> method, since it's now redundant with {@del RestServlet#getProperties()}.</li>
+		<li>New overridable <c>RestServlet.onError(HttpServletRequest,HttpServletResponse,RestException,boolean)</c> and <del>RestServlet.onSuccess(RestRequest,RestResponse,long)</del>methods for plugging in your own logging and peformance monitoring.</li>
+		<li>Eliminated <c>RestServlet.getInitParams()</c> method, since it's now redundant with <del>RestServlet#getProperties()</del>.</li>
 		<li>Header parameters passed as URL parameters are now case-insensitive.</li>			
 	</ul>
 </div>
\ No newline at end of file
diff --git a/juneau-doc/docs/ReleaseNotes/5.0.0.11.html b/juneau-doc/docs/ReleaseNotes/5.0.0.11.html
index 71d03a5bc..1fcf73920 100644
--- a/juneau-doc/docs/ReleaseNotes/5.0.0.11.html
+++ b/juneau-doc/docs/ReleaseNotes/5.0.0.11.html
@@ -26,10 +26,10 @@
 			Allows parsing form posts directly to POJOs.
 		</li>
 		<li>
-			Support for <c>Accept</c> and <c>Content-Type</c> <js>"application/x-www-form-urlencoded"</js> added by default on {@del oajr.BasicRestServlet}.
+			Support for <c>Accept</c> and <c>Content-Type</c> <js>"application/x-www-form-urlencoded"</js> added by default on <del>BasicRestServlet</del>.
 		</li>
 		<li>
-			New {@del RestServlet#renderError(HttpServletRequest,HttpServletResponse,RestException)} method to allow customized handling of response errors.
+			New <del>RestServlet.renderError(HttpServletRequest,HttpServletResponse,RestException)</del>method to allow customized handling of response errors.
 		</li>
 	</ul>
 </div>
\ No newline at end of file
diff --git a/juneau-doc/docs/ReleaseNotes/5.0.0.12.html b/juneau-doc/docs/ReleaseNotes/5.0.0.12.html
index 1852adf46..7d10a971e 100644
--- a/juneau-doc/docs/ReleaseNotes/5.0.0.12.html
+++ b/juneau-doc/docs/ReleaseNotes/5.0.0.12.html
@@ -22,7 +22,7 @@
 	<h5 class='topic w800'>Core API changes</h5>
 	<ul class='spaced-list'>
 		<li>
-			Relaxed method naming conventions when using {@del @BeanProperty} annotation.<br>
+			Relaxed method naming conventions when using <del>@BeanProperty</del> annotation.<br>
 			Methods with zero parameters are interpreted as getters, and methods with one parameter are interpreted as setters.<br>
 			Eliminated the <c>BeanProperty.method</c> annotation, since it's now unnecessary.
 				</li>
@@ -38,7 +38,7 @@
 			Useful for debugging purposes.
 		</li>
 		<li>
-			<c>Readers</c> and <c>InputStreams</c> can now be passed in as {@del @Content} parameters if you need direct access to the HTTP body content without involving the parsers.<br> 
+			<c>Readers</c> and <c>InputStreams</c> can now be passed in as <del>@Content</del> parameters if you need direct access to the HTTP body content without involving the parsers.<br> 
 			Equivalent to previously calling {@link oajr.RestRequest#getInputStream()} and {@link oajr.RestRequest#getReader()}.
 		</li>
 		<li>
diff --git a/juneau-doc/docs/ReleaseNotes/5.0.0.13.html b/juneau-doc/docs/ReleaseNotes/5.0.0.13.html
index b6156ca8a..8c1b4e434 100644
--- a/juneau-doc/docs/ReleaseNotes/5.0.0.13.html
+++ b/juneau-doc/docs/ReleaseNotes/5.0.0.13.html
@@ -32,10 +32,10 @@
 			New <c>SerializerContext.SERIALIZER_uriContext</c> and <c>SerializerContext.SERIALIZER_uriAuthority</c> serializer properties for specifying values for relative URIs.
 		</li>
 		<li>
-			New {@del oaj.annotation.URI @URI} annotation that allows you to specify classes and bean properties as URLs that aren't <c>java.net.URI</c> or <c>java.net.URL</c>.
+			New <del>URI @URI</del> annotation that allows you to specify classes and bean properties as URLs that aren't <c>java.net.URI</c> or <c>java.net.URL</c>.
 		</li>
 		<li>
-			New {@del oaj.html.HtmlSerializer#HTML_uriAnchorText} HTML serializer property for tailoring how anchor text is rendered.
+			New <del>HtmlSerializer.HTML_uriAnchorText</del>HTML serializer property for tailoring how anchor text is rendered.
 		</li>
 		<li>
 			Renamed <c>BeanProperty#uri</c> annotation to <c>BeanProperty#beanUri</c> to make it clear that this property represents the URI of the bean itself instead of an arbitrary property containing a URI.
@@ -47,7 +47,7 @@
 	<h5 class='topic w800'>REST server API changes</h5>
 	<ul class='spaced-list'>
 		<li>
-			Improvements to {@del oajr.RestServlet} to automatically handle relative URIs in POJOs.
+			Improvements to <del>RestServlet</del> to automatically handle relative URIs in POJOs.
 			<ul>
 				<li><c>SerializerContext.SERIALIZER_uriContext</c> property set by default to web app context root.</li>
 				<li><c>SerializerContext.SERIALIZER_uriAuthority</c> property set by default to the request scheme+hostname+port.</li>
diff --git a/juneau-doc/docs/ReleaseNotes/5.0.0.14.html b/juneau-doc/docs/ReleaseNotes/5.0.0.14.html
index 746405b5c..3f5ba1576 100644
--- a/juneau-doc/docs/ReleaseNotes/5.0.0.14.html
+++ b/juneau-doc/docs/ReleaseNotes/5.0.0.14.html
@@ -21,7 +21,7 @@
 	</p>
 	<p>
 		The biggest change is that the <c>RestSerializer</c>, <c>RestParser</c>, <c>RestSerializerGroup</c>, and <c>RestParserGroup</c> classes have been eliminated entirely.<br>  
-		Instead, the existing {@link oaj.serializer.Serializer}, {@link oaj.parser.Parser}, {@del oaj.serializer.SerializerGroup}, and {@del oaj.parser.ParserGroup} classes of the core API have been augmented to replace them.
+		Instead, the existing {@link oaj.serializer.Serializer}, {@link oaj.parser.Parser}, <del>SerializerGroup</del>, and <del>ParserGroup</del> classes of the core API have been augmented to replace them.
 	</p>
 	<p>
 		Adoptions will be required if you have previously used these classes.
@@ -34,7 +34,7 @@
 				<li>Entirely reworked class hierarchy to make it easier to define new serializers.</li>
 				<li>New {@link oaj.serializer.WriterSerializer} base class for defining character-based serializers.</li>
 				<li>New {@link oaj.serializer.OutputStreamSerializer} base class for defining byte-based serializers.</li>
-				<li>Updated {@del oaj.serializer.SerializerGroup} class with full support for RFC2616 <c>Accept-Content</c> headers.</li>
+				<li>Updated <del>SerializerGroup</del> class with full support for RFC2616 <c>Accept-Content</c> headers.</li>
 				<li>Improved cloning support on serializers and serializer groups.</li>
 			</ul>
 	       	</li>
@@ -51,7 +51,7 @@
 			New <c>org.apache.juneau.swap</c> package.
 			<ul>
 				<li>Cleaner class structure.</li>
-				<li>Improved {@del oaj.transform.BeanFilter} class for defining property filters on beans.</li>
+				<li>Improved <del>BeanFilter</del> class for defining property filters on beans.</li>
 				<li>Improved {@link oaj.utils.PojoQuery} class for defining filters on objects (previously called <c>ObjectFilter</c>).</li>
 	       		</ul>
 	       	</li>
@@ -61,7 +61,7 @@
 				<li>Defines API for {@link oaj.encoders.Encoder Encoders} for enabling compression in REST servlets and clients.</li>
 				<li>Previously, gzip compression was enabled by default.  This new API allows you to plug in your own compression algorithms.</li>
 				<li>New {@link oaj.encoders.GzipEncoder} class for enabling gzip compression.</li>
-				<li>New {@del oaj.encoders.EncoderGroup} class for managing multiple encoders and finding them based on RFC2616 <c>Accept-Encoding</c> header values.</li>
+				<li>New <del>EncoderGroup</del> class for managing multiple encoders and finding them based on RFC2616 <c>Accept-Encoding</c> header values.</li>
 			</ul>
 		</li>
 		<li>
@@ -73,7 +73,7 @@
 		<li>
 			New <c>org.apache.juneau.jso</c> package.
 			<ul>
-				<li>New {@del oaj.jso.JsoSerializer} class for serializing <c>application/x-java-serialized-object</c> content.</li>
+				<li>New <del>JsoSerializer</del> class for serializing <c>application/x-java-serialized-object</c> content.</li>
 			</ul>
 		</li>
 		<li>
@@ -89,7 +89,7 @@
 			</ul>
 		</li>
 	       	<li>
-			<c>JsonMap</c> and <c>JsonList</c> changed to {@del oaj.ObjectMap} and {@del oaj.ObjectList} to better reflect that they're not limited to just JSON support.
+			<c>JsonMap</c> and <c>JsonList</c> changed to <del>ObjectMap</del> and <del>ObjectList</del> to better reflect that they're not limited to just JSON support.
 	   		</li>
 	   		<li>
 			Renamed <c>PojoSwap</c> to {@link oaj.utils.PojoQuery} to not confuse it with the new Filter API.
diff --git a/juneau-doc/docs/ReleaseNotes/5.0.0.15.html b/juneau-doc/docs/ReleaseNotes/5.0.0.15.html
index 5bd76a7de..c5f9305ba 100644
--- a/juneau-doc/docs/ReleaseNotes/5.0.0.15.html
+++ b/juneau-doc/docs/ReleaseNotes/5.0.0.15.html
@@ -22,14 +22,14 @@
 	<ul class='spaced-list'>
 		<li>		
 			Juno-Wink integration components that have been requested by many for a long time!<br>
-			Refer to {@del org.apache.juneau.rest.jaxrs} for information.
+			Refer to <del>jaxrs</del> for information.
 		</li>
 		<li>
-			New {@del @Produces} annotation in place of <c>ISerializer.getMediaTypes()</c> for specifying what media types a serializer produces.<br>
+			New <del>@Produces</del> annotation in place of <c>ISerializer.getMediaTypes()</c> for specifying what media types a serializer produces.<br>
 			Available when subclassing from {@link oaj.serializer.Serializer}.
 		</li>
 		<li>
-			New {@del @Consumes} annotation in place of <c>IParser.getMediaTypes()</c> for specifying what media types a parser consumes.<br>
+			New <del>@Consumes</del> annotation in place of <c>IParser.getMediaTypes()</c> for specifying what media types a parser consumes.<br>
 			Available when subclassing from {@link oaj.parser.Parser}.
 		</li>
 	</ul>
diff --git a/juneau-doc/docs/ReleaseNotes/5.0.0.16.html b/juneau-doc/docs/ReleaseNotes/5.0.0.16.html
index d86b2a73c..2fc18dc76 100644
--- a/juneau-doc/docs/ReleaseNotes/5.0.0.16.html
+++ b/juneau-doc/docs/ReleaseNotes/5.0.0.16.html
@@ -21,7 +21,7 @@
 	</p>
 	<ul class='spaced-list'>
 		<li>
-			New {@del @Properties} REST method parameter annotation that can be used to get the runtime properties map through a parameter instead of through {@link oajr.RestResponse}. 
+			New <del>@Properties</del> REST method parameter annotation that can be used to get the runtime properties map through a parameter instead of through {@link oajr.RestResponse}. 
 		</li>
 	</ul>
 </div>
\ No newline at end of file
diff --git a/juneau-doc/docs/ReleaseNotes/5.0.0.18.html b/juneau-doc/docs/ReleaseNotes/5.0.0.18.html
index 0ef63a046..c94fac90c 100644
--- a/juneau-doc/docs/ReleaseNotes/5.0.0.18.html
+++ b/juneau-doc/docs/ReleaseNotes/5.0.0.18.html
@@ -34,7 +34,7 @@
 	<h5 class='topic w800'>Other changes</h5>
 	<ul class='spaced-list'>
 		<li>
-			New {@del oaj.jso.JsoParser} class.  
+			New <del>JsoParser</del> class.  
 		</li>
 	</ul>
 </div>
\ No newline at end of file
diff --git a/juneau-doc/docs/ReleaseNotes/5.0.0.19.html b/juneau-doc/docs/ReleaseNotes/5.0.0.19.html
index 571e7cb5b..9197b7ade 100644
--- a/juneau-doc/docs/ReleaseNotes/5.0.0.19.html
+++ b/juneau-doc/docs/ReleaseNotes/5.0.0.19.html
@@ -21,14 +21,14 @@
 	</p>
 	<ul class='spaced-list'>
 		<li>
-			New methods on {@del oajr.RestServlet}:
+			New methods on <del>RestServlet</del>:
 			<ul>
-				<li>{@del RestServlet#onPreCall(RestRequest)}</li>
-				<li>{@del RestServlet#onPostCall(RestRequest,RestResponse)}</li>
+				<li><del>RestServlet#onPreCall(RestRequest)</del></li>
+				<li><del>RestServlet#onPostCall(RestRequest,RestResponse)</del></li>
 			</ul>
 		</li>
 		<li>
-			<jsf>TRIM_NULLS</jsf> setting changed to {@del SerializerContext#SERIALIZER_trimNullProperties}.<br>
+			<jsf>TRIM_NULLS</jsf> setting changed to <del>SerializerContext#SERIALIZER_trimNullProperties</del>.<br>
 			New property default is <jk>true</jk>. 
 			Only applies to bean properties, not map or collection entries.
 		</li>
diff --git a/juneau-doc/docs/ReleaseNotes/5.0.0.20.html b/juneau-doc/docs/ReleaseNotes/5.0.0.20.html
index 26696c7f2..eb2e9149f 100644
--- a/juneau-doc/docs/ReleaseNotes/5.0.0.20.html
+++ b/juneau-doc/docs/ReleaseNotes/5.0.0.20.html
@@ -29,8 +29,8 @@
 			New Jena-based {@link oaj.jena.RdfParser} for parsing RDF/XML, RDF/XML-ABBREV, N3, Turtle, and N-Triple back into POJOs.
 		</li>
 		<li>
-			{@del XmlSerializerContext#XML_autoDetectNamespaces} default changed to <jk>true</jk>.<br>
-			The old default value would cause XML with unmapped namespaces if you didn't manually specify them via the {@del XmlSerializerContext#XML_namespaces} annotation.<br>
+			<del>XmlSerializerContext.XML_autoDetectNamespaces</del>default changed to <jk>true</jk>.<br>
+			The old default value would cause XML with unmapped namespaces if you didn't manually specify them via the <del>XmlSerializerContext.XML_namespaces</del> annotation.<br>
 			While setting the default to <jk>true</jk> is somewhat slower (since the serializer must crawl the POJO tree to find namespaces), the benefits of having it work out-of-the-box outweighs the performance concerns.<br>
 			For developers concerned about performance, they can always change it back to false and specify the namespaces themselves.	
 		</li>
@@ -38,32 +38,32 @@
 	<h5 class='topic w800'>REST server API changes</h5>
 	<ul class='spaced-list'>
 		<li>
-			Allow inheritance of {@del @RestResource} annotation.<br>
+			Allow inheritance of <del>@RestResource</del> annotation.<br>
 			Serializers, parsers, filters, properties , guards, and converters definitions are automatically inherited from parent classes and interfaces.
 		</li>
 		<li>
-			Enhancements to {@del oajr.annotation.RestMethod @RestMethod} annotation:
+			Enhancements to <del>RestMethod @RestMethod</del>annotation:
 			<ul>
 				<li>
 					New <c>RestMethod.filters()</c> annotation for defining POJO filters at the method level.
 				</li>
 				<li>
-					New {@del RestMethod#serializersInherit()} and {@del RestMethod#parsersInherit()} annotations for controlling how serializers and parsers (and associated filters and properties) are inherited from the class.<br>
+					New <del>RestMethod.serializersInherit()</del>and <del>RestMethod.parsersInherit()</del> annotations for controlling how serializers and parsers (and associated filters and properties) are inherited from the class.<br>
 					This replaces the previous <c>addSerializers</c> and <c>addParsers</c> annotations.
 			</ul>
 		</li>
 		<li>
-			New {@del RestServletJenaDefault} servlet that includes serialization/parsing support for all Jena-based serializers and parsers.
+			New <del>RestServletJenaDefault</del> servlet that includes serialization/parsing support for all Jena-based serializers and parsers.
 		</li>
 		<li>
-			New {@del DefaultJenaProvider} JAX-RS provider that includes serialization/parsing support for all Jena-based serializers and parsers.
+			New <del>DefaultJenaProvider</del>JAX-RS provider that includes serialization/parsing support for all Jena-based serializers and parsers.
 		</li>
 		<li>
 			Eliminated <c>RestServletChild</c> class.<br>  
 			It's redundant with the introduction of inheritable annotations.
 		</li>
 		<li>
-			New methods on {@del oajr.RestServlet}:
+			New methods on <del>RestServlet</del>:
 			<ul>
 				<li><c>RestServlet.createConfigFactory()</c></li>
 				<li><c>RestServlet.createSerializers()</c></li>
diff --git a/juneau-doc/docs/ReleaseNotes/5.0.0.21.html b/juneau-doc/docs/ReleaseNotes/5.0.0.21.html
index ddfc06f3c..25947379a 100644
--- a/juneau-doc/docs/ReleaseNotes/5.0.0.21.html
+++ b/juneau-doc/docs/ReleaseNotes/5.0.0.21.html
@@ -22,10 +22,10 @@
 	<h5 class='topic w800'>Core API changes</h5>
 	<ul class='spaced-list'>
 		<li>
-			New {@del HtmlDocSerializerContext#HTMLDOC_navlinks} annotation for addint links to HTML page views.
+			New <del>HtmlDocSerializerContext.HTMLDOC_navlinks</del> annotation for addint links to HTML page views.
 		</li>
 		<li>
-			Renamed the properties in {@del HtmlDocSerializerContext} for clarity.
+			Renamed the properties in <del>HtmlDocSerializerContext</del> for clarity.
 		</li>
 	</ul>		
 	<h5 class='topic w800'>Servlet API changes</h5>
@@ -43,7 +43,7 @@
 			</ul>
 		</li>
 		<li>
-			Path variables annotated with {@del @Attr} are now automatically URL-decoded.
+			Path variables annotated with <del>@Attr</del>are now automatically URL-decoded.
 		</li>
 	</ul>		
 </div>
\ No newline at end of file
diff --git a/juneau-doc/docs/ReleaseNotes/5.0.0.23.html b/juneau-doc/docs/ReleaseNotes/5.0.0.23.html
index 8eaf42172..c570f1253 100644
--- a/juneau-doc/docs/ReleaseNotes/5.0.0.23.html
+++ b/juneau-doc/docs/ReleaseNotes/5.0.0.23.html
@@ -21,7 +21,7 @@
 	</p>
 	<ul class='spaced-list'>
 		<li>
-			Simplified {@del oaj.dto.cognos Cognos} support.
+			Simplified <del>cognos Cognos</del> support.
 		</li>
 		<li>
 			Fixed bug where <c><ja>@Xml</ja></c> annotation was not being inherited by inner classes.
diff --git a/juneau-doc/docs/ReleaseNotes/5.0.0.24.html b/juneau-doc/docs/ReleaseNotes/5.0.0.24.html
index 450e07ff7..02472b6fb 100644
--- a/juneau-doc/docs/ReleaseNotes/5.0.0.24.html
+++ b/juneau-doc/docs/ReleaseNotes/5.0.0.24.html
@@ -28,11 +28,11 @@
 			</ul>
 		</li>
 		<li>
-			New {@del XmlFormat#CONTENT} enum value.<br>
+			New <del>XmlFormat.CONTENT</del> enum value.<br>
 			Allows bean properties to be persisted as XML element text.
 		</li>
 		<li>
-			New {@del XmlContentHandler} class and {@del @Xml#contentHandler} annotation.<br>
+			New <del>XmlContentHandler</del>class and <del>@Xml.contentHandler</del>annotation.<br>
 			Allows customized serialization and parsing of beans to XML element text.<br>
 			Added for support of ATOM text content that must support both plain text and embedded XHTML.
 		</li>
@@ -43,13 +43,13 @@
 			Removed <c><ja>@Xml</ja>.valAttr</c> annotation since it's now redundant with <c><ja>@Xml</ja>(format=<jsf>CONTENT</jsf>)</c>.
 			</li>
 			<li>
-			Fixed timezone bug in {@del oaj.transforms.CalendarSwap}.
+			Fixed timezone bug in <del>CalendarSwap</del>.
 		</li>
 			<li>
 			Simplified <c>Serializer.serialize(Object,Object,SerializerContext)</c> method.
 		</li>
 		<li>
-			Fixed bug where lists returned by {@del oaj.ObjectMap#getObjectList(String)} were not updatable.
+			Fixed bug where lists returned by <del>ObjectMap.getObjectList(String)</del>were not updatable.
 		</li>
 		<li>
 			Eliminated old RDF/XML serializer.
diff --git a/juneau-doc/docs/ReleaseNotes/5.0.0.26.html b/juneau-doc/docs/ReleaseNotes/5.0.0.26.html
index 42d6ccbb1..d0a70226e 100644
--- a/juneau-doc/docs/ReleaseNotes/5.0.0.26.html
+++ b/juneau-doc/docs/ReleaseNotes/5.0.0.26.html
@@ -25,14 +25,14 @@
 		</li>
 		<li>
 			Changed the way child REST resources are defined.<br>
-			Eliminated the <ja>@RestChild</ja> annotation on getter methods and replaced it with {@del @RestResource(children)} defined on the resource class itself.<br>
-			Child resource paths are specified through {@del @RestResource(path)}.
+			Eliminated the <ja>@RestChild</ja> annotation on getter methods and replaced it with <del>@RestResource(children)</del> defined on the resource class itself.<br>
+			Child resource paths are specified through <del>@RestResource(path)</del>.
 		</li>
 		<li>
-			New {@del ChildResourceDescriptions} bean for automatically generating the contents of router resource pages.
+			New <del>ChildResourceDescriptions</del> bean for automatically generating the contents of router resource pages.
 		</li>
 		<li>
-			Changed <c><ja>@RestMethod</ja>.pattern()</c> to {@del oajr.annotation.RestMethod#path() @RestMethod(path)} for naming consistency.
+			Changed <c><ja>@RestMethod</ja>.pattern()</c> to <del>RestMethod.path() @RestMethod(path)</del>for naming consistency.
 		</li>
 	</ul>
 </div>
\ No newline at end of file
diff --git a/juneau-doc/docs/ReleaseNotes/5.0.0.27.html b/juneau-doc/docs/ReleaseNotes/5.0.0.27.html
index 6b6f4f25a..783b66012 100644
--- a/juneau-doc/docs/ReleaseNotes/5.0.0.27.html
+++ b/juneau-doc/docs/ReleaseNotes/5.0.0.27.html
@@ -24,10 +24,10 @@
 			Fixed some HTML formatting issues in {@link oaj.html.HtmlSerializer}.
 		</li>
 		<li>
-	  			{@del oajr.BasicRestServlet} now includes {@link oaj.plaintext.PlainTextSerializer} and {@link oaj.plaintext.PlainTextParser} for plain-text support.
+	  			<del>BasicRestServlet</del> now includes {@link oaj.plaintext.PlainTextSerializer} and {@link oaj.plaintext.PlainTextParser} for plain-text support.
 	  		</li>
 	  		<li>
-			Child resources now render on default <c>OPTIONS</c> pages through new method {@del ResourceOptions#getChildren()}.
+			Child resources now render on default <c>OPTIONS</c> pages through new method <del>ResourceOptions#getChildren()</del>.
 		</li>
 		<li>
 			Changes to {@link oaj.urlencoding.UrlEncodingSerializer}/{@link oaj.urlencoding.UrlEncodingParser} to reduce the need for quoted string values.<br>
diff --git a/juneau-doc/docs/ReleaseNotes/5.0.0.29.html b/juneau-doc/docs/ReleaseNotes/5.0.0.29.html
index 8267bdff1..67221a1de 100644
--- a/juneau-doc/docs/ReleaseNotes/5.0.0.29.html
+++ b/juneau-doc/docs/ReleaseNotes/5.0.0.29.html
@@ -23,9 +23,9 @@
 		<li>
 			Revamped the API for filter support:
 			<ul>
-				<li>Updated {@del oaj.transform.BeanFilter} class to mirror the {@link oaj.annotation.Bean @Bean} annotation.</li>
-				<li>Introduced support for bean {@del Bean#subTypeProperty() subtypes}. </li>
-				<li>Replaced <c><ja>@Bean</ja>(filter=xxx)</c> with new {@del @Transform} annotation.</li>
+				<li>Updated <del>BeanFilter</del> class to mirror the {@link oaj.annotation.Bean @Bean} annotation.</li>
+				<li>Introduced support for bean <del>Bean.subTypeProperty() subtypes</del>. </li>
+				<li>Replaced <c><ja>@Bean</ja>(filter=xxx)</c> with new <del>@Transform</del>annotation.</li>
 			</ul>
 		</li>
 		<li>
diff --git a/juneau-doc/docs/ReleaseNotes/5.0.0.30.html b/juneau-doc/docs/ReleaseNotes/5.0.0.30.html
index b5809df98..4503890c1 100644
--- a/juneau-doc/docs/ReleaseNotes/5.0.0.30.html
+++ b/juneau-doc/docs/ReleaseNotes/5.0.0.30.html
@@ -21,7 +21,7 @@
 	</p>
 	<ul class='spaced-list'>
 		<li> 
-			Fixed bug involving beans using {@del Bean#subTypes()} annotation in addition to <c>subTypes</c> property.
+			Fixed bug involving beans using <del>Bean.subTypes()</del>annotation in addition to <c>subTypes</c> property.
 		</li>
 		<li>
 			Modified the JSON parser to handle non-existent JSON values to get around an issue where Cognos was generating invalid JSON.
diff --git a/juneau-doc/docs/ReleaseNotes/5.0.0.31.html b/juneau-doc/docs/ReleaseNotes/5.0.0.31.html
index 71eb09bf1..15ca1fb91 100644
--- a/juneau-doc/docs/ReleaseNotes/5.0.0.31.html
+++ b/juneau-doc/docs/ReleaseNotes/5.0.0.31.html
@@ -26,7 +26,7 @@
 			The new class hierarchy is much simpler to understand.
 		</li>
 		<li>
-			Added {@del oaj.transforms.XMLGregorianCalendarSwap} to convert these to ISO8601 strings during serialization, and vice versa during parsing.
+			Added <del>XMLGregorianCalendarSwap</del> to convert these to ISO8601 strings during serialization, and vice versa during parsing.
 		</li>
 		<li>
 			Added a strict mode to {@link oaj.json.JsonParser}.
diff --git a/juneau-doc/docs/ReleaseNotes/5.0.0.32.html b/juneau-doc/docs/ReleaseNotes/5.0.0.32.html
index 15008c3b9..c56150b65 100644
--- a/juneau-doc/docs/ReleaseNotes/5.0.0.32.html
+++ b/juneau-doc/docs/ReleaseNotes/5.0.0.32.html
@@ -22,7 +22,7 @@
 	<ul class='spaced-list'>
 		<li>
 			New support for generating and consuming fully-compliant JSON-Schema documents.<br>
-			See {@del org.apache.juneau.dto.jsonschema} for information.
+			See <del>jsonschema</del> for information.
 		</li>
 		<li>
 			New methods added to {@link oaj.parser.Parser}:
@@ -40,7 +40,7 @@
 			Used for JSON-Schema support to allow {@link oaj.dto.jsonschema.JsonType} enum to be serialized to lowercase per the specification (e.g. <js>"string"</js> instead of <js>"STRING"</js>).
 			</li>
 			<li>
-			{@del oaj.dto.cognos Cognos} DTOs now have fluent-style bean setters.
+			<del>cognos Cognos</del> DTOs now have fluent-style bean setters.
 			</li>
 			<li>
 			Support for generic bean objects whose type was erased at compile time.<br> 
diff --git a/juneau-doc/docs/ReleaseNotes/5.0.0.33.html b/juneau-doc/docs/ReleaseNotes/5.0.0.33.html
index a484f85a7..dd0beaf33 100644
--- a/juneau-doc/docs/ReleaseNotes/5.0.0.33.html
+++ b/juneau-doc/docs/ReleaseNotes/5.0.0.33.html
@@ -33,14 +33,14 @@
 		<li>
 			New settings in BeanContext.  These can be applied to all serializers/parsers.
 			<ul>
-				<li>{@del BEAN_ignoreInvocationExceptionsOnGetters}
-				<li>{@del BEAN_ignoreInvocationExceptionsOnSetters}
-				<li>{@del BEAN_notBeanPackages_add}
-				<li>{@del BEAN_notBeanPackages_remove}
+				<li><del>BEAN_ignoreInvocationExceptionsOnGetters</del>
+				<li><del>BEAN_ignoreInvocationExceptionsOnSetters</del>
+				<li><del>BEAN_notBeanPackages_add</del>
+				<li><del>BEAN_notBeanPackages_remove</del>
 			</ul>
 		</li>
 		<li>
-			Eliminated <c>addNotBeanClassPatterns(String...)</c> methods throughout API since these are now controlled by {@del BEAN_notBeanPackages_add} / {@del BEAN_notBeanPackages_remove} properties.
+			Eliminated <c>addNotBeanClassPatterns(String...)</c> methods throughout API since these are now controlled by <del>BEAN_notBeanPackages_add</del> / <del>BEAN_notBeanPackages_remove</del> properties.
 		</li>
 		<li>
 			New settings in <c>RestServletProperties</c>.
@@ -59,7 +59,7 @@
 			While the old behavior was as-designed, the new behavior is more in-line with expected behavior.
 		</li>
 		<li>
-			Added support for HTTP header <js>"X-Response-Headers"</js> to {@del oajr.RestServlet}. <br>
+			Added support for HTTP header <js>"X-Response-Headers"</js> to <del>RestServlet</del>. <br>
 			Allows you to specify one or more headers that should be returned on the response from the servlet.<br>
 			For example, to get a page to automatically refresh every 1 second, you can append the following to a URL:  <c>?x-response-headers={Refresh=1}</c>
 		</li>
diff --git a/juneau-doc/docs/ReleaseNotes/5.0.0.34.html b/juneau-doc/docs/ReleaseNotes/5.0.0.34.html
index f4f1096a6..a810f73d0 100644
--- a/juneau-doc/docs/ReleaseNotes/5.0.0.34.html
+++ b/juneau-doc/docs/ReleaseNotes/5.0.0.34.html
@@ -43,9 +43,9 @@
 		<li>
 			New methods on {@link oajr.RestRequest}:
 			<ul>
-				<li>{@del RestRequest#getVarResolver()}</li>
-				<li>{@del RestRequest#getServletURI()}</li>
-				<li>{@del RestRequest#getRequestParentURI()}</li>
+				<li><del>RestRequest#getVarResolver()</del></li>
+				<li><del>RestRequest#getServletURI()</del></li>
+				<li><del>RestRequest.getRequestParentURI()</del></li>
 			</ul>
 		</li>
 		<li>
@@ -55,22 +55,22 @@
 			</ul>
 		</li>
 		<li>
-			New methods on {@del oajr.RestServlet} that allow easier customization by subclasses:
+			New methods on <del>RestServlet</del>that allow easier customization by subclasses:
 			<ul>
-				<li>{@del RestServlet#createConfigFactory()}</li>
-				<li>{@del RestServlet#createConverters()}</li>
-				<li>{@del RestServlet#createDefaultRequestHeaders()}</li>
-				<li>{@del RestServlet#createDefaultResponseHeaders()}</li>
-				<li>{@del RestServlet#createEncoders()}</li>
-				<li>{@del RestServlet#createFilters()}</li>
-				<li>{@del RestServlet#createGuards()}</li>
-				<li>{@del RestServlet#createMimetypesFileTypeMap()}</li>
-				<li>{@del RestServlet#createParsers()}</li>
-				<li>{@del RestServlet#createProperties()}</li>
-				<li>{@del RestServlet#createRequestProperties(ObjectMap,RestRequest)}</li>
-				<li>{@del RestServlet#createRequestVarResolver(RestRequest)}</li>
-				<li>{@del RestServlet#createSerializers()}</li>
-				<li>{@del RestServlet#createUrlEncodingParser()}</li>
+				<li><del>RestServlet#createConfigFactory()</del></li>
+				<li><del>RestServlet#createConverters()</del></li>
+				<li><del>RestServlet#createDefaultRequestHeaders()</del></li>
+				<li><del>RestServlet#createDefaultResponseHeaders()</del></li>
+				<li><del>RestServlet#createEncoders()</del></li>
+				<li><del>RestServlet#createFilters()</del></li>
+				<li><del>RestServlet#createGuards()</del></li>
+				<li><del>RestServlet#createMimetypesFileTypeMap()</del></li>
+				<li><del>RestServlet#createParsers()</del></li>
+				<li><del>RestServlet#createProperties()</del></li>
+				<li><del>RestServlet#createRequestProperties(ObjectMap,RestRequest)</del></li>
+				<li><del>RestServlet#createRequestVarResolver(RestRequest)</del></li>
+				<li><del>RestServlet#createSerializers()</del></li>
+				<li><del>RestServlet#createUrlEncodingParser()</del></li>
 			</ul>
 		</li>
 		<li>
@@ -88,7 +88,7 @@
 			New {@link oaj.annotation.Bean#stopClass @Bean.stopClass} annotation for specifying stop classes for bean properties.
 		</li>
 		<li>
-			New {@del BeanFilter#setStopClass(Class)} which is the program equivalent to the annotation above.
+			New <del>BeanFilter.setStopClass(Class)</del>which is the program equivalent to the annotation above.
 		</li>
 		<li>
 			New methods on {@link oaj.dto.ResultSetList}:
diff --git a/juneau-doc/docs/ReleaseNotes/5.0.0.35.html b/juneau-doc/docs/ReleaseNotes/5.0.0.35.html
index c57073a52..3a5ae73c2 100644
--- a/juneau-doc/docs/ReleaseNotes/5.0.0.35.html
+++ b/juneau-doc/docs/ReleaseNotes/5.0.0.35.html
@@ -20,7 +20,7 @@
 		Juno 5.0.0.35 is a minor update.
 	</p>
 	<ul class='spaced-list'>
-		<li>{@del oajr.RestGuard#guard(RestRequest,RestResponse)} now returns a boolean to allow redirects to login pages.
+		<li><del>RestGuard.guard(RestRequest,RestResponse)</del>now returns a boolean to allow redirects to login pages.
 		<li>Fixed bug in RestServlet where occasional false positive "duplicate method with same name and path" errors were occurring.
 	</ul>	
 </div>
\ No newline at end of file
diff --git a/juneau-doc/docs/ReleaseNotes/5.0.0.36.html b/juneau-doc/docs/ReleaseNotes/5.0.0.36.html
index b6a4f06d4..00e45c4df 100644
--- a/juneau-doc/docs/ReleaseNotes/5.0.0.36.html
+++ b/juneau-doc/docs/ReleaseNotes/5.0.0.36.html
@@ -21,12 +21,12 @@
 	</p>
 	<ul class='spaced-list'>
 		<li>Implemented <c>org.apache.juneau.urlencoding.UrlEncodingParser.parseArgs(Reader,int,ClassMeta[])</c>.
-		<li><c>name</c> parameter of {@del ResourceDescription#ResourceDescription(String,String,String)}. 
+		<li><c>name</c> parameter of <del>ResourceDescription#ResourceDescription(String,String,String)</del>. 
 			is now automatically URL-encoded so that the name can contain special characters (e.g. <js>"foo/bar(baz)"</js>).
 		<li>Support for URL-matching and path info containing encoded characters (e.g. <js>'/'</js>) now supported.	
 		<li>Removed some lazy-initialization of bean information in {@link oaj.ClassMeta} that allowed the removal of
 			some synchronized blocks.
-		<li>Improved support of {@del BeanContext#getClassMetaFromString(String)}.
+		<li>Improved support of <del>BeanContext#getClassMetaFromString(String)</del>.
 			Now supports primitive arrays such as <js>"long[]"</js> in addition to the previous support for the equivalent <js>"[J"</js>.
 		<li>Various new convenience methods added to {@link oaj.internal.StringUtils} and {@link oaj.internal.ClassUtils}.
 	</ul>	
diff --git a/juneau-doc/docs/ReleaseNotes/5.1.0.00.html b/juneau-doc/docs/ReleaseNotes/5.1.0.00.html
index 4c40a66c3..5d57178e9 100644
--- a/juneau-doc/docs/ReleaseNotes/5.1.0.00.html
+++ b/juneau-doc/docs/ReleaseNotes/5.1.0.00.html
@@ -25,12 +25,12 @@
 			The new client API is simply a thin layer on top of <c>HttpClient</c> that performs 
 			serialization and parsing using Juno parsers but leaves all the details of the HTTP connection
 			to the Apache code. <br>
-			See the {@del org.apache.juneau.rest.client} package for details.
+			See the <del>client</del> package for details.
 		<li>New <c>org.apache.juneau.rest.client.jazz</c> package and <c>org.apache.juneau.rest.client.jazz.JazzRestClient</c> class
 			for performing REST operations against Jazz servers.<br>
 			Includes improved support for FORM authentication, and better SSL certificate validation.
 		<li>Completely redesigned URL-Encoding support.<br>
-			See {@del org.apache.juneau.urlencoding} package for details. 
+			See <del>urlencoding</del> package for details. 
 		<li>Changes to Parser API.
 		<ul>
 			<li>Removal of <c>ExtendedReaderParser</c> abstract class and moved methods into 
@@ -48,20 +48,20 @@
 	<h5 class='topic w800'>Other changes</h5>
 	<ul class='spaced-list'>
 		<li>Various new methods added to {@link oaj.internal.StringUtils} and {@link oaj.internal.ClassUtils}.
-		<li>Improved support on {@del BeanContext#getClassMetaFromString(String)}.<br>
+		<li>Improved support on <del>BeanContext.getClassMetaFromString(String)</del>.<br>
 			Now supports resolving <c>"long[]"</c>, and so forth.
-		<li>{@del ResourceDescription} name parameter is now automatically URL-encoded in links.
+		<li><del>ResourceDescription</del>name parameter is now automatically URL-encoded in links.
 		<li>{@link oajr.RestRequest} now correctly handles cases involving URL-encoded characters in the 
 			path info portion of URLs (e.g. <c>http://host/contextRoot/foo%2Fbar</c>).
 		<li>Removed lazy-initialization that required locking in {@link oaj.ClassMeta}.  
 		<li>New <c>BeanContext.setDefaultParser(ReaderParser)</c> method added for specifying 
 			a default parser to use in a bean context (used when converting beans to <c>Strings</c> using 
-			{@del BeanContext#convertToType(Object,Class)}.
+			<del>BeanContext#convertToType(Object,Class)</del>.
 			Old behavior simply used the default JSON serializer in these cases.
 		<li>More consistent handling of exceptions across all parsers.
 		<li>Minor changes to {@link oajr.RestRequest} class.
 		<ul>
-			<li>Changed the order of parameters on {@del RestRequest#getParameter(String,Class)}.
+			<li>Changed the order of parameters on <del>RestRequest#getParameter(String,Class)</del>.
 			<li>Added <c>RestRequest.getMapParameter(String,Class,Class,Class)</c> and 
 				<c>RestRequest.getCollectionParameter(String,Class,Class)}</c> methods.
 		</ul>
diff --git a/juneau-doc/docs/ReleaseNotes/5.1.0.01.html b/juneau-doc/docs/ReleaseNotes/5.1.0.01.html
index 2a8b96533..404db9115 100644
--- a/juneau-doc/docs/ReleaseNotes/5.1.0.01.html
+++ b/juneau-doc/docs/ReleaseNotes/5.1.0.01.html
@@ -28,7 +28,7 @@
 		<li>Fixed bug involving incorrect resolution of overlapping URL match patterns.
 		<li>Overall improvements in HTTP request parameter and header value resolution.  
 		<li>Made workspace changes so as not to be dependent on the WAS test environment being loaded.
-		<li>Renamed <ja>@Remainder</ja> annotation to {@del @PathRemainder}.
+		<li>Renamed <ja>@Remainder</ja> annotation to <del>@PathRemainder</del>.
 		<li>Fixed bug involving incorrect calculation of <c>pathInfo</c> on child resources.
 	</ul>	
 </div>
\ No newline at end of file
diff --git a/juneau-doc/docs/ReleaseNotes/5.1.0.03.html b/juneau-doc/docs/ReleaseNotes/5.1.0.03.html
index 33abf5f21..44c122425 100644
--- a/juneau-doc/docs/ReleaseNotes/5.1.0.03.html
+++ b/juneau-doc/docs/ReleaseNotes/5.1.0.03.html
@@ -24,29 +24,29 @@
 	<ul class='spaced-list'>
 		<li>Ability to detect and use non-public bean classes, getters/setters, and fields using the following new properties:
 			<ul>
-				<li>{@del oaj.BeanContext#BEAN_beanConstructorVisibility} - Control which bean constructors are visible to Juno.
-				<li>{@del oaj.BeanContext#BEAN_beanClassVisibility} - Control which bean classes are interpreted as beans to Juno.
-				<li>{@del oaj.BeanContext#BEAN_beanFieldVisibility} - Control which fields are visible to Juno as bean properties.
-				<li>{@del oaj.BeanContext#BEAN_beanMethodVisibility} - Control which getters/setters are visible to Juno as bean properties.
+				<li><del>BeanContext.BEAN_beanConstructorVisibility</del>- Control which bean constructors are visible to Juno.
+				<li><del>BeanContext.BEAN_beanClassVisibility</del>- Control which bean classes are interpreted as beans to Juno.
+				<li><del>BeanContext.BEAN_beanFieldVisibility</del>- Control which fields are visible to Juno as bean properties.
+				<li><del>BeanContext.BEAN_beanMethodVisibility</del>- Control which getters/setters are visible to Juno as bean properties.
 			</ul>
 			Removed <c>BeanContext.<jsf>INCLUDE_BEAN_FIELD_PROPERTIES</jsf></c> and <c>BeanContext.<jsf>INCLUDE_BEAN_METHOD_PROPERTIES</jsf></c> properties, since ignoring fields and methods
 			can be accomplished by setting the appropriate properties above to {@link oaj.Visibility#NONE NONE}.
-			Also, the {@del @BeanProperty} annotation can now be used on non-public fields/getters/setters to override
+			Also, the <del>@BeanProperty</del> annotation can now be used on non-public fields/getters/setters to override
 			the default behavior defined by the <c>VISIBILITY</c> properties identified above.  This is a convenient way of identifying protected or
 			private fields or methods as bean properties.  Previously, you could only identify public fields/getters/setters using this annotation.
 		</li>
-		<li>New {@del oaj.BeanContext#BEAN_useJavaBeanIntrospector} property that lets Juno use the Java bean <c>Introspector</c>
+		<li>New <del>BeanContext.BEAN_useJavaBeanIntrospector</del> property that lets Juno use the Java bean <c>Introspector</c>
 			class to determine bean properties.  In the previous release, the method for determining bean properties was a mixture of Juno-based and Introspector-based.
 			Now it's either pure Juno-based or pure Introspector-based.  The result is considerably cleaner code and consistent behavior.
-		<li>New {@link oaj.annotation.BeanIgnore @BeanIgnore} annotation.  Replaces the previous {@del @BeanProperty(hidden=true)} annotation
+		<li>New {@link oaj.annotation.BeanIgnore @BeanIgnore} annotation.  Replaces the previous <del>@BeanProperty(hidden=true)</del>annotation
 			for ignoring bean properties.  Can also be used on classes that look like beans so that they're not treated as beans.
 		<li>Support for parsing into non-static member classes.  This applies to all parsers.
 		<li>New {@link oaj.json.annotation.Json#wrapperAttr() @Json(wrapperAttr)}	annotation that automatically wraps beans and objects in a wrapper
 			attribute when serializing to or parsing from JSON.
 		<li>Changed the default ordering of bean properties to be in parent-to-child class order.
-		<li>New {@del oaj.transform.BeanFilter#readProperty(Object,String,Object) readProperty()} and {@del oaj.transform.BeanFilter#writeProperty(Object,String,Object) writeProperty()}
-			methods added to {@del oaj.transform.BeanFilter} class to allow individualized serialization and parsing behavior on a class-by-class basis.
-		<li>Eliminated previous restriction where bean subtype attributes had to be listed first in JSON objects when using the {@del Bean#subTypeProperty()} annotation.
+		<li>New <del>BeanFilter.readProperty(Object,String,Object) readProperty()</del>and <del>BeanFilter.writeProperty(Object,String,Object) writeProperty()</del>
+			methods added to <del>BeanFilter</del>class to allow individualized serialization and parsing behavior on a class-by-class basis.
+		<li>Eliminated previous restriction where bean subtype attributes had to be listed first in JSON objects when using the <del>Bean.subTypeProperty()</del>annotation.
 			The previous behavior was not strictly JSON-compliant since JSON objects are supposed to consist of unordered lists of key/value pairs.
 			While targeted for JSON, the restriction is also lifted for all other parsers.  	
 		<li>New fluent-style {@link oaj.BeanMap#load(String) BeanMap.load()} methods for initializing bean maps.
@@ -55,8 +55,8 @@
 	
 	<h5 class='topic w800'>REST Server API updates</h5>
 	<ul class='spaced-list'>
-		<li>New {@del RestRequest#getJavaMethod()} method for getting access to the method used to handle a request.
-			Useful for accessing the method name or annotations during requests, such as in calls to {@del oajr.RestGuard#guard(RestRequest,RestResponse)}.
+		<li>New <del>RestRequest.getJavaMethod()</del>method for getting access to the method used to handle a request.
+			Useful for accessing the method name or annotations during requests, such as in calls to <del>RestGuard#guard(RestRequest,RestResponse)</del>.
 		<li>Fixed bug when using Jetty where you tried to read text input after a header was written.
 		<li>Added new string variables <dc>$A{...}</dc> (request attributes) and <dc>$P{...}</dc> (request parameters) to <c>RestServlet.createRequestVarResolver(RestRequest)</c>.
 	</ul>
diff --git a/juneau-doc/docs/ReleaseNotes/5.1.0.04.html b/juneau-doc/docs/ReleaseNotes/5.1.0.04.html
index d6b9ac655..83b1e8265 100644
--- a/juneau-doc/docs/ReleaseNotes/5.1.0.04.html
+++ b/juneau-doc/docs/ReleaseNotes/5.1.0.04.html
@@ -21,7 +21,7 @@
 	</p>
 	
 	<ul class='spaced-list'>
-		<li>New {@del RestServlet#getPath()} method.
+		<li>New <del>RestServlet.getPath()</del> method.
 		<li>New <c>SerializerContext.getJavaMethod()</c> and <c>ParserContext.getJavaMethod()</c>
 				to allow access to REST methods that invoked the serializers or parsers.
 			For example, can be used to access additional annotations on REST methods to perform special handing
@@ -29,7 +29,7 @@
 		<li>Better behavior on overriding of filters in <c>BeanContext.addTransforms(Class[])</c>.
 			Previously, adding multiple conflicting filters resulted in random behavior.  
 			Now filters are overridden when multiple matching filters are applied.
-		<li>Allow {@del HtmlDocSerializerContext} properties to be set via {@del Serializer#setProperty(String,Object)}.
+		<li>Allow <del>HtmlDocSerializerContext</del>properties to be set via <del>Serializer#setProperty(String,Object)</del>.
 			Previously, these could only be defined through override properties (e.g. through REST class and method annotations).
 		<li>Fixed memory leak in XML parser.	
 	</ul>
diff --git a/juneau-doc/docs/ReleaseNotes/5.1.0.05.html b/juneau-doc/docs/ReleaseNotes/5.1.0.05.html
index 066ece17c..b67c5ede5 100644
--- a/juneau-doc/docs/ReleaseNotes/5.1.0.05.html
+++ b/juneau-doc/docs/ReleaseNotes/5.1.0.05.html
@@ -20,19 +20,19 @@
 		Juno 5.1.0.5 is a moderate update.
 	</p>
 	<ul class='spaced-list'>
-		<li>New {@del Redirect} class that simplifies performing redirections in REST methods.
-		<li>New pluggable {@link oajr.ResponseHandler} class and {@del @RestResource(responseHandlers)} annotation
+		<li>New <del>Redirect</del> class that simplifies performing redirections in REST methods.
+		<li>New pluggable {@link oajr.ResponseHandler} class and <del>@RestResource(responseHandlers)</del> annotation
 			for defining customer response handlers for special kinds of POJOs.
-		<li>New method {@del UrlEncodingSerializer#serializeUrlPart(Object)} method.
-		<li>New method {@del RestRequest#getServletURIBuilder()} for construcing servlet-based URLs more efficiently.
+		<li>New method <del>UrlEncodingSerializer.serializeUrlPart(Object)</del>method.
+		<li>New method <del>RestRequest.getServletURIBuilder()</del>for construcing servlet-based URLs more efficiently.
 		<li>New method {@link oajr.RestResponse#getNegotiatedOutputStream()} that uses encoders if a match is found, 
 			and {@link oajr.RestResponse#getOutputStream()} that just return the underlying output stream without any modifications.
-		<li>Fixed bug where some properties were not being propagated correctly when using {@del CoreObject#setProperties(ObjectMap)}
+		<li>Fixed bug where some properties were not being propagated correctly when using <del>CoreObject#setProperties(ObjectMap)</del>
 			on serializer and parser subclasses.
 		<li>Fixed bug in {@link oaj.html.HtmlSerializer} where URL keys in Maps were not being serialized as hyperlinks.
 		<li>Fixed bug in {@link oaj.json.JsonSerializer} where <js>"_class"</js> and <js>"items"</js> attributes were not quoted in strict mode when using SERIALIZER_addClassAttrs feature.	
 		<li>Fixed bug where <c>Content-Encoding</c> and<c>Character-Encoding</c> headers were being set when calling {@link oajr.RestResponse#getOutputStream()}.
 			These should not be set if interacting with the output streams at a low level.
-		<li>Eliminated various convenience <c>RestResponse.sendRedirect(...)</c> methods due to the introduction of the {@del Redirect} class.
+		<li>Eliminated various convenience <c>RestResponse.sendRedirect(...)</c> methods due to the introduction of the <del>Redirect</del> class.
 	</ul>
 </div>
\ No newline at end of file
diff --git a/juneau-doc/docs/ReleaseNotes/5.1.0.06.html b/juneau-doc/docs/ReleaseNotes/5.1.0.06.html
index 7c642d9da..bab3994e8 100644
--- a/juneau-doc/docs/ReleaseNotes/5.1.0.06.html
+++ b/juneau-doc/docs/ReleaseNotes/5.1.0.06.html
@@ -20,14 +20,14 @@
 		Juno 5.1.0.6 is a moderate update.
 	</p>
 	<ul class='spaced-list'>
-		<li>Simplified API for {@del oaj.transform.PojoSwap}.  
-			Since it's rarely used, the <c>beanContext</c> parameter was replaced with a {@del PojoSwap#getBeanContext()} method on
+		<li>Simplified API for <del>PojoSwap</del>.  
+			Since it's rarely used, the <c>beanContext</c> parameter was replaced with a <del>PojoSwap.getBeanContext()</del> method on
 			the class.
-		<li>New simplified way of defining POJO filters without needing to extend {@del oaj.transform.PojoSwap}.
-			See {@del oaj.transform.SurrogateSwap} for details.
+		<li>New simplified way of defining POJO filters without needing to extend <del>PojoSwap</del>.
+			See <del>SurrogateSwap</del> for details.
 		<li>New {@link oaj.html.annotation.Html @Html} annotation.
 			Will allow the definition of standard XHTML DTOs in future releases.  
-			For now, {@del Img} is an example of defining an XHTML element using Juno DTOs.
+			For now, <del>Img</del>is an example of defining an XHTML element using Juno DTOs.
 		<li>{@link oaj.json.JsonParser} now ignores trailing <c>';'</c> characters in input so that it can 
 			parse strings of the form <js>"var x = {'foo':'bar'};"</js>.
 		<li>New <c>TumblrParserResource</c> in the samples war file showing how to combine the REST client and server APIs into a single
diff --git a/juneau-doc/docs/ReleaseNotes/5.1.0.07.html b/juneau-doc/docs/ReleaseNotes/5.1.0.07.html
index 9f4067c97..a0dd298b2 100644
--- a/juneau-doc/docs/ReleaseNotes/5.1.0.07.html
+++ b/juneau-doc/docs/ReleaseNotes/5.1.0.07.html
@@ -21,9 +21,9 @@
 	</p>
 	<ul class='spaced-list'>
 		<li>Improved error handling.  
-		<li>New {@del ParserContext#PARSER_debug} and {@del SerializerContext#SERIALIZER_debug}.
+		<li>New <del>ParserContext.PARSER_debug</del>and <del>SerializerContext.SERIALIZER_debug</del>.
 			settings for logging additional information for debugging problems.
-		<li>New {@del SERIALIZER_ignoreRecursions} setting for explicitly ignoring recursions when 
+		<li>New <del>SERIALIZER_ignoreRecursions</del> setting for explicitly ignoring recursions when 
 			serializing models.  Previously, the <jsf>SERIALIZER_detectRecursions</jsf> setting did this but now it simply looks for recursions 
 			and throws exceptions when they occur.
 		<li>Improved handling of <c>StackOverflowErrors</c>.  When <jsf>SERIALIZER_detectRecursions</jsf> is enabled, a useful error message
@@ -31,12 +31,12 @@
 		<li>Bug fixes in {@link oaj.dto.ResultSetList} for Oracle and SQL Server.
 		<li>Serializers and parsers can now access HTTP request attributes, parameters, and headers through <c>SerializerContext.getProperties()</c> and
 			<c>ParserContext.getProperties()</c>.		
-		<li>Removed media-type and encoding attributes from {@del SerializerContext} and {@del ParserContext}	
+		<li>Removed media-type and encoding attributes from <del>SerializerContext</del> and <del>ParserContext</del>	
 			since these are now available through context properties, and are typically not used.
 		<li>{@link oaj.xml.XmlParser} now accepts <c>application/xml</c>.		
 		<li>Improved handling of bean property serialization when multiple matching pojo filters for the bean property class exist.
 		<li>Improved concurrency on BeanContext class.
-		<li>Fixed bug in {@del oajr.converters.Traversable} that was causing it to be executed even if the servlet extra path info was empty.
-		<li>Fixed bug in {@del oajr.converters.Traversable} where it was not picking up filters and properties defined on REST Java methods. 
+		<li>Fixed bug in <del>Traversable</del> that was causing it to be executed even if the servlet extra path info was empty.
+		<li>Fixed bug in <del>Traversable</del>where it was not picking up filters and properties defined on REST Java methods. 
 	</ul>
 </div>
\ No newline at end of file
diff --git a/juneau-doc/docs/ReleaseNotes/5.1.0.08.html b/juneau-doc/docs/ReleaseNotes/5.1.0.08.html
index 370b0ab06..89ad3757a 100644
--- a/juneau-doc/docs/ReleaseNotes/5.1.0.08.html
+++ b/juneau-doc/docs/ReleaseNotes/5.1.0.08.html
@@ -37,9 +37,9 @@
 						from being modified after being created.  The new mechanism is much more straightforward.
 			</ul>
 		</li>
-		<li>Modifications to the {@del org.apache.juneau.rest.client} APIs to make it easier to work with custom Apache HTTP clients.
+		<li>Modifications to the <del>client</del> APIs to make it easier to work with custom Apache HTTP clients.
 			<ul>
-				<li>Added overridable {@del RestClient#createHttpClient()} to allow customized subclasses to construct customized HTTP clients.
+				<li>Added overridable <del>RestClient.createHttpClient()</del>to allow customized subclasses to construct customized HTTP clients.
 				<li>Removed the <c>DefaultRestClient</c> class since it's now fully redundant with <c>RestClient</c>.
 				<li>Added <c>RestClient.shutdown()</c> method for cleaning up the internal HTTP client when you're done using a REST client.
 			</ul>
diff --git a/juneau-doc/docs/ReleaseNotes/5.1.0.09.html b/juneau-doc/docs/ReleaseNotes/5.1.0.09.html
index 0a1bd189a..0057b494f 100644
--- a/juneau-doc/docs/ReleaseNotes/5.1.0.09.html
+++ b/juneau-doc/docs/ReleaseNotes/5.1.0.09.html
@@ -32,11 +32,11 @@
 			</ul>
 		<li>Code changes to facilitate breaking up bundles:
 			<ul>
-				<li><c>org.apache.juneau.rest.labels.Link</c> class moved to {@del Link}.
+				<li><c>org.apache.juneau.rest.labels.Link</c> class moved to <del>Link</del>.
 				<li>References to <c>org.apache.juneau.rest.RestException</c> in {@link oaj.encoders.Encoder} class changed to <c>IOException</c>.
 			</ul>
 		<li>Changed configuration names for consistency with Jazz Framework.
-		<li>{@del RestClient#execute(HttpUriRequest)} method that allows subclasses to handle their own HTTP request execution.
+		<li><del>RestClient.execute(HttpUriRequest)</del>method that allows subclasses to handle their own HTTP request execution.
 		<li>Changes in <c>JazzRestClient</c> to handle introduction of SSO support in v6.
 		<li><c>&amp;plainText</c> debug feature was broken.
 		<li>Removed double-buffering in <c>RestRequest</c>.
diff --git a/juneau-doc/docs/ReleaseNotes/5.1.0.10.html b/juneau-doc/docs/ReleaseNotes/5.1.0.10.html
index 888766e92..ab650485c 100644
--- a/juneau-doc/docs/ReleaseNotes/5.1.0.10.html
+++ b/juneau-doc/docs/ReleaseNotes/5.1.0.10.html
@@ -30,7 +30,7 @@
 		</li>
 		<li>Fix bug where <c>BeanRuntimeExceptions</c> weren't being thrown on subsequent calls to {@link oaj.BeanContext#getClassMeta(Class)}.
 		<li>Moved logic for <c>BeanContext.getPrimitiveDefault(Class)</c> to new {@link oaj.ClassMeta#getPrimitiveDefault()} method for performance reasons.
-		<li>Fixed bug in {@del BeanContext#addTransforms(Class[])} that would cause filter order to get messed up.
+		<li>Fixed bug in <del>BeanContext.addTransforms(Class[])</del>that would cause filter order to get messed up.
 		<li>{@link oaj.ClassMeta#newInstance()} can now create array instances.
 		<li>Fixed indentation bugs in {@link oaj.html.HtmlSerializer}.
 		<li>Fixed issue in {@link oaj.html.HtmlSerializer} where newlines were not being converted into line breaks.
@@ -40,30 +40,30 @@
 	<h5 class='topic w800'>Server</h5>		
 	<ul class='spaced-list'>
 		<li>Fixed major issue that prevented parsing URL-Encoded form posts into POJOs.
-			Calling {@del HttpServlet#getParameter(String)} was forcing the underlying servlet code to process the HTTP body itself, preventing the <c>UrlEncodingSerializer</c>
+			Calling <del>HttpServlet.getParameter(String)</del>was forcing the underlying servlet code to process the HTTP body itself, preventing the <c>UrlEncodingSerializer</c>
 			class from being able to parse the content.  Updated code no longer inadvertantly calls this method.
-		<li>New {@del RestRequest#getQueryParameter(String)}, {@del RestRequest#hasQueryParameter(String)}, and {@del RestRequest#hasAnyQueryParameters(String[])}
+		<li>New <del>RestRequest#getQueryParameter(String)</del>, <del>RestRequest#hasQueryParameter(String)</del>, and <del>RestRequest.hasAnyQueryParameters(String[])</del>
 			methods that only look for parameters in the URL query string to prevent loading and parsing of URL-Encoded form posts.
-		<li>New {@del @QParam} and {@del @HasQParam} annotations for accessing query parameters from the URL query string.
+		<li>New <del>@QParam</del> and <del>@HasQParam</del>annotations for accessing query parameters from the URL query string.
 		<li><c>&amp;plainText</c> parameter can now specify a false value.
-		<li>Removed properties parameters from {@del RestServlet#onPreCall(RestRequest)} and {@del RestServlet#onPostCall(RestRequest,RestResponse)} methods
+		<li>Removed properties parameters from <del>RestServlet.onPreCall(RestRequest)</del>and <del>RestServlet.onPostCall(RestRequest,RestResponse)</del> methods
 			since the properties are already accessible through <c>RestRequest.getProperties()</c>.
 		<li>Added {@link oaj.uon.UonSerializer} and {@link oaj.uon.UonParser} to serializer and parser lists on 
-			{@del oajr.BasicRestServlet} and {@del RestServletJenaDefault}.
+			<del>BasicRestServlet</del>and <del>RestServletJenaDefault</del>.
 	</ul>
 	
 	<h5 class='topic w800'>Client</h5>		
 	<ul class='spaced-list'>
 		<li>Moved to Apache HttpClient 4.3 to match Jazz 6.0.
-		<li>Renamed <c>RestResponseEntity</c> to {@del oajrc.RestRequestEntity}.
+		<li>Renamed <c>RestResponseEntity</c> to <del>RestRequestEntity</del>.
 		<li>Improved performance on URL-Encoded form posts by serializing directly to output stream instead of serialized to string first.
 		<li>New methods on {@link oajrc.RestClient} class that makes it easier to associate serializer and parser attributes with registered serializer and parser:
 			<ul>
-				<li>{@del RestClient#setProperty(String,Object)}			
-				<li>{@del RestClient#setProperties(ObjectMap)}	
-				<li>{@del RestClient#addNotBeanClasses(Class[])}		
-				<li>{@del RestClient#addTransforms(Class[])}		
-				<li>{@del RestClient#addImplClass(Class,Class)}	
+				<li><del>RestClient#setProperty(String,Object)</del>			
+				<li><del>RestClient#setProperties(ObjectMap)</del>	
+				<li><del>RestClient#addNotBeanClasses(Class[])</del>		
+				<li><del>RestClient#addTransforms(Class[])</del>		
+				<li><del>RestClient#addImplClass(Class,Class)</del>	
 			</ul>
 		<li>Renamed <c>RestClient.shutdown()</c> to {@link oajrc.RestClient#close()} to mirror change in Apache API.		
 	</ul>
diff --git a/juneau-doc/docs/ReleaseNotes/5.1.0.11.html b/juneau-doc/docs/ReleaseNotes/5.1.0.11.html
index fc2dae75c..ca13814a7 100644
--- a/juneau-doc/docs/ReleaseNotes/5.1.0.11.html
+++ b/juneau-doc/docs/ReleaseNotes/5.1.0.11.html
@@ -33,19 +33,19 @@
 		<li>Several improvements to URL-Encoding support.
 			<ul>
 				<li>Improved whitespace handling in {@link oaj.uon.UonParser}.
-				<li>New {@del UonParserContext#UON_whitespaceAware} property for controlling whether whitespace is ignored.
-				<li>New {@del UrlEncodingContext#URLENC_expandedParams} property for controlling whether arrays/Collections 
+				<li>New <del>UonParserContext.UON_whitespaceAware</del>property for controlling whether whitespace is ignored.
+				<li>New <del>UrlEncodingContext.URLENC_expandedParams</del>property for controlling whether arrays/Collections 
 					should be serialized/parsed as multi-part parameters.
 				<li>New {@link oaj.urlencoding.annotation.UrlEncoding#expandedParams() @UrlEncoding(expandedParams)}
 					annotation that specifies that bean properties of type array/Collection be serialized as multi-part parameters (e.g. <c>&amp;key=val1&amp;key=val2</c>).
 			</ul>
 		</li>
-		<li>New {@del JsonSerializerContext#JSON_escapeSolidus} property for controlling whether slash characters should be escaped.
-		<li>New {@del oaj.internal.TeeOutputStream} and {@del oaj.internal.TeeWriter} classes.
+		<li>New <del>JsonSerializerContext.JSON_escapeSolidus</del> property for controlling whether slash characters should be escaped.
+		<li>New <del>TeeOutputStream</del> and <del>TeeWriter</del>classes.
 		<li>New {@link oaj.ClassMeta#isInstance(Object)} method.
 		<li>Performance improvements when using the {@link oaj.BeanMap#add(String,Object)} method.  
 			Array properties are stored in a temporary list cache until {@link oaj.BeanMap#getBean()} is called.
-		<li>New {@del BeanPropertyMeta#add(BeanMap,Object)} method for adding values to Collection and array properties.
+		<li>New <del>BeanPropertyMeta.add(BeanMap,Object)</del> method for adding values to Collection and array properties.
 		<li>Config INI files now support keys with name <js>"*"</js>.
 	</ul>
 	
@@ -53,8 +53,8 @@
 	<ul class='spaced-list'>
 		<li>REST method parameters can now be generic types (e.g. <dc><ja>@Param</ja>(<js>"foo"</js>) Map&lt;String,Integer&gt; foo</dc>).
 			This applies to headers, attributes, and parameters.
-		<li>New {@del @Param(multipart)}
-			and {@del @Query(multipart)} annotations
+		<li>New <del>@Param(multipart)</del>
+			and <del>@Query(multipart)</del>annotations
 			for handling multi-part GET and POST parameters.	
 		<li>GET parameters are now CASE-SENSITIVE per W3C standards.
 			<ul>
@@ -69,8 +69,8 @@
 		<li>Performance improvements around query parameters.
 		<li>New methods on {@link oajr.RestRequest} for handling multi-part parameters:
 			<ul>
-				<li>{@del RestRequest#getParameters(String,Class)}
-				<li>{@del RestRequest#getQueryParameters(String,Class)}
+				<li><del>RestRequest#getParameters(String,Class)</del>
+				<li><del>RestRequest#getQueryParameters(String,Class)</del>
 			</ul>
 		</li>
 		<li>Fixed Jetty issue in {@link oajr.RestResponse#setHeader(String,String)} where setting 
@@ -78,18 +78,18 @@
 		<li><c>&amp;noTrace=true</c> now prevents any errors from being logged in log file.
 		<li>Workaround for Jetty issue where <c>ServletContext.getContextPath()</c> always ends with <js>"null"</js>.
 		<li><c>RestServletProperties.REST_allowMethodParam</c> is now <jk>true</jk> by default on all subclasses 
-			of {@del oajr.BasicRestServlet} and {@del RestServletJenaDefault}.
+			of <del>BasicRestServlet</del> and <del>RestServletJenaDefault</del>.
 	</ul>
 			
 	<h5 class='topic w800'>Client</h5>		
 	<ul class='spaced-list'>
-		<li>New method {@del oajrc.RestCall#allowRedirectsOnPosts(boolean)}.
+		<li>New method <del>RestCall#allowRedirectsOnPosts(boolean)</del>.
 		<li>New method <c>RestCall.peekInputStream()</c> allows you to read response bodies without interrupting execution flow.
-		<li>New method {@del oajrc.RestCall#toString()} now useful for debugging purposes.  
+		<li>New method <del>RestCall.toString()</del> now useful for debugging purposes.  
 			Shows all request/response headers and bodies.
-		<li>{@del oajrc.RestCallException} now includes <c>HttpResponse</c> object for easier debugging.
+		<li><del>RestCallException</del>now includes <c>HttpResponse</c> object for easier debugging.
 		<li>New method <c>RestClient.addListener(RestClientListener)</c> for registering request/response listeners.
-		<li>New {@del RestClient#setClassLoader(ClassLoader)} method.
+		<li>New <del>RestClient.setClassLoader(ClassLoader)</del>method.
 		<li>TLS support in <c>JazzRestClient</c>.
 	</ul>
 	
diff --git a/juneau-doc/docs/ReleaseNotes/5.1.0.12.html b/juneau-doc/docs/ReleaseNotes/5.1.0.12.html
index 7601344b7..b324ea40e 100644
--- a/juneau-doc/docs/ReleaseNotes/5.1.0.12.html
+++ b/juneau-doc/docs/ReleaseNotes/5.1.0.12.html
@@ -22,14 +22,14 @@
 	
 	<h5 class='topic w800'>Core</h5>		
 	<ul class='spaced-list'>
-		<li>Fixed {@del ConfigFile#isEmpty()} method.
+		<li>Fixed <del>ConfigFile.isEmpty()</del>method.
 		<li>Changed behavior on {@link oaj.uon.UonParser} to not treat <js>'~'</js> characters as escapes
 			unless followed by one of the following characters:  <c>( ) , $ = ~</c>.
 	</ul>
 	
 	<h5 class='topic w800'>Client</h5>		
 	<ul class='spaced-list'>
-		<li>New class {@del oajrc.RestCallInterceptor}.  
+		<li>New class <del>RestCallInterceptor</del>.  
 			Allows responses to be inspected and modified before being processed.  
 			Replaces <c>RestClientListener</c> class.
 		<li>Minor connection cleanup fixes.
diff --git a/juneau-doc/docs/ReleaseNotes/5.1.0.13.html b/juneau-doc/docs/ReleaseNotes/5.1.0.13.html
index 70ed011f1..b69ced489 100644
--- a/juneau-doc/docs/ReleaseNotes/5.1.0.13.html
+++ b/juneau-doc/docs/ReleaseNotes/5.1.0.13.html
@@ -23,28 +23,28 @@
 	<h5 class='topic w800'>Core</h5>		
 	<ul class='spaced-list'>
 		<li>{@link oaj.ClassMeta#newInstance()} method can now create new instances of arrays.
-		<li>Arguments passed to {@del Link} are now serialized using {@link oaj.urlencoding.UrlEncodingSerializer}, so arbitrary POJOs can now be passed as arguments.
+		<li>Arguments passed to <del>Link</del> are now serialized using {@link oaj.urlencoding.UrlEncodingSerializer}, so arbitrary POJOs can now be passed as arguments.
 		<li>New date filters:  <c>org.apache.juneau.swaps.Datefilter.ISO8601DTZP</c> and <c>org.apache.juneau.swaps.Datefilter.SimpleP</c>.
-		<li>New {@del HtmlDocSerializerContext#HTMLDOC_nowrap} setting for {@link oaj.html.HtmlDocSerializer} class.  
+		<li>New <del>HtmlDocSerializerContext.HTMLDOC_nowrap</del>setting for {@link oaj.html.HtmlDocSerializer} class.  
 			Adds <js>"* {white-space:nowrap}"</js> to the style header to prevent word wrapping.
 		<li>Fixed bug in {@link oaj.uon.UonParser} where passing in a blank value on an array or collection type in a form post would cause a <c>ClassCastException</c>.  
 			New behavior creates an empty array or <c>Collection</c>.
-		<li>Improved implementation of {@del UrlEncodingSerializer#serializeUrlPart(Object)} method.
+		<li>Improved implementation of <del>UrlEncodingSerializer.serializeUrlPart(Object)</del> method.
 	</ul>
 	
 	<h5 class='topic w800'>Server</h5>		
 	<ul class='spaced-list'>
 		<li>{@link oajr.RestConverter} API fixed to handle the existence of POJO filters.
-			{@del oajr.converters.Introspectable}/{@del oajr.converters.Queryable}/{@del oajr.converters.Traversable} classes can now work with filtered POJOs.  
-		<li>{@del @RestResource(messages)} annotation can now be defined on super and subclasses so that NLS messages can be defined in multiple resource bundles.
+			<del>Introspectable</del>/<del>Queryable</del>/<del>Traversable</del> classes can now work with filtered POJOs.  
+		<li><del>@RestResource(messages)</del>annotation can now be defined on super and subclasses so that NLS messages can be defined in multiple resource bundles.
 		<li>Performance improvements in <c>RestServletNls</c> class. 
 		<li>Fixed bug where two REST java methods mapped to the same path pattern wasn't triggering an exception when it was supposed to.
 	</ul>
 	
 	<h5 class='topic w800'>Client</h5>		
 	<ul class='spaced-list'>	
-		<li>New {@del RestCall#setRedirectMaxAttempts(int)} method to prevent endless redirection loops.
-		<li>New {@del RestCall#setRetryable(int,long,RetryOn)} method to automatically retry on failed connection attempts.
+		<li>New <del>RestCall.setRedirectMaxAttempts(int)</del>method to prevent endless redirection loops.
+		<li>New <del>RestCall.setRetryable(int,long,RetryOn)</del>method to automatically retry on failed connection attempts.
 		<li>New <c>RestCallInterceptor.onRetry(RestCall,int,HttpRequest,HttpResponse)</c> method for listening in on retry attempts.		
 	</ul>
 </div>
\ No newline at end of file
diff --git a/juneau-doc/docs/ReleaseNotes/5.1.0.14.html b/juneau-doc/docs/ReleaseNotes/5.1.0.14.html
index eac5a4033..59506d8ff 100644
--- a/juneau-doc/docs/ReleaseNotes/5.1.0.14.html
+++ b/juneau-doc/docs/ReleaseNotes/5.1.0.14.html
@@ -26,28 +26,28 @@
 	
 	<h5 class='topic w800'>Core</h5>		
 	<ul class='spaced-list'>
-		<li>Simplified {@del oaj.utils.PojoIntrospector} class.
-		<li>New {@del ClassUtils#getMethodSignature(Method)} method.
+		<li>Simplified <del>PojoIntrospector</del> class.
+		<li>New <del>ClassUtils.getMethodSignature(Method)</del>method.
 	</ul>
 	
 	<h5 class='topic w800'>Client</h5>		
 	<ul class='spaced-list'>
 		<li>New methods in {@link oajrc.RestClient} for working with remoteable services:
 		<ul>
-			<li>{@del RestClient#setRemoteableServletUri(String)}
-			<li>{@del RestClient#getRemoteableProxy(Class)}
+			<li><del>RestClient#setRemoteableServletUri(String)</del>
+			<li><del>RestClient.getRemoteableProxy(Class)</del>
 		</ul>
 	</ul>
 	
 	<h5 class='topic w800'>Server</h5>		
 	<ul class='spaced-list'>
-		<li>Added a default OPTIONS page to {@del oajr.BasicRestServlet} and {@del RestServletJenaDefault}.
+		<li>Added a default OPTIONS page to <del>BasicRestServlet</del>and <del>RestServletJenaDefault</del>.
 		<li><c>RestServletProperties.REST_allowMethodParam</c> has been enhanced to allow you to
 			explicitly specify which HTTP methods can be used in the <c>&amp;method</c> parameter.
 		<li>New methods added to {@link oajr.RestRequest}:
 		<ul>
-			<li>{@del RestRequest#getParser()}
-			<li>{@del RestRequest#getReaderParser()}
+			<li><del>RestRequest#getParser()</del>
+			<li><del>RestRequest#getReaderParser()</del>
 		</ul>
 	</ul>
 </div>
\ No newline at end of file
diff --git a/juneau-doc/docs/ReleaseNotes/5.1.0.15.html b/juneau-doc/docs/ReleaseNotes/5.1.0.15.html
index c46a8621f..cb63c8a4f 100644
--- a/juneau-doc/docs/ReleaseNotes/5.1.0.15.html
+++ b/juneau-doc/docs/ReleaseNotes/5.1.0.15.html
@@ -22,10 +22,10 @@
 	
 	<h5 class='topic w800'>Core</h5>
 	<ul class='spaced-list'>
-		<li>New properties in {@del SerializerContext}:
+		<li>New properties in <del>SerializerContext</del>:
 			<ol>
-				<li>{@del SerializerContext#SERIALIZER_relativeUriBase}
-				<li>{@del SerializerContext#SERIALIZER_absolutePathUriBase}
+				<li><del>SerializerContext#SERIALIZER_relativeUriBase</del>
+				<li><del>SerializerContext#SERIALIZER_absolutePathUriBase</del>
 			</ol>
 			These replace the <c>SERIALIZER_uriAuthority</c> and <c>SERIALIZER_uriContext</c> properties.
 		</li>
@@ -45,25 +45,25 @@
 	
 	<h5 class='topic w800'>Client</h5>
 	<ul class='spaced-list'>
-		<li>New methods in {@del oajrc.RestCall}:
+		<li>New methods in <del>RestCall</del>:
 			<ol>
-				<li>{@del RestRequest#getHeader(String,Class)}
-				<li>{@del RestRequest#getHeader(String,Object,Class)}
+				<li><del>RestRequest#getHeader(String,Class)</del>
+				<li><del>RestRequest#getHeader(String,Object,Class)</del>
 				<li>{@del RestRequest#getHeader(String,Type,Type...)}
-				<li>{@del RestRequest#getQueryParameter(String,Class)}
-				<li>{@del RestRequest#getQueryParameter(String,Object,Class)}
+				<li><del>RestRequest#getQueryParameter(String,Class)</del>
+				<li><del>RestRequest#getQueryParameter(String,Object,Class)</del>
 				<li>{@del RestRequest#getQueryParameter(String,Type,Type...)}
 				<li>{@del RestRequest#getQueryParameter(String,Object,Type,Type...)}
-				<li>{@del RestRequest#getQueryParameters(String,Class)}
+				<li><del>RestRequest#getQueryParameters(String,Class)</del>
 				<li>{@del RestRequest#getQueryParameters(String,Type,Type...)}
-				<li>{@del RestRequest#getFormDataParameter(String,Class)}
-				<li>{@del RestRequest#getFormDataParameter(String,Object,Class)}
-				<li>{@del RestRequest#getFormDataParameters(String,Class)}
+				<li><del>RestRequest#getFormDataParameter(String,Class)</del>
+				<li><del>RestRequest#getFormDataParameter(String,Object,Class)</del>
+				<li><del>RestRequest#getFormDataParameters(String,Class)</del>
 				<li>{@del RestRequest#getFormDataParameter(String,Type,Type...)}
 				<li>{@del RestRequest#getFormDataParameters(String,Type,Type...)}
-				<li>{@del RestRequest#getPathParameter(String,Class)}
+				<li><del>RestRequest#getPathParameter(String,Class)</del>
 				<li>{@del RestRequest#getPathParameter(String,Type,Type...)}
-				<li>{@del RestRequest#getBody(Class)}
+				<li><del>RestRequest#getBody(Class)</del>
 				<li>{@del RestRequest#getBody(Type,Type...)}
 			</ol>
 		</li>
diff --git a/juneau-doc/docs/ReleaseNotes/5.1.0.16.html b/juneau-doc/docs/ReleaseNotes/5.1.0.16.html
index f9ee51c93..af09453ca 100644
--- a/juneau-doc/docs/ReleaseNotes/5.1.0.16.html
+++ b/juneau-doc/docs/ReleaseNotes/5.1.0.16.html
@@ -25,15 +25,15 @@
 		<li>New methods on {@link oaj.ClassMeta} that eliminates language-specific code in 
 			the general class metadata.
 			<ul>
-				<li>{@del ClassMeta#getXmlMeta()}
-				<li>{@del ClassMeta#getJsonMeta()}
-				<li>{@del ClassMeta#getHtmlMeta()}
-				<li>{@del ClassMeta#getUrlEncodingMeta()}
-				<li>{@del ClassMeta#getRdfMeta()}
+				<li><del>ClassMeta#getXmlMeta()</del>
+				<li><del>ClassMeta#getJsonMeta()</del>
+				<li><del>ClassMeta#getHtmlMeta()</del>
+				<li><del>ClassMeta#getUrlEncodingMeta()</del>
+				<li><del>ClassMeta#getRdfMeta()</del>
 			</ul>
 		<li>New {@link oaj.dto.jsonschema.JsonType#ANY} enum.
-		<li>New {@del @Html(asPlainText)} annotation.
-		<li>New {@del HtmlDocSerializerContext#HTMLDOC_cssImports} property.
+		<li>New <del>@Html(asPlainText)</del> annotation.
+		<li>New <del>HtmlDocSerializerContext.HTMLDOC_cssImports</del>property.
 		<li>Significant changes to RDF support.
 			<ul>
 				<li>New {@link oaj.jena.annotation.Rdf @Rdf} and {@link oaj.jena.annotation.RdfSchema @RdfSchema}
@@ -42,16 +42,16 @@
 				<li>Support for serializing arrays/collections as RDF bags, RDF lists, and multi-valued properties.   
 				<li>Fixed warning message about <js>"tab"</js> setting when using the N3/Turtle serializers.
 			</ul>
-		<li>New {@del SerializerContext#SERIALIZER_sortCollections} and 
-			{@del SerializerContext#SERIALIZER_sortMaps} properties.
+		<li>New <del>SerializerContext.SERIALIZER_sortCollections</del>and 
+			<del>SerializerContext.SERIALIZER_sortMaps</del>properties.
 		<li>FindBug fixes.
 	</ul>
 	
 	<h5 class='topic w800'>Server</h5>
 	<ul class='spaced-list'>
-		<li>New {@del RestRequest#getServletParentURI()} method.
+		<li>New <del>RestRequest.getServletParentURI()</del>method.
 		<li>New <c>$R{servletParentURI}</c> variable.
-		<li>Removed final modifier from {@del ChildResourceDescriptions}.
+		<li>Removed final modifier from <del>ChildResourceDescriptions</del>.
 	</ul>
 	
 	<h5 class='topic w800'>Samples</h5>
diff --git a/juneau-doc/docs/ReleaseNotes/5.1.0.17.html b/juneau-doc/docs/ReleaseNotes/5.1.0.17.html
index 9047f5eb5..e360708e5 100644
--- a/juneau-doc/docs/ReleaseNotes/5.1.0.17.html
+++ b/juneau-doc/docs/ReleaseNotes/5.1.0.17.html
@@ -38,22 +38,22 @@
 					</ul>
 				<li>{@link oaj.BeanPropertyMeta#getClassMeta()} now returns the filtered type of the property.
 			</ul> 
-		<li>{@del StringVarResolver} now has support for chained resolvers.
-		<li>{@del StringVarResolver}  now resolves variables inside resolved values.
+		<li><del>StringVarResolver</del> now has support for chained resolvers.
+		<li><del>StringVarResolver</del>  now resolves variables inside resolved values.
 			i.e. if a resolved variable value itself contains a variable, it now resolves that variable too.
-		<li>Fixed bug where inner interface classes being used in {@del RestResource#filters()} were being
+		<li>Fixed bug where inner interface classes being used in <del>RestResource.filters()</del> were being
 			interpreted as surrogate classes because they have hidden 1-arg constructors due to being inner classes.
 		<li>Fixed bug in {@link oaj.internal.MultiSet} where exception was being thrown if last set was empty.
-		<li>New {@del oaj.utils.ZipFileList} class for providing efficiently zipped directories through the REST interface.
+		<li>New <del>ZipFileList</del>class for providing efficiently zipped directories through the REST interface.
 		<li>New <c>RdfProperties.RDF_useXmlNamespaces</c> property.			
-		<li>New {@del XmlParserContext#XML_preserveRootElement} property.
+		<li>New <del>XmlParserContext.XML_preserveRootElement</del> property.
 		<li>Worked around bug in Sun VM on OS/X where XML parser was throwing an exception when trying to set a reporter.			
 	</ul>
 	
 	
 	<h5 class='topic w800'>Server</h5>
 	<ul class='spaced-list'>
-		<li>New {@del ZipFileListResponseHandler} class.
+		<li>New <del>ZipFileListResponseHandler</del>class.
 		<li>Simplified labels in servlet resource bundles:
 			<ul>
 				<li><c>"[ClassName].ResourceDescription"</c> is now <c>"[ClassName].label"</c>.
@@ -63,63 +63,63 @@
 			<ul>
 				<li>Added new methods:
 					<ul>
-						<li>{@del RestRequest#getQueryParameterMap()}
-						<li>{@del RestRequest#getQueryParameterNames()}
-						<li>{@del RestRequest#getPathInfoUndecoded()}
-						<li>{@del RestRequest#getPathRemainderUndecoded()}
-						<li>{@del RestRequest#getTrimmedRequestURI()}
-						<li>{@del RestRequest#getTrimmedRequestURL()}
-						<li>{@del RestRequest#getServletTitle()}
-						<li>{@del RestRequest#getServletDescription()}
-						<li>{@del RestRequest#getMethodDescription()}
+						<li><del>RestRequest#getQueryParameterMap()</del>
+						<li><del>RestRequest#getQueryParameterNames()</del>
+						<li><del>RestRequest#getPathInfoUndecoded()</del>
+						<li><del>RestRequest#getPathRemainderUndecoded()</del>
+						<li><del>RestRequest#getTrimmedRequestURI()</del>
+						<li><del>RestRequest#getTrimmedRequestURL()</del>
+						<li><del>RestRequest#getServletTitle()</del>
+						<li><del>RestRequest#getServletDescription()</del>
+						<li><del>RestRequest#getMethodDescription()</del>
 					</ul>
 				<li>Behavior changes to {@link oajr.RestRequest#getPathInfo()} to follow Servlet specs.
 					Returns <jk>null</jk> instead of blank for no path info.
-				<li>{@del RestRequest#getPathRemainder()} now automatically decodes the path remainder. 
-					Use {@del RestRequest#getPathRemainderUndecoded()} to get the unencoded path remainder.
-				<li>Bug fixes in {@del RestRequest#getRequestParentURI()} when servlet is mapped to <js>"/*"</js>.
-				<li>Bug fixes in {@del RestRequest#getServletURI()} when servlet is mapped to <js>"/*"</js>.
+				<li><del>RestRequest.getPathRemainder()</del>now automatically decodes the path remainder. 
+					Use <del>RestRequest.getPathRemainderUndecoded()</del>to get the unencoded path remainder.
+				<li>Bug fixes in <del>RestRequest.getRequestParentURI()</del>when servlet is mapped to <js>"/*"</js>.
+				<li>Bug fixes in <del>RestRequest.getServletURI()</del>when servlet is mapped to <js>"/*"</js>.
 			</ul>
 		<li>New string replacement variables:
 			<ul>
 				<li><c>$R{contextPath}</c> - Returns value from {@link oajr.RestRequest#getContextPath()}
-				<li><c>$R{methodDescription}</c> - Returns value from {@del RestRequest#getMethodDescription()}
-				<li><c>$R{resourceTitle}</c> - Returns value from {@del RestRequest#getServletTitle()}
-				<li><c>$R{resourceDescription}</c> - Returns value from {@del RestRequest#getServletDescription()}
-				<li><c>$R{trimmedRequestURI}</c> - Returns value from {@del RestRequest#getTrimmedRequestURI()}
+				<li><c>$R{methodDescription}</c> - Returns value from <del>RestRequest#getMethodDescription()</del>
+				<li><c>$R{resourceTitle}</c> - Returns value from <del>RestRequest#getServletTitle()</del>
+				<li><c>$R{resourceDescription}</c> - Returns value from <del>RestRequest#getServletDescription()</del>
+				<li><c>$R{trimmedRequestURI}</c> - Returns value from <del>RestRequest#getTrimmedRequestURI()</del>
 				<li><c>$E{var}</c> - Environment variables.
 			</ul>
-		<li>Added methods {@del RestServlet#getDescription(RestRequest)} and {@del RestServlet#getLabel(RestRequest)}.
-		<li>{@del oajr.BasicRestServlet} and {@del RestServletJenaDefault} now provide default HTML titles
+		<li>Added methods <del>RestServlet.getDescription(RestRequest)</del>and <del>RestServlet.getLabel(RestRequest)</del>.
+		<li><del>BasicRestServlet</del> and <del>RestServletJenaDefault</del> now provide default HTML titles
 			and descriptions:
 			<p class='bcode'>
 		<ja>@Property</ja>(name=<jsf>HTMLDOC_title</jsf>, value=<js>"$R{resourceTitle}"</js>),
 		<ja>@Property</ja>(name=<jsf>HTMLDOC_description</jsf>, value=<js>"$R{resourceDescription}"</js>)
 			</p>
-		<li>Options pages on {@del oajr.BasicRestServlet} and {@del RestServletJenaDefault} now provide default descriptions and back links:
+		<li>Options pages on <del>BasicRestServlet</del> and <del>RestServletJenaDefault</del> now provide default descriptions and back links:
 			and descriptions:
 			<p class='bcode'>
 		<ja>@Property</ja>(name=<jsf>HTMLDOC_navlinks</jsf>, value=<js>"{back:'$R{servletURI}"</js>),
 		<ja>@Property</ja>(name=<jsf>HTMLDOC_description</jsf>, value=<js>"Resource options"</js>)
 			</p>
-		<li>New {@del oajr.BasicRestServletGroup} class.
+		<li>New <del>BasicRestServletGroup</del>class.
 		<li>Removed <c>RestServletProperties.REST_trimTrailingUriSlashes</c> and <c>RestServletProperties.REST_pathInfoBlankForNull</c>. 
 		<li>New annotations for providing labels and descriptions.  Useful if you don't plan on having to support other languages, so you don't 
 			want to provide labels in resource bundles.
 			<ul>
-				<li>{@del RestResource#label()}
-				<li>{@del @RestResource(description)}
-				<li>{@del oajr.annotation.RestMethod#description() @RestMethod(description)}
-				<li>{@del RestMethod#responses()}
-				<li>{@del Attr#description()}
-				<li>{@del Content#description()}
-				<li>{@del HasParam#description()}
-				<li>{@del HasQParam#description()}
-				<li>{@del Header#description()}
-				<li>{@del Param#description()}
-				<li>{@del QParam#description()}
+				<li><del>RestResource#label()</del>
+				<li><del>@RestResource(description)</del>
+				<li><del>RestMethod#description() @RestMethod(description)</del>
+				<li><del>RestMethod#responses()</del>
+				<li><del>Attr#description()</del>
+				<li><del>Content#description()</del>
+				<li><del>HasParam#description()</del>
+				<li><del>HasQParam#description()</del>
+				<li><del>Header#description()</del>
+				<li><del>Param#description()</del>
+				<li><del>QParam#description()</del>
 			</ul>
-		<li>Support for sorting resources by name in {@del ChildResourceDescriptions}.
+		<li>Support for sorting resources by name in <del>ChildResourceDescriptions</del>.
 	</ul>
 	
 	<h5 class='topic w800'>Samples</h5>
diff --git a/juneau-doc/docs/ReleaseNotes/5.1.0.18.html b/juneau-doc/docs/ReleaseNotes/5.1.0.18.html
index 87d3cacc6..8ea9e080b 100644
--- a/juneau-doc/docs/ReleaseNotes/5.1.0.18.html
+++ b/juneau-doc/docs/ReleaseNotes/5.1.0.18.html
@@ -24,18 +24,18 @@
 	<ul class='spaced-list'>
 		<li>Fixed bug where localized strings weren't resolving when using chained resource bundles.
 		<li>Servlet and method labels and descriptions can now contain embedded string variables.
-		<li>New {@del RestMethod#input()} and {@del RestMethod#responses()}
+		<li>New <del>RestMethod.input()</del>and <del>RestMethod#responses()</del>
 			annotations.
 			These replace the various <c>description</c> annotations added 2 days ago with a simpler design.
-		<li>New methods on {@del oajr.RestServlet}:
+		<li>New methods on <del>RestServlet</del>:
 			<ul>
-				<li>{@del RestServlet#getMethodDescription(String,RestRequest)} so that subclasses
+				<li><del>RestServlet.getMethodDescription(String,RestRequest)</del>so that subclasses
 					can override the method description in the OPTIONS page.
-				<li>{@del RestServlet#createRequestVarResolver(RestRequest)} so that subclasses
+				<li><del>RestServlet.createRequestVarResolver(RestRequest)</del>so that subclasses
 					can override and augment the variable resolver.
-				<li>{@del RestServlet#resolveChild(Class)} and {@del RestServlet#replaceChild(RestServlet)}
+				<li><del>RestServlet.resolveChild(Class)</del>and <del>RestServlet.replaceChild(RestServlet)</del>
 					classes that allows customized resolution of servlet instances (e.g. if services are defined in OSGi).
 			</ul> 
-		<li>Reverted the {@del MethodDescription} back to 5.1.0.16 since it was being used by someone.
+		<li>Reverted the <del>MethodDescription</del>back to 5.1.0.16 since it was being used by someone.
 	</ul>
 </div>
\ No newline at end of file
diff --git a/juneau-doc/docs/ReleaseNotes/5.1.0.19.html b/juneau-doc/docs/ReleaseNotes/5.1.0.19.html
index 691d8bc04..749eac177 100644
--- a/juneau-doc/docs/ReleaseNotes/5.1.0.19.html
+++ b/juneau-doc/docs/ReleaseNotes/5.1.0.19.html
@@ -18,22 +18,22 @@
 <div class='topic'>
 	<p>
 		Juno 5.1.0.19 is a minor update in terms of core functionality.
-		But it introduces a {@del Microservices} project for building REST microservices and docker containers.
+		But it introduces a <del>Microservices</del> project for building REST microservices and docker containers.
 	</p>
 	
 	<h5 class='topic w800'>Core</h5>
 	<ul class='spaced-list'>
-		<li>Beans can now be serialized to and parsed from {@del oaj.ObjectMap ObjectMaps}.
+		<li>Beans can now be serialized to and parsed from <del>ObjectMap ObjectMaps</del>.
 			See <dc>Serializing to ObjectMaps</dc> for details.
-		<li>New {@del oaj.ObjectMap#include(String[])} and {@del oaj.ObjectMap#exclude(String[])} methods.
+		<li>New <del>ObjectMap.include(String[])</del>and <del>ObjectMap.exclude(String[])</del>methods.
 		<li>{@link oaj.html.annotation.Html @Html} annotations can now be applied to bean properties.
 		<li>New {@link oaj.utils.IOPipe} utility class.
-		<li>Behavior change on {@del StringVarResolver}.  <jk>null</jk> input now results in blank strings instead of <jk>null</jk>.
+		<li>Behavior change on <del>StringVarResolver</del>.  <jk>null</jk> input now results in blank strings instead of <jk>null</jk>.
 	</ul>
 	
 	<h5 class='topic w800'>Client</h5>
 	<ul class='spaced-list'>
-		<li>New {@del RestClient#doCallback(String)} method.
+		<li>New <del>RestClient.doCallback(String)</del>method.
 	</ul>
 	
 	<h5 class='topic w800'>Server</h5>
@@ -46,6 +46,6 @@
 			on all JVMs.  On IBM JVMs this is unnecessary because the order of the properties as defined in the class
 			are stored in the bytecode.  Other JVMs such as OpenJRE do not implement this feature causing the bean
 			properties to be in random order.
-		<li>New {@del ResourceDescription#ResourceDescription(RestRequest,String,String)} constructor.
+		<li>New <del>ResourceDescription.ResourceDescription(RestRequest,String,String)</del>constructor.
 	</ul>
 </div>
\ No newline at end of file
diff --git a/juneau-doc/docs/ReleaseNotes/5.1.0.20.html b/juneau-doc/docs/ReleaseNotes/5.1.0.20.html
index 284b4a119..c6157d5d5 100644
--- a/juneau-doc/docs/ReleaseNotes/5.1.0.20.html
+++ b/juneau-doc/docs/ReleaseNotes/5.1.0.20.html
@@ -18,25 +18,25 @@
 <div class='topic'>
 	<p>
 		Juno 5.1.0.20 is a moderate update.
-		The biggest improvement is the ability to associate external INI config files with REST servlets using the {@del ConfigFile} functionality.
+		The biggest improvement is the ability to associate external INI config files with REST servlets using the <del>ConfigFile</del> functionality.
 	</p>
 	
 	<h5 class='topic w800'>Core</h5>
 	<ul class='spaced-list'>
 		<li>Significant API changes to <c>org.apache.juneau.config</c> API.
 			<ul>
-				<li>{@del ConfigFile} is now thread safe and can be shared across multiple threads.
-				<li>New {@del ConfigMgr} class for managing configuration files.
+				<li><del>ConfigFile</del> is now thread safe and can be shared across multiple threads.
+				<li>New <del>ConfigMgr</del> class for managing configuration files.
 				<li>Serializers and parsers can be associated with config files for storing and retrieving POJOs.  
 					Default support provided for JSON.
 			</ul>
 		</li>
 		<li>New {@link oaj.html.SimpleHtmlWriter} class.  
 			Can be used for simple HTML DOM construction.
-		<li>New {@del oaj.utils.ProcBuilder} class for calling external processes.
-		<li>New {@del ObjectMap#remove(Class,String,Object)} method.
+		<li>New <del>ProcBuilder</del> class for calling external processes.
+		<li>New <del>ObjectMap.remove(Class,String,Object)</del>method.
 		<li><js>"class='link'"</js> added to links generated by {@link oaj.html.HtmlDocSerializer}.
-		<li>New {@del EncoderGroup#append(EncoderGroup)} method.
+		<li>New <del>EncoderGroup.append(EncoderGroup)</del>method.
 		<li>New <c>HtmlDocSerializerContext.HTMLDOC_addLinks</c> configuration property.
 		<li>Modified the <c>Parser.createContext(ObjectMap,Method,Object)</c> method.  
 			Outer context objects can be passed in to create instances of non-static inner classes.
@@ -45,7 +45,7 @@
 		<li>{@link oaj.urlencoding.UrlEncodingSerializer} and {@link oaj.urlencoding.UrlEncodingParser} now 
 			represent arrays and collections as key-value pairs where the keys are numbers (e.g. <js>"?0=foo&amp;1=bar"</js>).
 		<li>Various internal improvements to {@link oaj.utils.IOPipe}.
-		<li>New {@del ReflectionUtils#getResource(Class,String)} method.
+		<li>New <del>ReflectionUtils.getResource(Class,String)</del>method.
 		<li>{@link oaj.internal.StringUtils#parseNumber(String,Class)} now returns zero for empty strings. 
 			This affects the way most parsers handle blank values.
 	</ul>
@@ -54,28 +54,28 @@
 	<ul class='spaced-list'>
 		<li>You can now parse into non-static inner classes of a servlet for parameters/attributes/content.
 			Useful if you like to define your marshaller beans inside your servlet.
-		<li>Changes to {@del oajr.RestServlet}:
+		<li>Changes to <del>RestServlet</del>:
 			<ul>
 				<li>New methods for accessing external INI config files:<br>  
-					{@del RestServlet#getConfig()}<br>
-					{@del RestServlet#createConfigFile()}
+					<del>RestServlet#getConfig()</del><br>
+					<del>RestServlet#createConfigFile()</del>
 				<li>New <js>"$C{...}"</js> variable that resolve to INI config file values.
 				<li>New <js>"$UE{...}"</js> variable that  URL-encodes the value inside the variable.
 				<li>New convenience methods for retrieving classpath resource files:<br>  
-					{@del RestServlet#getResource(String)}<br>
-					{@del RestServlet#getResourceAsString(String)}<br>
-					{@del RestServlet#getResource(Class,String,String)}.
+					<del>RestServlet#getResource(String)</del><br>
+					<del>RestServlet#getResourceAsString(String)</del><br>
+					<del>RestServlet#getResource(Class,String,String)</del>.
 						Useful if you want to load predefined POJOs from JSON files in your classpath.
-				<li>New {@del RestServlet#handleNotFound(int,RestRequest,RestResponse)} method for customized handling
+				<li>New <del>RestServlet.handleNotFound(int,RestRequest,RestResponse)</del> method for customized handling
 					of when a resource or method was not found.  
 			</ul>
-		<li>{@del oajr.BasicRestServlet}  now automatically processes <js>"/favicon.ico"</js> requests by 
-			overriding the new {@del RestServlet#handleNotFound(int,RestRequest,RestResponse)} method.
+		<li><del>BasicRestServlet</del> now automatically processes <js>"/favicon.ico"</js> requests by 
+			overriding the new <del>RestServlet.handleNotFound(int,RestRequest,RestResponse)</del>method.
 		<li>New {@link oajr.RestRequest} methods: 
 			<ul>
-				<li>{@del RestRequest#resolveVars(String)}
+				<li><del>RestRequest#resolveVars(String)</del>
 				<li><c>RestRequest.getVarResource(String)</c>
-				<li>{@del RestRequest#getConfig()}
+				<li><del>RestRequest#getConfig()</del>
 			</ul>
 		<li>New {@link oajr.RestResponse} methods: 
 			<ul>
@@ -84,15 +84,15 @@
 					<c>getWriter()</c> now returns an unnegotiated writer.  
 					<c>getUnbufferedWriter()</c> has been removed.
 			</ul>
-		<li>New {@del oajr.annotation.RestMethod#encoders() @RestMethod(encoders)} and 
-			{@del RestMethod#inheritEncoders()} annotations.  
+		<li>New <del>RestMethod.encoders() @RestMethod(encoders)</del>and 
+			<del>RestMethod.inheritEncoders()</del> annotations.  
 			Allows encoders to be fine-tuned at the method level.
-		<li>New {@del @RestResource(config)} annotation for associating external {@del ConfigFile} config files with servlets.
-		<li>{@del ResourceLink}.
+		<li>New <del>@RestResource(config)</del> annotation for associating external <del>ConfigFile</del>config files with servlets.
+		<li><del>ResourceLink</del>.
 		<li>New <c>org.apache.juneau.rest.matcher</c> package for commonly-used {@link oajr.RestMatcher RestMatchers}:
 			<ul>
-				<li>{@del oajr.matchers#MultipartFormDataMatcher}
-				<li>{@del oajr.matchers#UrlEncodedFormMatcher}
+				<li><del>matchers#MultipartFormDataMatcher</del>
+				<li><del>matchers#UrlEncodedFormMatcher</del>
 			</ul>
 	</ul>
 			
diff --git a/juneau-doc/docs/ReleaseNotes/5.2.0.0.html b/juneau-doc/docs/ReleaseNotes/5.2.0.0.html
index 6fbc3a1ed..e86bd115f 100644
--- a/juneau-doc/docs/ReleaseNotes/5.2.0.0.html
+++ b/juneau-doc/docs/ReleaseNotes/5.2.0.0.html
@@ -26,40 +26,40 @@
 		<li>Significant changes and enhancements to the <c>org.apache.juneau.config</c> API.
 			<ul>
 				<li>More consistent handling of comma-delimited lists of objects.
-				<li>New methods in {@del ConfigFile}:
+				<li>New methods in <del>ConfigFile</del>:
 					<ul>
-						<li>{@del ConfigFile#getStringArray(String)},{@del ConfigFile#getStringArray(String,String[])}
-						<li>{@del ConfigFile#getSectionAsBean(String,Class)} - Instantiate a new bean with property values in the specified section..
-						<li>{@del ConfigFile#writeProperties(String,Object,boolean,Class[])} - Copy the properties in a config file section into properties on an existing bean or POJO.
-						<li>{@del ConfigFile#getSectionMap(String)} - Get all the resolved values in a section.
-						<li>{@del ConfigFile#containsNonEmptyValue(String)} 
-						<li>{@del ConfigFile#isEncoded(String)} 
-						<li>{@del ConfigFile#addListener(ConfigFileListener)} - Listen for modification events on the config file.
-						<li>{@del ConfigFile#merge(ConfigFile)} - Merge the contents of another config file into this config file.
-						<li>{@del ConfigFile#getResolving()}, {@del ConfigFile#getResolving(StringVarResolver)} - Return an instance of the config file that resolves string variables.
+						<li><del>ConfigFile#getStringArray(String)</del>,<del>ConfigFile#getStringArray(String,String[])</del>
+						<li><del>ConfigFile.getSectionAsBean(String,Class)</del>- Instantiate a new bean with property values in the specified section..
+						<li><del>ConfigFile.writeProperties(String,Object,boolean,Class[])</del>- Copy the properties in a config file section into properties on an existing bean or POJO.
+						<li><del>ConfigFile.getSectionMap(String)</del>- Get all the resolved values in a section.
+						<li><del>ConfigFile.containsNonEmptyValue(String)</del>
+						<li><del>ConfigFile.isEncoded(String)</del>
+						<li><del>ConfigFile.addListener(ConfigFileListener)</del>- Listen for modification events on the config file.
+						<li><del>ConfigFile.merge(ConfigFile)</del>- Merge the contents of another config file into this config file.
+						<li><del>ConfigFile#getResolving()</del>, <del>ConfigFile.getResolving(StringVarResolver)</del>- Return an instance of the config file that resolves string variables.
 							Much more efficient than the previous design since the same underlying config file object is shared.
-						<li>{@del ConfigFile#toWritable()} - Wraps the config file in a {@del oaj.Writable} interface so that it can be serialized by the REST interface as a plain-text INI file instead of as a serialized POJO.
-						<li>{@del ConfigFile#getInt(String)} - Now supports <js>"M"</js> and <js>"K"</js> to identify millions and thousands.
+						<li><del>ConfigFile.toWritable()</del> - Wraps the config file in a <del>Writable</del>interface so that it can be serialized by the REST interface as a plain-text INI file instead of as a serialized POJO.
+						<li><del>ConfigFile.getInt(String)</del>- Now supports <js>"M"</js> and <js>"K"</js> to identify millions and thousands.
 					</ul>
-				<li>New methods in {@del ConfigMgr}:
+				<li>New methods in <del>ConfigMgr</del>:
 					<ul>
-						<li>{@del ConfigMgr#create()}, {@del ConfigMgr#create(Reader)}, {@del ConfigMgr#create(File)}
-						<li>{@del ConfigMgr#deleteAll()}	
+						<li><del>ConfigMgr#create()</del>, <del>ConfigMgr#create(Reader)</del>, <del>ConfigMgr#create(File)</del>
+						<li><del>ConfigMgr#deleteAll()</del>	
 					</ul>
-				<li>New methods in {@del Section}:
+				<li>New methods in <del>Section</del>:
 					<ul>
-						<li>{@del Section#setParent(ConfigFileImpl)} - Used by parsers to set the config file for this section.
-						<li>{@del Section#setName(String)} - Used by parsers to set the name for this section.
+						<li><del>Section.setParent(ConfigFileImpl)</del>- Used by parsers to set the config file for this section.
+						<li><del>Section.setName(String)</del> - Used by parsers to set the name for this section.
 					</ul>
 				<li>New interfaces:
 					<ul>
-						<li>{@del org.apache.juneau.config.ConfigFileListener}
-						<li>{@del org.apache.juneau.config.SectionListener}
-						<li>{@del org.apache.juneau.config.EntryListener}
+						<li><del>ConfigFileListener</del>
+						<li><del>SectionListener</del>
+						<li><del>EntryListener</del>
 					</ul>
-				<li>{@del org.apache.juneau.config.Encoder} methods have access to field names to use them as salt values.
+				<li><del>Encoder</del> methods have access to field names to use them as salt values.
 				<li>The name of the default section is now <js>"default"</js>.  Before it was just <jk>null</jk>.
-				<li>{@del org.apache.juneau.config.XorEncoder} XOR key can be overridden through the <js>"org.apache.juneau.config.XorEncoder.key"</js> system property.
+				<li><del>XorEncoder</del> XOR key can be overridden through the <js>"org.apache.juneau.config.XorEncoder.key"</js> system property.
 			</ul> 
 		<li>Support for converting Strings to POJOs if the POJO class has any of the following static methods: 
 			<ul>
@@ -83,126 +83,126 @@
 		<li>Parsers have been enhanced to allow parent POJOs and field names to be passed into child POJOs.
 			New {@link oaj.annotation.NameProperty @NameProperty} and {@link oaj.annotation.ParentProperty @ParentProperty}
 				annotations are provided for identifying methods for setting names and parent POJOs on child POJOs.
-			For example, the config file {@del Section} class represents a section
-			in a config file.  It needs to know it's own name and have a link to the {@del ConfigFile} 
+			For example, the config file <del>Section</del> class represents a section
+			in a config file.  It needs to know it's own name and have a link to the <del>ConfigFile</del> 
 			that it belongs to.  With these new annotations, config files can be reconstructed using any of the parsers.
 		<li>New classes and interfaces:
 			<ul>
-				<li>{@del oaj.Streamable} interface for identifying objects that can be serialized directly to an output stream.
-				<li>{@del oaj.Writable} interface for identifying objects that can be serialized directly to a writer.
-				<li>{@del StringObject} class that can be used for delayed object serialization.
-				<li>{@del ByteArrayCache}
-				<li>{@del oaj.internal.ByteArrayInOutStream} 
+				<li><del>Streamable</del> interface for identifying objects that can be serialized directly to an output stream.
+				<li><del>Writable</del> interface for identifying objects that can be serialized directly to a writer.
+				<li><del>StringObject</del> class that can be used for delayed object serialization.
+				<li><del>ByteArrayCache</del>
+				<li><del>ByteArrayInOutStream</del>
 				<li>{@link oaj.internal.FileUtils}
 				<li>{@link oaj.internal.ThrowableUtils}
-				<li>{@del StringVarMultipart}
-				<li>{@del StringVarWithDefault}
+				<li><del>StringVarMultipart</del>
+				<li><del>StringVarWithDefault</del>
 			</ul> 
-		<li>New fields on {@del oaj.ObjectList}:
+		<li>New fields on <del>ObjectList</del>:
 			<ul>
-				<li>{@del oaj.ObjectList#EMPTY_LIST}
+				<li><del>ObjectList#EMPTY_LIST</del>
 			</ul>
-		<li>New fields and methods on {@del oaj.ObjectMap}:
+		<li>New fields and methods on <del>ObjectMap</del>:
 			<ul>
-				<li>{@del oaj.ObjectMap#EMPTY_MAP}
-				<li>{@del oaj.ObjectMap#getStringArray(String)}
-				<li>{@del oaj.ObjectMap#getStringArray(String,String[])}
-				<li>{@del oaj.ObjectMap#putIfNull(String,Object)}
-				<li>{@del oaj.ObjectMap#putIfEmpty(String,Object)}
+				<li><del>ObjectMap#EMPTY_MAP</del>
+				<li><del>ObjectMap#getStringArray(String)</del>
+				<li><del>ObjectMap#getStringArray(String,String[])</del>
+				<li><del>ObjectMap#putIfNull(String,Object)</del>
+				<li><del>ObjectMap#putIfEmpty(String,Object)</del>
 			</ul>
 		<li>New methods in {@link oaj.internal.ArrayUtils}:
 			<ul>
-				<li>{@del oaj.internal.ArrayUtils#contains(Object,Object[])}
-				<li>{@del oaj.internal.ArrayUtils#indexOf(Object,Object[])}
-				<li>{@del oaj.internal.ArrayUtils#toPrimitiveArray(Object)}
+				<li><del>ArrayUtils#contains(Object,Object[])</del>
+				<li><del>ArrayUtils#indexOf(Object,Object[])</del>
+				<li><del>ArrayUtils#toPrimitiveArray(Object)</del>
 			</ul>	
 		<li>New methods in {@link oaj.internal.IOUtils}:
 			<ul>
-				<li>{@del IOUtils#pipe(Reader,Writer)}
+				<li><del>IOUtils#pipe(Reader,Writer)</del>
 				<li>{@link oaj.internal.IOUtils#read(File)}
-				<li>{@del IOUtils#readFile(String)}
-				<li>{@del IOUtils#write(File,Reader)}
+				<li><del>IOUtils#readFile(String)</del>
+				<li><del>IOUtils#write(File,Reader)</del>
 			</ul>
-		<li>New methods on {@del oaj.utils.PojoRest}:
+		<li>New methods on <del>PojoRest</del>:
 			<ul>
-				<li>{@del PojoRest#get(Class,String,Object)}
-				<li>{@del oaj.utils.PojoRest#getString(String)}
-				<li>{@del oaj.utils.PojoRest#getString(String,String)}
-				<li>{@del oaj.utils.PojoRest#getInt(String)}
-				<li>{@del oaj.utils.PojoRest#getInt(String,Integer)}
-				<li>{@del oaj.utils.PojoRest#getLong(String)}
-				<li>{@del oaj.utils.PojoRest#getLong(String,Long)}
-				<li>{@del oaj.utils.PojoRest#getBoolean(String)}
-				<li>{@del oaj.utils.PojoRest#getBoolean(String,Boolean)}
-				<li>{@del oaj.utils.PojoRest#getMap(String)}
-				<li>{@del oaj.utils.PojoRest#getMap(String,Map)}
-				<li>{@del oaj.utils.PojoRest#getList(String)}
-				<li>{@del oaj.utils.PojoRest#getList(String,List)}
-				<li>{@del getObjectMap(String)}
-				<li>{@del getObjectMap(String,ObjectMap)}
-				<li>{@del getObjectList(String)}
-				<li>{@del getObjectList(String,ObjectList)}
+				<li><del>PojoRest#get(Class,String,Object)</del>
+				<li><del>PojoRest#getString(String)</del>
+				<li><del>PojoRest#getString(String,String)</del>
+				<li><del>PojoRest#getInt(String)</del>
+				<li><del>PojoRest#getInt(String,Integer)</del>
+				<li><del>PojoRest#getLong(String)</del>
+				<li><del>PojoRest#getLong(String,Long)</del>
+				<li><del>PojoRest#getBoolean(String)</del>
+				<li><del>PojoRest#getBoolean(String,Boolean)</del>
+				<li><del>PojoRest#getMap(String)</del>
+				<li><del>PojoRest#getMap(String,Map)</del>
+				<li><del>PojoRest#getList(String)</del>
+				<li><del>PojoRest#getList(String,List)</del>
+				<li><del>getObjectMap(String)</del>
+				<li><del>getObjectMap(String,ObjectMap)</del>
+				<li><del>getObjectList(String)</del>
+				<li><del>getObjectList(String,ObjectList)</del>
 			</ul>
-		<li>New methods on {@del oaj.utils.ProcBuilder}:
+		<li>New methods on <del>ProcBuilder</del>:
 			<ul>
-				<li>{@del oaj.utils.ProcBuilder#pipeTo(Writer,boolean)}
-				<li>{@del oaj.utils.ProcBuilder#pipeTo(Writer)}
-				<li>{@del oaj.utils.ProcBuilder#logTo(Writer,boolean)}
-				<li>{@del oaj.utils.ProcBuilder#logTo(Writer)}
-				<li>{@del oaj.utils.ProcBuilder#logTo(Level,Logger)}
-				<li>{@del oaj.utils.ProcBuilder#maxExitStatus(int)}
+				<li><del>ProcBuilder#pipeTo(Writer,boolean)</del>
+				<li><del>ProcBuilder#pipeTo(Writer)</del>
+				<li><del>ProcBuilder#logTo(Writer,boolean)</del>
+				<li><del>ProcBuilder#logTo(Writer)</del>
+				<li><del>ProcBuilder#logTo(Level,Logger)</del>
+				<li><del>ProcBuilder#maxExitStatus(int)</del>
 			</ul>
 		<li>New methods on {@link oaj.internal.StringUtils}:
 			<ul>
-				<li>{@del oaj.internal.StringUtils#isEmpty(Object)}
+				<li><del>StringUtils#isEmpty(Object)</del>
 				<li>{@link oaj.internal.StringUtils#nullIfEmpty(String)}
 				<li>{@link oaj.internal.StringUtils#base64EncodeToString(String)}
 				<li>{@link oaj.internal.StringUtils#base64Encode(byte[])}
 				<li>{@link oaj.internal.StringUtils#base64DecodeToString(String)}
 				<li>{@link oaj.internal.StringUtils#base64Decode(String)}
-				<li>{@del oaj.internal.StringUtils#generateUUID(int)}
+				<li><del>StringUtils#generateUUID(int)</del>
 				<li>{@link oaj.internal.StringUtils#trim(String)}
-				<li>{@del StringUtils#parseISO8601Date(String)}
+				<li><del>StringUtils#parseISO8601Date(String)</del>
 				<li>{@link oaj.internal.StringUtils#replaceVars(String,Map)}
-				<li>{@del oaj.internal.StringUtils#pathStartsWith(String,String)}
-				<li>{@del oaj.internal.StringUtils#pathStartsWith(String,String[])}
+				<li><del>StringUtils#pathStartsWith(String,String)</del>
+				<li><del>StringUtils#pathStartsWith(String,String[])</del>
 			</ul>
-		<li>New {@del StringVar#doResolve(String)} method.
-		<li>New {@del StringVarResolver#DEFAULT} field.
+		<li>New <del>StringVar.doResolve(String)</del>method.
+		<li>New <del>StringVarResolver.DEFAULT</del>field.
 		<li>Eliminated dependency on <c>javax.mail.internet.MimeUtility</c> by implementing our own {@link oaj.internal.StringUtils#base64Encode(byte[])} method.
-		<li>{@del oaj.transforms.CalendarSwap} and {@del oaj.transforms.DateSwap} classes now handle blank input better.  Returns <jk>null</jk> instead of throwing an exception.
+		<li><del>CalendarSwap</del> and <del>DateSwap</del> classes now handle blank input better.  Returns <jk>null</jk> instead of throwing an exception.
 		<li>{@link oaj.html.HtmlDocSerializer} specifies the default CSS location as <c>/servletPath/style.css</c> instead of <c>/servletPath/htdocs/juneau.css</c>.  
 			This coincides with enhancements made in the server code for specifying styles.
 		<li>{@link oaj.html.HtmlDocSerializer} wraps output in two div tags instead of one (e.g. <c>&lt;div class='outerdata'&gt;&lt;div class='data' id='data'&gt;...&lt;/div&gt;&lt;/div&gt;</c>).
 			Needed for supporting the new devops look-and-feel.
 		<li>Fixed indentation inconsistencies in {@link oaj.html.HtmlDocSerializer}.
-		<li>Renamed {@del HtmlSchemaSerializer} to {@del HtmlSchemaDocSerializer}.
+		<li>Renamed <del>HtmlSchemaSerializer</del> to <del>HtmlSchemaDocSerializer</del>.
 		<li>RDF serializers and parsers now support <c>RdfProperties.RDF_looseCollection</c> loose collections.
 		<li>RDF parser handles case where resources point to themselves (an unfortunate behavior in JFS RDF documents).
 		<li>JSON parser with throw an exception in strict mode if it encounters numbers that are valid in Java but invalid in JSON (e.g. octal, hexadecimal numbers).
 		<li>{@link oaj.parser.Parser} methods now check for <jk>null</jk> input.
-		<li>{@del oaj.serializer.SerializerGroup} and {@del oaj.parser.ParserGroup} ignores serializers and parsers if they throw <c>NoClassDefFoundErrors</c>.
+		<li><del>SerializerGroup</del> and <del>ParserGroup</del> ignores serializers and parsers if they throw <c>NoClassDefFoundErrors</c>.
 		<li>{@link oaj.urlencoding.UrlEncodingParser} creates lists if the same attribute name is encountered more than once.  Before it would just replace the previous value with the new value.
-		<li>New {@del UrlEncodingSerializer#DEFAULT_SIMPLE_EXPANDED} serializer.
-		<li>Changes to {@del Args}:
+		<li>New <del>UrlEncodingSerializer.DEFAULT_SIMPLE_EXPANDED</del>serializer.
+		<li>Changes to <del>Args</del>:
 			<ul>
-				<li><c>getMainArg(int)</c> changed to {@del Args#getArg(int)}.  
+				<li><c>getMainArg(int)</c> changed to <del>Args#getArg(int)</del>.  
 					Non-existent arguments are returned as <jk>null</jk> instead of blank strings.  
 					This is more inline with the behavior of the rest of the library.
-				<li>New {@del Args#hasArg(int)} method.
+				<li>New <del>Args.hasArg(int)</del> method.
 			</ul> 
 		<li>Removed <c>org.apache.juneau.utils.CharsetUtils</c> class.
 		<li>Removed <c>org.apache.juneau.utils.ConcurrentIdentityList</c> class.
 		<li>Fixed bug in {@link oaj.internal.MultiIterable} class.
-		<li>{@del oaj.utils.PojoIntrospector} must now be instantiated with a <c>ReaderParser</c>.
+		<li><del>PojoIntrospector</del> must now be instantiated with a <c>ReaderParser</c>.
 			Simplifies the API on the class.
-		<li>{@del oaj.utils.PojoRest} must now be instantiated with a <c>ReaderParser</c>.
+		<li><del>PojoRest</del> must now be instantiated with a <c>ReaderParser</c>.
 			Simplifies the API on the class.
-		<li>{@del oaj.utils.MessageBundle} and <c>SafeResourceMultiBundle</c> moved from server component.
-		<li>Several bug fixes and performance improvements in {@del StringVarResolver}.
-		<li>Various enhancements to {@del oaj.internal.TeeWriter} and {@del oaj.internal.TeeOutputStream}.
-		<li>Renamed {@del CharSet} to {@link oaj.internal.AsciiSet}.
-		<li>{@del oaj.serializer.SerializerGroup} and {@del oaj.parser.ParserGroup} now ignores <c>NoClassDefFoundErrors</c>
+		<li><del>MessageBundle</del> and <c>SafeResourceMultiBundle</c> moved from server component.
+		<li>Several bug fixes and performance improvements in <del>StringVarResolver</del>.
+		<li>Various enhancements to <del>TeeWriter</del> and <del>TeeOutputStream</del>.
+		<li>Renamed <del>CharSet</del> to {@link oaj.internal.AsciiSet}.
+		<li><del>SerializerGroup</del> and <del>ParserGroup</del>now ignores <c>NoClassDefFoundErrors</c>
 			so that resources that include Jena support can continue to operate even if the Jena libraries are not present.
 		<li>New {@link oaj.internal.FileUtils#createTempFile(String)} method.
 		<li>New {@link oaj.utils.PojoQuery} modified to handle bean getters that throw exceptions.
@@ -213,100 +213,100 @@
 		<li>Upgraded to use Apache HttpClient 4.5.
 		<li>New classes:
 			<ul>
-				<li>{@del oajrc.AllowAllRedirects}
-				<li>{@del oajrc.HttpMethod}
-				<li>{@del oajrc.ResponsePattern}
-				<li>{@del oajrc.SimpleX509TrustManager}
-				<li>{@del SSLOpts}
+				<li><del>AllowAllRedirects</del>
+				<li><del>HttpMethod</del>
+				<li><del>ResponsePattern</del>
+				<li><del>SimpleX509TrustManager</del>
+				<li><del>SSLOpts</del>
 			</ul>
 		<li>Removed <c>org.apache.juneau.rest.client.LaxRedirectStrategy</c>.  Use HTTP Client equivalent.
-		<li>New methods on {@del oajrc.RestCall}:
+		<li>New methods on <del>RestCall</del>:
 			<ul>
-				<li>{@del RestCall#addInterceptor(RestCallInterceptor)}
-				<li>{@del oajrc.RestCall#pipeTo(Writer)}
-				<li>{@del oajrc.RestCall#pipeTo(Writer,boolean)}
-				<li>{@del oajrc.RestCall#pipeTo(String,Writer,boolean)}
-				<li>{@del oajrc.RestCall#getWriter(String)}
-				<li>{@del oajrc.RestCall#pipeTo(OutputStream)}
-				<li>{@del oajrc.RestCall#pipeTo(OutputStream,boolean)}
-				<li>{@del oajrc.RestCall#pipeTo(String,OutputStream,boolean)}
-				<li>{@del oajrc.RestCall#getOutputStream(String)}
-				<li>{@del oajrc.RestCall#byLines()}
-				<li>{@del oajrc.RestCall#captureResponse()}
-				<li>{@del oajrc.RestCall#successPattern(String)}
-				<li>{@del oajrc.RestCall#failurePattern(String)}
-				<li>{@del RestCall#addResponsePattern(ResponsePattern)}
-				<li>{@del oajrc.RestCall#run()} - Renamed from <c>execute()</c>.
-				<li>{@del oajrc.RestCall#getCapturedResponse()}
-				<li>{@del oajrc.RestCall#getResponsePojoRest(Class)}
-				<li>{@del oajrc.RestCall#getResponsePojoRest()}
-				<li>{@del oajrc.RestCall#logTo(Level,Logger)}
-				<li>{@del oajrc.RestCall#setConfig(RequestConfig)}
+				<li><del>RestCall#addInterceptor(RestCallInterceptor)</del>
+				<li><del>RestCall#pipeTo(Writer)</del>
+				<li><del>RestCall#pipeTo(Writer,boolean)</del>
+				<li><del>RestCall#pipeTo(String,Writer,boolean)</del>
+				<li><del>RestCall#getWriter(String)</del>
+				<li><del>RestCall#pipeTo(OutputStream)</del>
+				<li><del>RestCall#pipeTo(OutputStream,boolean)</del>
+				<li><del>RestCall#pipeTo(String,OutputStream,boolean)</del>
+				<li><del>RestCall#getOutputStream(String)</del>
+				<li><del>RestCall#byLines()</del>
+				<li><del>RestCall#captureResponse()</del>
+				<li><del>RestCall#successPattern(String)</del>
+				<li><del>RestCall#failurePattern(String)</del>
+				<li><del>RestCall#addResponsePattern(ResponsePattern)</del>
+				<li><del>RestCall.run()</del>- Renamed from <c>execute()</c>.
+				<li><del>RestCall#getCapturedResponse()</del>
+				<li><del>RestCall#getResponsePojoRest(Class)</del>
+				<li><del>RestCall#getResponsePojoRest()</del>
+				<li><del>RestCall#logTo(Level,Logger)</del>
+				<li><del>RestCall#setConfig(RequestConfig)</del>
 			</ul>
-		<li>New lifecycle listener methods on {@del oajrc.RestCallInterceptor}:
+		<li>New lifecycle listener methods on <del>RestCallInterceptor</del>:
 			<ul>
-				<li>{@del RestCallInterceptor#onInit(RestCall)}
-				<li>{@del RestCallInterceptor#onClose(RestCall)}
+				<li><del>RestCallInterceptor#onInit(RestCall)</del>
+				<li><del>RestCallInterceptor#onClose(RestCall)</del>
 			</ul>
 		<li>New methods on {@link oajrc.RestClient}:
 			<ul>
-				<li>{@del RestClient#setBasicAuth(String,int,String,String)}
-				<li>{@del RestClient#logTo(Level,Logger)}
-				<li>{@del RestClient#setRootUrl(String)}
-				<li>{@del RestClient#enableSSL(SSLOpts)}
-				<li>{@del RestClient#enableLaxSSL()}
-				<li>{@del RestClient#doCall(HttpMethod,Object,Object)}
-				<li>{@del RestClient#createHttpClientBuilder()}
+				<li><del>RestClient#setBasicAuth(String,int,String,String)</del>
+				<li><del>RestClient#logTo(Level,Logger)</del>
+				<li><del>RestClient#setRootUrl(String)</del>
+				<li><del>RestClient#enableSSL(SSLOpts)</del>
+				<li><del>RestClient#enableLaxSSL()</del>
+				<li><del>RestClient#doCall(HttpMethod,Object,Object)</del>
+				<li><del>RestClient#createHttpClientBuilder()</del>
 			</ul>
 		<li>New passthrough methods on {@link oajrc.RestClient} defined on <c>HttpClientBuilder</c>:
 			<ul>
-				<li>{@del RestClient#setRedirectStrategy(RedirectStrategy)}
-				<li>{@del RestClient#setDefaultCookieSpecRegistry(Lookup)}
-				<li>{@del RestClient#setRequestExecutor(HttpRequestExecutor)}
-				<li>{@del RestClient#setSSLHostnameVerifier(HostnameVerifier)}
-				<li>{@del RestClient#setPublicSuffixMatcher(PublicSuffixMatcher)}
-				<li>{@del RestClient#setSSLContext(SSLContext)}
-				<li>{@del RestClient#setSSLSocketFactory(LayeredConnectionSocketFactory)}
-				<li>{@del RestClient#setMaxConnTotal(int)}
-				<li>{@del RestClient#setMaxConnPerRoute(int)}
-				<li>{@del RestClient#setDefaultSocketConfig(SocketConfig)}
-				<li>{@del RestClient#setDefaultConnectionConfig(ConnectionConfig)}
-				<li>{@del RestClient#setConnectionTimeToLive(long,TimeUnit)}
-				<li>{@del RestClient#setConnectionManager(HttpClientConnectionManager)}
-				<li>{@del RestClient#setConnectionManagerShared(boolean)}
-				<li>{@del RestClient#setConnectionReuseStrategy(ConnectionReuseStrategy)}
-				<li>{@del RestClient#setKeepAliveStrategy(ConnectionKeepAliveStrategy)}
-				<li>{@del RestClient#setTargetAuthenticationStrategy(AuthenticationStrategy)}
-				<li>{@del RestClient#setProxyAuthenticationStrategy(AuthenticationStrategy)}
-				<li>{@del RestClient#setUserTokenHandler(UserTokenHandler)}
-				<li>{@del RestClient#disableConnectionState()}
-				<li>{@del RestClient#setSchemePortResolver(SchemePortResolver)}
-				<li>{@del RestClient.setUserAgent(String)}
-				<li>{@del RestClient#setDefaultHeaders(Collection)}
-				<li>{@del RestClient#addInterceptorFirst(HttpResponseInterceptor)}
-				<li>{@del RestClient#addInterceptorLast(HttpResponseInterceptor)}
-				<li>{@del RestClient#addInterceptorFirst(HttpRequestInterceptor)}
-				<li>{@del RestClient#addInterceptorLast(HttpRequestInterceptor)}
-				<li>{@del RestClient#disableCookieManagement()}
-				<li>{@del RestClient#disableContentCompression()}
-				<li>{@del RestClient#disableAuthCaching()}
-				<li>{@del RestClient#setHttpProcessor(HttpProcessor)}
-				<li>{@del RestClient#setRetryHandler(HttpRequestRetryHandler)}
-				<li>{@del RestClient#disableAutomaticRetries()}
-				<li>{@del RestClient#setProxy(HttpHost)}
-				<li>{@del RestClient#setRoutePlanner(HttpRoutePlanner)}
-				<li>{@del RestClient#disableRedirectHandling()}
-				<li>{@del RestClient#setConnectionBackoffStrategy(ConnectionBackoffStrategy)}
-				<li>{@del RestClient#setBackoffManager(BackoffManager)}
-				<li>{@del RestClient#setServiceUnavailableRetryStrategy(ServiceUnavailableRetryStrategy)}
-				<li>{@del RestClient#setDefaultCookieStore(CookieStore)}
-				<li>{@del RestClient#setDefaultCredentialsProvider(CredentialsProvider)}
-				<li>{@del RestClient#setDefaultAuthSchemeRegistry(Lookup)}
-				<li>{@del RestClient#setContentDecoderRegistry(Map)}
-				<li>{@del RestClient#setDefaultRequestConfig(RequestConfig)}
-				<li>{@del RestClient#useSystemProperties()}
-				<li>{@del RestClient#evictExpiredConnections()}
-				<li>{@del RestClient#evictIdleConnections(long,TimeUnit)}
+				<li><del>RestClient#setRedirectStrategy(RedirectStrategy)</del>
+				<li><del>RestClient#setDefaultCookieSpecRegistry(Lookup)</del>
+				<li><del>RestClient#setRequestExecutor(HttpRequestExecutor)</del>
+				<li><del>RestClient#setSSLHostnameVerifier(HostnameVerifier)</del>
+				<li><del>RestClient#setPublicSuffixMatcher(PublicSuffixMatcher)</del>
+				<li><del>RestClient#setSSLContext(SSLContext)</del>
+				<li><del>RestClient#setSSLSocketFactory(LayeredConnectionSocketFactory)</del>
+				<li><del>RestClient#setMaxConnTotal(int)</del>
+				<li><del>RestClient#setMaxConnPerRoute(int)</del>
+				<li><del>RestClient#setDefaultSocketConfig(SocketConfig)</del>
+				<li><del>RestClient#setDefaultConnectionConfig(ConnectionConfig)</del>
+				<li><del>RestClient#setConnectionTimeToLive(long,TimeUnit)</del>
+				<li><del>RestClient#setConnectionManager(HttpClientConnectionManager)</del>
+				<li><del>RestClient#setConnectionManagerShared(boolean)</del>
+				<li><del>RestClient#setConnectionReuseStrategy(ConnectionReuseStrategy)</del>
+				<li><del>RestClient#setKeepAliveStrategy(ConnectionKeepAliveStrategy)</del>
+				<li><del>RestClient#setTargetAuthenticationStrategy(AuthenticationStrategy)</del>
+				<li><del>RestClient#setProxyAuthenticationStrategy(AuthenticationStrategy)</del>
+				<li><del>RestClient#setUserTokenHandler(UserTokenHandler)</del>
+				<li><del>RestClient#disableConnectionState()</del>
+				<li><del>RestClient#setSchemePortResolver(SchemePortResolver)</del>
+				<li><del>setUserAgent(String)</del>
+				<li><del>RestClient#setDefaultHeaders(Collection)</del>
+				<li><del>RestClient#addInterceptorFirst(HttpResponseInterceptor)</del>
+				<li><del>RestClient#addInterceptorLast(HttpResponseInterceptor)</del>
+				<li><del>RestClient#addInterceptorFirst(HttpRequestInterceptor)</del>
+				<li><del>RestClient#addInterceptorLast(HttpRequestInterceptor)</del>
+				<li><del>RestClient#disableCookieManagement()</del>
+				<li><del>RestClient#disableContentCompression()</del>
+				<li><del>RestClient#disableAuthCaching()</del>
+				<li><del>RestClient#setHttpProcessor(HttpProcessor)</del>
+				<li><del>RestClient#setRetryHandler(HttpRequestRetryHandler)</del>
+				<li><del>RestClient#disableAutomaticRetries()</del>
+				<li><del>RestClient#setProxy(HttpHost)</del>
+				<li><del>RestClient#setRoutePlanner(HttpRoutePlanner)</del>
+				<li><del>RestClient#disableRedirectHandling()</del>
+				<li><del>RestClient#setConnectionBackoffStrategy(ConnectionBackoffStrategy)</del>
+				<li><del>RestClient#setBackoffManager(BackoffManager)</del>
+				<li><del>RestClient#setServiceUnavailableRetryStrategy(ServiceUnavailableRetryStrategy)</del>
+				<li><del>RestClient#setDefaultCookieStore(CookieStore)</del>
+				<li><del>RestClient#setDefaultCredentialsProvider(CredentialsProvider)</del>
+				<li><del>RestClient#setDefaultAuthSchemeRegistry(Lookup)</del>
+				<li><del>RestClient#setContentDecoderRegistry(Map)</del>
+				<li><del>RestClient#setDefaultRequestConfig(RequestConfig)</del>
+				<li><del>RestClient#useSystemProperties()</del>
+				<li><del>RestClient#evictExpiredConnections()</del>
+				<li><del>RestClient.evictIdleConnections(long,TimeUnit)</del>
 			</ul>
 		<li><c>JazzRestClient</c> now supports OIDC authentication.
 		<li>These classes are now deprecated and will be removed in a future release:
@@ -322,62 +322,62 @@
 	
 	<h5 class='topic w800'>Server</h5>
 	<ul class='spaced-list'>
-		<li>New {@del ReaderResource} class.   
+		<li>New <del>ReaderResource</del> class.   
 			Represents the contents of a text file with convenience methods for resolving
-			{@del StringVar} variables and adding HTTP response headers.	
+			<del>StringVar</del> variables and adding HTTP response headers.	
 			REST Java methods can return instances of these to serialize <c>Readers</c>
-				containing text with {@del StringVarResolver} variables in them.
-		<li>New {@del StreamResource} class.   
+				containing text with <del>StringVarResolver</del> variables in them.
+		<li>New <del>StreamResource</del>class.   
 			REST Java methods can return instances of these to serialize <c>OutputStreams</c>.
-		<li>Fixed a bug in the stack trace hash algorithm in {@del oajr.RestException}.
+		<li>Fixed a bug in the stack trace hash algorithm in <del>RestException</del>.
 		<li>New methods in {@link oajr.RestRequest}:
 			<ul>
-				<li>{@del RestRequest#getReaderResource(String)} - Replaces <c>getVarResource(String)</c>.
-				<li>{@del RestRequest#getReaderResource(String,boolean)} 
-				<li>{@del RestRequest#getReaderResource(String,boolean,String)}
+				<li><del>RestRequest.getReaderResource(String)</del>- Replaces <c>getVarResource(String)</c>.
+				<li><del>RestRequest.getReaderResource(String,boolean)</del>
+				<li><del>RestRequest#getReaderResource(String,boolean,String)</del>
 			</ul>
 		<li>Changes in {@link oajr.RestResponse}:
 			<ul>
 				<li>Don't set <c>Content-Encoding: identity</c> when no encoding is used.  Some clients don't interpret it correctly.
 			</ul>
-		<li>New methods in {@del oajr.RestServlet}:
+		<li>New methods in <del>RestServlet</del>:
 			<ul>
-				<li>{@del RestServlet#getChildClasses()}  - Programmatic equivalent to {@del @RestResource(children)} annotation.
-				<li>{@del RestServlet#shouldLog(HttpServletRequest,HttpServletResponse,RestException)} 
-				<li>{@del RestServlet#shouldLogStackTrace(HttpServletRequest,HttpServletResponse,RestException)} 
-				<li>{@del RestServlet#logObjects(Level,String,Object[])} 
-				<li>{@del RestServlet#resolveStaticFile(String)} 
-				<li>{@del RestServlet#createStyleSheet()} 
-				<li>{@del RestServlet#createFavIcon()} 
-				<li>{@del RestServlet#createStaticFilesMap()} 
-				<li>{@del RestServlet#getConfigMgr()}
+				<li><del>RestServlet.getChildClasses()</del>  - Programmatic equivalent to <del>@RestResource(children)</del>annotation.
+				<li><del>RestServlet.shouldLog(HttpServletRequest,HttpServletResponse,RestException)</del>
+				<li><del>RestServlet.shouldLogStackTrace(HttpServletRequest,HttpServletResponse,RestException)</del>
+				<li><del>RestServlet.logObjects(Level,String,Object[])</del>
+				<li><del>RestServlet.resolveStaticFile(String)</del>
+				<li><del>RestServlet.createStyleSheet()</del>
+				<li><del>RestServlet.createFavIcon()</del>
+				<li><del>RestServlet.createStaticFilesMap()</del>
+				<li><del>RestServlet.getConfigMgr()</del>
 			</ul>
-		<li>Removed {@del oaj.jso.JsoParser}
-			from {@del oajr.BasicRestServlet} and {@del RestServletJenaDefault}.  
+		<li>Removed <del>JsoParser</del>
+			from <del>BasicRestServlet</del>and <del>RestServletJenaDefault</del>.  
 			These may represent a security risk if not handled correctly, so removed
 			them as a precaution.
-		<li>Removed <c>RestServletProperties.REST_htDocsFolder</c>.  Replaced with {@del @RestResource(staticFiles)}}.
-		<li>New annotations on {@del @RestResource}.
+		<li>Removed <c>RestServletProperties.REST_htDocsFolder</c>.  Replaced with <del>@RestResource(staticFiles)</del>}.
+		<li>New annotations on <del>@RestResource</del>.
 			<ul>
-				<li>{@del RestResource#stylesheet()}
-				<li>{@del RestResource#favicon()}
-				<li>{@del @RestResource(staticFiles)}
+				<li><del>RestResource#stylesheet()</del>
+				<li><del>RestResource#favicon()</del>
+				<li><del>@RestResource(staticFiles)</del>
 			</ul>
 		<li>Eliminated <c>org.apache.juneau.rest.jaxrs.JsonProvider</c> class.  
 			Some JAX-RS implementations use code scanning to find providers, so if you were using <c>DefaultJenaProvider</c>, it would
 			pick up <c>JsonProvider</c> as well.  It's easy enough to create your own implementation if needed.
 		<li>OPTIONS pages now specify <c>consumes</c> and <c>produces</c> fields instead of <c>accept</c> and <c>contentType</c> which was confusing.  
 		<li>Eliminated <c>properties</c> from OPTIONS pages. 
-		<li>New {@del ResourceLink#ResourceLink(String,RestRequest,String,Object[])} constructor.
+		<li>New <del>ResourceLink.ResourceLink(String,RestRequest,String,Object[])</del> constructor.
 		<li>New response handlers:
 			<ul>
-				<li>{@del StreamableHandler} - Allows REST Java methods to return instances of {@del oaj.Streamable}.
-				<li>{@del WritableHandler} - Allows REST Java methods to return instances of {@del oaj.Writable}.
+				<li><del>StreamableHandler</del> - Allows REST Java methods to return instances of <del>Streamable</del>.
+				<li><del>WritableHandler</del>- Allows REST Java methods to return instances of <del>Writable</del>.
 			</ul>
 		<li>New DevOps stylesheet.
 		<li>Servlet initialization and HTTP requests are now logged at <JSF>FINE</JSF> level.
 		<li>Added <jk>abstract</jk> modifier on various <l>RestServlet</l> subclasses to indicate that they're meant to be subclassed.
-		<li>New {@del RestUtils#trimPathInfo(StringBuffer,String,String)} method.
+		<li>New <del>RestUtils.trimPathInfo(StringBuffer,String,String)</del> method.
 	</ul>
 	
 	<h5 class='topic w800'>Microservice</h5>
@@ -385,7 +385,7 @@
 		<li>Completely revamped API.
 		<li>New {@link oaj.microservice.Microservice} class that serves as a generic
 			interface for microservices and their lifecycles.
-		<li>New {@del RestMicroservice} class that implements a microservice
+		<li>New <del>RestMicroservice</del> class that implements a microservice
 			consisting of a REST interface.
 			<ul>
 				<li>REST resources and configuration settings can be defined through either manifest files
@@ -397,14 +397,14 @@
 			</ul>
 		<li>Eliminated <c>org.apache.juneau.microservice.Main</c> class.  This is replaced by
 			the microservice classes defined above.
-		<li>{@del Resource} and {@del ResourceGroup}
+		<li><del>Resource</del> and <del>ResourceGroup</del>
 			classes now support the following new string variables:
 			<ul>
 				<li><js>"$A{key,default}""</js> - Command line arguments.
 				<li><js>"$MF{key,default}""</js> - Manifest file entries.
 			</ul> 
 		<li>CSS stylesheet now configurable through config file entry <js>"REST/stylesheet"</js>.
-		<li>New {@del BasicRestServletJena} class if you want your REST interface to support RDF.
+		<li>New <del>BasicRestServletJena</del> class if you want your REST interface to support RDF.
 		<li>Eliminated the following classes:
 			<ul>
 				<li><c>org.apache.juneau.microservice.RootResource</c>
@@ -427,12 +427,12 @@
 	
 	<h5 class='topic w800'>Documentation Updates</h5>
 	<ul class='spaced-list'>
-		<li>{@del org.apache.juneau.microservice} - New package-level javadoc.
-		<li>{@del org.apache.juneau.config} - New package-level javadoc.
-		<li>{@del StringVarResolver} - New documentation.
-		<li>{@del org.apache.juneau.rest.client} - New package-level javadoc.
+		<li><del>microservice</del> - New package-level javadoc.
+		<li><del>config</del> - New package-level javadoc.
+		<li><del>StringVarResolver</del> - New documentation.
+		<li><del>client</del> - New package-level javadoc.
 		<li><dc>Overview / Samples</dc> - New section.
 		<li><dc>org.apache.juneau.swap / Stop Classes</dc> - New section.
-		<li>{@del org.apache.juneau.rest} - Extensive updates.
+		<li><del>rest</del>- Extensive updates.
 	</ul>
 </div>
\ No newline at end of file
diff --git a/juneau-doc/docs/ReleaseNotes/5.2.0.1.html b/juneau-doc/docs/ReleaseNotes/5.2.0.1.html
index 18ad82718..92d9064a7 100644
--- a/juneau-doc/docs/ReleaseNotes/5.2.0.1.html
+++ b/juneau-doc/docs/ReleaseNotes/5.2.0.1.html
@@ -26,33 +26,33 @@
 			Any line that begins with whitespace is interpreted as a continuation of the previous line.
 		<li>Support for <js>'\uXXXX'</js> character sequences in config files.
 		<li>Fixed issue in {@link oaj.xml.XmlSerializer} where <js>'\r'</js> and <js>'\n'</js> characters were not being handled per XML specs.
-		<li>New methods on {@del oaj.ObjectList}:  
+		<li>New methods on <del>ObjectList</del>:  
 			<ul>
-				<li>{@del ObjectList#getAt(Class,String)}
-				<li>{@del oaj.ObjectList#putAt(String,Object)}
-				<li>{@del oaj.ObjectList#postAt(String,Object)}
-				<li>{@del oaj.ObjectList#deleteAt(String)}
+				<li><del>ObjectList#getAt(Class,String)</del>
+				<li><del>ObjectList#putAt(String,Object)</del>
+				<li><del>ObjectList#postAt(String,Object)</del>
+				<li><del>ObjectList#deleteAt(String)</del>
 			</ul>
-		<li>New methods on {@del oaj.ObjectMap}:  
+		<li>New methods on <del>ObjectMap</del>:  
 			<ul>
-				<li>{@del ObjectMap#getAt(Class,String)}
-				<li>{@del oaj.ObjectMap#putAt(String,Object)}
-				<li>{@del oaj.ObjectMap#postAt(String,Object)}
-				<li>{@del oaj.ObjectMap#deleteAt(String)}
+				<li><del>ObjectMap#getAt(Class,String)</del>
+				<li><del>ObjectMap#putAt(String,Object)</del>
+				<li><del>ObjectMap#postAt(String,Object)</del>
+				<li><del>ObjectMap.deleteAt(String)</del>
 			</ul>
-		<li>{@del @ThreadSafe} annotation.
+		<li><del>@ThreadSafe</del>annotation.
 		<li>New <c>ClassFilter</c> class.
-		<li>{@del ConfigFile#getResolving(StringVarResolver,boolean)} method.
-		<li>{@del ConfigFile#getStringVar()} method.
-		<li>New {@del ParserContext#PARSER_trimStrings} property.
-		<li>New {@del SerializerContext#SERIALIZER_trimStrings} property.
-		<li>{@del Args#getStringVar()} method.
+		<li><del>ConfigFile.getResolving(StringVarResolver,boolean)</del>method.
+		<li><del>ConfigFile.getStringVar()</del>method.
+		<li>New <del>ParserContext.PARSER_trimStrings</del>property.
+		<li>New <del>SerializerContext.SERIALIZER_trimStrings</del>property.
+		<li><del>Args.getStringVar()</del> method.
 		<li>New {@link oaj.utils.ManifestFile} class
-		<li>New {@del oaj.utils.MessageBundle} class.  Replaces <l>SafeResourceBundle</l>/<l>SafeResourceMultiBundle</l>/<l>RestNls</l>.
-		<li>New {@del StringMapVar} class.
-		<li>New {@del StringVars} class with reusable common {@del StringVar} instances.
-		<li>New {@del oaj.internal.JuneauLogger} class.
-		<li>Default value for {@del XmlParserContext#XML_trimWhitespace} changed to <jk>true</jk>.			
+		<li>New <del>MessageBundle</del> class.  Replaces <l>SafeResourceBundle</l>/<l>SafeResourceMultiBundle</l>/<l>RestNls</l>.
+		<li>New <del>StringMapVar</del> class.
+		<li>New <del>StringVars</del> class with reusable common <del>StringVar</del> instances.
+		<li>New <del>JuneauLogger</del>class.
+		<li>Default value for <del>XmlParserContext.XML_trimWhitespace</del>changed to <jk>true</jk>.			
 	</ul>
 	
 	<h5 class='topic w800'>Server</h5>
diff --git a/juneau-doc/docs/ReleaseNotes/6.0.0.html b/juneau-doc/docs/ReleaseNotes/6.0.0.html
index 40c0cd1bc..fd42fd1c4 100644
--- a/juneau-doc/docs/ReleaseNotes/6.0.0.html
+++ b/juneau-doc/docs/ReleaseNotes/6.0.0.html
@@ -53,17 +53,17 @@
 			The following features were added to enable this support:
 			<ul>
 				<li>{@link oaj.annotation.Bean#typeName() @Bean(typeName)} - Annotation that defines an identifying name for a bean class.
-				<li>{@del oaj.transform.BeanFilterBuilder#typeName(String)} - Programmatic equivalent to annotation above.
-				<li>{@del oaj.BeanContext#BEAN_beanDictionary} - List of bean classes that make up the bean dictionary for lookup
+				<li><del>BeanFilterBuilder.typeName(String)</del>- Programmatic equivalent to annotation above.
+				<li><del>BeanContext.BEAN_beanDictionary</del> - List of bean classes that make up the bean dictionary for lookup
 					during parsing. 
-				<li>{@del BEAN_beanTypePropertyName} - The overridable type property name.  Default is <js>"_type"</js>.
-				<li>{@del @BeanProperty(beanDictionary)} - Define a type dictionary
-					for a particular bean property value.  This overrides the value specified using {@del oaj.BeanContext#BEAN_beanDictionary}.
-				<li>{@del SerializerContext#SERIALIZER_addBeanTypeProperties} - Controls whether type properties are serialized.
+				<li><del>BEAN_beanTypePropertyName</del> - The overridable type property name.  Default is <js>"_type"</js>.
+				<li><del>@BeanProperty(beanDictionary)</del>- Define a type dictionary
+					for a particular bean property value.  This overrides the value specified using <del>BeanContext#BEAN_beanDictionary</del>.
+				<li><del>SerializerContext.SERIALIZER_addBeanTypeProperties</del>- Controls whether type properties are serialized.
 			</ul>
 			In addition, the {@link oaj.annotation.Bean#typeName() @Bean(typeName)} value replaces the <c>@Xml(name)</c> annotation, and the 
 			<js>"type"</js> and <js>"_class"</js> attributes in the XML and HTML serializers have been standardized on a single <js>"_type"</js> attribute.
-		<li>Refactor bean filter support to use {@del oaj.transform.BeanFilterBuilder} class.
+		<li>Refactor bean filter support to use <del>BeanFilterBuilder</del> class.
 			Allows the <c>BeanFilter</c> class to use final fields.
 		<li>{@link oaj.msgpack MessagePack} support.
 		<li>Serializers can now serialize directly to {@link java.io.File Files}.
@@ -77,40 +77,40 @@
 		<li>New methods on {@link oaj.parser.Parser}:
 			<ul>
 				<li><c>org.apache.juneau.parser.Parser.createSession(ObjectMap,Method,Object)</c>
-				<li>{@del Parser#getMediaRanges()}
+				<li><del>Parser#getMediaRanges()</del>
 			</ul>
 		</li>
 		<li>New methods on {@link oaj.serializer.Serializer}:
 			<ul>
 				<li><c>org.apache.juneau.serializer.Serializer.createSession(ObjectMap,Method)</c>
-				<li>{@del Serializer#getMediaRanges()}
+				<li><del>Serializer#getMediaRanges()</del>
 			</ul>
 		</li>
 		<li>New {@link oaj.annotation.Bean#sort() @Bean(sort)} annotation.
 		<li>Added <ja>@Bean.properties</ja> annotations on various DTO beans to make the ordering consistent
 			between IBM and Oracle JVMs.<br>
 			IBM JVMs maintain the order of methods in a class, whereas Oracle JVMs do not.
-		<li>Serializers and parsers now automatically convert {@link java.lang.Class} objects to readable names via {@del ClassUtils#getReadableClassName(Class)}.
+		<li>Serializers and parsers now automatically convert {@link java.lang.Class} objects to readable names via <del>ClassUtils.getReadableClassName(Class)</del>.
 		<li>Eliminated the <c>ClassFilter</c> class since it's no longer needed.
-		<li>Code and concurrency improvements to {@del oaj.serializer.SerializerGroup} and {@del oaj.parser.ParserGroup}.
-		<li>Various enhancements to {@del BeanContext#convertToType(Object,Class)}.
+		<li>Code and concurrency improvements to <del>SerializerGroup</del>and <del>ParserGroup</del>.
+		<li>Various enhancements to <del>BeanContext#convertToType(Object,Class)</del>.
 		<li>New properties on {@link oaj.html.HtmlSerializer}:
 			<ul>
-				<li>{@del HtmlSerializerContext#HTML_detectLinksInStrings} - Automatically detect hyperlinks in strings.
-				<li>{@del HtmlSerializerContext#HTML_lookForLabelParameters} - Specify anchor text by appending <c>&amp;label=MyLabel</c> to URL.
-				<li>{@del HtmlSerializerContext#HTML_labelParameter} - Specify what URL parameter to use as the anchor text label.
-				<li>{@del HtmlSerializerContext#URI_ANCHOR} option for {@del HtmlSerializerContext#HTML_uriAnchorText}.				
+				<li><del>HtmlSerializerContext.HTML_detectLinksInStrings</del>- Automatically detect hyperlinks in strings.
+				<li><del>HtmlSerializerContext.HTML_lookForLabelParameters</del>- Specify anchor text by appending <c>&amp;label=MyLabel</c> to URL.
+				<li><del>HtmlSerializerContext.HTML_labelParameter</del>- Specify what URL parameter to use as the anchor text label.
+				<li><del>HtmlSerializerContext.URI_ANCHOR</del>option for <del>HtmlSerializerContext.HTML_uriAnchorText</del>.				
 			</ul>
 		</li>
 		<li>Removed generics from {@link oaj.BeanPropertyMeta}.
 		<li>Introduced new classes to eliminate the references to language-specific metadata in the core metadata classes:
 			<ul>
-				<li>{@del ClassMetaExtended} / {@del ClassMeta#getExtendedMeta(Class)} 
-				<li>{@del BeanMetaExtended} /{@del BeanMeta#getExtendedMeta(Class)} 
-				<li>{@del BeanPropertyMetaExtended} / {@del BeanPropertyMeta#getExtendedMeta(Class)} 
+				<li><del>ClassMetaExtended</del>/ <del>ClassMeta.getExtendedMeta(Class)</del> 
+				<li><del>BeanMetaExtended</del>/<del>BeanMeta.getExtendedMeta(Class)</del> 
+				<li><del>BeanPropertyMetaExtended</del>/ <del>BeanPropertyMeta.getExtendedMeta(Class)</del> 
 			</ul>
 		</li>
-		<li>Renamed <c>@Transform</c> annotation to {@del @Pojo} so that it can be used for various POJO-related behavior, not just associating transforms.  
+		<li>Renamed <c>@Transform</c> annotation to <del>@Pojo</del> so that it can be used for various POJO-related behavior, not just associating transforms.  
 		<li>Introduced {@link oaj.dto.swagger Swagger DTOs}.
 	</ul>		
 	
@@ -123,47 +123,47 @@
 				<li>Eliminated <c>ResourceOptions</c> and related code.
 				<li>New annotations and related methods:
 					<ul>
-						<li>{@del @RestResource(title)} / {@del oajr.RestInfoProvider#getTitle(RestRequest)}
-						<li>{@del @RestResource(description)} / {@del oajr.RestInfoProvider#getDescription(RestRequest)}
-						<li>{@del @RestResource(termsOfService)} / {@del RestInfoProvider#getTermsOfService(RestRequest)}
-						<li>{@del @RestResource(contact)} / {@del RestInfoProvider#getContact(RestRequest)}
-						<li>{@del @RestResource(license)} / {@del RestInfoProvider#getLicense(RestRequest)}
-						<li>{@del @RestResource(version)} / {@del RestInfoProvider#getVersion(RestRequest)}
-						<li>{@del @RestResource(tags)} / {@del RestInfoProvider#getTags(RestRequest)}
-						<li>{@del @RestResource(externalDocs)} / {@del RestInfoProvidergetExternalDocs(RestRequest)}
-						<li>{@del oajr.annotation.RestMethod#summary() @RestMethod(summary)} / {@del RestInfoProvider#getMethodSummary(String,RestRequest)}
-						<li>{@del oajr.annotation.RestMethod#description() @RestMethod(description)} /{@del RestInfoProvider#getMethodDescription(String,RestRequest)}
-						<li>{@del @RestMethod(externalDocs)}
-						<li>{@del @RestMethod(tags)}
-						<li>{@del @RestMethod(deprecated)} 
-						<li>{@del @RestMethod(parameters)} 
-						<li>{@del @RestMethod(responses)}
+						<li><del>@RestResource(title)</del>/ <del>RestInfoProvider.getTitle(RestRequest)</del>
+						<li><del>@RestResource(description)</del>/ <del>RestInfoProvider.getDescription(RestRequest)</del>
+						<li><del>@RestResource(termsOfService)</del>/ <del>RestInfoProvider.getTermsOfService(RestRequest)</del>
+						<li><del>@RestResource(contact)</del>/ <del>RestInfoProvider.getContact(RestRequest)</del>
+						<li><del>@RestResource(license)</del>/ <del>RestInfoProvider.getLicense(RestRequest)</del>
+						<li><del>@RestResource(version)</del>/ <del>RestInfoProvider.getVersion(RestRequest)</del>
+						<li><del>@RestResource(tags)</del>/ <del>RestInfoProvider.getTags(RestRequest)</del>
+						<li><del>@RestResource(externalDocs)</del>/ <del>RestInfoProvidergetExternalDocs(RestRequest)</del>
+						<li><del>RestMethod.summary() @RestMethod(summary)</del>/ <del>RestInfoProvider#getMethodSummary(String,RestRequest)</del>
+						<li><del>RestMethod.description() @RestMethod(description)</del>/<del>RestInfoProvider.getMethodDescription(String,RestRequest)</del>
+						<li><del>@RestMethod(externalDocs)</del>
+						<li><del>@RestMethod(tags)</del>
+						<li><del>@RestMethod(deprecated)</del> 
+						<li><del>@RestMethod(parameters)</del>
+						<li><del>@RestMethod(responses)</del>
 					</ul>
 				</li>					
 			</ul>
-		<li>New {@del RestServletContext#paramFormat} context property.
-		<li>New/updated methods on {@del oajr.RestServlet}:
+		<li>New <del>RestServletContext.paramFormat</del>context property.
+		<li>New/updated methods on <del>RestServlet</del>:
 			<ul>
-				<li>{@del RestServlet#createProperties()}
-				<li>{@del RestServlet#createBeanContext(ObjectMap,Class[],Class[])}
-				<li>{@del RestServlet#createBeanFilters()}
-				<li>{@del RestServlet#createPojoSwaps()}
-				<li>{@del RestServlet#createParsers(ObjectMap,Class[],Class[])}
-				<li>{@del RestServlet#createUrlEncodingSerializer(ObjectMap,Class[],Class[])}
-				<li>{@del RestServlet#createUrlEncodingParser(ObjectMap,Class[],Class[])}
-				<li>{@del RestServlet#createConverters(ObjectMap)}
-				<li>{@del RestServlet#createDefaultRequestHeaders(ObjectMap)}
-				<li>{@del RestServlet#createDefaultResponseHeaders(ObjectMap)}
-				<li>{@del RestServlet#createEncoders(ObjectMap)}
-				<li>{@del RestServlet#createGuards(ObjectMap)}
-				<li>{@del RestServlet#createMimetypesFileTypeMap(ObjectMap)}
-				<li>{@del RestServlet#createResponseHandlers(ObjectMap)}
+				<li><del>RestServlet#createProperties()</del>
+				<li><del>RestServlet#createBeanContext(ObjectMap,Class[],Class[])</del>
+				<li><del>RestServlet#createBeanFilters()</del>
+				<li><del>RestServlet#createPojoSwaps()</del>
+				<li><del>RestServlet#createParsers(ObjectMap,Class[],Class[])</del>
+				<li><del>RestServlet#createUrlEncodingSerializer(ObjectMap,Class[],Class[])</del>
+				<li><del>RestServlet#createUrlEncodingParser(ObjectMap,Class[],Class[])</del>
+				<li><del>RestServlet#createConverters(ObjectMap)</del>
+				<li><del>RestServlet#createDefaultRequestHeaders(ObjectMap)</del>
+				<li><del>RestServlet#createDefaultResponseHeaders(ObjectMap)</del>
+				<li><del>RestServlet#createEncoders(ObjectMap)</del>
+				<li><del>RestServlet#createGuards(ObjectMap)</del>
+				<li><del>RestServlet#createMimetypesFileTypeMap(ObjectMap)</del>
+				<li><del>RestServlet#createResponseHandlers(ObjectMap)</del>
 			</ul>
 		</li>
 		<li>New client-version annotations:
 			<ul>
-				<li>{@del RestResource#clientVersionHeader}  - The name of the header used to identify the client version.
-				<li>{@del oajr.annotation.RestMethod#clientVersion}  - The client version range applied to a Java method.
+				<li><del>RestResource.clientVersionHeader</del> - The name of the header used to identify the client version.
+				<li><del>RestMethod.clientVersion</del> - The client version range applied to a Java method.
 			</ul>
 		</li>
 	</ul>
@@ -171,6 +171,6 @@
 	<h5 class='topic w800'>org.apache.juneau.rest.client</h5>
 	<ul class='spaced-list'>
 		<li>Removed the <c>JazzRestClient</c> class.
-		<li>New method {@del RestClient#setClientVersion(String)}.
+		<li>New method <del>RestClient#setClientVersion(String)</del>.
 	</ul>		
 </div>
\ No newline at end of file
diff --git a/juneau-doc/docs/ReleaseNotes/6.0.1.html b/juneau-doc/docs/ReleaseNotes/6.0.1.html
index 33394df76..34eaddc50 100644
--- a/juneau-doc/docs/ReleaseNotes/6.0.1.html
+++ b/juneau-doc/docs/ReleaseNotes/6.0.1.html
@@ -26,11 +26,11 @@
 			<ul>
 				<li>Several fixes to handle obscure edge cases.
 			</ul>
-		<li>New properties in {@del ParserContext}.
+		<li>New properties in <del>ParserContext</del>.
 			<ul>
-				<li>{@del ParserContext#PARSER_strict}
-				<li>{@del ParserContext#PARSER_inputStreamCharset}
-				<li>{@del ParserContext#PARSER_fileCharset}
+				<li><del>ParserContext#PARSER_strict</del>
+				<li><del>ParserContext#PARSER_inputStreamCharset</del>
+				<li><del>ParserContext#PARSER_fileCharset</del>
 			</ul>
 		<li>Removed <c>JsonParserContext.JSON_strictMode</c>.  Replaced by <c>PARSER_strict</c>.		
 		<li><c><jk>byte[]</jk></c> arrays can now be passed to {@link oaj.parser.Parser#parse(Object,Class)} for reader-based parsers.	
diff --git a/juneau-doc/docs/ReleaseNotes/6.1.0.html b/juneau-doc/docs/ReleaseNotes/6.1.0.html
index cc11d4f81..e93ab3fdf 100644
--- a/juneau-doc/docs/ReleaseNotes/6.1.0.html
+++ b/juneau-doc/docs/ReleaseNotes/6.1.0.html
@@ -44,9 +44,9 @@
 					<li>New {@link oaj.xml.annotation.XmlFormat#XMLTEXT} format that's identical to {@link oaj.xml.annotation.XmlFormat#TEXT} except 
 						XML content is not escaped and serialized directly as the child content.  The parser will reconvert this to the original XML text during parsing.
 				</ul>
-				<li>New support methodology and other improvements to {@del org.apache.juneau.xml} documentation.
+				<li>New support methodology and other improvements to <del>xml</del> documentation.
 				<li>Eliminated unnecessary <xt>&lt;string&gt;</xt> elements.
-				<li>Eliminated {@del XmlContentHandler} class.
+				<li>Eliminated <del>XmlContentHandler</del> class.
 				<li>Parser efficiency improvements through reuse of string builders.
 				<li>Reworked and simplified the default XML serializers.  The {@link oaj.xml.XmlSerializer#DEFAULT} serializer now has namespaces disabled,
 					and {@link oaj.xml.XmlSerializer#DEFAULT_NS} has namespaces enabled.  The 'XML-JSON' serializers have been eliminated.
@@ -58,23 +58,23 @@
 				<li>Parser converted from <c>XMLEventReader</c>-based to <c>XMLStreamReader</c>.
 				<li>Eliminated many unnecessary type tags and <xt>&lt;string&gt;</xt> elements and improved the readable layout.  
 					The new format is much leaner.
-				<li>New exhaustive support methodology section added to {@del org.apache.juneau.html} documentation.
+				<li>New exhaustive support methodology section added to <del>html</del> documentation.
 			</ul>
-		<li>New HTML5 DTO support:  {@del org.apache.juneau.dto.html5}.
+		<li>New HTML5 DTO support:  <del>html5</del>.
 		<li>{@link oaj.BeanContext} class split into separate {@link oaj.BeanContext} and {@link oaj.BeanSession} classes.
 		<ul>
 			<li>Session object meant to be single-use that can be discarded after use and contains session-level object cache and overridable Locale and TimeZone.
 		</ul>  
-		<li>{@del SerializerContext} and {@del ParserContext}
+		<li><del>SerializerContext</del> and <del>ParserContext</del>
 			now extend directly from {@link oaj.BeanContext}.
 		<li>{@link oaj.serializer.SerializerSession} and {@link oaj.parser.ParserSession}
 			now extend directly from {@link oaj.BeanSession}.
 		<li>New settings in {@link oaj.BeanContext}:
 		<ul>
-			<li>{@del BEAN_debug} - Debug setting.  Replaces individual debug properties in the serializer and parser contexts.
-			<li>{@del BEAN_locale} - Specifies a default locale at the context level.
-			<li>{@del BEAN_timeZone} - Specifies a default timezone at the context level.
-			<li>{@del BEAN_mediaType} - Specifies a default media type at the context level.
+			<li><del>BEAN_debug</del> - Debug setting.  Replaces individual debug properties in the serializer and parser contexts.
+			<li><del>BEAN_locale</del> - Specifies a default locale at the context level.
+			<li><del>BEAN_timeZone</del> - Specifies a default timezone at the context level.
+			<li><del>BEAN_mediaType</del> - Specifies a default media type at the context level.
 		</ul>
 		<li>Improvements to Parser class:  
 		<ul>
@@ -125,10 +125,10 @@
 		<jk>new</jk> JsonSerializer().setSimpleMode(<jk>true</jk>).setQuoteChar(<js>'"'</js>);
 				</p>
 		</ul>
-		<li>Simplified {@del oaj.transform.PojoSwap} class.  Now just two methods:
+		<li>Simplified <del>PojoSwap</del> class.  Now just two methods:
 		<ul>
-			<li>{@del oaj.transform.PojoSwap#swap(BeanSession,Object)}
-			<li>{@del oaj.transform.PojoSwap#unswap(BeanSession,Object,ClassMeta)}
+			<li><del>PojoSwap#swap(BeanSession,Object)</del>
+			<li><del>PojoSwap#unswap(BeanSession,Object,ClassMeta)</del>
 		</ul>
 		<li>General code improvements made to {@link oaj.ClassMeta} class.
 		<ul>
@@ -141,49 +141,49 @@
 			Allows for swaps and serializer/parser behavior to be tailored to individual media types.
 		<li>Several new {@link java.util.Calendar} and {@link java.util.Date} swaps:
 		<ul>
-			<li>{@del oaj.transforms.CalendarSwap.ToString},{@del oaj.transforms.DateSwap.ToString} - To {@link java.lang.String Strings} using the {@code Date.toString()} method.
-			<li>{@del oaj.transforms.CalendarSwap.ISO8601DT},{@del oaj.transforms.DateSwap.ISO8601DT} - To ISO8601 date-time strings.
-			<li>{@del oaj.transforms.CalendarSwap.ISO8601DTZ},{@del oaj.transforms.DateSwap.ISO8601DTZ} - Same as <jsf>ISO8601DT</jsf>, except always serializes in GMT.
-			<li>{@del oaj.transforms.CalendarSwap.ISO8601DTP},{@del oaj.transforms.DateSwap.ISO8601DTP} - Same as <jsf>ISO8601DT</jsf> except with millisecond precision.
-			<li>{@del oaj.transforms.CalendarSwap.ISO8601DTPZ},{@del oaj.transforms.DateSwap.ISO8601DTPZ} - Same as <jsf>ISO8601DTZ</jsf> except with millisecond precision.
-			<li>{@del oaj.transforms.CalendarSwap.RFC2822DT},{@del oaj.transforms.DateSwap.RFC2822DT} - To RFC2822 date-time strings.
-			<li>{@del oaj.transforms.CalendarSwap.RFC2822DTZ},{@del oaj.transforms.DateSwap.RFC2822DTZ} - Same as <jsf>RFC2822DT</jsf>, except always serializes in GMT.
-			<li>{@del oaj.transforms.CalendarSwap.RFC2822D},{@del oaj.transforms.DateSwap.RFC2822D} - To RFC2822 date strings.
-			<li>{@del oaj.transforms.CalendarSwap.DateTimeSimple},{@del oaj.transforms.DateSwap.DateTimeSimple} - To simple <js>"yyyy/MM/dd HH:mm:ss"</js> date-time strings.
-			<li>{@del oaj.transforms.CalendarSwap.DateSimple},{@del oaj.transforms.DateSwap.DateSimple} - To simple <js>"yyyy/MM/dd"</js> date strings.
-			<li>{@del oaj.transforms.CalendarSwap.TimeSimple},{@del oaj.transforms.DateSwap.TimeSimple} - To simple <js>"HH:mm:ss"</js> time strings.
-			<li>{@del oaj.transforms.CalendarSwap.DateFull},{@del oaj.transforms.DateSwap.DateFull} - To {@link java.text.DateFormat#FULL} date strings.
-			<li>{@del oaj.transforms.CalendarSwap.DateLong},{@del oaj.transforms.DateSwap.DateLong} - To {@link java.text.DateFormat#LONG} date strings.
-			<li>{@del oaj.transforms.CalendarSwap.DateMedium},{@del oaj.transforms.DateSwap.DateMedium} - To {@link java.text.DateFormat#MEDIUM} date strings.
-			<li>{@del oaj.transforms.CalendarSwap.DateShort},{@del oaj.transforms.DateSwap.DateShort} - To {@link java.text.DateFormat#SHORT} date strings.
-			<li>{@del oaj.transforms.CalendarSwap.TimeFull},{@del oaj.transforms.DateSwap.TimeFull} - To {@link java.text.DateFormat#FULL} time strings.
-			<li>{@del oaj.transforms.CalendarSwap.TimeLong},{@del oaj.transforms.DateSwap.TimeLong} - To {@link java.text.DateFormat#LONG} time strings.
-			<li>{@del oaj.transforms.CalendarSwap.TimeMedium},{@del oaj.transforms.DateSwap.TimeMedium} - To {@link java.text.DateFormat#MEDIUM} time strings.
-			<li>{@del oaj.transforms.CalendarSwap.TimeShort},{@del oaj.transforms.DateSwap.TimeShort} - To {@link java.text.DateFormat#SHORT} time strings.
-			<li>{@del oaj.transforms.CalendarSwap.DateTimeFull},{@del oaj.transforms.DateSwap.DateTimeFull} - To {@link java.text.DateFormat#FULL} date-time strings.
-			<li>{@del oaj.transforms.CalendarSwap.DateTimeLong},{@del oaj.transforms.DateSwap.DateTimeLong} - To {@link java.text.DateFormat#LONG} date-time strings.
-			<li>{@del oaj.transforms.CalendarSwap.DateTimeMedium},{@del oaj.transforms.DateSwap.DateTimeMedium} - To {@link java.text.DateFormat#MEDIUM} date-time strings.
-			<li>{@del oaj.transforms.CalendarSwap.DateTimeShort},{@del oaj.transforms.DateSwap.DateTimeShort} - To {@link java.text.DateFormat#SHORT} date-time strings.
+			<li><del>ToString</del>,<del>ToString</del> - To {@link java.lang.String Strings} using the {@code Date.toString()} method.
+			<li><del>ISO8601DT</del>,<del>ISO8601DT</del> - To ISO8601 date-time strings.
+			<li><del>ISO8601DTZ</del>,<del>ISO8601DTZ</del> - Same as <jsf>ISO8601DT</jsf>, except always serializes in GMT.
+			<li><del>ISO8601DTP</del>,<del>ISO8601DTP</del> - Same as <jsf>ISO8601DT</jsf> except with millisecond precision.
+			<li><del>ISO8601DTPZ</del>,<del>ISO8601DTPZ</del> - Same as <jsf>ISO8601DTZ</jsf> except with millisecond precision.
+			<li><del>RFC2822DT</del>,<del>RFC2822DT</del> - To RFC2822 date-time strings.
+			<li><del>RFC2822DTZ</del>,<del>RFC2822DTZ</del> - Same as <jsf>RFC2822DT</jsf>, except always serializes in GMT.
+			<li><del>RFC2822D</del>,<del>RFC2822D</del> - To RFC2822 date strings.
+			<li><del>DateTimeSimple</del>,<del>DateTimeSimple</del> - To simple <js>"yyyy/MM/dd HH:mm:ss"</js> date-time strings.
+			<li><del>DateSimple</del>,<del>DateSimple</del> - To simple <js>"yyyy/MM/dd"</js> date strings.
+			<li><del>TimeSimple</del>,<del>TimeSimple</del> - To simple <js>"HH:mm:ss"</js> time strings.
+			<li><del>DateFull</del>,<del>DateFull</del> - To {@link java.text.DateFormat.FULL} date strings.
+			<li><del>DateLong</del>,<del>DateLong</del>- To {@link java.text.DateFormat#LONG} date strings.
+			<li><del>DateMedium</del>,<del>DateMedium</del> - To {@link java.text.DateFormat.MEDIUM} date strings.
+			<li><del>DateShort</del>,<del>DateShort</del>- To {@link java.text.DateFormat#SHORT} date strings.
+			<li><del>TimeFull</del>,<del>TimeFull</del> - To {@link java.text.DateFormat.FULL} time strings.
+			<li><del>TimeLong</del>,<del>TimeLong</del>- To {@link java.text.DateFormat#LONG} time strings.
+			<li><del>TimeMedium</del>,<del>TimeMedium</del> - To {@link java.text.DateFormat.MEDIUM} time strings.
+			<li><del>TimeShort</del>,<del>TimeShort</del>- To {@link java.text.DateFormat#SHORT} time strings.
+			<li><del>DateTimeFull</del>,<del>DateTimeFull</del> - To {@link java.text.DateFormat.FULL} date-time strings.
+			<li><del>DateTimeLong</del>,<del>DateTimeLong</del>- To {@link java.text.DateFormat#LONG} date-time strings.
+			<li><del>DateTimeMedium</del>,<del>DateTimeMedium</del> - To {@link java.text.DateFormat.MEDIUM} date-time strings.
+			<li><del>DateTimeShort</del>,<del>DateTimeShort</del>- To {@link java.text.DateFormat#SHORT} date-time strings.
 		</ul>  
-		<li>New method {@del oaj.serializer.SerializerGroup#getSerializerMatch(String)} that returns the matched serializer and media type.
-		<li>New method {@del oaj.parser.ParserGroup#getParserMatch(String)} that returns the matched parser and media type.
-		<li>New method {@del oaj.encoders.EncoderGroup#getEncoderMatch(String)} that returns the matched encoder and encoding.
+		<li>New method <del>SerializerGroup.getSerializerMatch(String)</del>that returns the matched serializer and media type.
+		<li>New method <del>ParserGroup.getParserMatch(String)</del>that returns the matched parser and media type.
+		<li>New method <del>EncoderGroup.getEncoderMatch(String)</del>that returns the matched encoder and encoding.
 		<li>General improvements to Bean Dictionary support.
 			<ul>
 				<li>New {@link oaj.BeanDictionaryList} class can be used for defining reusable sets of bean dictionaries consisting
 					of classes annotated with {@link oaj.annotation.Bean#typeName() @Bean(typeName)}.
 				<li>New {@link oaj.BeanDictionaryMap} class can be used for defining reusable sets of bean dictionaries consisting
 					of classes not annotated with {@link oaj.annotation.Bean#typeName() @Bean(typeName)}.
-				<li>New {@del @Bean(beanDictionary)} annotation.
+				<li>New <del>@Bean(beanDictionary)</del> annotation.
 			</ul>
-		<li>Removed restriction on getters and setters to be prefixed with "getX/setX/isX" if a {@del @BeanProperty(name)} annotation is used.
+		<li>Removed restriction on getters and setters to be prefixed with "getX/setX/isX" if a <del>@BeanProperty(name)</del> annotation is used.
 		<li>Improvements to ATOM DTO:
 			<ul>
 				<li>New {@link oaj.dto.atom.AtomBuilder} class.
 				<li>New setter method names for a better fluent design.
-				<li>Updated {@del org.apache.juneau.dto.atom} documentation.
+				<li>Updated <del>atom</del> documentation.
 			</ul>
-		<li>New {@del oaj.transform.MapSwap} and {@del oaj.transform.StringSwap} classes.
+		<li>New <del>MapSwap</del> and <del>StringSwap</del> classes.
 		<li>New {@link oaj.serializer.WriterSerializer#println(Object)} method.  Useful for debugging purposes.
 		<li>New {@link oaj.BeanContext#getClassMeta(Type,Type...)} and {@link oaj.BeanSession#getClassMeta(Type,Type...)}
 			methods for retrieving Map and Collection class metas.  
@@ -201,46 +201,46 @@
 				serializers since there is no separate simple mode anymore.
 			<li>Eliminated the <c>UonParserContext.<jsf>UON_simpleMode</jsf></c> configuration setting.
 		</ul>
-		<li>Added new {@del OutputStreamSerializer#serializeToHex(Object)} method. 
+		<li>Added new <del>OutputStreamSerializer.serializeToHex(Object)</del>method. 
 			<br>Useful mostly for testing purposes.
 			<br>Equivalently, the {@link oaj.parser.InputStreamParser#parse(Object,Class)} method can now 
 				read the output from this method.
 		<li>Eliminated the <c><ja>@Bean</ja>(subTypeProperty)</c> and <c><ja>@Bean</ja>(subTypes)</c> annotations
-			and replaced them with the ability to define subtypes using the existing {@del @Bean(beanDictionary)}
+			and replaced them with the ability to define subtypes using the existing <del>@Bean(beanDictionary)</del>
 			annotation on parent classes and interfaces.
 			<br>This has the added benefit of simplifying the overall code.
-		<li>The {@del SerializerContext#SERIALIZER_addBeanTypeProperties} setting is now enabled by default.
+		<li>The <del>SerializerContext.SERIALIZER_addBeanTypeProperties</del>setting is now enabled by default.
 		<li>Combined the <c>SERIALIZER_addIndentation</c>/<c>JSON_addWhitespace</c>/<c>UON_addWhitespace</c>
-			properties into a single {@del SerializerContext#SERIALIZER_useWhitespace} setting.
+			properties into a single <del>SerializerContext.SERIALIZER_useWhitespace</del>setting.
 	</ul>
 	
 	<h5 class='topic w800'>org.apache.juneau.rest</h5>
 	<ul class='spaced-list'>
 		<li>{@link oajr.RestRequest} now passes locale and timezone to serializers/parsers/transforms.
-		<li>{@del RestRequest#getTimeZone()} method.
+		<li><del>RestRequest.getTimeZone()</del>method.
 		<li>Standardized the following methods in {@link oajr.RestRequest} to remove dependency on <c>ClassMeta</c>
 			objects and eliminate the need for casts:
 			<ul>
-				<li>{@del RestRequest#getHeader(String,Class)}
-				<li>{@del RestRequest#getHeader(String,Object,Class)}
+				<li><del>RestRequest#getHeader(String,Class)</del>
+				<li><del>RestRequest#getHeader(String,Object,Class)</del>
 				<li>{@del RestRequest#getHeader(String,Type,Type...)}
-				<li>{@del RestRequest#getQueryParameter(String,Class)}
-				<li>{@del RestRequest#getQueryParameter(String,Object,Class)}
+				<li><del>RestRequest#getQueryParameter(String,Class)</del>
+				<li><del>RestRequest#getQueryParameter(String,Object,Class)</del>
 				<li>{@del RestRequest#getQueryParameter(String,Type,Type...)}
 				<li>{@del RestRequest#getQueryParameter(String,Object,Type,Type...)}
-				<li>{@del RestRequest#getQueryParameters(String,Class)}
+				<li><del>RestRequest#getQueryParameters(String,Class)</del>
 				<li>{@del RestRequest#getQueryParameters(String,Type,Type...)}
-				<li>{@del RestRequest#getFormDataParameter(String,Class)}
-				<li>{@del RestRequest#getFormDataParameter(String,Object,Class)}
-				<li>{@del RestRequest#getFormDataParameters(String,Class)}
+				<li><del>RestRequest#getFormDataParameter(String,Class)</del>
+				<li><del>RestRequest#getFormDataParameter(String,Object,Class)</del>
+				<li><del>RestRequest#getFormDataParameters(String,Class)</del>
 				<li>{@del RestRequest#getFormDataParameter(String,Type,Type...)}
 				<li>{@del RestRequest#getFormDataParameters(String,Type,Type...)}
-				<li>{@del RestRequest#getPathParameter(String,Class)}
+				<li><del>RestRequest#getPathParameter(String,Class)</del>
 				<li>{@del RestRequest#getPathParameter(String,Type,Type...)}
-				<li>{@del RestRequest#getBody(Class)}
+				<li><del>RestRequest#getBody(Class)</del>
 				<li>{@del RestRequest#getBody(Type,Type...)}
 			</ul>
-		<li>New methods on {@del oajrc.NameValuePairs}
+		<li>New methods on <del>NameValuePairs</del>
 		<li>Fixed issue where whitespace was not added to UON/URL-Encoding output when <c>&amp;plainText=true</c> specified.
 	</ul>
 </div>
\ No newline at end of file
diff --git a/juneau-doc/docs/ReleaseNotes/6.2.0.html b/juneau-doc/docs/ReleaseNotes/6.2.0.html
index 7943b6b6d..8b671fb07 100644
--- a/juneau-doc/docs/ReleaseNotes/6.2.0.html
+++ b/juneau-doc/docs/ReleaseNotes/6.2.0.html
@@ -47,22 +47,22 @@
 			</p>	
 		<li>Also introduced the following builder classes and related architecture changes to make the built objects unmodifiable:
 			<ul>
-				<li>{@del oaj.serializer.SerializerGroup.Builder}
-				<li>{@del oaj.parser.ParserGroup.Builder}
-				<li>{@del oaj.encoders.EncoderGroup.Builder}
+				<li><del>Builder</del>
+				<li><del>Builder</del>
+				<li><del>Builder</del>
 			</ul>
-		<li>Revamped the config file API to use a build:  {@del ConfigFileBuilder}.
-		<li>Removed the {@del Lockable} interface.
+		<li>Revamped the config file API to use a build:  <del>ConfigFileBuilder</del>.
+		<li>Removed the <del>Lockable</del> interface.
 		<li>New <c>addBeanTypeProperties</c> setting added to serializers to override the 
-			{@del SerializerContext#SERIALIZER_addBeanTypeProperties} setting
+			<del>SerializerContext.SERIALIZER_addBeanTypeProperties</del>setting
 			for individual serializers in a serializer group:
 			<ul>
-				<li>{@del HtmlSerializerContext#HTML_addBeanTypeProperties}
-				<li>{@del JsonSerializerContext#JSON_addBeanTypeProperties}
-				<li>{@del MsgPackSerializerContext#MSGPACK_addBeanTypeProperties}
-				<li>{@del UonSerializerContext#UON_addBeanTypeProperties}
-				<li>{@del XmlSerializerContext#XML_addBeanTypeProperties}
-				<li>{@del RdfSerializerContext#RDF_addBeanTypeProperties}
+				<li><del>HtmlSerializerContext#HTML_addBeanTypeProperties</del>
+				<li><del>JsonSerializerContext#JSON_addBeanTypeProperties</del>
+				<li><del>MsgPackSerializerContext#MSGPACK_addBeanTypeProperties</del>
+				<li><del>UonSerializerContext#UON_addBeanTypeProperties</del>
+				<li><del>XmlSerializerContext#XML_addBeanTypeProperties</del>
+				<li><del>RdfSerializerContext#RDF_addBeanTypeProperties</del>
 			</ul>
 		<li>UON notation serializers and parsers moved into the new <c>org.apache.juneau.uon</c> package.
 		<li>New {@link oaj.xml.annotation.XmlFormat#VOID} format to identify HTML void elements.
@@ -75,7 +75,7 @@
 			<ul>
 				<li>New {@link oaj.dto.swagger.SwaggerBuilder} class.
 				<li>Fluent-style setters added to the Swagger beans.
-				<li>Added Swagger examples {@del here} and in the {@del org.apache.juneau.dto.swagger} javadocs.
+				<li>Added Swagger examples <del>here</del> and in the <del>swagger</del> javadocs.
 			</ul>
 		<li>Improvements to {@link oaj.svl.VarResolver}.
 			<ul>
@@ -87,9 +87,9 @@
 		<li>Parse-args supported added to {@link oaj.msgpack.MsgPackParser} to allow it to be used in remoteable proxies. 
 		<li>Added some convenience classes for constructing collections using a fluent interface:
 			<ul>
-				<li>{@del AList}
-				<li>{@del ASet}
-				<li>{@del AMap}
+				<li><del>AList</del>
+				<li><del>ASet</del>
+				<li><del>AMap</del>
 			</ul>
 		<li>New {@link oaj.annotation.Bean#typePropertyName @Bean(typePropertyName)} annotation allows you to 
 			specify the name of the <js>"_type"</js> property at the class level.
@@ -98,24 +98,24 @@
 				<li>{@link oaj.dto.html5.HtmlElementContainer#getChild(int...)}
 				<li>{@link oaj.dto.html5.HtmlElementMixed#getChild(int...)}
 			</ul>
-		<li>New common serializer setting: {@del SerializerContext#SERIALIZER_abridged}.
+		<li>New common serializer setting: <del>SerializerContext.SERIALIZER_abridged</del>.
 		<li>Support for defining interface proxies against 3rd-party REST interfaces.
-			<br>New package {@del org.apache.juneau.remoteable} for all remoteable proxy interface annotations.
+			<br>New package <del>remoteable</del>for all remoteable proxy interface annotations.
 			<br><ja>@Remoteable</ja> annotation has been moved to this package.
 		<li>Updated doc: <dc>6 - Remoteable Services</dc>
 		<li>New doc: <dc>6.1 -  Interface proxies against 3rd-party REST interfaces</dc>
-		<li>New URL-encoding serializer setting: {@del UrlEncodingSerializerContext#URLENC_paramFormat}.
+		<li>New URL-encoding serializer setting: <del>UrlEncodingSerializerContext#URLENC_paramFormat</del>.
 		<li>New methods on {@link oaj.urlencoding.UrlEncodingSerializer.Builder}:
 		<ul>
-			<li>{@del UrlEncodingSerializer.Builder#paramFormat(String)}	
-			<li>{@del UrlEncodingSerializer.Builder#plainTextParams()}	
+			<li><del>Builder#paramFormat(String)</del>	
+			<li><del>Builder.plainTextParams()</del>	
 		</ul> 		
 	</ul>
 	
 	<h5 class='topic w800'>org.apache.juneau.rest</h5>
 	<ul class='spaced-list'>
-		<li>{@del @RestResource} annotation can now be applied to 
-			any class!  You're no longer restricted to subclassing your resources from {@del oajr.RestServlet}.
+		<li><del>@RestResource</del> annotation can now be applied to 
+			any class!  You're no longer restricted to subclassing your resources from <del>RestServlet</del>.
 			<br>This is a major enhancement in the API.  Anything you could do by subclassing from <c>RestServlet</c>
 			should have an equivalent for non-<c>RestServlet</c> classes.
 			<br>The only restriction is that the top-level resource must subclass from <c>RestServlet</c>.
@@ -123,20 +123,20 @@
 			<br><br>
 			The majority of code has been split up into two separate classes:
 			<ul>
-				<li>{@del RestConfig} - A modifiable configuration of a resource.  Subclasses from {@link javax.servlet.ServletConfig}.
+				<li><del>RestConfig</del> - A modifiable configuration of a resource.  Subclasses from {@link javax.servlet.ServletConfig}.
 				<li>{@link oajr.RestContext} - A read-only configuration that's the result of a snapshot of the config.
 			</ul>
 			<br><br>
-			The {@del oajr.RestServlet} class now has the following initialization method that allows you to override
+			The <del>RestServlet</del>class now has the following initialization method that allows you to override
 			the config settings define via annotations:
 			<ul>
-				<li>{@del RestServlet#init(RestConfig)} - A modifiable configuration of a resource.
+				<li><del>RestServlet.init(RestConfig)</del> - A modifiable configuration of a resource.
 			</ul>
 			Non-<c>RestServlet</c> classes must have one of the following to allow it to be instantiated:
 			<ul>
 				<li>A <c><jk>public</jk> T(RestConfig)</c> constructor.
 				<li>A <c><jk>public</jk> T()</c> constructor.
-				<li>The parent resource must have a customized {@del oajr.RestResourceResolver} for instantiating it.
+				<li>The parent resource must have a customized <del>RestResourceResolver</del> for instantiating it.
 			</ul>
 			<br>
 			Non-<c>RestServlet</c> classes can optionally include the following init methods to gain access to the config and context:
@@ -144,27 +144,27 @@
 				<li><dc><jk>public</jk> init(RestConfig)</dc>
 				<li><dc><jk>public</jk> init(RestContext)</dc>
 			</ul>
-		<li>New annotations added to {@del @RestResource} to allow non-<c>RestServlet</c>
+		<li>New annotations added to <del>@RestResource</del>to allow non-<c>RestServlet</c>
 			resources to do the same as subclassing directly from <c>RestServlet</c>:
 			<ul>
-				<li>{@del RestResource#resourceResolver()} 
-					- Specify a {@del oajr.RestResourceResolver} class for resolving child resources.
-				<li>{@del RestResource#callHandler()} 
-					- Specify a {@del oajr.RestCallHandler} class for handling the lifecycle of a REST call.
-				<li>{@del RestResource#infoProvider()} 
-					- Specify a {@del oajr.RestInfoProvider} class for customizing title/description/Swagger information on a REST resource.
-				<li>{@del RestResource#logger()} 
-					- Specify a {@del oajr.RestLogger} class for handling logging.
+				<li><del>RestResource.resourceResolver()</del> 
+					- Specify a <del>RestResourceResolver</del>class for resolving child resources.
+				<li><del>RestResource.callHandler()</del> 
+					- Specify a <del>RestCallHandler</del>class for handling the lifecycle of a REST call.
+				<li><del>RestResource.infoProvider()</del> 
+					- Specify a <del>RestInfoProvider</del>class for customizing title/description/Swagger information on a REST resource.
+				<li><del>RestResource.logger()</del> 
+					- Specify a <del>RestLogger</del> class for handling logging.
 			</ul>
-		<li>New annotations added to {@del @RestResource} and {@del oajr.annotation.RestMethod @RestMethod}
+		<li>New annotations added to <del>@RestResource</del> and <del>RestMethod @RestMethod</del>
 			to simplify defining page title, text, and links on HTML views:
 			<ul>
-				<li>{@del @RestResource(pageTitle)}
-				<li>{@del @RestMethod(pageTitle)} 
-				<li>{@del @RestResource(pageText)} 
-				<li>{@del @RestMethod(pageText)} 
-				<li>{@del @RestResource(pageLinks)} 
-				<li>{@del @RestMethod(pageLinks)} 
+				<li><del>@RestResource(pageTitle)</del>
+				<li><del>@RestMethod(pageTitle)</del> 
+				<li><del>@RestResource(pageText)</del> 
+				<li><del>@RestMethod(pageText)</del> 
+				<li><del>@RestResource(pageLinks)</del> 
+				<li><del>@RestMethod(pageLinks)</del>
 			</ul>				
 			<p class='bcode'>
 		<jc>// Old method</jc>
@@ -194,11 +194,11 @@
 			pageLinks=<js>"{up:'$R{requestParentURI}',options:'?method=OPTIONS'}"</js>
 		)
 			</p>
-		<li>{@del RestResource#stylesheet()} can now take in a comma-delimited list of stylesheet paths.
-		<li>{@del StreamResource} can now contain multiple sources from a variety of source types (e.g. <c><jk>byte</jk>[]</c> arrays, <c>InputStreams</c>, <c>Files</c>, etc...)
-			and is now immutable.  It also includes a new {@del StreamResourceBuilder} class.
+		<li><del>RestResource.stylesheet()</del> can now take in a comma-delimited list of stylesheet paths.
+		<li><del>StreamResource</del> can now contain multiple sources from a variety of source types (e.g. <c><jk>byte</jk>[]</c> arrays, <c>InputStreams</c>, <c>Files</c>, etc...)
+			and is now immutable.  It also includes a new <del>StreamResourceBuilder</del>class.
 		<li>Simplified remoteable proxies using the <c><ja>@RestMethod</ja>(name=<js>"PROXY"</js>)</c> annotation on REST methods.
-			Used to expose interface proxies without the need for {@del RemoteableServlet}.
+			Used to expose interface proxies without the need for <del>RemoteableServlet</del>.
 		<p class='bcode'>
 		<jc>// Server side</jc>
 		<ja>@RestMethod</ja>(name=<js>"PROXY"</js>, path=<js>"/myproxy/*"</js>)
@@ -210,10 +210,10 @@
 		RestClient client = RestClient.<jsm>create</jsm>().rootUrl(<jf>samplesUrl</jf>).build();			
 		IAddressBook ab = client.getRemoteableProxy(IAddressBook.<jk>class</jk>, <js>"/addressBook/myproxy"</js>);
 		</p>
-			See {@del oajr.annotation.RestMethod#name() @RestMethod(name)} for more information.
+			See <del>RestMethod.name() @RestMethod(name)</del>for more information.
 		<li>{@link oajr.RestRequest#toString()} can be called at any time to view the headers and content of the request
 			without affecting functionality.  Very useful for debugging.
-		<li>{@del oajr.annotation.RestMethod#name() @RestMethod(name)} annotation is now optional.  Defaults to <js>"GET"</js>.
+		<li><del>RestMethod.name() @RestMethod(name)</del>annotation is now optional.  Defaults to <js>"GET"</js>.
 	</ul>
 	
 	<h5 class='topic w800'>org.apache.juneau.rest.client</h5>
@@ -223,71 +223,71 @@
 		<li>The <c>RestClient</c> class <c>doX(Object url)</c> methods now handle HttpClient <c>URIBuilder</c> instances.
 		<li>New methods added/updated to {@link oajrc.RestClient}:
 		<ul>
-			<li>{@del RestClient#getRemoteableProxy(Class,Object)} - For interface proxies defined using <c><ja>@RestMethod</ja>(name=<js>"PROXY"</js>)</c>.
-			<li>{@del RestClient#getRemoteableProxy(Class,Object,Serializer,Parser)} - Same as above but overrides the serializer and parser defined on the client.
-			<li>{@del RestClient#doPost(Object)}
-			<li>{@del RestClient#doCall(HttpMethod,Object,Object)} - Can now pass in instances of {@del oajrc.NameValuePairs} for easy form posts.
+			<li><del>RestClient.getRemoteableProxy(Class,Object)</del>- For interface proxies defined using <c><ja>@RestMethod</ja>(name=<js>"PROXY"</js>)</c>.
+			<li><del>RestClient.getRemoteableProxy(Class,Object,Serializer,Parser)</del>- Same as above but overrides the serializer and parser defined on the client.
+			<li><del>RestClient#doPost(Object)</del>
+			<li><del>RestClient.doCall(HttpMethod,Object,Object)</del> - Can now pass in instances of <del>NameValuePairs</del>for easy form posts.
 				<br>This extends to all methods that take in the input.
 		</ul>
-		<li>New methods on {@del oajrc.RestCall}:
+		<li>New methods on <del>RestCall</del>:
 			<ul>
-				<li>{@del oajrc.RestCall#uri(Object) uri(Object)}
-				<li>{@del query(String,Object,boolean,PartSerializer)}
-				<li>{@del oajrc.RestCall#query(String,Object) query(String,Object)}
-				<li>{@del oajrc.RestCall#queryIfNE(String,Object) queryIfNE(String,Object)}
-				<li>{@del oajrc.RestCall#query(Map) query(Map)}
-				<li>{@del oajrc.RestCall#queryIfNE(Map) queryIfNE(Map)}
-				<li>{@del oajrc.RestCall#query(String) query(String)}
-				<li>{@del formData(String,Object,boolean,PartSerializer)}
-				<li>{@del oajrc.RestCall#formData(String,Object) formData(String,Object)}
-				<li>{@del oajrc.RestCall#formDataIfNE(String,Object) formDataIfNE(String,Object)}
-				<li>{@del oajrc.RestCall#formData(Map) formData(Map)}
-				<li>{@del oajrc.RestCall#formDataIfNE(Map) formDataIfNE(Map)}
-				<li>{@del header(String,Object,boolean,PartSerializer)}
-				<li>{@del oajrc.RestCall#header(String,Object) header(String,Object)}
-				<li>{@del oajrc.RestCall#headerIfNE(String,Object) headerIfNE(String,Object)}
-				<li>{@del oajrc.RestCall#headers(Map) headers(Map)}
-				<li>{@del oajrc.RestCall#headersIfNE(Map) headersIfNE(Map)}
-				<li>{@del oajrc.RestCall#host(String) host(String)}
-				<li>{@del oajrc.RestCall#port(int) port(int)}
-				<li>{@del oajrc.RestCall#userInfo(String,String) userInfo(String,String)}
-				<li>{@del oajrc.RestCall#userInfo(String) userInfo(String)}
-				<li>{@del oajrc.RestCall#scheme(String) scheme(String)}
+				<li><del>RestCall#uri(Object) uri(Object)</del>
+				<li><del>query(String,Object,boolean,PartSerializer)</del>
+				<li><del>RestCall#query(String,Object) query(String,Object)</del>
+				<li><del>RestCall#queryIfNE(String,Object) queryIfNE(String,Object)</del>
+				<li><del>RestCall#query(Map) query(Map)</del>
+				<li><del>RestCall#queryIfNE(Map) queryIfNE(Map)</del>
+				<li><del>RestCall#query(String) query(String)</del>
+				<li><del>formData(String,Object,boolean,PartSerializer)</del>
+				<li><del>RestCall#formData(String,Object) formData(String,Object)</del>
+				<li><del>RestCall#formDataIfNE(String,Object) formDataIfNE(String,Object)</del>
+				<li><del>RestCall#formData(Map) formData(Map)</del>
+				<li><del>RestCall#formDataIfNE(Map) formDataIfNE(Map)</del>
+				<li><del>header(String,Object,boolean,PartSerializer)</del>
+				<li><del>RestCall#header(String,Object) header(String,Object)</del>
+				<li><del>RestCall#headerIfNE(String,Object) headerIfNE(String,Object)</del>
+				<li><del>RestCall#headers(Map) headers(Map)</del>
+				<li><del>RestCall#headersIfNE(Map) headersIfNE(Map)</del>
+				<li><del>RestCall#host(String) host(String)</del>
+				<li><del>RestCall#port(int) port(int)</del>
+				<li><del>RestCall#userInfo(String,String) userInfo(String,String)</del>
+				<li><del>RestCall#userInfo(String) userInfo(String)</del>
+				<li><del>RestCall#scheme(String) scheme(String)</del>
 			</ul>
 		<li>New methods added to {@link oajrc.RestClient.Builder}:
 			<ul>
 				<li>{@link oajrc.RestClient.Builder#executorService(ExecutorService,boolean) executorService(ExecutorService,boolean)}
-				<li>{@del RestClient.Builder#paramFormat(String)}
-				<li>{@del RestClient.Builder#plainTextParams()}
+				<li><del>Builder#paramFormat(String)</del>
+				<li><del>Builder#plainTextParams()</del>
 				<li>{@link oajrc.RestClient.Builder#noTrace() noTrace()} - Adds a <c>No-Trace: true</c> header on all requests to prevent
 					the servlet from logging errors.
 					<br>Useful for testing scenarios when you don't want the console to end up showing errors done on purpose.
 				<li>{@link oajrc.RestClient.Builder#debug() debug()} now adds a <c>Debug: true</c> header on all requests.
 			</ul>
-		<li>New methods added/updated to {@del oajrc.RestCall}:
+		<li>New methods added/updated to <del>RestCall</del>:
 			<ul>
-				<li>{@del oajrc.RestCall#runFuture() runFuture()}
-				<li>{@del oajrc.RestCall#getResponseFuture(Class) getResponseFuture(Class)}
+				<li><del>RestCall#runFuture() runFuture()</del>
+				<li><del>RestCall#getResponseFuture(Class) getResponseFuture(Class)</del>
 				<li>{@del oajrc.RestCall#getResponseFuture(Type,Type...) getResponseFuture(Type,Type...)}
-				<li>{@del oajrc.RestCall#getResponseAsStringFuture() getResponseAsStringFuture()}
-				<li>{@del oajrc.RestCall#serializer(Serializer) serializer(Serializer)} - Override the serializer defined on the client for a single call.
-				<li>{@del oajrc.RestCall#parser(Parser) parser(Parser)} - Override the parser defined on the client for a single call.
-				<li>{@del input(Object)} - Now accepts instances of {@del oajrc.NameValuePairs}.
-				<li>{@del oajrc.RestCall#getResponse(Class) getResponse(Class)} - Can now pass in any of the following:
+				<li><del>RestCall#getResponseAsStringFuture() getResponseAsStringFuture()</del>
+				<li><del>RestCall.serializer(Serializer) serializer(Serializer)</del>- Override the serializer defined on the client for a single call.
+				<li><del>RestCall.parser(Parser) parser(Parser)</del> - Override the parser defined on the client for a single call.
+				<li><del>input(Object)</del>- Now accepts instances of <del>NameValuePairs</del>.
+				<li><del>RestCall.getResponse(Class) getResponse(Class)</del>- Can now pass in any of the following:
 					<ul>
 						<li>{@link org.apache.http.HttpResponse} - Returns the raw <c>HttpResponse</c> returned by the inner <c>HttpClient</c>.
 						<li>{@link java.io.Reader} - Returns access to the raw reader of the response.
 						<li>{@link java.io.InputStream} - Returns access to the raw input stream of the response.
 					</ul>
 			</ul>
-		<li>New methods added to {@del oajrc.NameValuePairs}:
+		<li>New methods added to <del>NameValuePairs</del>:
 			<ul>
-				<li>{@del oajrc.NameValuePairs#append(String,Object) append(String,Object)}
-				<li>{@del append(String,Object,PartSerializer)}
+				<li><del>NameValuePairs.append(String,Object) append(String,Object)</del>
+				<li><del>append(String,Object,PartSerializer)</del>
 			</ul>
-		<li>{@del oajrc.RetryOn} is now an abstract class with an additional method:
+		<li><del>RetryOn</del>is now an abstract class with an additional method:
 			<ul>
-				<li>{@del oajrc.RetryOn#onResponse(HttpResponse) onResponse(HttpResponse)}
+				<li><del>RetryOn.onResponse(HttpResponse) onResponse(HttpResponse)</del>
 			</ul>			
 	</ul>
 	
@@ -295,10 +295,10 @@
 	<ul class='spaced-list'>
 		<li><js>"REST/port"</js> configuration setting can now be a comma-limited list of port numbers to try.
 			<br>You can also specify one or more <c>0</c>s to try a random port.
-		<li>Methods added to {@del RestMicroservice} class:
+		<li>Methods added to <del>RestMicroservice</del>class:
 		<ul>
-			<li>{@del getPort()}
-			<li>{@del getURI()}
+			<li><del>getPort()</del>
+			<li><del>getURI()</del>
 			<li>Override methods added from {@link oaj.microservice.Microservice} class for easier method chaining.
 		</ul>
 	</ul>		
diff --git a/juneau-doc/docs/ReleaseNotes/6.3.0.html b/juneau-doc/docs/ReleaseNotes/6.3.0.html
index 4e71fd8a8..e4ef84f41 100644
--- a/juneau-doc/docs/ReleaseNotes/6.3.0.html
+++ b/juneau-doc/docs/ReleaseNotes/6.3.0.html
@@ -26,7 +26,7 @@
 		<li>
 			New package:  {@link oaj.http}.
 		<li>
-			Support for dynamic beans.  See {@del @BeanProperty(name)}.
+			Support for dynamic beans.  See <del>@BeanProperty(name)</del>.
 		<li>
 			New doc: <dc>2.8 - Virtual Beans</dc>
 		<li>
@@ -38,47 +38,47 @@
 		<jc>// Example</jc>
 		<jk>int</jk> i = JsonParser.<jsf>DEFAULT</jsf>.parse(<js>"123M"</js>);  <jc>// 123MB</jc>
 			</p>
-		<li>New/modified methods on {@del ConfigFile}:
+		<li>New/modified methods on <del>ConfigFile</del>:
 			<ul>
-				<li>{@del ConfigFile#put(String,String,String,boolean)}
-				<li>{@del ConfigFile#put(String,String,Object,Serializer,boolean,boolean)}
+				<li><del>ConfigFile#put(String,String,String,boolean)</del>
+				<li><del>ConfigFile#put(String,String,Object,Serializer,boolean,boolean)</del>
 				<li>{@del ConfigFile#getObject(String,Type,Type...)}
 				<li>{@del ConfigFile#getObject(String,Parser,Type,Type...)}
-				<li>{@del ConfigFile#getObject(String,Class)}
-				<li>{@del ConfigFile#getObject(String,Parser,Class)}
+				<li><del>ConfigFile#getObject(String,Class)</del>
+				<li><del>ConfigFile#getObject(String,Parser,Class)</del>
 				<li>{@del ConfigFile#getObject(String,String,Type,Type...)}
 				<li>{@del ConfigFile#getObject(String,String,Parser,Type,Type...)}
-				<li>{@del ConfigFile#getObject(String,String,Class)}
-				<li>{@del ConfigFile#getObject(String,String,Parser,Class)}
+				<li><del>ConfigFile#getObject(String,String,Class)</del>
+				<li><del>ConfigFile#getObject(String,String,Parser,Class)</del>
 				<li>{@del ConfigFile#getObjectWithDefault(String,Object,Type,Type...)}
 				<li>{@del ConfigFile#getObjectWithDefault(String,Parser,Object,Type,Type...)}
-				<li>{@del ConfigFile#getObjectWithDefault(String,Object,Class)}
-				<li>{@del ConfigFile#getObjectWithDefault(String,Parser,Object,Class)} 
+				<li><del>ConfigFile#getObjectWithDefault(String,Object,Class)</del>
+				<li><del>ConfigFile.getObjectWithDefault(String,Parser,Object,Class)</del>
 			</ul>
-		<li>New ability to interact with config file sections with proxy interfaces with new method {@del ConfigFile#getSectionAsInterface(String,Class)}.
-		<li>{@del @BeanProperty} annotation can now be applied to getters
+		<li>New ability to interact with config file sections with proxy interfaces with new method <del>ConfigFile.getSectionAsInterface(String,Class)</del>.
+		<li><del>@BeanProperty</del>annotation can now be applied to getters
 			and setters defined on interfaces.
 		<li>New methods on {@link oaj.serializer.SerializerSession} and {@link oaj.parser.ParserSession}
 			for retrieving context and runtime-override properties:
 			<ul>
-				<li>{@del Session#getProperty(String)}
-				<li>{@del Session#getProperty(String,String)}
-				<li>{@del Session#getProperty(Class,String)}
-				<li>{@del Session#getProperty(Class,String,Object)}
+				<li><del>Session#getProperty(String)</del>
+				<li><del>Session#getProperty(String,String)</del>
+				<li><del>Session#getProperty(Class,String)</del>
+				<li><del>Session.getProperty(Class,String,Object)</del>
 			</ul>	
-		<li>New {@del org.apache.juneau.serializer.PartSerializer} interface particularly tailored to HTTP
+		<li>New <del>PartSerializer</del>interface particularly tailored to HTTP
 			headers, query parameters, form-data parameters, and path variables.  
 			<br>Allows easy user-defined serialization of these objects.
 			<br>The interface can be used in the following locations:
 			<ul>
-				<li>{@del org.apache.juneau.rest.client.RestClient.Builder#partSerializer(Class)}
-				<li>{@del org.apache.juneau.remoteable.Path#serializer}
-				<li>{@del org.apache.juneau.remoteable.Query#serializer}
-				<li>{@del org.apache.juneau.remoteable.QueryIfNE#serializer}
-				<li>{@del org.apache.juneau.remoteable.FormData#serializer}
-				<li>{@del org.apache.juneau.remoteable.FormDataIfNE#serializer}
-				<li>{@del org.apache.juneau.remoteable.Header#serializer}
-				<li>{@del org.apache.juneau.remoteable.HeaderIfNE#serializer}
+				<li><del>Builder#partSerializer(Class)</del>
+				<li><del>Path#serializer</del>
+				<li><del>Query#serializer</del>
+				<li><del>QueryIfNE#serializer</del>
+				<li><del>FormData#serializer</del>
+				<li><del>FormDataIfNE#serializer</del>
+				<li><del>Header#serializer</del>
+				<li><del>HeaderIfNE#serializer</del>
 			</ul>
 		<li>Across-the-board improvements to the URI-resolution support (i.e. how URIs get serialized).
 			<ul>
@@ -100,7 +100,7 @@
 					these new protocols should (hopefully) be easier to understand.
 					<br>
 					These protocols work on all serialized URL and URI objects, as well as classes and properties 
-					annotated with {@del oaj.annotation.URI @URI}.
+					annotated with <del>URI @URI</del>.
 				<li>New classes:
 					<ul>
 						<li>{@link oaj.UriContext}
@@ -109,12 +109,12 @@
 						<li>{@link oaj.UriResolver}
 					</ul>
 				<li>New configuration properties:
-					<li>{@del SerializerContext#SERIALIZER_uriContext}
-					<li>{@del SerializerContext#SERIALIZER_uriRelativity}
-					<li>{@del SerializerContext#SERIALIZER_uriResolution}
-					<li>{@del SerializerContext#SERIALIZER_maxIndent}
+					<li><del>SerializerContext#SERIALIZER_uriContext</del>
+					<li><del>SerializerContext#SERIALIZER_uriRelativity</del>
+					<li><del>SerializerContext#SERIALIZER_uriResolution</del>
+					<li><del>SerializerContext#SERIALIZER_maxIndent</del>
 			</ul>
-		<li>New annotation property: {@del @BeanProperty(value)}.
+		<li>New annotation property: <del>@BeanProperty(value)</del>.
 			<br>The following two annotations are considered equivalent:
 			<p class='bcode'>
 		<ja>@BeanProperty</ja>(name=<js>"foo"</js>)
@@ -122,23 +122,23 @@
 		<ja>@BeanProperty</ja>(<js>"foo"</js>)
 			</p>
 		<li>Fixed a race condition in ClassMeta.
-		<li><jsf>URLENC_paramFormat</jsf> has been moved to {@del UonSerializer#UON_paramFormat}, 
+		<li><jsf>URLENC_paramFormat</jsf> has been moved to <del>UonSerializer#UON_paramFormat</del>, 
 			and the UON/URL-Encoding serializers will now always serialize all values as plain text.
 			<br>This means that arrays and maps are converted to simple comma-delimited lists.
 		<li>Listener APIs added to serializers and parsers:
 			<ul>
 				<li>{@link oaj.serializer.SerializerListener}
 				<li>{@link oaj.serializer.Serializer.Builder#listener(Class)}
-				<li>{@del @RestResource(serializerListener)}
-				<li>{@del RestConfig#serializerListener(Class)}
+				<li><del>@RestResource(serializerListener)</del>
+				<li><del>RestConfig#serializerListener(Class)</del>
 				<li>{@link oaj.parser.ParserListener}
 				<li>{@link oaj.parser.Parser.Builder#listener(Class)}
-				<li>{@del @RestResource(parserListener)}
-				<li>{@del RestConfig#parserListener(Class)}
-				<li>{@del RestClient.Builder#listeners(Class,Class)}
+				<li><del>@RestResource(parserListener)</del>
+				<li><del>RestConfig#parserListener(Class)</del>
+				<li><del>Builder.listeners(Class,Class)</del>
 			</ul>juneau-examples-core.import1.pngjuneau-examples-core.import1.png
-		<li>The {@del BEAN_debug} flag will now capture parser input and make it
-			available through the {@del ParserSession#getInputAsString()} method so that it can be used
+		<li>The <del>BEAN_debug</del>flag will now capture parser input and make it
+			available through the <del>ParserSession.getInputAsString()</del>method so that it can be used
 			in the listeners.
 		<li>Significant new functionality introduced to the HTML serializer.  
 			<br>Lots of new options for customizing the HTML output.
@@ -149,17 +149,17 @@
 					<br>Annotation can be applied to POJO classes and bean properties.
 				<li>Several new properties for customizing parts of the HTML page:
 					<ul>
-						<li>{@del HtmlDocSerializerContext#HTMLDOC_title}
-						<li>{@del HtmlDocSerializerContext#HTMLDOC_description}
-						<li>{@del HtmlDocSerializerContext#HTMLDOC_branding}
-						<li>{@del HtmlDocSerializerContext#HTMLDOC_header}
-						<li>{@del HtmlDocSerializerContext#HTMLDOC_nav}
-						<li>{@del HtmlDocSerializerContext#HTMLDOC_aside}
-						<li>{@del HtmlDocSerializerContext#HTMLDOC_footer}
-						<li>{@del HtmlDocSerializerContext#HTMLDOC_noResultsMessage}
-						<li>{@del HtmlDocSerializerContext#HTMLDOC_cssUrl}
-						<li>{@del HtmlDocSerializerContext#HTMLDOC_css}
-						<li>{@del HtmlDocSerializerContext#HTMLDOC_template}
+						<li><del>HtmlDocSerializerContext#HTMLDOC_title</del>
+						<li><del>HtmlDocSerializerContext#HTMLDOC_description</del>
+						<li><del>HtmlDocSerializerContext#HTMLDOC_branding</del>
+						<li><del>HtmlDocSerializerContext#HTMLDOC_header</del>
+						<li><del>HtmlDocSerializerContext#HTMLDOC_nav</del>
+						<li><del>HtmlDocSerializerContext#HTMLDOC_aside</del>
+						<li><del>HtmlDocSerializerContext#HTMLDOC_footer</del>
+						<li><del>HtmlDocSerializerContext#HTMLDOC_noResultsMessage</del>
+						<li><del>HtmlDocSerializerContext#HTMLDOC_cssUrl</del>
+						<li><del>HtmlDocSerializerContext#HTMLDOC_css</del>
+						<li><del>HtmlDocSerializerContext#HTMLDOC_template</del>
 					</ul>
 				<li>New interface {@link oaj.html.HtmlDocTemplate} that allows full control over rendering
 					of HTML produced by {@link oaj.html.HtmlDocSerializer}.
@@ -169,10 +169,10 @@
 			can now be applied to fields.  
 		<li>New properties on {@link oaj.BeanContext}:
 			<ul>
-				<li>{@del BEAN_includeProperties}
-				<li>{@del BEAN_excludeProperties}
+				<li><del>BEAN_includeProperties</del>
+				<li><del>BEAN_excludeProperties</del>
 			</ul>
-		<li>New annotation property: {@del @BeanProperty(format)}.
+		<li>New annotation property: <del>@BeanProperty(format)</del>.
 	</ul>
 	
 	<h5 class='topic w800'>org.apache.juneau.rest</h5>
@@ -183,19 +183,19 @@
 			The {@link oajr.RestRequest} class functionality has been broken up into the following
 			functional pieces to reduce its complexity:
 			<ul>
-				<li>{@del oajr.RestRequest#getBody()} - The request body.
+				<li><del>RestRequest.getBody()</del>- The request body.
 				<li>{@link oajr.RestRequest#getHeaders()} - The request headers.
-				<li>{@del RestRequest#getQuery()} - The request query parameters.
-				<li>{@del RestRequest#getFormData()} - The request form data parameters.
-				<li>{@del RestRequest#getPathMatch()} - The path variables and remainder.
+				<li><del>RestRequest.getQuery()</del>- The request query parameters.
+				<li><del>RestRequest.getFormData()</del>- The request form data parameters.
+				<li><del>RestRequest.getPathMatch()</del> - The path variables and remainder.
 			</ul>	
 			The following classes have been introduced:
 			<ul>
-				<li>{@del oajr.RequestBody}
-				<li>{@del oajr.RequestHeaders}
-				<li>{@del oajr.RequestQuery}
-				<li>{@del oajr.RequestFormData}
-				<li>{@del oajr.RequestPath}
+				<li><del>RequestBody</del>
+				<li><del>RequestHeaders</del>
+				<li><del>RequestQuery</del>
+				<li><del>RequestFormData</del>
+				<li><del>RequestPath</del>
 			</ul>						
 		<li>
 			The un-annotated parameter types that can be passed in through REST Java methods has been significantly expanded.
@@ -208,34 +208,34 @@
 			</ul>
 			The new supported types are:
 			<ul>
-				<li>{@del Accept}
-				<li>{@del AcceptCharset}
-				<li>{@del AcceptEncoding}
-				<li>{@del AcceptLanguage}
-				<li>{@del Authorization}
-				<li>{@del CacheControl}
-				<li>{@del Connection}
-				<li>{@del ContentLength}
-				<li>{@del ContentType}
-				<li>{@del Date}
-				<li>{@del Expect}
-				<li>{@del From}
-				<li>{@del Host}
-				<li>{@del IfMatch}
-				<li>{@del IfModifiedSince}
-				<li>{@del IfNoneMatch}
-				<li>{@del IfRange}
-				<li>{@del IfUnmodifiedSince}
-				<li>{@del MaxForwards}
-				<li>{@del Pragma}
-				<li>{@del ProxyAuthorization}
-				<li>{@del Range}
-				<li>{@del Referer}
-				<li>{@del TE}
-				<li>{@del UserAgent}
-				<li>{@del Upgrade}
-				<li>{@del Via}
-				<li>{@del Warning}
+				<li><del>Accept</del>
+				<li><del>AcceptCharset</del>
+				<li><del>AcceptEncoding</del>
+				<li><del>AcceptLanguage</del>
+				<li><del>Authorization</del>
+				<li><del>CacheControl</del>
+				<li><del>Connection</del>
+				<li><del>ContentLength</del>
+				<li><del>ContentType</del>
+				<li><del>Date</del>
+				<li><del>Expect</del>
+				<li><del>From</del>
+				<li><del>Host</del>
+				<li><del>IfMatch</del>
+				<li><del>IfModifiedSince</del>
+				<li><del>IfNoneMatch</del>
+				<li><del>IfRange</del>
+				<li><del>IfUnmodifiedSince</del>
+				<li><del>MaxForwards</del>
+				<li><del>Pragma</del>
+				<li><del>ProxyAuthorization</del>
+				<li><del>Range</del>
+				<li><del>Referer</del>
+				<li><del>TE</del>
+				<li><del>UserAgent</del>
+				<li><del>Upgrade</del>
+				<li><del>Via</del>
+				<li><del>Warning</del>
 				<li>{@link java.util.TimeZone}
 				<li>{@link java.io.InputStream}
 				<li>{@link javax.servlet.ServletInputStream}
@@ -244,20 +244,20 @@
 				<li>{@link javax.servlet.ServletOutputStream}
 				<li>{@link java.io.Writer}
 				<li>{@link java.util.ResourceBundle} - Client-localized resource bundle.
-				<li>{@del oaj.utils.MessageBundle} - A resource bundle with additional features.
+				<li><del>MessageBundle</del> - A resource bundle with additional features.
 				<li>{@link java.util.Locale} - Client locale.
-				<li>{@del oajr.RequestHeaders} - API for accessing request headers.
-				<li>{@del oajr.RequestQuery} - API for accessing request query parameters.
-				<li>{@del oajr.RequestFormData} - API for accessing request form data.
-				<li>{@del oajr.RequestPath} - API for accessing path variables.
-				<li>{@del oajr.RequestBody} - API for accessing request body.
+				<li><del>RequestHeaders</del> - API for accessing request headers.
+				<li><del>RequestQuery</del> - API for accessing request query parameters.
+				<li><del>RequestFormData</del> - API for accessing request form data.
+				<li><del>RequestPath</del> - API for accessing path variables.
+				<li><del>RequestBody</del> - API for accessing request body.
 				<li>{@link oaj.http.HttpMethod} - The method name matched (when using <c><ja>@RestMethod</ja>(name=<js>"*"</js>)</c>)
 				<li>{@link java.util.logging.Logger} - The logger to use for logging.
-				<li>{@del oaj.internal.JuneauLogger} - Logger with additional features.
+				<li><del>JuneauLogger</del> - Logger with additional features.
 				<li>{@link oajr.RestContext} - The resource read-only context.
 				<li>{@link oaj.parser.Parser} - The parser matching the request content type.
 				<li>{@link oaj.dto.swagger.Swagger} - The auto-generated Swagger doc.
-				<li>{@del ConfigFile} - The external config file for the resource.
+				<li><del>ConfigFile</del>- The external config file for the resource.
 			</ul>
 			So, for example...
 			<p class='bcode'>
@@ -286,84 +286,84 @@
 		)
 			</p>
 		<li>
-			A new annotation {@del @RestResource(paramResolvers)}}
+			A new annotation <del>@RestResource(paramResolvers)</del>}
 			that allows you to define your own custom Java method parameter resolvers.
 		<li>
 			Fixed bug where Writer returned by {@link oajr.RestResponse#getWriter()} was not being flushed automatically
 			at the end of the HTTP call.
 		<li>
-			New annotations added to {@del oajr.annotation.RestMethod @RestMethod}:
+			New annotations added to <del>RestMethod @RestMethod</del>:
 			<ul>
-				<li>{@del oajr.annotation.RestMethod#defaultQuery() defaultQuery()}
-				<li>{@del oajr.annotation.RestMethod#defaultFormData() defaultFormData()}
-				<li>{@del bpIncludes()}
-				<li>{@del bpExcludes()}
+				<li><del>RestMethod#defaultQuery() defaultQuery()</del>
+				<li><del>RestMethod.defaultFormData() defaultFormData()</del>
+				<li><del>bpIncludes()</del>
+				<li><del>bpExcludes()</del>
 			</ul>
 		<li>
 			Default values on header, query, and form-data annotations:
 			<ul>
-				<li>{@del @Header(def)} - Default header value.
-				<li>{@del @Query(def)} - Default query parameter value.
-				<li>{@del @FormData(def)} - Default form data parameter value.
+				<li><del>@Header(def)</del> - Default header value.
+				<li><del>@Query(def)</del> - Default query parameter value.
+				<li><del>@FormData(def)</del>- Default form data parameter value.
 			</ul>
 		<li>
-			New attributes on {@del @RestResource}:
+			New attributes on <del>@RestResource</del>:
 			<ul>
-				<li>{@del serializerListener()}
-				<li>{@del parserListener()}
-				<li>{@del widgets()}
-				<li>{@del swagger()}
-				<li>{@del htmldoc()}
+				<li><del>serializerListener()</del>
+				<li><del>parserListener()</del>
+				<li><del>widgets()</del>
+				<li><del>swagger()</del>
+				<li><del>htmldoc()</del>
 			</ul>
 		<li>
-			New attributes on {@del oajr.annotation.RestMethod @RestMethod}:
+			New attributes on <del>RestMethod @RestMethod</del>:
 			<ul>
-				<li>{@del widgets()}
-				<li>{@del oajr.annotation.RestMethod#swagger() swagger()}
-				<li>{@del oajr.annotation.RestMethod#htmldoc() htmldoc()}
+				<li><del>widgets()</del>
+				<li><del>RestMethod#swagger() swagger()</del>
+				<li><del>RestMethod.htmldoc() htmldoc()</del>
 			</ul>
 		<li>
 			New string vars:
 			<ul>
 				<li>{@link oajr.vars.UrlVar} - Resolve <js>"$U{...}"</js> variables to URLs.
-				<li>{@del oajr.vars.WidgetVar} - Resolve <js>"$W{...}"</js> variables to widget contents.
+				<li><del>WidgetVar</del>- Resolve <js>"$W{...}"</js> variables to widget contents.
 			</ul>
 		<li>
-			New methods on {@del RestConfig}:
+			New methods on <del>RestConfig</del>:
 			<ul>
-				<li>{@del setHtmlTitle(String)}
-				<li>{@del setHtmlDescription(String)}
-				<li>{@del setHtmlBranding(String)}
-				<li>{@del setHtmlHeader(String)}
-				<li>{@del setHtmlLinks(String)}
-				<li>{@del setHtmlNav(String)}
-				<li>{@del setHtmlAside(String)}
-				<li>{@del setHtmlFooter(String)}
-				<li>{@del setHtmlCss(String)}
-				<li>{@del setHtmlCssUrl(String)}
-				<li>{@del setHtmlNoWrap(boolean)}
-				<li>{@del setHtmlNoResultsMessage(String)}
-				<li>{@del setHtmlTemplate(Class)}
-				<li>{@del setHtmlTemplate(HtmlDocTemplate)}
-				<li>{@del addWidget(Class)}
+				<li><del>setHtmlTitle(String)</del>
+				<li><del>setHtmlDescription(String)</del>
+				<li><del>setHtmlBranding(String)</del>
+				<li><del>setHtmlHeader(String)</del>
+				<li><del>setHtmlLinks(String)</del>
+				<li><del>setHtmlNav(String)</del>
+				<li><del>setHtmlAside(String)</del>
+				<li><del>setHtmlFooter(String)</del>
+				<li><del>setHtmlCss(String)</del>
+				<li><del>setHtmlCssUrl(String)</del>
+				<li><del>setHtmlNoWrap(boolean)</del>
+				<li><del>setHtmlNoResultsMessage(String)</del>
+				<li><del>setHtmlTemplate(Class)</del>
+				<li><del>setHtmlTemplate(HtmlDocTemplate)</del>
+				<li><del>addWidget(Class)</del>
 			</ul>
 		<li>
 			New methods on {@link oajr.RestResponse}:
 			<ul>
-				<li>{@del setHtmlTitle(Object)}
-				<li>{@del setHtmlDescription(Object)}
-				<li>{@del setHtmlBranding(Object)}
-				<li>{@del setHtmlHeader(Object)}
-				<li>{@del setHtmlLinks(Object)}
-				<li>{@del setHtmlNav(Object)}
-				<li>{@del setHtmlAside(Object)}
-				<li>{@del setHtmlFooter(Object)}
-				<li>{@del setHtmlCss(Object)}
-				<li>{@del setHtmlCssUrl(Object)}
-				<li>{@del setHtmlNoWrap(boolean)}
-				<li>{@del setHtmlNoResultsMessage(Object)}
-				<li>{@del setHtmlTemplate(Class)}
-				<li>{@del setHtmlTemplate(HtmlDocTemplate)}
+				<li><del>setHtmlTitle(Object)</del>
+				<li><del>setHtmlDescription(Object)</del>
+				<li><del>setHtmlBranding(Object)</del>
+				<li><del>setHtmlHeader(Object)</del>
+				<li><del>setHtmlLinks(Object)</del>
+				<li><del>setHtmlNav(Object)</del>
+				<li><del>setHtmlAside(Object)</del>
+				<li><del>setHtmlFooter(Object)</del>
+				<li><del>setHtmlCss(Object)</del>
+				<li><del>setHtmlCssUrl(Object)</del>
+				<li><del>setHtmlNoWrap(boolean)</del>
+				<li><del>setHtmlNoResultsMessage(Object)</del>
+				<li><del>setHtmlTemplate(Class)</del>
+				<li><del>setHtmlTemplate(HtmlDocTemplate)</del>
 			</ul>
 		<li>
 			<c>&amp;plainText=true</c> parameter now works on byte-based serializers by converting the output to hex.
@@ -371,10 +371,10 @@
 			New classes for widget support:
 			<ul>
 				<li>{@link oajr.widget.Widget}
-				<li>{@del PoweredByJuneauWidget}
-				<li>{@del ContentTypeLinksColumnWidget}
-				<li>{@del ContentTypeLinksRowWidget}
-				<li>{@del QueryWidget}
+				<li><del>PoweredByJuneauWidget</del>
+				<li><del>ContentTypeLinksColumnWidget</del>
+				<li><del>ContentTypeLinksRowWidget</del>
+				<li><del>QueryWidget</del>
 			</ul>
 		<li>
 			<c>devops.css</c> cleaned up.
@@ -397,16 +397,16 @@
 	<h5 class='topic w800'>org.apache.juneau.rest.client</h5>
 	<ul class='spaced-list'>
 		<li>
-			New {@del org.apache.juneau.remoteable.Path} annotation for specifying path variables on remoteable interfaces.
+			New <del>Path</del> annotation for specifying path variables on remoteable interfaces.
 		<li>
-			New {@del @RequestBean} annotation for specifying beans with remoteable annotations
+			New <del>@RequestBean</del> annotation for specifying beans with remoteable annotations
 			defined on properties.
 		<li>
 			The following annotations (and related methods on RestCall) can now take <c>NameValuePairs</c> and beans as input 
 			when using <js>"*"</js> as the name.
-			<br>{@del org.apache.juneau.remoteable.FormData},{@del org.apache.juneau.remoteable.FormDataIfNE},
-			{@del org.apache.juneau.remoteable.Query},{@del org.apache.juneau.remoteable.QueryIfNE},
-			{@del org.apache.juneau.remoteable.Header},{@del org.apache.juneau.remoteable.HeaderIfNE} 
+			<br><del>FormData</del>,<del>FormDataIfNE</del>,
+			<del>Query</del>,<del>QueryIfNE</del>,
+			<del>Header</del>,<del>HeaderIfNE</del> 
 	</ul>
 	
 	<h5 class='topic w800'>org.apache.juneau.microservice</h5>
diff --git a/juneau-doc/docs/ReleaseNotes/6.3.1.html b/juneau-doc/docs/ReleaseNotes/6.3.1.html
index 8dd01e8ca..9ddae877b 100644
--- a/juneau-doc/docs/ReleaseNotes/6.3.1.html
+++ b/juneau-doc/docs/ReleaseNotes/6.3.1.html
@@ -25,23 +25,23 @@
 		<li>
 			{@link oaj.utils.PojoQuery} improvements.
 		<li>
-			New {@del RemoteMethod#returns()} annotation.
+			New <del>RemoteMethod.returns()</del> annotation.
 			<br>Allows you to specify whether the remote method returns the HTTP body or status code.
 		<li>
-			Fixed bugs with {@del BEAN_includeProperties} and {@del BEAN_excludeProperties} settings.
+			Fixed bugs with <del>BEAN_includeProperties</del> and <del>BEAN_excludeProperties</del> settings.
 		<li>
-			New/modified settings in {@del HtmlDocSerializerContext}:
+			New/modified settings in <del>HtmlDocSerializerContext</del>:
 			<ul>
-				<li>{@del HTMLDOC_script}
-				<li>{@del HTMLDOC_style} - Was <jsf>HTMLDOC_css</jsf>.
-				<li>{@del HTMLDOC_stylesheet} - Was <jsf>HTMLDOC_cssUrl</jsf>.  Now an array.
+				<li><del>HTMLDOC_script</del>
+				<li><del>HTMLDOC_style</del> - Was <jsf>HTMLDOC_css</jsf>.
+				<li><del>HTMLDOC_stylesheet</del> - Was <jsf>HTMLDOC_cssUrl</jsf>.  Now an array.
 			</ul>
 		<li>
-			New {@del ResourceFinder} utility class.
+			New <del>ResourceFinder</del>utility class.
 			Allows you to search for resources up the parent hierarchy chain.
 			Also allows you to search for localized resources.
 		<li>
-			Eliminated the following properties from {@del HtmlDocSerializerContext}:
+			Eliminated the following properties from <del>HtmlDocSerializerContext</del>:
 			<jsf>HTMLDOC_title</jsf>, <jsf>HTMLDOC_description</jsf>, <jsf>HTMLDOC_description</jsf>
 			<br>See below on changes to simplify HTML headers.
 		<li>
@@ -65,7 +65,7 @@
 		<li>
 			Modifications to the following <ja>@HtmlDoc</ja> annotations:
 			<ul>
-				<li>{@del oajr.annotation.HtmlDoc#navlinks() navlinks()} - Now an array of strings instead of a JSON object.  Simplified syntax.
+				<li><del>HtmlDoc.navlinks() navlinks()</del>- Now an array of strings instead of a JSON object.  Simplified syntax.
 					<br>For example:
 					<p class='bcode'>
 		<jc>// Old syntax</jc>
@@ -94,12 +94,12 @@
 				<li>Several annotations are now arrays of strings instead of simple strings.
 					Values are simply concatenated with newlines which makes multi-line values cleaner.
 					<ul>
-						<li>{@del oajr.annotation.HtmlDoc#header() header()}
-						<li>{@del oajr.annotation.HtmlDoc#nav() nav()}
-						<li>{@del oajr.annotation.HtmlDoc#aside() aside()}
-						<li>{@del oajr.annotation.HtmlDoc#footer() footer()}
-						<li>{@del oajr.annotation.HtmlDoc#script() script()}
-						<li>{@del oajr.annotation.HtmlDoc#style() style()}
+						<li><del>HtmlDoc#header() header()</del>
+						<li><del>HtmlDoc#nav() nav()</del>
+						<li><del>HtmlDoc#aside() aside()</del>
+						<li><del>HtmlDoc#footer() footer()</del>
+						<li><del>HtmlDoc#script() script()</del>
+						<li><del>HtmlDoc#style() style()</del>
 					</ul>
 					Additionally, the <js>"INHERIT"</js> string literal can be used to combine the value with
 					the value defined on the servlet or parent class.  Links can also be inserted at specific
@@ -111,14 +111,14 @@
 				<li>
 					You can now add arbitrary CSS and Javascript along with your widgets through new methods:
 					<ul>
-						<li>{@del Widget#getHtml(RestRequest)}
-						<li>{@del Widget#getScript(RestRequest)}
-						<li>{@del Widget#getStyle(RestRequest)}
+						<li><del>Widget#getHtml(RestRequest)</del>
+						<li><del>Widget#getScript(RestRequest)</del>
+						<li><del>Widget#getStyle(RestRequest)</del>
 					</ul>
 				</li>
 				<li>
-					Declaration of widgets moved to {@del oajr.annotation.HtmlDoc#widgets() @HtmlDoc(widgets)} 
-					instead of separately on {@del @RestResource} and <ja>@RestMethod</ja> annotations.
+					Declaration of widgets moved to <del>HtmlDoc.widgets() @HtmlDoc(widgets)</del> 
+					instead of separately on <del>@RestResource</del>and <ja>@RestMethod</ja> annotations.
 				<li>
 					{@link oajr.widget.Widget#getName()} now defaults to the simple class name.
 					<br>So now you can just refer to the class name: <js>"$W{ContentTypeMenuItem}"</js>.
@@ -145,43 +145,43 @@
 					<br><img src='doc-files/ReleaseNotes.631.StyleMenuItem.png'>
 			</ul>
 		<li>
-			New/modified annotations on {@del oajr.annotation.HtmlDoc @HtmlDoc}:
+			New/modified annotations on <del>HtmlDoc @HtmlDoc</del>:
 			<ul>
-				<li>{@del oajr.annotation.HtmlDoc#style() style()} - Renamed from <c>css()</c>.
-				<li>{@del oajr.annotation.HtmlDoc#stylesheet() stylesheet()} - Renamed from <c>cssUrl()</c>.
+				<li><del>HtmlDoc.style() style()</del>- Renamed from <c>css()</c>.
+				<li><del>HtmlDoc.stylesheet() stylesheet()</del>- Renamed from <c>cssUrl()</c>.
 					<br>Can now be a comma-delimited list of URLs.
-				<li>{@del oajr.annotation.HtmlDoc#script() script()} - Add arbitrary Javascript to page header.
+				<li><del>HtmlDoc.script() script()</del>- Add arbitrary Javascript to page header.
 			</ul>
 	
 		<li>
-			Bug fix with {@del oajr.annotation.HtmlDoc#nowrap() @HtmlDoc(nowrap)} so that the setting only applies
+			Bug fix with <del>HtmlDoc.nowrap() @HtmlDoc(nowrap)</del>so that the setting only applies
 			to the data contents, not the whole page.
 		<li>
 			Two convenience methods added to {@link oajr.RestRequest}:
 			<ul>
-				<li>{@del RestRequest#attr(String,Object)}
-				<li>{@del RestRequest#prop(String,Object)}
+				<li><del>RestRequest#attr(String,Object)</del>
+				<li><del>RestRequest#prop(String,Object)</del>
 			</ul>
 		</li>
 		<li>
 			Annotations added:
 			<ul>
-				<li>{@del @RestResource(siteName)}
-				<li>{@del @RestResource(flags)}
-				<li>{@del oajr.annotation.RestMethod#flags() @RestMethod(flags)}
+				<li><del>@RestResource(siteName)</del>
+				<li><del>@RestResource(flags)</del>
+				<li><del>RestMethod.flags() @RestMethod(flags)</del>
 			</ul>
 		</li>
 		<li>
-			Eliminated the {@del @RestResource(stylesheet)} annotation.  
+			Eliminated the <del>@RestResource(stylesheet)</del>annotation.  
 			It's no longer needed now that you can easily specify styles via <ja>@Htmldoc</ja>.
 		<li>
-			Eliminated the following annotations since they are now redundant with {@del oajr.annotation.HtmlDoc#header() @HtmlDoc(header)}:
+			Eliminated the following annotations since they are now redundant with <del>HtmlDoc.header() @HtmlDoc(header)</del>:
 			<ul>
 				<li><c>title()</c>
 				<li><c>description()</c>
 				<li><c>branding()</c>
 			</ul>
-			Instead, the {@del oajr.BasicRestServlet} class defines the following default header
+			Instead, the <del>BasicRestServlet</del>class defines the following default header
 			that can be easily overridden: 
 			<p class='bcode'>
 		htmldoc=<ja>@HtmlDoc</ja>(
@@ -205,13 +205,13 @@
 		)
 			</p>
 		<li>
-			New {@del ReaderResource#toCommentStrippedString()} method.
+			New <del>ReaderResource.toCommentStrippedString()</del>method.
 		<li>
 			The <c>bpIncludes()</c> and <c>bpExcludes()</c> annotations on <ja>@RestMethod</ja>
 			has been replaced with the following:
 			<ul>
-				<li>{@del oajr.annotation.RestMethod#bpi() bpi()} - Now an array of simplified values instead of LAX JSON.
-				<li>{@del oajr.annotation.RestMethod#bpx() bpx()} - Now an array of simplified values instead of LAX JSON.
+				<li><del>RestMethod.bpi() bpi()</del>- Now an array of simplified values instead of LAX JSON.
+				<li><del>RestMethod.bpx() bpx()</del>- Now an array of simplified values instead of LAX JSON.
 			</ul>
 		<li>
 			Two new variables added to <c>$R</c> variable: <js>"$R{servletClass}"</js>, <js>"$R{servletClassSimple}"</js>
diff --git a/juneau-doc/docs/ReleaseNotes/6.4.0.html b/juneau-doc/docs/ReleaseNotes/6.4.0.html
index c0caf253e..ac3fe1a46 100644
--- a/juneau-doc/docs/ReleaseNotes/6.4.0.html
+++ b/juneau-doc/docs/ReleaseNotes/6.4.0.html
@@ -204,7 +204,7 @@
 			Improvements to swap support.
 			<ul>
 				<li>New {@link oaj.annotation.Swap @Swap} annotation.
-					<br>Replaces the <c>@Pojo</c> and {@del @BeanProperty(swap)} annotations.
+					<br>Replaces the <c>@Pojo</c> and <del>@BeanProperty(swap)</del> annotations.
 				<li>Support for per-media-type swaps.
 					<br>Programmatic example:
 					<p class='bcode'>
@@ -251,7 +251,7 @@
 			<ja>@Swap</ja>(impl=FreeMarkerSwap.<jk>class</jk>, template=<js>"MyPojo.div.ftl"</js>)
 			<jk>public class</jk> MyPojo {}
 					</p>
-				<li>New {@del oaj.annotation.Swaps @Swaps} annotation for defining multiple swaps
+				<li>New <del>Swaps @Swaps</del> annotation for defining multiple swaps
 					against the same POJO when they're differentiated by media types:
 					<p class='bcode'>
 		<ja>@Swaps</ja>(
@@ -265,7 +265,7 @@
 					</p>
 			</ul>
 		<li>
-			New {@del oaj.transform.Surrogate} interface for identifying surrogate classes.
+			New <del>Surrogate</del> interface for identifying surrogate classes.
 		<li>
 			Serializers can now serialize to {@link java.util.StringBuilder StringBuilders}.
 		<li>
@@ -311,42 +311,42 @@
 			</p>
 			This is mostly an internal change and doesn't affect the existing APIs.
 		<li>
-			{@del oaj.transform.PojoSwap#swap(BeanSession,Object)} and {@del oaj.transform.PojoSwap#unswap(BeanSession,Object,ClassMeta)} 
+			<del>PojoSwap.swap(BeanSession,Object)</del>and <del>PojoSwap.unswap(BeanSession,Object,ClassMeta)</del> 
 			can now throw arbitrary exceptions instead of having to wrap them in <c>SerializeException</c>/<c>ParseException</c>.
 		<li>
-			New {@del oaj.utils.CalendarUtils} class that encapsulates serialization/parsing logic from {@del oaj.transforms.CalendarSwap} and 
-			{@del oaj.transforms.DateSwap}.
+			New <del>CalendarUtils</del> class that encapsulates serialization/parsing logic from <del>CalendarSwap</del>and 
+			<del>DateSwap</del>.
 		<li>
 			New annotation {@link oaj.html.annotation.Html#anchorText}.
 		<li>
-			New methods on {@del oaj.ObjectList}:
+			New methods on <del>ObjectList</del>:
 			<ul>
-				<li>{@del oaj.ObjectList#get(int,Class) get(int,Class)}
+				<li><del>ObjectList#get(int,Class) get(int,Class)</del>
 				<li>{@del oaj.ObjectList#get(int,Type,Type...) get(int,Type,Type...)}
-				<li>{@del oaj.ObjectList#getMap(int,Class,Class) getMap(int,Class,Class)}
-				<li>{@del oaj.ObjectList#getList(int,Class) getList(int,Class)}
+				<li><del>ObjectList#getMap(int,Class,Class) getMap(int,Class,Class)</del>
+				<li><del>ObjectList#getList(int,Class) getList(int,Class)</del>
 			</ul>
 		<li>
-			New methods on {@del oaj.ObjectMap}:
+			New methods on <del>ObjectMap</del>:
 			<ul>
-				<li>{@del oaj.ObjectMap#get(String,Class) get(String,Class)}
+				<li><del>ObjectMap#get(String,Class) get(String,Class)</del>
 				<li>{@del oaj.ObjectMap#get(String,Type,Type...) get(String,Type,Type...)}
-				<li>{@del oaj.ObjectMap#getWithDefault(String,Object) getWithDefault(String,Object)}
-				<li>{@del oaj.ObjectMap#getWithDefault(String,Object,Class) getWithDefault(String,Object,Class)}
+				<li><del>ObjectMap#getWithDefault(String,Object) getWithDefault(String,Object)</del>
+				<li><del>ObjectMap#getWithDefault(String,Object,Class) getWithDefault(String,Object,Class)</del>
 				<li>{@del oaj.ObjectMap#getWithDefault(String,Object,Type,Type...) getWithDefault(String,Object,Type,Type...)}
-				<li>{@del oaj.ObjectMap#getSwapped(String,PojoSwap) getSwapped(String,PojoSwap)}
-				<li>{@del oaj.ObjectMap#getAt(String,Class) getAt(String,Class)}
+				<li><del>ObjectMap#getSwapped(String,PojoSwap) getSwapped(String,PojoSwap)</del>
+				<li><del>ObjectMap#getAt(String,Class) getAt(String,Class)</del>
 				<li>{@del oaj.ObjectMap#getAt(String,Type,Type...) getAt(String,Type,Type...)}
-				<li>{@del oaj.ObjectMap#getMap(String,Class,Class,Map) getMap(String,Class,Class,Map)}
-				<li>{@del oaj.ObjectMap#getList(String,Class,List) getList(String,Class,List)}
+				<li><del>ObjectMap#getMap(String,Class,Class,Map) getMap(String,Class,Class,Map)</del>
+				<li><del>ObjectMap#getList(String,Class,List) getList(String,Class,List)</del>
 			</ul>
 		<li>
-			New methods on {@del oaj.utils.PojoRest}:
+			New methods on <del>PojoRest</del>:
 			<ul>
-				<li>{@del oaj.utils.PojoRest#get(String,Class) get(String,Class)}
+				<li><del>PojoRest#get(String,Class) get(String,Class)</del>
 				<li>{@del oaj.utils.PojoRest#get(String,Type,Type...) get(String,Type,Type...)}
-				<li>{@del oaj.utils.PojoRest#getWithDefault(String,Object) getWithDefault(String,Object)}
-				<li>{@del oaj.utils.PojoRest#getWithDefault(String,Object,Class) getWithDefault(String,Object,Class)}
+				<li><del>PojoRest#getWithDefault(String,Object) getWithDefault(String,Object)</del>
+				<li><del>PojoRest#getWithDefault(String,Object,Class) getWithDefault(String,Object,Class)</del>
 				<li>{@del oaj.utils.PojoRest#getWithDefault(String,Object,Type,Type...) getWithDefault(String,Object,Type,Type...)}
 			</ul>
 		<li>
@@ -358,7 +358,7 @@
 			the call to <c>getClass()</c> to retrieve the annotation value could not be called before calling
 			the <c><jk>super</jk>()</c> method.
 		<li>
-			New class: {@del oaj.utils.PojoMerge}
+			New class: <del>PojoMerge</del>
 		<li>
 			New doc: <dc>2.6.2 - @Pojo annotation</dc>
 		<li>
@@ -368,7 +368,7 @@
 	<h5 class='topic w800'>juneau-dto</h5>
 	<ul class='spaced-list'>
 		<li>
-			{@link oaj.dto.html5.HtmlElementMixed#children(Object...)} can now take in collections
+			{@link oaj.dto.html5.HtmlElementMixed.children(Object...)} can now take in collections
 			of objects.
 		<li>
 			The DTO beans can now be serialized to strings of their typical language by calling the <c>toString()</c> method.
@@ -381,13 +381,13 @@
 	<ul class='spaced-list'>
 		<li>
 			Revamped and simplified servlet and REST-call lifecycle handling through new
-			{@del @RestHook} annotation.
+			<del>@RestHook</del>annotation.
 			<ul>
-				<li>The {@del oajr.RestServlet#init(ServletConfig)} method is now final and can
+				<li>The <del>RestServlet.init(ServletConfig)</del>method is now final and can
 					no longer be extended.
 					<br>Instead, use {@link oajr.annotation.HookEvent#INIT} or 
 					{@link oajr.annotation.HookEvent#POST_INIT} for initialization.
-				<li>The following methods on {@del oajr.RestServlet} have been removed:
+				<li>The following methods on <del>RestServlet</del> have been removed:
 					<ul>
 						<li><c>init(RestConfig)</c> 
 							- Use {@link oajr.annotation.HookEvent#INIT} instead.
@@ -401,40 +401,40 @@
 			</ul>
 		<li>
 			Simplified {@link oajr.widget.MenuItemWidget}.
-			<br>Exposes an abstract method {@del getContent(RestRequest)} that
+			<br>Exposes an abstract method <del>getContent(RestRequest)</del> that
 			can return raw HTML via readers or char-sequences, or any other object (such as HTML5 beans) that will
-			get converted to HTML using {@link oaj.html.HtmlSerializer#DEFAULT}.
+			get converted to HTML using {@link oaj.html.HtmlSerializer.DEFAULT}.
 		<li>
-			{@del oajr.RestResourceResolver} instances are now inherited from parent resources to child resources
+			<del>RestResourceResolver</del> instances are now inherited from parent resources to child resources
 			unless explicitly overridden at the child level.
 			<br>It's also been changed to an interface.
-		<li>New annotations on {@del @RestResource}:
+		<li>New annotations on <del>@RestResource</del>:
 			<ul>
-				<li>{@del resourceResolver()}
+				<li><del>resourceResolver()</del>
 					<br>Allows you to specify a resource resolver on the servlet context to make it easier to work with
 					dependency injection frameworks.
-				<li>{@del contextPath()} - 
+				<li><del>contextPath()</del> - 
 					<br>Allows you to override the context path value inherited from the servlet container.
-				<li>{@del allowHeaderParams()} - 
+				<li><del>allowHeaderParams()</del> - 
 					<br>Replaces the <c>RestContext.REST_allowHeaderParams</c> setting.
-				<li>{@del allowMethodParam()} - 
+				<li><del>allowMethodParam()</del> - 
 					<br>Replaces the <c>RestContext.REST_allowMethodParam</c> setting.
-				<li>{@del allowBodyParam()} - 
+				<li><del>allowBodyParam()</del> - 
 					<br>Replaces the <c>RestContext.REST_allowBodyParam</c> setting.
-				<li>{@del renderResponseStackTraces()} - 
+				<li><del>renderResponseStackTraces()</del> - 
 					<br>Replaces the <c>RestContext.REST_xxx</c> setting.
-				<li>{@del useStackTraceHashes()} - 
+				<li><del>useStackTraceHashes()</del> - 
 					<br>Replaces the <c>RestContext.REST_useStackTraceHashes</c> setting.
-				<li>{@del defaultCharset()} - 
+				<li><del>defaultCharset()</del> - 
 					<br>Replaces the <c>RestContext.REST_defaultCharset</c> setting.
-				<li>{@del paramFormat()} - 
+				<li><del>paramFormat()</del>- 
 					<br>Replaces the <c>RestContext.REST_paramFormat</c> setting.
 			</ul>
-		<li>New annotations on {@del oajr.annotation.RestMethod @RestMethod}:
+		<li>New annotations on <del>RestMethod @RestMethod</del>:
 			<ul>
-				<li>{@del oajr.annotation.RestMethod#defaultCharset() defaultCharset()} - 
+				<li><del>RestMethod.defaultCharset() defaultCharset()</del>- 
 					<br>Replaces the <c>RestContext.REST_defaultCharset</c> setting.
-				<li>{@del RestMethod#paramFormat()} - 
+				<li><del>RestMethod.paramFormat()</del>- 
 					<br>Replaces the <c>RestContext.REST_paramFormat</c> setting.
 			</ul>
 		<li>
@@ -442,12 +442,12 @@
 			<ul>
 				<li>{@link oajr.widget.Widget}
 				<li>{@link oajr.RestConverter}
-				<li>{@del oajr.RestGuard}
+				<li><del>RestGuard</del>
 				<li>{@link oajr.ResponseHandler}
-				<li>{@del oajr.RestCallHandler}
-				<li>{@del oajr.RestInfoProvider}
-				<li>{@del oajr.RestResourceResolver}
-				<li>{@del oajr.RestLogger}
+				<li><del>RestCallHandler</del>
+				<li><del>RestInfoProvider</del>
+				<li><del>RestResourceResolver</del>
+				<li><del>RestLogger</del>
 				<li>{@link oaj.html.HtmlDocTemplate}
 			</ul>
 		<li>
@@ -473,27 +473,27 @@
 			for maximum flexibility instead of the hodge-podge of support in the config file.
 			<br>Top-level servlets should now be defined in the provided <c>jetty.xml</c> file.
 		<li>
-			New methods on {@del RestMicroservice}:
+			New methods on <del>RestMicroservice</del>:
 			<ul>
-				<li>{@del addServlet(Servlet,String)}
-				<li>{@del addServletAttribute(String,Object)}
-				<li>{@del getServer()}
-				<li>{@del getInstance()}
-				<li>{@del getPort()}
-				<li>{@del getContextPath()}
-				<li>{@del getProtocol()}
-				<li>{@del getHostName()}
+				<li><del>addServlet(Servlet,String)</del>
+				<li><del>addServletAttribute(String,Object)</del>
+				<li><del>getServer()</del>
+				<li><del>getInstance()</del>
+				<li><del>getPort()</del>
+				<li><del>getContextPath()</del>
+				<li><del>getProtocol()</del>
+				<li><del>getHostName()</del>
 			</ul>
 		<li>
 			New methods on {@link oaj.microservice.Microservice}:
 			<ul>
-				<li>{@link oaj.microservice.Microservice#getInstance() getInstance()}
+				<li>{@link oaj.microservice.Microservice.getInstance() getInstance()}
 			</ul>
 		<li>
-			New class {@del JettyLogger} for directing Jetty logging to the
+			New class <del>JettyLogger</del> for directing Jetty logging to the
 			java.util.logging framework.
 		<li>
-			New class {@del DebugResource} for viewing and generating
+			New class <del>DebugResource</del>for viewing and generating
 			Jetty thread dumps through REST calls.
 	</ul>
 	
diff --git a/juneau-doc/docs/ReleaseNotes/7.0.0.html b/juneau-doc/docs/ReleaseNotes/7.0.0.html
index 077c27ac8..71b295392 100644
--- a/juneau-doc/docs/ReleaseNotes/7.0.0.html
+++ b/juneau-doc/docs/ReleaseNotes/7.0.0.html
@@ -23,7 +23,7 @@
 	<h5 class='topic w800'>juneau-marshall</h5>
 	<ul class='spaced-list'>
 		<li>
-			New class {@del oaj.http.HttpMethodName} with valid static string HTTP method names.
+			New class <del>HttpMethodName</del> with valid static string HTTP method names.
 	</ul>
 	
 	<h5 class='topic w800'>juneau-dto</h5>
@@ -36,9 +36,9 @@
 	<h5 class='topic w800'>juneau-rest-server</h5>
 	<ul class='spaced-list'>
 		<li>
-			Annotation <c><ja>@HtmlDoc</ja>(links)</c> renamed to {@del oajr.annotation.HtmlDoc#navlinks() navlinks}.
+			Annotation <c><ja>@HtmlDoc</ja>(links)</c> renamed to <del>HtmlDoc#navlinks() navlinks</del>.
 		<li>
-			New annotation {@del oajr.annotation.HtmlDoc#head() @HtmlDoc(head)}.
+			New annotation <del>HtmlDoc.head() @HtmlDoc(head)</del>.
 			<br>Allows you to specify arbitrary HTML content in the <xt>&lt;head&gt;</xt> section of the page.
 		<li>
 			Removed annotation <c><ja>@HtmlDoc</ja>(favIcon)</c>.
@@ -51,6 +51,6 @@
 			</p>
 		<li>
 			Removed several of the HTMLDOC-related methods from the <c>RestResponse/RestConfig/RestContext</c>
-			classes and moved it into the new {@del oajr.HtmlDocBuilder} class.
+			classes and moved it into the new <del>HtmlDocBuilder</del>class.
 	</ul>
 </div>
\ No newline at end of file
diff --git a/juneau-doc/docs/ReleaseNotes/7.0.1.html b/juneau-doc/docs/ReleaseNotes/7.0.1.html
index d4b1e3407..b05b91209 100644
--- a/juneau-doc/docs/ReleaseNotes/7.0.1.html
+++ b/juneau-doc/docs/ReleaseNotes/7.0.1.html
@@ -38,11 +38,11 @@
 			</p>
 			<br>The same static create methods have also been added to the following classes:
 			<ul>
-				<li>{@del oaj.serializer.SerializerGroup#create()}
-				<li>{@del oaj.parser.ParserGroup#create()}
-				<li>{@del oaj.encoders.EncoderGroup#create()}
+				<li><del>SerializerGroup#create()</del>
+				<li><del>ParserGroup#create()</del>
+				<li><del>EncoderGroup#create()</del>
 				<li>{@link oajrc.RestClient#create()}
-				<li>{@del ConfigFile#create()}
+				<li><del>ConfigFile#create()</del>
 			</ul>
 		<li>
 			The order of the parameters in {@link oaj.serializer.SerializerSession#serialize(Object,Object)}
@@ -64,8 +64,8 @@
 	<h5 class='topic w800'>juneau-rest-server</h5>
 	<ul class='spaced-list'>
 		<li>
-			New {@del @RestResource(maxInput)} and 
-			{@del oajr.annotation.RestMethod#maxInput() @RestMethod(maxInput)} for alleviating
+			New <del>@RestResource(maxInput)</del> and 
+			<del>RestMethod.maxInput() @RestMethod(maxInput)</del>for alleviating
 			potential DoS attacks.
 	</ul>
 	
@@ -135,7 +135,7 @@
 				<li>New methods on {@link oaj.microservice.Microservice}
 					<ul>
 						<li>{@link oaj.microservice.Microservice#startConsole() startConsole()}
-						<li>{@del createConsoleCommands()}
+						<li><del>createConsoleCommands()</del>
 						<li>{@link oaj.microservice.Microservice#getConsoleReader() getConsoleReader()}
 						<li>{@link oaj.microservice.Microservice#getConsoleWriter() getConsoleWriter()}
 					</ul>	
diff --git a/juneau-doc/docs/ReleaseNotes/7.1.0.html b/juneau-doc/docs/ReleaseNotes/7.1.0.html
index 0af5d49e0..7dc4144ca 100644
--- a/juneau-doc/docs/ReleaseNotes/7.1.0.html
+++ b/juneau-doc/docs/ReleaseNotes/7.1.0.html
@@ -105,28 +105,28 @@
 					<li class='jc'>{@link oaj.httppart.HttpPartType}
 					<li class='jic'>{@link oaj.httppart.HttpPartSerializer}
 					<ul>
-						<li class='jc'>{@del UonPartSerializer}
-						<li class='jc'>{@del SimpleUonPartSerializer}
+						<li class='jc'><del>UonPartSerializer</del>
+						<li class='jc'><del>SimpleUonPartSerializer</del>
 						<li class='jc'>{@link oaj.httppart.SimplePartSerializer}
 					</ul>
 					<li class='jic'>{@link oaj.httppart.HttpPartParser}
 					<ul>
-						<li class='jc'>{@del UonPartParser}
-						<li class='jc'>{@del SimplePartParser}
+						<li class='jc'><del>UonPartParser</del>
+						<li class='jc'><del>SimplePartParser</del>
 					</ul>
 				</ul>
 			</ul>
 			Code for marshalling of parts have been removed from the URL-Encoding serializers and parsers.
 		<li>	
-			<c>Context.Builder.property(String,Object)</c> renamed to {@del oaj.Context.Builder#set(String,Object)}.
+			<c>Context.Builder.property(String,Object)</c> renamed to <del>Builder#set(String,Object)</del>.
 		<li>
 			<c>ResourceFinder</c> class has been replaced with the following:
 			<ul>
-				<li>{@del oaj.utils.ClasspathResourceFinder}
-				<li>{@del oaj.utils.ClasspathResourceFinderSimple}
-				<li>{@del oaj.utils.ClasspathResourceFinderBasic}
-				<li>{@del oaj.utils.ClasspathResourceFinderRecursive}
-				<li>{@del oaj.utils.ClasspathResourceManager}
+				<li><del>ClasspathResourceFinder</del>
+				<li><del>ClasspathResourceFinderSimple</del>
+				<li><del>ClasspathResourceFinderBasic</del>
+				<li><del>ClasspathResourceFinderRecursive</del>
+				<li><del>ClasspathResourceManager</del>
 			</ul>
 		<li>
 			New methods on {@link oaj.serializer.SerializerSession}:
@@ -141,22 +141,22 @@
 				<li>{@link oaj.parser.ParserSession#getListener(Class) getListener(Class)}
 			</ul>
 		<li>
-			New {@del oaj.parser.Parser#PARSER_unbuffered} setting allows you to disable internal
+			New <del>Parser.PARSER_unbuffered</del>setting allows you to disable internal
 			buffering on the JSON and UON parsers so that they can be used to read continous streams of objects.
 		<li>
-			New {@del oaj.json.JsonParser#JSON_validateEnd} and {@del oaj.uon.UonParser#UON_validateEnd} 
+			New <del>JsonParser.JSON_validateEnd</del>and <del>UonParser.UON_validateEnd</del>
 			settings allow you to control whether we validate that there is no garbage at the end of the parsed input.
 		<li>
-			New {@del oaj.parser.Parser#PARSER_autoCloseStreams} setting allows input streams and
+			New <del>Parser.PARSER_autoCloseStreams</del> setting allows input streams and
 			readers passed into parsers to be automatically closed after parsing.
 		<li>
-			Syntax changed on unswap method on {@del oaj.transform.Surrogate} classes.
+			Syntax changed on unswap method on <del>Surrogate</del> classes.
 			<br>It's now a regular method instead of a static method.
 		<li>
 			{@link oaj.annotation.Swap @Swap} annotation can now be used with 
-			{@del oaj.transform.Surrogate} classes.
+			<del>Surrogate</del>classes.
 		<li>
-			New support for {@del PojoBuilders POJO Builders}.	
+			New support for <del>PojoBuilders POJO Builders</del>.	
 	</ul>
 	
 	<h5 class='topic w800'>juneau-svl</h5>
@@ -214,48 +214,48 @@
 	<h5 class='topic w800'>juneau-rest-server</h5>
 	<ul class='spaced-list'>
 		<li>
-			<c>RestServletDefault</c> renamed to {@del oajr.BasicRestServlet}.
+			<c>RestServletDefault</c> renamed to <del>BasicRestServlet</del>.
 		<li>
-			<c>RestServletGroupDefault</c> renamed to {@del oajr.BasicRestServletGroup}.
+			<c>RestServletGroupDefault</c> renamed to <del>BasicRestServletGroup</del>.
 		<li>
 			The <js>"$R{...}"</js> variable has been split into the following:
 			<ul>
 				<li><js>"$RA{key1[,key2...]}"</js> - {@link oajr.vars.RequestAttributeVar}, first non-null value returned by <c>HttpServletRequest.getAttribute(String)</c>.
-				<li><js>"$RF{key1[,key2...]}"</js> - {@link oajr.vars.RequestFormDataVar}, first non-null value returned by {@del oajr.RestRequest#getFormData(String)}.
+				<li><js>"$RF{key1[,key2...]}"</js> - {@link oajr.vars.RequestFormDataVar}, first non-null value returned by <del>RestRequest#getFormData(String)</del>.
 				<li><js>"$RH{key1[,key2...]}"</js> - {@link oajr.vars.RequestHeaderVar}, first non-null value returned by {@link oajr.RestRequest#getHeader(String)}.
-				<li><js>"$RI{key1[,key2...]}"</js> - {@del oajr.vars.RestInfoVar}, first non-null value returned by {@del oajr.RestRequest#getInfoProvider()}.
+				<li><js>"$RI{key1[,key2...]}"</js> - <del>RestInfoVar</del>, first non-null value returned by <del>RestRequest#getInfoProvider()</del>.
 					<br>The possible values are:
 					<ul>
 						<li><js>"contact"</js> - Value returned by {@link oaj.dto.swagger.Info#getContact()}
-						<li><js>"description"</js> - Value returned by {@del oajr.RestInfoProvider#getDescription(RestRequest)}
+						<li><js>"description"</js> - Value returned by <del>RestInfoProvider#getDescription(RestRequest)</del>
 						<li><js>"externalDocs"</js> - Value returned by {@link oaj.dto.swagger.Swagger#getExternalDocs()}
 						<li><js>"license"</js> - Value returned by {@link oaj.dto.swagger.Info#getLicense()}
-						<li><js>"methodDescription"</js> - Value returned by {@del RestInfoProvider#getMethodDescription(Method,RestRequest)}
-						<li><js>"methodSummary"</js> - Value returned by {@del RestInfoProvider#getMethodSummary(Method,RestRequest)}
-						<li><js>"siteName"</js> - Value returned by {@del RestInfoProvider#getSiteName(RestRequest)}
+						<li><js>"methodDescription"</js> - Value returned by <del>RestInfoProvider#getMethodDescription(Method,RestRequest)</del>
+						<li><js>"methodSummary"</js> - Value returned by <del>RestInfoProvider#getMethodSummary(Method,RestRequest)</del>
+						<li><js>"siteName"</js> - Value returned by <del>RestInfoProvider#getSiteName(RestRequest)</del>
 						<li><js>"tags"</js> - Value returned by {@link oaj.dto.swagger.Swagger#getTags()}
 						<li><js>"termsOfService"</js> - Value returned by {@link oaj.dto.swagger.Info#getTermsOfService()}
-						<li><js>"title"</js> - See {@del oajr.RestInfoProvider#getTitle(RestRequest)}
+						<li><js>"title"</js> - See <del>RestInfoProvider#getTitle(RestRequest)</del>
 						<li><js>"version"</js> - See {@link oaj.dto.swagger.Info#getVersion()}
 					</ul>					
-				<li><js>"$RP{key1[,key2...]}"</js> - {@link oajr.vars.RequestPathVar}, first non-null value returned by {@del oajr.RestRequest#getPath(String)}.
-				<li><js>"$RQ{key1[,key2...]}"</js> - {@link oajr.vars.RequestQueryVar}, first non-null value returned by {@del RestRequest#getQuery(String)}.
+				<li><js>"$RP{key1[,key2...]}"</js> - {@link oajr.vars.RequestPathVar}, first non-null value returned by <del>RestRequest#getPath(String)</del>.
+				<li><js>"$RQ{key1[,key2...]}"</js> - {@link oajr.vars.RequestQueryVar}, first non-null value returned by <del>RestRequest#getQuery(String)</del>.
 				<li><js>"$R{key1[,key2...]}"</js> - {@link oajr.vars.RequestVar}, first non-null other request variable.
 					<br>The possible values are:
 					<ul>
 						<li><js>"contextPath"</js> - Value returned by {@link oajr.RestRequest#getContextPath()}
 						<li><js>"method"</js> - Value returned by {@link oajr.RestRequest#getMethod()}
-						<li><js>"methodDescription"</js> - Value returned by {@del oajr.RestRequest#getMethodDescription()}
-						<li><js>"methodSummary"</js> - Value returned by {@del oajr.RestRequest#getMethodSummary()}
+						<li><js>"methodDescription"</js> - Value returned by <del>RestRequest#getMethodDescription()</del>
+						<li><js>"methodSummary"</js> - Value returned by <del>RestRequest#getMethodSummary()</del>
 						<li><js>"pathInfo"</js> - Value returned by {@link oajr.RestRequest#getPathInfo()}
 						<li><js>"requestParentURI"</js> - Value returned by {@link oaj.UriContext#getRootRelativePathInfoParent()}
 						<li><js>"requestURI"</js> - Value returned by {@link oajr.RestRequest#getRequestURI()}
-						<li><js>"resourceDescription"</js> - Value returned by {@del oajr.RestRequest#getResourceDescription()}
-						<li><js>"resourceTitle"</js> - See {@del oajr.RestRequest#getResourceTitle()}
+						<li><js>"resourceDescription"</js> - Value returned by <del>RestRequest#getResourceDescription()</del>
+						<li><js>"resourceTitle"</js> - See <del>RestRequest#getResourceTitle()</del>
 						<li><js>"servletParentURI"</js> - Value returned by {@link oaj.UriContext#getRootRelativeServletPathParent()}
 						<li><js>"servletPath"</js> - See {@link oajr.RestRequest#getServletPath()}
 						<li><js>"servletURI"</js> - See {@link oaj.UriContext#getRootRelativeServletPath()}
-						<li><js>"siteName"</js> - See {@del RestRequest#getSiteName()}
+						<li><js>"siteName"</js> - See <del>RestRequest#getSiteName()</del>
 					</ul>
 			</ul>
 		<li>
@@ -263,130 +263,130 @@
 			<br>Settings on {@link oajr.RestContext} objects can now be set declaratively through the 
 				following new properties:
 			<ul>
-				<li>{@del RestContext#REST_allowHeaderParams}
-				<li>{@del RestContext#REST_allowBodyParam}
-				<li>{@del oajr.RestContext#REST_allowedMethodParams REST_allowedMethodParams}
-				<li>{@del oajr.RestContext#REST_renderResponseStackTraces REST_renderResponseStackTraces}
-				<li>{@del RestContext#REST_useStackTraceHashes}
-				<li>{@del oajr.RestContext#REST_defaultCharset REST_defaultCharset}
-				<li>{@del oajr.RestContext#REST_maxInput REST_maxInput}
-				<li>{@del RestContext#REST_paramResolvers}
-				<li>{@del oajr.RestContext#REST_converters REST_converters}
-				<li>{@del oajr.RestContext#REST_guards REST_guards}
-				<li>{@del RestContext#REST_responseHandlers}
-				<li>{@del RestContext#REST_defaultRequestHeaders}
-				<li>{@del RestContext#REST_defaultResponseHeaders}
-				<li>{@del oajr.RestContext#REST_produces REST_produces}
-				<li>{@del oajr.RestContext#REST_consumes REST_consumes}
-				<li>{@del oajr.RestContext#REST_clientVersionHeader REST_clientVersionHeader}
-				<li>{@del RestContext#REST_resourceResolver}
-				<li>{@del RestContext#REST_logger}
-				<li>{@del RestContext#REST_callHandler}
-				<li>{@del RestContext#REST_infoProvider}
-				<li>{@del oajr.RestContext#REST_path REST_path}
-				<li>{@del RestContext#REST_contextPath}
-				<li>{@del oajr.RestContext#REST_staticFiles REST_staticFiles}
-				<li>{@del RestContext#REST_staticFileResponseHeaders}
-				<li>{@del RestContext#REST_classpathResourceFinder}
-				<li>{@del RestContext#REST_useClasspathResourceCaching}
-				<li>{@del RestContext#REST_widgets}
-				<li>{@del RestContext#REST_mimeTypes}
+				<li><del>RestContext#REST_allowHeaderParams</del>
+				<li><del>RestContext#REST_allowBodyParam</del>
+				<li><del>RestContext#REST_allowedMethodParams REST_allowedMethodParams</del>
+				<li><del>RestContext#REST_renderResponseStackTraces REST_renderResponseStackTraces</del>
+				<li><del>RestContext#REST_useStackTraceHashes</del>
+				<li><del>RestContext#REST_defaultCharset REST_defaultCharset</del>
+				<li><del>RestContext#REST_maxInput REST_maxInput</del>
+				<li><del>RestContext#REST_paramResolvers</del>
+				<li><del>RestContext#REST_converters REST_converters</del>
+				<li><del>RestContext#REST_guards REST_guards</del>
+				<li><del>RestContext#REST_responseHandlers</del>
+				<li><del>RestContext#REST_defaultRequestHeaders</del>
+				<li><del>RestContext#REST_defaultResponseHeaders</del>
+				<li><del>RestContext#REST_produces REST_produces</del>
+				<li><del>RestContext#REST_consumes REST_consumes</del>
+				<li><del>RestContext#REST_clientVersionHeader REST_clientVersionHeader</del>
+				<li><del>RestContext#REST_resourceResolver</del>
+				<li><del>RestContext#REST_logger</del>
+				<li><del>RestContext#REST_callHandler</del>
+				<li><del>RestContext#REST_infoProvider</del>
+				<li><del>RestContext#REST_path REST_path</del>
+				<li><del>RestContext#REST_contextPath</del>
+				<li><del>RestContext#REST_staticFiles REST_staticFiles</del>
+				<li><del>RestContext#REST_staticFileResponseHeaders</del>
+				<li><del>RestContext#REST_classpathResourceFinder</del>
+				<li><del>RestContext#REST_useClasspathResourceCaching</del>
+				<li><del>RestContext#REST_widgets</del>
+				<li><del>RestContext.REST_mimeTypes</del>
 			</ul>
 		<li>
 			Support for static files has been simplified and improved.
 			<ul>
-				<li>Syntax on {@del @RestResource(staticFiles)} has been simplified, and
+				<li>Syntax on <del>@RestResource(staticFiles)</del>has been simplified, and
 					now allows you to specify response headers in the strings.
 				<li>Response headers for static files can also be configured through 
-					{@del RestContext#REST_staticFileResponseHeaders}
+					<del>RestContext#REST_staticFileResponseHeaders</del>
 				<li>Static file in-memory caching now configurable through 
-					{@del RestContext#REST_useClasspathResourceCaching}
+					<del>RestContext#REST_useClasspathResourceCaching</del>
 				<li>Static file retrieval can be customized through 
-					{@del RestContext#REST_classpathResourceFinder}
+					<del>RestContext#REST_classpathResourceFinder</del>
 			</ul>
 		<li>
 			Eliminated the <c>RestMatcherReflecting</c> class.
 			<br>You can now simply create a {@link oajr.RestMatcher} that has a public constructor that 
 			takes in the server and method arguments.
 		<li>
-			{@del @RestResource#allowMethodParam} renamed to {@del RestResource#allowedMethodParams}.
+			<del>@RestResource.allowMethodParam</del>renamed to <del>RestResource#allowedMethodParams</del>.
 		<li>
 			<c>@RestMethod.serializersInherit</c> and <c>@RestMethod.parsersInherit</c> replaced with
-			simplified {@del @RestMethod(inherit)}. 
+			simplified <del>@RestMethod(inherit)</del>. 
 		<li>
-			Changes to {@del oajr.RequestFormData}:
+			Changes to <del>RequestFormData</del>:
 			<ul>
-				<li>{@del oajr.RequestFormData#addDefault(Map) addDefault(Map)} takes in a 
+				<li><del>RequestFormData.addDefault(Map) addDefault(Map)</del>takes in a 
 					<c>Map&lt;String,Object&gt;</c> instead of <c>Map&lt;String,String&gt;</c>.
 			</ul>
 		<li>
-			Changes to {@del oajr.RequestHeaders}:
+			Changes to <del>RequestHeaders</del>:
 			<ul>
-				<li>{@del oajr.RequestHeaders#addDefault(Map) addDefault(Map)} takes in a 
+				<li><del>RequestHeaders.addDefault(Map) addDefault(Map)</del>takes in a 
 					<c>Map&lt;String,Object&gt;</c> instead of <c>Map&lt;String,String&gt;</c>.
 			</ul>
 		<li>
-			Changes to {@del oajr.RequestQuery}:
+			Changes to <del>RequestQuery</del>:
 			<ul>
-				<li>{@del oajr.RequestQuery#addDefault(Map) addDefault(Map)} takes in a 
+				<li><del>RequestQuery.addDefault(Map) addDefault(Map)</del>takes in a 
 					<c>Map&lt;String,Object&gt;</c> instead of <c>Map&lt;String,String&gt;</c>.
 			</ul>
 		<li>
 			Changes to {@link oajr.RestContext}:
 			<ul>
-				<li><c>getResource(String,Locale)</c> renamed to {@del getClasspathResource(String,Locale)}
-				<li><c>getResourceAsString(String,Locale)</c> renamed to {@del getClasspathResourceAsString(String,Locale)}
-				<li><c>getResource(Class,MediaType,String,Locale)</c> renamed to {@del getClasspathResourceAsString(Class,MediaType,String,Locale)}
-				<li>New method {@del getClasspathResource(Class,String,Locale)}.
-				<li>New method {@del getClasspathResourceAsString(Class,String,Locale)}.
-				<li>New method {@del getClasspathResource(Class,Class,MediaType,String,Locale)}.
-				<li>{@del RestContext#getDefaultRequestHeaders()} returns a 
+				<li><c>getResource(String,Locale)</c> renamed to <del>getClasspathResource(String,Locale)</del>
+				<li><c>getResourceAsString(String,Locale)</c> renamed to <del>getClasspathResourceAsString(String,Locale)</del>
+				<li><c>getResource(Class,MediaType,String,Locale)</c> renamed to <del>getClasspathResourceAsString(Class,MediaType,String,Locale)</del>
+				<li>New method <del>getClasspathResource(Class,String,Locale)</del>.
+				<li>New method <del>getClasspathResourceAsString(Class,String,Locale)</del>.
+				<li>New method <del>getClasspathResource(Class,Class,MediaType,String,Locale)</del>.
+				<li><del>RestContext.getDefaultRequestHeaders()</del>returns a 
 					<c>Map&lt;String,Object&gt;</c> instead of <c>Map&lt;String,String&gt;</c>.
-				<li>{@del RestContext#getDefaultResponseHeaders()} returns a 
+				<li><del>RestContext.getDefaultResponseHeaders()</del>returns a 
 					<c>Map&lt;String,Object&gt;</c> instead of <c>Map&lt;String,String&gt;</c>.
 			</ul>
 		<li>
 			Changes to {@link oajr.RestRequest}:
 			<ul>	
 				<li><c>getSupportedMediaTypes()</c> replaced with
-					{@del oajr.RestRequest#getConsumes() getConsumes()} and
-					{@del oajr.RestRequest#getProduces() getProduces()}.
+					<del>RestRequest.getConsumes() getConsumes()</del>and
+					<del>RestRequest.getProduces() getProduces()</del>.
 				<li><c>getReaderResource(String,boolean,MediaType)</c> renamed to 
-					{@del getClasspathReaderResource(String,boolean,MediaType)}
+					<del>getClasspathReaderResource(String,boolean,MediaType)</del>
 				<li><c>getReaderResource(String,boolean)</c> renamed to 
-					{@del getClasspathHttpResource(String,boolean)}
+					<del>getClasspathHttpResource(String,boolean)</del>
 				<li><c>getReaderResource(String)</c> renamed to 
-					{@del getClasspathHttpResource(String)}
+					<del>getClasspathHttpResource(String)</del>
 			</ul>
 		<li>
-			Changes to {@del @RestResource}
+			Changes to <del>@RestResource</del>
 			<ul>
-				<li>New {@del mimeTypes()} annotation.
+				<li>New <del>mimeTypes()</del>annotation.
 			</ul>
 		<li>
-			Changes to {@del oajr.annotation.RestMethod @RestMethod}:
+			Changes to <del>RestMethod @RestMethod</del>:
 			<ul>
-				<li>New {@del oajr.annotation.RestMethod#consumes() consumes()} and
-					{@del oajr.annotation.RestMethod#produces() produces()}
+				<li>New <del>RestMethod.consumes() consumes()</del>and
+					<del>RestMethod.produces() produces()</del>
 					for overriding the supported media types inferred from the serializers and parsers.
 			</ul>
 		<li>
-			<c>RestCallHandler</c> split up into {@del oajr.RestCallHandler} and 
-			{@del BasicRestCallHandler}
+			<c>RestCallHandler</c> split up into <del>RestCallHandler</del> and 
+			<del>BasicRestCallHandler</del>
 		<li>
-			<c>RestInfoProvider</c> split up into {@del oajr.RestInfoProvider} and 
-			{@del oajr.BasicRestInfoProvider}
+			<c>RestInfoProvider</c> split up into <del>RestInfoProvider</del> and 
+			<del>BasicRestInfoProvider</del>
 		<li>
-			<c>RestLogger</c> split up into {@del oajr.RestLogger}, 
-			{@del oajr.BasicRestLogger} and {@del oajr.NoOpRestLogger}
+			<c>RestLogger</c> split up into <del>RestLogger</del>, 
+			<del>BasicRestLogger</del> and <del>NoOpRestLogger</del>
 		<li>
-			<c>RestResourceResolverSimple</c> renamed to {@del oajr.BasicRestResourceResolver}
+			<c>RestResourceResolverSimple</c> renamed to <del>BasicRestResourceResolver</del>
 		<li>
 			Introduced the following classes that helps make the code more understandable:
 			<ul>
-				<li>{@del oajr.RestContextProperties}
-				<li>{@del oajr.RestMethodProperties}
-				<li>{@del oajr.RequestProperties}
+				<li><del>RestContextProperties</del>
+				<li><del>RestMethodProperties</del>
+				<li><del>RequestProperties</del>
 			</ul>
 		<li>
 			Eliminated the <c>@Messages</c> and <c>@Properties</c> REST java method parameter
@@ -394,23 +394,23 @@
 			<br>These aren't needed anymore since you can just pass in <c>MessageBundle</c> and
 			<c>RestRequestProperties</c> as unannotated parameters.
 		<li>
-			Revamped the {@del oajr.RestInfoProvider} class.
+			Revamped the <del>RestInfoProvider</del>class.
 		<li>
 			New builder classes:
 			<ul>
-				<li>{@del ReaderResourceBuilder}
-				<li>{@del StreamResourceBuilder}
+				<li><del>ReaderResourceBuilder</del>
+				<li><del>StreamResourceBuilder</del>
 			</ul>
 		<li>
-			{@link oajr.RestResponse#getNegotiatedOutputStream()} now returns a 
-			{@del FinishableServletOutputStream} and {@link oajr.RestResponse#getNegotiatedWriter()}
-			now returns a {@del FinishablePrintWriter} that allows you to finish the output
+			{@link oajr.RestResponse.getNegotiatedOutputStream()} now returns a 
+			<del>FinishableServletOutputStream</del>and {@link oajr.RestResponse#getNegotiatedWriter()}
+			now returns a <del>FinishablePrintWriter</del> that allows you to finish the output
 			without closing the stream.
-			<br>The {@del oajr.reshandlers.DefaultHandler} class now calls <c>finish()</c>
+			<br>The <del>DefaultHandler</del> class now calls <c>finish()</c>
 			instead of <c>close()</c> on the stream.
 		<li>
-			Added the following annotations to the {@del oajr.BasicRestServlet} class
-			(which were previously defined on the {@del Resource} class):
+			Added the following annotations to the <del>BasicRestServlet</del> class
+			(which were previously defined on the <del>Resource</del> class):
 			<p class='bcode'>
 		<ja>@RestResource</ja>(
 			htmldoc=<ja>@HtmlDoc</ja>(
@@ -430,21 +430,21 @@
 	<h5 class='topic w800'>juneau-rest-client</h5>
 	<ul class='spaced-list'>
 		<li>
-			New configuration property {@del oajrc.RestClient#RESTCLIENT_query} and
-			builder method {@del oajrc.RestClient.Builder#query(String,Object)}.
+			New configuration property <del>RestClient.RESTCLIENT_query</del>and
+			builder method <del>Builder.query(String,Object)</del>.
 		<li>
 			API changes to replace <c>PartSerializer</c> with {@link oaj.httppart.HttpPartSerializer}.
-			<br>The default value is now {@del SimpleUonPartSerializer} which will
+			<br>The default value is now <del>SimpleUonPartSerializer</del> which will
 			serialize strings as plain-text and collections/arrays as comma-delimited lists.
 			<br>We decided to change the default behavior in favor of practicality over purity.
 		<li>
-			New methods on {@del oajrc.RestCall} class:
+			New methods on <del>RestCall</del>class:
 			<ul>
-				<li>{@del oajrc.RestCall#getResponseHeader(String) getResponseHeader(String)}
-				<li>{@del oajrc.RestCall#getResponseCode() getResponseCode()}
+				<li><del>RestCall#getResponseHeader(String) getResponseHeader(String)</del>
+				<li><del>RestCall.getResponseCode() getResponseCode()</del>
 			</ul>
 		<li>
-			{@del oajrc.RestCall} and {@link oajrc.RestClient}
+			<del>RestCall</del> and {@link oajrc.RestClient}
 			now implement the <c>Closeable</c> interface.
 	</ul>
 	
@@ -452,9 +452,9 @@
 	<ul class='spaced-list'>
 		<li>
 			<c>Resource</c> and <c>ResourceGroup</c> classes removed.
-			<br>{@del oajr.BasicRestServlet} and {@del oajr.BasicRestServletGroup} can be used instead.
+			<br><del>BasicRestServlet</del> and <del>BasicRestServletGroup</del> can be used instead.
 		<li>
 			<c>ResourceJena</c> and <c>ResourceJenaGroup</c> classes renamed to
-			{@del BasicRestServletJena} and {@del BasicRestServletJenaGroup}.
+			<del>BasicRestServletJena</del>and <del>BasicRestServletJenaGroup</del>.
 	</ul>
 </div>
\ No newline at end of file
diff --git a/juneau-doc/docs/ReleaseNotes/7.2.0.html b/juneau-doc/docs/ReleaseNotes/7.2.0.html
index 974086c0c..ddfa2e4c6 100644
--- a/juneau-doc/docs/ReleaseNotes/7.2.0.html
+++ b/juneau-doc/docs/ReleaseNotes/7.2.0.html
@@ -50,20 +50,20 @@
 				and auto-generated Swagger documentation:
 			<ul class='doctree'>
 				<li class='ja'>{@link oaj.http.annotation.Contact}
-				<li class='ja'>{@del ExternalDocs}
-				<li class='ja'>{@del Items}
+				<li class='ja'><del>ExternalDocs</del>
+				<li class='ja'><del>Items</del>
 				<li class='ja'>{@link oaj.http.annotation.License}
-				<li class='ja'>{@del Schema}
-				<li class='ja'>{@del SubItems}
-				<li class='ja'>{@del oaj.http.annotation.Tag}
+				<li class='ja'><del>Schema</del>
+				<li class='ja'><del>SubItems</del>
+				<li class='ja'><del>Tag</del>
 			</ul>
 			<br>Additionally, the <ja>@Remoteable</ja> annotation has been split into the following two annotations:
 			<ul class='doctree'>
-				<li class='ja'>{@del oaj.remote.RemoteInterface} 
+				<li class='ja'><del>RemoteInterface</del> 
 					- Used for remote proxy interfaces served up through 
-					{@del RemoteInterfaceServlet} or REST <js>"PROXY"</js> methods.
+					<del>RemoteInterfaceServlet</del> or REST <js>"PROXY"</js> methods.
 					<br>Defaults to <js>"POST"</js> with method signatures as paths.
-				<li class='ja'>{@del RemoteResource} 
+				<li class='ja'><del>RemoteResource</del> 
 					- Used for 3rd-party REST interfaces.
 					<br>Defaults to <js>"GET"</js> with standardized naming conventions for paths.
 			</ul>
@@ -79,13 +79,13 @@
 		<li>
 			Support for POJO examples:
 			<ul class='doctree'>
-				<li class='jf'>{@del BeanContext#BEAN_examples}
+				<li class='jf'><del>BeanContext.BEAN_examples</del>
 				<li class='ja'>{@link oaj.annotation.Example}
 			</ul>
 		<li>
 			Fixed bug where parsers could report the wrong line number when an error occurred.
 		<li>
-			A runtime exception is now thrown if you define a {@del @BeanProperty(name)} but forget to
+			A runtime exception is now thrown if you define a <del>@BeanProperty(name)</del>but forget to
 			add it to your <c><ja>@Bean</ja>(properties)</c> annotation.
 		<li>
 			<c><ja>@Html</ja>(asXml)</c> and <c><ja>@Html</ja>(asPlainText)</c> replaced with
@@ -97,19 +97,19 @@
 		<li>
 			New settings for binary-based serializers and parsers:
 			<ul class='doctree'>
-				<li class='jf'>{@del oaj.serializer.OutputStreamSerializer#OSSERIALIZER_binaryFormat}
-				<li class='jf'>{@del oaj.parser.InputStreamParser#ISPARSER_binaryFormat}
+				<li class='jf'><del>OutputStreamSerializer#OSSERIALIZER_binaryFormat</del>
+				<li class='jf'><del>InputStreamParser#ISPARSER_binaryFormat</del>
 			</ul>
 		<li>
 			Added support for auto-detection of fluent-style setters:
 			<ul class='doctree'>
-				<li class='jf'>{@del oaj.BeanContext#BEAN_fluentSetters}
-				<li class='ja'>{@del oaj.annotation.Bean#fluentSetters()}
+				<li class='jf'><del>BeanContext#BEAN_fluentSetters</del>
+				<li class='ja'><del>Bean#fluentSetters()</del>
 			</ul>
 		<li>
-			The <jsf>SERIALIZER_abridged</jsf> setting has been replaced with {@del oaj.serializer.Serializer#SERIALIZER_addRootType SERIALIZER_addRootType}
+			The <jsf>SERIALIZER_abridged</jsf> setting has been replaced with <del>Serializer#SERIALIZER_addRootType SERIALIZER_addRootType</del>
 		<li>
-			The <jsf>SERIALIZER_addBeanTypeProperties</jsf> setting has been replaced with {@del oaj.serializer.Serializer#SERIALIZER_addBeanTypes SERIALIZER_addBeanTypes}
+			The <jsf>SERIALIZER_addBeanTypeProperties</jsf> setting has been replaced with <del>Serializer#SERIALIZER_addBeanTypes SERIALIZER_addBeanTypes</del>
 			and is disabled by default.
 		<li>
 			Parse exception messages are now clearer and include code snippets of where a parse exception occurred:
@@ -134,12 +134,12 @@
 		---end---
 			</p>
 		<li>
-			New property {@del oaj.parser.Parser#PARSER_debugOutputLines} for controlling how many input lines are added to the exception message above.
+			New property <del>Parser.PARSER_debugOutputLines</del>for controlling how many input lines are added to the exception message above.
 		<li>
-			New property {@del oaj.BeanContext#BEAN_useEnumNames} for controlling whether enums are serialized
+			New property <del>BeanContext.BEAN_useEnumNames</del>for controlling whether enums are serialized
 			using their name or the <c>toString()</c> method.
 		<li>
-			New property {@del BeanContext#BEAN_examples} for defining examples of POJOs.
+			New property <del>BeanContext.BEAN_examples</del> for defining examples of POJOs.
 		<li>
 			New {@link oaj.annotation.Example @Example} annotation for defining examples of POJOs.
 			<br>Used heavily in JSON-Schema support.
@@ -149,38 +149,38 @@
 		<li>
 			Significant improvements to JSON-Schema serialization support.
 			<ul>
-				<li>New {@del @JsonSchema} annotation.
+				<li>New <del>@JsonSchema</del>annotation.
 			</ul>
 		<li>
 			Fixed <c>NullPointerException</c> when serializing beans with a dyna-property (i.e. <c><ja>@Bean</ja>(<js>"*"</js>)</c>)
 			which returns a <jk>null</jk> value.
 		<li>
 			New option for dyna-property (i.e. <c><ja>@Bean</ja>(<js>"*"</js>)</c>) using a method that returns a collection of extra keys.
-			<br>See new options #4 on {@del oaj.annotation.BeanProperty#name()}
+			<br>See new options #4 on <del>BeanProperty#name()</del>
 		<li>
 			New formats for the {@link oaj.html.annotation.Html#format() @Html(format)} annotation:
 			<ul class='doctree'>
-				<li class='jf'>{@del oaj.html.annotation.HtmlFormat#HTML_CDC} - Format collections as comma-delimited lists.
-				<li class='jf'>{@del oaj.html.annotation.HtmlFormat#HTML_SDC} - Format collections as space-delimited lists.
+				<li class='jf'><del>HtmlFormat.HTML_CDC</del>- Format collections as comma-delimited lists.
+				<li class='jf'><del>HtmlFormat.HTML_SDC</del> - Format collections as space-delimited lists.
 			</ul> 
 		<li>
 			Serializers now allow for q-values on the media types they handle.
 			<br>For example, the accept media type on <c>JsonSerializer.Simple</c> is <js>"application/json+simple,application/json;q=0.9"</js>.
 			<br>This means the serializer CAN handle requests for <js>"application/json"</js> if no other serializers provide a better match.
 		<li>
-			New methods for creating unmodifiable {@del oaj.ObjectMap ObjectMaps} and {@del oaj.ObjectList ObjectLists}.
+			New methods for creating unmodifiable <del>ObjectMap ObjectMaps</del>and <del>ObjectList ObjectLists</del>.
 			<ul class='doctree'>
-				<li class='jc'>{@del oaj.ObjectMap}
+				<li class='jc'><del>ObjectMap</del>
 				<ul>
-					<li class='jm'>{@del oaj.ObjectMap#isUnmodifiable() isUnmodifable()}
-					<li class='jm'>{@del oaj.ObjectMap#unmodifiable() unmodifiable()}
-					<li class='jm'>{@del oaj.ObjectMap#modifiable() modifiable()}
+					<li class='jm'><del>ObjectMap#isUnmodifiable() isUnmodifable()</del>
+					<li class='jm'><del>ObjectMap#unmodifiable() unmodifiable()</del>
+					<li class='jm'><del>ObjectMap#modifiable() modifiable()</del>
 				</ul>
-				<li class='jp'>{@del oaj.ObjectList}
+				<li class='jp'><del>ObjectList</del>
 				<ul>
-					<li class='jm'>{@del oaj.ObjectList#isUnmodifiable() isUnmodifable()}
-					<li class='jm'>{@del oaj.ObjectList#unmodifiable() unmodifiable()}
-					<li class='jm'>{@del oaj.ObjectList#modifiable() modifiable()}
+					<li class='jm'><del>ObjectList#isUnmodifiable() isUnmodifable()</del>
+					<li class='jm'><del>ObjectList#unmodifiable() unmodifiable()</del>
+					<li class='jm'><del>ObjectList#modifiable() modifiable()</del>
 				</ul>
 			</ul>
 		<li>
@@ -213,27 +213,27 @@
 		String string = Json.<jsf>DEFAULT</jsf>.write(myPojo);
 			</p>
 			<ul class='doctree'>
-				<li class='jac'>{@del oaj.marshall.Marshall}
+				<li class='jac'><del>Marshall</del>
 				<ul>
-					<li class='jac'>{@del oaj.marshall.CharMarshall}
+					<li class='jac'><del>CharMarshall</del>
 					<ul>
-						<li class='jc'>{@del oaj.marshall.Html}
-						<li class='jc'>{@del oaj.marshall.Json}
-						<li class='jc'>{@del oaj.marshall.PlainText}
-						<li class='jc'>{@del oaj.marshall.SimpleJson}
-						<li class='jc'>{@del oaj.marshall.Uon}
-						<li class='jc'>{@del oaj.marshall.UrlEncoding}
-						<li class='jc'>{@del oaj.marshall.Xml}
-						<li class='jc'>{@del oaj.marshall.N3}
-						<li class='jc'>{@del oaj.marshall.NTriple}
-						<li class='jc'>{@del oaj.marshall.RdfXml}
-						<li class='jc'>{@del oaj.marshall.RdfXmlAbbrev}
-						<li class='jc'>{@del oaj.marshall.Turtle}	
+						<li class='jc'><del>Html</del>
+						<li class='jc'><del>Json</del>
+						<li class='jc'><del>PlainText</del>
+						<li class='jc'><del>SimpleJson</del>
+						<li class='jc'><del>Uon</del>
+						<li class='jc'><del>UrlEncoding</del>
+						<li class='jc'><del>Xml</del>
+						<li class='jc'><del>N3</del>
+						<li class='jc'><del>NTriple</del>
+						<li class='jc'><del>RdfXml</del>
+						<li class='jc'><del>RdfXmlAbbrev</del>
+						<li class='jc'><del>Turtle</del>	
 					</ul>
-					<li class='jac'>{@del oaj.marshall.StreamMarshall}
+					<li class='jac'><del>StreamMarshall</del>
 					<ul>
-						<li class='jc'>{@del oaj.marshall.Jso}
-						<li class='jc'>{@del oaj.marshall.MsgPack}
+						<li class='jc'><del>Jso</del>
+						<li class='jc'><del>MsgPack</del>
 					</ul>
 				</ul>
 			</ul>
@@ -257,18 +257,18 @@
 	<h5 class='topic w800'>juneau-rest-server</h5>
 	<ul class='spaced-list'>
 		<li>
-			Auto-generated {@del RestSwagger Swagger UI}.
+			Auto-generated <del>RestSwagger Swagger UI</del>.
 		<li>
-			Simplified {@del @RestResource(swagger)}
-			and {@del oajr.annotation.RestMethod#swagger() @RestMethod(swagger)} annotations.
+			Simplified <del>@RestResource(swagger)</del>
+			and <del>RestMethod.swagger() @RestMethod(swagger)</del> annotations.
 		<li>
 			Fixed bug in <c>UriResolver</c> when request path info had special characters.
 		<li>
 			Fixed bug where incorrect media type was being set on responses (e.g. <c>text/html+schema</c> instead of <c>text/html</c> for schema documents).
 		<li>
-			The <c>RemoteableServlet</c> class has been moved and renamed to {@del RemoteInterfaceServlet}.
+			The <c>RemoteableServlet</c> class has been moved and renamed to <del>RemoteInterfaceServlet</del>.
 		<li>
-			{@del RemoteInterfaceServlet} now provides a form page for invoking remote interface methods in a browser.
+			<del>RemoteInterfaceServlet</del>now provides a form page for invoking remote interface methods in a browser.
 		<li>
 			Newlines were being stripped from <c><ja>@HtmlDoc</ja>(script)</c> when serialized which could cause script lines to become commented out.
 		<li>
@@ -289,90 +289,90 @@
 		<li>
 			"Helper" classes (i.e. reusable beans that can be returned by REST methods) have been moved to the following package with some new additions:
 			<ul class='doctree'>
-				<li class='jp'>{@del oajr.helper}
+				<li class='jp'><del>helper</del>
 				<ul>
-					<li class='jc'>{@del oajr.helper.BeanDescription}
-					<li class='jc'>{@del oajr.helper.ChildResourceDescriptions}
-					<li class='jc'>{@del ReaderResource}
-					<li class='jc'>{@del ReaderResourceBuilder}
-					<li class='jc'>{@del oajr.helper.SeeOtherRoot}
-					<li class='jc'>{@del oajr.helper.ResourceDescription}
-					<li class='jc'>{@del StreamResource}
-					<li class='jc'>{@del StreamResourceBuilder}
+					<li class='jc'><del>BeanDescription</del>
+					<li class='jc'><del>ChildResourceDescriptions</del>
+					<li class='jc'><del>ReaderResource</del>
+					<li class='jc'><del>ReaderResourceBuilder</del>
+					<li class='jc'><del>SeeOtherRoot</del>
+					<li class='jc'><del>ResourceDescription</del>
+					<li class='jc'><del>StreamResource</del>
+					<li class='jc'><del>StreamResourceBuilder</del>
 				</ul>
 			</ul>
 		<li>
 			Predefined HTTP responses.
 			<ul class='doctree'>
-				<li class='jp'>{@del oajr.response}
+				<li class='jp'><del>response</del>
 				<ul>
-					<li class='jc'>{@del oajr.response.Accepted}
-					<li class='jc'>{@del oajr.response.AlreadyReported}
-					<li class='jc'>{@del oajr.response.Continue}
-					<li class='jc'>{@del oajr.response.Created}
-					<li class='jc'>{@del oajr.response.EarlyHints}
-					<li class='jc'>{@del oajr.response.Found}
-					<li class='jc'>{@del oajr.response.IMUsed}
-					<li class='jc'>{@del oajr.response.MovedPermanently}
-					<li class='jc'>{@del oajr.response.MultipleChoices}
-					<li class='jc'>{@del oajr.response.MultiStatus}
-					<li class='jc'>{@del oajr.response.NoContent}
-					<li class='jc'>{@del oajr.response.NonAuthoritiveInformation}
-					<li class='jc'>{@del oajr.response.NotModified}
-					<li class='jc'>{@del oajr.response.Ok}
-					<li class='jc'>{@del oajr.response.PartialContent}
-					<li class='jc'>{@del oajr.response.PermanentRedirect}
-					<li class='jc'>{@del oajr.response.Processing}
-					<li class='jc'>{@del oajr.response.ResetContent}
-					<li class='jc'>{@del oajr.response.SeeOther}
-					<li class='jc'>{@del oajr.response.SwitchingProtocols}
-					<li class='jc'>{@del oajr.response.TemporaryRedirect}
-					<li class='jc'>{@del oajr.response.UseProxy}			
+					<li class='jc'><del>Accepted</del>
+					<li class='jc'><del>AlreadyReported</del>
+					<li class='jc'><del>Continue</del>
+					<li class='jc'><del>Created</del>
+					<li class='jc'><del>EarlyHints</del>
+					<li class='jc'><del>Found</del>
+					<li class='jc'><del>IMUsed</del>
+					<li class='jc'><del>MovedPermanently</del>
+					<li class='jc'><del>MultipleChoices</del>
+					<li class='jc'><del>MultiStatus</del>
+					<li class='jc'><del>NoContent</del>
+					<li class='jc'><del>NonAuthoritiveInformation</del>
+					<li class='jc'><del>NotModified</del>
+					<li class='jc'><del>Ok</del>
+					<li class='jc'><del>PartialContent</del>
+					<li class='jc'><del>PermanentRedirect</del>
+					<li class='jc'><del>Processing</del>
+					<li class='jc'><del>ResetContent</del>
+					<li class='jc'><del>SeeOther</del>
+					<li class='jc'><del>SwitchingProtocols</del>
+					<li class='jc'><del>TemporaryRedirect</del>
+					<li class='jc'><del>UseProxy</del>			
 				</ul>
 			</ul>
 		<li>
 			Predefined HTTP error throwables.
 			<br>When added to REST Java methods, reflected in generated Swagger documentation.
 			<ul class='doctree'>
-				<li class='jp'>{@del oajr.exception}
+				<li class='jp'><del>exception</del>
 				<ul>
-					<li class='jc'>{@del oajr.exception.BadRequest}
-					<li class='jc'>{@del oajr.exception.Conflict}
-					<li class='jc'>{@del oajr.exception.ExpectationFailed}
-					<li class='jc'>{@del oajr.exception.FailedDependency}
-					<li class='jc'>{@del oajr.exception.Forbidden}
-					<li class='jc'>{@del oajr.exception.Gone}
-					<li class='jc'>{@del oajr.exception.HttpVersionNotSupported}
-					<li class='jc'>{@del oajr.exception.InsufficientStorage}
-					<li class='jc'>{@del oajr.exception.InternalServerError}
-					<li class='jc'>{@del oajr.exception.LengthRequired}
-					<li class='jc'>{@del oajr.exception.Locked}
-					<li class='jc'>{@del oajr.exception.LoopDetected}
-					<li class='jc'>{@del oajr.exception.MethodNotAllowed}
-					<li class='jc'>{@del oajr.exception.MisdirectedRequest}
-					<li class='jc'>{@del oajr.exception.NetworkAuthenticationRequired}
-					<li class='jc'>{@del oajr.exception.NotAcceptable}
-					<li class='jc'>{@del oajr.exception.NotExtended}
-					<li class='jc'>{@del oajr.exception.NotFound}
-					<li class='jc'>{@del oajr.exception.NotImplemented}
-					<li class='jc'>{@del oajr.exception.PayloadTooLarge}
-					<li class='jc'>{@del oajr.exception.PreconditionFailed}
-					<li class='jc'>{@del oajr.exception.PreconditionRequired}
-					<li class='jc'>{@del oajr.exception.RangeNotSatisfiable}
-					<li class='jc'>{@del oajr.exception.RequestHeaderFieldsTooLarge}
-					<li class='jc'>{@del oajr.exception.ServiceUnavailable}
-					<li class='jc'>{@del oajr.exception.TooManyRequests}
-					<li class='jc'>{@del oajr.exception.Unauthorized}
-					<li class='jc'>{@del oajr.exception.UnavailableForLegalReasons}
-					<li class='jc'>{@del oajr.exception.UnprocessableEntity}
-					<li class='jc'>{@del oajr.exception.UnsupportedMediaType}
-					<li class='jc'>{@del oajr.exception.UpgradeRequired}
-					<li class='jc'>{@del oajr.exception.UriTooLong}
-					<li class='jc'>{@del oajr.exception.VariantAlsoNegotiates}
+					<li class='jc'><del>BadRequest</del>
+					<li class='jc'><del>Conflict</del>
+					<li class='jc'><del>ExpectationFailed</del>
+					<li class='jc'><del>FailedDependency</del>
+					<li class='jc'><del>Forbidden</del>
+					<li class='jc'><del>Gone</del>
+					<li class='jc'><del>HttpVersionNotSupported</del>
+					<li class='jc'><del>InsufficientStorage</del>
+					<li class='jc'><del>InternalServerError</del>
+					<li class='jc'><del>LengthRequired</del>
+					<li class='jc'><del>Locked</del>
+					<li class='jc'><del>LoopDetected</del>
+					<li class='jc'><del>MethodNotAllowed</del>
+					<li class='jc'><del>MisdirectedRequest</del>
+					<li class='jc'><del>NetworkAuthenticationRequired</del>
+					<li class='jc'><del>NotAcceptable</del>
+					<li class='jc'><del>NotExtended</del>
+					<li class='jc'><del>NotFound</del>
+					<li class='jc'><del>NotImplemented</del>
+					<li class='jc'><del>PayloadTooLarge</del>
+					<li class='jc'><del>PreconditionFailed</del>
+					<li class='jc'><del>PreconditionRequired</del>
+					<li class='jc'><del>RangeNotSatisfiable</del>
+					<li class='jc'><del>RequestHeaderFieldsTooLarge</del>
+					<li class='jc'><del>ServiceUnavailable</del>
+					<li class='jc'><del>TooManyRequests</del>
+					<li class='jc'><del>Unauthorized</del>
+					<li class='jc'><del>UnavailableForLegalReasons</del>
+					<li class='jc'><del>UnprocessableEntity</del>
+					<li class='jc'><del>UnsupportedMediaType</del>
+					<li class='jc'><del>UpgradeRequired</del>
+					<li class='jc'><del>UriTooLong</del>
+					<li class='jc'><del>VariantAlsoNegotiates</del>
 				</ul>
 			</ul>	
 		<li>
-			The {@del oajr.annotation.HtmlDoc#nav() @HtmlDoc(nav)} and {@del oajr.annotation.HtmlDoc#navlinks() @HtmlDoc(navlinks)}
+			The <del>HtmlDoc.nav() @HtmlDoc(nav)</del>and <del>HtmlDoc#navlinks() @HtmlDoc(navlinks)</del>
 			can now both be used on the same annotation.
 			<br>The contents of <c>nav()</c> are free-form HTML that gets rendered immediately after the navigation links.
 		<li>
@@ -397,35 +397,35 @@
 			<br>It should be noted that you cannot use the <c>$F</c> variable to retrieve localized versions of files (since you're not within
 			the scope of a client request.
 		<li>
-			The {@del RestResource#nowrap()} annotation has been changed to a string with a default value of <js>"true"</js>.
+			The <del>RestResource.nowrap()</del>annotation has been changed to a string with a default value of <js>"true"</js>.
 			<br>Having it as a string allows us to differentiate between a set and unset value so that it can be overridden in subclasses.
 		<li>
 			The {@link oaj.http.annotation.Path#name()} annotation parameter is now required.
 		<li>
 			New class for mock unit testing of REST resources:
 			<ul class='doctree'>
-				<li class='jc'>{@del MockRest}
+				<li class='jc'><del>MockRest</del>
 			</ul>
 		<li>
 			<c><ja>@RestMethod</ja>(inherit)</c> annotation has been removed and replaced with the following classes:
 			<ul class='doctree'>
-				<li class='jc'>{@del oajr.Inherit}
-				<li class='jc'>{@del oajr.None}
+				<li class='jc'><del>Inherit</del>
+				<li class='jc'><del>None</del>
 			</ul>
 			<br>These can be used in the following locations:
 			<ul class='doctree'>
-				<li class='ja'>{@del RestResource#serializers()}
-				<li class='ja'>{@del RestResource#parsers()}
-				<li class='ja'>{@del RestResource#beanFilters()}
-				<li class='ja'>{@del RestResource#pojoSwaps()}
-				<li class='ja'>{@del oajr.annotation.RestMethod#serializers()}
-				<li class='ja'>{@del oajr.annotation.RestMethod#parsers()}
-				<li class='ja'>{@del RestMethod#beanFilters()}
-				<li class='ja'>{@del oajr.annotation.RestMethod#pojoSwaps()}
+				<li class='ja'><del>RestResource#serializers()</del>
+				<li class='ja'><del>RestResource#parsers()</del>
+				<li class='ja'><del>RestResource#beanFilters()</del>
+				<li class='ja'><del>RestResource#pojoSwaps()</del>
+				<li class='ja'><del>RestMethod#serializers()</del>
+				<li class='ja'><del>RestMethod#parsers()</del>
+				<li class='ja'><del>RestMethod#beanFilters()</del>
+				<li class='ja'><del>RestMethod#pojoSwaps()</del>
 			</ul>
 			<br>One advantage is that you now have control over the precedence of serializers and parsers by where you insert the <c>Inherit</c> class. 
 		<li>
-			<c>RequestPathMatch</c> class has been renamed to {@del oajr.RequestPath}.
+			<c>RequestPathMatch</c> class has been renamed to <del>RequestPath</del>.
 		<li>
 			{@link oaj.http.annotation.Request @Request} objects can now be used as parameters in <ja>@RestMethod</ja> methods.
 			<br>Includes new methods on {@link oajr.RestRequest}:
@@ -438,8 +438,8 @@
 			<ul class='doctree'>
 				<li class='jc'>{@link oajr.widget.MenuItemWidget}
 				<ul>
-					<li class='jm'>{@del getBeforeShowScript(RestRequest)}
-					<li class='jm'>{@del getAfterShowScript(RestRequest)}
+					<li class='jm'><del>getBeforeShowScript(RestRequest)</del>
+					<li class='jm'><del>getAfterShowScript(RestRequest)</del>
 				</ul>
 			</ul>
 		<li>
@@ -447,44 +447,44 @@
 			<ul class='doctree'>
 				<li class='jc'>{@link oajr.widget.Widget}
 				<ul>
-					<li class='jm'>{@del loadHtmlWithVars(RestRequest,String)}
-					<li class='jm'>{@del loadScriptWithVars(RestRequest,String)}
-					<li class='jm'>{@del loadStyleWithVars(RestRequest,String)}
+					<li class='jm'><del>loadHtmlWithVars(RestRequest,String)</del>
+					<li class='jm'><del>loadScriptWithVars(RestRequest,String)</del>
+					<li class='jm'><del>loadStyleWithVars(RestRequest,String)</del>
 				</ul>
 			</ul>
 		<li>
 			New/updated documentation: 
 			<br><dc>juneau-rest-server.UnitTesting</dc>
 		<li>
-			The behavior of the default values for {@del oajr.annotation.RestMethod#name()} and {@del oajr.annotation.RestMethod#path()}
+			The behavior of the default values for <del>RestMethod.name()</del>and <del>RestMethod#path()</del>
 			have changed.
 			<br>If not specified, the values are inferred from the Java method name.
-			<br>See Also: {@del RestMethod}
+			<br>See Also: <del>RestMethod</del>
 		<li>
-			<c>RedirectToServletRoot</c> class has been renamed to {@del oajr.helper.SeeOtherRoot}.
+			<c>RedirectToServletRoot</c> class has been renamed to <del>SeeOtherRoot</del>.
 		<li>
 			New REST context settings:
 			<ul class='doctree'>
 				<li class='jc'>{@link oajr.RestContext}
 				<ul>
-					<li class='jf'>{@del oajr.RestContext#REST_uriAuthority REST_uriAuthority}
-					<li class='jf'>{@del oajr.RestContext#REST_uriContext REST_uriContext}
-					<li class='jf'>{@del oajr.RestContext#REST_uriRelativity REST_uriRelativity}
-					<li class='jf'>{@del oajr.RestContext#REST_uriResolution REST_uriResolution}
+					<li class='jf'><del>RestContext#REST_uriAuthority REST_uriAuthority</del>
+					<li class='jf'><del>RestContext#REST_uriContext REST_uriContext</del>
+					<li class='jf'><del>RestContext#REST_uriRelativity REST_uriRelativity</del>
+					<li class='jf'><del>RestContext#REST_uriResolution REST_uriResolution</del>
 				</ul>
 			</ul>
 		<li>
 			New convenience annotations for specifying default <c>Accept</c> and <c>Content-Type</c> headers:
 			<ul class='doctree'>	
-				<li class='jc'>{@del RestResource}
+				<li class='jc'><del>RestResource</del>
 				<ul>
-					<li class='jf'>{@del defaultAccept}
-					<li class='jf'>{@del defaultContentType}
+					<li class='jf'><del>defaultAccept</del>
+					<li class='jf'><del>defaultContentType</del>
 				</ul>	
-				<li class='jc'>{@del oajr.annotation.RestMethod}
+				<li class='jc'><del>RestMethod</del>
 				<ul>
-					<li class='jf'>{@del oajr.annotation.RestMethod#defaultAccept defaultAccept}
-					<li class='jf'>{@del oajr.annotation.RestMethod#defaultContentType defaultContentType}
+					<li class='jf'><del>RestMethod#defaultAccept defaultAccept</del>
+					<li class='jf'><del>RestMethod#defaultContentType defaultContentType</del>
 				</ul>	
 			</ul>
 	</ul>
@@ -501,11 +501,11 @@
 				<ul>
 					<li class='jf'>{@del oajrc.RestClient.Builder#sslProtocols(String...) sslProtocols(String...)}
 					<li class='jf'>{@del oajrc.RestClient.Builder#cipherSuites(String...) cipherSuites(String...)}
-					<li class='jf'>{@del oajrc.RestClient.Builder#hostnameVerifier(HostnameVerifier) hostnameVerifier(HostnameVerifier)}
+					<li class='jf'><del>Builder#hostnameVerifier(HostnameVerifier) hostnameVerifier(HostnameVerifier)</del>
 					<li class='jf'>{@del oajrc.RestClient.Builder#keyManagers(KeyManager...) keyManagers(KeyManager...)}
 					<li class='jf'>{@del oajrc.RestClient.Builder#trustManagers(TrustManager...)}
-					<li class='jf'>{@del oajrc.RestClient.Builder#secureRandom(SecureRandom)}
-					<li class='jf'>{@del oajrc.RestClient.Builder#httpClientConnectionManager(HttpClientConnectionManager)}
+					<li class='jf'><del>Builder#secureRandom(SecureRandom)</del>
+					<li class='jf'><del>Builder#httpClientConnectionManager(HttpClientConnectionManager)</del>
 				</ul>
 			</ul>
 		<li>
@@ -531,14 +531,14 @@
 			<ul class='doctree'>
 				<li class='jc'>{@link oajrc.RestClient.Builder}
 				<ul>
-					<li class='jf'>{@del mockHttpConnection(MockHttpConnection)}
+					<li class='jf'><del>mockHttpConnection(MockHttpConnection)</del>
 				</ul>
 			</ul>
 		<li>
 			Removed the deprecated <c>RestCall.execute()</c> method.
-			<br>Use {@del oajrc.RestCall#run()}.
+			<br>Use <del>RestCall#run()</del>.
 		<li>
-			<c>RestCall.input(Object)</c> method renamed to {@del oajrc.RestCall#body(Object)} to match OpenAPI terminology.
+			<c>RestCall.input(Object)</c> method renamed to <del>RestCall.body(Object)</del>to match OpenAPI terminology.
 		<li>
 			Made constructors on <c>RestClient</c> and <c>RestClient.Builder</c> protected so that they can be subclassed.
 		<li>
@@ -546,12 +546,12 @@
 			<ul class='doctree'>
 				<li class='jc'>{@link oajrc.RestClient}
 				<ul>
-					<li class='jm'>{@del RestClient#getRemoteInterface(Class)}
-					<li class='jm'>{@del RestClient#getRemoteInterface(Class,Object)}
-					<li class='jm'>{@del RestClient#getRemoteInterface(Class,Object,Serializer,Parser)}
-					<li class='jm'>{@del oajrc.RestClient#getRemoteResource(Class)}
-					<li class='jm'>{@del oajrc.RestClient#getRemoteResource(Class,Object)}
-					<li class='jm'>{@del oajrc.RestClient#getRemoteResource(Class,Object,Serializer,Parser)}
+					<li class='jm'><del>RestClient#getRemoteInterface(Class)</del>
+					<li class='jm'><del>RestClient#getRemoteInterface(Class,Object)</del>
+					<li class='jm'><del>RestClient#getRemoteInterface(Class,Object,Serializer,Parser)</del>
+					<li class='jm'><del>RestClient#getRemoteResource(Class)</del>
+					<li class='jm'><del>RestClient#getRemoteResource(Class,Object)</del>
+					<li class='jm'><del>RestClient#getRemoteResource(Class,Object,Serializer,Parser)</del>
 				</ul>
 			</ul>
 	</ul>
diff --git a/juneau-doc/docs/ReleaseNotes/7.2.1.html b/juneau-doc/docs/ReleaseNotes/7.2.1.html
index b78a975d0..c6cfb12ae 100644
--- a/juneau-doc/docs/ReleaseNotes/7.2.1.html
+++ b/juneau-doc/docs/ReleaseNotes/7.2.1.html
@@ -24,7 +24,7 @@
 	<h5 class='topic w800'>juneau-marshall</h5>
 	<ul class='spaced-list'>
 		<li>
-			The {@del @JsonSchema} annotation has been merged with the {@link oaj.jsonschema.annotation.Schema @Schema} annotation.
+			The <del>@JsonSchema</del> annotation has been merged with the {@link oaj.jsonschema.annotation.Schema @Schema} annotation.
 		<li>
 			Annotations typically used on bean properties (getters/setters/public fields) can now be used on private fields.
 			This is inline with behavior on JPA-annotated beans.
@@ -36,11 +36,11 @@
 		<li>
 			Method-level annotations (e.g. <ja>@RestMethod</ja>) and parameter-level annotations (e.g. <ja>@Query</ja>) are now inheritable
 			from parent classes and interfaces. 
-			<br>This allows you to define {@del RestcDualPurposeInterfaces}.
+			<br>This allows you to define <del>RestcDualPurposeInterfaces</del>.
 		<li>
 			The <c>ReaderResource</c> and <c>StreamResource</c> classes have been moved to the <c>org.apache.juneau.http</c>
 			package in <c>juneau-marshall</c>.  This allows them to be used as return types in remote REST interfaces.
-			<br>A new {@del ResolvingReaderResource} class has been added that includes the variable-resolving support since
+			<br>A new <del>ResolvingReaderResource</del> class has been added that includes the variable-resolving support since
 			this relies on the <c>juneau-svl</c> package.
 		<li>
 			The <c>RemoteInterfaceServlet</c> class has been renamed to {@link oajr.remote.RrpcServlet}.
diff --git a/juneau-doc/docs/ReleaseNotes/8.0.0.html b/juneau-doc/docs/ReleaseNotes/8.0.0.html
index 59d6c7fc5..bf62819eb 100644
--- a/juneau-doc/docs/ReleaseNotes/8.0.0.html
+++ b/juneau-doc/docs/ReleaseNotes/8.0.0.html
@@ -77,7 +77,7 @@
 		<li>
 			New classpath store.
 			<ul class='javatree'>
-				<li class='jc'>{@del oaj.config.store.ConfigClasspathStore}
+				<li class='jc'><del>ConfigClasspathStore</del>
 			</ul>
 		<li>
 			New API method:
@@ -92,13 +92,13 @@
 	<h5 class='topic w800'>juneau-rest-server</h5>
 	<ul class='spaced-list'>
 		<li>
-			New methods on {@del oajr.RestServlet}:
+			New methods on <del>RestServlet</del>:
 			<ul class='javatree'>
-				<li class='jm'>{@del oajr.RestServlet#setRestResourceResolver(RestResourceResolver) setRestResourceResolver(RestResourceResolver)}
-				<li class='jm'>{@del oajr.RestServlet#getPath() getPath()}
+				<li class='jm'><del>RestServlet#setRestResourceResolver(RestResourceResolver) setRestResourceResolver(RestResourceResolver)</del>
+				<li class='jm'><del>RestServlet#getPath() getPath()</del>
 			</ul>
 		<li>
-			The registered resource resolver is now used to instantiate objects of classes defined via {@del @RestResource}.
+			The registered resource resolver is now used to instantiate objects of classes defined via <del>@RestResource</del>.
 			<br>This allows for any of those instance to be injectable beans.
 	</ul>
 	
diff --git a/juneau-doc/docs/ReleaseNotes/8.1.0.html b/juneau-doc/docs/ReleaseNotes/8.1.0.html
index 6ffc13d92..5281a3825 100644
--- a/juneau-doc/docs/ReleaseNotes/8.1.0.html
+++ b/juneau-doc/docs/ReleaseNotes/8.1.0.html
@@ -21,21 +21,21 @@
 	</p>
 	<ul class='spaced-list'>
 		<li>
-			{@del ConfigurableAnnotations Configurable Annotations}
+			<del>ConfigurableAnnotations Configurable Annotations</del>
 		<li>
-			{@del DefaultPojoSwaps Default PojoSwaps}
+			<del>DefaultPojoSwaps Default PojoSwaps</del>
 		<li>
-			{@del ConfigImports Config Imports}
+			<del>ConfigImports Config Imports</del>
 		<li>
-			{@del BasicRest BasicRest}, {@del BasicRestGroup BasicRestGroup} classes
+			<del>BasicRest BasicRest</del>, <del>BasicRestGroup BasicRestGroup</del> classes
 		<li>
-			{@del RestPathAnnotation Path variables on resource paths}
+			<del>RestPathAnnotation Path variables on resource paths</del>
 		<li>
-			{@del RestmRequestAttributes Request Attributes API}
+			<del>RestmRequestAttributes Request Attributes API</del>
 		<li>
-			{@del RestRoleGuards Role Guards}
+			<del>RestRoleGuards Role Guards</del>
 		<li>
-			{@del RestLoggingAndDebugging Improved REST logging/debugging}
+			<del>RestLoggingAndDebugging Improved REST logging/debugging</del>
 		<li>
 			<a href='#juneau-rest-mock'>New MockRest API</a>
 	</ul>
@@ -57,8 +57,8 @@
 			<ul class='javatree'>
 				<li class='jc'>{@link oaj.serializer.WriterSerializer}
 				<ul>
-					<li class='jf'>{@del oaj.serializer.WriterSerializer#WSERIALIZER_fileCharset WSERIALIZER_fileCharset}
-					<li class='jf'>{@del oaj.serializer.WriterSerializer#WSERIALIZER_streamCharset WSERIALIZER_streamCharset}
+					<li class='jf'><del>WriterSerializer#WSERIALIZER_fileCharset WSERIALIZER_fileCharset</del>
+					<li class='jf'><del>WriterSerializer#WSERIALIZER_streamCharset WSERIALIZER_streamCharset</del>
 				</ul>
 			</ul>
 		<li>
@@ -77,7 +77,7 @@
 		<li>
 			New convenience debugging methods on Marshall API:
 			<ul class='javatree'>
-				<li class='jc'>{@del oaj.marshall.Marshall}
+				<li class='jc'><del>Marshall</del>
 				<ul>
 					<li class='jm'>{@del oaj.marshall.Marshall#format(String,Object...) format(String,Object...)} - <c>MessageFormat</c>-style formatter.
 					<li class='jm'>{@del oaj.marshall.Marshall#out(String,Object...) out(String,Object...)} - Prints <c>MessageFormat</c>-style messages to STDOUT.
@@ -90,9 +90,9 @@
 		<li>
 			New Java 8 date-time transforms:
 			<ul class='javatree'>
-				<li class='jc'>{@del oaj.transforms.TemporalSwap} - For all Java 8 temporal types (e.g. {@link java.time.ZonedDateTime})
-				<li class='jc'>{@del oaj.transforms.TemporalDateSwap} - For {@link java.util.Date}
-				<li class='jc'>{@del oaj.transforms.TemporalCalendarSwap} - For {@link java.util.Calendar}
+				<li class='jc'><del>TemporalSwap</del> - For all Java 8 temporal types (e.g. {@link java.time.ZonedDateTime})
+				<li class='jc'><del>TemporalDateSwap</del> - For {@link java.util.Date}
+				<li class='jc'><del>TemporalCalendarSwap</del> - For {@link java.util.Calendar}
 			</ul>
 		<li>
 			All serializers and parsers now have built-in default swaps for common class types:
@@ -123,17 +123,17 @@
 		<li>
 			Support for import statements:
 			<p class='bcode'>
-		<cc># Import values from another configuration:</cc>
+		<cc>. Import values from another configuration:</cc>
 		<ci>&lt;ParentConfig1&gt;</ci>
 		
 		<cs>[Foo]</cs>
 		<ck>bar</ck> = <cv>baz</cv>
 			</p>
 		<li>
-			The {@del oaj.config.store.ConfigFileStore} now automatically resolves file extensions.
+			The <del>ConfigFileStore</del>now automatically resolves file extensions.
 			<br>New configuration property for specifying search paths for file extensions:
 			<ul class='javatree'>
-				<li class='jf'>{@del oaj.config.store.ConfigFileStore#FILESTORE_extensions}
+				<li class='jf'><del>ConfigFileStore#FILESTORE_extensions</del>
 			</ul>
 		<li>
 			Fixed a bug where instances of {@link oaj.config.store.ConfigMemoryStore} ended up resolving to the same object.
@@ -192,7 +192,7 @@
 				<li class='ja'>{@link oaj.csv.annotation.CsvConfig CsvConfig}
 				<li class='ja'>{@link oaj.html.annotation.HtmlConfig HtmlConfig}
 				<li class='ja'>{@link oaj.html.annotation.HtmlDocConfig HtmlDocConfig}
-				<li class='ja'>{@del oaj.jso.annotation.JsoConfig JsoConfig}
+				<li class='ja'><del>JsoConfig JsoConfig</del>
 				<li class='ja'>{@link oaj.json.annotation.JsonConfig JsonConfig}
 				<li class='ja'>{@link oaj.jsonschema.annotation.JsonSchemaConfig JsonSchemaConfig}
 				<li class='ja'>{@link oaj.msgpack.annotation.MsgPackConfig MsgPackConfig}
@@ -209,19 +209,19 @@
 		<li>
 			New support for using Servlet request attributes.  
 			<ul class='javatree'>
-				<li class='jc'>{@del oajr.RequestAttributes}
+				<li class='jc'><del>RequestAttributes</del>
 				<li class='jc'>{@link oajr.RestContext}
 				<ul>
-					<li class='jf'>{@del REST_attrs}
+					<li class='jf'><del>REST_attrs</del>
 				</ul>
 				<li class='jc'>{@link oajr.RestContext.Builder}
 				<ul>
 					<li class='jm'>{@del attrs(String...)}
-					<li class='jm'>{@del attr(String,Object)}
+					<li class='jm'><del>attr(String,Object)</del>
 				</ul>
-				<li class='jc'>{@del oajr.RestMethodContext}
+				<li class='jc'><del>RestMethodContext</del>
 				<ul>
-					<li class='jf'>{@del oajr.RestMethodContext#RESTMETHOD_attrs RESTMETHOD_attrs}
+					<li class='jf'><del>RestMethodContext#RESTMETHOD_attrs RESTMETHOD_attrs</del>
 				</ul>
 				<li class='jc'>{@link oajr.RestRequest}
 				<ul>
@@ -230,60 +230,60 @@
 				<li class='jc'>{@link oajr.RestResponse}
 				<ul>
 					<li class='jm'>{@link oajr.RestResponse#getAttributes() getAttributes()}
-					<li class='jm'>{@del oajr.RestResponse#attr(String,Object) attr(String,Object)}
+					<li class='jm'><del>RestResponse#attr(String,Object) attr(String,Object)</del>
 				</ul>
 				<li class='ja'>{@link oajr.annotation.Attr}
-				<li class='ja'>{@del RestMethod#attrs()}
-				<li class='ja'>{@del RestResource#attrs()}
+				<li class='ja'><del>RestMethod#attrs()</del>
+				<li class='ja'><del>RestResource#attrs()</del>
 			</ul>
 			<br>This deprecates the following APIs:
 			<ul class='javatree'>
-				<li class='jc'>{@del oajr.RequestProperties}
-				<li class='jc'>{@del oajr.RestMethodProperties}
+				<li class='jc'><del>RequestProperties</del>
+				<li class='jc'><del>RestMethodProperties</del>
 				<li class='jc'>{@link oajr.RestRequest}
 				<ul>
-					<li class='jm'>{@del oajr.RestRequest#getProperties() getProperties()}
-					<li class='jm'>{@del oajr.RestRequest#prop(String,Object) prop(String,Object)}
+					<li class='jm'><del>RestRequest#getProperties() getProperties()</del>
+					<li class='jm'><del>RestRequest.prop(String,Object) prop(String,Object)</del>
 				</ul>
 			</ul>
 		<li>
 			Added the following classes that provide the same support as the servlet classes but doesn't extend from <c>HttpServlet</c>.
-			<br>This fixes an issue where instances of {@del oajr.BasicRestServlet} are registered as top-level servlets even though
+			<br>This fixes an issue where instances of <del>BasicRestServlet</del> are registered as top-level servlets even though
 			you don't want them to be.  
 			<ul class='javatree'>
-				<li class='jac'>{@del oajr.BasicRest} - Non-servlet equivalent to {@del oajr.BasicRestServlet}
-				<li class='jac'>{@del oajr.BasicRestGroup} - Non-servlet equivalent to {@del oajr.BasicRestServletGroup}
-				<li class='jac'>{@del oajr.BasicRestJena} - Non-servlet equivalent to {@del oajr.BasicRestServletJena}
-				<li class='jac'>{@del oajr.BasicRestJenaGroup} - Non-servlet equivalent to {@del oajr.BasicRestServletJenaGroup}
+				<li class='jac'><del>BasicRest</del> - Non-servlet equivalent to <del>BasicRestServlet</del>
+				<li class='jac'><del>BasicRestGroup</del> - Non-servlet equivalent to <del>BasicRestServletGroup</del>
+				<li class='jac'><del>BasicRestJena</del> - Non-servlet equivalent to <del>BasicRestServletJena</del>
+				<li class='jac'><del>BasicRestJenaGroup</del> - Non-servlet equivalent to <del>BasicRestServletJenaGroup</del>
 			</ul>
 		<li>
 			HTML widgets now have access to the <c>RestResponse</c> object if they need access to the output bean.
 		<li>
 			New annotations for simplified role-based guards on classes and methods:
 			<ul class='javatree'>
-				<li class='ja'>{@del RestResource} 
+				<li class='ja'><del>RestResource</del> 
 				<ul>
-					<li class='jm'>{@del roleGuard()}
-					<li class='jm'>{@del rolesDeclared()}
+					<li class='jm'><del>roleGuard()</del>
+					<li class='jm'><del>rolesDeclared()</del>
 				</ul>
-				<li class='ja'>{@del oajr.annotation.RestMethod} 
+				<li class='ja'><del>RestMethod</del>
 				<ul>
-					<li class='jm'>{@del oajr.annotation.RestMethod#roleGuard roleGuard()}
-					<li class='jm'>{@del oajr.annotation.RestMethod#rolesDeclared rolesDeclared()}
+					<li class='jm'><del>RestMethod#roleGuard roleGuard()</del>
+					<li class='jm'><del>RestMethod.rolesDeclared rolesDeclared()</del>
 				</ul>
 			</ul>
 		<li>
 			New annotations for fine-tuned handling of http-methods/http-headers as query parameters and others:
 			<ul class='javatree'>
-				<li class='ja'>{@del RestResource} 
+				<li class='ja'><del>RestResource</del> 
 				<ul>
-					<li class='jm'>{@del allowedHeaderParams()}
-					<li class='jm'>{@del allowedMethodHeaders()}
-					<li class='jm'>{@del allowedMethodParams()}
+					<li class='jm'><del>allowedHeaderParams()</del>
+					<li class='jm'><del>allowedMethodHeaders()</del>
+					<li class='jm'><del>allowedMethodParams()</del>
 				</ul>
 			</ul>
 		<li>
-			The {@del @RestResource(path)} annotation can now use variables:
+			The <del>@RestResource(path)</del>annotation can now use variables:
 			<p class='bcode'>
 		<ja>@RestResource</ja>(
 			path=<js>"/myResource/{foo}/{bar}"</js>
@@ -305,13 +305,13 @@
 		<li>
 			New interface method for catching arbitrary thrown objects and converting them to other throwables.
 			<ul class='javatree'>
-				<li class='jc'>{@del oajr.RestCallHandler}
+				<li class='jc'><del>RestCallHandler</del>
 				<ul>
-					<li class='jm'>{@del oajr.RestCallHandler#convertThrowable(Throwable) convertThrowable(Throwable)}
+					<li class='jm'><del>RestCallHandler.convertThrowable(Throwable) convertThrowable(Throwable)</del>
 				</ul>
-				<li class='jc'>{@del BasicRestCallHandler}
+				<li class='jc'><del>BasicRestCallHandler</del>
 				<ul>
-					<li class='jm'>{@del convertThrowable(Throwable)}
+					<li class='jm'><del>convertThrowable(Throwable)</del>
 				</ul>
 			</ul>
 		<li>
@@ -342,7 +342,7 @@
 			)
 			<jk>public</jk> String myMethod() <jk>throws</jk> Exception {...}
 			</p>		
-			See {@del RestLoggingAndDebugging} for details.
+			See <del>RestLoggingAndDebugging</del>for details.
 		<li>
 			Fixed a bug where the HTTP response was returning 405 (method not found) but should really be 404 (not found)
 			when no path patterns match on any of the Java methods.
diff --git a/juneau-doc/docs/ReleaseNotes/8.1.1.html b/juneau-doc/docs/ReleaseNotes/8.1.1.html
index e27ef220c..cef9f926d 100644
--- a/juneau-doc/docs/ReleaseNotes/8.1.1.html
+++ b/juneau-doc/docs/ReleaseNotes/8.1.1.html
@@ -32,7 +32,7 @@
 			so that they can be used when building REST proxy interfaces while only pulling in the marshall bundle.
 			<ul>
 				<li class='jp'>{@link oaj.http.response}
-				<li class='jp'>{@del oaj.http.exception}
+				<li class='jp'><del>exception</del>
 				<li class='jp'>{@link oaj.http.remote}
 			</ul>
 			These replace the <c>org.apache.juneau.rest.response</c>, <c>org.apache.juneau.rest.exception</c>, and <c>org.apache.juneau.rest.client.remote</c> packages.
@@ -50,10 +50,10 @@
 			Support for {@link java.util.Optional} on method parameters annotated with {@link oaj.http.annotation.Header}, {@link oaj.http.annotation.FormData},  
 			{@link oaj.http.annotation.Query}, {@link oaj.http.annotation.Path}.
 		<li>
-			Fixed issue where {@del oajr.annotation.RestMethod#debug() RestMethod.debug()} annotation wasn't resulting
+			Fixed issue where {@del oajr.annotation.RestMethod.debug() RestMethod.debug()} annotation wasn't resulting
 			in the HTTP request being logged.
 		<li>
-			{@del oajr.RestException} has been deprecated and replaced by {@del oaj.http.exception.HttpException}.
+			<del>RestException</del> has been deprecated and replaced by <del>HttpException</del>.
 		<li>
 			Resolved issue where parameterized types on <ja>@RestMethod</ja>-annotated method parameters of Spring beans.
 			This is due to Spring relying on CGLIB for runtime-recompilation of beans that results in loss of parameterized-type
@@ -67,29 +67,29 @@
 			The fix involves resolving the original bean class for resolving parameterized type while leaving
 			method invocation on the proxy method so as not to bypass Spring features.
 		<li>
-			New methods on {@del oajr.BasicRest} to provide feature-parity with {@del oajr.RestServlet}:
+			New methods on <del>BasicRest</del>to provide feature-parity with <del>RestServlet</del>:
 			<ul class='javatree'>
-				<li class='jc'>{@del oajr.BasicRest}
+				<li class='jc'><del>BasicRest</del>
 					<ul class='javatreec'>
-						<li class='jm'>{@del oajr.BasicRest#getContext() getContext()}
-						<li class='jm'>{@del oajr.BasicRest#getRequest() getRequest()}
-						<li class='jm'>{@del oajr.BasicRest#getResponse() getResponse()}
-						<li class='jm'>{@del oajr.BasicRest#log(String) log(String)}
-						<li class='jm'>{@del oajr.BasicRest#log(String,Throwable) log(String,Throwable)}
-						<li class='jm'>{@del oajr.BasicRest#log(Level,String,Object[]) log(Level,String,Object[])}
-						<li class='jm'>{@del oajr.BasicRest#logObjects(Level,String,Object[])}
-						<li class='jm'>{@del oajr.BasicRest#log(Level,Throwable,String,Object[]) log(Level,Throwable,String,Object[])}
+						<li class='jm'><del>BasicRest#getContext() getContext()</del>
+						<li class='jm'><del>BasicRest#getRequest() getRequest()</del>
+						<li class='jm'><del>BasicRest#getResponse() getResponse()</del>
+						<li class='jm'><del>BasicRest#log(String) log(String)</del>
+						<li class='jm'><del>BasicRest#log(String,Throwable) log(String,Throwable)</del>
+						<li class='jm'><del>BasicRest#log(Level,String,Object[]) log(Level,String,Object[])</del>
+						<li class='jm'><del>BasicRest#logObjects(Level,String,Object[])</del>
+						<li class='jm'><del>BasicRest.log(Level,Throwable,String,Object[]) log(Level,Throwable,String,Object[])</del>
 					</ul>
 				</li>
 			</ul>
 		<li>
-			The {@del @RestResource(staticFiles)} annotation now supports absolute path locations and multiple mappings:
+			The <del>@RestResource(staticFiles)</del> annotation now supports absolute path locations and multiple mappings:
 			<p class='bcode'>
 		<jc>// Resolves static files in root package "htdocs" or working directory "htdocs", and then relative package "htdocs".</jc>
 		<ja>@RestResource</ja>(staticFiles=<js>"htdocs:/htdocsfolder,htdocs:htdocs.package"</js>)
 			</p>
 		<li>
-			Fixed a bug in {@del @RestResource(staticFiles)} where the order of lookup between parent and child resources
+			Fixed a bug in <del>@RestResource(staticFiles)</del>where the order of lookup between parent and child resources
 			was wrong.
 	</ul>
 	
diff --git a/juneau-doc/docs/ReleaseNotes/8.1.2.html b/juneau-doc/docs/ReleaseNotes/8.1.2.html
index 258c7867d..ab6f0e8c8 100644
--- a/juneau-doc/docs/ReleaseNotes/8.1.2.html
+++ b/juneau-doc/docs/ReleaseNotes/8.1.2.html
@@ -25,29 +25,29 @@
 		<li>
 			Support for read-only and write-only properties.
 			<ul>
-				<li class='ja'>{@del oaj.annotation.Bean#bpro()}
-				<li class='ja'>{@del oaj.annotation.Bean#bpwo()}
+				<li class='ja'><del>Bean#bpro()</del>
+				<li class='ja'><del>Bean#bpwo()</del>
 				<li class='ja'>{@link oaj.annotation.Beanp#ro()}
 				<li class='ja'>{@link oaj.annotation.Beanp#wo()}
-				<li class='jf'>{@del BEAN_bpro}
-				<li class='jf'>{@del BEAN_bpwo}
-				<li class='jm'>{@del oaj.BeanContext.Builder#bpro(Map)}
-				<li class='jm'>{@del oaj.BeanContext.Builder#bpwo(Map)}
+				<li class='jf'><del>BEAN_bpro</del>
+				<li class='jf'><del>BEAN_bpwo</del>
+				<li class='jm'><del>Builder#bpro(Map)</del>
+				<li class='jm'><del>Builder#bpwo(Map)</del>
 			</ul>
 		<li>
 			New convenience methods:
 			<ul>	
-				<li class='jm'>{@del oaj.ObjectMap#parse(CharSequence)}
-				<li class='jm'>{@del oaj.ObjectList#parse(CharSequence)}
+				<li class='jm'><del>ObjectMap#parse(CharSequence)</del>
+				<li class='jm'><del>ObjectList.parse(CharSequence)</del>
 			</ul>
 		<li>
-			{@del oaj.marshall.CharMarshall} and {@link oaj.marshall.StreamMarshall} now have public constructors.
+			<del>CharMarshall</del>and {@link oaj.marshall.StreamMarshall} now have public constructors.
 		<li>
-			{@link oaj.annotation.Beanp @Beanp} replaces {@del oaj.annotation.BeanProperty @BeanProperty}.
+			{@link oaj.annotation.Beanp @Beanp} replaces <del>BeanProperty @BeanProperty</del>.
 		<li>
-			{@link oaj.annotation.Beanc @Beanc} replaces {@del oaj.annotation.BeanConstructor @BeanConstructor}.
+			{@link oaj.annotation.Beanc @Beanc} replaces <del>BeanConstructor @BeanConstructor</del>.
 		<li>
-			{@link oaj.http.remote.Remote @Remote} replaces {@del oaj.http.remote.RemoteResource @RemoteResource}.
+			{@link oaj.http.remote.Remote @Remote} replaces <del>RemoteResource @RemoteResource</del>.
 		<li>
 			Shortened names for {@link oaj.annotation.Bean#dictionary @Bean(dictionary)} and {@link oaj.BeanContext.Builder#beanDictionary(Class...)}.
 	</ul>
@@ -55,9 +55,9 @@
 	<h5 class='topic w800'>juneau-rest-server</h5>
 	<ul class='spaced-list'>
 		<li>
-			{@link oajr.annotation.Rest @Rest} replaces {@del oajr.annotation.RestResource @RestResource} with shorter syntax.
+			{@link oajr.annotation.Rest @Rest} replaces <del>RestResource @RestResource</del> with shorter syntax.
 		<li>
-			New method {@del oajr.RestResponse#setHeaderSafe(String,String)} to strip invalid characters from header values.
+			New method <del>RestResponse.setHeaderSafe(String,String)</del>to strip invalid characters from header values.
 		<li>
 			Fixed issues related to invalid characters being set on HTTP header values.
 	</ul>
diff --git a/juneau-doc/docs/ReleaseNotes/8.1.3.html b/juneau-doc/docs/ReleaseNotes/8.1.3.html
index 3a517373e..c59304d65 100644
--- a/juneau-doc/docs/ReleaseNotes/8.1.3.html
+++ b/juneau-doc/docs/ReleaseNotes/8.1.3.html
@@ -23,13 +23,13 @@
 	<h5 class='topic w800'>juneau-marshall</h5>
 	<ul class='spaced-list'>
 		<li>
-			Dynamically applied annotations: {@del DynamicallyAppliedAnnotations}
+			Dynamically applied annotations: <del>DynamicallyAppliedAnnotations</del>
 		<li>
 			Better representation of nulls for XML and HTML content properties.
 			<br>Old:  <js>"&lt;myBean&gt;&lt;null&gt;&lt;/myBean&gt;"</js>
 			<br>New:  <js>"&lt;myBean nil='true'&gt;&lt;/myBean&gt;"</js>
 		<li>
-			Configurable properties such as {@del oaj.Context#CONTEXT_debug} can now be set globally by either
+			Configurable properties such as <del>Context.CONTEXT_debug</del> can now be set globally by either
 			system properties or environment variables.
 			<br>For <jsf>CONTEXT_debug</jsf> you can use either the system
 			property <js>"Context.debug"</js> or environment variables <js>"CONTEXT_DEBUG"</js>.
@@ -44,7 +44,7 @@
 	<h5 class='topic w800'>juneau-rest-server</h5>
 	<ul class='spaced-list'>
 		<li> 
-			Fixed bug in {@del BasicRestCallHandler} where if you have the following REST methods...
+			Fixed bug in <del>BasicRestCallHandler</del> where if you have the following REST methods...
 			<p class='bcode'>
 		<ja>@RestMethod</ja>(name=<js>"GET"</js>, path=<js>"/foo"</js>)
 		<ja>@RestMethod</ja>(name=<js>"*"</js>, path=<js>"/bar"</js>)
@@ -54,7 +54,7 @@
 			Fixed an issue involving using Juneau REST with Spring Security.  When Spring Security cannot authenticate a 
 			request, it sets the URL on the request to <js>"/error"</js> with a 401 status.  When Juneau then processes
 			this request, it cannot find that mapping and changes the status to 404 which messes with HTTP clients.
-			<br>Solution was to add a default no-op error method to the {@del oajr.BasicRestConfig} (and implementers):
+			<br>Solution was to add a default no-op error method to the <del>BasicRestConfig</del>(and implementers):
 			<p class='bcode'>
 		<ja>@RestMethod</ja>(name=<js>"*"</js>, path=<js>"/error"</js>)
 		<jk>public void</jk> error() {}
@@ -65,14 +65,14 @@
 		<li>
 			Renamed the following annotations:
 			<ul>
-				<li><ja>@Rest(attrs)</ja> --> {@del oajr.annotation.Rest#reqAttrs() @Rest(reqAttrs)}
-				<li><ja>@Rest(defaultRequestHeaders)</ja> --> {@del oajr.annotation.Rest#reqHeaders() @Rest(reqHeaders)}
-				<li><ja>@Rest(defaultResponseHeaders)</ja> --> {@del oajr.annotation.Rest#resHeaders() @Rest(resHeaders)}
-				<li><ja>@RestMethod(attrs)</ja> --> {@del oajr.annotation.RestMethod#reqAttrs() @RestMethod(reqAttrs)}
-				<li><ja>@RestMethod(defaultRequestHeaders)</ja> --> {@del oajr.annotation.RestMethod#reqHeaders() @RestMethod(reqHeaders)}
+				<li><ja>@Rest(attrs)</ja> --> <del>Rest#reqAttrs() @Rest(reqAttrs)</del>
+				<li><ja>@Rest(defaultRequestHeaders)</ja> --> <del>Rest#reqHeaders() @Rest(reqHeaders)</del>
+				<li><ja>@Rest(defaultResponseHeaders)</ja> --> <del>Rest#resHeaders() @Rest(resHeaders)</del>
+				<li><ja>@RestMethod(attrs)</ja> --> <del>RestMethod#reqAttrs() @RestMethod(reqAttrs)</del>
+				<li><ja>@RestMethod(defaultRequestHeaders)</ja> --> <del>RestMethod#reqHeaders() @RestMethod(reqHeaders)</del>
 			</ul>
 		<li>
-			New auto-generated REST method execution statistics: {@del RestExecutionStatistics}
+			New auto-generated REST method execution statistics: <del>RestExecutionStatistics</del>
 	</ul>
 	
 	<h5 class='topic w800'>juneau-rest-client</h5>
@@ -85,6 +85,6 @@
 	<h5 class='topic w800'>juneau-doc</h5>
 	<ul class='spaced-list'>
 		<li>
-			New auto-generated glossary of all configurable properties: {@del GlossaryConfigurableProperties}
+			New auto-generated glossary of all configurable properties: <del>GlossaryConfigurableProperties</del>
 	</ul>
 </div>
\ No newline at end of file
diff --git a/juneau-doc/docs/ReleaseNotes/8.2.0.html b/juneau-doc/docs/ReleaseNotes/8.2.0.html
index 758ad5467..413a71260 100644
--- a/juneau-doc/docs/ReleaseNotes/8.2.0.html
+++ b/juneau-doc/docs/ReleaseNotes/8.2.0.html
@@ -18,7 +18,7 @@
 <div class='topic'>
 	<p>
 		Juneau 8.2.0 is a major release. 
-		The most significant change is the addition of an entirely new {@del oajr.client2.RestClient} API build from scratch
+		The most significant change is the addition of an entirely new <del>RestClient</del> API build from scratch
 		with near 100% unit test coverage.
 		The new API is located in the <c>org.apache.juneau.rest.client2</c> package and will replace the old API in 9.0.
 	</p>
@@ -60,14 +60,14 @@
 			<ul class='javatree'>
 				<li class='jc'>{@link oaj.BeanContext.Builder}
 					<ul class='javatreec'>
-						<li class='jm'>{@del oaj.BeanContext.Builder#bpi(Class,String) bpi(Class,String)}
-						<li class='jm'>{@del oaj.BeanContext.Builder#bpi(String,String) bpi(String,String)}
-						<li class='jm'>{@del oaj.BeanContext.Builder#bpx(Class,String) bpx(Class,String)}
-						<li class='jm'>{@del oaj.BeanContext.Builder#bpx(String,String) bpx(String,String)}
-						<li class='jm'>{@del oaj.BeanContext.Builder#bpro(Class,String) bpro(Class,String)}
-						<li class='jm'>{@del oaj.BeanContext.Builder#bpro(String,String) bpro(String,String)}
-						<li class='jm'>{@del oaj.BeanContext.Builder#bpwo(Class,String) bpwo(Class,String}
-						<li class='jm'>{@del oaj.BeanContext.Builder#bpwo(String,String) bpwo(String,String}
+						<li class='jm'><del>Builder#bpi(Class,String) bpi(Class,String)</del>
+						<li class='jm'><del>Builder#bpi(String,String) bpi(String,String)</del>
+						<li class='jm'><del>Builder#bpx(Class,String) bpx(Class,String)</del>
+						<li class='jm'><del>Builder#bpx(String,String) bpx(String,String)</del>
+						<li class='jm'><del>Builder#bpro(Class,String) bpro(Class,String)</del>
+						<li class='jm'><del>Builder#bpro(String,String) bpro(String,String)</del>
+						<li class='jm'><del>Builder#bpwo(Class,String) bpwo(Class,String</del>
+						<li class='jm'><del>Builder#bpwo(String,String) bpwo(String,String</del>
 					</ul>
 				</li>
 			</ul>
@@ -96,10 +96,10 @@
 				<li class='jc'>{@link oaj.annotation.NamePropertyAnnotation} <jk>implements</jk> {@link oaj.annotation.NameProperty}
 				<li class='jc'>{@link oaj.annotation.ParentPropertyAnnotation} <jk>implements</jk> {@link oaj.annotation.ParentProperty}
 				<li class='jc'>{@link oaj.annotation.SwapAnnotation} <jk>implements</jk> {@link oaj.annotation.Swap}
-				<li class='jc'>{@link oaj.annotation.UriAnnotation} <jk>implements</jk> {@del oaj.annotation.URI}
+				<li class='jc'>{@link oaj.annotation.UriAnnotation} <jk>implements</jk> <del>URI</del>
 				<li class='jc'>{@link oaj.csv.annotation.CsvAnnotation} <jk>implements</jk> {@link oaj.csv.annotation.Csv}
 				<li class='jc'>{@link oaj.html.annotation.HtmlAnnotation} <jk>implements</jk> {@link oaj.html.annotation.Html}
-				<li class='jc'>{@del oaj.jso.annotation.JsoAnnotation} <jk>implements</jk> {@del oaj.jso.annotation.Jso}
+				<li class='jc'><del>JsoAnnotation</del> <jk>implements</jk> <del>Jso</del>
 				<li class='jc'>{@link oaj.json.annotation.JsonAnnotation} <jk>implements</jk> {@link oaj.json.annotation.Json}
 				<li class='jc'>{@link oaj.jsonschema.annotation.SchemaAnnotation} <jk>implements</jk> {@link oaj.jsonschema.annotation.Schema}
 				<li class='jc'>{@link oaj.msgpack.annotation.MsgPackAnnotation} <jk>implements</jk> {@link oaj.msgpack.annotation.MsgPack}
@@ -121,7 +121,7 @@
 			</p>
 		<li>
 			Bean maps now have the concept of "hidden" properties (properties that aren't serialized but otherwise accessible).
-			<br>For example, the {@link oaj.html.annotation.Html#link()} can now reference hidden properties:
+			<br>For example, the {@link oaj.html.annotation.Html.link()} can now reference hidden properties:
 			<p class='bcode'>
 		<ja>@Bean</ja>(bpi=<js>"a"</js>) <jc>// Will be overridden</jc>
 		<jk>public class</jk> MyBean {
@@ -142,8 +142,8 @@
 		<li>
 			New swaps auto-added to all serializers/parsers:
 			<ul>
-				<li class='jc'>{@del oaj.transforms.MatchResultSwap} 
-				<li class='jc'>{@del oaj.transforms.StackTraceElementSwap} 
+				<li class='jc'><del>MatchResultSwap</del> 
+				<li class='jc'><del>StackTraceElementSwap</del>
 			</ul>		
 		<li>
 			{@link oaj.html.annotation.Html#noTableHeaders} now can be applied to collections of beans.
@@ -161,20 +161,20 @@
 		<li>
 			New {@link oaj.collections} package containing various convenience fluent-style collection classes:
 			<ul>
-				<li class='jc'>{@del oaj.collections.AList}
-				<li class='jc'>{@del oaj.collections.ASet}
-				<li class='jc'>{@del oaj.collections.ASortedSet}
-				<li class='jc'>{@del oaj.collections.AMap}
-				<li class='jc'>{@del oaj.collections.ASortedMap}
-				<li class='jc'>{@del oaj.collections.OMap}
-				<li class='jc'>{@del oaj.collections.OList}
+				<li class='jc'><del>AList</del>
+				<li class='jc'><del>ASet</del>
+				<li class='jc'><del>ASortedSet</del>
+				<li class='jc'><del>AMap</del>
+				<li class='jc'><del>ASortedMap</del>
+				<li class='jc'><del>OMap</del>
+				<li class='jc'><del>OList</del>
 			</ul>
 		<li>
-			{@del oaj.ObjectMap} is being deprecated and replaced with {@del oaj.collections.OMap}.
+			<del>ObjectMap</del> is being deprecated and replaced with <del>OMap</del>.
 		<li>
-			{@del oaj.ObjectList} is being deprecated and replaced with {@del oaj.collections.OList}.
+			<del>ObjectList</del> is being deprecated and replaced with <del>OList</del>.
 		<li>
-			All classes in the {@link oaj.http.response} and {@del oaj.http.exception} now have <c>header(String,Object)</c>
+			All classes in the {@link oaj.http.response} and <del>exception</del> now have <c>header(String,Object)</c>
 			methods for adding response headers.
 			<p class='bcode'>
 		<jc>// Method that performs a BASIC Auth handshake.</jc>
@@ -188,15 +188,15 @@
 		<li>
 			New annotations for multi-part support:
 			<ul>
-				<li class='jm'>{@del oaj.http.annotation.Header#multi()}
-				<li class='jm'>{@del oaj.http.annotation.Query#multi()}
-				<li class='jm'>{@del oaj.http.annotation.FormData#multi()}
+				<li class='jm'><del>Header#multi()</del>
+				<li class='jm'><del>Query#multi()</del>
+				<li class='jm'><del>FormData#multi()</del>
 			</ul>
 		<li>
-			{@del oaj.BeanTraverseContext#BEANTRAVERSE_ignoreRecursions} setting no longer requires {@del oaj.BeanTraverseContext#BEANTRAVERSE_detectRecursions} 
+			<del>BeanTraverseContext.BEANTRAVERSE_ignoreRecursions</del>setting no longer requires <del>BeanTraverseContext.BEANTRAVERSE_detectRecursions</del>
 			to be enabled.
 		<li>
-			Fixed bug in JSON/UON/URL-Encoding serializers where indentation was not correct of first line when {@del oaj.BeanTraverseContext#BEANTRAVERSE_initialDepth}
+			Fixed bug in JSON/UON/URL-Encoding serializers where indentation was not correct of first line when <del>BeanTraverseContext#BEANTRAVERSE_initialDepth</del>
 			used.
 		<li>
 			Fixed bug in JSON/UON/URL-Encoding serializers where properties past the max depth were being serialized as null instead
@@ -204,12 +204,12 @@
 		<li>
 			Fixed bug in HTML serializer where tables of maps were not sorted if <jsf>SERIALIZER_sortMaps</jsf> was specified.
 		<li>
-			<jsf>SERIALIZER_trimNullProperties</jsf> has been replaced with {@del oaj.serializer.Serializer#SERIALIZER_keepNullProperties SERIALIZER_keepNullProperties}.
+			<jsf>SERIALIZER_trimNullProperties</jsf> has been replaced with <del>Serializer#SERIALIZER_keepNullProperties SERIALIZER_keepNullProperties</del>.
 		<li>
 			Improvements to OpenAPI serializer and parser:
 			<ul>
 				<li>Collection format can now be specified on OBJECTs to allow key/value pairs to be delimited with the same support as ARRAYs.
-				<li>New {@del oaj.oapi.OpenApiCommon#OAPI_format OAPI_format} and {@del oaj.oapi.OpenApiCommon#OAPI_collectionFormat OAPI_collectionFormat} properties.
+				<li>New <del>OpenApiCommon.OAPI_format OAPI_format</del>and <del>OpenApiCommon.OAPI_collectionFormat OAPI_collectionFormat</del>properties.
 			</ul>
 		<li>
 			Convenience methods added to {@link oaj.httppart.HttpPartSchema} and related classes to simplify schema definitions:
@@ -246,11 +246,11 @@
 			.build();
 			</p>
 		<li>
-			<c>BeanContext.REST_pojoSwaps</c> replaced with {@del oaj.BeanContext#BEAN_swaps} (and builder methods as well).
+			<c>BeanContext.REST_pojoSwaps</c> replaced with <del>BeanContext.BEAN_swaps</del>(and builder methods as well).
 		<li>
 			New Bean Property Interceptor API for intercepting calls to bean getters/setters.
 			<ul>
-				<li class='jac'>{@del oaj.transform.BeanInterceptor}
+				<li class='jac'><del>BeanInterceptor</del>
 				<li class='ja'>{@link oaj.annotation.Bean#interceptor Bean(interceptor)}
 				<li class='jm'>{@link oaj.BeanContext.Builder#beanInterceptor(Class,Class)}
 			</ul>
@@ -271,95 +271,95 @@
 	<h5 class='topic w800'>juneau-rest-server</h5>
 	<ul class='spaced-list'>
 		<li>
-			New {@del oajr.RestContext#REST_context REST_context}/{@del oajr.annotation.Rest#context() @Rest(context)} setting to allow you to extend the {@link oajr.RestContext}
+			New <del>RestContext#REST_context REST_context</del>/<del>Rest.context() @Rest(context)</del> setting to allow you to extend the {@link oajr.RestContext}
 			class.
 		<li>
 			{@link oajr.annotation.Rest}-annotated classes can now implement the following interfaces directly instead of having
 			to define secondary classes and hook them up through annotations:
 			<ul>
-				<li class='jic'>{@del oajr.RestCallHandler} - Normally defined through {@del oajr.annotation.Rest#callHandler() @Rest.callHandler()}.
-				<li class='jic'>{@del oajr.RestInfoProvider} - Normally defined through {@del oajr.annotation.Rest#infoProvider() @Rest.infoProvider()}.
-				<li class='jic'>{@del oajr.RestCallLogger} - Normally defined through {@del oajr.annotation.Rest#callLogger() @Rest.callLogger()}.
-				<li class='jic'>{@del oaj.utils.ClasspathResourceFinder} - Normally defined through {@del oajr.annotation.Rest#classpathResourceFinder() @Rest.classpathResourceFinder()}.
+				<li class='jic'><del>RestCallHandler</del>- Normally defined through {@del oajr.annotation.Rest#callHandler() @Rest.callHandler()}.
+				<li class='jic'><del>RestInfoProvider</del> - Normally defined through {@del oajr.annotation.Rest.infoProvider() @Rest.infoProvider()}.
+				<li class='jic'><del>RestCallLogger</del>- Normally defined through {@del oajr.annotation.Rest#callLogger() @Rest.callLogger()}.
+				<li class='jic'><del>ClasspathResourceFinder</del> - Normally defined through {@del oajr.annotation.Rest.classpathResourceFinder() @Rest.classpathResourceFinder()}.
 			</ul>
-			<br>The methods added for {@del oajr.RestInfoProvider} are:
+			<br>The methods added for <del>RestInfoProvider</del> are:
 			<ul>
-				<li class='jac'>{@del oajr.RestServlet}
+				<li class='jac'><del>RestServlet</del>
 				<ul>
-					<li class='jm'>{@del getSwagger(RestRequest)}
-					<li class='jm'>{@del getSiteName(RestRequest)}
-					<li class='jm'>{@del getTitle(RestRequest)}
-					<li class='jm'>{@del getDescription(RestRequest)}
-					<li class='jm'>{@del getMethodSummary(Method,RestRequest)}
-					<li class='jm'>{@del getMethodDescription(Method,RestRequest)}
+					<li class='jm'><del>getSwagger(RestRequest)</del>
+					<li class='jm'><del>getSiteName(RestRequest)</del>
+					<li class='jm'><del>getTitle(RestRequest)</del>
+					<li class='jm'><del>getDescription(RestRequest)</del>
+					<li class='jm'><del>getMethodSummary(Method,RestRequest)</del>
+					<li class='jm'><del>getMethodDescription(Method,RestRequest)</del>
 				</ul>
-				<li class='jac'>{@del BasicRest}
+				<li class='jac'><del>BasicRest</del>
 				<ul>
-					<li class='jm'>{@del getSwagger(RestRequest)}
-					<li class='jm'>{@del getSiteName(RestRequest)}
-					<li class='jm'>{@del getTitle(RestRequest)}
-					<li class='jm'>{@del getDescription(RestRequest)}
-					<li class='jm'>{@del getMethodSummary(Method,RestRequest)}
-					<li class='jm'>{@del getMethodDescription(Method,RestRequest)}
+					<li class='jm'><del>getSwagger(RestRequest)</del>
+					<li class='jm'><del>getSiteName(RestRequest)</del>
+					<li class='jm'><del>getTitle(RestRequest)</del>
+					<li class='jm'><del>getDescription(RestRequest)</del>
+					<li class='jm'><del>getMethodSummary(Method,RestRequest)</del>
+					<li class='jm'><del>getMethodDescription(Method,RestRequest)</del>
 				</ul>
 			</ul>
-			<br>The methods added for {@del oajr.RestCallLogger} are:
+			<br>The methods added for <del>RestCallLogger</del>are:
 			<ul>
-				<li class='jac'>{@del oajr.RestServlet}
+				<li class='jac'><del>RestServlet</del>
 				<ul>
-					<li class='jm'>{@del oajr.RestServlet#log(RestCallLoggerConfig,HttpServletRequest,HttpServletResponse) log(RestCallLoggerConfig,HttpServletRequest,HttpServletResponse)}
+					<li class='jm'><del>RestServlet#log(RestCallLoggerConfig,HttpServletRequest,HttpServletResponse) log(RestCallLoggerConfig,HttpServletRequest,HttpServletResponse)</del>
 				</ul>
-				<li class='jac'>{@del oajr.BasicRest}
+				<li class='jac'><del>BasicRest</del>
 				<ul>
-					<li class='jm'>{@del oajr.BasicRest#log(RestCallLoggerConfig,HttpServletRequest,HttpServletResponse) log(RestCallLoggerConfig,HttpServletRequest,HttpServletResponse)}
+					<li class='jm'><del>BasicRest.log(RestCallLoggerConfig,HttpServletRequest,HttpServletResponse) log(RestCallLoggerConfig,HttpServletRequest,HttpServletResponse)</del>
 				</ul>
 			</ul>
-			<br>The methods added for {@del oaj.utils.ClasspathResourceFinder} are:
+			<br>The methods added for <del>ClasspathResourceFinder</del>are:
 			<ul>
-				<li class='jac'>{@del oajr.RestServlet}
+				<li class='jac'><del>RestServlet</del>
 				<ul>
-					<li class='jm'>{@del oajr.RestServlet#findResource(Class,String,Locale) findResource(Class,String,Locale)}
+					<li class='jm'><del>RestServlet#findResource(Class,String,Locale) findResource(Class,String,Locale)</del>
 				</ul>
-				<li class='jac'>{@del oajr.BasicRest}
+				<li class='jac'><del>BasicRest</del>
 				<ul>
-					<li class='jm'>{@del oajr.BasicRest#findResource(Class,String,Locale) findResource(Class,String,Locale)}
+					<li class='jm'><del>BasicRest.findResource(Class,String,Locale) findResource(Class,String,Locale)</del>
 				</ul>
 			</ul>
-			<br>The methods added for {@del oajr.RestResourceResolver} are:
+			<br>The methods added for <del>RestResourceResolver</del>are:
 			<ul>
-				<li class='jac'>{@del oajr.RestServlet}
+				<li class='jac'><del>RestServlet</del>
 				<ul>
 					<li class='jm'>{@del oajr.RestServlet#resolve(Object,Class,RestContext.Builder,Object...) resolve(Object,Class&lt;T&gt;,RestContext.Builder,Object...)}
 				</ul>
-				<li class='jac'>{@del oajr.BasicRest}
+				<li class='jac'><del>BasicRest</del>
 				<ul>
-					<li class='jm'>{@del oajr.BasicRest#resolve(Object,Class,RestContext.Builder,Object...) resolve(Object,Class&lt;T&gt;,RestContext.Builder,Object...)}
+					<li class='jm'>{@del oajr.BasicRest.resolve(Object,Class,RestContext.Builder,Object...) resolve(Object,Class&lt;T&gt;,RestContext.Builder,Object...)}
 				</ul>
 			</ul>
 		<li>
-			Added the following convenience hook methods on the {@del oajr.RestServlet} and {@del oajr.BasicRest} classes:
+			Added the following convenience hook methods on the <del>RestServlet</del> and <del>BasicRest</del>classes:
 			<ul>
-				<li class='jac'>{@del oajr.RestServlet}
+				<li class='jac'><del>RestServlet</del>
 				<ul>
 					<li class='jm'>{@del oajr.RestServlet#onInit(RestContext.Builder) onInit(RestContext.Builder)}
-					<li class='jm'>{@del oajr.RestServlet#onPostInit(RestContext) onPostInit(RestContext)}
-					<li class='jm'>{@del oajr.RestServlet#onPostInitChildFirst(RestContext) onPostInitChildFirst(RestContext)}
-					<li class='jm'>{@del oajr.RestServlet#onDestroy(RestContext) onDestroy(RestContext)}
-					<li class='jm'>{@del oajr.RestServlet#onStartCall(HttpServletRequest,HttpServletResponse) onStartCall(HttpServletRequest,HttpServletResponse)}
-					<li class='jm'>{@del oajr.RestServlet#onPreCall(RestRequest,RestResponse) onPreCall(RestRequest,RestResponse)}
-					<li class='jm'>{@del oajr.RestServlet#onPostCall(RestRequest,RestResponse) onPostCall(RestRequest,RestResponse)}
-					<li class='jm'>{@del oajr.RestServlet#onEndCall(HttpServletRequest,HttpServletResponse) onEndCall(HttpServletRequest,HttpServletResponse)}
+					<li class='jm'><del>RestServlet#onPostInit(RestContext) onPostInit(RestContext)</del>
+					<li class='jm'><del>RestServlet#onPostInitChildFirst(RestContext) onPostInitChildFirst(RestContext)</del>
+					<li class='jm'><del>RestServlet#onDestroy(RestContext) onDestroy(RestContext)</del>
+					<li class='jm'><del>RestServlet#onStartCall(HttpServletRequest,HttpServletResponse) onStartCall(HttpServletRequest,HttpServletResponse)</del>
+					<li class='jm'><del>RestServlet#onPreCall(RestRequest,RestResponse) onPreCall(RestRequest,RestResponse)</del>
+					<li class='jm'><del>RestServlet#onPostCall(RestRequest,RestResponse) onPostCall(RestRequest,RestResponse)</del>
+					<li class='jm'><del>RestServlet#onEndCall(HttpServletRequest,HttpServletResponse) onEndCall(HttpServletRequest,HttpServletResponse)</del>
 				</ul>
-				<li class='jac'>{@del oajr.BasicRest}
+				<li class='jac'><del>BasicRest</del>
 				<ul>
 					<li class='jm'>{@del oajr.BasicRest#onInit(RestContext.Builder) onInit(RestContext.Builder)}
-					<li class='jm'>{@del oajr.BasicRest#onPostInit(RestContext) onPostInit(RestContext)}
-					<li class='jm'>{@del oajr.BasicRest#onPostInitChildFirst(RestContext) onPostInitChildFirst(RestContext)}
-					<li class='jm'>{@del oajr.BasicRest#onDestroy(RestContext) onDestroy(RestContext)}
-					<li class='jm'>{@del oajr.BasicRest#onStartCall(HttpServletRequest,HttpServletResponse) onStartCall(HttpServletRequest,HttpServletResponse)}
-					<li class='jm'>{@del oajr.BasicRest#onPreCall(RestRequest,RestResponse) onPreCall(RestRequest,RestResponse)}
-					<li class='jm'>{@del oajr.BasicRest#onPostCall(RestRequest,RestResponse) onPostCall(RestRequest,RestResponse)}
-					<li class='jm'>{@del oajr.BasicRest#onEndCall(HttpServletRequest,HttpServletResponse) onEndCall(HttpServletRequest,HttpServletResponse)}
+					<li class='jm'><del>BasicRest#onPostInit(RestContext) onPostInit(RestContext)</del>
+					<li class='jm'><del>BasicRest#onPostInitChildFirst(RestContext) onPostInitChildFirst(RestContext)</del>
+					<li class='jm'><del>BasicRest#onDestroy(RestContext) onDestroy(RestContext)</del>
+					<li class='jm'><del>BasicRest#onStartCall(HttpServletRequest,HttpServletResponse) onStartCall(HttpServletRequest,HttpServletResponse)</del>
+					<li class='jm'><del>BasicRest#onPreCall(RestRequest,RestResponse) onPreCall(RestRequest,RestResponse)</del>
+					<li class='jm'><del>BasicRest#onPostCall(RestRequest,RestResponse) onPostCall(RestRequest,RestResponse)</del>
+					<li class='jm'><del>BasicRest#onEndCall(HttpServletRequest,HttpServletResponse) onEndCall(HttpServletRequest,HttpServletResponse)</del>
 				</ul>
 			</ul>
 		<li>
@@ -379,22 +379,22 @@
 			}
 			 </p>
 		<li>
-			{@del oajr.BasicRestConfig} has been broken up into {@del BasicRestConfig} and {@del oajr.BasicRestMethods} so that
+			<del>BasicRestConfig</del> has been broken up into <del>BasicRestConfig</del> and <del>BasicRestMethods</del> so that
 			you're not forced to implement methods such as <c>getOptions()</c> and <c>getStats()</c> if you're implementing the interface
 			to configure your REST class.
 		<li>
 			Any of the following classes can now be instantiated with <c><jk>public static</jk> <jsm>create</jsm>()</c> methods:
 			<ul>
-				<li class='jc'>{@del oajr.RestCallHandler}
-				<li class='jc'>{@del oajr.RestCallLogger}
-				<li class='jc'>{@del oajr.RestInfoProvider}
-				<li class='jc'>{@del oaj.utils.ClasspathResourceFinder}
-				<li class='jc'>{@del oajr.RestResourceResolver}
-				<li class='jc'>{@del oajr.RestGuard}
+				<li class='jc'><del>RestCallHandler</del>
+				<li class='jc'><del>RestCallLogger</del>
+				<li class='jc'><del>RestInfoProvider</del>
+				<li class='jc'><del>ClasspathResourceFinder</del>
+				<li class='jc'><del>RestResourceResolver</del>
+				<li class='jc'><del>RestGuard</del>
 				<li class='jc'>{@link oajr.ResponseHandler}
 			</ul>
 		<li>
-			New {@del oaj.http.annotation.Path#required() @Path(required)} annotation support.
+			New <del>Path.required() @Path(required)</del>annotation support.
 			<br>A path can be marked as not-required when the path variable is resolved by a parent resource like so:
 			<p class='bcode'>
 		<ja>@Rest</ja>(path=<js>"/parent/{p1}"</js>,children=Child.<jk>class</jk>)
@@ -415,7 +415,7 @@
 			</p>
 			<br>This allows the child resource to be mapped to multiple parents that may resolve various different path variables.
 		<li>
-			New {@del oajr.annotation.RestMethod#paths() @RestMethod(paths)} annotation that allows you to map multiple
+			New <del>RestMethod.paths() @RestMethod(paths)</del> annotation that allows you to map multiple
 			paths to the same Java method.
 			<br>Example:
 			<p class='bcode'>
@@ -426,7 +426,7 @@
 		<jk>public</jk> String doGet(<ja>@Path</ja>(name=<js>"foo"</js>,required=<jk>false</jk>) String foo) {...}
 			</p>
 		<li>
-			The {@del oajr.annotation.RestMethod @RestMethod} annotation is now implied on all unannotated methods of a {@link oajr.annotation.Rest @Rest}-annotated
+			The <del>RestMethod @RestMethod</del>annotation is now implied on all unannotated methods of a {@link oajr.annotation.Rest @Rest}-annotated
 			interface.
 			<p class='bcode'>
 		<ja>@Rest
@@ -435,19 +435,19 @@
 		}
 			</p>
 		<li>
-			Improved {@del oajr.RestContext#REST_messages REST_messages} support (mostly bug fixes).
+			Improved <del>RestContext.REST_messages REST_messages</del> support (mostly bug fixes).
 	</ul>
 	
 	<h5 class='topic w800'>juneau-rest-server-springboot</h5>
 	<ul class='spaced-list'>
 		<li>
-			{@del oajr.springboot.JuneauRestInitializer} now provides a no-arg constructor so that it can be used in
+			<del>JuneauRestInitializer</del>now provides a no-arg constructor so that it can be used in
 			the <c><ja>@ConfigurationContext</ja>(initializers=JuneauRestInitializer.<jk>class</jk>)</c> when unit testing
 			using <ja>@SpringBootTest</ja>.
 		<li>
-			New {@del oajr.helper.ResourceDescription#ResourceDescription(String,String,String)} constructor and {@del oajr.helper.ResourceDescriptions#append(String,String,String)} method.
+			New <del>ResourceDescription.ResourceDescription(String,String,String)</del>constructor and <del>ResourceDescriptions.append(String,String,String)</del> method.
 		<li>
-			New {@del oajr.helper.Hyperlink} class.
+			New <del>Hyperlink</del>class.
 	</ul>
 	
 	<h5 class='topic w800'>juneau-rest-client</h5>
@@ -479,7 +479,7 @@
 		<ul>
 			<li>{@link oaj.http.remote.Remote#version version} - Adds a client version header to all requests.
 			<li>{@link oaj.http.remote.Remote#headers headers} - Adds a set of headers to all requests.
-			<li>{@del headerSupplier} - Adds a dynamic supplier of headers to all requests.
+			<li><del>headerSupplier</del> - Adds a dynamic supplier of headers to all requests.
 		</ul>
 	</ul>
 	
@@ -487,7 +487,7 @@
 	<ul class='spaced-list'>
 		<li>
 			The <c>MockRest</c> and <c>MockRemote</c> classes have been remove entirely and all existing functions
-			have been moved into the improved {@del oajr.mock2.MockRestClient} class.  All REST test mocking can be 
+			have been moved into the improved <del>MockRestClient</del> class.  All REST test mocking can be 
 			done through this single class.
 	</ul>
 </div>
\ No newline at end of file
diff --git a/juneau-doc/docs/Topics/02.juneau-marshall/26.jm.XmlDetails/07.jm.XmlNamespaces.html b/juneau-doc/docs/Topics/02.juneau-marshall/26.jm.XmlDetails/07.jm.XmlNamespaces.html
index 1b5fa5755..d18487808 100644
--- a/juneau-doc/docs/Topics/02.juneau-marshall/26.jm.XmlDetails/07.jm.XmlNamespaces.html
+++ b/juneau-doc/docs/Topics/02.juneau-marshall/26.jm.XmlDetails/07.jm.XmlNamespaces.html
@@ -104,7 +104,7 @@
 		|	<xt>&lt;/per:person&gt;</xt>
 	</p>
 	<p>
-		Enabling the {@del oaj.xml.XmlSerializer#XML_addNamespaceUrisToRoot} setting results
+		Enabling the <del>XmlSerializer.XML_addNamespaceUrisToRoot</del>setting results
 		in the namespace URLs being added to the root node:
 	</p>
 	<p class='bxml'>
diff --git a/juneau-doc/docs/Topics/03.juneau-marshall-rdf/01.jmr.RdfDetails/06.jmr.RootProperty.html b/juneau-doc/docs/Topics/03.juneau-marshall-rdf/01.jmr.RdfDetails/06.jmr.RootProperty.html
index ebda64cce..5650efe43 100644
--- a/juneau-doc/docs/Topics/03.juneau-marshall-rdf/01.jmr.RdfDetails/06.jmr.RootProperty.html
+++ b/juneau-doc/docs/Topics/03.juneau-marshall-rdf/01.jmr.RdfDetails/06.jmr.RootProperty.html
@@ -31,7 +31,7 @@
 		locate the root at all.
 	</p>
 	<p>
-		To resolve this issue, the property {@del oaj.jena.RdfSerializer#RDF_addRootProperty} 
+		To resolve this issue, the property <del>RdfSerializer.RDF_addRootProperty</del>
 		was introduced.
 		When enabled, this adds a special <c>root</c> attribute to the root node to make it easy to locate 
 		by the parser.
diff --git a/juneau-doc/docs/Topics/03.juneau-marshall-rdf/01.jmr.RdfDetails/07.jmr.TypedLiterals.html b/juneau-doc/docs/Topics/03.juneau-marshall-rdf/01.jmr.RdfDetails/07.jmr.TypedLiterals.html
index 2ada3df2c..81df7c3f7 100644
--- a/juneau-doc/docs/Topics/03.juneau-marshall-rdf/01.jmr.RdfDetails/07.jmr.TypedLiterals.html
+++ b/juneau-doc/docs/Topics/03.juneau-marshall-rdf/01.jmr.RdfDetails/07.jmr.TypedLiterals.html
@@ -18,7 +18,7 @@
 <div class='topic'>
 	<p>
 		XML-Schema data-types can be added to non-<c>String</c> literals through the 
-		{@del oaj.jena.RdfSerializer#RDF_addLiteralTypes} setting.
+		<del>RdfSerializer.RDF_addLiteralTypes</del>setting.
 	</p>
 	<p>
 		To enable, set the <jsf>RDF_addLiteralTypes</jsf> property to <jk>true</jk> on the serializer:
diff --git a/juneau-doc/docs/Topics/08.juneau-rest-server/12.jrs.SvlVariables.html b/juneau-doc/docs/Topics/08.juneau-rest-server/12.jrs.SvlVariables.html
index 42a5b49ad..38a97deab 100644
--- a/juneau-doc/docs/Topics/08.juneau-rest-server/12.jrs.SvlVariables.html
+++ b/juneau-doc/docs/Topics/08.juneau-rest-server/12.jrs.SvlVariables.html
@@ -48,7 +48,7 @@
 			<br>These are variables that can be used in many of the annotations in {@link oajr.annotation.Rest @Rest}. 
 			<br>The {@link oajr.RestContext#getVarResolver()} method returns initialization-time variables only.
 		<li><l>Request-time variables</l>
-			<br>These are variables that are available during HTTP-requests and can be used on annotation such as {@del oajr.annotation.HtmlDoc @HtmlDoc}. 
+			<br>These are variables that are available during HTTP-requests and can be used on annotation such as <del>HtmlDoc @HtmlDoc</del>. 
 			<br>{@link oajr.RestRequest#getVarResolverSession()} method returns initialization and request-time variables.
 	</ul>
 	<p>
diff --git a/juneau-doc/docs/Topics/12.juneau-microservice-core/05.jmc.Config.html b/juneau-doc/docs/Topics/12.juneau-microservice-core/05.jmc.Config.html
index 109d352a1..568ecc1b4 100644
--- a/juneau-doc/docs/Topics/12.juneau-microservice-core/05.jmc.Config.html
+++ b/juneau-doc/docs/Topics/12.juneau-microservice-core/05.jmc.Config.html
@@ -109,7 +109,7 @@
 	<p>
 		Once the configuration is resolved, it is made as the system default configuration available through the {@link oaj.config.Config#getSystemDefault()}.
 		This in turn allows it to be used by REST resources that reference the system default configuration via the <js>"SYSTEM_DEFAULT"</js> such as those
-		implementing the {@del oajr.BasicRestConfig} interface.
+		implementing the <del>BasicRestConfig</del> interface.
 	<p>
 	<h5 class='figure'>BasicRestConfig.java</h5>
 	<p class='bjava'>
diff --git a/juneau-doc/docs/Topics/15.my-springboot-microservice/01.msm.Installing.html b/juneau-doc/docs/Topics/15.my-springboot-microservice/01.msm.Installing.html
index bd36c0d39..55c8342aa 100644
--- a/juneau-doc/docs/Topics/15.my-springboot-microservice/01.msm.Installing.html
+++ b/juneau-doc/docs/Topics/15.my-springboot-microservice/01.msm.Installing.html
@@ -43,7 +43,7 @@
 			<br>This class creates and starts our microservice.
 			<br>Note that we're using the existing Spring Boot application logic for the microservice and we're retrieving
 			our root resource as a spring bean.
-			<br>Only the top-level resource needs to be annotated with {@del oaj.rest.springboot.annotation.JuneauRestRoot @JuneauRestRoot}
+			<br>Only the top-level resource needs to be annotated with <del>JuneauRestRoot @JuneauRestRoot</del>
 			<br><br>
 			<p class='bjava'>
 				|	<ja>@SpringBootApplication</ja>
diff --git a/juneau-doc/src/main/java/org/apache/juneau/doc/internal/DelTag.java b/juneau-doc/src/main/java/org/apache/juneau/doc/internal/DelTag.java
deleted file mode 100644
index 3826f3a33..000000000
--- a/juneau-doc/src/main/java/org/apache/juneau/doc/internal/DelTag.java
+++ /dev/null
@@ -1,99 +0,0 @@
-// ***************************************************************************************************************************
-// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file *
-// * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file        *
-// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance            *
-// * with the License.  You may obtain a copy of the License at                                                              *
-// *                                                                                                                         *
-// *  http://www.apache.org/licenses/LICENSE-2.0                                                                             *
-// *                                                                                                                         *
-// * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an  *
-// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
-// * specific language governing permissions and limitations under the License.                                              *
-// ***************************************************************************************************************************
-package org.apache.juneau.doc.internal;
-
-
-import com.sun.tools.doclets.Taglet;
-import com.sun.javadoc.*;
-
-import java.util.*;
-
-/**
- * Implements the <c>{@del xxx}</c> tag that identifies a dead link
- */
-public class DelTag implements Taglet {
-
-	private static final String NAME = "del";
-
-	@Override
-	public String getName() {
-		return NAME;
-	}
-
-	@Override
-	public boolean inField() {
-		return true;
-	}
-
-	@Override
-	public boolean inConstructor() {
-		return true;
-	}
-
-	@Override
-	public boolean inMethod() {
-		return true;
-	}
-
-	@Override
-	public boolean inOverview() {
-		return true;
-	}
-
-	@Override
-	public boolean inPackage() {
-		return true;
-	}
-
-	@Override
-	public boolean inType() {
-		return true;
-	}
-
-	@Override
-	public boolean isInlineTag() {
-		return true;
-	}
-
-	@SuppressWarnings({ "javadoc", "rawtypes", "unchecked" })
-	public static void register(Map tagletMap) {
-		DelTag tag = new DelTag();
-		tagletMap.put(tag.getName(), tag);
-	}
-
-	@Override
-	public String toString(Tag tag) {
-		String label = tag.text();
-		int i = label.indexOf(' ');
-		if (i != -1) {
-			label = label.substring(i+1);
-		} else {
-			i = label.indexOf('#');
-			if (i != -1) {
-				i = label.lastIndexOf('.');
-				if (i != -1) {
-					label = label.substring(i+1);
-				}
-				label = label.replace('#','.');
-			}
-		}
-
-		label = label.replace('#','.');
-		return "<dc>" + label + "</dc>";
-	}
-
-	@Override
-	public String toString(Tag[] tags) {
-		return null;
-	}
-}
\ No newline at end of file
diff --git a/juneau-doc/src/main/javadoc/overview.html b/juneau-doc/src/main/javadoc/overview.html
index 44731ad59..554d035a6 100644
--- a/juneau-doc/src/main/javadoc/overview.html
+++ b/juneau-doc/src/main/javadoc/overview.html
@@ -9006,7 +9006,7 @@
 	<xt>&lt;/per:person&gt;</xt>
 	</p>
 	<p>
-		Enabling the {@del org.apache.juneau.xml.XmlSerializer#XML_addNamespaceUrisToRoot} setting results
+		Enabling the <del>XmlSerializer#XML_addNamespaceUrisToRoot</del> setting results
 		in the namespace URLs being added to the root node:
 	</p>
 	<p class='bxml'>
@@ -12429,7 +12429,7 @@
 		locate the root at all.
 	</p>
 	<p>
-		To resolve this issue, the property {@del org.apache.juneau.jena.RdfSerializer#RDF_addRootProperty} 
+		To resolve this issue, the property <del>RdfSerializer#RDF_addRootProperty</del> 
 		was introduced.
 		When enabled, this adds a special <c>root</c> attribute to the root node to make it easy to locate 
 		by the parser.
@@ -12489,7 +12489,7 @@
 <div class='topic'>
 	<p>
 		XML-Schema data-types can be added to non-<c>String</c> literals through the 
-		{@del org.apache.juneau.jena.RdfSerializer#RDF_addLiteralTypes} setting.
+		<del>RdfSerializer#RDF_addLiteralTypes</del> setting.
 	</p>
 	<p>
 		To enable, set the <jsf>RDF_addLiteralTypes</jsf> property to <jk>true</jk> on the serializer:
@@ -19292,7 +19292,7 @@
 			<br>These are variables that can be used in many of the annotations in {@link org.apache.juneau.rest.annotation.Rest @Rest}. 
 			<br>The {@link org.apache.juneau.rest.RestContext#getVarResolver()} method returns initialization-time variables only.
 		<li><l>Request-time variables</l>
-			<br>These are variables that are available during HTTP-requests and can be used on annotation such as {@del org.apache.juneau.rest.annotation.HtmlDoc @HtmlDoc}. 
+			<br>These are variables that are available during HTTP-requests and can be used on annotation such as <del>HtmlDoc @HtmlDoc</del>. 
 			<br>{@link org.apache.juneau.rest.RestRequest#getVarResolverSession()} method returns initialization and request-time variables.
 	</ul>
 	<p>
@@ -25896,7 +25896,7 @@
 	<p>
 		Once the configuration is resolved, it is made as the system default configuration available through the {@link org.apache.juneau.config.Config#getSystemDefault()}.
 		This in turn allows it to be used by REST resources that reference the system default configuration via the <js>"SYSTEM_DEFAULT"</js> such as those
-		implementing the {@del org.apache.juneau.rest.BasicRestConfig} interface.
+		implementing the <del>BasicRestConfig</del> interface.
 	<p>
 	<h5 class='figure'>BasicRestConfig.java</h5>
 	<p class='bjava'>
@@ -27268,16 +27268,22 @@
 			<xt>&lt;/New&gt;</xt>
 		<xt>&lt;/Set&gt;</xt>
 	
-		<xt>&lt;Set</xt> <xa>name</xa>=<xs>"requestLog"</xs><xt>&gt;</xt>
-			<xt>&lt;New</xt> <xa>id</xa>=<xs>"RequestLogImpl"</xs> <xa>class</xa>=<xs>"org.eclipse.jetty.server.NCSARequestLog"</xs><xt>&gt;</xt>
-				<xt>&lt;Set</xt> <xa>name</xa>=<xs>"filename"</xs><xt>&gt;&lt;Property</xt> <xa>name</xa>=<xs>"jetty.logs"</xs> <xa>default</xa>=<xs>"$C{Logging/logDir,logs}"</xs><xt>/&gt;</xt>/jetty-requests.log<xt>&lt;/Set&gt;</xt>
-				<xt>&lt;Set</xt> <xa>name</xa>=<xs>"filenameDateFormat</xs><xt>"&gt;</xt>yyyy_MM_dd<xt>&lt;/Set&gt;</xt>
-				<xt>&lt;Set</xt> <xa>name</xa>=<xs>"LogTimeZone"</xs><xt>&gt;</xt>GMT<xt>&lt;/Set&gt;</xt>
-				<xt>&lt;Set</xt> <xa>name</xa>=<xs>"retainDays"</xs><xt>&gt;</xt>90<xt>&lt;/Set&gt;</xt>
-				<xt>&lt;Set</xt> <xa>name</xa>=<xs>"append"</xs><xt>&gt;</xt>false<xt>&lt;/Set&gt;</xt>
-				<xt>&lt;Set</xt> <xa>name</xa>=<xs>"LogLatency"</xs><xt>&gt;</xt>true<xt>&lt;/Set&gt;</xt>
-			<xt>&lt;/New&gt;</xt>
-		<xt>&lt;/Set&gt;</xt>
+		<xt>&lt;New</xt> <xa>id</xa>=<xs>"RequestLogImpl"</xs> <xa>class</xa>=<xs>"org.eclipse.jetty.server.CustomRequestLog"</xs><xt>&gt;</xt>
+			<xc>&lt;!-- Param 0: org.eclipse.jetty.server.RequestLogWriter --&gt;</xc>
+			<xt>&lt;Arg&gt;</xt>
+				<xt>&lt;New</xt> <xa>class</xa>=<xs>"org.eclipse.jetty.server.RequestLogWriter"</xs><xt>&gt;</xt>
+					<xt>&lt;Set</xt> <xa>name</xa>=<xs>"append"</xs><xt>&gt;</xt>false<xt>&lt;/Set&gt</xt>;
+					<xt>&lt;Set</xt> <xa>name</xa>=<xs>"filename"</xs><xt>&gt;&lt;Property</xt> <xa>name</xa>=<xs>"jetty.logs"</xs> <xa>default</xa>=<xs>"$C{Logging/logDir,logs}"</xs> <xt>/&gt;</xt>/jetty-requests.log<xt>&lt;/Set&gt</xt>;
+					<xt>&lt;Set</xt> <xa>name</xa>=<xs>"filenameDateFormat"</xs><xt>&gt;</xt>yyyy_MM_dd<xt>&lt;/Set&gt;</xt>
+					<xt>&lt;Set</xt> <xa>name</xa>=<xs>"retainDays"</xs><xt>&gt;</xt>90<xt>&lt;/Set&gt;</xt>
+					<xt>&lt;Set</xt> <xa>name</xa>=<xs>"timeZone"</xs><xt>&gt;</xt>GMT<xt>&lt;/Set&gt;</xt>
+				<xt>&lt;/New&gt;</xt>
+			<xt>&lt;/Arg&gt;</xt>
+			<xc>&lt;!-- Param 1: String --&gt;</xc>
+			<xt>&lt;Arg&gt;</xt>
+				<xt>&lt;Get</xt> <xa>class</xa>=<xs>"org.eclipse.jetty.server.CustomRequestLog"</xs> <xa>name</xa>=<xs>"EXTENDED_NCSA_FORMAT"</xs> <xt>/&gt;</xt>
+			<xt>&lt;/Arg&gt;</xt>
+		<xt>&lt;/New&gt;</xt>
 	
 		<xt>&lt;Get</xt> <xa>name</xa>=<xs>"ThreadPool"</xs><xt>&gt;</xt>
 			<xt>&lt;Set</xt> <xa>name</xa>=<xs>"minThreads"</xs> <xa>type</xa>=<xs>"int"</xs><xt>&gt;</xt>10<xt>&lt;/Set&gt;</xt>
@@ -27437,7 +27443,7 @@
 			<br>This class creates and starts our microservice.
 			<br>Note that we're using the existing Spring Boot application logic for the microservice and we're retrieving
 			our root resource as a spring bean.
-			<br>Only the top-level resource needs to be annotated with {@del org.apache.juneau.rest.springboot.annotation.JuneauRestRoot @JuneauRestRoot}
+			<br>Only the top-level resource needs to be annotated with <del>JuneauRestRoot @JuneauRestRoot</del>
 			<br><br>
 			<p class='bjava'>
 	<ja>@SpringBootApplication</ja>
@@ -29119,11 +29125,11 @@
 		</li>
 		<li>
 			Simplified Filter API for handling non-standard POJOs.<br>
-			The API for handling non-standard POJOs has been simplified by introducing the concept of a {@del Transform} class, which is associated with the <c>BeanContext</c> class (and thus the Serializer and Parser classes too) through the <c>BeanContext.addTransforms(Class[])</c> method.<br>
-			Two new subclasses of {@del Transform}:
+			The API for handling non-standard POJOs has been simplified by introducing the concept of a <del>Transform</del> class, which is associated with the <c>BeanContext</c> class (and thus the Serializer and Parser classes too) through the <c>BeanContext.addTransforms(Class[])</c> method.<br>
+			Two new subclasses of <del>Transform</del>:
 			<ul>
-				<li>{@del org.apache.juneau.transform.BeanFilter} - Filter POJO beans.</li>
-				<li>{@del org.apache.juneau.transform.PojoSwap} - Filter POJOs that aren't beans.</li>
+				<li><del>BeanFilter</del> - Filter POJO beans.</li>
+				<li><del>PojoSwap</del> - Filter POJOs that aren't beans.</li>
 			</ul>
 			This new API replaces the previous separate <c>Cast</c> and <c>BeanFilter</c> APIs which were considerably more complicated and puts them under a common API. 
 		</li>
@@ -29165,7 +29171,7 @@
 			JSON-schema support.
 		</li>
 		<li>
-			New {@del org.apache.juneau.utils.PojoIntrospector} class.
+			New <del>PojoIntrospector</del> class.
 		</li>
 		<li>
 			Significant REST servlet API improvements.
@@ -29274,7 +29280,7 @@
 		</li>
 		<li> 
 			Support for parsing into beans with read-only properties.<br>
-			New {@del @BeanConstructor} annotation allows you to specify bean property values to be passed in through a constructor.
+			New <del>@BeanConstructor</del> annotation allows you to specify bean property values to be passed in through a constructor.
 		</li>
 		<li> 
 			Separated the rest library into separate independent client and server libraries.<br>
@@ -29295,13 +29301,13 @@
 	<ul class='spaced-list'>
 		<li>
 			Support for parsing into read-only beans (i.e. beans with only getters, property values set through constructor args).<br>
-			To support this, the {@del @BeanConstructor} annotation has been added.
+			To support this, the <del>@BeanConstructor</del> annotation has been added.
 		</li>
 		<li>
 			Merged separate settings classes back into their base classes (simplifies the API).
 		</li>
 		<li>
-			{@del org.apache.juneau.serializer.SerializerGroup SerializerGroups} and {@del org.apache.juneau.parser.ParserGroup ParserGroups} now share {@link org.apache.juneau.BeanContext BeanContexts} to reduce memory consumption of class type metadata.	
+			<del>SerializerGroup SerializerGroups</del> and <del>ParserGroup ParserGroups</del> now share {@link org.apache.juneau.BeanContext BeanContexts} to reduce memory consumption of class type metadata.	
 		</li>	
 	</ul>
 </div>
@@ -29317,12 +29323,12 @@
 	</p>
 	<ul class='spaced-list'>
 		<li>
-			New {@del org.apache.juneau.rest.annotation.RestMethod @RestMethod} annotation on {@del org.apache.juneau.rest.RestServlet} methods.<br>
+			New <del>RestMethod @RestMethod</del> annotation on <del>RestServlet</del> methods.<br>
 			Allows the usage of URL pattern matching and automatic conversion of URL variables to arguments passed to method handlers.<br>
-			See {@del org.apache.juneau.rest.RestServlet} for more information.
+			See <del>RestServlet</del> for more information.
 		</li>
 		<li>
-			Enhancements to {@del BeanContext#convertToType(Object,Class)} to be able to convert <c>Strings</c> to classes with 
+			Enhancements to <del>BeanContext#convertToType(Object,Class)</del> to be able to convert <c>Strings</c> to classes with 
 			<c>fromString(String)</c>/<c>valueOf(String)</c> static methods or <c>T(String)</c> constructors.
 		</li>	
 	</ul>
@@ -29340,8 +29346,8 @@
 	<ul class='spaced-list'>
 		<li>New <c><ja>@RestChild</ja></c> annotation for identifying child resources.</li>
 		<li>
-			New <c>traversable</c> and <c>filterable</c> attributes added to {@del org.apache.juneau.rest.annotation.RestMethod @RestMethod} annotation.<br>
-			Eliminates the need for {@del PojoResource} and {@del FilteredRestResource} classes.
+			New <c>traversable</c> and <c>filterable</c> attributes added to <del>RestMethod @RestMethod</del> annotation.<br>
+			Eliminates the need for <del>PojoResource</del> and <del>FilteredRestResource</del> classes.
 		</li>
 		<li>Simplified client API.  Easier to use when making multiple connections to the same server.</li>
 		<li>Support for pluggable authentication in the client API.</li>
@@ -29427,22 +29433,22 @@
 			New configurable property classes for everything are now structured better and easier to locate and identify through the following new classes:
 			<ul>
 				<li>{@link org.apache.juneau.BeanContext}</li>
-				<li>{@del SerializerContext}</li>
-				<li>{@del ParserContext}</li>
+				<li><del>SerializerContext</del></li>
+				<li><del>ParserContext</del></li>
 			</ul>		
 		</li>
 		<li>
 			Enhancements to {@link org.apache.juneau.BeanContext}:
 			<ul>
 				<li>
-					Ability to mark bean properties as hidden using {@del @BeanProperty(hidden)} so that they don't get serialized.
+					Ability to mark bean properties as hidden using <del>@BeanProperty(hidden)</del> so that they don't get serialized.
 				</li>
 				<li>
 					Simplified <c>ClassType</c> {@link org.apache.juneau.ClassMeta} API.<br>
 					Combined 4 classes into a single class.
 				</li>
 				<li>
-					New {@del @Bean#filter} and {@del @BeanProperty#filter} annotations.<br>
+					New <del>@Bean#filter</del> and <del>@BeanProperty#filter</del> annotations.<br>
 					Used for defining filters on bean classes and bean properties instead of just globally through <c>BeanContext.addTransforms(Class[])</c>.
 				</li>
 				<li>
@@ -29450,13 +29456,13 @@
 					Used for customizing bean property names.
 				</li>
 				<li>
-					New {@del @BeanProperty#beanUri} and {@del @BeanProperty#id} annotations.<br>
+					New <del>@BeanProperty#beanUri</del> and <del>@BeanProperty#id</del> annotations.<br>
 					Used for associating beans with URLs and IDs.<br>
 					Used by XML serializer to add a url attribute on a bean element.<br>
 					Used by RDF/XML serializer to construct <c>rdf:resource</c> attributes.
 				</li>
 				<li>
-					New {@del BeanProperty#properties()} annotation.
+					New <del>BeanProperty#properties()</del> annotation.
 					Used for limiting properties on child elements.
 				</li>	
 			</ul>
@@ -29484,38 +29490,38 @@
 	<h5 class='topic w800'>REST server updates</h5>
 	<ul class='spaced-list'>
 			<li>
-			Support for overriding bean context and serializer properties in a REST method call through new {@del RestResponse#setProperty(String,Object)} method.<br>
+			Support for overriding bean context and serializer properties in a REST method call through new <del>RestResponse#setProperty(String,Object)</del> method.<br>
 			For example, allows you to control whitespace options on a per-request basis.
 		</li>
 		<li>
 			Several new annotations on REST servlets:
 			<ul>
-				<li>{@del @RestResource#filters} - Associate post-formatting filters on a resource level.</li>
-				<li>{@del @RestResource#guards} - Associate resource-level guards.</li>
-				<li>{@del @RestResource#messages} - Associate a resource bundle with a REST servlet.  Comes with several convenience methods for looking up messages for the client locale.</li>
-				<li>{@del @RestResource#properties} - Override default bean context, serializer, and parser properties though an annotation.</li>
+				<li><del>@RestResource#filters</del> - Associate post-formatting filters on a resource level.</li>
+				<li><del>@RestResource#guards</del> - Associate resource-level guards.</li>
+				<li><del>@RestResource#messages</del> - Associate a resource bundle with a REST servlet.  Comes with several convenience methods for looking up messages for the client locale.</li>
+				<li><del>@RestResource#properties</del> - Override default bean context, serializer, and parser properties though an annotation.</li>
 			</ul> 
 		</li>
 		<li>
 			Several new annotations on REST methods:
 			<ul>
 				<li><c>@RestMethod(filters)</c> - Associate post-formatting filters on a method level.</li>
-				<li>{@del org.apache.juneau.rest.annotation.RestMethod#guards() @RestMethod(guards)} - Associate method-level guards.</li>
+				<li><del>RestMethod#guards() @RestMethod(guards)</del> - Associate method-level guards.</li>
 			</ul>
 		</li>
 		<li>				
 			New annotations on REST method parameters with automatic conversion:
 			<ul>
-				<li>{@del @Attr} - A parameter or URL variable value as a parsed POJO.</li>
-				<li>{@del @Param} - A query parameter value as a parsed POJO.</li>
-				<li>{@del @PathRemainder}- The remainder after a URL pattern match as a String.</li>
-				<li>{@del @Header} - An HTTP header value as a parsed POJO.</li>
-				<li>{@del @Content} - The HTTP content as a parsed POJO.</li>
+				<li><del>@Attr</del> - A parameter or URL variable value as a parsed POJO.</li>
+				<li><del>@Param</del> - A query parameter value as a parsed POJO.</li>
+				<li><del>@PathRemainder</del>- The remainder after a URL pattern match as a String.</li>
+				<li><del>@Header</del> - An HTTP header value as a parsed POJO.</li>
+				<li><del>@Content</del> - The HTTP content as a parsed POJO.</li>
 				<li>{@link org.apache.juneau.rest.annotation.Method @Method} - The HTTP method name as a String.</li>
 			</ul>
 		</li>
 		<li>
-			HTTP response content POJOs can now simply be returned from methods instead of calling {@del org.apache.juneau.rest.RestResponse#setOutput(Object)}.		
+			HTTP response content POJOs can now simply be returned from methods instead of calling <del>RestResponse#setOutput(Object)</del>.		
 		</li>	
 	</ul>
 </div>
@@ -29563,18 +29569,18 @@
 		</li>
 		<li>Support for fluent-style bean setters (setters that return the bean itself).</li>
 		<li>Ability to use {@link org.apache.juneau.annotation.Bean @Bean} annotation to override bean identification settings.</li>
-		<li>New {@del org.apache.juneau.ObjectMap#cast(Class)} method to convert <c>ObjectMaps</c> directly to beans.</li>
+		<li>New <del>ObjectMap#cast(Class)</del> method to convert <c>ObjectMaps</c> directly to beans.</li>
 	</ul>
 	<h5 class='topic w800'>REST server API changes</h5>
 	<ul class='spaced-list'>
 		<li>Build-in default <c>OPTIONS</c> pages.</li>
-		<li>New {@del @RestResource#defaultRequestHeaders} and {@del @RestResource#defaultResponseHeaders} annotations.</li>
-		<li>New {@del org.apache.juneau.rest.annotation.RestMethod#serializers() @RestMethod(serializers)} and {@del org.apache.juneau.rest.annotation.RestMethod#parsers() @RestMethod(parsers)} annotations.</li>
-		<li>New {@del org.apache.juneau.rest.annotation.RestMethod#properties() @RestMethod(properties)} annotation.</li>
-		<li>New {@del @RestMethod(defaultRequestHeaders)} annotation.</li>
-		<li>New {@del org.apache.juneau.rest.annotation.RestMethod#matchers() @RestMethod(matchers)} annotation and {@link org.apache.juneau.rest.RestMatcher} class.</li>
-		<li><c>Readers</c> and <c>InputStreams</c> can be specified on {@del @Content} annotated parameters.</li>
-		<li>New {@del @HasParam} annotation.</li>
+		<li>New <del>@RestResource#defaultRequestHeaders</del> and <del>@RestResource#defaultResponseHeaders</del> annotations.</li>
+		<li>New <del>RestMethod#serializers() @RestMethod(serializers)</del> and <del>RestMethod#parsers() @RestMethod(parsers)</del> annotations.</li>
+		<li>New <del>RestMethod#properties() @RestMethod(properties)</del> annotation.</li>
+		<li>New <del>@RestMethod(defaultRequestHeaders)</del> annotation.</li>
+		<li>New <del>RestMethod#matchers() @RestMethod(matchers)</del> annotation and {@link org.apache.juneau.rest.RestMatcher} class.</li>
+		<li><c>Readers</c> and <c>InputStreams</c> can be specified on <del>@Content</del> annotated parameters.</li>
+		<li>New <del>@HasParam</del> annotation.</li>
 		<li>Full RFC2616 support for matching <c>Accept</c> headers to serializers.</li>		
 	</ul>
 	<h5 class='topic w800'>Other notes</h5>
@@ -29594,18 +29600,18 @@
 	</p>
 	<h5 class='topic w800'>Core API changes</h5>
 	<ul class='spaced-list'>
-		<li>New {@del org.apache.juneau.ObjectMap#findKeyIgnoreCase(String)} method.
+		<li>New <del>ObjectMap#findKeyIgnoreCase(String)</del> method.
 		<li>HtmlSerializer will now create 2-dimensional tables for collections of mixed beans/maps if all object have the same set of property names/keys.</li>
 	</ul>
 	<h5 class='topic w800'>REST server API changes</h5>
 	<ul class='spaced-list'>
 		<li>New <c>RestServletProperties</c> class that defines all the class-level properties that can be set on the servlet.</li>
-		<li>Properties can be set through {@del @RestResource#properties} annotation, or new {@del RestServlet#setProperty(String,Object)} method.</li>
+		<li>Properties can be set through <del>@RestResource#properties</del> annotation, or new <del>RestServlet#setProperty(String,Object)</del> method.</li>
 		<li>New <js>"?noTrace"</js> URL parameter to prevent stack traces from being logged (for JUnit testing of error conditions).</li>
 		<li>New <c>RestServletProperties.REST_useStackTraceHashes</c> property to prevent the same stack trace from being logged multiple times.</li>
 		<li>New <c>RestServletProperties.REST_renderResponseStackTraces</c> property for preventing stack traces in responses for security reasons.</li>
-		<li>New overridable <c>RestServlet.onError(HttpServletRequest,HttpServletResponse,RestException,boolean)</c> and {@del RestServlet#onSuccess(RestRequest,RestResponse,long)} methods for plugging in your own logging and peformance monitoring.</li>
-		<li>Eliminated <c>RestServlet.getInitParams()</c> method, since it's now redundant with {@del RestServlet#getProperties()}.</li>
+		<li>New overridable <c>RestServlet.onError(HttpServletRequest,HttpServletResponse,RestException,boolean)</c> and <del>RestServlet#onSuccess(RestRequest,RestResponse,long)</del> methods for plugging in your own logging and peformance monitoring.</li>
+		<li>Eliminated <c>RestServlet.getInitParams()</c> method, since it's now redundant with <del>RestServlet#getProperties()</del>.</li>
 		<li>Header parameters passed as URL parameters are now case-insensitive.</li>			
 	</ul>
 </div>
@@ -29626,10 +29632,10 @@
 			Allows parsing form posts directly to POJOs.
 		</li>
 		<li>
-			Support for <c>Accept</c> and <c>Content-Type</c> <js>"application/x-www-form-urlencoded"</js> added by default on {@del org.apache.juneau.rest.BasicRestServlet}.
+			Support for <c>Accept</c> and <c>Content-Type</c> <js>"application/x-www-form-urlencoded"</js> added by default on <del>BasicRestServlet</del>.
 		</li>
 		<li>
-			New {@del RestServlet#renderError(HttpServletRequest,HttpServletResponse,RestException)} method to allow customized handling of response errors.
+			New <del>RestServlet#renderError(HttpServletRequest,HttpServletResponse,RestException)</del> method to allow customized handling of response errors.
 		</li>
 	</ul>
 </div>
@@ -29646,7 +29652,7 @@
 	<h5 class='topic w800'>Core API changes</h5>
 	<ul class='spaced-list'>
 		<li>
-			Relaxed method naming conventions when using {@del @BeanProperty} annotation.<br>
+			Relaxed method naming conventions when using <del>@BeanProperty</del> annotation.<br>
 			Methods with zero parameters are interpreted as getters, and methods with one parameter are interpreted as setters.<br>
 			Eliminated the <c>BeanProperty.method</c> annotation, since it's now unnecessary.
 				</li>
@@ -29662,7 +29668,7 @@
 			Useful for debugging purposes.
 		</li>
 		<li>
-			<c>Readers</c> and <c>InputStreams</c> can now be passed in as {@del @Content} parameters if you need direct access to the HTTP body content without involving the parsers.<br> 
+			<c>Readers</c> and <c>InputStreams</c> can now be passed in as <del>@Content</del> parameters if you need direct access to the HTTP body content without involving the parsers.<br> 
 			Equivalent to previously calling {@link org.apache.juneau.rest.RestRequest#getInputStream()} and {@link org.apache.juneau.rest.RestRequest#getReader()}.
 		</li>
 		<li>
@@ -29694,10 +29700,10 @@
 			New <c>SerializerContext.SERIALIZER_uriContext</c> and <c>SerializerContext.SERIALIZER_uriAuthority</c> serializer properties for specifying values for relative URIs.
 		</li>
 		<li>
-			New {@del org.apache.juneau.annotation.URI @URI} annotation that allows you to specify classes and bean properties as URLs that aren't <c>java.net.URI</c> or <c>java.net.URL</c>.
+			New <del>URI @URI</del> annotation that allows you to specify classes and bean properties as URLs that aren't <c>java.net.URI</c> or <c>java.net.URL</c>.
 		</li>
 		<li>
-			New {@del org.apache.juneau.html.HtmlSerializer#HTML_uriAnchorText} HTML serializer property for tailoring how anchor text is rendered.
+			New <del>HtmlSerializer#HTML_uriAnchorText</del> HTML serializer property for tailoring how anchor text is rendered.
 		</li>
 		<li>
 			Renamed <c>BeanProperty#uri</c> annotation to <c>BeanProperty#beanUri</c> to make it clear that this property represents the URI of the bean itself instead of an arbitrary property containing a URI.
@@ -29709,7 +29715,7 @@
 	<h5 class='topic w800'>REST server API changes</h5>
 	<ul class='spaced-list'>
 		<li>
-			Improvements to {@del org.apache.juneau.rest.RestServlet} to automatically handle relative URIs in POJOs.
+			Improvements to <del>RestServlet</del> to automatically handle relative URIs in POJOs.
 			<ul>
 				<li><c>SerializerContext.SERIALIZER_uriContext</c> property set by default to web app context root.</li>
 				<li><c>SerializerContext.SERIALIZER_uriAuthority</c> property set by default to the request scheme+hostname+port.</li>
@@ -29733,7 +29739,7 @@
 	</p>
 	<p>
 		The biggest change is that the <c>RestSerializer</c>, <c>RestParser</c>, <c>RestSerializerGroup</c>, and <c>RestParserGroup</c> classes have been eliminated entirely.<br>  
-		Instead, the existing {@link org.apache.juneau.serializer.Serializer}, {@link org.apache.juneau.parser.Parser}, {@del org.apache.juneau.serializer.SerializerGroup}, and {@del org.apache.juneau.parser.ParserGroup} classes of the core API have been augmented to replace them.
+		Instead, the existing {@link org.apache.juneau.serializer.Serializer}, {@link org.apache.juneau.parser.Parser}, <del>SerializerGroup</del>, and <del>ParserGroup</del> classes of the core API have been augmented to replace them.
 	</p>
 	<p>
 		Adoptions will be required if you have previously used these classes.
@@ -29746,7 +29752,7 @@
 				<li>Entirely reworked class hierarchy to make it easier to define new serializers.</li>
 				<li>New {@link org.apache.juneau.serializer.WriterSerializer} base class for defining character-based serializers.</li>
 				<li>New {@link org.apache.juneau.serializer.OutputStreamSerializer} base class for defining byte-based serializers.</li>
-				<li>Updated {@del org.apache.juneau.serializer.SerializerGroup} class with full support for RFC2616 <c>Accept-Content</c> headers.</li>
+				<li>Updated <del>SerializerGroup</del> class with full support for RFC2616 <c>Accept-Content</c> headers.</li>
 				<li>Improved cloning support on serializers and serializer groups.</li>
 			</ul>
 	       	</li>
@@ -29763,7 +29769,7 @@
 			New <c>org.apache.juneau.swap</c> package.
 			<ul>
 				<li>Cleaner class structure.</li>
-				<li>Improved {@del org.apache.juneau.transform.BeanFilter} class for defining property filters on beans.</li>
+				<li>Improved <del>BeanFilter</del> class for defining property filters on beans.</li>
 				<li>Improved {@link org.apache.juneau.utils.PojoQuery} class for defining filters on objects (previously called <c>ObjectFilter</c>).</li>
 	       		</ul>
 	       	</li>
@@ -29773,7 +29779,7 @@
 				<li>Defines API for {@link org.apache.juneau.encoders.Encoder Encoders} for enabling compression in REST servlets and clients.</li>
 				<li>Previously, gzip compression was enabled by default.  This new API allows you to plug in your own compression algorithms.</li>
 				<li>New {@link org.apache.juneau.encoders.GzipEncoder} class for enabling gzip compression.</li>
-				<li>New {@del org.apache.juneau.encoders.EncoderGroup} class for managing multiple encoders and finding them based on RFC2616 <c>Accept-Encoding</c> header values.</li>
+				<li>New <del>EncoderGroup</del> class for managing multiple encoders and finding them based on RFC2616 <c>Accept-Encoding</c> header values.</li>
 			</ul>
 		</li>
 		<li>
@@ -29785,7 +29791,7 @@
 		<li>
 			New <c>org.apache.juneau.jso</c> package.
 			<ul>
-				<li>New {@del org.apache.juneau.jso.JsoSerializer} class for serializing <c>application/x-java-serialized-object</c> content.</li>
+				<li>New <del>JsoSerializer</del> class for serializing <c>application/x-java-serialized-object</c> content.</li>
 			</ul>
 		</li>
 		<li>
@@ -29801,7 +29807,7 @@
 			</ul>
 		</li>
 	       	<li>
-			<c>JsonMap</c> and <c>JsonList</c> changed to {@del org.apache.juneau.ObjectMap} and {@del org.apache.juneau.ObjectList} to better reflect that they're not limited to just JSON support.
+			<c>JsonMap</c> and <c>JsonList</c> changed to <del>ObjectMap</del> and <del>ObjectList</del> to better reflect that they're not limited to just JSON support.
 	   		</li>
 	   		<li>
 			Renamed <c>PojoSwap</c> to {@link org.apache.juneau.utils.PojoQuery} to not confuse it with the new Filter API.
@@ -29843,14 +29849,14 @@
 	<ul class='spaced-list'>
 		<li>		
 			Juno-Wink integration components that have been requested by many for a long time!<br>
-			Refer to {@del org.apache.juneau.rest.jaxrs} for information.
+			Refer to <del>jaxrs</del> for information.
 		</li>
 		<li>
-			New {@del @Produces} annotation in place of <c>ISerializer.getMediaTypes()</c> for specifying what media types a serializer produces.<br>
+			New <del>@Produces</del> annotation in place of <c>ISerializer.getMediaTypes()</c> for specifying what media types a serializer produces.<br>
 			Available when subclassing from {@link org.apache.juneau.serializer.Serializer}.
 		</li>
 		<li>
-			New {@del @Consumes} annotation in place of <c>IParser.getMediaTypes()</c> for specifying what media types a parser consumes.<br>
+			New <del>@Consumes</del> annotation in place of <c>IParser.getMediaTypes()</c> for specifying what media types a parser consumes.<br>
 			Available when subclassing from {@link org.apache.juneau.parser.Parser}.
 		</li>
 	</ul>
@@ -29867,7 +29873,7 @@
 	</p>
 	<ul class='spaced-list'>
 		<li>
-			New {@del @Properties} REST method parameter annotation that can be used to get the runtime properties map through a parameter instead of through {@link org.apache.juneau.rest.RestResponse}. 
+			New <del>@Properties</del> REST method parameter annotation that can be used to get the runtime properties map through a parameter instead of through {@link org.apache.juneau.rest.RestResponse}. 
 		</li>
 	</ul>
 </div>
@@ -29912,7 +29918,7 @@
 	<h5 class='topic w800'>Other changes</h5>
 	<ul class='spaced-list'>
 		<li>
-			New {@del org.apache.juneau.jso.JsoParser} class.  
+			New <del>JsoParser</del> class.  
 		</li>
 	</ul>
 </div>
@@ -29928,14 +29934,14 @@
 	</p>
 	<ul class='spaced-list'>
 		<li>
-			New methods on {@del org.apache.juneau.rest.RestServlet}:
+			New methods on <del>RestServlet</del>:
 			<ul>
-				<li>{@del RestServlet#onPreCall(RestRequest)}</li>
-				<li>{@del RestServlet#onPostCall(RestRequest,RestResponse)}</li>
+				<li><del>RestServlet#onPreCall(RestRequest)</del></li>
+				<li><del>RestServlet#onPostCall(RestRequest,RestResponse)</del></li>
 			</ul>
 		</li>
 		<li>
-			<jsf>TRIM_NULLS</jsf> setting changed to {@del SerializerContext#SERIALIZER_trimNullProperties}.<br>
+			<jsf>TRIM_NULLS</jsf> setting changed to <del>SerializerContext#SERIALIZER_trimNullProperties</del>.<br>
 			New property default is <jk>true</jk>. 
 			Only applies to bean properties, not map or collection entries.
 		</li>
@@ -29961,8 +29967,8 @@
 			New Jena-based {@link org.apache.juneau.jena.RdfParser} for parsing RDF/XML, RDF/XML-ABBREV, N3, Turtle, and N-Triple back into POJOs.
 		</li>
 		<li>
-			{@del XmlSerializerContext#XML_autoDetectNamespaces} default changed to <jk>true</jk>.<br>
-			The old default value would cause XML with unmapped namespaces if you didn't manually specify them via the {@del XmlSerializerContext#XML_namespaces} annotation.<br>
+			<del>XmlSerializerContext#XML_autoDetectNamespaces</del> default changed to <jk>true</jk>.<br>
+			The old default value would cause XML with unmapped namespaces if you didn't manually specify them via the <del>XmlSerializerContext#XML_namespaces</del> annotation.<br>
 			While setting the default to <jk>true</jk> is somewhat slower (since the serializer must crawl the POJO tree to find namespaces), the benefits of having it work out-of-the-box outweighs the performance concerns.<br>
 			For developers concerned about performance, they can always change it back to false and specify the namespaces themselves.	
 		</li>
@@ -29970,32 +29976,32 @@
 	<h5 class='topic w800'>REST server API changes</h5>
 	<ul class='spaced-list'>
 		<li>
-			Allow inheritance of {@del @RestResource} annotation.<br>
+			Allow inheritance of <del>@RestResource</del> annotation.<br>
 			Serializers, parsers, filters, properties , guards, and converters definitions are automatically inherited from parent classes and interfaces.
 		</li>
 		<li>
-			Enhancements to {@del org.apache.juneau.rest.annotation.RestMethod @RestMethod} annotation:
+			Enhancements to <del>RestMethod @RestMethod</del> annotation:
 			<ul>
 				<li>
 					New <c>RestMethod.filters()</c> annotation for defining POJO filters at the method level.
 				</li>
 				<li>
-					New {@del RestMethod#serializersInherit()} and {@del RestMethod#parsersInherit()} annotations for controlling how serializers and parsers (and associated filters and properties) are inherited from the class.<br>
+					New <del>RestMethod#serializersInherit()</del> and <del>RestMethod#parsersInherit()</del> annotations for controlling how serializers and parsers (and associated filters and properties) are inherited from the class.<br>
 					This replaces the previous <c>addSerializers</c> and <c>addParsers</c> annotations.
 			</ul>
 		</li>
 		<li>
-			New {@del RestServletJenaDefault} servlet that includes serialization/parsing support for all Jena-based serializers and parsers.
+			New <del>RestServletJenaDefault</del> servlet that includes serialization/parsing support for all Jena-based serializers and parsers.
 		</li>
 		<li>
-			New {@del DefaultJenaProvider} JAX-RS provider that includes serialization/parsing support for all Jena-based serializers and parsers.
+			New <del>DefaultJenaProvider</del> JAX-RS provider that includes serialization/parsing support for all Jena-based serializers and parsers.
 		</li>
 		<li>
 			Eliminated <c>RestServletChild</c> class.<br>  
 			It's redundant with the introduction of inheritable annotations.
 		</li>
 		<li>
-			New methods on {@del org.apache.juneau.rest.RestServlet}:
+			New methods on <del>RestServlet</del>:
 			<ul>
 				<li><c>RestServlet.createConfigFactory()</c></li>
 				<li><c>RestServlet.createSerializers()</c></li>
@@ -30024,10 +30030,10 @@
 	<h5 class='topic w800'>Core API changes</h5>
 	<ul class='spaced-list'>
 		<li>
-			New {@del HtmlDocSerializerContext#HTMLDOC_navlinks} annotation for addint links to HTML page views.
+			New <del>HtmlDocSerializerContext#HTMLDOC_navlinks</del> annotation for addint links to HTML page views.
 		</li>
 		<li>
-			Renamed the properties in {@del HtmlDocSerializerContext} for clarity.
+			Renamed the properties in <del>HtmlDocSerializerContext</del> for clarity.
 		</li>
 	</ul>		
 	<h5 class='topic w800'>Servlet API changes</h5>
@@ -30045,7 +30051,7 @@
 			</ul>
 		</li>
 		<li>
-			Path variables annotated with {@del @Attr} are now automatically URL-decoded.
+			Path variables annotated with <del>@Attr</del> are now automatically URL-decoded.
 		</li>
 	</ul>		
 </div>
@@ -30084,7 +30090,7 @@
 	</p>
 	<ul class='spaced-list'>
 		<li>
-			Simplified {@del org.apache.juneau.dto.cognos Cognos} support.
+			Simplified <del>cognos Cognos</del> support.
 		</li>
 		<li>
 			Fixed bug where <c><ja>@Xml</ja></c> annotation was not being inherited by inner classes.
@@ -30113,11 +30119,11 @@
 			</ul>
 		</li>
 		<li>
-			New {@del XmlFormat#CONTENT} enum value.<br>
+			New <del>XmlFormat#CONTENT</del> enum value.<br>
 			Allows bean properties to be persisted as XML element text.
 		</li>
 		<li>
-			New {@del XmlContentHandler} class and {@del @Xml#contentHandler} annotation.<br>
+			New <del>XmlContentHandler</del> class and <del>@Xml#contentHandler</del> annotation.<br>
 			Allows customized serialization and parsing of beans to XML element text.<br>
 			Added for support of ATOM text content that must support both plain text and embedded XHTML.
 		</li>
@@ -30128,13 +30134,13 @@
 			Removed <c><ja>@Xml</ja>.valAttr</c> annotation since it's now redundant with <c><ja>@Xml</ja>(format=<jsf>CONTENT</jsf>)</c>.
 			</li>
 			<li>
-			Fixed timezone bug in {@del org.apache.juneau.transforms.CalendarSwap}.
+			Fixed timezone bug in <del>CalendarSwap</del>.
 		</li>
 			<li>
 			Simplified <c>Serializer.serialize(Object,Object,SerializerContext)</c> method.
 		</li>
 		<li>
-			Fixed bug where lists returned by {@del org.apache.juneau.ObjectMap#getObjectList(String)} were not updatable.
+			Fixed bug where lists returned by <del>ObjectMap#getObjectList(String)</del> were not updatable.
 		</li>
 		<li>
 			Eliminated old RDF/XML serializer.
@@ -30196,14 +30202,14 @@
 		</li>
 		<li>
 			Changed the way child REST resources are defined.<br>
-			Eliminated the <ja>@RestChild</ja> annotation on getter methods and replaced it with {@del @RestResource(children)} defined on the resource class itself.<br>
-			Child resource paths are specified through {@del @RestResource(path)}.
+			Eliminated the <ja>@RestChild</ja> annotation on getter methods and replaced it with <del>@RestResource(children)</del> defined on the resource class itself.<br>
+			Child resource paths are specified through <del>@RestResource(path)</del>.
 		</li>
 		<li>
-			New {@del ChildResourceDescriptions} bean for automatically generating the contents of router resource pages.
+			New <del>ChildResourceDescriptions</del> bean for automatically generating the contents of router resource pages.
 		</li>
 		<li>
-			Changed <c><ja>@RestMethod</ja>.pattern()</c> to {@del org.apache.juneau.rest.annotation.RestMethod#path() @RestMethod(path)} for naming consistency.
+			Changed <c><ja>@RestMethod</ja>.pattern()</c> to <del>RestMethod#path() @RestMethod(path)</del> for naming consistency.
 		</li>
 	</ul>
 </div>
@@ -30222,10 +30228,10 @@
 			Fixed some HTML formatting issues in {@link org.apache.juneau.html.HtmlSerializer}.
 		</li>
 		<li>
-	  			{@del org.apache.juneau.rest.BasicRestServlet} now includes {@link org.apache.juneau.plaintext.PlainTextSerializer} and {@link org.apache.juneau.plaintext.PlainTextParser} for plain-text support.
+	  			<del>BasicRestServlet</del> now includes {@link org.apache.juneau.plaintext.PlainTextSerializer} and {@link org.apache.juneau.plaintext.PlainTextParser} for plain-text support.
 	  		</li>
 	  		<li>
-			Child resources now render on default <c>OPTIONS</c> pages through new method {@del ResourceOptions#getChildren()}.
+			Child resources now render on default <c>OPTIONS</c> pages through new method <del>ResourceOptions#getChildren()</del>.
 		</li>
 		<li>
 			Changes to {@link org.apache.juneau.urlencoding.UrlEncodingSerializer}/{@link org.apache.juneau.urlencoding.UrlEncodingParser} to reduce the need for quoted string values.<br>
@@ -30270,9 +30276,9 @@
 		<li>
 			Revamped the API for filter support:
 			<ul>
-				<li>Updated {@del org.apache.juneau.transform.BeanFilter} class to mirror the {@link org.apache.juneau.annotation.Bean @Bean} annotation.</li>
-				<li>Introduced support for bean {@del Bean#subTypeProperty() subtypes}. </li>
-				<li>Replaced <c><ja>@Bean</ja>(filter=xxx)</c> with new {@del @Transform} annotation.</li>
+				<li>Updated <del>BeanFilter</del> class to mirror the {@link org.apache.juneau.annotation.Bean @Bean} annotation.</li>
+				<li>Introduced support for bean <del>Bean#subTypeProperty() subtypes</del>. </li>
+				<li>Replaced <c><ja>@Bean</ja>(filter=xxx)</c> with new <del>@Transform</del> annotation.</li>
 			</ul>
 		</li>
 		<li>
@@ -30308,7 +30314,7 @@
 	</p>
 	<ul class='spaced-list'>
 		<li> 
-			Fixed bug involving beans using {@del Bean#subTypes()} annotation in addition to <c>subTypes</c> property.
+			Fixed bug involving beans using <del>Bean#subTypes()</del> annotation in addition to <c>subTypes</c> property.
 		</li>
 		<li>
 			Modified the JSON parser to handle non-existent JSON values to get around an issue where Cognos was generating invalid JSON.
@@ -30332,7 +30338,7 @@
 			The new class hierarchy is much simpler to understand.
 		</li>
 		<li>
-			Added {@del org.apache.juneau.transforms.XMLGregorianCalendarSwap} to convert these to ISO8601 strings during serialization, and vice versa during parsing.
+			Added <del>XMLGregorianCalendarSwap</del> to convert these to ISO8601 strings during serialization, and vice versa during parsing.
 		</li>
 		<li>
 			Added a strict mode to {@link org.apache.juneau.json.JsonParser}.
@@ -30355,7 +30361,7 @@
 	<ul class='spaced-list'>
 		<li>
 			New support for generating and consuming fully-compliant JSON-Schema documents.<br>
-			See {@del org.apache.juneau.dto.jsonschema} for information.
+			See <del>jsonschema</del> for information.
 		</li>
 		<li>
 			New methods added to {@link org.apache.juneau.parser.Parser}:
@@ -30373,7 +30379,7 @@
 			Used for JSON-Schema support to allow {@link org.apache.juneau.dto.jsonschema.JsonType} enum to be serialized to lowercase per the specification (e.g. <js>"string"</js> instead of <js>"STRING"</js>).
 			</li>
 			<li>
-			{@del org.apache.juneau.dto.cognos Cognos} DTOs now have fluent-style bean setters.
+			<del>cognos Cognos</del> DTOs now have fluent-style bean setters.
 			</li>
 			<li>
 			Support for generic bean objects whose type was erased at compile time.<br> 
@@ -30423,14 +30429,14 @@
 		<li>
 			New settings in BeanContext.  These can be applied to all serializers/parsers.
 			<ul>
-				<li>{@del BEAN_ignoreInvocationExceptionsOnGetters}
-				<li>{@del BEAN_ignoreInvocationExceptionsOnSetters}
-				<li>{@del BEAN_notBeanPackages_add}
-				<li>{@del BEAN_notBeanPackages_remove}
+				<li><del>BEAN_ignoreInvocationExceptionsOnGetters</del>
+				<li><del>BEAN_ignoreInvocationExceptionsOnSetters</del>
+				<li><del>BEAN_notBeanPackages_add</del>
+				<li><del>BEAN_notBeanPackages_remove</del>
 			</ul>
 		</li>
 		<li>
-			Eliminated <c>addNotBeanClassPatterns(String...)</c> methods throughout API since these are now controlled by {@del BEAN_notBeanPackages_add} / {@del BEAN_notBeanPackages_remove} properties.
+			Eliminated <c>addNotBeanClassPatterns(String...)</c> methods throughout API since these are now controlled by <del>BEAN_notBeanPackages_add</del> / <del>BEAN_notBeanPackages_remove</del> properties.
 		</li>
 		<li>
 			New settings in <c>RestServletProperties</c>.
@@ -30449,7 +30455,7 @@
 			While the old behavior was as-designed, the new behavior is more in-line with expected behavior.
 		</li>
 		<li>
-			Added support for HTTP header <js>"X-Response-Headers"</js> to {@del org.apache.juneau.rest.RestServlet}. <br>
+			Added support for HTTP header <js>"X-Response-Headers"</js> to <del>RestServlet</del>. <br>
 			Allows you to specify one or more headers that should be returned on the response from the servlet.<br>
 			For example, to get a page to automatically refresh every 1 second, you can append the following to a URL:  <c>?x-response-headers={Refresh=1}</c>
 		</li>
@@ -30498,9 +30504,9 @@
 		<li>
 			New methods on {@link org.apache.juneau.rest.RestRequest}:
 			<ul>
-				<li>{@del RestRequest#getVarResolver()}</li>
-				<li>{@del RestRequest#getServletURI()}</li>
-				<li>{@del RestRequest#getRequestParentURI()}</li>
+				<li><del>RestRequest#getVarResolver()</del></li>
+				<li><del>RestRequest#getServletURI()</del></li>
+				<li><del>RestRequest#getRequestParentURI()</del></li>
 			</ul>
 		</li>
 		<li>
@@ -30510,22 +30516,22 @@
 			</ul>
 		</li>
 		<li>
-			New methods on {@del org.apache.juneau.rest.RestServlet} that allow easier customization by subclasses:
+			New methods on <del>RestServlet</del> that allow easier customization by subclasses:
 			<ul>
-				<li>{@del RestServlet#createConfigFactory()}</li>
-				<li>{@del RestServlet#createConverters()}</li>
-				<li>{@del RestServlet#createDefaultRequestHeaders()}</li>
-				<li>{@del RestServlet#createDefaultResponseHeaders()}</li>
-				<li>{@del RestServlet#createEncoders()}</li>
-				<li>{@del RestServlet#createFilters()}</li>
-				<li>{@del RestServlet#createGuards()}</li>
-				<li>{@del RestServlet#createMimetypesFileTypeMap()}</li>
-				<li>{@del RestServlet#createParsers()}</li>
-				<li>{@del RestServlet#createProperties()}</li>
-				<li>{@del RestServlet#createRequestProperties(ObjectMap,RestRequest)}</li>
-				<li>{@del RestServlet#createRequestVarResolver(RestRequest)}</li>
-				<li>{@del RestServlet#createSerializers()}</li>
-				<li>{@del RestServlet#createUrlEncodingParser()}</li>
+				<li><del>RestServlet#createConfigFactory()</del></li>
+				<li><del>RestServlet#createConverters()</del></li>
+				<li><del>RestServlet#createDefaultRequestHeaders()</del></li>
+				<li><del>RestServlet#createDefaultResponseHeaders()</del></li>
+				<li><del>RestServlet#createEncoders()</del></li>
+				<li><del>RestServlet#createFilters()</del></li>
+				<li><del>RestServlet#createGuards()</del></li>
+				<li><del>RestServlet#createMimetypesFileTypeMap()</del></li>
+				<li><del>RestServlet#createParsers()</del></li>
+				<li><del>RestServlet#createProperties()</del></li>
+				<li><del>RestServlet#createRequestProperties(ObjectMap,RestRequest)</del></li>
+				<li><del>RestServlet#createRequestVarResolver(RestRequest)</del></li>
+				<li><del>RestServlet#createSerializers()</del></li>
+				<li><del>RestServlet#createUrlEncodingParser()</del></li>
 			</ul>
 		</li>
 		<li>
@@ -30543,7 +30549,7 @@
 			New {@link org.apache.juneau.annotation.Bean#stopClass @Bean.stopClass} annotation for specifying stop classes for bean properties.
 		</li>
 		<li>
-			New {@del BeanFilter#setStopClass(Class)} which is the program equivalent to the annotation above.
+			New <del>BeanFilter#setStopClass(Class)</del> which is the program equivalent to the annotation above.
 		</li>
 		<li>
 			New methods on {@link org.apache.juneau.dto.ResultSetList}:
@@ -30564,7 +30570,7 @@
 		Juno 5.0.0.35 is a minor update.
 	</p>
 	<ul class='spaced-list'>
-		<li>{@del org.apache.juneau.rest.RestGuard#guard(RestRequest,RestResponse)} now returns a boolean to allow redirects to login pages.
+		<li><del>RestGuard#guard(RestRequest,RestResponse)</del> now returns a boolean to allow redirects to login pages.
 		<li>Fixed bug in RestServlet where occasional false positive "duplicate method with same name and path" errors were occurring.
 	</ul>	
 </div>
@@ -30580,12 +30586,12 @@
 	</p>
 	<ul class='spaced-list'>
 		<li>Implemented <c>org.apache.juneau.urlencoding.UrlEncodingParser.parseArgs(Reader,int,ClassMeta[])</c>.
-		<li><c>name</c> parameter of {@del ResourceDescription#ResourceDescription(String,String,String)}. 
+		<li><c>name</c> parameter of <del>ResourceDescription#ResourceDescription(String,String,String)</del>. 
 			is now automatically URL-encoded so that the name can contain special characters (e.g. <js>"foo/bar(baz)"</js>).
 		<li>Support for URL-matching and path info containing encoded characters (e.g. <js>'/'</js>) now supported.	
 		<li>Removed some lazy-initialization of bean information in {@link org.apache.juneau.ClassMeta} that allowed the removal of
 			some synchronized blocks.
-		<li>Improved support of {@del BeanContext#getClassMetaFromString(String)}.
+		<li>Improved support of <del>BeanContext#getClassMetaFromString(String)</del>.
 			Now supports primitive arrays such as <js>"long[]"</js> in addition to the previous support for the equivalent <js>"[J"</js>.
 		<li>Various new convenience methods added to {@link org.apache.juneau.internal.StringUtils} and {@link org.apache.juneau.internal.ClassUtils}.
 	</ul>	
@@ -30606,12 +30612,12 @@
 			The new client API is simply a thin layer on top of <c>HttpClient</c> that performs 
 			serialization and parsing using Juno parsers but leaves all the details of the HTTP connection
 			to the Apache code. <br>
-			See the {@del org.apache.juneau.rest.client} package for details.
+			See the <del>client</del> package for details.
 		<li>New <c>org.apache.juneau.rest.client.jazz</c> package and <c>org.apache.juneau.rest.client.jazz.JazzRestClient</c> class
 			for performing REST operations against Jazz servers.<br>
 			Includes improved support for FORM authentication, and better SSL certificate validation.
 		<li>Completely redesigned URL-Encoding support.<br>
-			See {@del org.apache.juneau.urlencoding} package for details. 
+			See <del>urlencoding</del> package for details. 
 		<li>Changes to Parser API.
 		<ul>
 			<li>Removal of <c>ExtendedReaderParser</c> abstract class and moved methods into 
@@ -30629,20 +30635,20 @@
 	<h5 class='topic w800'>Other changes</h5>
 	<ul class='spaced-list'>
 		<li>Various new methods added to {@link org.apache.juneau.internal.StringUtils} and {@link org.apache.juneau.internal.ClassUtils}.
-		<li>Improved support on {@del BeanContext#getClassMetaFromString(String)}.<br>
+		<li>Improved support on <del>BeanContext#getClassMetaFromString(String)</del>.<br>
 			Now supports resolving <c>"long[]"</c>, and so forth.
-		<li>{@del ResourceDescription} name parameter is now automatically URL-encoded in links.
+		<li><del>ResourceDescription</del> name parameter is now automatically URL-encoded in links.
 		<li>{@link org.apache.juneau.rest.RestRequest} now correctly handles cases involving URL-encoded characters in the 
 			path info portion of URLs (e.g. <c>http://host/contextRoot/foo%2Fbar</c>).
 		<li>Removed lazy-initialization that required locking in {@link org.apache.juneau.ClassMeta}.  
 		<li>New <c>BeanContext.setDefaultParser(ReaderParser)</c> method added for specifying 
 			a default parser to use in a bean context (used when converting beans to <c>Strings</c> using 
-			{@del BeanContext#convertToType(Object,Class)}.
+			<del>BeanContext#convertToType(Object,Class)</del>.
 			Old behavior simply used the default JSON serializer in these cases.
 		<li>More consistent handling of exceptions across all parsers.
 		<li>Minor changes to {@link org.apache.juneau.rest.RestRequest} class.
 		<ul>
-			<li>Changed the order of parameters on {@del RestRequest#getParameter(String,Class)}.
+			<li>Changed the order of parameters on <del>RestRequest#getParameter(String,Class)</del>.
 			<li>Added <c>RestRequest.getMapParameter(String,Class,Class,Class)</c> and 
 				<c>RestRequest.getCollectionParameter(String,Class,Class)}</c> methods.
 		</ul>
@@ -30667,7 +30673,7 @@
 		<li>Fixed bug involving incorrect resolution of overlapping URL match patterns.
 		<li>Overall improvements in HTTP request parameter and header value resolution.  
 		<li>Made workspace changes so as not to be dependent on the WAS test environment being loaded.
-		<li>Renamed <ja>@Remainder</ja> annotation to {@del @PathRemainder}.
+		<li>Renamed <ja>@Remainder</ja> annotation to <del>@PathRemainder</del>.
 		<li>Fixed bug involving incorrect calculation of <c>pathInfo</c> on child resources.
 	</ul>	
 </div>
@@ -30704,29 +30710,29 @@
 	<ul class='spaced-list'>
 		<li>Ability to detect and use non-public bean classes, getters/setters, and fields using the following new properties:
 			<ul>
-				<li>{@del org.apache.juneau.BeanContext#BEAN_beanConstructorVisibility} - Control which bean constructors are visible to Juno.
-				<li>{@del org.apache.juneau.BeanContext#BEAN_beanClassVisibility} - Control which bean classes are interpreted as beans to Juno.
-				<li>{@del org.apache.juneau.BeanContext#BEAN_beanFieldVisibility} - Control which fields are visible to Juno as bean properties.
-				<li>{@del org.apache.juneau.BeanContext#BEAN_beanMethodVisibility} - Control which getters/setters are visible to Juno as bean properties.
+				<li><del>BeanContext#BEAN_beanConstructorVisibility</del> - Control which bean constructors are visible to Juno.
+				<li><del>BeanContext#BEAN_beanClassVisibility</del> - Control which bean classes are interpreted as beans to Juno.
+				<li><del>BeanContext#BEAN_beanFieldVisibility</del> - Control which fields are visible to Juno as bean properties.
+				<li><del>BeanContext#BEAN_beanMethodVisibility</del> - Control which getters/setters are visible to Juno as bean properties.
 			</ul>
 			Removed <c>BeanContext.<jsf>INCLUDE_BEAN_FIELD_PROPERTIES</jsf></c> and <c>BeanContext.<jsf>INCLUDE_BEAN_METHOD_PROPERTIES</jsf></c> properties, since ignoring fields and methods
 			can be accomplished by setting the appropriate properties above to {@link org.apache.juneau.Visibility#NONE NONE}.
-			Also, the {@del @BeanProperty} annotation can now be used on non-public fields/getters/setters to override
+			Also, the <del>@BeanProperty</del> annotation can now be used on non-public fields/getters/setters to override
 			the default behavior defined by the <c>VISIBILITY</c> properties identified above.  This is a convenient way of identifying protected or
 			private fields or methods as bean properties.  Previously, you could only identify public fields/getters/setters using this annotation.
 		</li>
-		<li>New {@del org.apache.juneau.BeanContext#BEAN_useJavaBeanIntrospector} property that lets Juno use the Java bean <c>Introspector</c>
+		<li>New <del>BeanContext#BEAN_useJavaBeanIntrospector</del> property that lets Juno use the Java bean <c>Introspector</c>
 			class to determine bean properties.  In the previous release, the method for determining bean properties was a mixture of Juno-based and Introspector-based.
 			Now it's either pure Juno-based or pure Introspector-based.  The result is considerably cleaner code and consistent behavior.
-		<li>New {@link org.apache.juneau.annotation.BeanIgnore @BeanIgnore} annotation.  Replaces the previous {@del @BeanProperty(hidden=true)} annotation
+		<li>New {@link org.apache.juneau.annotation.BeanIgnore @BeanIgnore} annotation.  Replaces the previous <del>@BeanProperty(hidden=true)</del> annotation
 			for ignoring bean properties.  Can also be used on classes that look like beans so that they're not treated as beans.
 		<li>Support for parsing into non-static member classes.  This applies to all parsers.
 		<li>New {@link org.apache.juneau.json.annotation.Json#wrapperAttr() @Json(wrapperAttr)}	annotation that automatically wraps beans and objects in a wrapper
 			attribute when serializing to or parsing from JSON.
 		<li>Changed the default ordering of bean properties to be in parent-to-child class order.
-		<li>New {@del org.apache.juneau.transform.BeanFilter#readProperty(Object,String,Object) readProperty()} and {@del org.apache.juneau.transform.BeanFilter#writeProperty(Object,String,Object) writeProperty()}
-			methods added to {@del org.apache.juneau.transform.BeanFilter} class to allow individualized serialization and parsing behavior on a class-by-class basis.
-		<li>Eliminated previous restriction where bean subtype attributes had to be listed first in JSON objects when using the {@del Bean#subTypeProperty()} annotation.
+		<li>New <del>BeanFilter#readProperty(Object,String,Object) readProperty()</del> and <del>BeanFilter#writeProperty(Object,String,Object) writeProperty()</del>
+			methods added to <del>BeanFilter</del> class to allow individualized serialization and parsing behavior on a class-by-class basis.
+		<li>Eliminated previous restriction where bean subtype attributes had to be listed first in JSON objects when using the <del>Bean#subTypeProperty()</del> annotation.
 			The previous behavior was not strictly JSON-compliant since JSON objects are supposed to consist of unordered lists of key/value pairs.
 			While targeted for JSON, the restriction is also lifted for all other parsers.  	
 		<li>New fluent-style {@link org.apache.juneau.BeanMap#load(String) BeanMap.load()} methods for initializing bean maps.
@@ -30735,8 +30741,8 @@
 	
 	<h5 class='topic w800'>REST Server API updates</h5>
 	<ul class='spaced-list'>
-		<li>New {@del RestRequest#getJavaMethod()} method for getting access to the method used to handle a request.
-			Useful for accessing the method name or annotations during requests, such as in calls to {@del org.apache.juneau.rest.RestGuard#guard(RestRequest,RestResponse)}.
+		<li>New <del>RestRequest#getJavaMethod()</del> method for getting access to the method used to handle a request.
+			Useful for accessing the method name or annotations during requests, such as in calls to <del>RestGuard#guard(RestRequest,RestResponse)</del>.
 		<li>Fixed bug when using Jetty where you tried to read text input after a header was written.
 		<li>Added new string variables <dc>$A{...}</dc> (request attributes) and <dc>$P{...}</dc> (request parameters) to <c>RestServlet.createRequestVarResolver(RestRequest)</c>.
 	</ul>
@@ -30753,7 +30759,7 @@
 	</p>
 	
 	<ul class='spaced-list'>
-		<li>New {@del RestServlet#getPath()} method.
+		<li>New <del>RestServlet#getPath()</del> method.
 		<li>New <c>SerializerContext.getJavaMethod()</c> and <c>ParserContext.getJavaMethod()</c>
 				to allow access to REST methods that invoked the serializers or parsers.
 			For example, can be used to access additional annotations on REST methods to perform special handing
@@ -30761,7 +30767,7 @@
 		<li>Better behavior on overriding of filters in <c>BeanContext.addTransforms(Class[])</c>.
 			Previously, adding multiple conflicting filters resulted in random behavior.  
 			Now filters are overridden when multiple matching filters are applied.
-		<li>Allow {@del HtmlDocSerializerContext} properties to be set via {@del Serializer#setProperty(String,Object)}.
+		<li>Allow <del>HtmlDocSerializerContext</del> properties to be set via <del>Serializer#setProperty(String,Object)</del>.
 			Previously, these could only be defined through override properties (e.g. through REST class and method annotations).
 		<li>Fixed memory leak in XML parser.	
 	</ul>
@@ -30777,20 +30783,20 @@
 		Juno 5.1.0.5 is a moderate update.
 	</p>
 	<ul class='spaced-list'>
-		<li>New {@del Redirect} class that simplifies performing redirections in REST methods.
-		<li>New pluggable {@link org.apache.juneau.rest.ResponseHandler} class and {@del @RestResource(responseHandlers)} annotation
+		<li>New <del>Redirect</del> class that simplifies performing redirections in REST methods.
+		<li>New pluggable {@link org.apache.juneau.rest.ResponseHandler} class and <del>@RestResource(responseHandlers)</del> annotation
 			for defining customer response handlers for special kinds of POJOs.
-		<li>New method {@del UrlEncodingSerializer#serializeUrlPart(Object)} method.
-		<li>New method {@del RestRequest#getServletURIBuilder()} for construcing servlet-based URLs more efficiently.
+		<li>New method <del>UrlEncodingSerializer#serializeUrlPart(Object)</del> method.
+		<li>New method <del>RestRequest#getServletURIBuilder()</del> for construcing servlet-based URLs more efficiently.
 		<li>New method {@link org.apache.juneau.rest.RestResponse#getNegotiatedOutputStream()} that uses encoders if a match is found, 
 			and {@link org.apache.juneau.rest.RestResponse#getOutputStream()} that just return the underlying output stream without any modifications.
-		<li>Fixed bug where some properties were not being propagated correctly when using {@del CoreObject#setProperties(ObjectMap)}
+		<li>Fixed bug where some properties were not being propagated correctly when using <del>CoreObject#setProperties(ObjectMap)</del>
 			on serializer and parser subclasses.
 		<li>Fixed bug in {@link org.apache.juneau.html.HtmlSerializer} where URL keys in Maps were not being serialized as hyperlinks.
 		<li>Fixed bug in {@link org.apache.juneau.json.JsonSerializer} where <js>"_class"</js> and <js>"items"</js> attributes were not quoted in strict mode when using SERIALIZER_addClassAttrs feature.	
 		<li>Fixed bug where <c>Content-Encoding</c> and<c>Character-Encoding</c> headers were being set when calling {@link org.apache.juneau.rest.RestResponse#getOutputStream()}.
 			These should not be set if interacting with the output streams at a low level.
-		<li>Eliminated various convenience <c>RestResponse.sendRedirect(...)</c> methods due to the introduction of the {@del Redirect} class.
+		<li>Eliminated various convenience <c>RestResponse.sendRedirect(...)</c> methods due to the introduction of the <del>Redirect</del> class.
 	</ul>
 </div>
 </div><!-- END: 5.1.0.5 -->
@@ -30804,14 +30810,14 @@
 		Juno 5.1.0.6 is a moderate update.
 	</p>
 	<ul class='spaced-list'>
-		<li>Simplified API for {@del org.apache.juneau.transform.PojoSwap}.  
-			Since it's rarely used, the <c>beanContext</c> parameter was replaced with a {@del PojoSwap#getBeanContext()} method on
+		<li>Simplified API for <del>PojoSwap</del>.  
+			Since it's rarely used, the <c>beanContext</c> parameter was replaced with a <del>PojoSwap#getBeanContext()</del> method on
 			the class.
-		<li>New simplified way of defining POJO filters without needing to extend {@del org.apache.juneau.transform.PojoSwap}.
-			See {@del org.apache.juneau.transform.SurrogateSwap} for details.
+		<li>New simplified way of defining POJO filters without needing to extend <del>PojoSwap</del>.
+			See <del>SurrogateSwap</del> for details.
 		<li>New {@link org.apache.juneau.html.annotation.Html @Html} annotation.
 			Will allow the definition of standard XHTML DTOs in future releases.  
-			For now, {@del Img} is an example of defining an XHTML element using Juno DTOs.
+			For now, <del>Img</del> is an example of defining an XHTML element using Juno DTOs.
 		<li>{@link org.apache.juneau.json.JsonParser} now ignores trailing <c>';'</c> characters in input so that it can 
 			parse strings of the form <js>"var x = {'foo':'bar'};"</js>.
 		<li>New <c>TumblrParserResource</c> in the samples war file showing how to combine the REST client and server APIs into a single
@@ -30830,9 +30836,9 @@
 	</p>
 	<ul class='spaced-list'>
 		<li>Improved error handling.  
-		<li>New {@del ParserContext#PARSER_debug} and {@del SerializerContext#SERIALIZER_debug}.
+		<li>New <del>ParserContext#PARSER_debug</del> and <del>SerializerContext#SERIALIZER_debug</del>.
 			settings for logging additional information for debugging problems.
-		<li>New {@del SERIALIZER_ignoreRecursions} setting for explicitly ignoring recursions when 
+		<li>New <del>SERIALIZER_ignoreRecursions</del> setting for explicitly ignoring recursions when 
 			serializing models.  Previously, the <jsf>SERIALIZER_detectRecursions</jsf> setting did this but now it simply looks for recursions 
 			and throws exceptions when they occur.
 		<li>Improved handling of <c>StackOverflowErrors</c>.  When <jsf>SERIALIZER_detectRecursions</jsf> is enabled, a useful error message
@@ -30840,13 +30846,13 @@
 		<li>Bug fixes in {@link org.apache.juneau.dto.ResultSetList} for Oracle and SQL Server.
 		<li>Serializers and parsers can now access HTTP request attributes, parameters, and headers through <c>SerializerContext.getProperties()</c> and
 			<c>ParserContext.getProperties()</c>.		
-		<li>Removed media-type and encoding attributes from {@del SerializerContext} and {@del ParserContext}	
+		<li>Removed media-type and encoding attributes from <del>SerializerContext</del> and <del>ParserContext</del>	
 			since these are now available through context properties, and are typically not used.
 		<li>{@link org.apache.juneau.xml.XmlParser} now accepts <c>application/xml</c>.		
 		<li>Improved handling of bean property serialization when multiple matching pojo filters for the bean property class exist.
 		<li>Improved concurrency on BeanContext class.
-		<li>Fixed bug in {@del org.apache.juneau.rest.converters.Traversable} that was causing it to be executed even if the servlet extra path info was empty.
-		<li>Fixed bug in {@del org.apache.juneau.rest.converters.Traversable} where it was not picking up filters and properties defined on REST Java methods. 
+		<li>Fixed bug in <del>Traversable</del> that was causing it to be executed even if the servlet extra path info was empty.
+		<li>Fixed bug in <del>Traversable</del> where it was not picking up filters and properties defined on REST Java methods. 
 	</ul>
 </div>
 </div><!-- END: 5.1.0.7 -->
@@ -30877,9 +30883,9 @@
 						from being modified after being created.  The new mechanism is much more straightforward.
 			</ul>
 		</li>
-		<li>Modifications to the {@del org.apache.juneau.rest.client} APIs to make it easier to work with custom Apache HTTP clients.
+		<li>Modifications to the <del>client</del> APIs to make it easier to work with custom Apache HTTP clients.
 			<ul>
-				<li>Added overridable {@del RestClient#createHttpClient()} to allow customized subclasses to construct customized HTTP clients.
+				<li>Added overridable <del>RestClient#createHttpClient()</del> to allow customized subclasses to construct customized HTTP clients.
 				<li>Removed the <c>DefaultRestClient</c> class since it's now fully redundant with <c>RestClient</c>.
 				<li>Added <c>RestClient.shutdown()</c> method for cleaning up the internal HTTP client when you're done using a REST client.
 			</ul>
@@ -30909,11 +30915,11 @@
 			</ul>
 		<li>Code changes to facilitate breaking up bundles:
 			<ul>
-				<li><c>org.apache.juneau.rest.labels.Link</c> class moved to {@del Link}.
+				<li><c>org.apache.juneau.rest.labels.Link</c> class moved to <del>Link</del>.
 				<li>References to <c>org.apache.juneau.rest.RestException</c> in {@link org.apache.juneau.encoders.Encoder} class changed to <c>IOException</c>.
 			</ul>
 		<li>Changed configuration names for consistency with Jazz Framework.
-		<li>{@del RestClient#execute(HttpUriRequest)} method that allows subclasses to handle their own HTTP request execution.
+		<li><del>RestClient#execute(HttpUriRequest)</del> method that allows subclasses to handle their own HTTP request execution.
 		<li>Changes in <c>JazzRestClient</c> to handle introduction of SSO support in v6.
 		<li><c>&amp;plainText</c> debug feature was broken.
 		<li>Removed double-buffering in <c>RestRequest</c>.
@@ -30941,7 +30947,7 @@
 		</li>
 		<li>Fix bug where <c>BeanRuntimeExceptions</c> weren't being thrown on subsequent calls to {@link org.apache.juneau.BeanContext#getClassMeta(Class)}.
 		<li>Moved logic for <c>BeanContext.getPrimitiveDefault(Class)</c> to new {@link org.apache.juneau.ClassMeta#getPrimitiveDefault()} method for performance reasons.
-		<li>Fixed bug in {@del BeanContext#addTransforms(Class[])} that would cause filter order to get messed up.
+		<li>Fixed bug in <del>BeanContext#addTransforms(Class[])</del> that would cause filter order to get messed up.
 		<li>{@link org.apache.juneau.ClassMeta#newInstance()} can now create array instances.
 		<li>Fixed indentation bugs in {@link org.apache.juneau.html.HtmlSerializer}.
 		<li>Fixed issue in {@link org.apache.juneau.html.HtmlSerializer} where newlines were not being converted into line breaks.
@@ -30951,30 +30957,30 @@
 	<h5 class='topic w800'>Server</h5>		
 	<ul class='spaced-list'>
 		<li>Fixed major issue that prevented parsing URL-Encoded form posts into POJOs.
-			Calling {@del HttpServlet#getParameter(String)} was forcing the underlying servlet code to process the HTTP body itself, preventing the <c>UrlEncodingSerializer</c>
+			Calling <del>HttpServlet#getParameter(String)</del> was forcing the underlying servlet code to process the HTTP body itself, preventing the <c>UrlEncodingSerializer</c>
 			class from being able to parse the content.  Updated code no longer inadvertantly calls this method.
-		<li>New {@del RestRequest#getQueryParameter(String)}, {@del RestRequest#hasQueryParameter(String)}, and {@del RestRequest#hasAnyQueryParameters(String[])}
+		<li>New <del>RestRequest#getQueryParameter(String)</del>, <del>RestRequest#hasQueryParameter(String)</del>, and <del>RestRequest#hasAnyQueryParameters(String[])</del>
 			methods that only look for parameters in the URL query string to prevent loading and parsing of URL-Encoded form posts.
-		<li>New {@del @QParam} and {@del @HasQParam} annotations for accessing query parameters from the URL query string.
+		<li>New <del>@QParam</del> and <del>@HasQParam</del> annotations for accessing query parameters from the URL query string.
 		<li><c>&amp;plainText</c> parameter can now specify a false value.
-		<li>Removed properties parameters from {@del RestServlet#onPreCall(RestRequest)} and {@del RestServlet#onPostCall(RestRequest,RestResponse)} methods
+		<li>Removed properties parameters from <del>RestServlet#onPreCall(RestRequest)</del> and <del>RestServlet#onPostCall(RestRequest,RestResponse)</del> methods
 			since the properties are already accessible through <c>RestRequest.getProperties()</c>.
 		<li>Added {@link org.apache.juneau.uon.UonSerializer} and {@link org.apache.juneau.uon.UonParser} to serializer and parser lists on 
-			{@del org.apache.juneau.rest.BasicRestServlet} and {@del RestServletJenaDefault}.
+			<del>BasicRestServlet</del> and <del>RestServletJenaDefault</del>.
 	</ul>
 	
 	<h5 class='topic w800'>Client</h5>		
 	<ul class='spaced-list'>
 		<li>Moved to Apache HttpClient 4.3 to match Jazz 6.0.
-		<li>Renamed <c>RestResponseEntity</c> to {@del org.apache.juneau.rest.client.RestRequestEntity}.
+		<li>Renamed <c>RestResponseEntity</c> to <del>RestRequestEntity</del>.
 		<li>Improved performance on URL-Encoded form posts by serializing directly to output stream instead of serialized to string first.
 		<li>New methods on {@link org.apache.juneau.rest.client.RestClient} class that makes it easier to associate serializer and parser attributes with registered serializer and parser:
 			<ul>
-				<li>{@del RestClient#setProperty(String,Object)}			
-				<li>{@del RestClient#setProperties(ObjectMap)}	
-				<li>{@del RestClient#addNotBeanClasses(Class[])}		
-				<li>{@del RestClient#addTransforms(Class[])}		
-				<li>{@del RestClient#addImplClass(Class,Class)}	
+				<li><del>RestClient#setProperty(String,Object)</del>			
+				<li><del>RestClient#setProperties(ObjectMap)</del>	
+				<li><del>RestClient#addNotBeanClasses(Class[])</del>		
+				<li><del>RestClient#addTransforms(Class[])</del>		
+				<li><del>RestClient#addImplClass(Class,Class)</del>	
 			</ul>
 		<li>Renamed <c>RestClient.shutdown()</c> to {@link org.apache.juneau.rest.client.RestClient#close()} to mirror change in Apache API.		
 	</ul>
@@ -31009,19 +31015,19 @@
 		<li>Several improvements to URL-Encoding support.
 			<ul>
 				<li>Improved whitespace handling in {@link org.apache.juneau.uon.UonParser}.
-				<li>New {@del UonParserContext#UON_whitespaceAware} property for controlling whether whitespace is ignored.
-				<li>New {@del UrlEncodingContext#URLENC_expandedParams} property for controlling whether arrays/Collections 
+				<li>New <del>UonParserContext#UON_whitespaceAware</del> property for controlling whether whitespace is ignored.
+				<li>New <del>UrlEncodingContext#URLENC_expandedParams</del> property for controlling whether arrays/Collections 
 					should be serialized/parsed as multi-part parameters.
 				<li>New {@link org.apache.juneau.urlencoding.annotation.UrlEncoding#expandedParams() @UrlEncoding(expandedParams)}
 					annotation that specifies that bean properties of type array/Collection be serialized as multi-part parameters (e.g. <c>&amp;key=val1&amp;key=val2</c>).
 			</ul>
 		</li>
-		<li>New {@del JsonSerializerContext#JSON_escapeSolidus} property for controlling whether slash characters should be escaped.
-		<li>New {@del org.apache.juneau.internal.TeeOutputStream} and {@del org.apache.juneau.internal.TeeWriter} classes.
+		<li>New <del>JsonSerializerContext#JSON_escapeSolidus</del> property for controlling whether slash characters should be escaped.
+		<li>New <del>TeeOutputStream</del> and <del>TeeWriter</del> classes.
 		<li>New {@link org.apache.juneau.ClassMeta#isInstance(Object)} method.
 		<li>Performance improvements when using the {@link org.apache.juneau.BeanMap#add(String,Object)} method.  
 			Array properties are stored in a temporary list cache until {@link org.apache.juneau.BeanMap#getBean()} is called.
-		<li>New {@del BeanPropertyMeta#add(BeanMap,Object)} method for adding values to Collection and array properties.
+		<li>New <del>BeanPropertyMeta#add(BeanMap,Object)</del> method for adding values to Collection and array properties.
 		<li>Config INI files now support keys with name <js>"*"</js>.
 	</ul>
 	
@@ -31029,8 +31035,8 @@
 	<ul class='spaced-list'>
 		<li>REST method parameters can now be generic types (e.g. <dc><ja>@Param</ja>(<js>"foo"</js>) Map&lt;String,Integer&gt; foo</dc>).
 			This applies to headers, attributes, and parameters.
-		<li>New {@del @Param(multipart)}
-			and {@del @Query(multipart)} annotations
+		<li>New <del>@Param(multipart)</del>
+			and <del>@Query(multipart)</del> annotations
 			for handling multi-part GET and POST parameters.	
 		<li>GET parameters are now CASE-SENSITIVE per W3C standards.
 			<ul>
@@ -31045,8 +31051,8 @@
 		<li>Performance improvements around query parameters.
 		<li>New methods on {@link org.apache.juneau.rest.RestRequest} for handling multi-part parameters:
 			<ul>
-				<li>{@del RestRequest#getParameters(String,Class)}
-				<li>{@del RestRequest#getQueryParameters(String,Class)}
+				<li><del>RestRequest#getParameters(String,Class)</del>
+				<li><del>RestRequest#getQueryParameters(String,Class)</del>
 			</ul>
 		</li>
 		<li>Fixed Jetty issue in {@link org.apache.juneau.rest.RestResponse#setHeader(String,String)} where setting 
@@ -31054,18 +31060,18 @@
 		<li><c>&amp;noTrace=true</c> now prevents any errors from being logged in log file.
 		<li>Workaround for Jetty issue where <c>ServletContext.getContextPath()</c> always ends with <js>"null"</js>.
 		<li><c>RestServletProperties.REST_allowMethodParam</c> is now <jk>true</jk> by default on all subclasses 
-			of {@del org.apache.juneau.rest.BasicRestServlet} and {@del RestServletJenaDefault}.
+			of <del>BasicRestServlet</del> and <del>RestServletJenaDefault</del>.
 	</ul>
 			
 	<h5 class='topic w800'>Client</h5>		
 	<ul class='spaced-list'>
-		<li>New method {@del org.apache.juneau.rest.client.RestCall#allowRedirectsOnPosts(boolean)}.
+		<li>New method <del>RestCall#allowRedirectsOnPosts(boolean)</del>.
 		<li>New method <c>RestCall.peekInputStream()</c> allows you to read response bodies without interrupting execution flow.
-		<li>New method {@del org.apache.juneau.rest.client.RestCall#toString()} now useful for debugging purposes.  
+		<li>New method <del>RestCall#toString()</del> now useful for debugging purposes.  
 			Shows all request/response headers and bodies.
-		<li>{@del org.apache.juneau.rest.client.RestCallException} now includes <c>HttpResponse</c> object for easier debugging.
+		<li><del>RestCallException</del> now includes <c>HttpResponse</c> object for easier debugging.
 		<li>New method <c>RestClient.addListener(RestClientListener)</c> for registering request/response listeners.
-		<li>New {@del RestClient#setClassLoader(ClassLoader)} method.
+		<li>New <del>RestClient#setClassLoader(ClassLoader)</del> method.
 		<li>TLS support in <c>JazzRestClient</c>.
 	</ul>
 	
@@ -31088,14 +31094,14 @@
 	
 	<h5 class='topic w800'>Core</h5>		
 	<ul class='spaced-list'>
-		<li>Fixed {@del ConfigFile#isEmpty()} method.
+		<li>Fixed <del>ConfigFile#isEmpty()</del> method.
 		<li>Changed behavior on {@link org.apache.juneau.uon.UonParser} to not treat <js>'~'</js> characters as escapes
 			unless followed by one of the following characters:  <c>( ) , $ = ~</c>.
 	</ul>
 	
 	<h5 class='topic w800'>Client</h5>		
 	<ul class='spaced-list'>
-		<li>New class {@del org.apache.juneau.rest.client.RestCallInterceptor}.  
+		<li>New class <del>RestCallInterceptor</del>.  
 			Allows responses to be inspected and modified before being processed.  
 			Replaces <c>RestClientListener</c> class.
 		<li>Minor connection cleanup fixes.
@@ -31115,28 +31121,28 @@
 	<h5 class='topic w800'>Core</h5>		
 	<ul class='spaced-list'>
 		<li>{@link org.apache.juneau.ClassMeta#newInstance()} method can now create new instances of arrays.
-		<li>Arguments passed to {@del Link} are now serialized using {@link org.apache.juneau.urlencoding.UrlEncodingSerializer}, so arbitrary POJOs can now be passed as arguments.
+		<li>Arguments passed to <del>Link</del> are now serialized using {@link org.apache.juneau.urlencoding.UrlEncodingSerializer}, so arbitrary POJOs can now be passed as arguments.
 		<li>New date filters:  <c>org.apache.juneau.swaps.Datefilter.ISO8601DTZP</c> and <c>org.apache.juneau.swaps.Datefilter.SimpleP</c>.
-		<li>New {@del HtmlDocSerializerContext#HTMLDOC_nowrap} setting for {@link org.apache.juneau.html.HtmlDocSerializer} class.  
+		<li>New <del>HtmlDocSerializerContext#HTMLDOC_nowrap</del> setting for {@link org.apache.juneau.html.HtmlDocSerializer} class.  
 			Adds <js>"* {white-space:nowrap}"</js> to the style header to prevent word wrapping.
 		<li>Fixed bug in {@link org.apache.juneau.uon.UonParser} where passing in a blank value on an array or collection type in a form post would cause a <c>ClassCastException</c>.  
 			New behavior creates an empty array or <c>Collection</c>.
-		<li>Improved implementation of {@del UrlEncodingSerializer#serializeUrlPart(Object)} method.
+		<li>Improved implementation of <del>UrlEncodingSerializer#serializeUrlPart(Object)</del> method.
 	</ul>
 	
 	<h5 class='topic w800'>Server</h5>		
 	<ul class='spaced-list'>
 		<li>{@link org.apache.juneau.rest.RestConverter} API fixed to handle the existence of POJO filters.
-			{@del org.apache.juneau.rest.converters.Introspectable}/{@del org.apache.juneau.rest.converters.Queryable}/{@del org.apache.juneau.rest.converters.Traversable} classes can now work with filtered POJOs.  
-		<li>{@del @RestResource(messages)} annotation can now be defined on super and subclasses so that NLS messages can be defined in multiple resource bundles.
+			<del>Introspectable</del>/<del>Queryable</del>/<del>Traversable</del> classes can now work with filtered POJOs.  
+		<li><del>@RestResource(messages)</del> annotation can now be defined on super and subclasses so that NLS messages can be defined in multiple resource bundles.
 		<li>Performance improvements in <c>RestServletNls</c> class. 
 		<li>Fixed bug where two REST java methods mapped to the same path pattern wasn't triggering an exception when it was supposed to.
 	</ul>
 	
 	<h5 class='topic w800'>Client</h5>		
 	<ul class='spaced-list'>	
-		<li>New {@del RestCall#setRedirectMaxAttempts(int)} method to prevent endless redirection loops.
-		<li>New {@del RestCall#setRetryable(int,long,RetryOn)} method to automatically retry on failed connection attempts.
+		<li>New <del>RestCall#setRedirectMaxAttempts(int)</del> method to prevent endless redirection loops.
+		<li>New <del>RestCall#setRetryable(int,long,RetryOn)</del> method to automatically retry on failed connection attempts.
 		<li>New <c>RestCallInterceptor.onRetry(RestCall,int,HttpRequest,HttpResponse)</c> method for listening in on retry attempts.		
 	</ul>
 </div>
@@ -31157,28 +31163,28 @@
 	
 	<h5 class='topic w800'>Core</h5>		
 	<ul class='spaced-list'>
-		<li>Simplified {@del org.apache.juneau.utils.PojoIntrospector} class.
-		<li>New {@del ClassUtils#getMethodSignature(Method)} method.
+		<li>Simplified <del>PojoIntrospector</del> class.
+		<li>New <del>ClassUtils#getMethodSignature(Method)</del> method.
 	</ul>
 	
 	<h5 class='topic w800'>Client</h5>		
 	<ul class='spaced-list'>
 		<li>New methods in {@link org.apache.juneau.rest.client.RestClient} for working with remoteable services:
 		<ul>
-			<li>{@del RestClient#setRemoteableServletUri(String)}
-			<li>{@del RestClient#getRemoteableProxy(Class)}
+			<li><del>RestClient#setRemoteableServletUri(String)</del>
+			<li><del>RestClient#getRemoteableProxy(Class)</del>
 		</ul>
 	</ul>
 	
 	<h5 class='topic w800'>Server</h5>		
 	<ul class='spaced-list'>
-		<li>Added a default OPTIONS page to {@del org.apache.juneau.rest.BasicRestServlet} and {@del RestServletJenaDefault}.
+		<li>Added a default OPTIONS page to <del>BasicRestServlet</del> and <del>RestServletJenaDefault</del>.
 		<li><c>RestServletProperties.REST_allowMethodParam</c> has been enhanced to allow you to
 			explicitly specify which HTTP methods can be used in the <c>&amp;method</c> parameter.
 		<li>New methods added to {@link org.apache.juneau.rest.RestRequest}:
 		<ul>
-			<li>{@del RestRequest#getParser()}
-			<li>{@del RestRequest#getReaderParser()}
+			<li><del>RestRequest#getParser()</del>
+			<li><del>RestRequest#getReaderParser()</del>
 		</ul>
 	</ul>
 </div>
@@ -31195,10 +31201,10 @@
 	
 	<h5 class='topic w800'>Core</h5>
 	<ul class='spaced-list'>
-		<li>New properties in {@del SerializerContext}:
+		<li>New properties in <del>SerializerContext</del>:
 			<ol>
-				<li>{@del SerializerContext#SERIALIZER_relativeUriBase}
-				<li>{@del SerializerContext#SERIALIZER_absolutePathUriBase}
+				<li><del>SerializerContext#SERIALIZER_relativeUriBase</del>
+				<li><del>SerializerContext#SERIALIZER_absolutePathUriBase</del>
 			</ol>
 			These replace the <c>SERIALIZER_uriAuthority</c> and <c>SERIALIZER_uriContext</c> properties.
 		</li>
@@ -31218,25 +31224,25 @@
 	
 	<h5 class='topic w800'>Client</h5>
 	<ul class='spaced-list'>
-		<li>New methods in {@del org.apache.juneau.rest.client.RestCall}:
+		<li>New methods in <del>RestCall</del>:
 			<ol>
-				<li>{@del RestRequest#getHeader(String,Class)}
-				<li>{@del RestRequest#getHeader(String,Object,Class)}
+				<li><del>RestRequest#getHeader(String,Class)</del>
+				<li><del>RestRequest#getHeader(String,Object,Class)</del>
 				<li>{@del RestRequest#getHeader(String,Type,Type...)}
-				<li>{@del RestRequest#getQueryParameter(String,Class)}
-				<li>{@del RestRequest#getQueryParameter(String,Object,Class)}
+				<li><del>RestRequest#getQueryParameter(String,Class)</del>
+				<li><del>RestRequest#getQueryParameter(String,Object,Class)</del>
 				<li>{@del RestRequest#getQueryParameter(String,Type,Type...)}
 				<li>{@del RestRequest#getQueryParameter(String,Object,Type,Type...)}
-				<li>{@del RestRequest#getQueryParameters(String,Class)}
+				<li><del>RestRequest#getQueryParameters(String,Class)</del>
 				<li>{@del RestRequest#getQueryParameters(String,Type,Type...)}
-				<li>{@del RestRequest#getFormDataParameter(String,Class)}
-				<li>{@del RestRequest#getFormDataParameter(String,Object,Class)}
-				<li>{@del RestRequest#getFormDataParameters(String,Class)}
+				<li><del>RestRequest#getFormDataParameter(String,Class)</del>
+				<li><del>RestRequest#getFormDataParameter(String,Object,Class)</del>
+				<li><del>RestRequest#getFormDataParameters(String,Class)</del>
 				<li>{@del RestRequest#getFormDataParameter(String,Type,Type...)}
 				<li>{@del RestRequest#getFormDataParameters(String,Type,Type...)}
-				<li>{@del RestRequest#getPathParameter(String,Class)}
+				<li><del>RestRequest#getPathParameter(String,Class)</del>
 				<li>{@del RestRequest#getPathParameter(String,Type,Type...)}
-				<li>{@del RestRequest#getBody(Class)}
+				<li><del>RestRequest#getBody(Class)</del>
 				<li>{@del RestRequest#getBody(Type,Type...)}
 			</ol>
 		</li>
@@ -31258,15 +31264,15 @@
 		<li>New methods on {@link org.apache.juneau.ClassMeta} that eliminates language-specific code in 
 			the general class metadata.
 			<ul>
-				<li>{@del ClassMeta#getXmlMeta()}
-				<li>{@del ClassMeta#getJsonMeta()}
-				<li>{@del ClassMeta#getHtmlMeta()}
-				<li>{@del ClassMeta#getUrlEncodingMeta()}
-				<li>{@del ClassMeta#getRdfMeta()}
+				<li><del>ClassMeta#getXmlMeta()</del>
+				<li><del>ClassMeta#getJsonMeta()</del>
+				<li><del>ClassMeta#getHtmlMeta()</del>
+				<li><del>ClassMeta#getUrlEncodingMeta()</del>
+				<li><del>ClassMeta#getRdfMeta()</del>
 			</ul>
 		<li>New {@link org.apache.juneau.dto.jsonschema.JsonType#ANY} enum.
-		<li>New {@del @Html(asPlainText)} annotation.
-		<li>New {@del HtmlDocSerializerContext#HTMLDOC_cssImports} property.
+		<li>New <del>@Html(asPlainText)</del> annotation.
+		<li>New <del>HtmlDocSerializerContext#HTMLDOC_cssImports</del> property.
 		<li>Significant changes to RDF support.
 			<ul>
 				<li>New {@link org.apache.juneau.jena.annotation.Rdf @Rdf} and {@link org.apache.juneau.jena.annotation.RdfSchema @RdfSchema}
@@ -31275,16 +31281,16 @@
 				<li>Support for serializing arrays/collections as RDF bags, RDF lists, and multi-valued properties.   
 				<li>Fixed warning message about <js>"tab"</js> setting when using the N3/Turtle serializers.
 			</ul>
-		<li>New {@del SerializerContext#SERIALIZER_sortCollections} and 
-			{@del SerializerContext#SERIALIZER_sortMaps} properties.
+		<li>New <del>SerializerContext#SERIALIZER_sortCollections</del> and 
+			<del>SerializerContext#SERIALIZER_sortMaps</del> properties.
 		<li>FindBug fixes.
 	</ul>
 	
 	<h5 class='topic w800'>Server</h5>
 	<ul class='spaced-list'>
-		<li>New {@del RestRequest#getServletParentURI()} method.
+		<li>New <del>RestRequest#getServletParentURI()</del> method.
 		<li>New <c>$R{servletParentURI}</c> variable.
-		<li>Removed final modifier from {@del ChildResourceDescriptions}.
+		<li>Removed final modifier from <del>ChildResourceDescriptions</del>.
 	</ul>
 	
 	<h5 class='topic w800'>Samples</h5>
@@ -31321,22 +31327,22 @@
 					</ul>
 				<li>{@link org.apache.juneau.BeanPropertyMeta#getClassMeta()} now returns the filtered type of the property.
 			</ul> 
-		<li>{@del StringVarResolver} now has support for chained resolvers.
-		<li>{@del StringVarResolver}  now resolves variables inside resolved values.
+		<li><del>StringVarResolver</del> now has support for chained resolvers.
+		<li><del>StringVarResolver</del>  now resolves variables inside resolved values.
 			i.e. if a resolved variable value itself contains a variable, it now resolves that variable too.
-		<li>Fixed bug where inner interface classes being used in {@del RestResource#filters()} were being
+		<li>Fixed bug where inner interface classes being used in <del>RestResource#filters()</del> were being
 			interpreted as surrogate classes because they have hidden 1-arg constructors due to being inner classes.
 		<li>Fixed bug in {@link org.apache.juneau.internal.MultiSet} where exception was being thrown if last set was empty.
-		<li>New {@del org.apache.juneau.utils.ZipFileList} class for providing efficiently zipped directories through the REST interface.
+		<li>New <del>ZipFileList</del> class for providing efficiently zipped directories through the REST interface.
 		<li>New <c>RdfProperties.RDF_useXmlNamespaces</c> property.			
-		<li>New {@del XmlParserContext#XML_preserveRootElement} property.
+		<li>New <del>XmlParserContext#XML_preserveRootElement</del> property.
 		<li>Worked around bug in Sun VM on OS/X where XML parser was throwing an exception when trying to set a reporter.			
 	</ul>
 	
 	
 	<h5 class='topic w800'>Server</h5>
 	<ul class='spaced-list'>
-		<li>New {@del ZipFileListResponseHandler} class.
+		<li>New <del>ZipFileListResponseHandler</del> class.
 		<li>Simplified labels in servlet resource bundles:
 			<ul>
 				<li><c>"[ClassName].ResourceDescription"</c> is now <c>"[ClassName].label"</c>.
@@ -31346,63 +31352,63 @@
 			<ul>
 				<li>Added new methods:
 					<ul>
-						<li>{@del RestRequest#getQueryParameterMap()}
-						<li>{@del RestRequest#getQueryParameterNames()}
-						<li>{@del RestRequest#getPathInfoUndecoded()}
-						<li>{@del RestRequest#getPathRemainderUndecoded()}
-						<li>{@del RestRequest#getTrimmedRequestURI()}
-						<li>{@del RestRequest#getTrimmedRequestURL()}
-						<li>{@del RestRequest#getServletTitle()}
-						<li>{@del RestRequest#getServletDescription()}
-						<li>{@del RestRequest#getMethodDescription()}
+						<li><del>RestRequest#getQueryParameterMap()</del>
+						<li><del>RestRequest#getQueryParameterNames()</del>
+						<li><del>RestRequest#getPathInfoUndecoded()</del>
+						<li><del>RestRequest#getPathRemainderUndecoded()</del>
+						<li><del>RestRequest#getTrimmedRequestURI()</del>
+						<li><del>RestRequest#getTrimmedRequestURL()</del>
+						<li><del>RestRequest#getServletTitle()</del>
+						<li><del>RestRequest#getServletDescription()</del>
+						<li><del>RestRequest#getMethodDescription()</del>
 					</ul>
 				<li>Behavior changes to {@link org.apache.juneau.rest.RestRequest#getPathInfo()} to follow Servlet specs.
 					Returns <jk>null</jk> instead of blank for no path info.
-				<li>{@del RestRequest#getPathRemainder()} now automatically decodes the path remainder. 
-					Use {@del RestRequest#getPathRemainderUndecoded()} to get the unencoded path remainder.
-				<li>Bug fixes in {@del RestRequest#getRequestParentURI()} when servlet is mapped to <js>"/*"</js>.
-				<li>Bug fixes in {@del RestRequest#getServletURI()} when servlet is mapped to <js>"/*"</js>.
+				<li><del>RestRequest#getPathRemainder()</del> now automatically decodes the path remainder. 
+					Use <del>RestRequest#getPathRemainderUndecoded()</del> to get the unencoded path remainder.
+				<li>Bug fixes in <del>RestRequest#getRequestParentURI()</del> when servlet is mapped to <js>"/*"</js>.
+				<li>Bug fixes in <del>RestRequest#getServletURI()</del> when servlet is mapped to <js>"/*"</js>.
 			</ul>
 		<li>New string replacement variables:
 			<ul>
 				<li><c>$R{contextPath}</c> - Returns value from {@link org.apache.juneau.rest.RestRequest#getContextPath()}
-				<li><c>$R{methodDescription}</c> - Returns value from {@del RestRequest#getMethodDescription()}
-				<li><c>$R{resourceTitle}</c> - Returns value from {@del RestRequest#getServletTitle()}
-				<li><c>$R{resourceDescription}</c> - Returns value from {@del RestRequest#getServletDescription()}
-				<li><c>$R{trimmedRequestURI}</c> - Returns value from {@del RestRequest#getTrimmedRequestURI()}
+				<li><c>$R{methodDescription}</c> - Returns value from <del>RestRequest#getMethodDescription()</del>
+				<li><c>$R{resourceTitle}</c> - Returns value from <del>RestRequest#getServletTitle()</del>
+				<li><c>$R{resourceDescription}</c> - Returns value from <del>RestRequest#getServletDescription()</del>
+				<li><c>$R{trimmedRequestURI}</c> - Returns value from <del>RestRequest#getTrimmedRequestURI()</del>
 				<li><c>$E{var}</c> - Environment variables.
 			</ul>
-		<li>Added methods {@del RestServlet#getDescription(RestRequest)} and {@del RestServlet#getLabel(RestRequest)}.
-		<li>{@del org.apache.juneau.rest.BasicRestServlet} and {@del RestServletJenaDefault} now provide default HTML titles
+		<li>Added methods <del>RestServlet#getDescription(RestRequest)</del> and <del>RestServlet#getLabel(RestRequest)</del>.
+		<li><del>BasicRestServlet</del> and <del>RestServletJenaDefault</del> now provide default HTML titles
 			and descriptions:
 			<p class='bcode'>
 		<ja>@Property</ja>(name=<jsf>HTMLDOC_title</jsf>, value=<js>"$R{resourceTitle}"</js>),
 		<ja>@Property</ja>(name=<jsf>HTMLDOC_description</jsf>, value=<js>"$R{resourceDescription}"</js>)
 			</p>
-		<li>Options pages on {@del org.apache.juneau.rest.BasicRestServlet} and {@del RestServletJenaDefault} now provide default descriptions and back links:
+		<li>Options pages on <del>BasicRestServlet</del> and <del>RestServletJenaDefault</del> now provide default descriptions and back links:
 			and descriptions:
 			<p class='bcode'>
 		<ja>@Property</ja>(name=<jsf>HTMLDOC_navlinks</jsf>, value=<js>"{back:'$R{servletURI}"</js>),
 		<ja>@Property</ja>(name=<jsf>HTMLDOC_description</jsf>, value=<js>"Resource options"</js>)
 			</p>
-		<li>New {@del org.apache.juneau.rest.BasicRestServletGroup} class.
+		<li>New <del>BasicRestServletGroup</del> class.
 		<li>Removed <c>RestServletProperties.REST_trimTrailingUriSlashes</c> and <c>RestServletProperties.REST_pathInfoBlankForNull</c>. 
 		<li>New annotations for providing labels and descriptions.  Useful if you don't plan on having to support other languages, so you don't 
 			want to provide labels in resource bundles.
 			<ul>
-				<li>{@del RestResource#label()}
-				<li>{@del @RestResource(description)}
-				<li>{@del org.apache.juneau.rest.annotation.RestMethod#description() @RestMethod(description)}
-				<li>{@del RestMethod#responses()}
-				<li>{@del Attr#description()}
-				<li>{@del Content#description()}
-				<li>{@del HasParam#description()}
-				<li>{@del HasQParam#description()}
-				<li>{@del Header#description()}
-				<li>{@del Param#description()}
-				<li>{@del QParam#description()}
+				<li><del>RestResource#label()</del>
+				<li><del>@RestResource(description)</del>
+				<li><del>RestMethod#description() @RestMethod(description)</del>
+				<li><del>RestMethod#responses()</del>
+				<li><del>Attr#description()</del>
+				<li><del>Content#description()</del>
+				<li><del>HasParam#description()</del>
+				<li><del>HasQParam#description()</del>
+				<li><del>Header#description()</del>
+				<li><del>Param#description()</del>
+				<li><del>QParam#description()</del>
 			</ul>
-		<li>Support for sorting resources by name in {@del ChildResourceDescriptions}.
+		<li>Support for sorting resources by name in <del>ChildResourceDescriptions</del>.
 	</ul>
 	
 	<h5 class='topic w800'>Samples</h5>
@@ -31425,19 +31431,19 @@
 	<ul class='spaced-list'>
 		<li>Fixed bug where localized strings weren't resolving when using chained resource bundles.
 		<li>Servlet and method labels and descriptions can now contain embedded string variables.
-		<li>New {@del RestMethod#input()} and {@del RestMethod#responses()}
+		<li>New <del>RestMethod#input()</del> and <del>RestMethod#responses()</del>
 			annotations.
 			These replace the various <c>description</c> annotations added 2 days ago with a simpler design.
-		<li>New methods on {@del org.apache.juneau.rest.RestServlet}:
+		<li>New methods on <del>RestServlet</del>:
 			<ul>
-				<li>{@del RestServlet#getMethodDescription(String,RestRequest)} so that subclasses
+				<li><del>RestServlet#getMethodDescription(String,RestRequest)</del> so that subclasses
 					can override the method description in the OPTIONS page.
-				<li>{@del RestServlet#createRequestVarResolver(RestRequest)} so that subclasses
+				<li><del>RestServlet#createRequestVarResolver(RestRequest)</del> so that subclasses
 					can override and augment the variable resolver.
-				<li>{@del RestServlet#resolveChild(Class)} and {@del RestServlet#replaceChild(RestServlet)}
+				<li><del>RestServlet#resolveChild(Class)</del> and <del>RestServlet#replaceChild(RestServlet)</del>
 					classes that allows customized resolution of servlet instances (e.g. if services are defined in OSGi).
 			</ul> 
-		<li>Reverted the {@del MethodDescription} back to 5.1.0.16 since it was being used by someone.
+		<li>Reverted the <del>MethodDescription</del> back to 5.1.0.16 since it was being used by someone.
 	</ul>
 </div>
 </div><!-- END: 5.1.0.18 -->
@@ -31449,22 +31455,22 @@
 <div class='topic'>
 	<p>
 		Juno 5.1.0.19 is a minor update in terms of core functionality.
-		But it introduces a {@del Microservices} project for building REST microservices and docker containers.
+		But it introduces a <del>Microservices</del> project for building REST microservices and docker containers.
 	</p>
 	
 	<h5 class='topic w800'>Core</h5>
 	<ul class='spaced-list'>
-		<li>Beans can now be serialized to and parsed from {@del org.apache.juneau.ObjectMap ObjectMaps}.
+		<li>Beans can now be serialized to and parsed from <del>ObjectMap ObjectMaps</del>.
 			See <dc>Serializing to ObjectMaps</dc> for details.
-		<li>New {@del org.apache.juneau.ObjectMap#include(String[])} and {@del org.apache.juneau.ObjectMap#exclude(String[])} methods.
+		<li>New <del>ObjectMap#include(String[])</del> and <del>ObjectMap#exclude(String[])</del> methods.
 		<li>{@link org.apache.juneau.html.annotation.Html @Html} annotations can now be applied to bean properties.
 		<li>New {@link org.apache.juneau.utils.IOPipe} utility class.
-		<li>Behavior change on {@del StringVarResolver}.  <jk>null</jk> input now results in blank strings instead of <jk>null</jk>.
+		<li>Behavior change on <del>StringVarResolver</del>.  <jk>null</jk> input now results in blank strings instead of <jk>null</jk>.
 	</ul>
 	
 	<h5 class='topic w800'>Client</h5>
 	<ul class='spaced-list'>
-		<li>New {@del RestClient#doCallback(String)} method.
+		<li>New <del>RestClient#doCallback(String)</del> method.
 	</ul>
 	
 	<h5 class='topic w800'>Server</h5>
@@ -31477,7 +31483,7 @@
 			on all JVMs.  On IBM JVMs this is unnecessary because the order of the properties as defined in the class
 			are stored in the bytecode.  Other JVMs such as OpenJRE do not implement this feature causing the bean
 			properties to be in random order.
-		<li>New {@del ResourceDescription#ResourceDescription(RestRequest,String,String)} constructor.
+		<li>New <del>ResourceDescription#ResourceDescription(RestRequest,String,String)</del> constructor.
 	</ul>
 </div>
 </div><!-- END: 5.1.0.19 -->
@@ -31489,25 +31495,25 @@
 <div class='topic'>
 	<p>
 		Juno 5.1.0.20 is a moderate update.
-		The biggest improvement is the ability to associate external INI config files with REST servlets using the {@del ConfigFile} functionality.
+		The biggest improvement is the ability to associate external INI config files with REST servlets using the <del>ConfigFile</del> functionality.
 	</p>
 	
 	<h5 class='topic w800'>Core</h5>
 	<ul class='spaced-list'>
 		<li>Significant API changes to <c>org.apache.juneau.config</c> API.
 			<ul>
-				<li>{@del ConfigFile} is now thread safe and can be shared across multiple threads.
-				<li>New {@del ConfigMgr} class for managing configuration files.
+				<li><del>ConfigFile</del> is now thread safe and can be shared across multiple threads.
+				<li>New <del>ConfigMgr</del> class for managing configuration files.
 				<li>Serializers and parsers can be associated with config files for storing and retrieving POJOs.  
 					Default support provided for JSON.
 			</ul>
 		</li>
 		<li>New {@link org.apache.juneau.html.SimpleHtmlWriter} class.  
 			Can be used for simple HTML DOM construction.
-		<li>New {@del org.apache.juneau.utils.ProcBuilder} class for calling external processes.
-		<li>New {@del ObjectMap#remove(Class,String,Object)} method.
+		<li>New <del>ProcBuilder</del> class for calling external processes.
+		<li>New <del>ObjectMap#remove(Class,String,Object)</del> method.
 		<li><js>"class='link'"</js> added to links generated by {@link org.apache.juneau.html.HtmlDocSerializer}.
-		<li>New {@del EncoderGroup#append(EncoderGroup)} method.
+		<li>New <del>EncoderGroup#append(EncoderGroup)</del> method.
 		<li>New <c>HtmlDocSerializerContext.HTMLDOC_addLinks</c> configuration property.
 		<li>Modified the <c>Parser.createContext(ObjectMap,Method,Object)</c> method.  
 			Outer context objects can be passed in to create instances of non-static inner classes.
@@ -31516,7 +31522,7 @@
 		<li>{@link org.apache.juneau.urlencoding.UrlEncodingSerializer} and {@link org.apache.juneau.urlencoding.UrlEncodingParser} now 
 			represent arrays and collections as key-value pairs where the keys are numbers (e.g. <js>"?0=foo&amp;1=bar"</js>).
 		<li>Various internal improvements to {@link org.apache.juneau.utils.IOPipe}.
-		<li>New {@del ReflectionUtils#getResource(Class,String)} method.
+		<li>New <del>ReflectionUtils#getResource(Class,String)</del> method.
 		<li>{@link org.apache.juneau.internal.StringUtils#parseNumber(String,Class)} now returns zero for empty strings. 
 			This affects the way most parsers handle blank values.
 	</ul>
@@ -31525,28 +31531,28 @@
 	<ul class='spaced-list'>
 		<li>You can now parse into non-static inner classes of a servlet for parameters/attributes/content.
 			Useful if you like to define your marshaller beans inside your servlet.
-		<li>Changes to {@del org.apache.juneau.rest.RestServlet}:
+		<li>Changes to <del>RestServlet</del>:
 			<ul>
 				<li>New methods for accessing external INI config files:<br>  
-					{@del RestServlet#getConfig()}<br>
-					{@del RestServlet#createConfigFile()}
+					<del>RestServlet#getConfig()</del><br>
+					<del>RestServlet#createConfigFile()</del>
 				<li>New <js>"$C{...}"</js> variable that resolve to INI config file values.
 				<li>New <js>"$UE{...}"</js> variable that  URL-encodes the value inside the variable.
 				<li>New convenience methods for retrieving classpath resource files:<br>  
-					{@del RestServlet#getResource(String)}<br>
-					{@del RestServlet#getResourceAsString(String)}<br>
-					{@del RestServlet#getResource(Class,String,String)}.
+					<del>RestServlet#getResource(String)</del><br>
+					<del>RestServlet#getResourceAsString(String)</del><br>
+					<del>RestServlet#getResource(Class,String,String)</del>.
 						Useful if you want to load predefined POJOs from JSON files in your classpath.
-				<li>New {@del RestServlet#handleNotFound(int,RestRequest,RestResponse)} method for customized handling
+				<li>New <del>RestServlet#handleNotFound(int,RestRequest,RestResponse)</del> method for customized handling
 					of when a resource or method was not found.  
 			</ul>
-		<li>{@del org.apache.juneau.rest.BasicRestServlet}  now automatically processes <js>"/favicon.ico"</js> requests by 
-			overriding the new {@del RestServlet#handleNotFound(int,RestRequest,RestResponse)} method.
+		<li><del>BasicRestServlet</del>  now automatically processes <js>"/favicon.ico"</js> requests by 
+			overriding the new <del>RestServlet#handleNotFound(int,RestRequest,RestResponse)</del> method.
 		<li>New {@link org.apache.juneau.rest.RestRequest} methods: 
 			<ul>
-				<li>{@del RestRequest#resolveVars(String)}
+				<li><del>RestRequest#resolveVars(String)</del>
 				<li><c>RestRequest.getVarResource(String)</c>
-				<li>{@del RestRequest#getConfig()}
+				<li><del>RestRequest#getConfig()</del>
 			</ul>
 		<li>New {@link org.apache.juneau.rest.RestResponse} methods: 
 			<ul>
@@ -31555,15 +31561,15 @@
 					<c>getWriter()</c> now returns an unnegotiated writer.  
 					<c>getUnbufferedWriter()</c> has been removed.
 			</ul>
-		<li>New {@del org.apache.juneau.rest.annotation.RestMethod#encoders() @RestMethod(encoders)} and 
-			{@del RestMethod#inheritEncoders()} annotations.  
+		<li>New <del>RestMethod#encoders() @RestMethod(encoders)</del> and 
+			<del>RestMethod#inheritEncoders()</del> annotations.  
 			Allows encoders to be fine-tuned at the method level.
-		<li>New {@del @RestResource(config)} annotation for associating external {@del ConfigFile} config files with servlets.
-		<li>{@del ResourceLink}.
+		<li>New <del>@RestResource(config)</del> annotation for associating external <del>ConfigFile</del> config files with servlets.
+		<li><del>ResourceLink</del>.
 		<li>New <c>org.apache.juneau.rest.matcher</c> package for commonly-used {@link org.apache.juneau.rest.RestMatcher RestMatchers}:
 			<ul>
-				<li>{@del org.apache.juneau.rest.matchers#MultipartFormDataMatcher}
-				<li>{@del org.apache.juneau.rest.matchers#UrlEncodedFormMatcher}
+				<li><del>matchers#MultipartFormDataMatcher</del>
+				<li><del>matchers#UrlEncodedFormMatcher</del>
 			</ul>
 	</ul>
 			
@@ -31596,40 +31602,40 @@
 		<li>Significant changes and enhancements to the <c>org.apache.juneau.config</c> API.
 			<ul>
 				<li>More consistent handling of comma-delimited lists of objects.
-				<li>New methods in {@del ConfigFile}:
+				<li>New methods in <del>ConfigFile</del>:
 					<ul>
-						<li>{@del ConfigFile#getStringArray(String)},{@del ConfigFile#getStringArray(String,String[])}
-						<li>{@del ConfigFile#getSectionAsBean(String,Class)} - Instantiate a new bean with property values in the specified section..
-						<li>{@del ConfigFile#writeProperties(String,Object,boolean,Class[])} - Copy the properties in a config file section into properties on an existing bean or POJO.
-						<li>{@del ConfigFile#getSectionMap(String)} - Get all the resolved values in a section.
-						<li>{@del ConfigFile#containsNonEmptyValue(String)} 
-						<li>{@del ConfigFile#isEncoded(String)} 
-						<li>{@del ConfigFile#addListener(ConfigFileListener)} - Listen for modification events on the config file.
-						<li>{@del ConfigFile#merge(ConfigFile)} - Merge the contents of another config file into this config file.
-						<li>{@del ConfigFile#getResolving()}, {@del ConfigFile#getResolving(StringVarResolver)} - Return an instance of the config file that resolves string variables.
+						<li><del>ConfigFile#getStringArray(String)</del>,<del>ConfigFile#getStringArray(String,String[])</del>
+						<li><del>ConfigFile#getSectionAsBean(String,Class)</del> - Instantiate a new bean with property values in the specified section..
+						<li><del>ConfigFile#writeProperties(String,Object,boolean,Class[])</del> - Copy the properties in a config file section into properties on an existing bean or POJO.
+						<li><del>ConfigFile#getSectionMap(String)</del> - Get all the resolved values in a section.
+						<li><del>ConfigFile#containsNonEmptyValue(String)</del> 
+						<li><del>ConfigFile#isEncoded(String)</del> 
+						<li><del>ConfigFile#addListener(ConfigFileListener)</del> - Listen for modification events on the config file.
+						<li><del>ConfigFile#merge(ConfigFile)</del> - Merge the contents of another config file into this config file.
+						<li><del>ConfigFile#getResolving()</del>, <del>ConfigFile#getResolving(StringVarResolver)</del> - Return an instance of the config file that resolves string variables.
 							Much more efficient than the previous design since the same underlying config file object is shared.
-						<li>{@del ConfigFile#toWritable()} - Wraps the config file in a {@del org.apache.juneau.Writable} interface so that it can be serialized by the REST interface as a plain-text INI file instead of as a serialized POJO.
-						<li>{@del ConfigFile#getInt(String)} - Now supports <js>"M"</js> and <js>"K"</js> to identify millions and thousands.
+						<li><del>ConfigFile#toWritable()</del> - Wraps the config file in a <del>Writable</del> interface so that it can be serialized by the REST interface as a plain-text INI file instead of as a serialized POJO.
+						<li><del>ConfigFile#getInt(String)</del> - Now supports <js>"M"</js> and <js>"K"</js> to identify millions and thousands.
 					</ul>
-				<li>New methods in {@del ConfigMgr}:
+				<li>New methods in <del>ConfigMgr</del>:
 					<ul>
-						<li>{@del ConfigMgr#create()}, {@del ConfigMgr#create(Reader)}, {@del ConfigMgr#create(File)}
-						<li>{@del ConfigMgr#deleteAll()}	
+						<li><del>ConfigMgr#create()</del>, <del>ConfigMgr#create(Reader)</del>, <del>ConfigMgr#create(File)</del>
+						<li><del>ConfigMgr#deleteAll()</del>	
 					</ul>
-				<li>New methods in {@del Section}:
+				<li>New methods in <del>Section</del>:
 					<ul>
-						<li>{@del Section#setParent(ConfigFileImpl)} - Used by parsers to set the config file for this section.
-						<li>{@del Section#setName(String)} - Used by parsers to set the name for this section.
+						<li><del>Section#setParent(ConfigFileImpl)</del> - Used by parsers to set the config file for this section.
+						<li><del>Section#setName(String)</del> - Used by parsers to set the name for this section.
 					</ul>
 				<li>New interfaces:
 					<ul>
-						<li>{@del org.apache.juneau.config.ConfigFileListener}
-						<li>{@del org.apache.juneau.config.SectionListener}
-						<li>{@del org.apache.juneau.config.EntryListener}
+						<li><del>ConfigFileListener</del>
+						<li><del>SectionListener</del>
+						<li><del>EntryListener</del>
 					</ul>
-				<li>{@del org.apache.juneau.config.Encoder} methods have access to field names to use them as salt values.
+				<li><del>Encoder</del> methods have access to field names to use them as salt values.
 				<li>The name of the default section is now <js>"default"</js>.  Before it was just <jk>null</jk>.
-				<li>{@del org.apache.juneau.config.XorEncoder} XOR key can be overridden through the <js>"org.apache.juneau.config.XorEncoder.key"</js> system property.
+				<li><del>XorEncoder</del> XOR key can be overridden through the <js>"org.apache.juneau.config.XorEncoder.key"</js> system property.
 			</ul> 
 		<li>Support for converting Strings to POJOs if the POJO class has any of the following static methods: 
 			<ul>
@@ -31653,126 +31659,126 @@
 		<li>Parsers have been enhanced to allow parent POJOs and field names to be passed into child POJOs.
 			New {@link org.apache.juneau.annotation.NameProperty @NameProperty} and {@link org.apache.juneau.annotation.ParentProperty @ParentProperty}
 				annotations are provided for identifying methods for setting names and parent POJOs on child POJOs.
-			For example, the config file {@del Section} class represents a section
-			in a config file.  It needs to know it's own name and have a link to the {@del ConfigFile} 
+			For example, the config file <del>Section</del> class represents a section
+			in a config file.  It needs to know it's own name and have a link to the <del>ConfigFile</del> 
 			that it belongs to.  With these new annotations, config files can be reconstructed using any of the parsers.
 		<li>New classes and interfaces:
 			<ul>
-				<li>{@del org.apache.juneau.Streamable} interface for identifying objects that can be serialized directly to an output stream.
-				<li>{@del org.apache.juneau.Writable} interface for identifying objects that can be serialized directly to a writer.
-				<li>{@del StringObject} class that can be used for delayed object serialization.
-				<li>{@del ByteArrayCache}
-				<li>{@del org.apache.juneau.internal.ByteArrayInOutStream} 
+				<li><del>Streamable</del> interface for identifying objects that can be serialized directly to an output stream.
+				<li><del>Writable</del> interface for identifying objects that can be serialized directly to a writer.
+				<li><del>StringObject</del> class that can be used for delayed object serialization.
+				<li><del>ByteArrayCache</del>
+				<li><del>ByteArrayInOutStream</del> 
 				<li>{@link org.apache.juneau.internal.FileUtils}
 				<li>{@link org.apache.juneau.internal.ThrowableUtils}
-				<li>{@del StringVarMultipart}
-				<li>{@del StringVarWithDefault}
+				<li><del>StringVarMultipart</del>
+				<li><del>StringVarWithDefault</del>
 			</ul> 
-		<li>New fields on {@del org.apache.juneau.ObjectList}:
+		<li>New fields on <del>ObjectList</del>:
 			<ul>
-				<li>{@del org.apache.juneau.ObjectList#EMPTY_LIST}
+				<li><del>ObjectList#EMPTY_LIST</del>
 			</ul>
-		<li>New fields and methods on {@del org.apache.juneau.ObjectMap}:
+		<li>New fields and methods on <del>ObjectMap</del>:
 			<ul>
-				<li>{@del org.apache.juneau.ObjectMap#EMPTY_MAP}
-				<li>{@del org.apache.juneau.ObjectMap#getStringArray(String)}
-				<li>{@del org.apache.juneau.ObjectMap#getStringArray(String,String[])}
-				<li>{@del org.apache.juneau.ObjectMap#putIfNull(String,Object)}
-				<li>{@del org.apache.juneau.ObjectMap#putIfEmpty(String,Object)}
+				<li><del>ObjectMap#EMPTY_MAP</del>
+				<li><del>ObjectMap#getStringArray(String)</del>
+				<li><del>ObjectMap#getStringArray(String,String[])</del>
+				<li><del>ObjectMap#putIfNull(String,Object)</del>
+				<li><del>ObjectMap#putIfEmpty(String,Object)</del>
 			</ul>
 		<li>New methods in {@link org.apache.juneau.internal.ArrayUtils}:
 			<ul>
-				<li>{@del org.apache.juneau.internal.ArrayUtils#contains(Object,Object[])}
-				<li>{@del org.apache.juneau.internal.ArrayUtils#indexOf(Object,Object[])}
-				<li>{@del org.apache.juneau.internal.ArrayUtils#toPrimitiveArray(Object)}
+				<li><del>ArrayUtils#contains(Object,Object[])</del>
+				<li><del>ArrayUtils#indexOf(Object,Object[])</del>
+				<li><del>ArrayUtils#toPrimitiveArray(Object)</del>
 			</ul>	
 		<li>New methods in {@link org.apache.juneau.internal.IOUtils}:
 			<ul>
-				<li>{@del IOUtils#pipe(Reader,Writer)}
+				<li><del>IOUtils#pipe(Reader,Writer)</del>
 				<li>{@link org.apache.juneau.internal.IOUtils#read(File)}
-				<li>{@del IOUtils#readFile(String)}
-				<li>{@del IOUtils#write(File,Reader)}
-			</ul>
-		<li>New methods on {@del org.apache.juneau.utils.PojoRest}:
-			<ul>
-				<li>{@del PojoRest#get(Class,String,Object)}
-				<li>{@del org.apache.juneau.utils.PojoRest#getString(String)}
-				<li>{@del org.apache.juneau.utils.PojoRest#getString(String,String)}
-				<li>{@del org.apache.juneau.utils.PojoRest#getInt(String)}
-				<li>{@del org.apache.juneau.utils.PojoRest#getInt(String,Integer)}
-				<li>{@del org.apache.juneau.utils.PojoRest#getLong(String)}
-				<li>{@del org.apache.juneau.utils.PojoRest#getLong(String,Long)}
-				<li>{@del org.apache.juneau.utils.PojoRest#getBoolean(String)}
-				<li>{@del org.apache.juneau.utils.PojoRest#getBoolean(String,Boolean)}
-				<li>{@del org.apache.juneau.utils.PojoRest#getMap(String)}
-				<li>{@del org.apache.juneau.utils.PojoRest#getMap(String,Map)}
-				<li>{@del org.apache.juneau.utils.PojoRest#getList(String)}
-				<li>{@del org.apache.juneau.utils.PojoRest#getList(String,List)}
-				<li>{@del getObjectMap(String)}
-				<li>{@del getObjectMap(String,ObjectMap)}
-				<li>{@del getObjectList(String)}
-				<li>{@del getObjectList(String,ObjectList)}
-			</ul>
-		<li>New methods on {@del org.apache.juneau.utils.ProcBuilder}:
-			<ul>
-				<li>{@del org.apache.juneau.utils.ProcBuilder#pipeTo(Writer,boolean)}
-				<li>{@del org.apache.juneau.utils.ProcBuilder#pipeTo(Writer)}
-				<li>{@del org.apache.juneau.utils.ProcBuilder#logTo(Writer,boolean)}
-				<li>{@del org.apache.juneau.utils.ProcBuilder#logTo(Writer)}
-				<li>{@del org.apache.juneau.utils.ProcBuilder#logTo(Level,Logger)}
-				<li>{@del org.apache.juneau.utils.ProcBuilder#maxExitStatus(int)}
+				<li><del>IOUtils#readFile(String)</del>
+				<li><del>IOUtils#write(File,Reader)</del>
+			</ul>
+		<li>New methods on <del>PojoRest</del>:
+			<ul>
+				<li><del>PojoRest#get(Class,String,Object)</del>
+				<li><del>PojoRest#getString(String)</del>
+				<li><del>PojoRest#getString(String,String)</del>
+				<li><del>PojoRest#getInt(String)</del>
+				<li><del>PojoRest#getInt(String,Integer)</del>
+				<li><del>PojoRest#getLong(String)</del>
+				<li><del>PojoRest#getLong(String,Long)</del>
+				<li><del>PojoRest#getBoolean(String)</del>
+				<li><del>PojoRest#getBoolean(String,Boolean)</del>
+				<li><del>PojoRest#getMap(String)</del>
+				<li><del>PojoRest#getMap(String,Map)</del>
+				<li><del>PojoRest#getList(String)</del>
+				<li><del>PojoRest#getList(String,List)</del>
+				<li><del>getObjectMap(String)</del>
+				<li><del>getObjectMap(String,ObjectMap)</del>
+				<li><del>getObjectList(String)</del>
+				<li><del>getObjectList(String,ObjectList)</del>
+			</ul>
+		<li>New methods on <del>ProcBuilder</del>:
+			<ul>
+				<li><del>ProcBuilder#pipeTo(Writer,boolean)</del>
+				<li><del>ProcBuilder#pipeTo(Writer)</del>
+				<li><del>ProcBuilder#logTo(Writer,boolean)</del>
+				<li><del>ProcBuilder#logTo(Writer)</del>
+				<li><del>ProcBuilder#logTo(Level,Logger)</del>
+				<li><del>ProcBuilder#maxExitStatus(int)</del>
 			</ul>
 		<li>New methods on {@link org.apache.juneau.internal.StringUtils}:
 			<ul>
-				<li>{@del org.apache.juneau.internal.StringUtils#isEmpty(Object)}
+				<li><del>StringUtils#isEmpty(Object)</del>
 				<li>{@link org.apache.juneau.internal.StringUtils#nullIfEmpty(String)}
 				<li>{@link org.apache.juneau.internal.StringUtils#base64EncodeToString(String)}
 				<li>{@link org.apache.juneau.internal.StringUtils#base64Encode(byte[])}
 				<li>{@link org.apache.juneau.internal.StringUtils#base64DecodeToString(String)}
 				<li>{@link org.apache.juneau.internal.StringUtils#base64Decode(String)}
-				<li>{@del org.apache.juneau.internal.StringUtils#generateUUID(int)}
+				<li><del>StringUtils#generateUUID(int)</del>
 				<li>{@link org.apache.juneau.internal.StringUtils#trim(String)}
-				<li>{@del StringUtils#parseISO8601Date(String)}
+				<li><del>StringUtils#parseISO8601Date(String)</del>
 				<li>{@link org.apache.juneau.internal.StringUtils#replaceVars(String,Map)}
-				<li>{@del org.apache.juneau.internal.StringUtils#pathStartsWith(String,String)}
-				<li>{@del org.apache.juneau.internal.StringUtils#pathStartsWith(String,String[])}
+				<li><del>StringUtils#pathStartsWith(String,String)</del>
+				<li><del>StringUtils#pathStartsWith(String,String[])</del>
 			</ul>
-		<li>New {@del StringVar#doResolve(String)} method.
-		<li>New {@del StringVarResolver#DEFAULT} field.
+		<li>New <del>StringVar#doResolve(String)</del> method.
+		<li>New <del>StringVarResolver#DEFAULT</del> field.
 		<li>Eliminated dependency on <c>javax.mail.internet.MimeUtility</c> by implementing our own {@link org.apache.juneau.internal.StringUtils#base64Encode(byte[])} method.
-		<li>{@del org.apache.juneau.transforms.CalendarSwap} and {@del org.apache.juneau.transforms.DateSwap} classes now handle blank input better.  Returns <jk>null</jk> instead of throwing an exception.
+		<li><del>CalendarSwap</del> and <del>DateSwap</del> classes now handle blank input better.  Returns <jk>null</jk> instead of throwing an exception.
 		<li>{@link org.apache.juneau.html.HtmlDocSerializer} specifies the default CSS location as <c>/servletPath/style.css</c> instead of <c>/servletPath/htdocs/juneau.css</c>.  
 			This coincides with enhancements made in the server code for specifying styles.
 		<li>{@link org.apache.juneau.html.HtmlDocSerializer} wraps output in two div tags instead of one (e.g. <c>&lt;div class='outerdata'&gt;&lt;div class='data' id='data'&gt;...&lt;/div&gt;&lt;/div&gt;</c>).
 			Needed for supporting the new devops look-and-feel.
 		<li>Fixed indentation inconsistencies in {@link org.apache.juneau.html.HtmlDocSerializer}.
-		<li>Renamed {@del HtmlSchemaSerializer} to {@del HtmlSchemaDocSerializer}.
+		<li>Renamed <del>HtmlSchemaSerializer</del> to <del>HtmlSchemaDocSerializer</del>.
 		<li>RDF serializers and parsers now support <c>RdfProperties.RDF_looseCollection</c> loose collections.
 		<li>RDF parser handles case where resources point to themselves (an unfortunate behavior in JFS RDF documents).
 		<li>JSON parser with throw an exception in strict mode if it encounters numbers that are valid in Java but invalid in JSON (e.g. octal, hexadecimal numbers).
 		<li>{@link org.apache.juneau.parser.Parser} methods now check for <jk>null</jk> input.
-		<li>{@del org.apache.juneau.serializer.SerializerGroup} and {@del org.apache.juneau.parser.ParserGroup} ignores serializers and parsers if they throw <c>NoClassDefFoundErrors</c>.
+		<li><del>SerializerGroup</del> and <del>ParserGroup</del> ignores serializers and parsers if they throw <c>NoClassDefFoundErrors</c>.
 		<li>{@link org.apache.juneau.urlencoding.UrlEncodingParser} creates lists if the same attribute name is encountered more than once.  Before it would just replace the previous value with the new value.
-		<li>New {@del UrlEncodingSerializer#DEFAULT_SIMPLE_EXPANDED} serializer.
-		<li>Changes to {@del Args}:
+		<li>New <del>UrlEncodingSerializer#DEFAULT_SIMPLE_EXPANDED</del> serializer.
+		<li>Changes to <del>Args</del>:
 			<ul>
-				<li><c>getMainArg(int)</c> changed to {@del Args#getArg(int)}.  
+				<li><c>getMainArg(int)</c> changed to <del>Args#getArg(int)</del>.  
 					Non-existent arguments are returned as <jk>null</jk> instead of blank strings.  
 					This is more inline with the behavior of the rest of the library.
-				<li>New {@del Args#hasArg(int)} method.
+				<li>New <del>Args#hasArg(int)</del> method.
 			</ul> 
 		<li>Removed <c>org.apache.juneau.utils.CharsetUtils</c> class.
 		<li>Removed <c>org.apache.juneau.utils.ConcurrentIdentityList</c> class.
 		<li>Fixed bug in {@link org.apache.juneau.internal.MultiIterable} class.
-		<li>{@del org.apache.juneau.utils.PojoIntrospector} must now be instantiated with a <c>ReaderParser</c>.
+		<li><del>PojoIntrospector</del> must now be instantiated with a <c>ReaderParser</c>.
 			Simplifies the API on the class.
-		<li>{@del org.apache.juneau.utils.PojoRest} must now be instantiated with a <c>ReaderParser</c>.
+		<li><del>PojoRest</del> must now be instantiated with a <c>ReaderParser</c>.
 			Simplifies the API on the class.
-		<li>{@del org.apache.juneau.utils.MessageBundle} and <c>SafeResourceMultiBundle</c> moved from server component.
-		<li>Several bug fixes and performance improvements in {@del StringVarResolver}.
-		<li>Various enhancements to {@del org.apache.juneau.internal.TeeWriter} and {@del org.apache.juneau.internal.TeeOutputStream}.
-		<li>Renamed {@del CharSet} to {@link org.apache.juneau.internal.AsciiSet}.
-		<li>{@del org.apache.juneau.serializer.SerializerGroup} and {@del org.apache.juneau.parser.ParserGroup} now ignores <c>NoClassDefFoundErrors</c>
+		<li><del>MessageBundle</del> and <c>SafeResourceMultiBundle</c> moved from server component.
+		<li>Several bug fixes and performance improvements in <del>StringVarResolver</del>.
+		<li>Various enhancements to <del>TeeWriter</del> and <del>TeeOutputStream</del>.
+		<li>Renamed <del>CharSet</del> to {@link org.apache.juneau.internal.AsciiSet}.
+		<li><del>SerializerGroup</del> and <del>ParserGroup</del> now ignores <c>NoClassDefFoundErrors</c>
 			so that resources that include Jena support can continue to operate even if the Jena libraries are not present.
 		<li>New {@link org.apache.juneau.internal.FileUtils#createTempFile(String)} method.
 		<li>New {@link org.apache.juneau.utils.PojoQuery} modified to handle bean getters that throw exceptions.
@@ -31783,100 +31789,100 @@
 		<li>Upgraded to use Apache HttpClient 4.5.
 		<li>New classes:
 			<ul>
-				<li>{@del org.apache.juneau.rest.client.AllowAllRedirects}
-				<li>{@del org.apache.juneau.rest.client.HttpMethod}
-				<li>{@del org.apache.juneau.rest.client.ResponsePattern}
-				<li>{@del org.apache.juneau.rest.client.SimpleX509TrustManager}
-				<li>{@del SSLOpts}
+				<li><del>AllowAllRedirects</del>
+				<li><del>HttpMethod</del>
+				<li><del>ResponsePattern</del>
+				<li><del>SimpleX509TrustManager</del>
+				<li><del>SSLOpts</del>
 			</ul>
 		<li>Removed <c>org.apache.juneau.rest.client.LaxRedirectStrategy</c>.  Use HTTP Client equivalent.
-		<li>New methods on {@del org.apache.juneau.rest.client.RestCall}:
-			<ul>
-				<li>{@del RestCall#addInterceptor(RestCallInterceptor)}
-				<li>{@del org.apache.juneau.rest.client.RestCall#pipeTo(Writer)}
-				<li>{@del org.apache.juneau.rest.client.RestCall#pipeTo(Writer,boolean)}
-				<li>{@del org.apache.juneau.rest.client.RestCall#pipeTo(String,Writer,boolean)}
-				<li>{@del org.apache.juneau.rest.client.RestCall#getWriter(String)}
-				<li>{@del org.apache.juneau.rest.client.RestCall#pipeTo(OutputStream)}
-				<li>{@del org.apache.juneau.rest.client.RestCall#pipeTo(OutputStream,boolean)}
-				<li>{@del org.apache.juneau.rest.client.RestCall#pipeTo(String,OutputStream,boolean)}
-				<li>{@del org.apache.juneau.rest.client.RestCall#getOutputStream(String)}
-				<li>{@del org.apache.juneau.rest.client.RestCall#byLines()}
-				<li>{@del org.apache.juneau.rest.client.RestCall#captureResponse()}
-				<li>{@del org.apache.juneau.rest.client.RestCall#successPattern(String)}
-				<li>{@del org.apache.juneau.rest.client.RestCall#failurePattern(String)}
-				<li>{@del RestCall#addResponsePattern(ResponsePattern)}
-				<li>{@del org.apache.juneau.rest.client.RestCall#run()} - Renamed from <c>execute()</c>.
-				<li>{@del org.apache.juneau.rest.client.RestCall#getCapturedResponse()}
-				<li>{@del org.apache.juneau.rest.client.RestCall#getResponsePojoRest(Class)}
-				<li>{@del org.apache.juneau.rest.client.RestCall#getResponsePojoRest()}
-				<li>{@del org.apache.juneau.rest.client.RestCall#logTo(Level,Logger)}
-				<li>{@del org.apache.juneau.rest.client.RestCall#setConfig(RequestConfig)}
-			</ul>
-		<li>New lifecycle listener methods on {@del org.apache.juneau.rest.client.RestCallInterceptor}:
-			<ul>
-				<li>{@del RestCallInterceptor#onInit(RestCall)}
-				<li>{@del RestCallInterceptor#onClose(RestCall)}
+		<li>New methods on <del>RestCall</del>:
+			<ul>
+				<li><del>RestCall#addInterceptor(RestCallInterceptor)</del>
+				<li><del>RestCall#pipeTo(Writer)</del>
+				<li><del>RestCall#pipeTo(Writer,boolean)</del>
+				<li><del>RestCall#pipeTo(String,Writer,boolean)</del>
+				<li><del>RestCall#getWriter(String)</del>
+				<li><del>RestCall#pipeTo(OutputStream)</del>
+				<li><del>RestCall#pipeTo(OutputStream,boolean)</del>
+				<li><del>RestCall#pipeTo(String,OutputStream,boolean)</del>
+				<li><del>RestCall#getOutputStream(String)</del>
+				<li><del>RestCall#byLines()</del>
+				<li><del>RestCall#captureResponse()</del>
+				<li><del>RestCall#successPattern(String)</del>
+				<li><del>RestCall#failurePattern(String)</del>
+				<li><del>RestCall#addResponsePattern(ResponsePattern)</del>
+				<li><del>RestCall#run()</del> - Renamed from <c>execute()</c>.
+				<li><del>RestCall#getCapturedResponse()</del>
+				<li><del>RestCall#getResponsePojoRest(Class)</del>
+				<li><del>RestCall#getResponsePojoRest()</del>
+				<li><del>RestCall#logTo(Level,Logger)</del>
+				<li><del>RestCall#setConfig(RequestConfig)</del>
+			</ul>
+		<li>New lifecycle listener methods on <del>RestCallInterceptor</del>:
+			<ul>
+				<li><del>RestCallInterceptor#onInit(RestCall)</del>
+				<li><del>RestCallInterceptor#onClose(RestCall)</del>
 			</ul>
 		<li>New methods on {@link org.apache.juneau.rest.client.RestClient}:
 			<ul>
-				<li>{@del RestClient#setBasicAuth(String,int,String,String)}
-				<li>{@del RestClient#logTo(Level,Logger)}
-				<li>{@del RestClient#setRootUrl(String)}
-				<li>{@del RestClient#enableSSL(SSLOpts)}
-				<li>{@del RestClient#enableLaxSSL()}
-				<li>{@del RestClient#doCall(HttpMethod,Object,Object)}
-				<li>{@del RestClient#createHttpClientBuilder()}
+				<li><del>RestClient#setBasicAuth(String,int,String,String)</del>
+				<li><del>RestClient#logTo(Level,Logger)</del>
+				<li><del>RestClient#setRootUrl(String)</del>
+				<li><del>RestClient#enableSSL(SSLOpts)</del>
+				<li><del>RestClient#enableLaxSSL()</del>
+				<li><del>RestClient#doCall(HttpMethod,Object,Object)</del>
+				<li><del>RestClient#createHttpClientBuilder()</del>
 			</ul>
 		<li>New passthrough methods on {@link org.apache.juneau.rest.client.RestClient} defined on <c>HttpClientBuilder</c>:
 			<ul>
-				<li>{@del RestClient#setRedirectStrategy(RedirectStrategy)}
-				<li>{@del RestClient#setDefaultCookieSpecRegistry(Lookup)}
-				<li>{@del RestClient#setRequestExecutor(HttpRequestExecutor)}
-				<li>{@del RestClient#setSSLHostnameVerifier(HostnameVerifier)}
-				<li>{@del RestClient#setPublicSuffixMatcher(PublicSuffixMatcher)}
-				<li>{@del RestClient#setSSLContext(SSLContext)}
-				<li>{@del RestClient#setSSLSocketFactory(LayeredConnectionSocketFactory)}
-				<li>{@del RestClient#setMaxConnTotal(int)}
-				<li>{@del RestClient#setMaxConnPerRoute(int)}
-				<li>{@del RestClient#setDefaultSocketConfig(SocketConfig)}
-				<li>{@del RestClient#setDefaultConnectionConfig(ConnectionConfig)}
-				<li>{@del RestClient#setConnectionTimeToLive(long,TimeUnit)}
-				<li>{@del RestClient#setConnectionManager(HttpClientConnectionManager)}
-				<li>{@del RestClient#setConnectionManagerShared(boolean)}
-				<li>{@del RestClient#setConnectionReuseStrategy(ConnectionReuseStrategy)}
-				<li>{@del RestClient#setKeepAliveStrategy(ConnectionKeepAliveStrategy)}
-				<li>{@del RestClient#setTargetAuthenticationStrategy(AuthenticationStrategy)}
-				<li>{@del RestClient#setProxyAuthenticationStrategy(AuthenticationStrategy)}
-				<li>{@del RestClient#setUserTokenHandler(UserTokenHandler)}
-				<li>{@del RestClient#disableConnectionState()}
-				<li>{@del RestClient#setSchemePortResolver(SchemePortResolver)}
-				<li>{@del RestClient.setUserAgent(String)}
-				<li>{@del RestClient#setDefaultHeaders(Collection)}
-				<li>{@del RestClient#addInterceptorFirst(HttpResponseInterceptor)}
-				<li>{@del RestClient#addInterceptorLast(HttpResponseInterceptor)}
-				<li>{@del RestClient#addInterceptorFirst(HttpRequestInterceptor)}
-				<li>{@del RestClient#addInterceptorLast(HttpRequestInterceptor)}
-				<li>{@del RestClient#disableCookieManagement()}
-				<li>{@del RestClient#disableContentCompression()}
-				<li>{@del RestClient#disableAuthCaching()}
-				<li>{@del RestClient#setHttpProcessor(HttpProcessor)}
-				<li>{@del RestClient#setRetryHandler(HttpRequestRetryHandler)}
-				<li>{@del RestClient#disableAutomaticRetries()}
-				<li>{@del RestClient#setProxy(HttpHost)}
-				<li>{@del RestClient#setRoutePlanner(HttpRoutePlanner)}
-				<li>{@del RestClient#disableRedirectHandling()}
-				<li>{@del RestClient#setConnectionBackoffStrategy(ConnectionBackoffStrategy)}
-				<li>{@del RestClient#setBackoffManager(BackoffManager)}
-				<li>{@del RestClient#setServiceUnavailableRetryStrategy(ServiceUnavailableRetryStrategy)}
-				<li>{@del RestClient#setDefaultCookieStore(CookieStore)}
-				<li>{@del RestClient#setDefaultCredentialsProvider(CredentialsProvider)}
-				<li>{@del RestClient#setDefaultAuthSchemeRegistry(Lookup)}
-				<li>{@del RestClient#setContentDecoderRegistry(Map)}
-				<li>{@del RestClient#setDefaultRequestConfig(RequestConfig)}
-				<li>{@del RestClient#useSystemProperties()}
-				<li>{@del RestClient#evictExpiredConnections()}
-				<li>{@del RestClient#evictIdleConnections(long,TimeUnit)}
+				<li><del>RestClient#setRedirectStrategy(RedirectStrategy)</del>
+				<li><del>RestClient#setDefaultCookieSpecRegistry(Lookup)</del>
+				<li><del>RestClient#setRequestExecutor(HttpRequestExecutor)</del>
+				<li><del>RestClient#setSSLHostnameVerifier(HostnameVerifier)</del>
+				<li><del>RestClient#setPublicSuffixMatcher(PublicSuffixMatcher)</del>
+				<li><del>RestClient#setSSLContext(SSLContext)</del>
+				<li><del>RestClient#setSSLSocketFactory(LayeredConnectionSocketFactory)</del>
+				<li><del>RestClient#setMaxConnTotal(int)</del>
+				<li><del>RestClient#setMaxConnPerRoute(int)</del>
+				<li><del>RestClient#setDefaultSocketConfig(SocketConfig)</del>
+				<li><del>RestClient#setDefaultConnectionConfig(ConnectionConfig)</del>
+				<li><del>RestClient#setConnectionTimeToLive(long,TimeUnit)</del>
+				<li><del>RestClient#setConnectionManager(HttpClientConnectionManager)</del>
+				<li><del>RestClient#setConnectionManagerShared(boolean)</del>
+				<li><del>RestClient#setConnectionReuseStrategy(ConnectionReuseStrategy)</del>
+				<li><del>RestClient#setKeepAliveStrategy(ConnectionKeepAliveStrategy)</del>
+				<li><del>RestClient#setTargetAuthenticationStrategy(AuthenticationStrategy)</del>
+				<li><del>RestClient#setProxyAuthenticationStrategy(AuthenticationStrategy)</del>
+				<li><del>RestClient#setUserTokenHandler(UserTokenHandler)</del>
+				<li><del>RestClient#disableConnectionState()</del>
+				<li><del>RestClient#setSchemePortResolver(SchemePortResolver)</del>
+				<li><del>setUserAgent(String)</del>
+				<li><del>RestClient#setDefaultHeaders(Collection)</del>
+				<li><del>RestClient#addInterceptorFirst(HttpResponseInterceptor)</del>
+				<li><del>RestClient#addInterceptorLast(HttpResponseInterceptor)</del>
+				<li><del>RestClient#addInterceptorFirst(HttpRequestInterceptor)</del>
+				<li><del>RestClient#addInterceptorLast(HttpRequestInterceptor)</del>
+				<li><del>RestClient#disableCookieManagement()</del>
+				<li><del>RestClient#disableContentCompression()</del>
+				<li><del>RestClient#disableAuthCaching()</del>
+				<li><del>RestClient#setHttpProcessor(HttpProcessor)</del>
+				<li><del>RestClient#setRetryHandler(HttpRequestRetryHandler)</del>
+				<li><del>RestClient#disableAutomaticRetries()</del>
+				<li><del>RestClient#setProxy(HttpHost)</del>
+				<li><del>RestClient#setRoutePlanner(HttpRoutePlanner)</del>
+				<li><del>RestClient#disableRedirectHandling()</del>
+				<li><del>RestClient#setConnectionBackoffStrategy(ConnectionBackoffStrategy)</del>
+				<li><del>RestClient#setBackoffManager(BackoffManager)</del>
+				<li><del>RestClient#setServiceUnavailableRetryStrategy(ServiceUnavailableRetryStrategy)</del>
+				<li><del>RestClient#setDefaultCookieStore(CookieStore)</del>
+				<li><del>RestClient#setDefaultCredentialsProvider(CredentialsProvider)</del>
+				<li><del>RestClient#setDefaultAuthSchemeRegistry(Lookup)</del>
+				<li><del>RestClient#setContentDecoderRegistry(Map)</del>
+				<li><del>RestClient#setDefaultRequestConfig(RequestConfig)</del>
+				<li><del>RestClient#useSystemProperties()</del>
+				<li><del>RestClient#evictExpiredConnections()</del>
+				<li><del>RestClient#evictIdleConnections(long,TimeUnit)</del>
 			</ul>
 		<li><c>JazzRestClient</c> now supports OIDC authentication.
 		<li>These classes are now deprecated and will be removed in a future release:
@@ -31892,62 +31898,62 @@
 	
 	<h5 class='topic w800'>Server</h5>
 	<ul class='spaced-list'>
-		<li>New {@del ReaderResource} class.   
+		<li>New <del>ReaderResource</del> class.   
 			Represents the contents of a text file with convenience methods for resolving
-			{@del StringVar} variables and adding HTTP response headers.	
+			<del>StringVar</del> variables and adding HTTP response headers.	
 			REST Java methods can return instances of these to serialize <c>Readers</c>
-				containing text with {@del StringVarResolver} variables in them.
-		<li>New {@del StreamResource} class.   
+				containing text with <del>StringVarResolver</del> variables in them.
+		<li>New <del>StreamResource</del> class.   
 			REST Java methods can return instances of these to serialize <c>OutputStreams</c>.
-		<li>Fixed a bug in the stack trace hash algorithm in {@del org.apache.juneau.rest.RestException}.
+		<li>Fixed a bug in the stack trace hash algorithm in <del>RestException</del>.
 		<li>New methods in {@link org.apache.juneau.rest.RestRequest}:
 			<ul>
-				<li>{@del RestRequest#getReaderResource(String)} - Replaces <c>getVarResource(String)</c>.
-				<li>{@del RestRequest#getReaderResource(String,boolean)} 
-				<li>{@del RestRequest#getReaderResource(String,boolean,String)}
+				<li><del>RestRequest#getReaderResource(String)</del> - Replaces <c>getVarResource(String)</c>.
+				<li><del>RestRequest#getReaderResource(String,boolean)</del> 
+				<li><del>RestRequest#getReaderResource(String,boolean,String)</del>
 			</ul>
 		<li>Changes in {@link org.apache.juneau.rest.RestResponse}:
 			<ul>
 				<li>Don't set <c>Content-Encoding: identity</c> when no encoding is used.  Some clients don't interpret it correctly.
 			</ul>
-		<li>New methods in {@del org.apache.juneau.rest.RestServlet}:
+		<li>New methods in <del>RestServlet</del>:
 			<ul>
-				<li>{@del RestServlet#getChildClasses()}  - Programmatic equivalent to {@del @RestResource(children)} annotation.
-				<li>{@del RestServlet#shouldLog(HttpServletRequest,HttpServletResponse,RestException)} 
-				<li>{@del RestServlet#shouldLogStackTrace(HttpServletRequest,HttpServletResponse,RestException)} 
-				<li>{@del RestServlet#logObjects(Level,String,Object[])} 
-				<li>{@del RestServlet#resolveStaticFile(String)} 
-				<li>{@del RestServlet#createStyleSheet()} 
-				<li>{@del RestServlet#createFavIcon()} 
-				<li>{@del RestServlet#createStaticFilesMap()} 
-				<li>{@del RestServlet#getConfigMgr()}
+				<li><del>RestServlet#getChildClasses()</del>  - Programmatic equivalent to <del>@RestResource(children)</del> annotation.
+				<li><del>RestServlet#shouldLog(HttpServletRequest,HttpServletResponse,RestException)</del> 
+				<li><del>RestServlet#shouldLogStackTrace(HttpServletRequest,HttpServletResponse,RestException)</del> 
+				<li><del>RestServlet#logObjects(Level,String,Object[])</del> 
+				<li><del>RestServlet#resolveStaticFile(String)</del> 
+				<li><del>RestServlet#createStyleSheet()</del> 
+				<li><del>RestServlet#createFavIcon()</del> 
+				<li><del>RestServlet#createStaticFilesMap()</del> 
+				<li><del>RestServlet#getConfigMgr()</del>
 			</ul>
-		<li>Removed {@del org.apache.juneau.jso.JsoParser}
-			from {@del org.apache.juneau.rest.BasicRestServlet} and {@del RestServletJenaDefault}.  
+		<li>Removed <del>JsoParser</del>
+			from <del>BasicRestServlet</del> and <del>RestServletJenaDefault</del>.  
 			These may represent a security risk if not handled correctly, so removed
 			them as a precaution.
-		<li>Removed <c>RestServletProperties.REST_htDocsFolder</c>.  Replaced with {@del @RestResource(staticFiles)}}.
-		<li>New annotations on {@del @RestResource}.
+		<li>Removed <c>RestServletProperties.REST_htDocsFolder</c>.  Replaced with <del>@RestResource(staticFiles)</del>}.
+		<li>New annotations on <del>@RestResource</del>.
 			<ul>
-				<li>{@del RestResource#stylesheet()}
-				<li>{@del RestResource#favicon()}
-				<li>{@del @RestResource(staticFiles)}
+				<li><del>RestResource#stylesheet()</del>
+				<li><del>RestResource#favicon()</del>
+				<li><del>@RestResource(staticFiles)</del>
 			</ul>
 		<li>Eliminated <c>org.apache.juneau.rest.jaxrs.JsonProvider</c> class.  
 			Some JAX-RS implementations use code scanning to find providers, so if you were using <c>DefaultJenaProvider</c>, it would
 			pick up <c>JsonProvider</c> as well.  It's easy enough to create your own implementation if needed.
 		<li>OPTIONS pages now specify <c>consumes</c> and <c>produces</c> fields instead of <c>accept</c> and <c>contentType</c> which was confusing.  
 		<li>Eliminated <c>properties</c> from OPTIONS pages. 
-		<li>New {@del ResourceLink#ResourceLink(String,RestRequest,String,Object[])} constructor.
+		<li>New <del>ResourceLink#ResourceLink(String,RestRequest,String,Object[])</del> constructor.
 		<li>New response handlers:
 			<ul>
-				<li>{@del StreamableHandler} - Allows REST Java methods to return instances of {@del org.apache.juneau.Streamable}.
-				<li>{@del WritableHandler} - Allows REST Java methods to return instances of {@del org.apache.juneau.Writable}.
+				<li><del>StreamableHandler</del> - Allows REST Java methods to return instances of <del>Streamable</del>.
+				<li><del>WritableHandler</del> - Allows REST Java methods to return instances of <del>Writable</del>.
 			</ul>
 		<li>New DevOps stylesheet.
 		<li>Servlet initialization and HTTP requests are now logged at <JSF>FINE</JSF> level.
 		<li>Added <jk>abstract</jk> modifier on various <l>RestServlet</l> subclasses to indicate that they're meant to be subclassed.
-		<li>New {@del RestUtils#trimPathInfo(StringBuffer,String,String)} method.
+		<li>New <del>RestUtils#trimPathInfo(StringBuffer,String,String)</del> method.
 	</ul>
 	
 	<h5 class='topic w800'>Microservice</h5>
@@ -31955,7 +31961,7 @@
 		<li>Completely revamped API.
 		<li>New {@link org.apache.juneau.microservice.Microservice} class that serves as a generic
 			interface for microservices and their lifecycles.
-		<li>New {@del RestMicroservice} class that implements a microservice
+		<li>New <del>RestMicroservice</del> class that implements a microservice
 			consisting of a REST interface.
 			<ul>
 				<li>REST resources and configuration settings can be defined through either manifest files
@@ -31967,14 +31973,14 @@
 			</ul>
 		<li>Eliminated <c>org.apache.juneau.microservice.Main</c> class.  This is replaced by
 			the microservice classes defined above.
-		<li>{@del Resource} and {@del ResourceGroup}
+		<li><del>Resource</del> and <del>ResourceGroup</del>
 			classes now support the following new string variables:
 			<ul>
 				<li><js>"$A{key,default}""</js> - Command line arguments.
 				<li><js>"$MF{key,default}""</js> - Manifest file entries.
 			</ul> 
 		<li>CSS stylesheet now configurable through config file entry <js>"REST/stylesheet"</js>.
-		<li>New {@del BasicRestServletJena} class if you want your REST interface to support RDF.
+		<li>New <del>BasicRestServletJena</del> class if you want your REST interface to support RDF.
 		<li>Eliminated the following classes:
 			<ul>
 				<li><c>org.apache.juneau.microservice.RootResource</c>
@@ -31997,13 +32003,13 @@
 	
 	<h5 class='topic w800'>Documentation Updates</h5>
 	<ul class='spaced-list'>
-		<li>{@del org.apache.juneau.microservice} - New package-level javadoc.
-		<li>{@del org.apache.juneau.config} - New package-level javadoc.
-		<li>{@del StringVarResolver} - New documentation.
-		<li>{@del org.apache.juneau.rest.client} - New package-level javadoc.
+		<li><del>microservice</del> - New package-level javadoc.
+		<li><del>config</del> - New package-level javadoc.
+		<li><del>StringVarResolver</del> - New documentation.
+		<li><del>client</del> - New package-level javadoc.
 		<li><dc>Overview / Samples</dc> - New section.
 		<li><dc>org.apache.juneau.swap / Stop Classes</dc> - New section.
-		<li>{@del org.apache.juneau.rest} - Extensive updates.
+		<li><del>rest</del> - Extensive updates.
 	</ul>
 </div>
 </div><!-- END: 5.2.0.0 -->
@@ -32023,33 +32029,33 @@
 			Any line that begins with whitespace is interpreted as a continuation of the previous line.
 		<li>Support for <js>'\uXXXX'</js> character sequences in config files.
 		<li>Fixed issue in {@link org.apache.juneau.xml.XmlSerializer} where <js>'\r'</js> and <js>'\n'</js> characters were not being handled per XML specs.
-		<li>New methods on {@del org.apache.juneau.ObjectList}:  
+		<li>New methods on <del>ObjectList</del>:  
 			<ul>
-				<li>{@del ObjectList#getAt(Class,String)}
-				<li>{@del org.apache.juneau.ObjectList#putAt(String,Object)}
-				<li>{@del org.apache.juneau.ObjectList#postAt(String,Object)}
-				<li>{@del org.apache.juneau.ObjectList#deleteAt(String)}
+				<li><del>ObjectList#getAt(Class,String)</del>
+				<li><del>ObjectList#putAt(String,Object)</del>
+				<li><del>ObjectList#postAt(String,Object)</del>
+				<li><del>ObjectList#deleteAt(String)</del>
 			</ul>
-		<li>New methods on {@del org.apache.juneau.ObjectMap}:  
+		<li>New methods on <del>ObjectMap</del>:  
 			<ul>
-				<li>{@del ObjectMap#getAt(Class,String)}
-				<li>{@del org.apache.juneau.ObjectMap#putAt(String,Object)}
-				<li>{@del org.apache.juneau.ObjectMap#postAt(String,Object)}
-				<li>{@del org.apache.juneau.ObjectMap#deleteAt(String)}
+				<li><del>ObjectMap#getAt(Class,String)</del>
+				<li><del>ObjectMap#putAt(String,Object)</del>
+				<li><del>ObjectMap#postAt(String,Object)</del>
+				<li><del>ObjectMap#deleteAt(String)</del>
 			</ul>
-		<li>{@del @ThreadSafe} annotation.
+		<li><del>@ThreadSafe</del> annotation.
 		<li>New <c>ClassFilter</c> class.
-		<li>{@del ConfigFile#getResolving(StringVarResolver,boolean)} method.
-		<li>{@del ConfigFile#getStringVar()} method.
-		<li>New {@del ParserContext#PARSER_trimStrings} property.
-		<li>New {@del SerializerContext#SERIALIZER_trimStrings} property.
-		<li>{@del Args#getStringVar()} method.
+		<li><del>ConfigFile#getResolving(StringVarResolver,boolean)</del> method.
+		<li><del>ConfigFile#getStringVar()</del> method.
+		<li>New <del>ParserContext#PARSER_trimStrings</del> property.
+		<li>New <del>SerializerContext#SERIALIZER_trimStrings</del> property.
+		<li><del>Args#getStringVar()</del> method.
 		<li>New {@link org.apache.juneau.utils.ManifestFile} class
-		<li>New {@del org.apache.juneau.utils.MessageBundle} class.  Replaces <l>SafeResourceBundle</l>/<l>SafeResourceMultiBundle</l>/<l>RestNls</l>.
-		<li>New {@del StringMapVar} class.
-		<li>New {@del StringVars} class with reusable common {@del StringVar} instances.
-		<li>New {@del org.apache.juneau.internal.JuneauLogger} class.
-		<li>Default value for {@del XmlParserContext#XML_trimWhitespace} changed to <jk>true</jk>.			
+		<li>New <del>MessageBundle</del> class.  Replaces <l>SafeResourceBundle</l>/<l>SafeResourceMultiBundle</l>/<l>RestNls</l>.
+		<li>New <del>StringMapVar</del> class.
+		<li>New <del>StringVars</del> class with reusable common <del>StringVar</del> instances.
+		<li>New <del>JuneauLogger</del> class.
+		<li>Default value for <del>XmlParserContext#XML_trimWhitespace</del> changed to <jk>true</jk>.			
 	</ul>
 	
 	<h5 class='topic w800'>Server</h5>
@@ -32112,17 +32118,17 @@
 			The following features were added to enable this support:
 			<ul>
 				<li>{@link org.apache.juneau.annotation.Bean#typeName() @Bean(typeName)} - Annotation that defines an identifying name for a bean class.
-				<li>{@del org.apache.juneau.transform.BeanFilterBuilder#typeName(String)} - Programmatic equivalent to annotation above.
-				<li>{@del org.apache.juneau.BeanContext#BEAN_beanDictionary} - List of bean classes that make up the bean dictionary for lookup
+				<li><del>BeanFilterBuilder#typeName(String)</del> - Programmatic equivalent to annotation above.
+				<li><del>BeanContext#BEAN_beanDictionary</del> - List of bean classes that make up the bean dictionary for lookup
 					during parsing. 
-				<li>{@del BEAN_beanTypePropertyName} - The overridable type property name.  Default is <js>"_type"</js>.
-				<li>{@del @BeanProperty(beanDictionary)} - Define a type dictionary
-					for a particular bean property value.  This overrides the value specified using {@del org.apache.juneau.BeanContext#BEAN_beanDictionary}.
-				<li>{@del SerializerContext#SERIALIZER_addBeanTypeProperties} - Controls whether type properties are serialized.
+				<li><del>BEAN_beanTypePropertyName</del> - The overridable type property name.  Default is <js>"_type"</js>.
+				<li><del>@BeanProperty(beanDictionary)</del> - Define a type dictionary
+					for a particular bean property value.  This overrides the value specified using <del>BeanContext#BEAN_beanDictionary</del>.
+				<li><del>SerializerContext#SERIALIZER_addBeanTypeProperties</del> - Controls whether type properties are serialized.
 			</ul>
 			In addition, the {@link org.apache.juneau.annotation.Bean#typeName() @Bean(typeName)} value replaces the <c>@Xml(name)</c> annotation, and the 
 			<js>"type"</js> and <js>"_class"</js> attributes in the XML and HTML serializers have been standardized on a single <js>"_type"</js> attribute.
-		<li>Refactor bean filter support to use {@del org.apache.juneau.transform.BeanFilterBuilder} class.
+		<li>Refactor bean filter support to use <del>BeanFilterBuilder</del> class.
 			Allows the <c>BeanFilter</c> class to use final fields.
 		<li>{@link org.apache.juneau.msgpack MessagePack} support.
 		<li>Serializers can now serialize directly to {@link java.io.File Files}.
@@ -32136,40 +32142,40 @@
 		<li>New methods on {@link org.apache.juneau.parser.Parser}:
 			<ul>
 				<li><c>org.apache.juneau.parser.Parser.createSession(ObjectMap,Method,Object)</c>
-				<li>{@del Parser#getMediaRanges()}
+				<li><del>Parser#getMediaRanges()</del>
 			</ul>
 		</li>
 		<li>New methods on {@link org.apache.juneau.serializer.Serializer}:
 			<ul>
 				<li><c>org.apache.juneau.serializer.Serializer.createSession(ObjectMap,Method)</c>
-				<li>{@del Serializer#getMediaRanges()}
+				<li><del>Serializer#getMediaRanges()</del>
 			</ul>
 		</li>
 		<li>New {@link org.apache.juneau.annotation.Bean#sort() @Bean(sort)} annotation.
 		<li>Added <ja>@Bean.properties</ja> annotations on various DTO beans to make the ordering consistent
 			between IBM and Oracle JVMs.<br>
 			IBM JVMs maintain the order of methods in a class, whereas Oracle JVMs do not.
-		<li>Serializers and parsers now automatically convert {@link java.lang.Class} objects to readable names via {@del ClassUtils#getReadableClassName(Class)}.
+		<li>Serializers and parsers now automatically convert {@link java.lang.Class} objects to readable names via <del>ClassUtils#getReadableClassName(Class)</del>.
 		<li>Eliminated the <c>ClassFilter</c> class since it's no longer needed.
-		<li>Code and concurrency improvements to {@del org.apache.juneau.serializer.SerializerGroup} and {@del org.apache.juneau.parser.ParserGroup}.
-		<li>Various enhancements to {@del BeanContext#convertToType(Object,Class)}.
+		<li>Code and concurrency improvements to <del>SerializerGroup</del> and <del>ParserGroup</del>.
+		<li>Various enhancements to <del>BeanContext#convertToType(Object,Class)</del>.
 		<li>New properties on {@link org.apache.juneau.html.HtmlSerializer}:
 			<ul>
-				<li>{@del HtmlSerializerContext#HTML_detectLinksInStrings} - Automatically detect hyperlinks in strings.
-				<li>{@del HtmlSerializerContext#HTML_lookForLabelParameters} - Specify anchor text by appending <c>&amp;label=MyLabel</c> to URL.
-				<li>{@del HtmlSerializerContext#HTML_labelParameter} - Specify what URL parameter to use as the anchor text label.
-				<li>{@del HtmlSerializerContext#URI_ANCHOR} option for {@del HtmlSerializerContext#HTML_uriAnchorText}.				
+				<li><del>HtmlSerializerContext#HTML_detectLinksInStrings</del> - Automatically detect hyperlinks in strings.
+				<li><del>HtmlSerializerContext#HTML_lookForLabelParameters</del> - Specify anchor text by appending <c>&amp;label=MyLabel</c> to URL.
+				<li><del>HtmlSerializerContext#HTML_labelParameter</del> - Specify what URL parameter to use as the anchor text label.
+				<li><del>HtmlSerializerContext#URI_ANCHOR</del> option for <del>HtmlSerializerContext#HTML_uriAnchorText</del>.				
 			</ul>
 		</li>
 		<li>Removed generics from {@link org.apache.juneau.BeanPropertyMeta}.
 		<li>Introduced new classes to eliminate the references to language-specific metadata in the core metadata classes:
 			<ul>
-				<li>{@del ClassMetaExtended} / {@del ClassMeta#getExtendedMeta(Class)} 
-				<li>{@del BeanMetaExtended} /{@del BeanMeta#getExtendedMeta(Class)} 
-				<li>{@del BeanPropertyMetaExtended} / {@del BeanPropertyMeta#getExtendedMeta(Class)} 
+				<li><del>ClassMetaExtended</del> / <del>ClassMeta#getExtendedMeta(Class)</del> 
+				<li><del>BeanMetaExtended</del> /<del>BeanMeta#getExtendedMeta(Class)</del> 
+				<li><del>BeanPropertyMetaExtended</del> / <del>BeanPropertyMeta#getExtendedMeta(Class)</del> 
 			</ul>
 		</li>
-		<li>Renamed <c>@Transform</c> annotation to {@del @Pojo} so that it can be used for various POJO-related behavior, not just associating transforms.  
+		<li>Renamed <c>@Transform</c> annotation to <del>@Pojo</del> so that it can be used for various POJO-related behavior, not just associating transforms.  
 		<li>Introduced {@link org.apache.juneau.dto.swagger Swagger DTOs}.
 	</ul>		
 	
@@ -32182,47 +32188,47 @@
 				<li>Eliminated <c>ResourceOptions</c> and related code.
 				<li>New annotations and related methods:
 					<ul>
-						<li>{@del @RestResource(title)} / {@del org.apache.juneau.rest.RestInfoProvider#getTitle(RestRequest)}
-						<li>{@del @RestResource(description)} / {@del org.apache.juneau.rest.RestInfoProvider#getDescription(RestRequest)}
-						<li>{@del @RestResource(termsOfService)} / {@del RestInfoProvider#getTermsOfService(RestRequest)}
-						<li>{@del @RestResource(contact)} / {@del RestInfoProvider#getContact(RestRequest)}
-						<li>{@del @RestResource(license)} / {@del RestInfoProvider#getLicense(RestRequest)}
-						<li>{@del @RestResource(version)} / {@del RestInfoProvider#getVersion(RestRequest)}
-						<li>{@del @RestResource(tags)} / {@del RestInfoProvider#getTags(RestRequest)}
-						<li>{@del @RestResource(externalDocs)} / {@del RestInfoProvidergetExternalDocs(RestRequest)}
-						<li>{@del org.apache.juneau.rest.annotation.RestMethod#summary() @RestMethod(summary)} / {@del RestInfoProvider#getMethodSummary(String,RestRequest)}
-						<li>{@del org.apache.juneau.rest.annotation.RestMethod#description() @RestMethod(description)} /{@del RestInfoProvider#getMethodDescription(String,RestRequest)}
-						<li>{@del @RestMethod(externalDocs)}
-						<li>{@del @RestMethod(tags)}
-						<li>{@del @RestMethod(deprecated)} 
-						<li>{@del @RestMethod(parameters)} 
-						<li>{@del @RestMethod(responses)}
+						<li><del>@RestResource(title)</del> / <del>RestInfoProvider#getTitle(RestRequest)</del>
+						<li><del>@RestResource(description)</del> / <del>RestInfoProvider#getDescription(RestRequest)</del>
+						<li><del>@RestResource(termsOfService)</del> / <del>RestInfoProvider#getTermsOfService(RestRequest)</del>
+						<li><del>@RestResource(contact)</del> / <del>RestInfoProvider#getContact(RestRequest)</del>
+						<li><del>@RestResource(license)</del> / <del>RestInfoProvider#getLicense(RestRequest)</del>
+						<li><del>@RestResource(version)</del> / <del>RestInfoProvider#getVersion(RestRequest)</del>
+						<li><del>@RestResource(tags)</del> / <del>RestInfoProvider#getTags(RestRequest)</del>
+						<li><del>@RestResource(externalDocs)</del> / <del>RestInfoProvidergetExternalDocs(RestRequest)</del>
+						<li><del>RestMethod#summary() @RestMethod(summary)</del> / <del>RestInfoProvider#getMethodSummary(String,RestRequest)</del>
+						<li><del>RestMethod#description() @RestMethod(description)</del> /<del>RestInfoProvider#getMethodDescription(String,RestRequest)</del>
+						<li><del>@RestMethod(externalDocs)</del>
+						<li><del>@RestMethod(tags)</del>
+						<li><del>@RestMethod(deprecated)</del> 
+						<li><del>@RestMethod(parameters)</del> 
+						<li><del>@RestMethod(responses)</del>
 					</ul>
 				</li>					
 			</ul>
-		<li>New {@del RestServletContext#paramFormat} context property.
-		<li>New/updated methods on {@del org.apache.juneau.rest.RestServlet}:
-			<ul>
-				<li>{@del RestServlet#createProperties()}
-				<li>{@del RestServlet#createBeanContext(ObjectMap,Class[],Class[])}
-				<li>{@del RestServlet#createBeanFilters()}
-				<li>{@del RestServlet#createPojoSwaps()}
-				<li>{@del RestServlet#createParsers(ObjectMap,Class[],Class[])}
-				<li>{@del RestServlet#createUrlEncodingSerializer(ObjectMap,Class[],Class[])}
-				<li>{@del RestServlet#createUrlEncodingParser(ObjectMap,Class[],Class[])}
-				<li>{@del RestServlet#createConverters(ObjectMap)}
-				<li>{@del RestServlet#createDefaultRequestHeaders(ObjectMap)}
-				<li>{@del RestServlet#createDefaultResponseHeaders(ObjectMap)}
-				<li>{@del RestServlet#createEncoders(ObjectMap)}
-				<li>{@del RestServlet#createGuards(ObjectMap)}
-				<li>{@del RestServlet#createMimetypesFileTypeMap(ObjectMap)}
-				<li>{@del RestServlet#createResponseHandlers(ObjectMap)}
+		<li>New <del>RestServletContext#paramFormat</del> context property.
+		<li>New/updated methods on <del>RestServlet</del>:
+			<ul>
+				<li><del>RestServlet#createProperties()</del>
+				<li><del>RestServlet#createBeanContext(ObjectMap,Class[],Class[])</del>
+				<li><del>RestServlet#createBeanFilters()</del>
+				<li><del>RestServlet#createPojoSwaps()</del>
+				<li><del>RestServlet#createParsers(ObjectMap,Class[],Class[])</del>
+				<li><del>RestServlet#createUrlEncodingSerializer(ObjectMap,Class[],Class[])</del>
+				<li><del>RestServlet#createUrlEncodingParser(ObjectMap,Class[],Class[])</del>
+				<li><del>RestServlet#createConverters(ObjectMap)</del>
+				<li><del>RestServlet#createDefaultRequestHeaders(ObjectMap)</del>
+				<li><del>RestServlet#createDefaultResponseHeaders(ObjectMap)</del>
+				<li><del>RestServlet#createEncoders(ObjectMap)</del>
+				<li><del>RestServlet#createGuards(ObjectMap)</del>
+				<li><del>RestServlet#createMimetypesFileTypeMap(ObjectMap)</del>
+				<li><del>RestServlet#createResponseHandlers(ObjectMap)</del>
 			</ul>
 		</li>
 		<li>New client-version annotations:
 			<ul>
-				<li>{@del RestResource#clientVersionHeader}  - The name of the header used to identify the client version.
-				<li>{@del org.apache.juneau.rest.annotation.RestMethod#clientVersion}  - The client version range applied to a Java method.
+				<li><del>RestResource#clientVersionHeader</del>  - The name of the header used to identify the client version.
+				<li><del>RestMethod#clientVersion</del>  - The client version range applied to a Java method.
 			</ul>
 		</li>
 	</ul>
@@ -32230,7 +32236,7 @@
 	<h5 class='topic w800'>org.apache.juneau.rest.client</h5>
 	<ul class='spaced-list'>
 		<li>Removed the <c>JazzRestClient</c> class.
-		<li>New method {@del RestClient#setClientVersion(String)}.
+		<li>New method <del>RestClient#setClientVersion(String)</del>.
 	</ul>		
 </div>
 </div><!-- END: 6.0.0 -->
@@ -32250,11 +32256,11 @@
 			<ul>
 				<li>Several fixes to handle obscure edge cases.
 			</ul>
-		<li>New properties in {@del ParserContext}.
+		<li>New properties in <del>ParserContext</del>.
 			<ul>
-				<li>{@del ParserContext#PARSER_strict}
-				<li>{@del ParserContext#PARSER_inputStreamCharset}
-				<li>{@del ParserContext#PARSER_fileCharset}
+				<li><del>ParserContext#PARSER_strict</del>
+				<li><del>ParserContext#PARSER_inputStreamCharset</del>
+				<li><del>ParserContext#PARSER_fileCharset</del>
 			</ul>
 		<li>Removed <c>JsonParserContext.JSON_strictMode</c>.  Replaced by <c>PARSER_strict</c>.		
 		<li><c><jk>byte[]</jk></c> arrays can now be passed to {@link org.apache.juneau.parser.Parser#parse(Object,Class)} for reader-based parsers.	
@@ -32295,9 +32301,9 @@
 					<li>New {@link org.apache.juneau.xml.annotation.XmlFormat#XMLTEXT} format that's identical to {@link org.apache.juneau.xml.annotation.XmlFormat#TEXT} except 
 						XML content is not escaped and serialized directly as the child content.  The parser will reconvert this to the original XML text during parsing.
 				</ul>
-				<li>New support methodology and other improvements to {@del org.apache.juneau.xml} documentation.
+				<li>New support methodology and other improvements to <del>xml</del> documentation.
 				<li>Eliminated unnecessary <xt>&lt;string&gt;</xt> elements.
-				<li>Eliminated {@del XmlContentHandler} class.
+				<li>Eliminated <del>XmlContentHandler</del> class.
 				<li>Parser efficiency improvements through reuse of string builders.
 				<li>Reworked and simplified the default XML serializers.  The {@link org.apache.juneau.xml.XmlSerializer#DEFAULT} serializer now has namespaces disabled,
 					and {@link org.apache.juneau.xml.XmlSerializer#DEFAULT_NS} has namespaces enabled.  The 'XML-JSON' serializers have been eliminated.
@@ -32309,23 +32315,23 @@
 				<li>Parser converted from <c>XMLEventReader</c>-based to <c>XMLStreamReader</c>.
 				<li>Eliminated many unnecessary type tags and <xt>&lt;string&gt;</xt> elements and improved the readable layout.  
 					The new format is much leaner.
-				<li>New exhaustive support methodology section added to {@del org.apache.juneau.html} documentation.
+				<li>New exhaustive support methodology section added to <del>html</del> documentation.
 			</ul>
-		<li>New HTML5 DTO support:  {@del org.apache.juneau.dto.html5}.
+		<li>New HTML5 DTO support:  <del>html5</del>.
 		<li>{@link org.apache.juneau.BeanContext} class split into separate {@link org.apache.juneau.BeanContext} and {@link org.apache.juneau.BeanSession} classes.
 		<ul>
 			<li>Session object meant to be single-use that can be discarded after use and contains session-level object cache and overridable Locale and TimeZone.
 		</ul>  
-		<li>{@del SerializerContext} and {@del ParserContext}
+		<li><del>SerializerContext</del> and <del>ParserContext</del>
 			now extend directly from {@link org.apache.juneau.BeanContext}.
 		<li>{@link org.apache.juneau.serializer.SerializerSession} and {@link org.apache.juneau.parser.ParserSession}
 			now extend directly from {@link org.apache.juneau.BeanSession}.
 		<li>New settings in {@link org.apache.juneau.BeanContext}:
 		<ul>
-			<li>{@del BEAN_debug} - Debug setting.  Replaces individual debug properties in the serializer and parser contexts.
-			<li>{@del BEAN_locale} - Specifies a default locale at the context level.
-			<li>{@del BEAN_timeZone} - Specifies a default timezone at the context level.
-			<li>{@del BEAN_mediaType} - Specifies a default media type at the context level.
+			<li><del>BEAN_debug</del> - Debug setting.  Replaces individual debug properties in the serializer and parser contexts.
+			<li><del>BEAN_locale</del> - Specifies a default locale at the context level.
+			<li><del>BEAN_timeZone</del> - Specifies a default timezone at the context level.
+			<li><del>BEAN_mediaType</del> - Specifies a default media type at the context level.
 		</ul>
 		<li>Improvements to Parser class:  
 		<ul>
@@ -32376,10 +32382,10 @@
 		<jk>new</jk> JsonSerializer().setSimpleMode(<jk>true</jk>).setQuoteChar(<js>'"'</js>);
 				</p>
 		</ul>
-		<li>Simplified {@del org.apache.juneau.transform.PojoSwap} class.  Now just two methods:
+		<li>Simplified <del>PojoSwap</del> class.  Now just two methods:
 		<ul>
-			<li>{@del org.apache.juneau.transform.PojoSwap#swap(BeanSession,Object)}
-			<li>{@del org.apache.juneau.transform.PojoSwap#unswap(BeanSession,Object,ClassMeta)}
+			<li><del>PojoSwap#swap(BeanSession,Object)</del>
+			<li><del>PojoSwap#unswap(BeanSession,Object,ClassMeta)</del>
 		</ul>
 		<li>General code improvements made to {@link org.apache.juneau.ClassMeta} class.
 		<ul>
@@ -32392,49 +32398,49 @@
 			Allows for swaps and serializer/parser behavior to be tailored to individual media types.
 		<li>Several new {@link java.util.Calendar} and {@link java.util.Date} swaps:
 		<ul>
-			<li>{@del org.apache.juneau.transforms.CalendarSwap.ToString},{@del org.apache.juneau.transforms.DateSwap.ToString} - To {@link java.lang.String Strings} using the {@code Date.toString()} method.
-			<li>{@del org.apache.juneau.transforms.CalendarSwap.ISO8601DT},{@del org.apache.juneau.transforms.DateSwap.ISO8601DT} - To ISO8601 date-time strings.
-			<li>{@del org.apache.juneau.transforms.CalendarSwap.ISO8601DTZ},{@del org.apache.juneau.transforms.DateSwap.ISO8601DTZ} - Same as <jsf>ISO8601DT</jsf>, except always serializes in GMT.
-			<li>{@del org.apache.juneau.transforms.CalendarSwap.ISO8601DTP},{@del org.apache.juneau.transforms.DateSwap.ISO8601DTP} - Same as <jsf>ISO8601DT</jsf> except with millisecond precision.
-			<li>{@del org.apache.juneau.transforms.CalendarSwap.ISO8601DTPZ},{@del org.apache.juneau.transforms.DateSwap.ISO8601DTPZ} - Same as <jsf>ISO8601DTZ</jsf> except with millisecond precision.
-			<li>{@del org.apache.juneau.transforms.CalendarSwap.RFC2822DT},{@del org.apache.juneau.transforms.DateSwap.RFC2822DT} - To RFC2822 date-time strings.
-			<li>{@del org.apache.juneau.transforms.CalendarSwap.RFC2822DTZ},{@del org.apache.juneau.transforms.DateSwap.RFC2822DTZ} - Same as <jsf>RFC2822DT</jsf>, except always serializes in GMT.
-			<li>{@del org.apache.juneau.transforms.CalendarSwap.RFC2822D},{@del org.apache.juneau.transforms.DateSwap.RFC2822D} - To RFC2822 date strings.
-			<li>{@del org.apache.juneau.transforms.CalendarSwap.DateTimeSimple},{@del org.apache.juneau.transforms.DateSwap.DateTimeSimple} - To simple <js>"yyyy/MM/dd HH:mm:ss"</js> date-time strings.
-			<li>{@del org.apache.juneau.transforms.CalendarSwap.DateSimple},{@del org.apache.juneau.transforms.DateSwap.DateSimple} - To simple <js>"yyyy/MM/dd"</js> date strings.
-			<li>{@del org.apache.juneau.transforms.CalendarSwap.TimeSimple},{@del org.apache.juneau.transforms.DateSwap.TimeSimple} - To simple <js>"HH:mm:ss"</js> time strings.
-			<li>{@del org.apache.juneau.transforms.CalendarSwap.DateFull},{@del org.apache.juneau.transforms.DateSwap.DateFull} - To {@link java.text.DateFormat#FULL} date strings.
-			<li>{@del org.apache.juneau.transforms.CalendarSwap.DateLong},{@del org.apache.juneau.transforms.DateSwap.DateLong} - To {@link java.text.DateFormat#LONG} date strings.
-			<li>{@del org.apache.juneau.transforms.CalendarSwap.DateMedium},{@del org.apache.juneau.transforms.DateSwap.DateMedium} - To {@link java.text.DateFormat#MEDIUM} date strings.
-			<li>{@del org.apache.juneau.transforms.CalendarSwap.DateShort},{@del org.apache.juneau.transforms.DateSwap.DateShort} - To {@link java.text.DateFormat#SHORT} date strings.
-			<li>{@del org.apache.juneau.transforms.CalendarSwap.TimeFull},{@del org.apache.juneau.transforms.DateSwap.TimeFull} - To {@link java.text.DateFormat#FULL} time strings.
-			<li>{@del org.apache.juneau.transforms.CalendarSwap.TimeLong},{@del org.apache.juneau.transforms.DateSwap.TimeLong} - To {@link java.text.DateFormat#LONG} time strings.
-			<li>{@del org.apache.juneau.transforms.CalendarSwap.TimeMedium},{@del org.apache.juneau.transforms.DateSwap.TimeMedium} - To {@link java.text.DateFormat#MEDIUM} time strings.
-			<li>{@del org.apache.juneau.transforms.CalendarSwap.TimeShort},{@del org.apache.juneau.transforms.DateSwap.TimeShort} - To {@link java.text.DateFormat#SHORT} time strings.
-			<li>{@del org.apache.juneau.transforms.CalendarSwap.DateTimeFull},{@del org.apache.juneau.transforms.DateSwap.DateTimeFull} - To {@link java.text.DateFormat#FULL} date-time strings.
-			<li>{@del org.apache.juneau.transforms.CalendarSwap.DateTimeLong},{@del org.apache.juneau.transforms.DateSwap.DateTimeLong} - To {@link java.text.DateFormat#LONG} date-time strings.
-			<li>{@del org.apache.juneau.transforms.CalendarSwap.DateTimeMedium},{@del org.apache.juneau.transforms.DateSwap.DateTimeMedium} - To {@link java.text.DateFormat#MEDIUM} date-time strings.
-			<li>{@del org.apache.juneau.transforms.CalendarSwap.DateTimeShort},{@del org.apache.juneau.transforms.DateSwap.DateTimeShort} - To {@link java.text.DateFormat#SHORT} date-time strings.
+			<li><del>ToString</del>,<del>ToString</del> - To {@link java.lang.String Strings} using the {@code Date.toString()} method.
+			<li><del>ISO8601DT</del>,<del>ISO8601DT</del> - To ISO8601 date-time strings.
+			<li><del>ISO8601DTZ</del>,<del>ISO8601DTZ</del> - Same as <jsf>ISO8601DT</jsf>, except always serializes in GMT.
+			<li><del>ISO8601DTP</del>,<del>ISO8601DTP</del> - Same as <jsf>ISO8601DT</jsf> except with millisecond precision.
+			<li><del>ISO8601DTPZ</del>,<del>ISO8601DTPZ</del> - Same as <jsf>ISO8601DTZ</jsf> except with millisecond precision.
+			<li><del>RFC2822DT</del>,<del>RFC2822DT</del> - To RFC2822 date-time strings.
+			<li><del>RFC2822DTZ</del>,<del>RFC2822DTZ</del> - Same as <jsf>RFC2822DT</jsf>, except always serializes in GMT.
+			<li><del>RFC2822D</del>,<del>RFC2822D</del> - To RFC2822 date strings.
+			<li><del>DateTimeSimple</del>,<del>DateTimeSimple</del> - To simple <js>"yyyy/MM/dd HH:mm:ss"</js> date-time strings.
+			<li><del>DateSimple</del>,<del>DateSimple</del> - To simple <js>"yyyy/MM/dd"</js> date strings.
+			<li><del>TimeSimple</del>,<del>TimeSimple</del> - To simple <js>"HH:mm:ss"</js> time strings.
+			<li><del>DateFull</del>,<del>DateFull</del> - To {@link java.text.DateFormat#FULL} date strings.
+			<li><del>DateLong</del>,<del>DateLong</del> - To {@link java.text.DateFormat#LONG} date strings.
+			<li><del>DateMedium</del>,<del>DateMedium</del> - To {@link java.text.DateFormat#MEDIUM} date strings.
+			<li><del>DateShort</del>,<del>DateShort</del> - To {@link java.text.DateFormat#SHORT} date strings.
+			<li><del>TimeFull</del>,<del>TimeFull</del> - To {@link java.text.DateFormat#FULL} time strings.
+			<li><del>TimeLong</del>,<del>TimeLong</del> - To {@link java.text.DateFormat#LONG} time strings.
+			<li><del>TimeMedium</del>,<del>TimeMedium</del> - To {@link java.text.DateFormat#MEDIUM} time strings.
+			<li><del>TimeShort</del>,<del>TimeShort</del> - To {@link java.text.DateFormat#SHORT} time strings.
+			<li><del>DateTimeFull</del>,<del>DateTimeFull</del> - To {@link java.text.DateFormat#FULL} date-time strings.
+			<li><del>DateTimeLong</del>,<del>DateTimeLong</del> - To {@link java.text.DateFormat#LONG} date-time strings.
+			<li><del>DateTimeMedium</del>,<del>DateTimeMedium</del> - To {@link java.text.DateFormat#MEDIUM} date-time strings.
+			<li><del>DateTimeShort</del>,<del>DateTimeShort</del> - To {@link java.text.DateFormat#SHORT} date-time strings.
 		</ul>  
-		<li>New method {@del org.apache.juneau.serializer.SerializerGroup#getSerializerMatch(String)} that returns the matched serializer and media type.
-		<li>New method {@del org.apache.juneau.parser.ParserGroup#getParserMatch(String)} that returns the matched parser and media type.
-		<li>New method {@del org.apache.juneau.encoders.EncoderGroup#getEncoderMatch(String)} that returns the matched encoder and encoding.
+		<li>New method <del>SerializerGroup#getSerializerMatch(String)</del> that returns the matched serializer and media type.
+		<li>New method <del>ParserGroup#getParserMatch(String)</del> that returns the matched parser and media type.
+		<li>New method <del>EncoderGroup#getEncoderMatch(String)</del> that returns the matched encoder and encoding.
 		<li>General improvements to Bean Dictionary support.
 			<ul>
 				<li>New {@link org.apache.juneau.BeanDictionaryList} class can be used for defining reusable sets of bean dictionaries consisting
 					of classes annotated with {@link org.apache.juneau.annotation.Bean#typeName() @Bean(typeName)}.
 				<li>New {@link org.apache.juneau.BeanDictionaryMap} class can be used for defining reusable sets of bean dictionaries consisting
 					of classes not annotated with {@link org.apache.juneau.annotation.Bean#typeName() @Bean(typeName)}.
-				<li>New {@del @Bean(beanDictionary)} annotation.
+				<li>New <del>@Bean(beanDictionary)</del> annotation.
 			</ul>
-		<li>Removed restriction on getters and setters to be prefixed with "getX/setX/isX" if a {@del @BeanProperty(name)} annotation is used.
+		<li>Removed restriction on getters and setters to be prefixed with "getX/setX/isX" if a <del>@BeanProperty(name)</del> annotation is used.
 		<li>Improvements to ATOM DTO:
 			<ul>
 				<li>New {@link org.apache.juneau.dto.atom.AtomBuilder} class.
 				<li>New setter method names for a better fluent design.
-				<li>Updated {@del org.apache.juneau.dto.atom} documentation.
+				<li>Updated <del>atom</del> documentation.
 			</ul>
-		<li>New {@del org.apache.juneau.transform.MapSwap} and {@del org.apache.juneau.transform.StringSwap} classes.
+		<li>New <del>MapSwap</del> and <del>StringSwap</del> classes.
 		<li>New {@link org.apache.juneau.serializer.WriterSerializer#println(Object)} method.  Useful for debugging purposes.
 		<li>New {@link org.apache.juneau.BeanContext#getClassMeta(Type,Type...)} and {@link org.apache.juneau.BeanSession#getClassMeta(Type,Type...)}
 			methods for retrieving Map and Collection class metas.  
@@ -32452,46 +32458,46 @@
 				serializers since there is no separate simple mode anymore.
 			<li>Eliminated the <c>UonParserContext.<jsf>UON_simpleMode</jsf></c> configuration setting.
 		</ul>
-		<li>Added new {@del OutputStreamSerializer#serializeToHex(Object)} method. 
+		<li>Added new <del>OutputStreamSerializer#serializeToHex(Object)</del> method. 
 			<br>Useful mostly for testing purposes.
 			<br>Equivalently, the {@link org.apache.juneau.parser.InputStreamParser#parse(Object,Class)} method can now 
 				read the output from this method.
 		<li>Eliminated the <c><ja>@Bean</ja>(subTypeProperty)</c> and <c><ja>@Bean</ja>(subTypes)</c> annotations
-			and replaced them with the ability to define subtypes using the existing {@del @Bean(beanDictionary)}
+			and replaced them with the ability to define subtypes using the existing <del>@Bean(beanDictionary)</del>
 			annotation on parent classes and interfaces.
 			<br>This has the added benefit of simplifying the overall code.
-		<li>The {@del SerializerContext#SERIALIZER_addBeanTypeProperties} setting is now enabled by default.
+		<li>The <del>SerializerContext#SERIALIZER_addBeanTypeProperties</del> setting is now enabled by default.
 		<li>Combined the <c>SERIALIZER_addIndentation</c>/<c>JSON_addWhitespace</c>/<c>UON_addWhitespace</c>
-			properties into a single {@del SerializerContext#SERIALIZER_useWhitespace} setting.
+			properties into a single <del>SerializerContext#SERIALIZER_useWhitespace</del> setting.
 	</ul>
 	
 	<h5 class='topic w800'>org.apache.juneau.rest</h5>
 	<ul class='spaced-list'>
 		<li>{@link org.apache.juneau.rest.RestRequest} now passes locale and timezone to serializers/parsers/transforms.
-		<li>{@del RestRequest#getTimeZone()} method.
+		<li><del>RestRequest#getTimeZone()</del> method.
 		<li>Standardized the following methods in {@link org.apache.juneau.rest.RestRequest} to remove dependency on <c>ClassMeta</c>
 			objects and eliminate the need for casts:
 			<ul>
-				<li>{@del RestRequest#getHeader(String,Class)}
-				<li>{@del RestRequest#getHeader(String,Object,Class)}
+				<li><del>RestRequest#getHeader(String,Class)</del>
+				<li><del>RestRequest#getHeader(String,Object,Class)</del>
 				<li>{@del RestRequest#getHeader(String,Type,Type...)}
-				<li>{@del RestRequest#getQueryParameter(String,Class)}
-				<li>{@del RestRequest#getQueryParameter(String,Object,Class)}
+				<li><del>RestRequest#getQueryParameter(String,Class)</del>
+				<li><del>RestRequest#getQueryParameter(String,Object,Class)</del>
 				<li>{@del RestRequest#getQueryParameter(String,Type,Type...)}
 				<li>{@del RestRequest#getQueryParameter(String,Object,Type,Type...)}
-				<li>{@del RestRequest#getQueryParameters(String,Class)}
+				<li><del>RestRequest#getQueryParameters(String,Class)</del>
 				<li>{@del RestRequest#getQueryParameters(String,Type,Type...)}
-				<li>{@del RestRequest#getFormDataParameter(String,Class)}
-				<li>{@del RestRequest#getFormDataParameter(String,Object,Class)}
-				<li>{@del RestRequest#getFormDataParameters(String,Class)}
+				<li><del>RestRequest#getFormDataParameter(String,Class)</del>
+				<li><del>RestRequest#getFormDataParameter(String,Object,Class)</del>
+				<li><del>RestRequest#getFormDataParameters(String,Class)</del>
 				<li>{@del RestRequest#getFormDataParameter(String,Type,Type...)}
 				<li>{@del RestRequest#getFormDataParameters(String,Type,Type...)}
-				<li>{@del RestRequest#getPathParameter(String,Class)}
+				<li><del>RestRequest#getPathParameter(String,Class)</del>
 				<li>{@del RestRequest#getPathParameter(String,Type,Type...)}
-				<li>{@del RestRequest#getBody(Class)}
+				<li><del>RestRequest#getBody(Class)</del>
 				<li>{@del RestRequest#getBody(Type,Type...)}
 			</ul>
-		<li>New methods on {@del org.apache.juneau.rest.client.NameValuePairs}
+		<li>New methods on <del>NameValuePairs</del>
 		<li>Fixed issue where whitespace was not added to UON/URL-Encoding output when <c>&amp;plainText=true</c> specified.
 	</ul>
 </div>
@@ -32533,22 +32539,22 @@
 			</p>	
 		<li>Also introduced the following builder classes and related architecture changes to make the built objects unmodifiable:
 			<ul>
-				<li>{@del org.apache.juneau.serializer.SerializerGroup.Builder}
-				<li>{@del org.apache.juneau.parser.ParserGroup.Builder}
-				<li>{@del org.apache.juneau.encoders.EncoderGroup.Builder}
+				<li><del>Builder</del>
+				<li><del>Builder</del>
+				<li><del>Builder</del>
 			</ul>
-		<li>Revamped the config file API to use a build:  {@del ConfigFileBuilder}.
-		<li>Removed the {@del Lockable} interface.
+		<li>Revamped the config file API to use a build:  <del>ConfigFileBuilder</del>.
+		<li>Removed the <del>Lockable</del> interface.
 		<li>New <c>addBeanTypeProperties</c> setting added to serializers to override the 
-			{@del SerializerContext#SERIALIZER_addBeanTypeProperties} setting
+			<del>SerializerContext#SERIALIZER_addBeanTypeProperties</del> setting
 			for individual serializers in a serializer group:
 			<ul>
-				<li>{@del HtmlSerializerContext#HTML_addBeanTypeProperties}
-				<li>{@del JsonSerializerContext#JSON_addBeanTypeProperties}
-				<li>{@del MsgPackSerializerContext#MSGPACK_addBeanTypeProperties}
-				<li>{@del UonSerializerContext#UON_addBeanTypeProperties}
-				<li>{@del XmlSerializerContext#XML_addBeanTypeProperties}
-				<li>{@del RdfSerializerContext#RDF_addBeanTypeProperties}
+				<li><del>HtmlSerializerContext#HTML_addBeanTypeProperties</del>
+				<li><del>JsonSerializerContext#JSON_addBeanTypeProperties</del>
+				<li><del>MsgPackSerializerContext#MSGPACK_addBeanTypeProperties</del>
+				<li><del>UonSerializerContext#UON_addBeanTypeProperties</del>
+				<li><del>XmlSerializerContext#XML_addBeanTypeProperties</del>
+				<li><del>RdfSerializerContext#RDF_addBeanTypeProperties</del>
 			</ul>
 		<li>UON notation serializers and parsers moved into the new <c>org.apache.juneau.uon</c> package.
 		<li>New {@link org.apache.juneau.xml.annotation.XmlFormat#VOID} format to identify HTML void elements.
@@ -32561,7 +32567,7 @@
 			<ul>
 				<li>New {@link org.apache.juneau.dto.swagger.SwaggerBuilder} class.
 				<li>Fluent-style setters added to the Swagger beans.
-				<li>Added Swagger examples {@del here} and in the {@del org.apache.juneau.dto.swagger} javadocs.
+				<li>Added Swagger examples <del>here</del> and in the <del>swagger</del> javadocs.
 			</ul>
 		<li>Improvements to {@link org.apache.juneau.svl.VarResolver}.
 			<ul>
@@ -32573,9 +32579,9 @@
 		<li>Parse-args supported added to {@link org.apache.juneau.msgpack.MsgPackParser} to allow it to be used in remoteable proxies. 
 		<li>Added some convenience classes for constructing collections using a fluent interface:
 			<ul>
-				<li>{@del AList}
-				<li>{@del ASet}
-				<li>{@del AMap}
+				<li><del>AList</del>
+				<li><del>ASet</del>
+				<li><del>AMap</del>
 			</ul>
 		<li>New {@link org.apache.juneau.annotation.Bean#typePropertyName @Bean(typePropertyName)} annotation allows you to 
 			specify the name of the <js>"_type"</js> property at the class level.
@@ -32584,24 +32590,24 @@
 				<li>{@link org.apache.juneau.dto.html5.HtmlElementContainer#getChild(int...)}
 				<li>{@link org.apache.juneau.dto.html5.HtmlElementMixed#getChild(int...)}
 			</ul>
-		<li>New common serializer setting: {@del SerializerContext#SERIALIZER_abridged}.
+		<li>New common serializer setting: <del>SerializerContext#SERIALIZER_abridged</del>.
 		<li>Support for defining interface proxies against 3rd-party REST interfaces.
-			<br>New package {@del org.apache.juneau.remoteable} for all remoteable proxy interface annotations.
+			<br>New package <del>remoteable</del> for all remoteable proxy interface annotations.
 			<br><ja>@Remoteable</ja> annotation has been moved to this package.
 		<li>Updated doc: <dc>6 - Remoteable Services</dc>
 		<li>New doc: <dc>6.1 -  Interface proxies against 3rd-party REST interfaces</dc>
-		<li>New URL-encoding serializer setting: {@del UrlEncodingSerializerContext#URLENC_paramFormat}.
+		<li>New URL-encoding serializer setting: <del>UrlEncodingSerializerContext#URLENC_paramFormat</del>.
 		<li>New methods on {@link org.apache.juneau.urlencoding.UrlEncodingSerializer.Builder}:
 		<ul>
-			<li>{@del UrlEncodingSerializer.Builder#paramFormat(String)}	
-			<li>{@del UrlEncodingSerializer.Builder#plainTextParams()}	
+			<li><del>Builder#paramFormat(String)</del>	
+			<li><del>Builder#plainTextParams()</del>	
 		</ul> 		
 	</ul>
 	
 	<h5 class='topic w800'>org.apache.juneau.rest</h5>
 	<ul class='spaced-list'>
-		<li>{@del @RestResource} annotation can now be applied to 
-			any class!  You're no longer restricted to subclassing your resources from {@del org.apache.juneau.rest.RestServlet}.
+		<li><del>@RestResource</del> annotation can now be applied to 
+			any class!  You're no longer restricted to subclassing your resources from <del>RestServlet</del>.
 			<br>This is a major enhancement in the API.  Anything you could do by subclassing from <c>RestServlet</c>
 			should have an equivalent for non-<c>RestServlet</c> classes.
 			<br>The only restriction is that the top-level resource must subclass from <c>RestServlet</c>.
@@ -32609,20 +32615,20 @@
 			<br><br>
 			The majority of code has been split up into two separate classes:
 			<ul>
-				<li>{@del RestConfig} - A modifiable configuration of a resource.  Subclasses from {@link javax.servlet.ServletConfig}.
+				<li><del>RestConfig</del> - A modifiable configuration of a resource.  Subclasses from {@link javax.servlet.ServletConfig}.
 				<li>{@link org.apache.juneau.rest.RestContext} - A read-only configuration that's the result of a snapshot of the config.
 			</ul>
 			<br><br>
-			The {@del org.apache.juneau.rest.RestServlet} class now has the following initialization method that allows you to override
+			The <del>RestServlet</del> class now has the following initialization method that allows you to override
 			the config settings define via annotations:
 			<ul>
-				<li>{@del RestServlet#init(RestConfig)} - A modifiable configuration of a resource.
+				<li><del>RestServlet#init(RestConfig)</del> - A modifiable configuration of a resource.
 			</ul>
 			Non-<c>RestServlet</c> classes must have one of the following to allow it to be instantiated:
 			<ul>
 				<li>A <c><jk>public</jk> T(RestConfig)</c> constructor.
 				<li>A <c><jk>public</jk> T()</c> constructor.
-				<li>The parent resource must have a customized {@del org.apache.juneau.rest.RestResourceResolver} for instantiating it.
+				<li>The parent resource must have a customized <del>RestResourceResolver</del> for instantiating it.
 			</ul>
 			<br>
 			Non-<c>RestServlet</c> classes can optionally include the following init methods to gain access to the config and context:
@@ -32630,27 +32636,27 @@
 				<li><dc><jk>public</jk> init(RestConfig)</dc>
 				<li><dc><jk>public</jk> init(RestContext)</dc>
 			</ul>
-		<li>New annotations added to {@del @RestResource} to allow non-<c>RestServlet</c>
+		<li>New annotations added to <del>@RestResource</del> to allow non-<c>RestServlet</c>
 			resources to do the same as subclassing directly from <c>RestServlet</c>:
 			<ul>
-				<li>{@del RestResource#resourceResolver()} 
-					- Specify a {@del org.apache.juneau.rest.RestResourceResolver} class for resolving child resources.
-				<li>{@del RestResource#callHandler()} 
-					- Specify a {@del org.apache.juneau.rest.RestCallHandler} class for handling the lifecycle of a REST call.
-				<li>{@del RestResource#infoProvider()} 
-					- Specify a {@del org.apache.juneau.rest.RestInfoProvider} class for customizing title/description/Swagger information on a REST resource.
-				<li>{@del RestResource#logger()} 
-					- Specify a {@del org.apache.juneau.rest.RestLogger} class for handling logging.
+				<li><del>RestResource#resourceResolver()</del> 
+					- Specify a <del>RestResourceResolver</del> class for resolving child resources.
+				<li><del>RestResource#callHandler()</del> 
+					- Specify a <del>RestCallHandler</del> class for handling the lifecycle of a REST call.
+				<li><del>RestResource#infoProvider()</del> 
+					- Specify a <del>RestInfoProvider</del> class for customizing title/description/Swagger information on a REST resource.
+				<li><del>RestResource#logger()</del> 
+					- Specify a <del>RestLogger</del> class for handling logging.
 			</ul>
-		<li>New annotations added to {@del @RestResource} and {@del org.apache.juneau.rest.annotation.RestMethod @RestMethod}
+		<li>New annotations added to <del>@RestResource</del> and <del>RestMethod @RestMethod</del>
 			to simplify defining page title, text, and links on HTML views:
 			<ul>
-				<li>{@del @RestResource(pageTitle)}
-				<li>{@del @RestMethod(pageTitle)} 
-				<li>{@del @RestResource(pageText)} 
-				<li>{@del @RestMethod(pageText)} 
-				<li>{@del @RestResource(pageLinks)} 
-				<li>{@del @RestMethod(pageLinks)} 
+				<li><del>@RestResource(pageTitle)</del>
+				<li><del>@RestMethod(pageTitle)</del> 
+				<li><del>@RestResource(pageText)</del> 
+				<li><del>@RestMethod(pageText)</del> 
+				<li><del>@RestResource(pageLinks)</del> 
+				<li><del>@RestMethod(pageLinks)</del> 
 			</ul>				
 			<p class='bcode'>
 		<jc>// Old method</jc>
@@ -32680,11 +32686,11 @@
 			pageLinks=<js>"{up:'$R{requestParentURI}',options:'?method=OPTIONS'}"</js>
 		)
 			</p>
-		<li>{@del RestResource#stylesheet()} can now take in a comma-delimited list of stylesheet paths.
-		<li>{@del StreamResource} can now contain multiple sources from a variety of source types (e.g. <c><jk>byte</jk>[]</c> arrays, <c>InputStreams</c>, <c>Files</c>, etc...)
-			and is now immutable.  It also includes a new {@del StreamResourceBuilder} class.
+		<li><del>RestResource#stylesheet()</del> can now take in a comma-delimited list of stylesheet paths.
+		<li><del>StreamResource</del> can now contain multiple sources from a variety of source types (e.g. <c><jk>byte</jk>[]</c> arrays, <c>InputStreams</c>, <c>Files</c>, etc...)
+			and is now immutable.  It also includes a new <del>StreamResourceBuilder</del> class.
 		<li>Simplified remoteable proxies using the <c><ja>@RestMethod</ja>(name=<js>"PROXY"</js>)</c> annotation on REST methods.
-			Used to expose interface proxies without the need for {@del RemoteableServlet}.
+			Used to expose interface proxies without the need for <del>RemoteableServlet</del>.
 		<p class='bcode'>
 		<jc>// Server side</jc>
 		<ja>@RestMethod</ja>(name=<js>"PROXY"</js>, path=<js>"/myproxy/*"</js>)
@@ -32696,10 +32702,10 @@
 		RestClient client = RestClient.<jsm>create</jsm>().rootUrl(<jf>samplesUrl</jf>).build();			
 		IAddressBook ab = client.getRemoteableProxy(IAddressBook.<jk>class</jk>, <js>"/addressBook/myproxy"</js>);
 		</p>
-			See {@del org.apache.juneau.rest.annotation.RestMethod#name() @RestMethod(name)} for more information.
+			See <del>RestMethod#name() @RestMethod(name)</del> for more information.
 		<li>{@link org.apache.juneau.rest.RestRequest#toString()} can be called at any time to view the headers and content of the request
 			without affecting functionality.  Very useful for debugging.
-		<li>{@del org.apache.juneau.rest.annotation.RestMethod#name() @RestMethod(name)} annotation is now optional.  Defaults to <js>"GET"</js>.
+		<li><del>RestMethod#name() @RestMethod(name)</del> annotation is now optional.  Defaults to <js>"GET"</js>.
 	</ul>
 	
 	<h5 class='topic w800'>org.apache.juneau.rest.client</h5>
@@ -32709,71 +32715,71 @@
 		<li>The <c>RestClient</c> class <c>doX(Object url)</c> methods now handle HttpClient <c>URIBuilder</c> instances.
 		<li>New methods added/updated to {@link org.apache.juneau.rest.client.RestClient}:
 		<ul>
-			<li>{@del RestClient#getRemoteableProxy(Class,Object)} - For interface proxies defined using <c><ja>@RestMethod</ja>(name=<js>"PROXY"</js>)</c>.
-			<li>{@del RestClient#getRemoteableProxy(Class,Object,Serializer,Parser)} - Same as above but overrides the serializer and parser defined on the client.
-			<li>{@del RestClient#doPost(Object)}
-			<li>{@del RestClient#doCall(HttpMethod,Object,Object)} - Can now pass in instances of {@del org.apache.juneau.rest.client.NameValuePairs} for easy form posts.
+			<li><del>RestClient#getRemoteableProxy(Class,Object)</del> - For interface proxies defined using <c><ja>@RestMethod</ja>(name=<js>"PROXY"</js>)</c>.
+			<li><del>RestClient#getRemoteableProxy(Class,Object,Serializer,Parser)</del> - Same as above but overrides the serializer and parser defined on the client.
+			<li><del>RestClient#doPost(Object)</del>
+			<li><del>RestClient#doCall(HttpMethod,Object,Object)</del> - Can now pass in instances of <del>NameValuePairs</del> for easy form posts.
 				<br>This extends to all methods that take in the input.
 		</ul>
-		<li>New methods on {@del org.apache.juneau.rest.client.RestCall}:
-			<ul>
-				<li>{@del org.apache.juneau.rest.client.RestCall#uri(Object) uri(Object)}
-				<li>{@del query(String,Object,boolean,PartSerializer)}
-				<li>{@del org.apache.juneau.rest.client.RestCall#query(String,Object) query(String,Object)}
-				<li>{@del org.apache.juneau.rest.client.RestCall#queryIfNE(String,Object) queryIfNE(String,Object)}
-				<li>{@del org.apache.juneau.rest.client.RestCall#query(Map) query(Map)}
-				<li>{@del org.apache.juneau.rest.client.RestCall#queryIfNE(Map) queryIfNE(Map)}
-				<li>{@del org.apache.juneau.rest.client.RestCall#query(String) query(String)}
-				<li>{@del formData(String,Object,boolean,PartSerializer)}
-				<li>{@del org.apache.juneau.rest.client.RestCall#formData(String,Object) formData(String,Object)}
-				<li>{@del org.apache.juneau.rest.client.RestCall#formDataIfNE(String,Object) formDataIfNE(String,Object)}
-				<li>{@del org.apache.juneau.rest.client.RestCall#formData(Map) formData(Map)}
-				<li>{@del org.apache.juneau.rest.client.RestCall#formDataIfNE(Map) formDataIfNE(Map)}
-				<li>{@del header(String,Object,boolean,PartSerializer)}
-				<li>{@del org.apache.juneau.rest.client.RestCall#header(String,Object) header(String,Object)}
-				<li>{@del org.apache.juneau.rest.client.RestCall#headerIfNE(String,Object) headerIfNE(String,Object)}
-				<li>{@del org.apache.juneau.rest.client.RestCall#headers(Map) headers(Map)}
-				<li>{@del org.apache.juneau.rest.client.RestCall#headersIfNE(Map) headersIfNE(Map)}
-				<li>{@del org.apache.juneau.rest.client.RestCall#host(String) host(String)}
-				<li>{@del org.apache.juneau.rest.client.RestCall#port(int) port(int)}
-				<li>{@del org.apache.juneau.rest.client.RestCall#userInfo(String,String) userInfo(String,String)}
-				<li>{@del org.apache.juneau.rest.client.RestCall#userInfo(String) userInfo(String)}
-				<li>{@del org.apache.juneau.rest.client.RestCall#scheme(String) scheme(String)}
+		<li>New methods on <del>RestCall</del>:
+			<ul>
+				<li><del>RestCall#uri(Object) uri(Object)</del>
+				<li><del>query(String,Object,boolean,PartSerializer)</del>
+				<li><del>RestCall#query(String,Object) query(String,Object)</del>
+				<li><del>RestCall#queryIfNE(String,Object) queryIfNE(String,Object)</del>
+				<li><del>RestCall#query(Map) query(Map)</del>
+				<li><del>RestCall#queryIfNE(Map) queryIfNE(Map)</del>
+				<li><del>RestCall#query(String) query(String)</del>
+				<li><del>formData(String,Object,boolean,PartSerializer)</del>
+				<li><del>RestCall#formData(String,Object) formData(String,Object)</del>
+				<li><del>RestCall#formDataIfNE(String,Object) formDataIfNE(String,Object)</del>
+				<li><del>RestCall#formData(Map) formData(Map)</del>
+				<li><del>RestCall#formDataIfNE(Map) formDataIfNE(Map)</del>
+				<li><del>header(String,Object,boolean,PartSerializer)</del>
+				<li><del>RestCall#header(String,Object) header(String,Object)</del>
+				<li><del>RestCall#headerIfNE(String,Object) headerIfNE(String,Object)</del>
+				<li><del>RestCall#headers(Map) headers(Map)</del>
+				<li><del>RestCall#headersIfNE(Map) headersIfNE(Map)</del>
+				<li><del>RestCall#host(String) host(String)</del>
+				<li><del>RestCall#port(int) port(int)</del>
+				<li><del>RestCall#userInfo(String,String) userInfo(String,String)</del>
+				<li><del>RestCall#userInfo(String) userInfo(String)</del>
+				<li><del>RestCall#scheme(String) scheme(String)</del>
 			</ul>
 		<li>New methods added to {@link org.apache.juneau.rest.client.RestClient.Builder}:
 			<ul>
 				<li>{@link org.apache.juneau.rest.client.RestClient.Builder#executorService(ExecutorService,boolean) executorService(ExecutorService,boolean)}
-				<li>{@del RestClient.Builder#paramFormat(String)}
-				<li>{@del RestClient.Builder#plainTextParams()}
+				<li><del>Builder#paramFormat(String)</del>
+				<li><del>Builder#plainTextParams()</del>
 				<li>{@link org.apache.juneau.rest.client.RestClient.Builder#noTrace() noTrace()} - Adds a <c>No-Trace: true</c> header on all requests to prevent
 					the servlet from logging errors.
 					<br>Useful for testing scenarios when you don't want the console to end up showing errors done on purpose.
 				<li>{@link org.apache.juneau.rest.client.RestClient.Builder#debug() debug()} now adds a <c>Debug: true</c> header on all requests.
 			</ul>
-		<li>New methods added/updated to {@del org.apache.juneau.rest.client.RestCall}:
+		<li>New methods added/updated to <del>RestCall</del>:
 			<ul>
-				<li>{@del org.apache.juneau.rest.client.RestCall#runFuture() runFuture()}
-				<li>{@del org.apache.juneau.rest.client.RestCall#getResponseFuture(Class) getResponseFuture(Class)}
+				<li><del>RestCall#runFuture() runFuture()</del>
+				<li><del>RestCall#getResponseFuture(Class) getResponseFuture(Class)</del>
 				<li>{@del org.apache.juneau.rest.client.RestCall#getResponseFuture(Type,Type...) getResponseFuture(Type,Type...)}
-				<li>{@del org.apache.juneau.rest.client.RestCall#getResponseAsStringFuture() getResponseAsStringFuture()}
-				<li>{@del org.apache.juneau.rest.client.RestCall#serializer(Serializer) serializer(Serializer)} - Override the serializer defined on the client for a single call.
-				<li>{@del org.apache.juneau.rest.client.RestCall#parser(Parser) parser(Parser)} - Override the parser defined on the client for a single call.
-				<li>{@del input(Object)} - Now accepts instances of {@del org.apache.juneau.rest.client.NameValuePairs}.
-				<li>{@del org.apache.juneau.rest.client.RestCall#getResponse(Class) getResponse(Class)} - Can now pass in any of the following:
+				<li><del>RestCall#getResponseAsStringFuture() getResponseAsStringFuture()</del>
+				<li><del>RestCall#serializer(Serializer) serializer(Serializer)</del> - Override the serializer defined on the client for a single call.
+				<li><del>RestCall#parser(Parser) parser(Parser)</del> - Override the parser defined on the client for a single call.
+				<li><del>input(Object)</del> - Now accepts instances of <del>NameValuePairs</del>.
+				<li><del>RestCall#getResponse(Class) getResponse(Class)</del> - Can now pass in any of the following:
 					<ul>
 						<li>{@link org.apache.http.HttpResponse} - Returns the raw <c>HttpResponse</c> returned by the inner <c>HttpClient</c>.
 						<li>{@link java.io.Reader} - Returns access to the raw reader of the response.
 						<li>{@link java.io.InputStream} - Returns access to the raw input stream of the response.
 					</ul>
 			</ul>
-		<li>New methods added to {@del org.apache.juneau.rest.client.NameValuePairs}:
+		<li>New methods added to <del>NameValuePairs</del>:
 			<ul>
-				<li>{@del org.apache.juneau.rest.client.NameValuePairs#append(String,Object) append(String,Object)}
-				<li>{@del append(String,Object,PartSerializer)}
+				<li><del>NameValuePairs#append(String,Object) append(String,Object)</del>
+				<li><del>append(String,Object,PartSerializer)</del>
 			</ul>
-		<li>{@del org.apache.juneau.rest.client.RetryOn} is now an abstract class with an additional method:
+		<li><del>RetryOn</del> is now an abstract class with an additional method:
 			<ul>
-				<li>{@del org.apache.juneau.rest.client.RetryOn#onResponse(HttpResponse) onResponse(HttpResponse)}
+				<li><del>RetryOn#onResponse(HttpResponse) onResponse(HttpResponse)</del>
 			</ul>			
 	</ul>
 	
@@ -32781,10 +32787,10 @@
 	<ul class='spaced-list'>
 		<li><js>"REST/port"</js> configuration setting can now be a comma-limited list of port numbers to try.
 			<br>You can also specify one or more <c>0</c>s to try a random port.
-		<li>Methods added to {@del RestMicroservice} class:
+		<li>Methods added to <del>RestMicroservice</del> class:
 		<ul>
-			<li>{@del getPort()}
-			<li>{@del getURI()}
+			<li><del>getPort()</del>
+			<li><del>getURI()</del>
 			<li>Override methods added from {@link org.apache.juneau.microservice.Microservice} class for easier method chaining.
 		</ul>
 	</ul>		
@@ -32806,7 +32812,7 @@
 		<li>
 			New package:  {@link org.apache.juneau.http}.
 		<li>
-			Support for dynamic beans.  See {@del @BeanProperty(name)}.
+			Support for dynamic beans.  See <del>@BeanProperty(name)</del>.
 		<li>
 			New doc: <dc>2.8 - Virtual Beans</dc>
 		<li>
@@ -32818,47 +32824,47 @@
 		<jc>// Example</jc>
 		<jk>int</jk> i = JsonParser.<jsf>DEFAULT</jsf>.parse(<js>"123M"</js>);  <jc>// 123MB</jc>
 			</p>
-		<li>New/modified methods on {@del ConfigFile}:
+		<li>New/modified methods on <del>ConfigFile</del>:
 			<ul>
-				<li>{@del ConfigFile#put(String,String,String,boolean)}
-				<li>{@del ConfigFile#put(String,String,Object,Serializer,boolean,boolean)}
+				<li><del>ConfigFile#put(String,String,String,boolean)</del>
+				<li><del>ConfigFile#put(String,String,Object,Serializer,boolean,boolean)</del>
 				<li>{@del ConfigFile#getObject(String,Type,Type...)}
 				<li>{@del ConfigFile#getObject(String,Parser,Type,Type...)}
-				<li>{@del ConfigFile#getObject(String,Class)}
-				<li>{@del ConfigFile#getObject(String,Parser,Class)}
+				<li><del>ConfigFile#getObject(String,Class)</del>
+				<li><del>ConfigFile#getObject(String,Parser,Class)</del>
 				<li>{@del ConfigFile#getObject(String,String,Type,Type...)}
 				<li>{@del ConfigFile#getObject(String,String,Parser,Type,Type...)}
-				<li>{@del ConfigFile#getObject(String,String,Class)}
-				<li>{@del ConfigFile#getObject(String,String,Parser,Class)}
+				<li><del>ConfigFile#getObject(String,String,Class)</del>
+				<li><del>ConfigFile#getObject(String,String,Parser,Class)</del>
 				<li>{@del ConfigFile#getObjectWithDefault(String,Object,Type,Type...)}
 				<li>{@del ConfigFile#getObjectWithDefault(String,Parser,Object,Type,Type...)}
-				<li>{@del ConfigFile#getObjectWithDefault(String,Object,Class)}
-				<li>{@del ConfigFile#getObjectWithDefault(String,Parser,Object,Class)} 
+				<li><del>ConfigFile#getObjectWithDefault(String,Object,Class)</del>
+				<li><del>ConfigFile#getObjectWithDefault(String,Parser,Object,Class)</del> 
 			</ul>
-		<li>New ability to interact with config file sections with proxy interfaces with new method {@del ConfigFile#getSectionAsInterface(String,Class)}.
-		<li>{@del @BeanProperty} annotation can now be applied to getters
+		<li>New ability to interact with config file sections with proxy interfaces with new method <del>ConfigFile#getSectionAsInterface(String,Class)</del>.
+		<li><del>@BeanProperty</del> annotation can now be applied to getters
 			and setters defined on interfaces.
 		<li>New methods on {@link org.apache.juneau.serializer.SerializerSession} and {@link org.apache.juneau.parser.ParserSession}
 			for retrieving context and runtime-override properties:
 			<ul>
-				<li>{@del Session#getProperty(String)}
-				<li>{@del Session#getProperty(String,String)}
-				<li>{@del Session#getProperty(Class,String)}
-				<li>{@del Session#getProperty(Class,String,Object)}
+				<li><del>Session#getProperty(String)</del>
+				<li><del>Session#getProperty(String,String)</del>
+				<li><del>Session#getProperty(Class,String)</del>
+				<li><del>Session#getProperty(Class,String,Object)</del>
 			</ul>	
-		<li>New {@del org.apache.juneau.serializer.PartSerializer} interface particularly tailored to HTTP
+		<li>New <del>PartSerializer</del> interface particularly tailored to HTTP
 			headers, query parameters, form-data parameters, and path variables.  
 			<br>Allows easy user-defined serialization of these objects.
 			<br>The interface can be used in the following locations:
 			<ul>
-				<li>{@del org.apache.juneau.rest.client.RestClient.Builder#partSerializer(Class)}
-				<li>{@del org.apache.juneau.remoteable.Path#serializer}
-				<li>{@del org.apache.juneau.remoteable.Query#serializer}
-				<li>{@del org.apache.juneau.remoteable.QueryIfNE#serializer}
-				<li>{@del org.apache.juneau.remoteable.FormData#serializer}
-				<li>{@del org.apache.juneau.remoteable.FormDataIfNE#serializer}
-				<li>{@del org.apache.juneau.remoteable.Header#serializer}
-				<li>{@del org.apache.juneau.remoteable.HeaderIfNE#serializer}
+				<li><del>Builder#partSerializer(Class)</del>
+				<li><del>Path#serializer</del>
+				<li><del>Query#serializer</del>
+				<li><del>QueryIfNE#serializer</del>
+				<li><del>FormData#serializer</del>
+				<li><del>FormDataIfNE#serializer</del>
+				<li><del>Header#serializer</del>
+				<li><del>HeaderIfNE#serializer</del>
 			</ul>
 		<li>Across-the-board improvements to the URI-resolution support (i.e. how URIs get serialized).
 			<ul>
@@ -32880,7 +32886,7 @@
 					these new protocols should (hopefully) be easier to understand.
 					<br>
 					These protocols work on all serialized URL and URI objects, as well as classes and properties 
-					annotated with {@del org.apache.juneau.annotation.URI @URI}.
+					annotated with <del>URI @URI</del>.
 				<li>New classes:
 					<ul>
 						<li>{@link org.apache.juneau.UriContext}
@@ -32889,12 +32895,12 @@
 						<li>{@link org.apache.juneau.UriResolver}
 					</ul>
 				<li>New configuration properties:
-					<li>{@del SerializerContext#SERIALIZER_uriContext}
-					<li>{@del SerializerContext#SERIALIZER_uriRelativity}
-					<li>{@del SerializerContext#SERIALIZER_uriResolution}
-					<li>{@del SerializerContext#SERIALIZER_maxIndent}
+					<li><del>SerializerContext#SERIALIZER_uriContext</del>
+					<li><del>SerializerContext#SERIALIZER_uriRelativity</del>
+					<li><del>SerializerContext#SERIALIZER_uriResolution</del>
+					<li><del>SerializerContext#SERIALIZER_maxIndent</del>
 			</ul>
-		<li>New annotation property: {@del @BeanProperty(value)}.
+		<li>New annotation property: <del>@BeanProperty(value)</del>.
 			<br>The following two annotations are considered equivalent:
 			<p class='bcode'>
 		<ja>@BeanProperty</ja>(name=<js>"foo"</js>)
@@ -32902,23 +32908,23 @@
 		<ja>@BeanProperty</ja>(<js>"foo"</js>)
 			</p>
 		<li>Fixed a race condition in ClassMeta.
-		<li><jsf>URLENC_paramFormat</jsf> has been moved to {@del UonSerializer#UON_paramFormat}, 
+		<li><jsf>URLENC_paramFormat</jsf> has been moved to <del>UonSerializer#UON_paramFormat</del>, 
 			and the UON/URL-Encoding serializers will now always serialize all values as plain text.
 			<br>This means that arrays and maps are converted to simple comma-delimited lists.
 		<li>Listener APIs added to serializers and parsers:
 			<ul>
 				<li>{@link org.apache.juneau.serializer.SerializerListener}
 				<li>{@link org.apache.juneau.serializer.Serializer.Builder#listener(Class)}
-				<li>{@del @RestResource(serializerListener)}
-				<li>{@del RestConfig#serializerListener(Class)}
+				<li><del>@RestResource(serializerListener)</del>
+				<li><del>RestConfig#serializerListener(Class)</del>
 				<li>{@link org.apache.juneau.parser.ParserListener}
 				<li>{@link org.apache.juneau.parser.Parser.Builder#listener(Class)}
-				<li>{@del @RestResource(parserListener)}
-				<li>{@del RestConfig#parserListener(Class)}
-				<li>{@del RestClient.Builder#listeners(Class,Class)}
+				<li><del>@RestResource(parserListener)</del>
+				<li><del>RestConfig#parserListener(Class)</del>
+				<li><del>Builder#listeners(Class,Class)</del>
 			</ul>juneau-examples-core.import1.pngjuneau-examples-core.import1.png
-		<li>The {@del BEAN_debug} flag will now capture parser input and make it
-			available through the {@del ParserSession#getInputAsString()} method so that it can be used
+		<li>The <del>BEAN_debug</del> flag will now capture parser input and make it
+			available through the <del>ParserSession#getInputAsString()</del> method so that it can be used
 			in the listeners.
 		<li>Significant new functionality introduced to the HTML serializer.  
 			<br>Lots of new options for customizing the HTML output.
@@ -32929,17 +32935,17 @@
 					<br>Annotation can be applied to POJO classes and bean properties.
 				<li>Several new properties for customizing parts of the HTML page:
 					<ul>
-						<li>{@del HtmlDocSerializerContext#HTMLDOC_title}
-						<li>{@del HtmlDocSerializerContext#HTMLDOC_description}
-						<li>{@del HtmlDocSerializerContext#HTMLDOC_branding}
-						<li>{@del HtmlDocSerializerContext#HTMLDOC_header}
-						<li>{@del HtmlDocSerializerContext#HTMLDOC_nav}
-						<li>{@del HtmlDocSerializerContext#HTMLDOC_aside}
-						<li>{@del HtmlDocSerializerContext#HTMLDOC_footer}
-						<li>{@del HtmlDocSerializerContext#HTMLDOC_noResultsMessage}
-						<li>{@del HtmlDocSerializerContext#HTMLDOC_cssUrl}
-						<li>{@del HtmlDocSerializerContext#HTMLDOC_css}
-						<li>{@del HtmlDocSerializerContext#HTMLDOC_template}
+						<li><del>HtmlDocSerializerContext#HTMLDOC_title</del>
+						<li><del>HtmlDocSerializerContext#HTMLDOC_description</del>
+						<li><del>HtmlDocSerializerContext#HTMLDOC_branding</del>
+						<li><del>HtmlDocSerializerContext#HTMLDOC_header</del>
+						<li><del>HtmlDocSerializerContext#HTMLDOC_nav</del>
+						<li><del>HtmlDocSerializerContext#HTMLDOC_aside</del>
+						<li><del>HtmlDocSerializerContext#HTMLDOC_footer</del>
+						<li><del>HtmlDocSerializerContext#HTMLDOC_noResultsMessage</del>
+						<li><del>HtmlDocSerializerContext#HTMLDOC_cssUrl</del>
+						<li><del>HtmlDocSerializerContext#HTMLDOC_css</del>
+						<li><del>HtmlDocSerializerContext#HTMLDOC_template</del>
 					</ul>
 				<li>New interface {@link org.apache.juneau.html.HtmlDocTemplate} that allows full control over rendering
 					of HTML produced by {@link org.apache.juneau.html.HtmlDocSerializer}.
@@ -32949,10 +32955,10 @@
 			can now be applied to fields.  
 		<li>New properties on {@link org.apache.juneau.BeanContext}:
 			<ul>
-				<li>{@del BEAN_includeProperties}
-				<li>{@del BEAN_excludeProperties}
+				<li><del>BEAN_includeProperties</del>
+				<li><del>BEAN_excludeProperties</del>
 			</ul>
-		<li>New annotation property: {@del @BeanProperty(format)}.
+		<li>New annotation property: <del>@BeanProperty(format)</del>.
 	</ul>
 	
 	<h5 class='topic w800'>org.apache.juneau.rest</h5>
@@ -32963,19 +32969,19 @@
 			The {@link org.apache.juneau.rest.RestRequest} class functionality has been broken up into the following
 			functional pieces to reduce its complexity:
 			<ul>
-				<li>{@del org.apache.juneau.rest.RestRequest#getBody()} - The request body.
+				<li><del>RestRequest#getBody()</del> - The request body.
 				<li>{@link org.apache.juneau.rest.RestRequest#getHeaders()} - The request headers.
-				<li>{@del RestRequest#getQuery()} - The request query parameters.
-				<li>{@del RestRequest#getFormData()} - The request form data parameters.
-				<li>{@del RestRequest#getPathMatch()} - The path variables and remainder.
+				<li><del>RestRequest#getQuery()</del> - The request query parameters.
+				<li><del>RestRequest#getFormData()</del> - The request form data parameters.
+				<li><del>RestRequest#getPathMatch()</del> - The path variables and remainder.
 			</ul>	
 			The following classes have been introduced:
 			<ul>
-				<li>{@del org.apache.juneau.rest.RequestBody}
-				<li>{@del org.apache.juneau.rest.RequestHeaders}
-				<li>{@del org.apache.juneau.rest.RequestQuery}
-				<li>{@del org.apache.juneau.rest.RequestFormData}
-				<li>{@del org.apache.juneau.rest.RequestPath}
+				<li><del>RequestBody</del>
+				<li><del>RequestHeaders</del>
+				<li><del>RequestQuery</del>
+				<li><del>RequestFormData</del>
+				<li><del>RequestPath</del>
 			</ul>						
 		<li>
 			The un-annotated parameter types that can be passed in through REST Java methods has been significantly expanded.
@@ -32988,34 +32994,34 @@
 			</ul>
 			The new supported types are:
 			<ul>
-				<li>{@del Accept}
-				<li>{@del AcceptCharset}
-				<li>{@del AcceptEncoding}
-				<li>{@del AcceptLanguage}
-				<li>{@del Authorization}
-				<li>{@del CacheControl}
-				<li>{@del Connection}
-				<li>{@del ContentLength}
-				<li>{@del ContentType}
-				<li>{@del Date}
-				<li>{@del Expect}
-				<li>{@del From}
-				<li>{@del Host}
-				<li>{@del IfMatch}
-				<li>{@del IfModifiedSince}
-				<li>{@del IfNoneMatch}
-				<li>{@del IfRange}
-				<li>{@del IfUnmodifiedSince}
-				<li>{@del MaxForwards}
-				<li>{@del Pragma}
-				<li>{@del ProxyAuthorization}
-				<li>{@del Range}
-				<li>{@del Referer}
-				<li>{@del TE}
-				<li>{@del UserAgent}
-				<li>{@del Upgrade}
-				<li>{@del Via}
-				<li>{@del Warning}
+				<li><del>Accept</del>
+				<li><del>AcceptCharset</del>
+				<li><del>AcceptEncoding</del>
+				<li><del>AcceptLanguage</del>
+				<li><del>Authorization</del>
+				<li><del>CacheControl</del>
+				<li><del>Connection</del>
+				<li><del>ContentLength</del>
+				<li><del>ContentType</del>
+				<li><del>Date</del>
+				<li><del>Expect</del>
+				<li><del>From</del>
+				<li><del>Host</del>
+				<li><del>IfMatch</del>
+				<li><del>IfModifiedSince</del>
+				<li><del>IfNoneMatch</del>
+				<li><del>IfRange</del>
+				<li><del>IfUnmodifiedSince</del>
+				<li><del>MaxForwards</del>
+				<li><del>Pragma</del>
+				<li><del>ProxyAuthorization</del>
+				<li><del>Range</del>
+				<li><del>Referer</del>
+				<li><del>TE</del>
+				<li><del>UserAgent</del>
+				<li><del>Upgrade</del>
+				<li><del>Via</del>
+				<li><del>Warning</del>
 				<li>{@link java.util.TimeZone}
 				<li>{@link java.io.InputStream}
 				<li>{@link javax.servlet.ServletInputStream}
@@ -33024,20 +33030,20 @@
 				<li>{@link javax.servlet.ServletOutputStream}
 				<li>{@link java.io.Writer}
 				<li>{@link java.util.ResourceBundle} - Client-localized resource bundle.
-				<li>{@del org.apache.juneau.utils.MessageBundle} - A resource bundle with additional features.
+				<li><del>MessageBundle</del> - A resource bundle with additional features.
 				<li>{@link java.util.Locale} - Client locale.
-				<li>{@del org.apache.juneau.rest.RequestHeaders} - API for accessing request headers.
-				<li>{@del org.apache.juneau.rest.RequestQuery} - API for accessing request query parameters.
-				<li>{@del org.apache.juneau.rest.RequestFormData} - API for accessing request form data.
-				<li>{@del org.apache.juneau.rest.RequestPath} - API for accessing path variables.
-				<li>{@del org.apache.juneau.rest.RequestBody} - API for accessing request body.
+				<li><del>RequestHeaders</del> - API for accessing request headers.
+				<li><del>RequestQuery</del> - API for accessing request query parameters.
+				<li><del>RequestFormData</del> - API for accessing request form data.
+				<li><del>RequestPath</del> - API for accessing path variables.
+				<li><del>RequestBody</del> - API for accessing request body.
 				<li>{@link org.apache.juneau.http.HttpMethod} - The method name matched (when using <c><ja>@RestMethod</ja>(name=<js>"*"</js>)</c>)
 				<li>{@link java.util.logging.Logger} - The logger to use for logging.
-				<li>{@del org.apache.juneau.internal.JuneauLogger} - Logger with additional features.
+				<li><del>JuneauLogger</del> - Logger with additional features.
 				<li>{@link org.apache.juneau.rest.RestContext} - The resource read-only context.
 				<li>{@link org.apache.juneau.parser.Parser} - The parser matching the request content type.
 				<li>{@link org.apache.juneau.dto.swagger.Swagger} - The auto-generated Swagger doc.
-				<li>{@del ConfigFile} - The external config file for the resource.
+				<li><del>ConfigFile</del> - The external config file for the resource.
 			</ul>
 			So, for example...
 			<p class='bcode'>
@@ -33066,84 +33072,84 @@
 		)
 			</p>
 		<li>
-			A new annotation {@del @RestResource(paramResolvers)}}
+			A new annotation <del>@RestResource(paramResolvers)</del>}
 			that allows you to define your own custom Java method parameter resolvers.
 		<li>
 			Fixed bug where Writer returned by {@link org.apache.juneau.rest.RestResponse#getWriter()} was not being flushed automatically
 			at the end of the HTTP call.
 		<li>
-			New annotations added to {@del org.apache.juneau.rest.annotation.RestMethod @RestMethod}:
+			New annotations added to <del>RestMethod @RestMethod</del>:
 			<ul>
-				<li>{@del org.apache.juneau.rest.annotation.RestMethod#defaultQuery() defaultQuery()}
-				<li>{@del org.apache.juneau.rest.annotation.RestMethod#defaultFormData() defaultFormData()}
-				<li>{@del bpIncludes()}
-				<li>{@del bpExcludes()}
+				<li><del>RestMethod#defaultQuery() defaultQuery()</del>
+				<li><del>RestMethod#defaultFormData() defaultFormData()</del>
+				<li><del>bpIncludes()</del>
+				<li><del>bpExcludes()</del>
 			</ul>
 		<li>
 			Default values on header, query, and form-data annotations:
 			<ul>
-				<li>{@del @Header(def)} - Default header value.
-				<li>{@del @Query(def)} - Default query parameter value.
-				<li>{@del @FormData(def)} - Default form data parameter value.
+				<li><del>@Header(def)</del> - Default header value.
+				<li><del>@Query(def)</del> - Default query parameter value.
+				<li><del>@FormData(def)</del> - Default form data parameter value.
 			</ul>
 		<li>
-			New attributes on {@del @RestResource}:
+			New attributes on <del>@RestResource</del>:
 			<ul>
-				<li>{@del serializerListener()}
-				<li>{@del parserListener()}
-				<li>{@del widgets()}
-				<li>{@del swagger()}
-				<li>{@del htmldoc()}
+				<li><del>serializerListener()</del>
+				<li><del>parserListener()</del>
+				<li><del>widgets()</del>
+				<li><del>swagger()</del>
+				<li><del>htmldoc()</del>
 			</ul>
 		<li>
-			New attributes on {@del org.apache.juneau.rest.annotation.RestMethod @RestMethod}:
+			New attributes on <del>RestMethod @RestMethod</del>:
 			<ul>
-				<li>{@del widgets()}
-				<li>{@del org.apache.juneau.rest.annotation.RestMethod#swagger() swagger()}
-				<li>{@del org.apache.juneau.rest.annotation.RestMethod#htmldoc() htmldoc()}
+				<li><del>widgets()</del>
+				<li><del>RestMethod#swagger() swagger()</del>
+				<li><del>RestMethod#htmldoc() htmldoc()</del>
 			</ul>
 		<li>
 			New string vars:
 			<ul>
 				<li>{@link org.apache.juneau.rest.vars.UrlVar} - Resolve <js>"$U{...}"</js> variables to URLs.
-				<li>{@del org.apache.juneau.rest.vars.WidgetVar} - Resolve <js>"$W{...}"</js> variables to widget contents.
+				<li><del>WidgetVar</del> - Resolve <js>"$W{...}"</js> variables to widget contents.
 			</ul>
 		<li>
-			New methods on {@del RestConfig}:
+			New methods on <del>RestConfig</del>:
 			<ul>
-				<li>{@del setHtmlTitle(String)}
-				<li>{@del setHtmlDescription(String)}
-				<li>{@del setHtmlBranding(String)}
-				<li>{@del setHtmlHeader(String)}
-				<li>{@del setHtmlLinks(String)}
-				<li>{@del setHtmlNav(String)}
-				<li>{@del setHtmlAside(String)}
-				<li>{@del setHtmlFooter(String)}
-				<li>{@del setHtmlCss(String)}
-				<li>{@del setHtmlCssUrl(String)}
-				<li>{@del setHtmlNoWrap(boolean)}
-				<li>{@del setHtmlNoResultsMessage(String)}
-				<li>{@del setHtmlTemplate(Class)}
-				<li>{@del setHtmlTemplate(HtmlDocTemplate)}
-				<li>{@del addWidget(Class)}
+				<li><del>setHtmlTitle(String)</del>
+				<li><del>setHtmlDescription(String)</del>
+				<li><del>setHtmlBranding(String)</del>
+				<li><del>setHtmlHeader(String)</del>
+				<li><del>setHtmlLinks(String)</del>
+				<li><del>setHtmlNav(String)</del>
+				<li><del>setHtmlAside(String)</del>
+				<li><del>setHtmlFooter(String)</del>
+				<li><del>setHtmlCss(String)</del>
+				<li><del>setHtmlCssUrl(String)</del>
+				<li><del>setHtmlNoWrap(boolean)</del>
+				<li><del>setHtmlNoResultsMessage(String)</del>
+				<li><del>setHtmlTemplate(Class)</del>
+				<li><del>setHtmlTemplate(HtmlDocTemplate)</del>
+				<li><del>addWidget(Class)</del>
 			</ul>
 		<li>
 			New methods on {@link org.apache.juneau.rest.RestResponse}:
 			<ul>
-				<li>{@del setHtmlTitle(Object)}
-				<li>{@del setHtmlDescription(Object)}
-				<li>{@del setHtmlBranding(Object)}
-				<li>{@del setHtmlHeader(Object)}
-				<li>{@del setHtmlLinks(Object)}
-				<li>{@del setHtmlNav(Object)}
-				<li>{@del setHtmlAside(Object)}
-				<li>{@del setHtmlFooter(Object)}
-				<li>{@del setHtmlCss(Object)}
-				<li>{@del setHtmlCssUrl(Object)}
-				<li>{@del setHtmlNoWrap(boolean)}
-				<li>{@del setHtmlNoResultsMessage(Object)}
-				<li>{@del setHtmlTemplate(Class)}
-				<li>{@del setHtmlTemplate(HtmlDocTemplate)}
+				<li><del>setHtmlTitle(Object)</del>
+				<li><del>setHtmlDescription(Object)</del>
+				<li><del>setHtmlBranding(Object)</del>
+				<li><del>setHtmlHeader(Object)</del>
+				<li><del>setHtmlLinks(Object)</del>
+				<li><del>setHtmlNav(Object)</del>
+				<li><del>setHtmlAside(Object)</del>
+				<li><del>setHtmlFooter(Object)</del>
+				<li><del>setHtmlCss(Object)</del>
+				<li><del>setHtmlCssUrl(Object)</del>
+				<li><del>setHtmlNoWrap(boolean)</del>
+				<li><del>setHtmlNoResultsMessage(Object)</del>
+				<li><del>setHtmlTemplate(Class)</del>
+				<li><del>setHtmlTemplate(HtmlDocTemplate)</del>
 			</ul>
 		<li>
 			<c>&amp;plainText=true</c> parameter now works on byte-based serializers by converting the output to hex.
@@ -33151,10 +33157,10 @@
 			New classes for widget support:
 			<ul>
 				<li>{@link org.apache.juneau.rest.widget.Widget}
-				<li>{@del PoweredByJuneauWidget}
-				<li>{@del ContentTypeLinksColumnWidget}
-				<li>{@del ContentTypeLinksRowWidget}
-				<li>{@del QueryWidget}
+				<li><del>PoweredByJuneauWidget</del>
+				<li><del>ContentTypeLinksColumnWidget</del>
+				<li><del>ContentTypeLinksRowWidget</del>
+				<li><del>QueryWidget</del>
 			</ul>
 		<li>
 			<c>devops.css</c> cleaned up.
@@ -33177,16 +33183,16 @@
 	<h5 class='topic w800'>org.apache.juneau.rest.client</h5>
 	<ul class='spaced-list'>
 		<li>
-			New {@del org.apache.juneau.remoteable.Path} annotation for specifying path variables on remoteable interfaces.
+			New <del>Path</del> annotation for specifying path variables on remoteable interfaces.
 		<li>
-			New {@del @RequestBean} annotation for specifying beans with remoteable annotations
+			New <del>@RequestBean</del> annotation for specifying beans with remoteable annotations
 			defined on properties.
 		<li>
 			The following annotations (and related methods on RestCall) can now take <c>NameValuePairs</c> and beans as input 
 			when using <js>"*"</js> as the name.
-			<br>{@del org.apache.juneau.remoteable.FormData},{@del org.apache.juneau.remoteable.FormDataIfNE},
-			{@del org.apache.juneau.remoteable.Query},{@del org.apache.juneau.remoteable.QueryIfNE},
-			{@del org.apache.juneau.remoteable.Header},{@del org.apache.juneau.remoteable.HeaderIfNE} 
+			<br><del>FormData</del>,<del>FormDataIfNE</del>,
+			<del>Query</del>,<del>QueryIfNE</del>,
+			<del>Header</del>,<del>HeaderIfNE</del> 
 	</ul>
 	
 	<h5 class='topic w800'>org.apache.juneau.microservice</h5>
@@ -33219,23 +33225,23 @@
 		<li>
 			{@link org.apache.juneau.utils.PojoQuery} improvements.
 		<li>
-			New {@del RemoteMethod#returns()} annotation.
+			New <del>RemoteMethod#returns()</del> annotation.
 			<br>Allows you to specify whether the remote method returns the HTTP body or status code.
 		<li>
-			Fixed bugs with {@del BEAN_includeProperties} and {@del BEAN_excludeProperties} settings.
+			Fixed bugs with <del>BEAN_includeProperties</del> and <del>BEAN_excludeProperties</del> settings.
 		<li>
-			New/modified settings in {@del HtmlDocSerializerContext}:
+			New/modified settings in <del>HtmlDocSerializerContext</del>:
 			<ul>
-				<li>{@del HTMLDOC_script}
-				<li>{@del HTMLDOC_style} - Was <jsf>HTMLDOC_css</jsf>.
-				<li>{@del HTMLDOC_stylesheet} - Was <jsf>HTMLDOC_cssUrl</jsf>.  Now an array.
+				<li><del>HTMLDOC_script</del>
+				<li><del>HTMLDOC_style</del> - Was <jsf>HTMLDOC_css</jsf>.
+				<li><del>HTMLDOC_stylesheet</del> - Was <jsf>HTMLDOC_cssUrl</jsf>.  Now an array.
 			</ul>
 		<li>
-			New {@del ResourceFinder} utility class.
+			New <del>ResourceFinder</del> utility class.
 			Allows you to search for resources up the parent hierarchy chain.
 			Also allows you to search for localized resources.
 		<li>
-			Eliminated the following properties from {@del HtmlDocSerializerContext}:
+			Eliminated the following properties from <del>HtmlDocSerializerContext</del>:
 			<jsf>HTMLDOC_title</jsf>, <jsf>HTMLDOC_description</jsf>, <jsf>HTMLDOC_description</jsf>
 			<br>See below on changes to simplify HTML headers.
 		<li>
@@ -33259,7 +33265,7 @@
 		<li>
 			Modifications to the following <ja>@HtmlDoc</ja> annotations:
 			<ul>
-				<li>{@del org.apache.juneau.rest.annotation.HtmlDoc#navlinks() navlinks()} - Now an array of strings instead of a JSON object.  Simplified syntax.
+				<li><del>HtmlDoc#navlinks() navlinks()</del> - Now an array of strings instead of a JSON object.  Simplified syntax.
 					<br>For example:
 					<p class='bcode'>
 		<jc>// Old syntax</jc>
@@ -33288,12 +33294,12 @@
 				<li>Several annotations are now arrays of strings instead of simple strings.
 					Values are simply concatenated with newlines which makes multi-line values cleaner.
 					<ul>
-						<li>{@del org.apache.juneau.rest.annotation.HtmlDoc#header() header()}
-						<li>{@del org.apache.juneau.rest.annotation.HtmlDoc#nav() nav()}
-						<li>{@del org.apache.juneau.rest.annotation.HtmlDoc#aside() aside()}
-						<li>{@del org.apache.juneau.rest.annotation.HtmlDoc#footer() footer()}
-						<li>{@del org.apache.juneau.rest.annotation.HtmlDoc#script() script()}
-						<li>{@del org.apache.juneau.rest.annotation.HtmlDoc#style() style()}
+						<li><del>HtmlDoc#header() header()</del>
+						<li><del>HtmlDoc#nav() nav()</del>
+						<li><del>HtmlDoc#aside() aside()</del>
+						<li><del>HtmlDoc#footer() footer()</del>
+						<li><del>HtmlDoc#script() script()</del>
+						<li><del>HtmlDoc#style() style()</del>
 					</ul>
 					Additionally, the <js>"INHERIT"</js> string literal can be used to combine the value with
 					the value defined on the servlet or parent class.  Links can also be inserted at specific
@@ -33305,14 +33311,14 @@
 				<li>
 					You can now add arbitrary CSS and Javascript along with your widgets through new methods:
 					<ul>
-						<li>{@del Widget#getHtml(RestRequest)}
-						<li>{@del Widget#getScript(RestRequest)}
-						<li>{@del Widget#getStyle(RestRequest)}
+						<li><del>Widget#getHtml(RestRequest)</del>
+						<li><del>Widget#getScript(RestRequest)</del>
+						<li><del>Widget#getStyle(RestRequest)</del>
 					</ul>
 				</li>
 				<li>
-					Declaration of widgets moved to {@del org.apache.juneau.rest.annotation.HtmlDoc#widgets() @HtmlDoc(widgets)} 
-					instead of separately on {@del @RestResource} and <ja>@RestMethod</ja> annotations.
+					Declaration of widgets moved to <del>HtmlDoc#widgets() @HtmlDoc(widgets)</del> 
+					instead of separately on <del>@RestResource</del> and <ja>@RestMethod</ja> annotations.
 				<li>
 					{@link org.apache.juneau.rest.widget.Widget#getName()} now defaults to the simple class name.
 					<br>So now you can just refer to the class name: <js>"$W{ContentTypeMenuItem}"</js>.
@@ -33339,43 +33345,43 @@
 					<br><img src='doc-files/ReleaseNotes.631.StyleMenuItem.png'>
 			</ul>
 		<li>
-			New/modified annotations on {@del org.apache.juneau.rest.annotation.HtmlDoc @HtmlDoc}:
+			New/modified annotations on <del>HtmlDoc @HtmlDoc</del>:
 			<ul>
-				<li>{@del org.apache.juneau.rest.annotation.HtmlDoc#style() style()} - Renamed from <c>css()</c>.
-				<li>{@del org.apache.juneau.rest.annotation.HtmlDoc#stylesheet() stylesheet()} - Renamed from <c>cssUrl()</c>.
+				<li><del>HtmlDoc#style() style()</del> - Renamed from <c>css()</c>.
+				<li><del>HtmlDoc#stylesheet() stylesheet()</del> - Renamed from <c>cssUrl()</c>.
 					<br>Can now be a comma-delimited list of URLs.
-				<li>{@del org.apache.juneau.rest.annotation.HtmlDoc#script() script()} - Add arbitrary Javascript to page header.
+				<li><del>HtmlDoc#script() script()</del> - Add arbitrary Javascript to page header.
 			</ul>
 	
 		<li>
-			Bug fix with {@del org.apache.juneau.rest.annotation.HtmlDoc#nowrap() @HtmlDoc(nowrap)} so that the setting only applies
+			Bug fix with <del>HtmlDoc#nowrap() @HtmlDoc(nowrap)</del> so that the setting only applies
 			to the data contents, not the whole page.
 		<li>
 			Two convenience methods added to {@link org.apache.juneau.rest.RestRequest}:
 			<ul>
-				<li>{@del RestRequest#attr(String,Object)}
-				<li>{@del RestRequest#prop(String,Object)}
+				<li><del>RestRequest#attr(String,Object)</del>
+				<li><del>RestRequest#prop(String,Object)</del>
 			</ul>
 		</li>
 		<li>
 			Annotations added:
 			<ul>
-				<li>{@del @RestResource(siteName)}
-				<li>{@del @RestResource(flags)}
-				<li>{@del org.apache.juneau.rest.annotation.RestMethod#flags() @RestMethod(flags)}
+				<li><del>@RestResource(siteName)</del>
+				<li><del>@RestResource(flags)</del>
+				<li><del>RestMethod#flags() @RestMethod(flags)</del>
 			</ul>
 		</li>
 		<li>
-			Eliminated the {@del @RestResource(stylesheet)} annotation.  
+			Eliminated the <del>@RestResource(stylesheet)</del> annotation.  
 			It's no longer needed now that you can easily specify styles via <ja>@Htmldoc</ja>.
 		<li>
-			Eliminated the following annotations since they are now redundant with {@del org.apache.juneau.rest.annotation.HtmlDoc#header() @HtmlDoc(header)}:
+			Eliminated the following annotations since they are now redundant with <del>HtmlDoc#header() @HtmlDoc(header)</del>:
 			<ul>
 				<li><c>title()</c>
 				<li><c>description()</c>
 				<li><c>branding()</c>
 			</ul>
-			Instead, the {@del org.apache.juneau.rest.BasicRestServlet} class defines the following default header
+			Instead, the <del>BasicRestServlet</del> class defines the following default header
 			that can be easily overridden: 
 			<p class='bcode'>
 		htmldoc=<ja>@HtmlDoc</ja>(
@@ -33399,13 +33405,13 @@
 		)
 			</p>
 		<li>
-			New {@del ReaderResource#toCommentStrippedString()} method.
+			New <del>ReaderResource#toCommentStrippedString()</del> method.
 		<li>
 			The <c>bpIncludes()</c> and <c>bpExcludes()</c> annotations on <ja>@RestMethod</ja>
 			has been replaced with the following:
 			<ul>
-				<li>{@del org.apache.juneau.rest.annotation.RestMethod#bpi() bpi()} - Now an array of simplified values instead of LAX JSON.
-				<li>{@del org.apache.juneau.rest.annotation.RestMethod#bpx() bpx()} - Now an array of simplified values instead of LAX JSON.
+				<li><del>RestMethod#bpi() bpi()</del> - Now an array of simplified values instead of LAX JSON.
+				<li><del>RestMethod#bpx() bpx()</del> - Now an array of simplified values instead of LAX JSON.
 			</ul>
 		<li>
 			Two new variables added to <c>$R</c> variable: <js>"$R{servletClass}"</js>, <js>"$R{servletClassSimple}"</js>
@@ -33614,7 +33620,7 @@
 			Improvements to swap support.
 			<ul>
 				<li>New {@link org.apache.juneau.annotation.Swap @Swap} annotation.
-					<br>Replaces the <c>@Pojo</c> and {@del @BeanProperty(swap)} annotations.
+					<br>Replaces the <c>@Pojo</c> and <del>@BeanProperty(swap)</del> annotations.
 				<li>Support for per-media-type swaps.
 					<br>Programmatic example:
 					<p class='bcode'>
@@ -33661,7 +33667,7 @@
 			<ja>@Swap</ja>(impl=FreeMarkerSwap.<jk>class</jk>, template=<js>"MyPojo.div.ftl"</js>)
 			<jk>public class</jk> MyPojo {}
 					</p>
-				<li>New {@del org.apache.juneau.annotation.Swaps @Swaps} annotation for defining multiple swaps
+				<li>New <del>Swaps @Swaps</del> annotation for defining multiple swaps
 					against the same POJO when they're differentiated by media types:
 					<p class='bcode'>
 		<ja>@Swaps</ja>(
@@ -33675,7 +33681,7 @@
 					</p>
 			</ul>
 		<li>
-			New {@del org.apache.juneau.transform.Surrogate} interface for identifying surrogate classes.
+			New <del>Surrogate</del> interface for identifying surrogate classes.
 		<li>
 			Serializers can now serialize to {@link java.util.StringBuilder StringBuilders}.
 		<li>
@@ -33721,42 +33727,42 @@
 			</p>
 			This is mostly an internal change and doesn't affect the existing APIs.
 		<li>
-			{@del org.apache.juneau.transform.PojoSwap#swap(BeanSession,Object)} and {@del org.apache.juneau.transform.PojoSwap#unswap(BeanSession,Object,ClassMeta)} 
+			<del>PojoSwap#swap(BeanSession,Object)</del> and <del>PojoSwap#unswap(BeanSession,Object,ClassMeta)</del> 
 			can now throw arbitrary exceptions instead of having to wrap them in <c>SerializeException</c>/<c>ParseException</c>.
 		<li>
-			New {@del org.apache.juneau.utils.CalendarUtils} class that encapsulates serialization/parsing logic from {@del org.apache.juneau.transforms.CalendarSwap} and 
-			{@del org.apache.juneau.transforms.DateSwap}.
+			New <del>CalendarUtils</del> class that encapsulates serialization/parsing logic from <del>CalendarSwap</del> and 
+			<del>DateSwap</del>.
 		<li>
 			New annotation {@link org.apache.juneau.html.annotation.Html#anchorText}.
 		<li>
-			New methods on {@del org.apache.juneau.ObjectList}:
+			New methods on <del>ObjectList</del>:
 			<ul>
-				<li>{@del org.apache.juneau.ObjectList#get(int,Class) get(int,Class)}
+				<li><del>ObjectList#get(int,Class) get(int,Class)</del>
 				<li>{@del org.apache.juneau.ObjectList#get(int,Type,Type...) get(int,Type,Type...)}
-				<li>{@del org.apache.juneau.ObjectList#getMap(int,Class,Class) getMap(int,Class,Class)}
-				<li>{@del org.apache.juneau.ObjectList#getList(int,Class) getList(int,Class)}
+				<li><del>ObjectList#getMap(int,Class,Class) getMap(int,Class,Class)</del>
+				<li><del>ObjectList#getList(int,Class) getList(int,Class)</del>
 			</ul>
 		<li>
-			New methods on {@del org.apache.juneau.ObjectMap}:
+			New methods on <del>ObjectMap</del>:
 			<ul>
-				<li>{@del org.apache.juneau.ObjectMap#get(String,Class) get(String,Class)}
+				<li><del>ObjectMap#get(String,Class) get(String,Class)</del>
 				<li>{@del org.apache.juneau.ObjectMap#get(String,Type,Type...) get(String,Type,Type...)}
-				<li>{@del org.apache.juneau.ObjectMap#getWithDefault(String,Object) getWithDefault(String,Object)}
-				<li>{@del org.apache.juneau.ObjectMap#getWithDefault(String,Object,Class) getWithDefault(String,Object,Class)}
+				<li><del>ObjectMap#getWithDefault(String,Object) getWithDefault(String,Object)</del>
+				<li><del>ObjectMap#getWithDefault(String,Object,Class) getWithDefault(String,Object,Class)</del>
 				<li>{@del org.apache.juneau.ObjectMap#getWithDefault(String,Object,Type,Type...) getWithDefault(String,Object,Type,Type...)}
-				<li>{@del org.apache.juneau.ObjectMap#getSwapped(String,PojoSwap) getSwapped(String,PojoSwap)}
-				<li>{@del org.apache.juneau.ObjectMap#getAt(String,Class) getAt(String,Class)}
+				<li><del>ObjectMap#getSwapped(String,PojoSwap) getSwapped(String,PojoSwap)</del>
+				<li><del>ObjectMap#getAt(String,Class) getAt(String,Class)</del>
 				<li>{@del org.apache.juneau.ObjectMap#getAt(String,Type,Type...) getAt(String,Type,Type...)}
-				<li>{@del org.apache.juneau.ObjectMap#getMap(String,Class,Class,Map) getMap(String,Class,Class,Map)}
-				<li>{@del org.apache.juneau.ObjectMap#getList(String,Class,List) getList(String,Class,List)}
+				<li><del>ObjectMap#getMap(String,Class,Class,Map) getMap(String,Class,Class,Map)</del>
+				<li><del>ObjectMap#getList(String,Class,List) getList(String,Class,List)</del>
 			</ul>
 		<li>
-			New methods on {@del org.apache.juneau.utils.PojoRest}:
+			New methods on <del>PojoRest</del>:
 			<ul>
-				<li>{@del org.apache.juneau.utils.PojoRest#get(String,Class) get(String,Class)}
+				<li><del>PojoRest#get(String,Class) get(String,Class)</del>
 				<li>{@del org.apache.juneau.utils.PojoRest#get(String,Type,Type...) get(String,Type,Type...)}
-				<li>{@del org.apache.juneau.utils.PojoRest#getWithDefault(String,Object) getWithDefault(String,Object)}
-				<li>{@del org.apache.juneau.utils.PojoRest#getWithDefault(String,Object,Class) getWithDefault(String,Object,Class)}
+				<li><del>PojoRest#getWithDefault(String,Object) getWithDefault(String,Object)</del>
+				<li><del>PojoRest#getWithDefault(String,Object,Class) getWithDefault(String,Object,Class)</del>
 				<li>{@del org.apache.juneau.utils.PojoRest#getWithDefault(String,Object,Type,Type...) getWithDefault(String,Object,Type,Type...)}
 			</ul>
 		<li>
@@ -33768,7 +33774,7 @@
 			the call to <c>getClass()</c> to retrieve the annotation value could not be called before calling
 			the <c><jk>super</jk>()</c> method.
 		<li>
-			New class: {@del org.apache.juneau.utils.PojoMerge}
+			New class: <del>PojoMerge</del>
 		<li>
 			New doc: <dc>2.6.2 - @Pojo annotation</dc>
 		<li>
@@ -33791,13 +33797,13 @@
 	<ul class='spaced-list'>
 		<li>
 			Revamped and simplified servlet and REST-call lifecycle handling through new
-			{@del @RestHook} annotation.
+			<del>@RestHook</del> annotation.
 			<ul>
-				<li>The {@del org.apache.juneau.rest.RestServlet#init(ServletConfig)} method is now final and can
+				<li>The <del>RestServlet#init(ServletConfig)</del> method is now final and can
 					no longer be extended.
 					<br>Instead, use {@link org.apache.juneau.rest.annotation.HookEvent#INIT} or 
 					{@link org.apache.juneau.rest.annotation.HookEvent#POST_INIT} for initialization.
-				<li>The following methods on {@del org.apache.juneau.rest.RestServlet} have been removed:
+				<li>The following methods on <del>RestServlet</del> have been removed:
 					<ul>
 						<li><c>init(RestConfig)</c> 
 							- Use {@link org.apache.juneau.rest.annotation.HookEvent#INIT} instead.
@@ -33811,40 +33817,40 @@
 			</ul>
 		<li>
 			Simplified {@link org.apache.juneau.rest.widget.MenuItemWidget}.
-			<br>Exposes an abstract method {@del getContent(RestRequest)} that
+			<br>Exposes an abstract method <del>getContent(RestRequest)</del> that
 			can return raw HTML via readers or char-sequences, or any other object (such as HTML5 beans) that will
 			get converted to HTML using {@link org.apache.juneau.html.HtmlSerializer#DEFAULT}.
 		<li>
-			{@del org.apache.juneau.rest.RestResourceResolver} instances are now inherited from parent resources to child resources
+			<del>RestResourceResolver</del> instances are now inherited from parent resources to child resources
 			unless explicitly overridden at the child level.
 			<br>It's also been changed to an interface.
-		<li>New annotations on {@del @RestResource}:
+		<li>New annotations on <del>@RestResource</del>:
 			<ul>
-				<li>{@del resourceResolver()}
+				<li><del>resourceResolver()</del>
 					<br>Allows you to specify a resource resolver on the servlet context to make it easier to work with
 					dependency injection frameworks.
-				<li>{@del contextPath()} - 
+				<li><del>contextPath()</del> - 
 					<br>Allows you to override the context path value inherited from the servlet container.
-				<li>{@del allowHeaderParams()} - 
+				<li><del>allowHeaderParams()</del> - 
 					<br>Replaces the <c>RestContext.REST_allowHeaderParams</c> setting.
-				<li>{@del allowMethodParam()} - 
+				<li><del>allowMethodParam()</del> - 
 					<br>Replaces the <c>RestContext.REST_allowMethodParam</c> setting.
-				<li>{@del allowBodyParam()} - 
+				<li><del>allowBodyParam()</del> - 
 					<br>Replaces the <c>RestContext.REST_allowBodyParam</c> setting.
-				<li>{@del renderResponseStackTraces()} - 
+				<li><del>renderResponseStackTraces()</del> - 
 					<br>Replaces the <c>RestContext.REST_xxx</c> setting.
-				<li>{@del useStackTraceHashes()} - 
+				<li><del>useStackTraceHashes()</del> - 
 					<br>Replaces the <c>RestContext.REST_useStackTraceHashes</c> setting.
-				<li>{@del defaultCharset()} - 
+				<li><del>defaultCharset()</del> - 
 					<br>Replaces the <c>RestContext.REST_defaultCharset</c> setting.
-				<li>{@del paramFormat()} - 
+				<li><del>paramFormat()</del> - 
 					<br>Replaces the <c>RestContext.REST_paramFormat</c> setting.
 			</ul>
-		<li>New annotations on {@del org.apache.juneau.rest.annotation.RestMethod @RestMethod}:
+		<li>New annotations on <del>RestMethod @RestMethod</del>:
 			<ul>
-				<li>{@del org.apache.juneau.rest.annotation.RestMethod#defaultCharset() defaultCharset()} - 
+				<li><del>RestMethod#defaultCharset() defaultCharset()</del> - 
 					<br>Replaces the <c>RestContext.REST_defaultCharset</c> setting.
-				<li>{@del RestMethod#paramFormat()} - 
+				<li><del>RestMethod#paramFormat()</del> - 
 					<br>Replaces the <c>RestContext.REST_paramFormat</c> setting.
 			</ul>
 		<li>
@@ -33852,12 +33858,12 @@
 			<ul>
 				<li>{@link org.apache.juneau.rest.widget.Widget}
 				<li>{@link org.apache.juneau.rest.RestConverter}
-				<li>{@del org.apache.juneau.rest.RestGuard}
+				<li><del>RestGuard</del>
 				<li>{@link org.apache.juneau.rest.ResponseHandler}
-				<li>{@del org.apache.juneau.rest.RestCallHandler}
-				<li>{@del org.apache.juneau.rest.RestInfoProvider}
-				<li>{@del org.apache.juneau.rest.RestResourceResolver}
-				<li>{@del org.apache.juneau.rest.RestLogger}
+				<li><del>RestCallHandler</del>
+				<li><del>RestInfoProvider</del>
+				<li><del>RestResourceResolver</del>
+				<li><del>RestLogger</del>
 				<li>{@link org.apache.juneau.html.HtmlDocTemplate}
 			</ul>
 		<li>
@@ -33883,16 +33889,16 @@
 			for maximum flexibility instead of the hodge-podge of support in the config file.
 			<br>Top-level servlets should now be defined in the provided <c>jetty.xml</c> file.
 		<li>
-			New methods on {@del RestMicroservice}:
+			New methods on <del>RestMicroservice</del>:
 			<ul>
-				<li>{@del addServlet(Servlet,String)}
-				<li>{@del addServletAttribute(String,Object)}
-				<li>{@del getServer()}
-				<li>{@del getInstance()}
-				<li>{@del getPort()}
-				<li>{@del getContextPath()}
-				<li>{@del getProtocol()}
-				<li>{@del getHostName()}
+				<li><del>addServlet(Servlet,String)</del>
+				<li><del>addServletAttribute(String,Object)</del>
+				<li><del>getServer()</del>
+				<li><del>getInstance()</del>
+				<li><del>getPort()</del>
+				<li><del>getContextPath()</del>
+				<li><del>getProtocol()</del>
+				<li><del>getHostName()</del>
 			</ul>
 		<li>
 			New methods on {@link org.apache.juneau.microservice.Microservice}:
@@ -33900,10 +33906,10 @@
 				<li>{@link org.apache.juneau.microservice.Microservice#getInstance() getInstance()}
 			</ul>
 		<li>
-			New class {@del JettyLogger} for directing Jetty logging to the
+			New class <del>JettyLogger</del> for directing Jetty logging to the
 			java.util.logging framework.
 		<li>
-			New class {@del DebugResource} for viewing and generating
+			New class <del>DebugResource</del> for viewing and generating
 			Jetty thread dumps through REST calls.
 	</ul>
 	
@@ -33928,7 +33934,7 @@
 	<h5 class='topic w800'>juneau-marshall</h5>
 	<ul class='spaced-list'>
 		<li>
-			New class {@del org.apache.juneau.http.HttpMethodName} with valid static string HTTP method names.
+			New class <del>HttpMethodName</del> with valid static string HTTP method names.
 	</ul>
 	
 	<h5 class='topic w800'>juneau-dto</h5>
@@ -33941,9 +33947,9 @@
 	<h5 class='topic w800'>juneau-rest-server</h5>
 	<ul class='spaced-list'>
 		<li>
-			Annotation <c><ja>@HtmlDoc</ja>(links)</c> renamed to {@del org.apache.juneau.rest.annotation.HtmlDoc#navlinks() navlinks}.
+			Annotation <c><ja>@HtmlDoc</ja>(links)</c> renamed to <del>HtmlDoc#navlinks() navlinks</del>.
 		<li>
-			New annotation {@del org.apache.juneau.rest.annotation.HtmlDoc#head() @HtmlDoc(head)}.
+			New annotation <del>HtmlDoc#head() @HtmlDoc(head)</del>.
 			<br>Allows you to specify arbitrary HTML content in the <xt>&lt;head&gt;</xt> section of the page.
 		<li>
 			Removed annotation <c><ja>@HtmlDoc</ja>(favIcon)</c>.
@@ -33956,7 +33962,7 @@
 			</p>
 		<li>
 			Removed several of the HTMLDOC-related methods from the <c>RestResponse/RestConfig/RestContext</c>
-			classes and moved it into the new {@del org.apache.juneau.rest.HtmlDocBuilder} class.
+			classes and moved it into the new <del>HtmlDocBuilder</del> class.
 	</ul>
 </div>
 </div><!-- END: 7.0.0 -->
@@ -33988,11 +33994,11 @@
 			</p>
 			<br>The same static create methods have also been added to the following classes:
 			<ul>
-				<li>{@del org.apache.juneau.serializer.SerializerGroup#create()}
-				<li>{@del org.apache.juneau.parser.ParserGroup#create()}
-				<li>{@del org.apache.juneau.encoders.EncoderGroup#create()}
+				<li><del>SerializerGroup#create()</del>
+				<li><del>ParserGroup#create()</del>
+				<li><del>EncoderGroup#create()</del>
 				<li>{@link org.apache.juneau.rest.client.RestClient#create()}
-				<li>{@del ConfigFile#create()}
+				<li><del>ConfigFile#create()</del>
 			</ul>
 		<li>
 			The order of the parameters in {@link org.apache.juneau.serializer.SerializerSession#serialize(Object,Object)}
@@ -34014,8 +34020,8 @@
 	<h5 class='topic w800'>juneau-rest-server</h5>
 	<ul class='spaced-list'>
 		<li>
-			New {@del @RestResource(maxInput)} and 
-			{@del org.apache.juneau.rest.annotation.RestMethod#maxInput() @RestMethod(maxInput)} for alleviating
+			New <del>@RestResource(maxInput)</del> and 
+			<del>RestMethod#maxInput() @RestMethod(maxInput)</del> for alleviating
 			potential DoS attacks.
 	</ul>
 	
@@ -34085,7 +34091,7 @@
 				<li>New methods on {@link org.apache.juneau.microservice.Microservice}
 					<ul>
 						<li>{@link org.apache.juneau.microservice.Microservice#startConsole() startConsole()}
-						<li>{@del createConsoleCommands()}
+						<li><del>createConsoleCommands()</del>
... 1785 lines suppressed ...