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 2021/08/01 00:54:38 UTC

[juneau] branch master updated: Javadocs.

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 0827b5a  Javadocs.
0827b5a is described below

commit 0827b5a64d8ae27cee46e81fcf1a221c57986880
Author: JamesBognar <ja...@salesforce.com>
AuthorDate: Sat Jul 31 20:49:09 2021 -0400

    Javadocs.
---
 .../juneau/assertions/PrimitiveArrayAssertion.java |    2 +-
 juneau-doc/docs/ReleaseNotes/5.0.0.00.html         |    6 +-
 juneau-doc/docs/ReleaseNotes/5.0.0.02.html         |    2 +-
 juneau-doc/docs/ReleaseNotes/5.0.0.03.html         |    2 +-
 juneau-doc/docs/ReleaseNotes/5.0.0.04.html         |    4 +-
 juneau-doc/docs/ReleaseNotes/5.0.0.05.html         |    4 +-
 juneau-doc/docs/ReleaseNotes/5.0.0.07.html         |   34 +-
 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         |    2 +-
 juneau-doc/docs/ReleaseNotes/5.0.0.12.html         |    4 +-
 juneau-doc/docs/ReleaseNotes/5.0.0.13.html         |    2 +-
 juneau-doc/docs/ReleaseNotes/5.0.0.14.html         |    4 +-
 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.19.html         |    6 +-
 juneau-doc/docs/ReleaseNotes/5.0.0.20.html         |   14 +-
 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         |    2 +-
 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.32.html         |    4 +-
 juneau-doc/docs/ReleaseNotes/5.0.0.33.html         |    6 +-
 juneau-doc/docs/ReleaseNotes/5.0.0.34.html         |   36 +-
 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         |   12 +-
 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         |    4 +-
 juneau-doc/docs/ReleaseNotes/5.1.0.07.html         |    6 +-
 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         |   30 +-
 juneau-doc/docs/ReleaseNotes/5.1.0.12.html         |    4 +-
 juneau-doc/docs/ReleaseNotes/5.1.0.13.html         |   12 +-
 juneau-doc/docs/ReleaseNotes/5.1.0.14.html         |   12 +-
 juneau-doc/docs/ReleaseNotes/5.1.0.15.html         |   44 +-
 juneau-doc/docs/ReleaseNotes/5.1.0.16.html         |   22 +-
 juneau-doc/docs/ReleaseNotes/5.1.0.17.html         |   76 +-
 juneau-doc/docs/ReleaseNotes/5.1.0.18.html         |   10 +-
 juneau-doc/docs/ReleaseNotes/5.1.0.19.html         |   14 +-
 juneau-doc/docs/ReleaseNotes/5.1.0.20.html         |   40 +-
 juneau-doc/docs/ReleaseNotes/5.2.0.0.html          |  368 +-
 juneau-doc/docs/ReleaseNotes/5.2.0.1.html          |   42 +-
 juneau-doc/docs/ReleaseNotes/6.0.0.html            |  100 +-
 juneau-doc/docs/ReleaseNotes/6.0.1.html            |    8 +-
 juneau-doc/docs/ReleaseNotes/6.1.0.html            |  118 +-
 juneau-doc/docs/ReleaseNotes/6.2.0.html            |  182 +-
 juneau-doc/docs/ReleaseNotes/6.3.0.html            |  304 +-
 juneau-doc/docs/ReleaseNotes/6.3.1.html            |   70 +-
 juneau-doc/docs/ReleaseNotes/6.4.0.html            |  106 +-
 juneau-doc/docs/ReleaseNotes/7.0.0.html            |    8 +-
 juneau-doc/docs/ReleaseNotes/7.0.1.html            |    8 +-
 juneau-doc/docs/ReleaseNotes/7.1.0.html            |  184 +-
 juneau-doc/docs/ReleaseNotes/7.2.0.html            |  260 +-
 juneau-doc/docs/ReleaseNotes/7.2.1.html            |    4 +-
 juneau-doc/docs/ReleaseNotes/8.0.0.html            |    4 +-
 juneau-doc/docs/ReleaseNotes/8.1.0.html            |   56 +-
 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            |   14 +-
 juneau-doc/docs/ReleaseNotes/8.2.0.html            |  130 +-
 juneau-doc/docs/ReleaseNotes/9.0.0.html            |   24 +-
 .../02.juneau-marshall/05.JavaBeansSupport.html    |   34 +-
 .../05.JavaBeansSupport/01.BeanAnnotation.html     |    4 +-
 .../05.JavaBeansSupport/02.BeanpAnnotation.html    |    4 +-
 .../05.JavaBeansSupport/08.BeanFilters.html        |   14 +-
 .../05.JavaBeansSupport/09.InterfaceFilters.html   |    8 +-
 .../05.JavaBeansSupport/10.StopClasses.html        |    4 +-
 .../10.ConfigurableAnnotations.html                |    4 +-
 .../docs/Topics/02.juneau-marshall/11.OMap.html    |    4 +-
 .../Topics/02.juneau-marshall/14.Transforms.html   |    8 +-
 .../14.Transforms/06.SwapAnnotation.html           |    4 +-
 .../15.DynamicallyAppliedAnnotations.html          |    2 +-
 .../Topics/02.juneau-marshall/17.VirtualBeans.html |    4 +-
 .../02.juneau-marshall/21.MarshallingUris.html     |    2 +-
 .../02.juneau-marshall/22.JacksonComparison.html   |    4 +-
 .../26.XmlDetails/02.XmlSerializers.html           |    5 +-
 .../26.XmlDetails/07.XmlNamespaces.html            |    9 +-
 .../27.HtmlDetails/02.HtmlSerializers.html         |   44 +-
 .../32.SimpleVariableLanguage/01.SvlVariables.html |    4 -
 .../32.SimpleVariableLanguage/02.VarResolvers.html |   10 +-
 .../01.RdfDetails/01.RdfSerializers.html           |   75 +-
 .../01.RdfDetails/02.RdfParsers.html               |   61 +-
 .../01.RdfDetails/03.RdfAnnotation.html            |    2 +-
 .../01.RdfDetails/04.RdfNamespaces.html            |    9 +-
 .../01.RdfDetails/05.RdfUriProperties.html         |    4 +-
 .../01.RdfDetails/06.RdfRootProperty.html          |    2 +-
 .../01.RdfDetails/07.RdfTypedLiterals.html         |    2 +-
 .../12.ConfigStores/02.ConfigFileStore.html        |   14 +-
 .../02.RestClassHierarchy.html                     |    6 +-
 .../03.RestInstantiation/02.BasicRestServlet.html  |    2 +-
 .../03.RestInstantiation/03.BasicRest.html         |    2 +-
 .../03.RestInstantiation/06.BasicRestGroup.html    |    2 +-
 .../07.RestResourceResolvers.html                  |    6 +-
 .../01.RestAnnotationInheritance.html              |    8 +-
 .../04.RestAnnotation/02.RestPath.html             |   10 +-
 .../06.RestMethod/01.RestmParameters.html          |    8 +-
 .../06.RestMethod/02.RestmRestRequest.html         |    9 +-
 .../06.RestMethod/03.RestmRestResponse.html        |    2 +-
 .../06.RestMethod/05.RestmRequestHeaders.html      |   12 +-
 .../06.RestMethod/07.RestmRequestQuery.html        |   14 +-
 .../06.RestMethod/08.RestmRequestFormData.html     |   12 +-
 .../06.RestMethod/09.RestmPath.html                |    2 +-
 .../06.RestMethod/10.RestmRequestPathMatch.html    |   12 +-
 .../06.RestMethod/11.RestmReturnTypes.html         |   12 +-
 .../06.RestMethod/12.RestmReaderResource.html      |    2 +-
 .../06.RestMethod/13.RestmStreamResource.html      |    2 +-
 .../16.RestmPredefinedExceptions.html              |   68 +-
 .../Topics/06.juneau-rest-server/07.RestRpc.html   |    8 +-
 .../09.RestResponseAnnotation.html                 |    2 +-
 .../11.RestHandlingFormPosts.html                  |    2 +-
 .../15.RestConfigurableProperties.html             |   12 +-
 .../06.juneau-rest-server/17.RestTransforms.html   |    4 +-
 .../06.juneau-rest-server/24.RestSvlVariables.html |    6 +-
 .../06.juneau-rest-server/26.RestStaticFiles.html  |    2 +-
 .../06.juneau-rest-server/28.RestInfoProvider.html |   28 +-
 .../01.BasicRestInfoProvider.html                  |    4 +-
 .../01.RestSwaggerBasicRestServlet.html            |    2 +-
 .../06.RestSwaggerParameterExamples.html           |    6 +-
 .../08.RestSwaggerResponseExamples.html            |    9 +-
 .../31.RestHtmlDocAnnotation.html                  |    2 +-
 .../02.RestHtmlWidgets.html                        |   14 +-
 .../03.RestHtmlPredefinedWidgets.html              |    2 +-
 .../32.RestDefaultHeaders.html                     |    8 +-
 .../33.RestLoggingAndDebugging.html                |   46 +-
 .../34.RestHttpStatusCodes.html                    |    4 +-
 .../06.juneau-rest-server/39.RestInjection.html    |    2 +-
 .../01.SpringBootOverview.html                     |    8 +-
 .../02.SpringBootChildResources.html               |    4 +-
 juneau-doc/docs/Topics/09.juneau-rest-client.html  |   54 +-
 .../01.RestcPojoMarshalling.html                   |   36 +-
 .../02.RestcRequestHeaders.html                    |   42 +-
 .../03.RestcRequestQueryParameters.html            |   34 +-
 .../04.RestcRequestFormData.html                   |   34 +-
 .../09.juneau-rest-client/05.RestcRequestBody.html |    8 +-
 .../06.RestcResponseStatus.html                    |   16 +-
 .../07.RestcResponseHeaders.html                   |   76 +-
 .../08.RestcResponseBody.html                      |   52 +-
 .../09.RestcCustomCallHandlers.html                |   16 +-
 .../10.RestcInterceptors.html                      |   18 +-
 .../09.juneau-rest-client/11.RestcProxies.html     |    8 +-
 .../11.RestcProxies/01.RestcRemote.html            |    4 +-
 .../12.RestcLoggingAndDebugging.html               |   16 +-
 .../13.RestcCustomizingHttpClient.html             |   12 +-
 .../14.RestcExtendingRestClient.html               |    4 +-
 .../01.RestcAuthenticationBASIC.html               |    2 +-
 .../02.RestcAuthenticationFormFORM.html            |    6 +-
 .../10.juneau-rest-mock/01.MockRestClient.html     |   14 +-
 .../05.MicroserviceConfig.html                     |    2 +-
 .../07.MicroserviceVarResolver.html                |    2 +-
 .../05.MicroserviceJettyConfig.html                |    2 +-
 .../07.MicroserviceJettyUiCustomization.html       |    2 +-
 .../02.RestExamplesHelloWorldResource.html         |    2 +-
 .../20.Glossaries/01.GlossaryLanguageSupport.html  |    7 -
 .../20.Glossaries/02.GlossaryAnnotations.html      |    8 +-
 .../org/apache/juneau/doc/internal/DelTag.java     |   99 +
 juneau-doc/src/main/javadoc/overview.html          | 3828 ++++++++++----------
 .../src/main/javadoc/resources/fragments/toc.html  |   26 +-
 .../org/apache/juneau/rest/client/RestClient.java  |    6 +-
 .../assertion/FluentResponseBodyAssertion.java     |    7 +-
 .../assertion/FluentResponseHeaderAssertion.java   |    3 +-
 .../java/org/apache/juneau/rest/RestContext.java   |   10 +-
 .../apache/juneau/rest/RestOperationContext.java   |   45 +-
 .../apache/juneau/rest/annotation/RestDelete.java  |    2 +-
 .../org/apache/juneau/rest/annotation/RestGet.java |    2 +-
 .../org/apache/juneau/rest/annotation/RestOp.java  |    2 +-
 .../apache/juneau/rest/annotation/RestPost.java    |    2 +-
 .../org/apache/juneau/rest/annotation/RestPut.java |    2 +-
 .../assertions/FluentRequestBodyAssertion.java     |    3 +-
 .../FluentRequestFormParamAssertion.java           |    3 +-
 pom.xml                                            |    3 +
 178 files changed, 3949 insertions(+), 3876 deletions(-)

diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/PrimitiveArrayAssertion.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/PrimitiveArrayAssertion.java
index a54f7aa..600dff5 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/PrimitiveArrayAssertion.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/PrimitiveArrayAssertion.java
@@ -31,7 +31,7 @@ import org.apache.juneau.serializer.*;
  *
  * <h5 class='topic'>Test Methods</h5>
  * 	<ul>
- * 		<li class='jm'>{@link FluentPrimitiveArrayAssertion#has(E...)}
+ * 		<li class='jm'>{@link FluentPrimitiveArrayAssertion#has(Object...)}
  * 		<li class='jm'>{@link FluentPrimitiveArrayAssertion#is(Predicate)}
  * 		<li class='jm'>{@link FluentPrimitiveArrayAssertion#any(Predicate)}
  * 		<li class='jm'>{@link FluentPrimitiveArrayAssertion#all(Predicate)}
diff --git a/juneau-doc/docs/ReleaseNotes/5.0.0.00.html b/juneau-doc/docs/ReleaseNotes/5.0.0.00.html
index 089c012..d6e887e 100644
--- a/juneau-doc/docs/ReleaseNotes/5.0.0.00.html
+++ b/juneau-doc/docs/ReleaseNotes/5.0.0.00.html
@@ -38,10 +38,10 @@
 	</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 <dc>Transform</dc> 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 <dc>Transform</dc>:
+		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}:
 		<ul>
-			<li>{@link oaj.transform.BeanFilter} - Filter POJO beans.</li>
+			<li>{@del oaj.transform.BeanFilter} - Filter POJO beans.</li>
 			<li>{@link oaj.transform.PojoSwap} - 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. 
diff --git a/juneau-doc/docs/ReleaseNotes/5.0.0.02.html b/juneau-doc/docs/ReleaseNotes/5.0.0.02.html
index 480c5cf..81f4f32 100644
--- a/juneau-doc/docs/ReleaseNotes/5.0.0.02.html
+++ b/juneau-doc/docs/ReleaseNotes/5.0.0.02.html
@@ -39,7 +39,7 @@
 	</li>
 	<li> 
 		Support for parsing into beans with read-only properties.<br>
-		New <dc>@BeanConstructor</dc> annotation allows you to specify bean property values to be passed in through a constructor.
+		New {@del @BeanConstructor} 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 3571598..b474920 100644
--- a/juneau-doc/docs/ReleaseNotes/5.0.0.03.html
+++ b/juneau-doc/docs/ReleaseNotes/5.0.0.03.html
@@ -21,7 +21,7 @@
 <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 <dc>@BeanConstructor</dc> annotation has been added.
+		To support this, the {@del @BeanConstructor} annotation has been added.
 	</li>
 	<li>
 		Merged separate settings classes back into their base classes (simplifies the API).
diff --git a/juneau-doc/docs/ReleaseNotes/5.0.0.04.html b/juneau-doc/docs/ReleaseNotes/5.0.0.04.html
index 7752b17..f3af24a 100644
--- a/juneau-doc/docs/ReleaseNotes/5.0.0.04.html
+++ b/juneau-doc/docs/ReleaseNotes/5.0.0.04.html
@@ -20,12 +20,12 @@
 </p>
 <ul class='spaced-list'>
 	<li>
-		New {@link oajr.annotation.RestMethod @RestMethod} annotation on {@link oajr.RestServlet} methods.<br>
+		New {@del oajr.annotation.RestMethod @RestMethod} annotation on {@link oajr.RestServlet} methods.<br>
 		Allows the usage of URL pattern matching and automatic conversion of URL variables to arguments passed to method handlers.<br>
 		See {@link oajr.RestServlet} for more information.
 	</li>
 	<li>
-		Enhancements to <dc>BeanContext.convertToType(Object,Class)</dc> to be able to convert <c>Strings</c> to classes with 
+		Enhancements to {@del BeanContext#convertToType(Object,Class)} 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 b19f07a..0e66097 100644
--- a/juneau-doc/docs/ReleaseNotes/5.0.0.05.html
+++ b/juneau-doc/docs/ReleaseNotes/5.0.0.05.html
@@ -21,8 +21,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 {@link oajr.annotation.RestMethod @RestMethod} annotation.<br>
-		Eliminates the need for <dc>PojoResource</dc> and <dc>FilteredRestResource</dc> classes.
+		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.
 	</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 43e890f..ee88956 100644
--- a/juneau-doc/docs/ReleaseNotes/5.0.0.07.html
+++ b/juneau-doc/docs/ReleaseNotes/5.0.0.07.html
@@ -65,22 +65,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><dc>SerializerContext</dc></li>
-			<li><dc>ParserContext</dc></li>
+			<li>{@del SerializerContext}</li>
+			<li>{@del ParserContext}</li>
 		</ul>		
 	</li>
 	<li>
 		Enhancements to {@link oaj.BeanContext}:
 		<ul>
 			<li>
-				Ability to mark bean properties as hidden using <dc>@BeanProperty(hidden)</dc> so that they don't get serialized.
+				Ability to mark bean properties as hidden using {@del @BeanProperty(hidden)} 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 <dc>@Bean.filter</dc> and <dc>@BeanProperty.filter</dc> annotations.<br>
+				New {@del @Bean#filter} and {@del @BeanProperty#filter} annotations.<br>
 				Used for defining filters on bean classes and bean properties instead of just globally through <c>BeanContext.addTransforms(Class[])</c>.
 			</li>
 			<li>
@@ -88,13 +88,13 @@
 				Used for customizing bean property names.
 			</li>
 			<li>
-				New <dc>@BeanProperty.beanUri</dc> and <dc>@BeanProperty.id</dc> annotations.<br>
+				New {@del @BeanProperty#beanUri} and {@del @BeanProperty#id} 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 <dc>BeanProperty.properties()</dc> annotation.
+				New {@del BeanProperty#properties()} annotation.
 				Used for limiting properties on child elements.
 			</li>	
 		</ul>
@@ -122,33 +122,33 @@
 <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 <dc>RestResponse.setProperty(String,Object)</dc> method.<br>
+		Support for overriding bean context and serializer properties in a REST method call through new {@del RestResponse#setProperty(String,Object)} 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><dc>@RestResource(filters)</cc> - Associate post-formatting filters on a resource level.</li>
-			<li><dc>@RestResource.guards</dc> - Associate resource-level guards.</li>
-			<li><dc>@RestResource.messages</dc> - Associate a resource bundle with a REST servlet.  Comes with several convenience methods for looking up messages for the client locale.</li>
-			<li><dc>@RestResource.properties</dc> - Override default bean context, serializer, and parser properties though an annotation.</li>
+			<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>
 		</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>{@link oajr.annotation.RestMethod#guards() @RestMethod(guards)} - Associate method-level guards.</li>
+			<li>{@del oajr.annotation.RestMethod#guards() @RestMethod(guards)} - Associate method-level guards.</li>
 		</ul>
 	</li>
 	<li>				
 		New annotations on REST method parameters with automatic conversion:
 		<ul>
-			<li><dc>@Attr</dc> - A parameter or URL variable value as a parsed POJO.</li>
-			<li><dc>@Param</dc> - A query parameter value as a parsed POJO.</li>
-			<li><dc>@PathRemainder</dc>- The remainder after a URL pattern match as a String.</li>
-			<li><dc>@Header</dc> - An HTTP header value as a parsed POJO.</li>
-			<li><dc>@Content</dc> - The HTTP content as a parsed POJO.</li>
+			<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>{@link oajr.annotation.Method @Method} - The HTTP method name as a String.</li>
 		</ul>
 	</li>
diff --git a/juneau-doc/docs/ReleaseNotes/5.0.0.09.html b/juneau-doc/docs/ReleaseNotes/5.0.0.09.html
index c8b3bb3..6eed1d6 100644
--- a/juneau-doc/docs/ReleaseNotes/5.0.0.09.html
+++ b/juneau-doc/docs/ReleaseNotes/5.0.0.09.html
@@ -31,18 +31,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 {@link oaj.ObjectMap#cast(Class)} method to convert <c>ObjectMaps</c> directly to beans.</li>
+	<li>New {@del oaj.ObjectMap#cast(Class)} 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 <dc>@RestResource.defaultRequestHeaders</dc> and <dc>@RestResource.defaultResponseHeaders</dc> annotations.</li>
-	<li>New {@link oajr.annotation.RestMethod#serializers() @RestMethod(serializers)} and {@link oajr.annotation.RestMethod#parsers() @RestMethod(parsers)} annotations.</li>
-	<li>New {@link oajr.annotation.RestMethod#properties() @RestMethod(properties)} annotation.</li>
-	<li>New <dc>@RestMethod(defaultRequestHeaders)</dc> annotation.</li>
-	<li>New {@link 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 <dc>@Content</dc> annotated parameters.</li>
-	<li>New <dc>@HasParam</dc> annotation.</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>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 7617695..0e4f675 100644
--- a/juneau-doc/docs/ReleaseNotes/5.0.0.10.html
+++ b/juneau-doc/docs/ReleaseNotes/5.0.0.10.html
@@ -20,17 +20,17 @@
 </p>
 <h5 class='topic w800'>Core API changes</h5>
 <ul class='spaced-list'>
-	<li>New {@link oaj.ObjectMap#findKeyIgnoreCase(String)} method.
+	<li>New {@del oaj.ObjectMap#findKeyIgnoreCase(String)} 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 <dc>@RestResource.propertie</dc> annotation, or new <dc>RestServlet.setProperty(String,Object)</dc> method.</li>
+	<li>Properties can be set through {@del @RestResource#properties} annotation, or new {@del RestServlet#setProperty(String,Object)} 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 <dc>RestServlet.onSuccess(RestRequest,RestResponse,long)</dc> methods for plugging in your own logging and peformance monitoring.</li>
-	<li>Eliminated <c>RestServlet.getInitParams()</c> method, since it's now redundant with <dc>RestServlet.getProperties()</dc>.</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>Header parameters passed as URL parameters are now case-insensitive.</li>			
 </ul>
diff --git a/juneau-doc/docs/ReleaseNotes/5.0.0.11.html b/juneau-doc/docs/ReleaseNotes/5.0.0.11.html
index 9146db0..cdc3087 100644
--- a/juneau-doc/docs/ReleaseNotes/5.0.0.11.html
+++ b/juneau-doc/docs/ReleaseNotes/5.0.0.11.html
@@ -28,6 +28,6 @@
 		Support for <c>Accept</c> and <c>Content-Type</c> <js>"application/x-www-form-urlencoded"</js> added by default on {@link oajr.BasicRestServlet}.
 	</li>
 	<li>
-		New <dc>RestServlet.renderError(HttpServletRequest,HttpServletResponse,RestException)</dc> method to allow customized handling of response errors.
+		New {@del RestServlet#renderError(HttpServletRequest,HttpServletResponse,RestException)} method to allow customized handling of response errors.
 	</li>
 </ul>
diff --git a/juneau-doc/docs/ReleaseNotes/5.0.0.12.html b/juneau-doc/docs/ReleaseNotes/5.0.0.12.html
index 63357bf..a148471 100644
--- a/juneau-doc/docs/ReleaseNotes/5.0.0.12.html
+++ b/juneau-doc/docs/ReleaseNotes/5.0.0.12.html
@@ -21,7 +21,7 @@
 <h5 class='topic w800'>Core API changes</h5>
 <ul class='spaced-list'>
 	<li>
-		Relaxed method naming conventions when using <dc>@BeanProperty</dc> annotation.<br>
+		Relaxed method naming conventions when using {@del @BeanProperty} 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>
@@ -37,7 +37,7 @@
 		Useful for debugging purposes.
 	</li>
    		<li>
-		<c>Readers</c> and <c>InputStreams</c> can now be passed in as <dc>@Content</dc> 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} 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 7d94426..121b44b 100644
--- a/juneau-doc/docs/ReleaseNotes/5.0.0.13.html
+++ b/juneau-doc/docs/ReleaseNotes/5.0.0.13.html
@@ -31,7 +31,7 @@
 		New <c>SerializerContext.SERIALIZER_uriContext</c> and <c>SerializerContext.SERIALIZER_uriAuthority</c> serializer properties for specifying values for relative URIs.
    		</li>
    		<li>
-		New {@link 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 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>.
 	</li>
 	<li>
 		New {@link oaj.html.HtmlSerializer#HTML_uriAnchorText} HTML serializer property for tailoring how anchor text is rendered.
diff --git a/juneau-doc/docs/ReleaseNotes/5.0.0.14.html b/juneau-doc/docs/ReleaseNotes/5.0.0.14.html
index 1c7d3cb..2df1873 100644
--- a/juneau-doc/docs/ReleaseNotes/5.0.0.14.html
+++ b/juneau-doc/docs/ReleaseNotes/5.0.0.14.html
@@ -50,7 +50,7 @@
 		New <c>org.apache.juneau.transform</c> package.
 		<ul>
 			<li>Cleaner class structure.</li>
-			<li>Improved {@link oaj.transform.BeanFilter} class for defining property filters on beans.</li>
+			<li>Improved {@del oaj.transform.BeanFilter} 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>
@@ -88,7 +88,7 @@
 		</ul>
 	</li>
        	<li>
-		<c>JsonMap</c> and <c>JsonList</c> changed to {@link oaj.ObjectMap} and {@link oaj.ObjectList} to better reflect that they're not limited to just JSON support.
+		<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.
    		</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 e6b634c..1b2da56 100644
--- a/juneau-doc/docs/ReleaseNotes/5.0.0.15.html
+++ b/juneau-doc/docs/ReleaseNotes/5.0.0.15.html
@@ -21,14 +21,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</del> for information.
+		Refer to {@del org.apache.juneau.rest.jaxrs} for information.
 	</li>
 	<li>
-		New <dc>@Produces</dc> annotation in place of <c>ISerializer.getMediaTypes()</c> for specifying what media types a serializer produces.<br>
+		New {@del @Produces} 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 <dc>@Consumes</dc> annotation in place of <c>IParser.getMediaTypes()</c> for specifying what media types a parser consumes.<br>
+		New {@del @Consumes} 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 b6dfe34..dd40752 100644
--- a/juneau-doc/docs/ReleaseNotes/5.0.0.16.html
+++ b/juneau-doc/docs/ReleaseNotes/5.0.0.16.html
@@ -20,6 +20,6 @@
 </p>
 <ul class='spaced-list'>
 	<li>
-		New <dc>@Properties</dc> 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} 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>
diff --git a/juneau-doc/docs/ReleaseNotes/5.0.0.19.html b/juneau-doc/docs/ReleaseNotes/5.0.0.19.html
index e33f879..332f924 100644
--- a/juneau-doc/docs/ReleaseNotes/5.0.0.19.html
+++ b/juneau-doc/docs/ReleaseNotes/5.0.0.19.html
@@ -22,12 +22,12 @@
 	<li>
 		New methods on {@link oajr.RestServlet}:
 		<ul>
-			<li><dc>RestServlet.onPreCall(RestRequest)</dc></li>
-			<li><dc>RestServlet.onPostCall(RestRequest,RestResponse)</dc></li>
+			<li>{@del RestServlet#onPreCall(RestRequest)}</li>
+			<li>{@del RestServlet#onPostCall(RestRequest,RestResponse)}</li>
 		</ul>
 	</li>
 	<li>
-		<jsf>TRIM_NULLS</jsf> setting changed to <dc>SerializerContext.SERIALIZER_trimNullProperties</dc>.<br>
+		<jsf>TRIM_NULLS</jsf> setting changed to {@del SerializerContext#SERIALIZER_trimNullProperties}.<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 0528882..78267d5 100644
--- a/juneau-doc/docs/ReleaseNotes/5.0.0.20.html
+++ b/juneau-doc/docs/ReleaseNotes/5.0.0.20.html
@@ -28,8 +28,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>
-		<dc>XmlSerializerContext.XML_autoDetectNamespaces</dc> 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 <dc>XmlSerializerContext.XML_namespaces</dc> annotation.<br>
+		{@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>
 		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>
@@ -37,25 +37,25 @@
 <h5 class='topic w800'>REST server API changes</h5>
 <ul class='spaced-list'>
 	<li>
-		Allow inheritance of <dc>@RestResource</dc> annotation.<br>
+		Allow inheritance of {@del @RestResource} annotation.<br>
 		Serializers, parsers, filters, properties , guards, and converters definitions are automatically inherited from parent classes and interfaces.
 	</li>
 	<li>
-		Enhancements to {@link oajr.annotation.RestMethod @RestMethod} annotation:
+		Enhancements to {@del oajr.annotation.RestMethod @RestMethod} annotation:
 		<ul>
 			<li>
 				New <c>RestMethod.filters()</c> annotation for defining POJO filters at the method level.
 			</li>
 			<li>
-				New <dc>RestMethod.serializersInherit()</dc> and <dc>RestMethod.parsersInherit()</dc> annotations for controlling how serializers and parsers (and associated filters and properties) are inherited from the class.<br>
+				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>
 				This replaces the previous <c>addSerializers</c> and <c>addParsers</c> annotations.
 		</ul>
 	</li>
 	<li>
-		New <dc>RestServletJenaDefault</dc> servlet that includes serialization/parsing support for all Jena-based serializers and parsers.
+		New {@del RestServletJenaDefault} servlet that includes serialization/parsing support for all Jena-based serializers and parsers.
 	</li>
 	<li>
-		New <dc>DefaultJenaProvider</dc> JAX-RS provider that includes serialization/parsing support for all Jena-based serializers and parsers.
+		New {@del DefaultJenaProvider} JAX-RS provider that includes serialization/parsing support for all Jena-based serializers and parsers.
 	</li>
 	<li>
 		Eliminated <c>RestServletChild</c> class.<br>  
diff --git a/juneau-doc/docs/ReleaseNotes/5.0.0.21.html b/juneau-doc/docs/ReleaseNotes/5.0.0.21.html
index 4d06c32..ebda771 100644
--- a/juneau-doc/docs/ReleaseNotes/5.0.0.21.html
+++ b/juneau-doc/docs/ReleaseNotes/5.0.0.21.html
@@ -21,10 +21,10 @@
 <h5 class='topic w800'>Core API changes</h5>
 <ul class='spaced-list'>
 	<li>
-		New <dc>HtmlDocSerializerContext.HTMLDOC_navlinks</dc> annotation for addint links to HTML page views.
+		New {@del HtmlDocSerializerContext#HTMLDOC_navlinks} annotation for addint links to HTML page views.
 	</li>
 	<li>
-		Renamed the properties in <dc>HtmlDocSerializerContext</dc> for clarity.
+		Renamed the properties in {@del HtmlDocSerializerContext} for clarity.
 	</li>
 </ul>		
 <h5 class='topic w800'>Servlet API changes</h5>
@@ -42,6 +42,6 @@
 		</ul>
 	</li>
 	<li>
-		Path variables annotated with <dc>@Attr</dc> are now automatically URL-decoded.
+		Path variables annotated with {@del @Attr} are now automatically URL-decoded.
 	</li>
 </ul>		
diff --git a/juneau-doc/docs/ReleaseNotes/5.0.0.23.html b/juneau-doc/docs/ReleaseNotes/5.0.0.23.html
index 1653ae3..3758467 100644
--- a/juneau-doc/docs/ReleaseNotes/5.0.0.23.html
+++ b/juneau-doc/docs/ReleaseNotes/5.0.0.23.html
@@ -20,7 +20,7 @@
 </p>
 <ul class='spaced-list'>
 	<li>
-		Simplified {@link oaj.dto.cognos Cognos} support.
+		Simplified {@del oaj.dto.cognos Cognos} 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 fc71f96..cc4c11c 100644
--- a/juneau-doc/docs/ReleaseNotes/5.0.0.24.html
+++ b/juneau-doc/docs/ReleaseNotes/5.0.0.24.html
@@ -27,11 +27,11 @@
 		</ul>
 	</li>
 	<li>
-		New <dc>XmlFormat.CONTENT</dc> enum value.<br>
+		New {@del XmlFormat#CONTENT} enum value.<br>
 		Allows bean properties to be persisted as XML element text.
 	</li>
 	<li>
-		New <dc>XmlContentHandler</dc> class and <dc>@Xml.contentHandler</dc> annotation.<br>
+		New {@del XmlContentHandler} class and {@del @Xml#contentHandler} 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>
@@ -42,13 +42,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 {@link oaj.transforms.CalendarSwap}.
+		Fixed timezone bug in {@del oaj.transforms.CalendarSwap}.
 	</li>
 		<li>
 		Simplified <c>Serializer.serialize(Object,Object,SerializerContext)</c> method.
 	</li>
 	<li>
-		Fixed bug where lists returned by {@link oaj.ObjectMap#getObjectList(String)} were not updatable.
+		Fixed bug where lists returned by {@del oaj.ObjectMap#getObjectList(String)} 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 c38e07d..0d45db4 100644
--- a/juneau-doc/docs/ReleaseNotes/5.0.0.26.html
+++ b/juneau-doc/docs/ReleaseNotes/5.0.0.26.html
@@ -24,13 +24,13 @@
 	</li>
 	<li>
 		Changed the way child REST resources are defined.<br>
-		Eliminated the <ja>@RestChild</ja> annotation on getter methods and replaced it with <dc>@RestResource(children)</dc> defined on the resource class itself.<br>
-		Child resource paths are specified through <dc>@RestResource(path)</dc>.
+		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)}.
    		</li>
    		<li>
-   			New <dc>ChildResourceDescriptions</dc> bean for automatically generating the contents of router resource pages.
+   			New {@del ChildResourceDescriptions} bean for automatically generating the contents of router resource pages.
    		</li>
    		<li>
-		Changed <c><ja>@RestMethod</ja>.pattern()</c> to {@link oajr.annotation.RestMethod#path() @RestMethod(path)} for naming consistency.
+		Changed <c><ja>@RestMethod</ja>.pattern()</c> to {@del oajr.annotation.RestMethod#path() @RestMethod(path)} for naming consistency.
 	</li>
 </ul>
diff --git a/juneau-doc/docs/ReleaseNotes/5.0.0.27.html b/juneau-doc/docs/ReleaseNotes/5.0.0.27.html
index 044ace1..7d1c745 100644
--- a/juneau-doc/docs/ReleaseNotes/5.0.0.27.html
+++ b/juneau-doc/docs/ReleaseNotes/5.0.0.27.html
@@ -26,7 +26,7 @@
   			{@link oajr.BasicRestServlet} 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 <dc>ResourceOptions.getChildren()</dc>.
+		Child resources now render on default <c>OPTIONS</c> pages through new method {@del ResourceOptions#getChildren()}.
 	</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 2342b66..102c5b6 100644
--- a/juneau-doc/docs/ReleaseNotes/5.0.0.29.html
+++ b/juneau-doc/docs/ReleaseNotes/5.0.0.29.html
@@ -22,9 +22,9 @@
 	<li>
 		Revamped the API for filter support:
 		<ul>
-			<li>Updated {@link oaj.transform.BeanFilter} class to mirror the {@link oaj.annotation.Bean @Bean} annotation.</li>
-			<li>Introduced support for bean <dc>Bean.subTypeProperty() subtypes</dc>. </li>
-			<li>Replaced <c><ja>@Bean</ja>(filter=xxx)</c> with new <dc>@Transform</dc> annotation.</li>
+			<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>
 		</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 2f71da3..75d7852 100644
--- a/juneau-doc/docs/ReleaseNotes/5.0.0.30.html
+++ b/juneau-doc/docs/ReleaseNotes/5.0.0.30.html
@@ -20,7 +20,7 @@
 </p>
 <ul class='spaced-list'>
 	<li> 
-		Fixed bug involving beans using <dc>Bean.subTypes()</dc> annotation in addition to <c>subTypes</c> property.
+		Fixed bug involving beans using {@del Bean#subTypes()} 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.32.html b/juneau-doc/docs/ReleaseNotes/5.0.0.32.html
index 8193bb4..fc6da6e 100644
--- a/juneau-doc/docs/ReleaseNotes/5.0.0.32.html
+++ b/juneau-doc/docs/ReleaseNotes/5.0.0.32.html
@@ -21,7 +21,7 @@
 <ul class='spaced-list'>
 	<li>
 		New support for generating and consuming fully-compliant JSON-Schema documents.<br>
-		See <dc>org.apache.juneau.dto.jsonschema</dc> for information.
+		See {@del org.apache.juneau.dto.jsonschema} for information.
 	</li>
 	<li>
 		New methods added to {@link oaj.parser.Parser}:
@@ -39,7 +39,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>
-		{@link oaj.dto.cognos Cognos} DTOs now have fluent-style bean setters.
+		{@del oaj.dto.cognos Cognos} 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 6b2e7cd..52326fe 100644
--- a/juneau-doc/docs/ReleaseNotes/5.0.0.33.html
+++ b/juneau-doc/docs/ReleaseNotes/5.0.0.33.html
@@ -34,12 +34,12 @@
 		<ul>
 			<li>{@link oaj.BeanContext#BEAN_ignoreInvocationExceptionsOnGetters}
 			<li>{@link oaj.BeanContext#BEAN_ignoreInvocationExceptionsOnSetters}
-			<li>{@link oaj.BeanContext#BEAN_notBeanPackages_add}
-			<li>{@link oaj.BeanContext#BEAN_notBeanPackages_remove}
+			<li>{@del BEAN_notBeanPackages_add}
+			<li>{@del BEAN_notBeanPackages_remove}
 		</ul>
 	</li>
 	<li>
-		Eliminated <c>addNotBeanClassPatterns(String...)</c> methods throughout API since these are now controlled by {@link oaj.BeanContext#BEAN_notBeanPackages_add} / {@link oaj.BeanContext#BEAN_notBeanPackages_remove} properties.
+		Eliminated <c>addNotBeanClassPatterns(String...)</c> methods throughout API since these are now controlled by {@del BeanContext#BEAN_notBeanPackages_add} / {@del BeanContext#BEAN_notBeanPackages_remove} properties.
 	</li>
 	<li>
 		New settings in <c>RestServletProperties</c>.
diff --git a/juneau-doc/docs/ReleaseNotes/5.0.0.34.html b/juneau-doc/docs/ReleaseNotes/5.0.0.34.html
index f44d9b0..cfa2fc6 100644
--- a/juneau-doc/docs/ReleaseNotes/5.0.0.34.html
+++ b/juneau-doc/docs/ReleaseNotes/5.0.0.34.html
@@ -42,9 +42,9 @@
 	<li>
 		New methods on {@link oajr.RestRequest}:
 		<ul>
-			<li><dc>RestRequest.getVarResolver()</dc></li>
-			<li><dc>RestRequest.getServletURI()</dc></li>
-			<li><dc>RestRequest.getRequestParentURI()</dc></li>
+			<li>{@del RestRequest#getVarResolver()}</li>
+			<li>{@del RestRequest#getServletURI()}</li>
+			<li>{@del RestRequest#getRequestParentURI()}</li>
 		</ul>
 	</li>
 	<li>
@@ -56,20 +56,20 @@
 	<li>
 		New methods on {@link oajr.RestServlet} that allow easier customization by subclasses:
 		<ul>
-			<li><dc>RestServlet.createConfigFactory()</dc></li>
-			<li><dc>RestServlet.createConverters()</dc></li>
-			<li><dc>RestServlet.createDefaultRequestHeaders()</dc></li>
-			<li><dc>RestServlet.createDefaultResponseHeaders()</dc></li>
-			<li><dc>RestServlet.createEncoders()</dc></li>
-			<li><dc>RestServlet.createFilters()</dc></li>
-			<li><dc>RestServlet.createGuards()</dc></li>
-			<li><dc>RestServlet.createMimetypesFileTypeMap()</dc></li>
-			<li><dc>RestServlet.createParsers()</dc></li>
-			<li><dc>RestServlet.createProperties()</dc></li>
-			<li><dc>RestServlet.createRequestProperties(ObjectMap,RestRequest)</dc></li>
-			<li><dc>RestServlet.createRequestVarResolver(RestRequest)</dc></li>
-			<li><dc>RestServlet.createSerializers()</dc></li>
-			<li><dc>RestServlet.createUrlEncodingParser()</dc></li>
+			<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>
 		</ul>
 	</li>
 	<li>
@@ -87,7 +87,7 @@
 		New {@link oaj.annotation.Bean#stopClass @Bean.stopClass} annotation for specifying stop classes for bean properties.
 	</li>
 	<li>
-		New <dc>BeanFilter.setStopClass(Class)</dc> which is the program equivalent to the annotation above.
+		New {@del BeanFilter#setStopClass(Class)} 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.36.html b/juneau-doc/docs/ReleaseNotes/5.0.0.36.html
index c3bd263..034e48d 100644
--- a/juneau-doc/docs/ReleaseNotes/5.0.0.36.html
+++ b/juneau-doc/docs/ReleaseNotes/5.0.0.36.html
@@ -20,12 +20,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 <dc>ResourceDescription#ResourceDescription(String,String,String)</dc>. 
+	<li><c>name</c> parameter of {@del ResourceDescription#ResourceDescription(String,String,String)}. 
 		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 <dc>BeanContext.getClassMetaFromString(String)</dc>.
+	<li>Improved support of {@del BeanContext#getClassMetaFromString(String)}.
 		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 41d92b7..ca45dbb 100644
--- a/juneau-doc/docs/ReleaseNotes/5.1.0.00.html
+++ b/juneau-doc/docs/ReleaseNotes/5.1.0.00.html
@@ -24,12 +24,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</del> package for details.
+		See the {@del org.apache.juneau.rest.client} 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 <dc>org.apache.juneau.urlencoding</dc> package for details. 
+		See {@del org.apache.juneau.urlencoding} package for details. 
 	<li>Changes to Parser API.
 	<ul>
 		<li>Removal of <c>ExtendedReaderParser</c> abstract class and moved methods into 
@@ -47,20 +47,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 <dc>BeanContext.getClassMetaFromString(String)</dc>.<br>
+	<li>Improved support on {@del BeanContext#getClassMetaFromString(String)}.<br>
 		Now supports resolving <c>"long[]"</c>, and so forth.
-	<li><dc>ResourceDescription</dc> name parameter is now automatically URL-encoded in links.
+	<li>{@del ResourceDescription} 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 
-		<dc>BeanContext.convertToType(Object,Class)</dc>.
+		{@del BeanContext#convertToType(Object,Class)}.
 		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 <dc>RestRequest#getParameter(String,Class)</dc>.
+		<li>Changed the order of parameters on {@del RestRequest#getParameter(String,Class)}.
 		<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 0a98370..6aa01d4 100644
--- a/juneau-doc/docs/ReleaseNotes/5.1.0.01.html
+++ b/juneau-doc/docs/ReleaseNotes/5.1.0.01.html
@@ -27,6 +27,6 @@
 	<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 <dc>@PathRemainder</dc>.
+	<li>Renamed <ja>@Remainder</ja> annotation to {@del @PathRemainder}.
 	<li>Fixed bug involving incorrect calculation of <c>pathInfo</c> on child resources.
 </ul>	
diff --git a/juneau-doc/docs/ReleaseNotes/5.1.0.03.html b/juneau-doc/docs/ReleaseNotes/5.1.0.03.html
index 35622e6..ad2dee6 100644
--- a/juneau-doc/docs/ReleaseNotes/5.1.0.03.html
+++ b/juneau-doc/docs/ReleaseNotes/5.1.0.03.html
@@ -30,22 +30,22 @@
 		</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 <dc>@BeanProperty</dc> annotation can now be used on non-public fields/getters/setters to override
+		Also, the {@del @BeanProperty} 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 {@link oaj.BeanContext#BEAN_useJavaBeanIntrospector} 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 <dc>@BeanProperty(hidden=true)</dc> annotation
+	<li>New {@link oaj.annotation.BeanIgnore @BeanIgnore} annotation.  Replaces the previous {@del @BeanProperty(hidden=true)} 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 {@link oaj.transform.BeanFilter#readProperty(Object,String,Object) readProperty()} and {@link oaj.transform.BeanFilter#writeProperty(Object,String,Object) writeProperty()}
-		methods added to {@link 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 <dc>Bean.subTypeProperty()</dc> annotation.
+	<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.
 		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.
@@ -54,7 +54,7 @@
 
 <h5 class='topic w800'>REST Server API updates</h5>
 <ul class='spaced-list'>
-	<li>New {@link oajr.RestRequest#getJavaMethod()} method for getting access to the method used to handle a request.
+	<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 {@link oajr.RestGuard#guard(RestRequest,RestResponse)}.
 	<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>.
diff --git a/juneau-doc/docs/ReleaseNotes/5.1.0.04.html b/juneau-doc/docs/ReleaseNotes/5.1.0.04.html
index 4f7da86..db7c3a7 100644
--- a/juneau-doc/docs/ReleaseNotes/5.1.0.04.html
+++ b/juneau-doc/docs/ReleaseNotes/5.1.0.04.html
@@ -20,7 +20,7 @@
 </p>
 
 <ul class='spaced-list'>
-	<li>New <dc>RestServlet.getPath()</dc> method.
+	<li>New {@del RestServlet#getPath()} 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
@@ -28,7 +28,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 <dc>HtmlDocSerializerContext</dc> properties to be set via <dc>Serializer.setProperty(String,Object)</dc>.
+	<li>Allow {@del HtmlDocSerializerContext} properties to be set via {@del Serializer#setProperty(String,Object)}.
 		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 cdbac9b..1abd9e8 100644
--- a/juneau-doc/docs/ReleaseNotes/5.1.0.05.html
+++ b/juneau-doc/docs/ReleaseNotes/5.1.0.05.html
@@ -19,18 +19,18 @@
 	Juno 5.1.0.5 is a moderate update.
 </p>
 <ul class='spaced-list'>
-	<li>New <dc>Redirect</dc> class that simplifies performing redirections in REST methods.
-	<li>New pluggable {@link oajr.ResponseHandler} class and <dc>@RestResource(responseHandlers)</dc> annotation
+	<li>New {@del Redirect} class that simplifies performing redirections in REST methods.
+	<li>New pluggable {@link oajr.ResponseHandler} class and {@del @RestResource(responseHandlers)} annotation
 		for defining customer response handlers for special kinds of POJOs.
-	<li>New method <dc>UrlEncodingSerializer.serializeUrlPart(Object)</dc> method.
-	<li>New method <dc>RestRequest.getServletURIBuilder()</dc> for construcing servlet-based URLs more efficiently.
+	<li>New method {@del UrlEncodingSerializer#serializeUrlPart(Object)} method.
+	<li>New method {@del RestRequest#getServletURIBuilder()} 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 <dc>CoreObject.setProperties(ObjectMap)</dc>
+	<li>Fixed bug where some properties were not being propagated correctly when using {@del CoreObject#setProperties(ObjectMap)}
 		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 <dc>Redirect</dc> class.
+	<li>Eliminated various convenience <c>RestResponse.sendRedirect(...)</c> methods due to the introduction of the {@del Redirect} class.
 </ul>
diff --git a/juneau-doc/docs/ReleaseNotes/5.1.0.06.html b/juneau-doc/docs/ReleaseNotes/5.1.0.06.html
index 103b644..b9977ab 100644
--- a/juneau-doc/docs/ReleaseNotes/5.1.0.06.html
+++ b/juneau-doc/docs/ReleaseNotes/5.1.0.06.html
@@ -20,13 +20,13 @@
 </p>
 <ul class='spaced-list'>
 	<li>Simplified API for {@link oaj.transform.PojoSwap}.  
-		Since it's rarely used, the <c>beanContext</c> parameter was replaced with a <dc>PojoSwap#getBeanContext()</dc> method on
+		Since it's rarely used, the <c>beanContext</c> parameter was replaced with a {@del PojoSwap#getBeanContext()} method on
 		the class.
 	<li>New simplified way of defining POJO filters without needing to extend {@link oaj.transform.PojoSwap}.
 		See {@link oaj.transform.SurrogateSwap} for details.
 	<li>New {@link oaj.html.annotation.Html @Html} annotation.
 		Will allow the definition of standard XHTML DTOs in future releases.  
-		For now, <dc>Img</dc> is an example of defining an XHTML element using Juno DTOs.
+		For now, {@del Img} 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 394480c..1b9bf75 100644
--- a/juneau-doc/docs/ReleaseNotes/5.1.0.07.html
+++ b/juneau-doc/docs/ReleaseNotes/5.1.0.07.html
@@ -20,9 +20,9 @@
 </p>
 <ul class='spaced-list'>
 	<li>Improved error handling.  
-	<li>New <dc>ParserContext.PARSER_debug</dc> and <dc>SerializerContext.SERIALIZER_debug</dc>.
+	<li>New {@del ParserContext#PARSER_debug} and {@del SerializerContext#SERIALIZER_debug}.
 		settings for logging additional information for debugging problems.
-	<li>New <dc>SERIALIZER_ignoreRecursions</dc> setting for explicitly ignoring recursions when 
+	<li>New {@del SERIALIZER_ignoreRecursions} 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
@@ -30,7 +30,7 @@
 	<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 <dc>SerializerContext</dc> and <dc>ParserContext</dc>	
+	<li>Removed media-type and encoding attributes from {@del SerializerContext} and {@del ParserContext}	
 		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.
diff --git a/juneau-doc/docs/ReleaseNotes/5.1.0.08.html b/juneau-doc/docs/ReleaseNotes/5.1.0.08.html
index 54a7443..f36ddd2 100644
--- a/juneau-doc/docs/ReleaseNotes/5.1.0.08.html
+++ b/juneau-doc/docs/ReleaseNotes/5.1.0.08.html
@@ -36,9 +36,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</del> APIs to make it easier to work with custom Apache HTTP clients.
+	<li>Modifications to the {@del org.apache.juneau.rest.client} APIs to make it easier to work with custom Apache HTTP clients.
 		<ul>
-			<li>Added overridable <dc>RestClient#createHttpClient()</dc> to allow customized subclasses to construct customized HTTP clients.
+			<li>Added overridable {@del RestClient#createHttpClient()} 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 6997546..d1561f1 100644
--- a/juneau-doc/docs/ReleaseNotes/5.1.0.09.html
+++ b/juneau-doc/docs/ReleaseNotes/5.1.0.09.html
@@ -31,11 +31,11 @@
 		</ul>
 	<li>Code changes to facilitate breaking up bundles:
 		<ul>
-			<li><c>org.apache.juneau.rest.labels.Link</c> class moved to <dc>Link</dc>.
+			<li><c>org.apache.juneau.rest.labels.Link</c> class moved to {@del Link}.
 			<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><dc>RestClient.execute(HttpUriRequest)</dc> method that allows subclasses to handle their own HTTP request execution.
+	<li>{@del RestClient#execute(HttpUriRequest)} 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 be9aaf7..cf51b9e 100644
--- a/juneau-doc/docs/ReleaseNotes/5.1.0.10.html
+++ b/juneau-doc/docs/ReleaseNotes/5.1.0.10.html
@@ -29,7 +29,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 <dc>BeanContext.addTransforms(Class[])</dc> that would cause filter order to get messed up.
+	<li>Fixed bug in {@del BeanContext#addTransforms(Class[])} 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.
@@ -39,30 +39,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 <dc>HttpServlet.getParameter(String)</dc> was forcing the underlying servlet code to process the HTTP body itself, preventing the <c>UrlEncodingSerializer</c>
+		Calling {@del HttpServlet#getParameter(String)} 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 <dc>RestRequest.getQueryParameter(String)</dc>, <dc>RestRequest.hasQueryParameter(String)</dc>, and <dc>RestRequest.hasAnyQueryParameters(String[])</dc>
+	<li>New {@del RestRequest#getQueryParameter(String)}, {@del RestRequest#hasQueryParameter(String)}, and {@del RestRequest#hasAnyQueryParameters(String[])}
 		methods that only look for parameters in the URL query string to prevent loading and parsing of URL-Encoded form posts.
-	<li>New <dc>@QParam</dc> and <dc>@HasQParam</dc> annotations for accessing query parameters from the URL query string.
+	<li>New {@del @QParam} and {@del @HasQParam} 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 <dc>RestServlet.onPreCall(RestRequest)</dc> and <dc>RestServlet#onPostCall(RestRequest,RestResponse)</dc> methods
+	<li>Removed properties parameters from {@del RestServlet#onPreCall(RestRequest)} and {@del RestServlet#onPostCall(RestRequest,RestResponse)} 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 
-		{@link oajr.BasicRestServlet} and <dc>RestServletJenaDefault</dc>.
+		{@link oajr.BasicRestServlet} and {@del RestServletJenaDefault}.
 </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 {@link oajrc.RestRequestEntity}.
+	<li>Renamed <c>RestResponseEntity</c> to {@del oajrc.RestRequestEntity}.
 	<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><dc>RestClient#setProperty(String,Object)</dc>			
-			<li><dc>RestClient#setProperties(ObjectMap)</dc>	
-			<li><dc>RestClient#addNotBeanClasses(Class[])</dc>		
-			<li><dc>RestClient.addTransforms(Class[])</dc>		
-			<li><dc>RestClient#addImplClass(Class,Class)</dc>	
+			<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)}	
 		</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 827cb8f..ba9fe20 100644
--- a/juneau-doc/docs/ReleaseNotes/5.1.0.11.html
+++ b/juneau-doc/docs/ReleaseNotes/5.1.0.11.html
@@ -32,28 +32,28 @@
 	<li>Several improvements to URL-Encoding support.
 		<ul>
 			<li>Improved whitespace handling in {@link oaj.uon.UonParser}.
-			<li>New <dc>UonParserContext.UON_whitespaceAware</dc> property for controlling whether whitespace is ignored.
-			<li>New <dc>UrlEncodingContext.URLENC_expandedParams</dc> property for controlling whether arrays/Collections 
+			<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 
 				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 <dc>JsonSerializerContext.JSON_escapeSolidus</dc> property for controlling whether slash characters should be escaped.
-	<li>New {@link oaj.internal.TeeOutputStream} and {@link oaj.internal.TeeWriter} classes.
+	<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 {@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 <dc>BeanPropertyMeta.add(BeanMap,Object)</dc> method for adding values to Collection and array properties.
+	<li>New {@del BeanPropertyMeta#add(BeanMap,Object)} method for adding values to Collection and array properties.
 	<li>Config INI files now support keys with name <js>"*"</js>.
 </ul>
 
 <h5 class='topic w800'>Server</h5>		
 <ul class='spaced-list'>
-	<li>REST method parameters can now be generic types (e.g. <del><ja>@Param</ja>(<js>"foo"</js>) Map&lt;String,Integer&gt; foo</del>).
+	<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 <dc>@Param(multipart)</dc>
-		and <dc>@Query(multipart)</dc> annotations
+	<li>New {@del @Param(multipart)}
+		and {@del @Query(multipart)} annotations
 		for handling multi-part GET and POST parameters.	
 	<li>GET parameters are now CASE-SENSITIVE per W3C standards.
 		<ul>
@@ -68,8 +68,8 @@
 	<li>Performance improvements around query parameters.
 	<li>New methods on {@link oajr.RestRequest} for handling multi-part parameters:
 		<ul>
-			<li><dc>RestRequest.getParameters(String,Class)</dc>
-			<li><dc>RestRequest#getQueryParameters(String,Class)</dc>
+			<li>{@del RestRequest#getParameters(String,Class)}
+			<li>{@del RestRequest#getQueryParameters(String,Class)}
 		</ul>
 	</li>
 	<li>Fixed Jetty issue in {@link oajr.RestResponse#setHeader(String,String)} where setting 
@@ -77,18 +77,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 {@link oajr.BasicRestServlet} and <dc>RestServletJenaDefault</dc>.
+		of {@link oajr.BasicRestServlet} and {@del RestServletJenaDefault}.
 </ul>
 		
 <h5 class='topic w800'>Client</h5>		
 <ul class='spaced-list'>
-	<li>New method {@link oajrc.RestCall#allowRedirectsOnPosts(boolean)}.
+	<li>New method {@del oajrc.RestCall#allowRedirectsOnPosts(boolean)}.
 	<li>New method <c>RestCall.peekInputStream()</c> allows you to read response bodies without interrupting execution flow.
-	<li>New method {@link oajrc.RestCall#toString()} now useful for debugging purposes.  
+	<li>New method {@del oajrc.RestCall#toString()} now useful for debugging purposes.  
 		Shows all request/response headers and bodies.
-	<li>{@link oajrc.RestCallException} now includes <c>HttpResponse</c> object for easier debugging.
+	<li>{@del oajrc.RestCallException} now includes <c>HttpResponse</c> object for easier debugging.
 	<li>New method <c>RestClient.addListener(RestClientListener)</c> for registering request/response listeners.
-	<li>New <dc>RestClient.setClassLoader(ClassLoader)</dc> method.
+	<li>New {@del RestClient#setClassLoader(ClassLoader)} 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 c08637d..75d9c03 100644
--- a/juneau-doc/docs/ReleaseNotes/5.1.0.12.html
+++ b/juneau-doc/docs/ReleaseNotes/5.1.0.12.html
@@ -21,14 +21,14 @@
 
 <h5 class='topic w800'>Core</h5>		
 <ul class='spaced-list'>
-	<li>Fixed <dc>ConfigFile.isEmpty()</dc> method.
+	<li>Fixed {@del ConfigFile#isEmpty()} 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 {@link oajrc.RestCallInterceptor}.  
+	<li>New class {@del oajrc.RestCallInterceptor}.  
 		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 5b42e7c..4aeca8c 100644
--- a/juneau-doc/docs/ReleaseNotes/5.1.0.13.html
+++ b/juneau-doc/docs/ReleaseNotes/5.1.0.13.html
@@ -22,27 +22,27 @@
 <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 <dc>Link</dc> are now serialized using {@link oaj.urlencoding.UrlEncodingSerializer}, so arbitrary POJOs can now be passed as arguments.
+	<li>Arguments passed to {@del Link} 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.transforms.Datefilter.ISO8601DTZP</c> and <c>org.apache.juneau.transforms.Datefilter.SimpleP</c>.
-	<li>New <dc>HtmlDocSerializerContext.HTMLDOC_nowrap</dc> setting for {@link oaj.html.HtmlDocSerializer} class.  
+	<li>New {@del HtmlDocSerializerContext#HTMLDOC_nowrap} 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 <dc>UrlEncodingSerializer.serializeUrlPart(Object)</dc> method.
+	<li>Improved implementation of {@del UrlEncodingSerializer#serializeUrlPart(Object)} 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.
 		{@link oajr.converters.Introspectable}/{@link oajr.converters.Queryable}/{@link oajr.converters.Traversable} classes can now work with filtered POJOs.  
-	<li><dc>@RestResource(messages)</dc> annotation can now be defined on super and subclasses so that NLS messages can be defined in multiple resource bundles.
+	<li>{@del @RestResource(messages)} 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 <dc>RestCall.setRedirectMaxAttempts(int)</dc> method to prevent endless redirection loops.
-	<li>New <dc>RestCall#setRetryable(int,long,RetryOn)</dc> method to automatically retry on failed connection attempts.
+	<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 <c>RestCallInterceptor.onRetry(RestCall,int,HttpRequest,HttpResponse)</c> method for listening in on retry attempts.		
 </ul>
diff --git a/juneau-doc/docs/ReleaseNotes/5.1.0.14.html b/juneau-doc/docs/ReleaseNotes/5.1.0.14.html
index 877805b..9a3ce40 100644
--- a/juneau-doc/docs/ReleaseNotes/5.1.0.14.html
+++ b/juneau-doc/docs/ReleaseNotes/5.1.0.14.html
@@ -26,26 +26,26 @@
 <h5 class='topic w800'>Core</h5>		
 <ul class='spaced-list'>
 	<li>Simplified {@link oaj.utils.PojoIntrospector} class.
-	<li>New <dc>ClassUtils.getMethodSignature(Method)</dc> method.
+	<li>New {@del ClassUtils#getMethodSignature(Method)} 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><dc>RestClient.setRemoteableServletUri(String)</dc>
-		<li><dc>RestClient#getRemoteableProxy(Class)</dc>
+		<li>{@del RestClient#setRemoteableServletUri(String)}
+		<li>{@del RestClient#getRemoteableProxy(Class)}
 	</ul>
 </ul>
 
 <h5 class='topic w800'>Server</h5>		
 <ul class='spaced-list'>
-	<li>Added a default OPTIONS page to {@link oajr.BasicRestServlet} and <dc>RestServletJenaDefault</dc>.
+	<li>Added a default OPTIONS page to {@link oajr.BasicRestServlet} and {@del RestServletJenaDefault}.
 	<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><dc>RestRequest.getParser()</dc>
-		<li><dc>RestRequest.getReaderParser()</dc>
+		<li>{@del RestRequest#getParser()}
+		<li>{@del RestRequest#getReaderParser()}
 	</ul>
 </ul>
diff --git a/juneau-doc/docs/ReleaseNotes/5.1.0.15.html b/juneau-doc/docs/ReleaseNotes/5.1.0.15.html
index 4be6c6a..06d3d2d 100644
--- a/juneau-doc/docs/ReleaseNotes/5.1.0.15.html
+++ b/juneau-doc/docs/ReleaseNotes/5.1.0.15.html
@@ -21,10 +21,10 @@
 
 <h5 class='topic w800'>Core</h5>
 <ul class='spaced-list'>
-	<li>New properties in <dc>SerializerContext</dc>:
+	<li>New properties in {@del SerializerContext}:
 		<ol>
-			<li><dc>SerializerContext.SERIALIZER_relativeUriBase</dc>
-			<li><dc>SerializerContext.SERIALIZER_absolutePathUriBase</dc>
+			<li>{@del SerializerContext#SERIALIZER_relativeUriBase}
+			<li>{@del SerializerContext#SERIALIZER_absolutePathUriBase}
 		</ol>
 		These replace the <c>SERIALIZER_uriAuthority</c> and <c>SERIALIZER_uriContext</c> properties.
 	</li>
@@ -44,26 +44,26 @@
 
 <h5 class='topic w800'>Client</h5>
 <ul class='spaced-list'>
-	<li>New methods in {@link oajrc.RestCall}:
+	<li>New methods in {@del oajrc.RestCall}:
 		<ol>
-			<li><dc>RestRequest.getHeader(String,Class)</dc>
-			<li><dc>RestRequest.getHeader(String,Object,Class)</dc>
-			<li><dc>RestRequest.getHeader(String,Type,Type...)</dc>
-			<li><dc>RestRequest.getQueryParameter(String,Class)</dc>
-			<li><dc>RestRequest.getQueryParameter(String,Object,Class)</dc>
-			<li><dc>RestRequest.getQueryParameter(String,Type,Type...)</dc>
-			<li><dc>RestRequest.getQueryParameter(String,Object,Type,Type...)</dc>
-			<li><dc>RestRequest.getQueryParameters(String,Class)</dc>
-			<li><dc>RestRequest.getQueryParameters(String,Type,Type...)</dc>
-			<li><dc>RestRequest.getFormDataParameter(String,Class)</dc>
-			<li><dc>RestRequest.getFormDataParameter(String,Object,Class)</dc>
-			<li><dc>RestRequest.getFormDataParameters(String,Class)</dc>
-			<li><dc>RestRequest.getFormDataParameter(String,Type,Type...)</dc>
-			<li><dc>RestRequest.getFormDataParameters(String,Type,Type...)</dc>
-			<li><dc>RestRequest.getPathParameter(String,Class)</dc>
-			<li><dc>RestRequest.getPathParameter(String,Type,Type...)</dc>
-			<li><dc>RestRequest.getBody(Class)</dc>
-			<li><dc>RestRequest.getBody(Type,Type...)</dc>
+			<li>{@del RestRequest#getHeader(String,Class)}
+			<li>{@del RestRequest#getHeader(String,Object,Class)}
+			<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,Type,Type...)}
+			<li>{@del RestRequest#getQueryParameter(String,Object,Type,Type...)}
+			<li>{@del RestRequest#getQueryParameters(String,Class)}
+			<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,Type,Type...)}
+			<li>{@del RestRequest#getFormDataParameters(String,Type,Type...)}
+			<li>{@del RestRequest#getPathParameter(String,Class)}
+			<li>{@del RestRequest#getPathParameter(String,Type,Type...)}
+			<li>{@del RestRequest#getBody(Class)}
+			<li>{@del RestRequest#getBody(Type,Type...)}
 		</ol>
 	</li>
 </ul>
diff --git a/juneau-doc/docs/ReleaseNotes/5.1.0.16.html b/juneau-doc/docs/ReleaseNotes/5.1.0.16.html
index 8b08da0..c58adbd 100644
--- a/juneau-doc/docs/ReleaseNotes/5.1.0.16.html
+++ b/juneau-doc/docs/ReleaseNotes/5.1.0.16.html
@@ -24,15 +24,15 @@
 	<li>New methods on {@link oaj.ClassMeta} that eliminates language-specific code in 
 		the general class metadata.
 		<ul>
-			<li><dc>ClassMeta.getXmlMeta()</dc>
-			<li><dc>ClassMeta.getJsonMeta()</dc>
-			<li><dc>ClassMeta.getHtmlMeta()</dc>
-			<li><dc>ClassMeta.getUrlEncodingMeta()</dc>
-			<li><dc>ClassMeta.getRdfMeta()</dc>
+			<li>{@del ClassMeta#getXmlMeta()}
+			<li>{@del ClassMeta#getJsonMeta()}
+			<li>{@del ClassMeta#getHtmlMeta()}
+			<li>{@del ClassMeta#getUrlEncodingMeta()}
+			<li>{@del ClassMeta#getRdfMeta()}
 		</ul>
 	<li>New {@link oaj.dto.jsonschema.JsonType#ANY} enum.
-	<li>New <dc>@Html(asPlainText)</dc> annotation.
-	<li>New <dc>HtmlDocSerializerContext.HTMLDOC_cssImports</dc> property.
+	<li>New {@del @Html(asPlainText)} annotation.
+	<li>New {@del HtmlDocSerializerContext#HTMLDOC_cssImports} property.
 	<li>Significant changes to RDF support.
 		<ul>
 			<li>New {@link oaj.jena.annotation.Rdf @Rdf} and {@link oaj.jena.annotation.RdfSchema @RdfSchema}
@@ -41,16 +41,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 <dc>SerializerContext.SERIALIZER_sortCollections</dc> and 
-		<dc>SerializerContext.SERIALIZER_sortMaps</dc> properties.
+	<li>New {@del SerializerContext#SERIALIZER_sortCollections} and 
+		{@del SerializerContext#SERIALIZER_sortMaps} properties.
 	<li>FindBug fixes.
 </ul>
 
 <h5 class='topic w800'>Server</h5>
 <ul class='spaced-list'>
-	<li>New <dc>RestRequest.getServletParentURI()</dc> method.
+	<li>New {@del RestRequest#getServletParentURI()} method.
 	<li>New <c>$R{servletParentURI}</c> variable.
-	<li>Removed final modifier from <dc>ChildResourceDescriptions</dc>.
+	<li>Removed final modifier from {@del ChildResourceDescriptions}.
 </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 dca2cc1..ff5cb06 100644
--- a/juneau-doc/docs/ReleaseNotes/5.1.0.17.html
+++ b/juneau-doc/docs/ReleaseNotes/5.1.0.17.html
@@ -37,22 +37,22 @@
 				</ul>
 			<li>{@link oaj.BeanPropertyMeta#getClassMeta()} now returns the filtered type of the property.
 		</ul> 
-	<li><dc>StringVarResolver</dc> now has support for chained resolvers.
-	<li><dc>StringVarResolver</dc>  now resolves variables inside resolved values.
+	<li>{@del StringVarResolver} now has support for chained resolvers.
+	<li>{@del StringVarResolver}  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 <dc>RestResource.filters()</dc> were being
+	<li>Fixed bug where inner interface classes being used in {@del RestResource#filters()} 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 {@link oaj.utils.ZipFileList} class for providing efficiently zipped directories through the REST interface.
+	<li>New {@del oaj.utils.ZipFileList} class for providing efficiently zipped directories through the REST interface.
 	<li>New <c>RdfProperties.RDF_useXmlNamespaces</c> property.			
-	<li>New <dc>XmlParserContext.XML_preserveRootElement</dc> property.
+	<li>New {@del XmlParserContext#XML_preserveRootElement} 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 <dc>ZipFileListResponseHandler</dc> class.
+	<li>New {@del ZipFileListResponseHandler} class.
 	<li>Simplified labels in servlet resource bundles:
 		<ul>
 			<li><c>"[ClassName].ResourceDescription"</c> is now <c>"[ClassName].label"</c>.
@@ -62,40 +62,40 @@
 		<ul>
 			<li>Added new methods:
 				<ul>
-					<li><dc>RestRequest.getQueryParameterMap()</dc>
-					<li><dc>RestRequest.getQueryParameterNames()</dc>
-					<li><dc>RestRequest.getPathInfoUndecoded()</dc>
-					<li><dc>RestRequest.getPathRemainderUndecoded()</dc>
-					<li><dc>RestRequest.getTrimmedRequestURI()</dc>
-					<li><dc>RestRequest.getTrimmedRequestURL()</dc>
-					<li><dc>RestRequest.getServletTitle()</dc>
-					<li><dc>RestRequest.getServletDescription()</dc>
-					<li>{@link oajr.RestRequest#getMethodDescription()}
+					<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()}
 				</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><dc>RestRequest.getPathRemainder()</dc> now automatically decodes the path remainder. 
-				Use <dc>RestRequest.getPathRemainderUndecoded()</dc> to get the unencoded path remainder.
-			<li>Bug fixes in <dc>RestRequest.getRequestParentURI()</dc> when servlet is mapped to <js>"/*"</js>.
-			<li>Bug fixes in <dc>RestRequest.getServletURI()</dc> when servlet is mapped to <js>"/*"</js>.
+			<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>.
 		</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 {@link oajr.RestRequest#getMethodDescription()}
-			<li><c>$R{resourceTitle}</c> - Returns value from <dc>RestRequest.getServletTitle()</dc>
-			<li><c>$R{resourceDescription}</c> - Returns value from <dc>RestRequest.getServletDescription()</dc>
-			<li><c>$R{trimmedRequestURI}</c> - Returns value from <dc>RestRequest.getTrimmedRequestURI()</dc>
+			<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>$E{var}</c> - Environment variables.
 		</ul>
-	<li>Added methods <dc>RestServlet.getDescription(RestRequest)</dc> and <dc>RestServlet.getLabel(RestRequest)</dc>.
-	<li>{@link oajr.BasicRestServlet} and <dc>RestServletJenaDefault</dc> now provide default HTML titles
+	<li>Added methods {@del RestServlet#getDescription(RestRequest)} and {@del RestServlet#getLabel(RestRequest)}.
+	<li>{@link oajr.BasicRestServlet} and {@del RestServletJenaDefault} now provide default HTML titles
 		and descriptions:
 		<p class='bcode w800'>
 	<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 {@link oajr.BasicRestServlet} and <dc>RestServletJenaDefault</dc> now provide default descriptions and back links:
+	<li>Options pages on {@link oajr.BasicRestServlet} and {@del RestServletJenaDefault} now provide default descriptions and back links:
 		and descriptions:
 		<p class='bcode w800'>
 	<ja>@Property</ja>(name=<jsf>HTMLDOC_navlinks</jsf>, value=<js>"{back:'$R{servletURI}"</js>),
@@ -106,19 +106,19 @@
 	<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><dc>RestResource.label()</dc>
-			<li><dc>@RestResource(description)</dc>
-			<li>{@link oajr.annotation.RestMethod#description() @RestMethod(description)}
-			<li><dc>RestMethod#responses()</dc>
-			<li><dc>Attr.description()</dc>
-			<li><dc>Content.description()</dc>
-			<li><dc>HasParam.description()</dc>
-			<li><dc>HasQParam.description()</dc>
-			<li><dc>Header.description()</dc>
-			<li><dc>Param.description()</dc>
-			<li><dc>QParam.description()</dc>
+			<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()}
 		</ul>
-	<li>Support for sorting resources by name in <dc>ChildResourceDescriptions</dc>.
+	<li>Support for sorting resources by name in {@del ChildResourceDescriptions}.
 </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 5beadbf..9463177 100644
--- a/juneau-doc/docs/ReleaseNotes/5.1.0.18.html
+++ b/juneau-doc/docs/ReleaseNotes/5.1.0.18.html
@@ -23,17 +23,17 @@
 <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 <dc>RestMethod.input()</dc> and <dc>RestMethod.responses()</dc>
+	<li>New {@del RestMethod#input()} and {@del RestMethod#responses()}
 		annotations.
 		These replace the various <c>description</c> annotations added 2 days ago with a simpler design.
 	<li>New methods on {@link oajr.RestServlet}:
 		<ul>
-			<li><dc>RestServlet.getMethodDescription(String,RestRequest)</dc> so that subclasses
+			<li>{@del RestServlet#getMethodDescription(String,RestRequest)} so that subclasses
 				can override the method description in the OPTIONS page.
-			<li><dc>RestServlet.createRequestVarResolver(RestRequest)</dc> so that subclasses
+			<li>{@del RestServlet#createRequestVarResolver(RestRequest)} so that subclasses
 				can override and augment the variable resolver.
-			<li><dc>RestServlet.resolveChild(Class)</dc> and <dc>RestServlet.replaceChild(RestServlet)</dc>
+			<li>{@del RestServlet#resolveChild(Class)} and {@del RestServlet#replaceChild(RestServlet)}
 				classes that allows customized resolution of servlet instances (e.g. if services are defined in OSGi).
 		</ul> 
-	<li>Reverted the <dc>MethodDescription</dc> back to 5.1.0.16 since it was being used by someone.
+	<li>Reverted the {@del MethodDescription} back to 5.1.0.16 since it was being used by someone.
 </ul>
diff --git a/juneau-doc/docs/ReleaseNotes/5.1.0.19.html b/juneau-doc/docs/ReleaseNotes/5.1.0.19.html
index 1105810..1a5df76 100644
--- a/juneau-doc/docs/ReleaseNotes/5.1.0.19.html
+++ b/juneau-doc/docs/ReleaseNotes/5.1.0.19.html
@@ -17,22 +17,22 @@
 
 <p>
 	Juno 5.1.0.19 is a minor update in terms of core functionality.
-	But it introduces a <dc>Microservices</dc> project for building REST microservices and docker containers.
+	But it introduces a {@del Microservices} 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 {@link oaj.ObjectMap ObjectMaps}.
-		See <del>Serializing to ObjectMaps</del> for details.
-	<li>New {@link oaj.ObjectMap#include(String[])} and {@link oaj.ObjectMap#exclude(String[])} methods.
+	<li>Beans can now be serialized to and parsed from {@del oaj.ObjectMap ObjectMaps}.
+		See <dc>Serializing to ObjectMaps</dc> for details.
+	<li>New {@del oaj.ObjectMap#include(String[])} and {@del oaj.ObjectMap#exclude(String[])} 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 <dc>StringVarResolver</dc>.  <jk>null</jk> input now results in blank strings instead of <jk>null</jk>.
+	<li>Behavior change on {@del StringVarResolver}.  <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 {@link oajrc.RestClient#doCallback(String)} method.
+	<li>New {@del RestClient#doCallback(String)} method.
 </ul>
 
 <h5 class='topic w800'>Server</h5>
@@ -45,5 +45,5 @@
 		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 <dc>ResourceDescription.ResourceDescription(RestRequest,String,String)</dc> constructor.
+	<li>New {@del ResourceDescription#ResourceDescription(RestRequest,String,String)} constructor.
 </ul>
diff --git a/juneau-doc/docs/ReleaseNotes/5.1.0.20.html b/juneau-doc/docs/ReleaseNotes/5.1.0.20.html
index 4e2f049..9e22c06 100644
--- a/juneau-doc/docs/ReleaseNotes/5.1.0.20.html
+++ b/juneau-doc/docs/ReleaseNotes/5.1.0.20.html
@@ -17,25 +17,25 @@
 
 <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 <dc>ConfigFile</dc> functionality.
+	The biggest improvement is the ability to associate external INI config files with REST servlets using the {@del ConfigFile} 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><dc>ConfigFile</dc> is now thread safe and can be shared across multiple threads.
-			<li>New <dc>ConfigMgr</dc> class for managing configuration files.
+			<li>{@del ConfigFile} is now thread safe and can be shared across multiple threads.
+			<li>New {@del ConfigMgr} 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 {@link oaj.utils.ProcBuilder} class for calling external processes.
-	<li>New <dc>ObjectMap.remove(Class,String,Object)</dc> method.
+	<li>New {@del oaj.utils.ProcBuilder} class for calling external processes.
+	<li>New {@del ObjectMap#remove(Class,String,Object)} method.
 	<li><js>"class='link'"</js> added to links generated by {@link oaj.html.HtmlDocSerializer}.
-	<li>New <dc>EncoderGroup#append(EncoderGroup)</dc> method.
+	<li>New {@del EncoderGroup#append(EncoderGroup)} 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.
@@ -44,7 +44,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 <dc>ReflectionUtils.getResource(Class,String)</dc> method.
+	<li>New {@del ReflectionUtils#getResource(Class,String)} 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>
@@ -56,25 +56,25 @@
 	<li>Changes to {@link oajr.RestServlet}:
 		<ul>
 			<li>New methods for accessing external INI config files:<br>  
-				<dc>RestServlet.getConfig()</dc><br>
-				<dc>RestServlet.createConfigFile()</dc>
+				{@del RestServlet#getConfig()}<br>
+				{@del RestServlet#createConfigFile()}
 			<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>  
-				<dc>RestServlet.getResource(String)</dc><br>
-				<dc>RestServlet.getResourceAsString(String)</dc><br>
-				<dc>RestServlet.getResource(Class,String,String)</dc>.
+				{@del RestServlet#getResource(String)}<br>
+				{@del RestServlet#getResourceAsString(String)}<br>
+				{@del RestServlet#getResource(Class,String,String)}.
 					Useful if you want to load predefined POJOs from JSON files in your classpath.
-			<li>New <dc>RestServlet.handleNotFound(int,RestRequest,RestResponse)</dc> method for customized handling
+			<li>New {@del RestServlet#handleNotFound(int,RestRequest,RestResponse)} method for customized handling
 				of when a resource or method was not found.  
 		</ul>
 	<li>{@link oajr.BasicRestServlet}  now automatically processes <js>"/favicon.ico"</js> requests by 
-		overriding the new <dc>RestServlet.handleNotFound(int,RestRequest,RestResponse)</dc> method.
+		overriding the new {@del RestServlet#handleNotFound(int,RestRequest,RestResponse)} method.
 	<li>New {@link oajr.RestRequest} methods: 
 		<ul>
-			<li><dc>RestRequest.resolveVars(String)</dc>
+			<li>{@del RestRequest#resolveVars(String)}
 			<li><c>RestRequest.getVarResource(String)</c>
-			<li><dc>RestRequest.getConfig()</dc>
+			<li>{@del RestRequest#getConfig()}
 		</ul>
 	<li>New {@link oajr.RestResponse} methods: 
 		<ul>
@@ -83,11 +83,11 @@
 				<c>getWriter()</c> now returns an unnegotiated writer.  
 				<c>getUnbufferedWriter()</c> has been removed.
 		</ul>
-	<li>New {@link oajr.annotation.RestMethod#encoders() @RestMethod(encoders)} and 
-		<dc>RestMethod.inheritEncoders()</dc> annotations.  
+	<li>New {@del oajr.annotation.RestMethod#encoders() @RestMethod(encoders)} and 
+		{@del RestMethod#inheritEncoders()} annotations.  
 		Allows encoders to be fine-tuned at the method level.
-	<li>New <dc>@RestResource(config)</dc> annotation for associating external <dc>ConfigFile</dc> config files with servlets.
-	<li><dc>ResourceLink</dc>.
+	<li>New {@del @RestResource(config)} annotation for associating external {@del ConfigFile} config files with servlets.
+	<li>{@del ResourceLink}.
 	<li>New <c>org.apache.juneau.rest.matchers</c> package for commonly-used {@link oajr.RestMatcher RestMatchers}:
 		<ul>
 			<li>{@link oajr.matchers#MultipartFormDataMatcher}
diff --git a/juneau-doc/docs/ReleaseNotes/5.2.0.0.html b/juneau-doc/docs/ReleaseNotes/5.2.0.0.html
index b403d57..9b55af8 100644
--- a/juneau-doc/docs/ReleaseNotes/5.2.0.0.html
+++ b/juneau-doc/docs/ReleaseNotes/5.2.0.0.html
@@ -25,40 +25,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 <dc>ConfigFile</dc>:
+			<li>New methods in {@del ConfigFile}:
 				<ul>
-					<li><dc>ConfigFile.getStringArray(String)</dc>,<dc>ConfigFile.getStringArray(String,String[])</dc>
-					<li><dc>ConfigFile.getSectionAsBean(String,Class)</dc> - Instantiate a new bean with property values in the specified section..
-					<li><dc>ConfigFile.writeProperties(String,Object,boolean,Class[])</dc> - Copy the properties in a config file section into properties on an existing bean or POJO.
-					<li><dc>ConfigFile.getSectionMap(String)</dc> - Get all the resolved values in a section.
-					<li><dc>ConfigFile.containsNonEmptyValue(String)</dc> 
-					<li><dc>ConfigFile.isEncoded(String)</dc> 
-					<li><dc>ConfigFile.addListener(ConfigFileListener)</dc> - Listen for modification events on the config file.
-					<li><dc>ConfigFile.merge(ConfigFile)</dc> - Merge the contents of another config file into this config file.
-					<li><dc>ConfigFile.getResolving()</dc>, <dc>ConfigFile.getResolving(StringVarResolver)</dc> - Return an instance of the config file that resolves string variables.
+					<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.
 						Much more efficient than the previous design since the same underlying config file object is shared.
-					<li><dc>ConfigFile.toWritable()</dc> - Wraps the config file in a {@link 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><dc>ConfigFile.getInt(String)</dc> - Now supports <js>"M"</js> and <js>"K"</js> to identify millions and thousands.
+					<li>{@del ConfigFile#toWritable()} - Wraps the config file in a {@link 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.
 				</ul>
-			<li>New methods in <dc>ConfigMgr</dc>:
+			<li>New methods in {@del ConfigMgr}:
 				<ul>
-					<li><dc>ConfigMgr.create()</dc>, <dc>ConfigMgr.create(Reader)</dc>, <dc>ConfigMgr.create(File)</dc>
-					<li><dc>ConfigMgr.deleteAll()</dc>	
+					<li>{@del ConfigMgr#create()}, {@del ConfigMgr#create(Reader)}, {@del ConfigMgr#create(File)}
+					<li>{@del ConfigMgr#deleteAll()}	
 				</ul>
-			<li>New methods in <dc>Section</dc>:
+			<li>New methods in {@del Section}:
 				<ul>
-					<li><dc>Section.setParent(ConfigFileImpl)</dc> - Used by parsers to set the config file for this section.
-					<li><dc>Section.setName(String)</dc> - Used by parsers to set the name for this section.
+					<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.
 				</ul>
 			<li>New interfaces:
 				<ul>
-					<li><dc>org.apache.juneau.config.ConfigFileListener</dc>
-					<li><dc>org.apache.juneau.config.SectionListener</dc>
-					<li><dc>org.apache.juneau.config.EntryListener</dc> 
+					<li>{@del org.apache.juneau.config.ConfigFileListener}
+					<li>{@del org.apache.juneau.config.SectionListener}
+					<li>{@del org.apache.juneau.config.EntryListener}
 				</ul>
-			<li><dc>org.apache.juneau.config.Encoder</dc> methods have access to field names to use them as salt values.
+			<li>{@del org.apache.juneau.config.Encoder} 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><dc>org.apache.juneau.config.XorEncoder</dc> XOR key can be overridden through the <js>"org.apache.juneau.config.XorEncoder.key"</js> system property.
+			<li>{@del org.apache.juneau.config.XorEncoder} 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>
@@ -82,32 +82,32 @@
 	<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 <dc>Section</dc> class represents a section
-		in a config file.  It needs to know it's own name and have a link to the <dc>ConfigFile</dc> 
+		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} 
 		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>{@link oaj.Streamable} interface for identifying objects that can be serialized directly to an output stream.
 			<li>{@link oaj.Writable} interface for identifying objects that can be serialized directly to a writer.
-			<li><dc>StringObject</dc> class that can be used for delayed object serialization.
-			<li><dc>ByteArrayCache</dc>
+			<li>{@del StringObject} class that can be used for delayed object serialization.
+			<li>{@del ByteArrayCache}
 			<li>{@link oaj.internal.ByteArrayInOutStream} 
 			<li>{@link oaj.internal.FileUtils}
 			<li>{@link oaj.internal.ThrowableUtils}
-			<li><dc>StringVarMultipart</dc>
-			<li><dc>StringVarWithDefault</dc>
+			<li>{@del StringVarMultipart}
+			<li>{@del StringVarWithDefault}
 		</ul> 
-	<li>New fields on {@link oaj.ObjectList}:
+	<li>New fields on {@del oaj.ObjectList}:
 		<ul>
-			<li>{@link oaj.ObjectList#EMPTY_LIST}
+			<li>{@del oaj.ObjectList#EMPTY_LIST}
 		</ul>
-	<li>New fields and methods on {@link oaj.ObjectMap}:
+	<li>New fields and methods on {@del oaj.ObjectMap}:
 		<ul>
-			<li>{@link oaj.ObjectMap#EMPTY_MAP}
-			<li>{@link oaj.ObjectMap#getStringArray(String)}
-			<li>{@link oaj.ObjectMap#getStringArray(String,String[])}
-			<li>{@link oaj.ObjectMap#putIfNull(String,Object)}
-			<li>{@link oaj.ObjectMap#putIfEmpty(String,Object)}
+			<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)}
 		</ul>
 	<li>New methods in {@link oaj.internal.ArrayUtils}:
 		<ul>
@@ -117,14 +117,14 @@
 		</ul>	
 	<li>New methods in {@link oaj.internal.IOUtils}:
 		<ul>
-			<li><dc>IOUtils.pipe(Reader,Writer)</dc>
+			<li>{@del IOUtils#pipe(Reader,Writer)}
 			<li>{@link oaj.internal.IOUtils#read(File)}
-			<li>{@link oaj.internal.IOUtils#readFile(String)}
-			<li>{@link oaj.internal.IOUtils#write(File,Reader)}
+			<li>{@del IOUtils#readFile(String)}
+			<li>{@del IOUtils#write(File,Reader)}
 		</ul>
 	<li>New methods on {@link oaj.utils.PojoRest}:
 		<ul>
-			<li><dc>PojoRest.get(Class,String,Object)</dc>
+			<li>{@del PojoRest#get(Class,String,Object)}
 			<li>{@link oaj.utils.PojoRest#getString(String)}
 			<li>{@link oaj.utils.PojoRest#getString(String,String)}
 			<li>{@link oaj.utils.PojoRest#getInt(String)}
@@ -137,19 +137,19 @@
 			<li>{@link oaj.utils.PojoRest#getMap(String,Map)}
 			<li>{@link oaj.utils.PojoRest#getList(String)}
 			<li>{@link oaj.utils.PojoRest#getList(String,List)}
-			<li>{@link oaj.utils.PojoRest#getObjectMap(String)}
-			<li>{@link oaj.utils.PojoRest#getObjectMap(String,ObjectMap)}
-			<li>{@link oaj.utils.PojoRest#getObjectList(String)}
-			<li>{@link oaj.utils.PojoRest#getObjectList(String,ObjectList)}
+			<li>{@del getObjectMap(String)}
+			<li>{@del getObjectMap(String,ObjectMap)}
+			<li>{@del getObjectList(String)}
+			<li>{@del getObjectList(String,ObjectList)}
 		</ul>
-	<li>New methods on {@link oaj.utils.ProcBuilder}:
+	<li>New methods on {@del oaj.utils.ProcBuilder}:
 		<ul>
-			<li>{@link oaj.utils.ProcBuilder#pipeTo(Writer,boolean)}
-			<li>{@link oaj.utils.ProcBuilder#pipeTo(Writer)}
-			<li>{@link oaj.utils.ProcBuilder#logTo(Writer,boolean)}
-			<li>{@link oaj.utils.ProcBuilder#logTo(Writer)}
-			<li>{@link oaj.utils.ProcBuilder#logTo(Level,Logger)}
-			<li>{@link oaj.utils.ProcBuilder#maxExitStatus(int)}
+			<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)}
 		</ul>
 	<li>New methods on {@link oaj.internal.StringUtils}:
 		<ul>
@@ -161,34 +161,34 @@
 			<li>{@link oaj.internal.StringUtils#base64Decode(String)}
 			<li>{@link oaj.internal.StringUtils#generateUUID(int)}
 			<li>{@link oaj.internal.StringUtils#trim(String)}
-			<li><dc>StringUtils.parseISO8601Date(String)</dc>
+			<li>{@del StringUtils#parseISO8601Date(String)}
 			<li>{@link oaj.internal.StringUtils#replaceVars(String,Map)}
 			<li>{@link oaj.internal.StringUtils#pathStartsWith(String,String)}
 			<li>{@link oaj.internal.StringUtils#pathStartsWith(String,String[])}
 		</ul>
-	<li>New <dc>StringVar.doResolve(String)</dc> method.
-	<li>New <dc>StringVarResolver.DEFAULT</dc> field.
+	<li>New {@del StringVar#doResolve(String)} method.
+	<li>New {@del StringVarResolver#DEFAULT} field.
 	<li>Eliminated dependency on <c>javax.mail.internet.MimeUtility</c> by implementing our own {@link oaj.internal.StringUtils#base64Encode(byte[])} method.
-	<li>{@link oaj.transforms.CalendarSwap} and {@link oaj.transforms.DateSwap} classes now handle blank input better.  Returns <jk>null</jk> instead of throwing an exception.
+	<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>{@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</del> to <del>HtmlSchemaDocSerializer</del>.
+	<li>Renamed {@del HtmlSchemaSerializer} to {@del HtmlSchemaDocSerializer}.
 	<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>{@link oaj.serializer.SerializerGroup} and {@link oaj.parser.ParserGroup} 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 <dc>UrlEncodingSerializer.DEFAULT_SIMPLE_EXPANDED</dc> serializer.
-	<li>Changes to <dc>Args</dc>:
+	<li>New {@del UrlEncodingSerializer#DEFAULT_SIMPLE_EXPANDED} serializer.
+	<li>Changes to {@del Args}:
 		<ul>
-			<li><c>getMainArg(int)</c> changed to <dc>Args.getArg(int)</dc>.  
+			<li><c>getMainArg(int)</c> changed to {@del Args#getArg(int)}.  
 				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 <dc>Args.hasArg(int)</dc> method.
+			<li>New {@del Args#hasArg(int)} method.
 		</ul> 
 	<li>Removed <c>org.apache.juneau.utils.CharsetUtils</c> class.
 	<li>Removed <c>org.apache.juneau.utils.ConcurrentIdentityList</c> class.
@@ -197,10 +197,10 @@
 		Simplifies the API on the class.
 	<li>{@link oaj.utils.PojoRest} must now be instantiated with a <c>ReaderParser</c>.
 		Simplifies the API on the class.
-	<li>{@link oaj.utils.MessageBundle} and <c>SafeResourceMultiBundle</c> moved from server component.
-	<li>Several bug fixes and performance improvements in <dc>StringVarResolver</dc>.
-	<li>Various enhancements to {@link oaj.internal.TeeWriter} and {@link oaj.internal.TeeOutputStream}.
-	<li>Renamed <del>CharSet</del> to {@link oaj.internal.AsciiSet}.
+	<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>{@link oaj.serializer.SerializerGroup} and {@link oaj.parser.ParserGroup} 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.
@@ -212,100 +212,100 @@
 	<li>Upgraded to use Apache HttpClient 4.5.
 	<li>New classes:
 		<ul>
-			<li>{@link oajrc.AllowAllRedirects}
-			<li>{@link oajrc.HttpMethod}
-			<li>{@link oajrc.ResponsePattern}
-			<li>{@link oajrc.SimpleX509TrustManager}
-			<li><dc>SSLOpts</dc>
+			<li>{@del oajrc.AllowAllRedirects}
+			<li>{@del oajrc.HttpMethod}
+			<li>{@del oajrc.ResponsePattern}
+			<li>{@del oajrc.SimpleX509TrustManager}
+			<li>{@del SSLOpts}
 		</ul>
 	<li>Removed <c>org.apache.juneau.rest.client.LaxRedirectStrategy</c>.  Use HTTP Client equivalent.
-	<li>New methods on {@link oajrc.RestCall}:
+	<li>New methods on {@del oajrc.RestCall}:
 		<ul>
-			<li><dc>RestCall#addInterceptor(RestCallInterceptor)</dc>
-			<li>{@link oajrc.RestCall#pipeTo(Writer)}
-			<li>{@link oajrc.RestCall#pipeTo(Writer,boolean)}
-			<li>{@link oajrc.RestCall#pipeTo(String,Writer,boolean)}
-			<li>{@link oajrc.RestCall#getWriter(String)}
-			<li>{@link oajrc.RestCall#pipeTo(OutputStream)}
-			<li>{@link oajrc.RestCall#pipeTo(OutputStream,boolean)}
-			<li>{@link oajrc.RestCall#pipeTo(String,OutputStream,boolean)}
-			<li>{@link oajrc.RestCall#getOutputStream(String)}
-			<li>{@link oajrc.RestCall#byLines()}
-			<li>{@link oajrc.RestCall#captureResponse()}
-			<li>{@link oajrc.RestCall#successPattern(String)}
-			<li>{@link oajrc.RestCall#failurePattern(String)}
-			<li><dc>RestCall#addResponsePattern(ResponsePattern)</dc>
-			<li>{@link oajrc.RestCall#run()} - Renamed from <c>execute()</c>.
-			<li>{@link oajrc.RestCall#getCapturedResponse()}
-			<li>{@link oajrc.RestCall#getResponsePojoRest(Class)}
-			<li>{@link oajrc.RestCall#getResponsePojoRest()}
-			<li>{@link oajrc.RestCall#logTo(Level,Logger)}
-			<li>{@link oajrc.RestCall#setConfig(RequestConfig)}
+			<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)}
 		</ul>
-	<li>New lifecycle listener methods on {@link oajrc.RestCallInterceptor}:
+	<li>New lifecycle listener methods on {@del oajrc.RestCallInterceptor}:
 		<ul>
-			<li>{@link oajrc.RestCallInterceptor#onInit(RestCall)}
-			<li>{@link oajrc.RestCallInterceptor#onClose(RestCall)}
+			<li>{@del RestCallInterceptor#onInit(RestCall)}
+			<li>{@del RestCallInterceptor#onClose(RestCall)}
 		</ul>
 	<li>New methods on {@link oajrc.RestClient}:
 		<ul>
-			<li><dc>RestClient.setBasicAuth(String,int,String,String)</dc>
-			<li><dc>RestClient.logTo(Level,Logger)</dc>
-			<li><dc>RestClient.setRootUrl(String)</dc>
-			<li><dc>RestClient.enableSSL(SSLOpts)</dc>
-			<li><dc>RestClient.enableLaxSSL()</dc>
-			<li>{@link oajrc.RestClient#doCall(HttpMethod,Object,Object)}
-			<li><dc>RestClient.createHttpClientBuilder()</dc>
+			<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()}
 		</ul>
 	<li>New passthrough methods on {@link oajrc.RestClient} defined on <c>HttpClientBuilder</c>:
 		<ul>
-			<li><dc>RestClient.setRedirectStrategy(RedirectStrategy)</dc>
-			<li><dc>RestClient.setDefaultCookieSpecRegistry(Lookup)</dc>
-			<li><dc>RestClient.setRequestExecutor(HttpRequestExecutor)</dc>
-			<li><dc>RestClient.setSSLHostnameVerifier(HostnameVerifier)</dc>
-			<li><dc>RestClient.setPublicSuffixMatcher(PublicSuffixMatcher)</dc>
-			<li><dc>RestClient.setSSLContext(SSLContext)</dc>
-			<li><dc>RestClient.setSSLSocketFactory(LayeredConnectionSocketFactory)</dc>
-			<li><dc>RestClient.setMaxConnTotal(int)</dc>
-			<li><dc>RestClient.setMaxConnPerRoute(int)</dc>
-			<li><dc>RestClient.setDefaultSocketConfig(SocketConfig)</dc>
-			<li><dc>RestClient.setDefaultConnectionConfig(ConnectionConfig)</dc>
-			<li><dc>RestClient.setConnectionTimeToLive(long,TimeUnit)</dc>
-			<li><dc>RestClient.setConnectionManager(HttpClientConnectionManager)</dc>
-			<li><dc>RestClient.setConnectionManagerShared(boolean)</dc>
-			<li><dc>RestClient.setConnectionReuseStrategy(ConnectionReuseStrategy)</dc>
-			<li><dc>RestClient.setKeepAliveStrategy(ConnectionKeepAliveStrategy)</dc>
-			<li><dc>RestClient.setTargetAuthenticationStrategy(AuthenticationStrategy)</dc>
-			<li><dc>RestClient.setProxyAuthenticationStrategy(AuthenticationStrategy)</dc>
-			<li><dc>RestClient.setUserTokenHandler(UserTokenHandler)</dc>
-			<li><dc>RestClient.disableConnectionState()</dc>
-			<li><dc>RestClient.setSchemePortResolver(SchemePortResolver)</dc>
-			<li><dc>RestClient.setUserAgent(String userAgent)</dc>
-			<li><dc>RestClient.setDefaultHeaders(Collection)</dc>
-			<li><dc>RestClient.addInterceptorFirst(HttpResponseInterceptor)</dc>
-			<li><dc>RestClient.addInterceptorLast(HttpResponseInterceptor)</dc>
-			<li><dc>RestClient.addInterceptorFirst(HttpRequestInterceptor)</dc>
-			<li><dc>RestClient.addInterceptorLast(HttpRequestInterceptor)</dc>
-			<li><dc>RestClient.disableCookieManagement()</dc>
-			<li><dc>RestClient.disableContentCompression()</dc>
-			<li><dc>RestClient.disableAuthCaching()</dc>
-			<li><dc>RestClient.setHttpProcessor(HttpProcessor)</dc>
-			<li><dc>RestClient.setRetryHandler(HttpRequestRetryHandler)</dc>
-			<li><dc>RestClient.disableAutomaticRetries()</dc>
-			<li><dc>RestClient.setProxy(HttpHost)</dc>
-			<li><dc>RestClient.setRoutePlanner(HttpRoutePlanner)</dc>
-			<li><dc>RestClient.disableRedirectHandling()</dc>
-			<li><dc>RestClient.setConnectionBackoffStrategy(ConnectionBackoffStrategy)</dc>
-			<li><dc>RestClient.setBackoffManager(BackoffManager)</dc>
-			<li><dc>RestClient.setServiceUnavailableRetryStrategy(ServiceUnavailableRetryStrategy)</dc>
-			<li><dc>RestClient.setDefaultCookieStore(CookieStore)</dc>
-			<li><dc>RestClient.setDefaultCredentialsProvider(CredentialsProvider)</dc>
-			<li><dc>RestClient.setDefaultAuthSchemeRegistry(Lookup)</dc>
-			<li><dc>RestClient.setContentDecoderRegistry(Map)</dc>
-			<li><dc>RestClient.setDefaultRequestConfig(RequestConfig)</dc>
-			<li><dc>RestClient.useSystemProperties()</dc>
-			<li><dc>RestClient.evictExpiredConnections()</dc>
-			<li><dc>RestClient.evictIdleConnections(long,TimeUnit)</dc>
+			<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)}
 		</ul>
 	<li><c>JazzRestClient</c> now supports OIDC authentication.
 	<li>These classes are now deprecated and will be removed in a future release:
@@ -321,19 +321,19 @@
 
 <h5 class='topic w800'>Server</h5>
 <ul class='spaced-list'>
-	<li>New <dc>ReaderResource</dc> class.   
+	<li>New {@del ReaderResource} class.   
 		Represents the contents of a text file with convenience methods for resolving
-		<dc>StringVar</dc> variables and adding HTTP response headers.	
+		{@del StringVar} variables and adding HTTP response headers.	
 		REST Java methods can return instances of these to serialize <c>Readers</c>
-			containing text with <dc>StringVarResolver</dc> variables in them.
-	<li>New <dc>StreamResource</dc> class.   
+			containing text with {@del StringVarResolver} variables in them.
+	<li>New {@del StreamResource} 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 {@link oajr.RestException}.
+	<li>Fixed a bug in the stack trace hash algorithm in {@del oajr.RestException}.
 	<li>New methods in {@link oajr.RestRequest}:
 		<ul>
-			<li><dc>RestRequest.getReaderResource(String)</dc> - Replaces <c>getVarResource(String)</c>.
-			<li><dc>RestRequest.getReaderResource(String,boolean)</dc> 
-			<li><dc>RestRequest.getReaderResource(String,boolean,String)</dc>
+			<li>{@del RestRequest#getReaderResource(String)} - Replaces <c>getVarResource(String)</c>.
+			<li>{@del RestRequest#getReaderResource(String,boolean)} 
+			<li>{@del RestRequest#getReaderResource(String,boolean,String)}
 		</ul>
 	<li>Changes in {@link oajr.RestResponse}:
 		<ul>
@@ -341,42 +341,42 @@
 		</ul>
 	<li>New methods in {@link oajr.RestServlet}:
 		<ul>
-			<li><dc>RestServlet.getChildClasses()</dc>  - Programmatic equivalent to <dc>@RestResource(children)</dc> annotation.
-			<li><dc>RestServlet.shouldLog(HttpServletRequest,HttpServletResponse,RestException)</dc> 
-			<li><dc>RestServlet.shouldLogStackTrace(HttpServletRequest,HttpServletResponse,RestException)</dc> 
-			<li><dc>RestServlet.logObjects(Level,String,Object[])</dc> 
-			<li><dc>RestServlet.resolveStaticFile(String)</dc> 
-			<li><dc>RestServlet.createStyleSheet()</dc> 
-			<li><dc>RestServlet.createFavIcon()</dc> 
-			<li><dc>RestServlet.createStaticFilesMap()</dc> 
-			<li><dc>RestServlet.getConfigMgr()</dc>
+			<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()}
 		</ul>
 	<li>Removed {@link oaj.jso.JsoParser}
-		from {@link oajr.BasicRestServlet} and <dc>RestServletJenaDefault</dc>.  
+		from {@link oajr.BasicRestServlet} and {@del RestServletJenaDefault}.  
 		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 <dc>@RestResource(staticFiles)</dc>}.
-	<li>New annotations on <dc>@RestResource</dc>.
+	<li>Removed <c>RestServletProperties.REST_htDocsFolder</c>.  Replaced with {@del @RestResource(staticFiles)}}.
+	<li>New annotations on {@del @RestResource}.
 		<ul>
-			<li><dc>RestResource.stylesheet()</dc>
-			<li><dc>RestResource.favicon()</dc>
-			<li><dc>@RestResource(staticFiles)</dc>
+			<li>{@del RestResource#stylesheet()}
+			<li>{@del RestResource#favicon()}
+			<li>{@del @RestResource(staticFiles)}
 		</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 <dc>ResourceLink.ResourceLink(String,RestRequest,String,Object[])</dc> constructor.
+	<li>New {@del ResourceLink#ResourceLink(String,RestRequest,String,Object[])} constructor.
 	<li>New response handlers:
 		<ul>
-			<li><dc>StreamableHandler</dc> - Allows REST Java methods to return instances of {@link oaj.Streamable}.
-			<li><dc>WritableHandler</dc> - Allows REST Java methods to return instances of {@link oaj.Writable}.
+			<li>{@del StreamableHandler} - Allows REST Java methods to return instances of {@link oaj.Streamable}.
+			<li>{@del WritableHandler} - Allows REST Java methods to return instances of {@link oaj.Writable}.
 		</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 <dc>RestUtils.trimPathInfo(StringBuffer,String,String)</dc> method.
+	<li>New {@del RestUtils#trimPathInfo(StringBuffer,String,String)} method.
 </ul>
 
 <h5 class='topic w800'>Microservice</h5>
@@ -384,7 +384,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 <dc>RestMicroservice</dc> class that implements a microservice
+	<li>New {@del RestMicroservice} class that implements a microservice
 		consisting of a REST interface.
 		<ul>
 			<li>REST resources and configuration settings can be defined through either manifest files
@@ -396,14 +396,14 @@
 		</ul>
 	<li>Eliminated <c>org.apache.juneau.microservice.Main</c> class.  This is replaced by
 		the microservice classes defined above.
-	<li><dc>Resource</dc> and <dc>ResourceGroup</dc>
+	<li>{@del Resource} and {@del ResourceGroup}
 		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 <dc>BasicRestServletJena</dc> class if you want your REST interface to support RDF.
+	<li>New {@del BasicRestServletJena} class if you want your REST interface to support RDF.
 	<li>Eliminated the following classes:
 		<ul>
 			<li><c>org.apache.juneau.microservice.RootResource</c>
@@ -426,11 +426,11 @@
 
 <h5 class='topic w800'>Documentation Updates</h5>
 <ul class='spaced-list'>
-	<li><del>org.apache.juneau.microservice</del> - New package-level javadoc.
-	<li><del>org.apache.juneau.config</del> - New package-level javadoc.
-	<li><dc>StringVarResolver</dc> - New documentation.
-	<li><del>org.apache.juneau.rest.client</del> - New package-level javadoc.
+	<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><dc>Overview / Samples</dc> - New section.
-	<li><del>org.apache.juneau.transform / Stop Classes</del> - New section.
-	<li><del>org.apache.juneau.rest</del> - Extensive updates.
+	<li><dc>org.apache.juneau.transform / Stop Classes</dc> - New section.
+	<li>{@del org.apache.juneau.rest} - Extensive updates.
 </ul>
diff --git a/juneau-doc/docs/ReleaseNotes/5.2.0.1.html b/juneau-doc/docs/ReleaseNotes/5.2.0.1.html
index 75a3708..3a25f4f 100644
--- a/juneau-doc/docs/ReleaseNotes/5.2.0.1.html
+++ b/juneau-doc/docs/ReleaseNotes/5.2.0.1.html
@@ -25,33 +25,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 {@link oaj.ObjectList}:  
+	<li>New methods on {@del oaj.ObjectList}:  
 		<ul>
-			<li><dc>ObjectList.getAt(Class,String)</dc>
-			<li>{@link oaj.ObjectList#putAt(String,Object)}
-			<li>{@link oaj.ObjectList#postAt(String,Object)}
-			<li>{@link oaj.ObjectList#deleteAt(String)}
+			<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)}
 		</ul>
-	<li>New methods on {@link oaj.ObjectMap}:  
+	<li>New methods on {@del oaj.ObjectMap}:  
 		<ul>
-			<li><dc>ObjectMap.getAt(Class,String)</dc>
-			<li>{@link oaj.ObjectMap#putAt(String,Object)}
-			<li>{@link oaj.ObjectMap#postAt(String,Object)}
-			<li>{@link oaj.ObjectMap#deleteAt(String)}
+			<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)}
 		</ul>
-	<li><dc>@ThreadSafe</dc> annotation.
+	<li>{@del @ThreadSafe} annotation.
 	<li>New <c>ClassFilter</c> class.
-	<li><dc>ConfigFile.getResolving(StringVarResolver,boolean)</dc> method.
-	<li><dc>ConfigFile.getStringVar()</dc> method.
-	<li>New <dc>ParserContext.PARSER_trimStrings</dc> property.
-	<li>New <dc>SerializerContext.SERIALIZER_trimStrings</dc> property.
-	<li><dc>Args.getStringVar()}</dc> method.
+	<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>New {@link oaj.utils.ManifestFile} class
-	<li>New {@link oaj.utils.MessageBundle} class.  Replaces <l>SafeResourceBundle</l>/<l>SafeResourceMultiBundle</l>/<l>RestNls</l>.
-	<li>New <dc>StringMapVar</dc> class.
-	<li>New <dc>StringVars</dc> class with reusable common <dc>StringVar</dc> instances.
-	<li>New {@link oaj.internal.JuneauLogger} class.
-	<li>Default value for <dc>XmlParserContext.XML_trimWhitespace</dc> changed to <jk>true</jk>.			
+	<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>.			
 </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 60c626a..03f402d 100644
--- a/juneau-doc/docs/ReleaseNotes/6.0.0.html
+++ b/juneau-doc/docs/ReleaseNotes/6.0.0.html
@@ -52,17 +52,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>{@link oaj.transform.BeanFilterBuilder#typeName(String)} - Programmatic equivalent to annotation above.
+			<li>{@del oaj.transform.BeanFilterBuilder#typeName(String)} - Programmatic equivalent to annotation above.
 			<li>{@link oaj.BeanContext#BEAN_beanDictionary} - List of bean classes that make up the bean dictionary for lookup
 				during parsing. 
-			<li><dc>BEAN_beanTypePropertyName</dc> - The overridable type property name.  Default is <js>"_type"</js>.
-			<li><dc>@BeanProperty(beanDictionary)</dc> - Define a type dictionary
+			<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 {@link oaj.BeanContext#BEAN_beanDictionary}.
-			<li><dc>SerializerContext.SERIALIZER_addBeanTypeProperties</dc> - Controls whether type properties are serialized.
+			<li>{@del SerializerContext#SERIALIZER_addBeanTypeProperties} - 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 {@link oaj.transform.BeanFilterBuilder} class.
+	<li>Refactor bean filter support to use {@del oaj.transform.BeanFilterBuilder} 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}.
@@ -76,40 +76,40 @@
 	<li>New methods on {@link oaj.parser.Parser}:
 		<ul>
 			<li><c>org.apache.juneau.parser.Parser.createSession(ObjectMap,Method,Object)</c>
-			<li><dc>Parser.getMediaRanges()</dc>
+			<li>{@del Parser#getMediaRanges()}
 		</ul>
 	</li>
 	<li>New methods on {@link oaj.serializer.Serializer}:
 		<ul>
 			<li><c>org.apache.juneau.serializer.Serializer.createSession(ObjectMap,Method)</c>
-			<li><dc>Serializer.getMediaRanges()</dc>
+			<li>{@del Serializer#getMediaRanges()}
 		</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 <dc>ClassUtils.getReadableClassName(Class)</dc>.
+	<li>Serializers and parsers now automatically convert {@link java.lang.Class} objects to readable names via {@del ClassUtils#getReadableClassName(Class)}.
 	<li>Eliminated the <c>ClassFilter</c> class since it's no longer needed.
 	<li>Code and concurrency improvements to {@link oaj.serializer.SerializerGroup} and {@link oaj.parser.ParserGroup}.
-	<li>Various enhancements to <dc>BeanContext.convertToType(Object,Class)</dc>.
+	<li>Various enhancements to {@del BeanContext#convertToType(Object,Class)}.
 	<li>New properties on {@link oaj.html.HtmlSerializer}:
 		<ul>
-			<li><dc>HtmlSerializerContext.HTML_detectLinksInStrings</dc> - Automatically detect hyperlinks in strings.
-			<li><dc>HtmlSerializerContext.HTML_lookForLabelParameters</dc> - Specify anchor text by appending <c>&amp;label=MyLabel</c> to URL.
-			<li><dc>HtmlSerializerContext.HTML_labelParameter</dc> - Specify what URL parameter to use as the anchor text label.
-			<li><dc>HtmlSerializerContext.URI_ANCHOR</dc> option for <dc>HtmlSerializerContext.HTML_uriAnchorText</dc>.				
+			<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}.				
 		</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><dc>ClassMetaExtended</dc> / <dc>ClassMeta.getExtendedMeta(Class)</dc> 
-			<li><dc>BeanMetaExtended</dc> /<dc>BeanMeta.getExtendedMeta(Class)</dc> 
-			<li><dc>BeanPropertyMetaExtended</dc> / <dc>BeanPropertyMeta.getExtendedMeta(Class)</dc> 
+			<li>{@del ClassMetaExtended} / {@del ClassMeta#getExtendedMeta(Class)} 
+			<li>{@del BeanMetaExtended} /{@del BeanMeta#getExtendedMeta(Class)} 
+			<li>{@del BeanPropertyMetaExtended} / {@del BeanPropertyMeta#getExtendedMeta(Class)} 
 		</ul>
 	</li>
-	<li>Renamed <c>@Transform</c> annotation to <dc>@Pojo</dc> so that it can be used for various POJO-related behavior, not just associating transforms.  
+	<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>Introduced {@link oaj.dto.swagger Swagger DTOs}.
 </ul>		
 
@@ -122,47 +122,47 @@
 			<li>Eliminated <c>ResourceOptions</c> and related code.
 			<li>New annotations and related methods:
 				<ul>
-					<li><dc>@RestResource(title)</dc> / {@link oajr.RestInfoProvider#getTitle(RestRequest)}
-					<li><dc>@RestResource(description)</dc> / {@link oajr.RestInfoProvider#getDescription(RestRequest)}
-					<li><dc>@RestResource(termsOfService)</dc> / <dc>RestInfoProvider.getTermsOfService(RestRequest)</dc>
-					<li><dc>@RestResource(contact)</dc> / <dc>RestInfoProvider.getContact(RestRequest)</dc>
-					<li><dc>@RestResource(license)</dc> / <dc>RestInfoProvider.getLicense(RestRequest)</dc>
-					<li><dc>@RestResource(version)</dc> / <dc>RestInfoProvider.getVersion(RestRequest)</dc>
-					<li><dc>@RestResource(tags)</dc> / <dc>RestInfoProvider.getTags(RestRequest)</dc>
-					<li><dc>@RestResource(externalDocs)</dc> / <dc>RestInfoProvidergetExternalDocs(RestRequest)</dc>
-					<li>{@link oajr.annotation.RestMethod#summary() @RestMethod(summary)} / <dc>RestInfoProvider.getMethodSummary(String,RestRequest)</dc>
-					<li>{@link oajr.annotation.RestMethod#description() @RestMethod(description)} /<dc>RestInfoProvider.getMethodDescription(String,RestRequest)</dc>
-					<li><dc>@RestMethod(externalDocs)</dc>
-					<li><dc>@RestMethod(tags)</dc>
-					<li><dc>@RestMethod(deprecated)</dc> 
-					<li><dc>@RestMethod(parameters)</dc> 
-					<li><dc>@RestMethod(responses)</dc>
+					<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)}
 				</ul>
 			</li>					
 		</ul>
-	<li>New <dc>RestServletContext.paramFormat</dc> context property.
+	<li>New {@del RestServletContext#paramFormat} context property.
 	<li>New/updated methods on {@link oajr.RestServlet}:
 		<ul>
-			<li><dc>RestServlet.createProperties()</dc>
-			<li><dc>RestServlet.createBeanContext(ObjectMap,Class[],Class[])</dc>
-			<li><dc>RestServlet.createBeanFilters()</dc>
-			<li><dc>RestServlet.createPojoSwaps()</dc>
-			<li><dc>RestServlet.createParsers(ObjectMap,Class[],Class[])</dc>
-			<li><dc>RestServlet.createUrlEncodingSerializer(ObjectMap,Class[],Class[])</dc>
-			<li><dc>RestServlet.createUrlEncodingParser(ObjectMap,Class[],Class[])</dc>
-			<li><dc>RestServlet.createConverters(ObjectMap)</dc>
-			<li><dc>RestServlet.createDefaultRequestHeaders(ObjectMap)</dc>
-			<li><dc>RestServlet.createDefaultResponseHeaders(ObjectMap)</dc>
-			<li><dc>RestServlet.createEncoders(ObjectMap)</dc>
-			<li><dc>RestServlet.createGuards(ObjectMap)</dc>
-			<li><dc>RestServlet.createMimetypesFileTypeMap(ObjectMap)</dc>
-			<li><dc>RestServlet.createResponseHandlers(ObjectMap)</dc>
+			<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)}
 		</ul>
 	</li>
 	<li>New client-version annotations:
 		<ul>
-			<li><dc>RestResource.clientVersionHeader</dc>  - The name of the header used to identify the client version.
-			<li>{@link oajr.annotation.RestMethod#clientVersion}  - The client version range applied to a Java method.
+			<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.
 		</ul>
 	</li>
 </ul>
@@ -170,5 +170,5 @@
 <h5 class='topic w800'>org.apache.juneau.rest.client</h5>
 <ul class='spaced-list'>
 	<li>Removed the <c>JazzRestClient</c> class.
-	<li>New method <dc>RestClient.setClientVersion(String)</dc>.
+	<li>New method {@del RestClient#setClientVersion(String)}.
 </ul>		
diff --git a/juneau-doc/docs/ReleaseNotes/6.0.1.html b/juneau-doc/docs/ReleaseNotes/6.0.1.html
index 5dbc229..368d71a 100644
--- a/juneau-doc/docs/ReleaseNotes/6.0.1.html
+++ b/juneau-doc/docs/ReleaseNotes/6.0.1.html
@@ -25,11 +25,11 @@
 		<ul>
 			<li>Several fixes to handle obscure edge cases.
 		</ul>
-	<li>New properties in <dc>ParserContext</dc>.
+	<li>New properties in {@del ParserContext}.
 		<ul>
-			<li><dc>ParserContext.PARSER_strict</dc>
-			<li><dc>ParserContext.PARSER_inputStreamCharset</dc>
-			<li><dc>ParserContext.PARSER_fileCharset</dc>
+			<li>{@del ParserContext#PARSER_strict}
+			<li>{@del ParserContext#PARSER_inputStreamCharset}
+			<li>{@del ParserContext#PARSER_fileCharset}
 		</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 f0ae356..54e8500 100644
--- a/juneau-doc/docs/ReleaseNotes/6.1.0.html
+++ b/juneau-doc/docs/ReleaseNotes/6.1.0.html
@@ -43,9 +43,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 <dc>org.apache.juneau.xml</dc> documentation.
+			<li>New support methodology and other improvements to {@del org.apache.juneau.xml} documentation.
 			<li>Eliminated unnecessary <xt>&lt;string&gt;</xt> elements.
-			<li>Eliminated <dc>XmlContentHandler</dc> class.
+			<li>Eliminated {@del XmlContentHandler} 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.
@@ -57,23 +57,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 <dc>org.apache.juneau.html</dc> documentation.
+			<li>New exhaustive support methodology section added to {@del org.apache.juneau.html} documentation.
 		</ul>
-	<li>New HTML5 DTO support:  <dc>org.apache.juneau.dto.html5</dc>.
+	<li>New HTML5 DTO support:  {@del org.apache.juneau.dto.html5}.
 	<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><dc>SerializerContext</dc> and <dc>ParserContext</dc>
+	<li>{@del SerializerContext} and {@del ParserContext}
 		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><dc>BEAN_debug</dc> - Debug setting.  Replaces individual debug properties in the serializer and parser contexts.
-		<li><dc>BEAN_locale</dc> - Specifies a default locale at the context level.
-		<li><dc>BEAN_timeZone</dc> - Specifies a default timezone at the context level.
-		<li><dc>BEAN_mediaType</dc> - Specifies a default media type at the context level.
+		<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.
 	</ul>
 	<li>Improvements to Parser class:  
 	<ul>
@@ -140,29 +140,29 @@
 		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>{@link oaj.transforms.CalendarSwap.ToString},{@link oaj.transforms.DateSwap.ToString} - To {@link java.lang.String Strings} using the {@code Date.toString()} method.
-		<li>{@link oaj.transforms.CalendarSwap.ISO8601DT},{@link oaj.transforms.DateSwap.ISO8601DT} - To ISO8601 date-time strings.
-		<li>{@link oaj.transforms.CalendarSwap.ISO8601DTZ},{@link oaj.transforms.DateSwap.ISO8601DTZ} - Same as <jsf>ISO8601DT</jsf>, except always serializes in GMT.
-		<li>{@link oaj.transforms.CalendarSwap.ISO8601DTP},{@link oaj.transforms.DateSwap.ISO8601DTP} - Same as <jsf>ISO8601DT</jsf> except with millisecond precision.
-		<li>{@link oaj.transforms.CalendarSwap.ISO8601DTPZ},{@link oaj.transforms.DateSwap.ISO8601DTPZ} - Same as <jsf>ISO8601DTZ</jsf> except with millisecond precision.
-		<li>{@link oaj.transforms.CalendarSwap.RFC2822DT},{@link oaj.transforms.DateSwap.RFC2822DT} - To RFC2822 date-time strings.
-		<li>{@link oaj.transforms.CalendarSwap.RFC2822DTZ},{@link oaj.transforms.DateSwap.RFC2822DTZ} - Same as <jsf>RFC2822DT</jsf>, except always serializes in GMT.
-		<li>{@link oaj.transforms.CalendarSwap.RFC2822D},{@link oaj.transforms.DateSwap.RFC2822D} - To RFC2822 date strings.
-		<li>{@link oaj.transforms.CalendarSwap.DateTimeSimple},{@link oaj.transforms.DateSwap.DateTimeSimple} - To simple <js>"yyyy/MM/dd HH:mm:ss"</js> date-time strings.
-		<li>{@link oaj.transforms.CalendarSwap.DateSimple},{@link oaj.transforms.DateSwap.DateSimple} - To simple <js>"yyyy/MM/dd"</js> date strings.
-		<li>{@link oaj.transforms.CalendarSwap.TimeSimple},{@link oaj.transforms.DateSwap.TimeSimple} - To simple <js>"HH:mm:ss"</js> time strings.
-		<li>{@link oaj.transforms.CalendarSwap.DateFull},{@link oaj.transforms.DateSwap.DateFull} - To {@link java.text.DateFormat#FULL} date strings.
-		<li>{@link oaj.transforms.CalendarSwap.DateLong},{@link oaj.transforms.DateSwap.DateLong} - To {@link java.text.DateFormat#LONG} date strings.
-		<li>{@link oaj.transforms.CalendarSwap.DateMedium},{@link oaj.transforms.DateSwap.DateMedium} - To {@link java.text.DateFormat#MEDIUM} date strings.
-		<li>{@link oaj.transforms.CalendarSwap.DateShort},{@link oaj.transforms.DateSwap.DateShort} - To {@link java.text.DateFormat#SHORT} date strings.
-		<li>{@link oaj.transforms.CalendarSwap.TimeFull},{@link oaj.transforms.DateSwap.TimeFull} - To {@link java.text.DateFormat#FULL} time strings.
-		<li>{@link oaj.transforms.CalendarSwap.TimeLong},{@link oaj.transforms.DateSwap.TimeLong} - To {@link java.text.DateFormat#LONG} time strings.
-		<li>{@link oaj.transforms.CalendarSwap.TimeMedium},{@link oaj.transforms.DateSwap.TimeMedium} - To {@link java.text.DateFormat#MEDIUM} time strings.
-		<li>{@link oaj.transforms.CalendarSwap.TimeShort},{@link oaj.transforms.DateSwap.TimeShort} - To {@link java.text.DateFormat#SHORT} time strings.
-		<li>{@link oaj.transforms.CalendarSwap.DateTimeFull},{@link oaj.transforms.DateSwap.DateTimeFull} - To {@link java.text.DateFormat#FULL} date-time strings.
-		<li>{@link oaj.transforms.CalendarSwap.DateTimeLong},{@link oaj.transforms.DateSwap.DateTimeLong} - To {@link java.text.DateFormat#LONG} date-time strings.
-		<li>{@link oaj.transforms.CalendarSwap.DateTimeMedium},{@link oaj.transforms.DateSwap.DateTimeMedium} - To {@link java.text.DateFormat#MEDIUM} date-time strings.
-		<li>{@link oaj.transforms.CalendarSwap.DateTimeShort},{@link oaj.transforms.DateSwap.DateTimeShort} - To {@link java.text.DateFormat#SHORT} date-time strings.
+		<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.
 	</ul>  
 	<li>New method {@link oaj.serializer.SerializerGroup#getSerializerMatch(String)} that returns the matched serializer and media type.
 	<li>New method {@link oaj.parser.ParserGroup#getParserMatch(String)} that returns the matched parser and media type.
@@ -173,14 +173,14 @@
 				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 <dc>@Bean(beanDictionary)</dc> annotation.
+			<li>New {@del @Bean(beanDictionary)} annotation.
 		</ul>
-	<li>Removed restriction on getters and setters to be prefixed with "getX/setX/isX" if a <dc>@BeanProperty(name)</dc> annotation is used.
+	<li>Removed restriction on getters and setters to be prefixed with "getX/setX/isX" if a {@del @BeanProperty(name)} 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 <dc>org.apache.juneau.dto.atom</dc> documentation.
+			<li>Updated {@del org.apache.juneau.dto.atom} documentation.
 		</ul>
 	<li>New {@link oaj.transform.MapSwap} and {@link oaj.transform.StringSwap} classes.
 	<li>New {@link oaj.serializer.WriterSerializer#println(Object)} method.  Useful for debugging purposes.
@@ -200,45 +200,45 @@
 			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 <dc>OutputStreamSerializer.serializeToHex(Object)</dc> method. 
+	<li>Added new {@del OutputStreamSerializer#serializeToHex(Object)} 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 <dc>@Bean(beanDictionary)</dc>
+		and replaced them with the ability to define subtypes using the existing {@del @Bean(beanDictionary)}
 		annotation on parent classes and interfaces.
 		<br>This has the added benefit of simplifying the overall code.
-	<li>The <dc>SerializerContext.SERIALIZER_addBeanTypeProperties</dc> setting is now enabled by default.
+	<li>The {@del SerializerContext#SERIALIZER_addBeanTypeProperties} 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 <dc>SerializerContext.SERIALIZER_useWhitespace</dc> setting.
+		properties into a single {@del SerializerContext#SERIALIZER_useWhitespace} 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><dc>RestRequest.getTimeZone()</dc> method.
+	<li>{@del RestRequest#getTimeZone()} 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><dc>RestRequest.getHeader(String,Class)</dc>
-			<li><dc>RestRequest.getHeader(String,Object,Class)</dc>
-			<li><dc>RestRequest.getHeader(String,Type,Type...)</dc>
-			<li><dc>RestRequest.getQueryParameter(String,Class)</dc>
-			<li><dc>RestRequest.getQueryParameter(String,Object,Class)</dc>
-			<li><dc>RestRequest.getQueryParameter(String,Type,Type...)</dc>
-			<li><dc>RestRequest.getQueryParameter(String,Object,Type,Type...)</dc>
-			<li><dc>RestRequest.getQueryParameters(String,Class)</dc>
-			<li><dc>RestRequest.getQueryParameters(String,Type,Type...)</dc>
-			<li><dc>RestRequest.getFormDataParameter(String,Class)</dc>
-			<li><dc>RestRequest.getFormDataParameter(String,Object,Class)</dc>
-			<li><dc>RestRequest.getFormDataParameters(String,Class)</dc>
-			<li><dc>RestRequest.getFormDataParameter(String,Type,Type...)</dc>
-			<li><dc>RestRequest.getFormDataParameters(String,Type,Type...)</dc>
-			<li><dc>RestRequest.getPathParameter(String,Class)</dc>
-			<li><dc>RestRequest.getPathParameter(String,Type,Type...)</dc>
-			<li><dc>RestRequest.getBody(Class)</dc>
-			<li><dc>RestRequest.getBody(Type,Type...)</dc>
+			<li>{@del RestRequest#getHeader(String,Class)}
+			<li>{@del RestRequest#getHeader(String,Object,Class)}
+			<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,Type,Type...)}
+			<li>{@del RestRequest#getQueryParameter(String,Object,Type,Type...)}
+			<li>{@del RestRequest#getQueryParameters(String,Class)}
+			<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,Type,Type...)}
+			<li>{@del RestRequest#getFormDataParameters(String,Type,Type...)}
+			<li>{@del RestRequest#getPathParameter(String,Class)}
+			<li>{@del RestRequest#getPathParameter(String,Type,Type...)}
+			<li>{@del RestRequest#getBody(Class)}
+			<li>{@del RestRequest#getBody(Type,Type...)}
 		</ul>
-	<li>New methods on {@link oajrc.NameValuePairs}
+	<li>New methods on {@del oajrc.NameValuePairs}
 	<li>Fixed issue where whitespace was not added to UON/URL-Encoding output when <c>&amp;plainText=true</c> specified.
 </ul>
diff --git a/juneau-doc/docs/ReleaseNotes/6.2.0.html b/juneau-doc/docs/ReleaseNotes/6.2.0.html
index 762bc5b..5f51d64 100644
--- a/juneau-doc/docs/ReleaseNotes/6.2.0.html
+++ b/juneau-doc/docs/ReleaseNotes/6.2.0.html
@@ -50,18 +50,18 @@
 			<li>{@link oaj.parser.ParserGroupBuilder}
 			<li>{@link oaj.encoders.EncoderGroupBuilder}
 		</ul>
-	<li>Revamped the config file API to use a build:  <dc>ConfigFileBuilder</dc>.
-	<li>Removed the <dc>Lockable</dc> interface.
+	<li>Revamped the config file API to use a build:  {@del ConfigFileBuilder}.
+	<li>Removed the {@del Lockable} interface.
 	<li>New <c>addBeanTypeProperties</c> setting added to serializers to override the 
-		<dc>SerializerContext.SERIALIZER_addBeanTypeProperties</dc> setting
+		{@del SerializerContext#SERIALIZER_addBeanTypeProperties} setting
 		for individual serializers in a serializer group:
 		<ul>
-			<li><dc>HtmlSerializerContext.HTML_addBeanTypeProperties</dc>
-			<li><dc>JsonSerializerContext.JSON_addBeanTypeProperties</dc>
-			<li><dc>MsgPackSerializerContext.MSGPACK_addBeanTypeProperties</dc>
-			<li><dc>UonSerializerContext.UON_addBeanTypeProperties</dc>
-			<li><dc>XmlSerializerContext.#XML_addBeanTypeProperties</dc>
-			<li><dc>RdfSerializerContext.RDF_addBeanTypeProperties</dc>
+			<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}
 		</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.
@@ -74,7 +74,7 @@
 		<ul>
 			<li>New {@link oaj.dto.swagger.SwaggerBuilder} class.
 			<li>Fluent-style setters added to the Swagger beans.
-			<li>Added Swagger examples <dc>here</dc> and in the <del>org.apache.juneau.dto.swagger</del> javadocs.
+			<li>Added Swagger examples {@del here} and in the {@del org.apache.juneau.dto.swagger} javadocs.
 		</ul>
 	<li>Improvements to {@link oaj.svl.VarResolver}.
 		<ul>
@@ -86,9 +86,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><dc>AList</dc>
-			<li><dc>ASet</dc>
-			<li><dc>AMap</dc>
+			<li>{@del AList}
+			<li>{@del ASet}
+			<li>{@del AMap}
 		</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.
@@ -97,23 +97,23 @@
 			<li>{@link oaj.dto.html5.HtmlElementContainer#getChild(int...)}
 			<li>{@link oaj.dto.html5.HtmlElementMixed#getChild(int...)}
 		</ul>
-	<li>New common serializer setting: <dc>SerializerContext.SERIALIZER_abridged</dc>.
+	<li>New common serializer setting: {@del SerializerContext#SERIALIZER_abridged}.
 	<li>Support for defining interface proxies against 3rd-party REST interfaces.
-		<br>New package <dc>org.apache.juneau.remoteable</dc> for all remoteable proxy interface annotations.
+		<br>New package {@del org.apache.juneau.remoteable} 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: <dc>UrlEncodingSerializerContext.URLENC_paramFormat</dc>.
+	<li>New URL-encoding serializer setting: {@del UrlEncodingSerializerContext#URLENC_paramFormat}.
 	<li>New methods on {@link oaj.urlencoding.UrlEncodingSerializerBuilder}:
 	<ul>
-		<li><dc>UrlEncodingSerializerBuilder.paramFormat(String)</dc>	
-		<li><dc>UrlEncodingSerializerBuilder.plainTextParams()</dc>	
+		<li>{@del UrlEncodingSerializerBuilder#paramFormat(String)}	
+		<li>{@del UrlEncodingSerializerBuilder#plainTextParams()}	
 	</ul> 		
 </ul>
 
 <h5 class='topic w800'>org.apache.juneau.rest</h5>
 <ul class='spaced-list'>
-	<li><dc>@RestResource</dc> annotation can now be applied to 
+	<li>{@del @RestResource} annotation can now be applied to 
 		any class!  You're no longer restricted to subclassing your resources from {@link oajr.RestServlet}.
 		<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.
@@ -122,20 +122,20 @@
 		<br><br>
 		The majority of code has been split up into two separate classes:
 		<ul>
-			<li><dc>RestConfig</dc> - A modifiable configuration of a resource.  Subclasses from {@link javax.servlet.ServletConfig}.
+			<li>{@del RestConfig} - 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 {@link oajr.RestServlet} class now has the following initialization method that allows you to override
 		the config settings define via annotations:
 		<ul>
-			<li><dc>RestServlet.init(RestConfig)</dc> - A modifiable configuration of a resource.
+			<li>{@del RestServlet#init(RestConfig)} - 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 {@link oajr.RestResourceResolver} for instantiating it.
+			<li>The parent resource must have a customized {@del oajr.RestResourceResolver} 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:
@@ -143,27 +143,27 @@
 			<li><dc><jk>public</jk> init(RestConfig)</dc>
 			<li><dc><jk>public</jk> init(RestContext)</dc>
 		</ul>
-	<li>New annotations added to <dc>@RestResource</dc> to allow non-<c>RestServlet</c>
+	<li>New annotations added to {@del @RestResource} to allow non-<c>RestServlet</c>
 		resources to do the same as subclassing directly from <c>RestServlet</c>:
 		<ul>
-			<li><dc>RestResource.resourceResolver()</dc> 
-				- Specify a {@link oajr.RestResourceResolver} class for resolving child resources.
-			<li><dc>RestResource.callHandler()</dc> 
-				- Specify a {@link oajr.RestCallHandler} class for handling the lifecycle of a REST call.
-			<li><dc>RestResource.infoProvider()</dc> 
-				- Specify a {@link oajr.RestInfoProvider} class for customizing title/description/Swagger information on a REST resource.
-			<li><dc>RestResource.logger()</dc> 
-				- Specify a {@link oajr.RestLogger} class for handling logging.
+			<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.
 		</ul>
-	<li>New annotations added to <dc>@RestResource</dc> and {@link oajr.annotation.RestMethod @RestMethod}
+	<li>New annotations added to {@del @RestResource} and {@del oajr.annotation.RestMethod @RestMethod}
 		to simplify defining page title, text, and links on HTML views:
 		<ul>
-			<li><dc>@RestResource(pageTitle)</dc>
-			<li><dc>@RestMethod(pageTitle)</dc> 
-			<li><dc>@RestResource(pageText)</dc> 
-			<li><dc>@RestMethod(pageText)</dc> 
-			<li><dc>@RestResource(pageLinks)</dc> 
-			<li><dc>@RestMethod(pageLinks)</dc> 
+			<li>{@del @RestResource(pageTitle)}
+			<li>{@del @RestMethod(pageTitle)} 
+			<li>{@del @RestResource(pageText)} 
+			<li>{@del @RestMethod(pageText)} 
+			<li>{@del @RestResource(pageLinks)} 
+			<li>{@del @RestMethod(pageLinks)} 
 		</ul>				
 		<p class='bcode w800'>
 	<jc>// Old method</jc>
@@ -193,11 +193,11 @@
 		pageLinks=<js>"{up:'$R{requestParentURI}',options:'?method=OPTIONS'}"</js>
 	)
 		</p>
-	<li><dc>RestResource.stylesheet()</dc> can now take in a comma-delimited list of stylesheet paths.
-	<li><dc>StreamResource</dc> 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 <dc>StreamResourceBuilder</dc> class.
+	<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>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 <dc>RemoteableServlet</dc>.
+		Used to expose interface proxies without the need for {@del RemoteableServlet}.
 	<p class='bcode w800'>
 	<jc>// Server side</jc>
 	<ja>@RestMethod</ja>(name=<js>"PROXY"</js>, path=<js>"/myproxy/*"</js>)
@@ -209,84 +209,84 @@
 	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 {@link oajr.annotation.RestMethod#name() @RestMethod(name)} for more information.
+		See {@del oajr.annotation.RestMethod#name() @RestMethod(name)} 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>{@link oajr.annotation.RestMethod#name() @RestMethod(name)} annotation is now optional.  Defaults to <js>"GET"</js>.
+	<li>{@del oajr.annotation.RestMethod#name() @RestMethod(name)} annotation is now optional.  Defaults to <js>"GET"</js>.
 </ul>
 
 <h5 class='topic w800'>org.apache.juneau.rest.client</h5>
 <ul class='spaced-list'>
 	<li>Revamped the client API to use builders.
-	<li>New doc: <del>1.5 - Debugging</del>
+	<li>New doc: <dc>1.5 - Debugging</dc>
 	<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><dc>RestClient.getRemoteableProxy(Class,Object)</dc> - For interface proxies defined using <c><ja>@RestMethod</ja>(name=<js>"PROXY"</js>)</c>.
-		<li><dc>RestClient.getRemoteableProxy(Class,Object,Serializer,Parser)</dc> - Same as above, but overrides the serializer and parser defined on the client.
-		<li>{@link oajrc.RestClient#doPost(Object) doPost(Object)} 
-		<li>{@link oajrc.RestClient#doCall(HttpMethod,Object,Object) doCall(HttpMethod,Object,Object)} - Can now pass in instances of {@link oajrc.NameValuePairs} for easy form posts.
+		<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.
 			<br>This extends to all methods that take in the input.
 	</ul>
-	<li>New methods on {@link oajrc.RestCall}:
+	<li>New methods on {@del oajrc.RestCall}:
 		<ul>
-			<li>{@link oajrc.RestCall#uri(Object) uri(Object)}
-			<li><dc>query(String,Object,boolean,PartSerializer)</dc>
-			<li>{@link oajrc.RestCall#query(String,Object) query(String,Object)}
-			<li>{@link oajrc.RestCall#queryIfNE(String,Object) queryIfNE(String,Object)}
-			<li>{@link oajrc.RestCall#query(Map) query(Map)}
-			<li>{@link oajrc.RestCall#queryIfNE(Map) queryIfNE(Map)}
-			<li>{@link oajrc.RestCall#query(String) query(String)}
-			<li><dc>formData(String,Object,boolean,PartSerializer)</dc>
-			<li>{@link oajrc.RestCall#formData(String,Object) formData(String,Object)}
-			<li>{@link oajrc.RestCall#formDataIfNE(String,Object) formDataIfNE(String,Object)}
-			<li>{@link oajrc.RestCall#formData(Map) formData(Map)}
-			<li>{@link oajrc.RestCall#formDataIfNE(Map) formDataIfNE(Map)}
-			<li><dc>header(String,Object,boolean,PartSerializer)</dc>
-			<li>{@link oajrc.RestCall#header(String,Object) header(String,Object)}
-			<li>{@link oajrc.RestCall#headerIfNE(String,Object) headerIfNE(String,Object)}
-			<li>{@link oajrc.RestCall#headers(Map) headers(Map)}
-			<li>{@link oajrc.RestCall#headersIfNE(Map) headersIfNE(Map)}
-			<li>{@link oajrc.RestCall#host(String) host(String)}
-			<li>{@link oajrc.RestCall#port(int) port(int)}
-			<li>{@link oajrc.RestCall#userInfo(String,String) userInfo(String,String)}
-			<li>{@link oajrc.RestCall#userInfo(String) userInfo(String)}
-			<li>{@link oajrc.RestCall#scheme(String) scheme(String)}
+			<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)}
 		</ul>
 	<li>New methods added to {@link oajrc.RestClientBuilder}:
 		<ul>
 			<li>{@link oajrc.RestClientBuilder#executorService(ExecutorService,boolean) executorService(ExecutorService,boolean)}
-			<li>{@link oajrc.RestClientBuilder#paramFormat(String) paramFormat(ExecutorService,boolean)}
-			<li><dc>RestClientBuilder.plainTextParams()</dc>
+			<li>{@del RestClientBuilder#paramFormat(String)}
+			<li>{@del RestClientBuilder#plainTextParams()}
 			<li>{@link oajrc.RestClientBuilder#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.RestClientBuilder#debug() debug()} now adds a <c>Debug: true</c> header on all requests.
 		</ul>
-	<li>New methods added/updated to {@link oajrc.RestCall}:
+	<li>New methods added/updated to {@del oajrc.RestCall}:
 		<ul>
-			<li>{@link oajrc.RestCall#runFuture() runFuture()}
-			<li>{@link oajrc.RestCall#getResponseFuture(Class) getResponseFuture(Class)}
-			<li>{@link oajrc.RestCall#getResponseFuture(Type,Type...) getResponseFuture(Type,Type...)}
-			<li>{@link oajrc.RestCall#getResponseAsStringFuture() getResponseAsStringFuture()}
-			<li>{@link oajrc.RestCall#serializer(Serializer) serializer(Serializer)} - Override the serializer defined on the client for a single call.
-			<li>{@link oajrc.RestCall#parser(Parser) parser(Parser)} - Override the parser defined on the client for a single call.
-			<li><dc>input(Object)</dc> - Now accepts instances of {@link oajrc.NameValuePairs}.
-			<li>{@link oajrc.RestCall#getResponse(Class) getResponse(Class)} - Can now pass in any of the following:
+			<li>{@del oajrc.RestCall#runFuture() runFuture()}
+			<li>{@del oajrc.RestCall#getResponseFuture(Class) getResponseFuture(Class)}
+			<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:
 				<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 {@link oajrc.NameValuePairs}:
+	<li>New methods added to {@del oajrc.NameValuePairs}:
 		<ul>
-			<li>{@link oajrc.NameValuePairs#append(String,Object) append(String,Object)}
-			<li><dc>append(String,Object,PartSerializer)</dc>
+			<li>{@del oajrc.NameValuePairs#append(String,Object) append(String,Object)}
+			<li>{@del append(String,Object,PartSerializer)}
 		</ul>
-	<li>{@link oajrc.RetryOn} is now an abstract class with an additional method:
+	<li>{@del oajrc.RetryOn} is now an abstract class with an additional method:
 		<ul>
-			<li>{@link oajrc.RetryOn#onResponse(HttpResponse) onResponse(HttpResponse)}
+			<li>{@del oajrc.RetryOn#onResponse(HttpResponse) onResponse(HttpResponse)}
 		</ul>			
 </ul>
 
@@ -294,10 +294,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 <dc>RestMicroservice</dc> class:
+	<li>Methods added to {@del RestMicroservice} class:
 	<ul>
-		<li><dc>getPort()</dc>
-		<li><dc>getURI()</dc>
+		<li>{@del getPort()}
+		<li>{@del getURI()}
 		<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 204d70b..3b1c703 100644
--- a/juneau-doc/docs/ReleaseNotes/6.3.0.html
+++ b/juneau-doc/docs/ReleaseNotes/6.3.0.html
@@ -25,7 +25,7 @@
 	<li>
 		New package:  {@link oaj.http}.
 	<li>
-		Support for dynamic beans.  See <dc>@BeanProperty(name)</dc>.
+		Support for dynamic beans.  See {@del @BeanProperty(name)}.
 	<li>
 		New doc: <dc>2.8 - Virtual Beans</dc>
 	<li>
@@ -37,47 +37,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 <dc>ConfigFile</dc>:
+	<li>New/modified methods on {@del ConfigFile}:
 		<ul>
-			<li><dc>ConfigFile.put(String,String,String,boolean)</dc>
-			<li><dc>ConfigFile.put(String,String,Object,Serializer,boolean,boolean)</dc>
-			<li><dc>ConfigFile.getObject(String,Type,Type...)</dc>
-			<li><dc>ConfigFile.getObject(String,Parser,Type,Type...)</dc>
-			<li><dc>ConfigFile.getObject(String,Class)</dc>
-			<li><dc>ConfigFile.getObject(String,Parser,Class)</dc>
-			<li><dc>ConfigFile.getObject(String,String,Type,Type...)</dc>
-			<li><dc>ConfigFile.getObject(String,String,Parser,Type,Type...)</dc>
-			<li><dc>ConfigFile.getObject(String,String,Class)</dc>
-			<li><dc>ConfigFile.getObject(String,String,Parser,Class)</dc>
-			<li><dc>ConfigFile.getObjectWithDefault(String,Object,Type,Type...)</dc> 
-			<li><dc>ConfigFile.getObjectWithDefault(String,Parser,Object,Type,Type...)</dc>
-			<li><dc>ConfigFile.getObjectWithDefault(String,Object,Class)</dc>
-			<li><dc>ConfigFile.getObjectWithDefault(String,Parser,Object,Class)</dc> 
+			<li>{@del ConfigFile#put(String,String,String,boolean)}
+			<li>{@del ConfigFile#put(String,String,Object,Serializer,boolean,boolean)}
+			<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,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#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)} 
 		</ul>
-	<li>New ability to interact with config file sections with proxy interfaces with new method <dc>ConfigFile.getSectionAsInterface(String,Class)</dc>.
-	<li><dc>@BeanProperty</dc> 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)}.
+	<li>{@del @BeanProperty} 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><dc>Session.getProperty(String)</dc>
-			<li><dc>Session.getProperty(String,String)</dc>
-			<li><dc>Session.getProperty(Class,String)</dc>
-			<li><dc>Session.getProperty(Class,String,Object)</dc>
+			<li>{@del Session#getProperty(String)}
+			<li>{@del Session#getProperty(String,String)}
+			<li>{@del Session#getProperty(Class,String)}
+			<li>{@del Session#getProperty(Class,String,Object)}
 		</ul>	
-	<li>New <dc>org.apache.juneau.serializer.PartSerializer</dc> interface particularly tailored to HTTP
+	<li>New {@del org.apache.juneau.serializer.PartSerializer} 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><dc>org.apache.juneau.rest.client.RestClientBuilder.partSerializer(Class)</dc> 
-			<li><dc>org.apache.juneau.remoteable.Path.serializer</dc> 
-			<li><dc>org.apache.juneau.remoteable.Query.serializer</dc> 
-			<li><dc>org.apache.juneau.remoteable.QueryIfNE.serializer</dc> 
-			<li><dc>org.apache.juneau.remoteable.FormData.serializer</dc> 
-			<li><dc>org.apache.juneau.remoteable.FormDataIfNE.serializer</dc> 
-			<li><dc>org.apache.juneau.remoteable.Header.serializer</dc> 
-			<li><dc>org.apache.juneau.remoteable.HeaderIfNE.serializer</dc> 
+			<li>{@del org.apache.juneau.rest.client.RestClientBuilder#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}
 		</ul>
 	<li>Across-the-board improvements to the URI-resolution support (i.e. how URIs get serialized).
 		<ul>
@@ -99,7 +99,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 {@link oaj.annotation.URI @URI}.
+				annotated with {@del oaj.annotation.URI @URI}.
 			<li>New classes:
 				<ul>
 					<li>{@link oaj.UriContext}
@@ -108,12 +108,12 @@
 					<li>{@link oaj.UriResolver}
 				</ul>
 			<li>New configuration properties:
-				<li><dc>SerializerContext.SERIALIZER_uriContext</dc>
-				<li><dc>SerializerContext.SERIALIZER_uriRelativity</dc>
-				<li><dc>SerializerContext.SERIALIZER_uriResolution</dc>
-				<li><dc>SerializerContext.SERIALIZER_maxIndent</dc>
+				<li>{@del SerializerContext#SERIALIZER_uriContext}
+				<li>{@del SerializerContext#SERIALIZER_uriRelativity}
+				<li>{@del SerializerContext#SERIALIZER_uriResolution}
+				<li>{@del SerializerContext#SERIALIZER_maxIndent}
 		</ul>
-	<li>New annotation property: <dc>@BeanProperty(value)</dc>.
+	<li>New annotation property: {@del @BeanProperty(value)}.
 		<br>The following two annotations are considered equivalent:
 		<p class='bcode w800'>
 	<ja>@BeanProperty</ja>(name=<js>"foo"</js>)
@@ -121,23 +121,23 @@
 	<ja>@BeanProperty</ja>(<js>"foo"</js>)
 		</p>
 	<li>Fixed a race condition in ClassMeta.
-	<li><jsf>URLENC_paramFormat</jsf> has been moved to <dc>UonSerializer.UON_paramFormat</dc>, 
+	<li><jsf>URLENC_paramFormat</jsf> has been moved to {@del UonSerializer#UON_paramFormat}, 
 		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.SerializerBuilder#listener(Class)}
-			<li><dc>@RestResource(serializerListener)</dc>
-			<li><dc>RestConfig.serializerListener(Class)</dc>
+			<li>{@del @RestResource(serializerListener)}
+			<li>{@del RestConfig#serializerListener(Class)}
 			<li>{@link oaj.parser.ParserListener}
 			<li>{@link oaj.parser.ParserBuilder#listener(Class)}
-			<li><dc> @RestResource(parserListener)</dc>
-			<li><dc>RestConfig.parserListener(Class)</dc>
-			<li><dc>RestClientBuilder.listeners(Class,Class)</dc>
+			<li>{@del @RestResource(parserListener)}
+			<li>{@del RestConfig#parserListener(Class)}
+			<li>{@del RestClientBuilder#listeners(Class,Class)}
 		</ul>juneau-examples-core.import1.pngjuneau-examples-core.import1.png
-	<li>The <dc>BEAN_debug</dc> flag will now capture parser input and make it
-		available through the <dc>ParserSession.getInputAsString()</dc> method so that it can be used
+	<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
 		in the listeners.
 	<li>Significant new functionality introduced to the HTML serializer.  
 		<br>Lots of new options for customizing the HTML output.
@@ -148,17 +148,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><dc>HtmlDocSerializerContext.HTMLDOC_title</dc>
-					<li><dc>HtmlDocSerializerContext.HTMLDOC_description</dc>
-					<li><dc>HtmlDocSerializerContext.HTMLDOC_branding</dc>
-					<li><dc>HtmlDocSerializerContext.HTMLDOC_header</dc>
-					<li><dc>HtmlDocSerializerContext.HTMLDOC_nav</dc>
-					<li><dc>HtmlDocSerializerContext.HTMLDOC_aside</dc>
-					<li><dc>HtmlDocSerializerContext.HTMLDOC_footer</dc>
-					<li><dc>HtmlDocSerializerContext.HTMLDOC_noResultsMessage</dc>
-					<li><dc>HtmlDocSerializerContext.HTMLDOC_cssUrl</dc>
-					<li><dc>HtmlDocSerializerContext.HTMLDOC_css</dc>
-					<li><dc>HtmlDocSerializerContext.HTMLDOC_template</dc>
+					<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}
 				</ul>
 			<li>New interface {@link oaj.html.HtmlDocTemplate} that allows full control over rendering
 				of HTML produced by {@link oaj.html.HtmlDocSerializer}.
@@ -168,10 +168,10 @@
 		can now be applied to fields.  
 	<li>New properties on {@link oaj.BeanContext}:
 		<ul>
-			<li><dc>BEAN_includeProperties</dc>
-			<li><dc>BEAN_excludeProperties</dc>
+			<li>{@del BEAN_includeProperties}
+			<li>{@del BEAN_excludeProperties}
 		</ul>
-	<li>New annotation property: <dc>@BeanProperty(format)</dc>.
+	<li>New annotation property: {@del @BeanProperty(format)}.
 </ul>
 
 <h5 class='topic w800'>org.apache.juneau.rest</h5>
@@ -184,9 +184,9 @@
 		<ul>
 			<li>{@link oajr.RestRequest#getBody()} - The request body.
 			<li>{@link oajr.RestRequest#getHeaders()} - The request headers.
-			<li>{@link oajr.RestRequest#getQuery()} - The request query parameters.
-			<li>{@link oajr.RestRequest#getFormData()} - The request form data parameters.
-			<li>{@link oajr.RestRequest#getPathMatch()} - The path variables and remainder.
+			<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.
 		</ul>	
 		The following classes have been introduced:
 		<ul>
@@ -207,34 +207,34 @@
 		</ul>
 		The new supported types are:
 		<ul>
-			<li><dc>Accept</dc>
-			<li><dc>AcceptCharset</dc>
-			<li><dc>AcceptEncoding</dc>
-			<li><dc>AcceptLanguage</dc>
-			<li><dc>Authorization</dc>
-			<li><dc>CacheControl</dc>
-			<li><dc>Connection</dc>
-			<li><dc>ContentLength</dc>
-			<li><dc>ContentType</dc>
-			<li><dc>Date</dc>
-			<li><dc>Expect</dc>
-			<li><dc>From</dc>
-			<li><dc>Host</dc>
-			<li><dc>IfMatch</dc>
-			<li><dc>IfModifiedSince</dc>
-			<li><dc>IfNoneMatch</dc>
-			<li><dc>IfRange</dc>
-			<li><dc>IfUnmodifiedSince</dc>
-			<li><dc>MaxForwards</dc>
-			<li><dc>Pragma</dc>
-			<li><dc>ProxyAuthorization</dc>
-			<li><dc>Range</dc>
-			<li><dc>Referer</dc>
-			<li><dc>TE</dc>
-			<li><dc>UserAgent</dc>
-			<li><dc>Upgrade</dc>
-			<li><dc>Via</dc>
-			<li><dc>Warning</dc>
+			<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>{@link java.util.TimeZone}
 			<li>{@link java.io.InputStream}
 			<li>{@link javax.servlet.ServletInputStream}
@@ -243,7 +243,7 @@
 			<li>{@link javax.servlet.ServletOutputStream}
 			<li>{@link java.io.Writer}
 			<li>{@link java.util.ResourceBundle} - Client-localized resource bundle.
-			<li>{@link oaj.utils.MessageBundle} - A resource bundle with additional features.
+			<li>{@del oaj.utils.MessageBundle} - A resource bundle with additional features.
 			<li>{@link java.util.Locale} - Client locale.
 			<li>{@link oajr.RequestHeaders} - API for accessing request headers.
 			<li>{@link oajr.RequestQuery} - API for accessing request query parameters.
@@ -252,11 +252,11 @@
 			<li>{@link oajr.RequestBody} - 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>{@link oaj.internal.JuneauLogger} - Logger with additional features.
+			<li>{@del oaj.internal.JuneauLogger} - 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><dc>ConfigFile</dc> - The external config file for the resource.
+			<li>{@del ConfigFile} - The external config file for the resource.
 		</ul>
 		So, for example...
 		<p class='bcode w800'>
@@ -285,84 +285,84 @@
 	)
 		</p>
 	<li>
-		A new annotation <dc>@RestResource(paramResolvers)</dc>}
+		A new annotation {@del @RestResource(paramResolvers)}}
 		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 {@link oajr.annotation.RestMethod @RestMethod}:
+		New annotations added to {@del oajr.annotation.RestMethod @RestMethod}:
 		<ul>
-			<li>{@link oajr.annotation.RestMethod#defaultQuery() defaultQuery()}
-			<li>{@link oajr.annotation.RestMethod#defaultFormData() defaultFormData()}
-			<li><dc>bpIncludes()</dc>
-			<li><dc>bpExcludes()</dc>
+			<li>{@del oajr.annotation.RestMethod#defaultQuery() defaultQuery()}
+			<li>{@del oajr.annotation.RestMethod#defaultFormData() defaultFormData()}
+			<li>{@del bpIncludes()}
+			<li>{@del bpExcludes()}
 		</ul>
 	<li>
 		Default values on header, query, and form-data annotations:
 		<ul>
-			<li><dc>@Header(def)</dc> - Default header value.
-			<li><dc>@Query(def)</dc> - Default query parameter value.
-			<li><dc>@FormData(def)</dc> - Default form data parameter value.
+			<li>{@del @Header(def)} - Default header value.
+			<li>{@del @Query(def)} - Default query parameter value.
+			<li>{@del @FormData(def)} - Default form data parameter value.
 		</ul>
 	<li>
-		New attributes on <dc>@RestResource</dc>:
+		New attributes on {@del @RestResource}:
 		<ul>
-			<li><dc>serializerListener()</dc>
-			<li><dc>parserListener()</dc>
-			<li><dc>widgets()</dc>
-			<li><dc>swagger()</dc>
-			<li><dc>htmldoc()</dc>
+			<li>{@del serializerListener()}
+			<li>{@del parserListener()}
+			<li>{@del widgets()}
+			<li>{@del swagger()}
+			<li>{@del htmldoc()}
 		</ul>
 	<li>
-		New attributes on {@link oajr.annotation.RestMethod @RestMethod}:
+		New attributes on {@del oajr.annotation.RestMethod @RestMethod}:
 		<ul>
-			<li><dc>widgets()</dc>
-			<li>{@link oajr.annotation.RestMethod#swagger() swagger()}
-			<li>{@link oajr.annotation.RestMethod#htmldoc() htmldoc()}
+			<li>{@del widgets()}
+			<li>{@del oajr.annotation.RestMethod#swagger() swagger()}
+			<li>{@del oajr.annotation.RestMethod#htmldoc() htmldoc()}
 		</ul>
 	<li>
 		New string vars:
 		<ul>
 			<li>{@link oajr.vars.UrlVar} - Resolve <js>"$U{...}"</js> variables to URLs.
-			<li>{@link oajr.vars.WidgetVar} - Resolve <js>"$W{...}"</js> variables to widget contents.
+			<li>{@del oajr.vars.WidgetVar} - Resolve <js>"$W{...}"</js> variables to widget contents.
 		</ul>
 	<li>
-		New methods on <dc>RestConfig</dc>:
+		New methods on {@del RestConfig}:
 		<ul>
-			<li><dc>setHtmlTitle(String)</dc>
-			<li><dc>setHtmlDescription(String)</dc>
-			<li><dc>setHtmlBranding(String)</dc>
-			<li><dc>setHtmlHeader(String)</dc>
-			<li><dc>setHtmlLinks(String)</dc>
-			<li><dc>setHtmlNav(String)</dc>
-			<li><dc>setHtmlAside(String)</dc>
-			<li><dc>setHtmlFooter(String)</dc>
-			<li><dc>setHtmlCss(String)</dc>
-			<li><dc>setHtmlCssUrl(String)</dc>
-			<li><dc>setHtmlNoWrap(boolean)</dc>
-			<li><dc>setHtmlNoResultsMessage(String)</dc>
-			<li><dc>setHtmlTemplate(Class)</dc>
-			<li><dc>setHtmlTemplate(HtmlDocTemplate)</dc>
-			<li><dc>addWidget(Class)</dc>
+			<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)}
 		</ul>
 	<li>
 		New methods on {@link oajr.RestResponse}:
 		<ul>
-			<li><dc>setHtmlTitle(Object)</dc>
-			<li><dc>setHtmlDescription(Object)</dc>
-			<li><dc>setHtmlBranding(Object)</dc>
-			<li><dc>setHtmlHeader(Object)</dc>
-			<li><dc>setHtmlLinks(Object)</dc>
-			<li><dc>setHtmlNav(Object)</dc>
-			<li><dc>setHtmlAside(Object)</dc>
-			<li><dc>setHtmlFooter(Object)</dc>
-			<li><dc>setHtmlCss(Object)</dc>
-			<li><dc>setHtmlCssUrl(Object)</dc>
-			<li><dc>setHtmlNoWrap(boolean)</dc>
-			<li><dc>setHtmlNoResultsMessage(Object)</dc>
-			<li><dc>setHtmlTemplate(Class)</dc>
-			<li><dc>setHtmlTemplate(HtmlDocTemplate)</dc>
+			<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)}
 		</ul>
 	<li>
 		<c>&amp;plainText=true</c> parameter now works on byte-based serializers by converting the output to hex.
@@ -370,10 +370,10 @@
 		New classes for widget support:
 		<ul>
 			<li>{@link oajr.widget.Widget}
-			<li><dc>PoweredByJuneauWidget</dc>
-			<li><dc>ContentTypeLinksColumnWidget</dc>
-			<li><dc>ContentTypeLinksRowWidget</dc>
-			<li><dc>QueryWidget</dc>
+			<li>{@del PoweredByJuneauWidget}
+			<li>{@del ContentTypeLinksColumnWidget}
+			<li>{@del ContentTypeLinksRowWidget}
+			<li>{@del QueryWidget}
 		</ul>
 	<li>
 		<c>devops.css</c> cleaned up.
@@ -396,16 +396,16 @@
 <h5 class='topic w800'>org.apache.juneau.rest.client</h5>
 <ul class='spaced-list'>
 	<li>
-		New <dc>org.apache.juneau.remoteable.Path</dc> annotation for specifying path variables on remoteable interfaces.
+		New {@del org.apache.juneau.remoteable.Path} annotation for specifying path variables on remoteable interfaces.
 	<li>
-		New <dc>@RequestBean</dc> annotation for specifying beans with remoteable annotations
+		New {@del @RequestBean} 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><dc>org.apache.juneau.remoteable.FormData</dc>,<dc>org.apache.juneau.remoteable.FormDataIfNE</dc>,
-		<dc>org.apache.juneau.remoteable.Query</dc>,<dc>org.apache.juneau.remoteable.QueryIfNE</dc>,
-		<dc>org.apache.juneau.remoteable.Header</dc>,<dc>org.apache.juneau.remoteable.HeaderIfNE</dc> 
+		<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} 
 </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 d35439a..d6f6b93 100644
--- a/juneau-doc/docs/ReleaseNotes/6.3.1.html
+++ b/juneau-doc/docs/ReleaseNotes/6.3.1.html
@@ -24,23 +24,23 @@
 	<li>
 		{@link oaj.utils.PojoQuery} improvements.
 	<li>
-		New <dc>RemoteMethod.returns()</dc> annotation.
+		New {@del RemoteMethod#returns()} annotation.
 		<br>Allows you to specify whether the remote method returns the HTTP body or status code.
 	<li>
-		Fixed bugs with <dc>BEAN_includeProperties</dc> and <dc>BEAN_excludeProperties</dc> settings.
+		Fixed bugs with {@del BEAN_includeProperties} and {@del BEAN_excludeProperties} settings.
 	<li>
-		New/modified settings in <dc>HtmlDocSerializerContext</dc>:
+		New/modified settings in {@del HtmlDocSerializerContext}:
 		<ul>
-			<li><dc>HTMLDOC_script</dc>
-			<li><dc>HTMLDOC_style</dc> - Was <jsf>HTMLDOC_css</jsf>.
-			<li><dc>HTMLDOC_stylesheet</dc> - Was <jsf>HTMLDOC_cssUrl</jsf>.  Now an array.
+			<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.
 		</ul>
 	<li>
-		New <dc>ResourceFinder</dc> utility class.
+		New {@del ResourceFinder} 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 <dc>HtmlDocSerializerContext</dc>:
+		Eliminated the following properties from {@del HtmlDocSerializerContext}:
 		<jsf>HTMLDOC_title</jsf>, <jsf>HTMLDOC_description</jsf>, <jsf>HTMLDOC_description</jsf>
 		<br>See below on changes to simplify HTML headers.
 	<li>
@@ -64,7 +64,7 @@
 	<li>
 		Modifications to the following <ja>@HtmlDoc</ja> annotations:
 		<ul>
-			<li>{@link oajr.annotation.HtmlDoc#navlinks() navlinks()} - Now an array of strings instead of a JSON object.  Simplified syntax.
+			<li>{@del oajr.annotation.HtmlDoc#navlinks() navlinks()} - Now an array of strings instead of a JSON object.  Simplified syntax.
 				<br>For example:
 				<p class='bcode w800'>
 	<jc>// Old syntax</jc>
@@ -93,12 +93,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>{@link oajr.annotation.HtmlDoc#header() header()}
-					<li>{@link oajr.annotation.HtmlDoc#nav() nav()}
-					<li>{@link oajr.annotation.HtmlDoc#aside() aside()}
-					<li>{@link oajr.annotation.HtmlDoc#footer() footer()}
-					<li>{@link oajr.annotation.HtmlDoc#script() script()}
-					<li>{@link oajr.annotation.HtmlDoc#style() style()}
+					<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()}
 				</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
@@ -110,14 +110,14 @@
 			<li>
 				You can now add arbitrary CSS and Javascript along with your widgets through new methods:
 				<ul>
-					<li><dc>Widget#getHtml(RestRequest)</dc>
-					<li><dc>Widget#getScript(RestRequest)</dc>
-					<li><dc>Widget#getStyle(RestRequest)</dc>
+					<li>{@del Widget#getHtml(RestRequest)}
+					<li>{@del Widget#getScript(RestRequest)}
+					<li>{@del Widget#getStyle(RestRequest)}
 				</ul>
 			</li>
 			<li>
-				Declaration of widgets moved to {@link oajr.annotation.HtmlDoc#widgets() @HtmlDoc(widgets)} 
-				instead of separately on <dc>@RestResource</dc> and <ja>@RestMethod</ja> annotations.
+				Declaration of widgets moved to {@del oajr.annotation.HtmlDoc#widgets() @HtmlDoc(widgets)} 
+				instead of separately on {@del @RestResource} 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>.
@@ -144,37 +144,37 @@
 				<br><img src='doc-files/ReleaseNotes.631.StyleMenuItem.png'>
 		</ul>
 	<li>
-		New/modified annotations on {@link oajr.annotation.HtmlDoc @HtmlDoc}:
+		New/modified annotations on {@del oajr.annotation.HtmlDoc @HtmlDoc}:
 		<ul>
-			<li>{@link oajr.annotation.HtmlDoc#style() style()} - Renamed from <c>css()</c>.
-			<li>{@link oajr.annotation.HtmlDoc#stylesheet() stylesheet()} - Renamed from <c>cssUrl()</c>.
+			<li>{@del oajr.annotation.HtmlDoc#style() style()} - Renamed from <c>css()</c>.
+			<li>{@del oajr.annotation.HtmlDoc#stylesheet() stylesheet()} - Renamed from <c>cssUrl()</c>.
 				<br>Can now be a comma-delimited list of URLs.
-			<li>{@link oajr.annotation.HtmlDoc#script() script()} - Add arbitrary Javascript to page header.
+			<li>{@del oajr.annotation.HtmlDoc#script() script()} - Add arbitrary Javascript to page header.
 		</ul>
 
 	<li>
-		Bug fix with {@link oajr.annotation.HtmlDoc#nowrap() @HtmlDoc(nowrap)} so that the setting only applies
+		Bug fix with {@del oajr.annotation.HtmlDoc#nowrap() @HtmlDoc(nowrap)} 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>{@link oajr.RestRequest#attr(String,Object) attr(String,Object)}
-			<li>{@link oajr.RestRequest#prop(String,Object) prop(String,Object)}
+			<li>{@del RestRequest#attr(String,Object)}
+			<li>{@del RestRequest#prop(String,Object)}
 		</ul>
 	</li>
 	<li>
 		Annotations added:
 		<ul>
-			<li><dc>@RestResource(siteName)</dc>
-			<li><dc>@RestResource(flags)</dc>
-			<li>{@link oajr.annotation.RestMethod#flags() @RestMethod(flags)}
+			<li>{@del @RestResource(siteName)}
+			<li>{@del @RestResource(flags)}
+			<li>{@del oajr.annotation.RestMethod#flags() @RestMethod(flags)}
 		</ul>
 	</li>
 	<li>
-		Eliminated the <dc>@RestResource(stylesheet)</dc> annotation.  
+		Eliminated the {@del @RestResource(stylesheet)} 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 {@link oajr.annotation.HtmlDoc#header() @HtmlDoc(header)}:
+		Eliminated the following annotations since they are now redundant with {@del oajr.annotation.HtmlDoc#header() @HtmlDoc(header)}:
 		<ul>
 			<li><c>title()</c>
 			<li><c>description()</c>
@@ -204,13 +204,13 @@
 	)
 		</p>
 	<li>
-		New <dc>ReaderResource.toCommentStrippedString()</dc> method.
+		New {@del ReaderResource#toCommentStrippedString()} method.
 	<li>
 		The <c>bpIncludes()</c> and <c>bpExcludes()</c> annotations on <ja>@RestMethod</ja>
 		has been replaced with the following:
 		<ul>
-			<li>{@link oajr.annotation.RestMethod#bpi() bpi()} - Now an array of simplified values instead of LAX JSON.
-			<li>{@link oajr.annotation.RestMethod#bpx() bpx()} - Now an array of simplified values instead of LAX JSON.
+			<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.
 		</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 fa2708e..d7734d2 100644
--- a/juneau-doc/docs/ReleaseNotes/6.4.0.html
+++ b/juneau-doc/docs/ReleaseNotes/6.4.0.html
@@ -203,7 +203,7 @@
 		Improvements to swap support.
 		<ul>
 			<li>New {@link oaj.annotation.Swap @Swap} annotation.
-				<br>Replaces the <c>@Pojo</c> and <dc>@BeanProperty(swap)</dc> annotations.
+				<br>Replaces the <c>@Pojo</c> and {@del @BeanProperty(swap)} annotations.
 			<li>Support for per-media-type swaps.
 				<br>Programmatic example:
 				<p class='bcode w800'>
@@ -250,7 +250,7 @@
 		<ja>@Swap</ja>(impl=FreeMarkerSwap.<jk>class</jk>, template=<js>"MyPojo.div.ftl"</js>)
 		<jk>public class</jk> MyPojo {}
 				</p>
-			<li>New {@link oaj.annotation.Swaps @Swaps} annotation for defining multiple swaps
+			<li>New {@del oaj.annotation.Swaps @Swaps} annotation for defining multiple swaps
 				against the same POJO when they're differentiated by media types:
 				<p class='bcode w800'>
 	<ja>@Swaps</ja>(
@@ -313,31 +313,31 @@
 		{@link oaj.transform.PojoSwap#swap(BeanSession,Object)} and {@link oaj.transform.PojoSwap#unswap(BeanSession,Object,ClassMeta)} 
 		can now throw arbitrary exceptions instead of having to wrap them in <c>SerializeException</c>/<c>ParseException</c>.
 	<li>
-		New {@link oaj.utils.CalendarUtils} class that encapsulates serialization/parsing logic from {@link oaj.transforms.CalendarSwap} and 
-		{@link oaj.transforms.DateSwap}.
+		New {@del oaj.utils.CalendarUtils} class that encapsulates serialization/parsing logic from {@del oaj.transforms.CalendarSwap} and 
+		{@del oaj.transforms.DateSwap}.
 	<li>
 		New annotation {@link oaj.html.annotation.Html#anchorText}.
 	<li>
-		New methods on {@link oaj.ObjectList}:
+		New methods on {@del oaj.ObjectList}:
 		<ul>
-			<li>{@link oaj.ObjectList#get(int,Class) get(int,Class)}
-			<li>{@link oaj.ObjectList#get(int,Type,Type...) get(int,Type,Type...)}
-			<li>{@link oaj.ObjectList#getMap(int,Class,Class) getMap(int,Class,Class)}
-			<li>{@link oaj.ObjectList#getList(int,Class) getList(int,Class)}
+			<li>{@del oaj.ObjectList#get(int,Class) get(int,Class)}
+			<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)}
 		</ul>
 	<li>
-		New methods on {@link oaj.ObjectMap}:
+		New methods on {@del oaj.ObjectMap}:
 		<ul>
-			<li>{@link oaj.ObjectMap#get(String,Class) get(String,Class)}
-			<li>{@link oaj.ObjectMap#get(String,Type,Type...) get(String,Type,Type...)}
-			<li>{@link oaj.ObjectMap#getWithDefault(String,Object) getWithDefault(String,Object)}
-			<li>{@link oaj.ObjectMap#getWithDefault(String,Object,Class) getWithDefault(String,Object,Class)}
-			<li>{@link oaj.ObjectMap#getWithDefault(String,Object,Type,Type...) getWithDefault(String,Object,Type,Type...)}
-			<li>{@link oaj.ObjectMap#getSwapped(String,PojoSwap) getSwapped(String,PojoSwap)}
-			<li>{@link oaj.ObjectMap#getAt(String,Class) getAt(String,Class)}
-			<li>{@link oaj.ObjectMap#getAt(String,Type,Type...) getAt(String,Type,Type...)}
-			<li>{@link oaj.ObjectMap#getMap(String,Class,Class,Map) getMap(String,Class,Class,Map)}
-			<li>{@link oaj.ObjectMap#getList(String,Class,List) getList(String,Class,List)}
+			<li>{@del oaj.ObjectMap#get(String,Class) get(String,Class)}
+			<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 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 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)}
 		</ul>
 	<li>
 		New methods on {@link oaj.utils.PojoRest}:
@@ -359,9 +359,9 @@
 	<li>
 		New class: {@link oaj.utils.PojoMerge}
 	<li>
-		New doc: <del>2.6.2 - @Pojo annotation</del>
+		New doc: <dc>2.6.2 - @Pojo annotation</dc>
 	<li>
-		New doc: <del>2.6.5 - Serializing Readers and InputStreams</del>
+		New doc: <dc>2.6.5 - Serializing Readers and InputStreams</dc>
 </ul>
 
 <h5 class='topic w800'>juneau-dto</h5>
@@ -400,40 +400,40 @@
 		</ul>
 	<li>
 		Simplified {@link oajr.widget.MenuItemWidget}.
-		<br>Exposes an abstract method <dc>getContent(RestRequest)</dc> that
+		<br>Exposes an abstract method {@del getContent(RestRequest)} 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}.
 	<li>
-		{@link oajr.RestResourceResolver} instances are now inherited from parent resources to child resources
+		{@del oajr.RestResourceResolver} 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 <dc>@RestResource</dc>:
+	<li>New annotations on {@del @RestResource}:
 		<ul>
-			<li><dc>resourceResolver()</dc>
+			<li>{@del resourceResolver()}
 				<br>Allows you to specify a resource resolver on the servlet context to make it easier to work with
 				dependency injection frameworks.
-			<li><dc>contextPath()</dc> - 
+			<li>{@del contextPath()} - 
 				<br>Allows you to override the context path value inherited from the servlet container.
-			<li><dc>allowHeaderParams()</dc> - 
+			<li>{@del allowHeaderParams()} - 
 				<br>Replaces the <c>RestContext.REST_allowHeaderParams</c> setting.
-			<li><dc>allowMethodParam()</dc> - 
+			<li>{@del allowMethodParam()} - 
 				<br>Replaces the <c>RestContext.REST_allowMethodParam</c> setting.
-			<li><dc>allowBodyParam()</dc> - 
+			<li>{@del allowBodyParam()} - 
 				<br>Replaces the <c>RestContext.REST_allowBodyParam</c> setting.
-			<li><dc>renderResponseStackTraces()</dc> - 
+			<li>{@del renderResponseStackTraces()} - 
 				<br>Replaces the <c>RestContext.REST_xxx</c> setting.
-			<li><dc>useStackTraceHashes()</dc> - 
+			<li>{@del useStackTraceHashes()} - 
 				<br>Replaces the <c>RestContext.REST_useStackTraceHashes</c> setting.
-			<li><dc>defaultCharset()</dc> - 
+			<li>{@del defaultCharset()} - 
 				<br>Replaces the <c>RestContext.REST_defaultCharset</c> setting.
-			<li><dc>paramFormat()</dc> - 
+			<li>{@del paramFormat()} - 
 				<br>Replaces the <c>RestContext.REST_paramFormat</c> setting.
 		</ul>
-	<li>New annotations on {@link oajr.annotation.RestMethod @RestMethod}:
+	<li>New annotations on {@del oajr.annotation.RestMethod @RestMethod}:
 		<ul>
-			<li>{@link oajr.annotation.RestMethod#defaultCharset() defaultCharset()} - 
+			<li>{@del oajr.annotation.RestMethod#defaultCharset() defaultCharset()} - 
 				<br>Replaces the <c>RestContext.REST_defaultCharset</c> setting.
-			<li><dc>RestMethod.paramFormat()</dc> - 
+			<li>{@del RestMethod#paramFormat()} - 
 				<br>Replaces the <c>RestContext.REST_paramFormat</c> setting.
 		</ul>
 	<li>
@@ -443,10 +443,10 @@
 			<li>{@link oajr.RestConverter}
 			<li>{@link oajr.RestGuard}
 			<li>{@link oajr.ResponseHandler}
-			<li>{@link oajr.RestCallHandler}
-			<li>{@link oajr.RestInfoProvider}
-			<li>{@link oajr.RestResourceResolver}
-			<li>{@link oajr.RestLogger}
+			<li>{@del oajr.RestCallHandler}
+			<li>{@del oajr.RestInfoProvider}
+			<li>{@del oajr.RestResourceResolver}
+			<li>{@del oajr.RestLogger}
 			<li>{@link oaj.html.HtmlDocTemplate}
 		</ul>
 	<li>
@@ -457,7 +457,7 @@
 	<li>
 		Stylesheet selection now stored in HTTP session when passed in via <c>?stylesheet</c> query parameter.
 	<li>
-		New doc: <del>Lifecycle Hooks</del>
+		New doc: <dc>Lifecycle Hooks</dc>
 	<li>
 		Eliminated the <c>RestServletJenaDefault</c> class to remove the Jena dependency class on 
 		the <c>juneau-rest-server</c> artifact. 
@@ -472,16 +472,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 <dc>RestMicroservice</dc>:
+		New methods on {@del RestMicroservice}:
 		<ul>
-			<li><dc>addServlet(Servlet,String)</dc>
-			<li><dc>addServletAttribute(String,Object)</dc>
-			<li><dc>getServer()</dc>
-			<li><dc>getInstance()</dc>
-			<li><dc>getPort()</dc>
-			<li><dc>getContextPath()</dc>
-			<li><dc>getProtocol()</dc>
-			<li><dc>getHostName()</dc>
+			<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()}
 		</ul>
 	<li>
 		New methods on {@link oaj.microservice.Microservice}:
@@ -489,10 +489,10 @@
 			<li>{@link oaj.microservice.Microservice#getInstance() getInstance()}
 		</ul>
 	<li>
-		New class <dc>JettyLogger</dc> for directing Jetty logging to the
+		New class {@del JettyLogger} for directing Jetty logging to the
 		java.util.logging framework.
 	<li>
-		New class <dc>DebugResource</dc> for viewing and generating
+		New class {@del DebugResource} 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 01d507b..161e42c 100644
--- a/juneau-doc/docs/ReleaseNotes/7.0.0.html
+++ b/juneau-doc/docs/ReleaseNotes/7.0.0.html
@@ -22,7 +22,7 @@
 <h5 class='topic w800'>juneau-marshall</h5>
 <ul class='spaced-list'>
 	<li>
-		New class {@link oaj.http.HttpMethodName} with valid static string HTTP method names.
+		New class {@del oaj.http.HttpMethodName} with valid static string HTTP method names.
 </ul>
 
 <h5 class='topic w800'>juneau-dto</h5>
@@ -35,9 +35,9 @@
 <h5 class='topic w800'>juneau-rest-server</h5>
 <ul class='spaced-list'>
 	<li>
-		Annotation <c><ja>@HtmlDoc</ja>(links)</c> renamed to {@link oajr.annotation.HtmlDoc#navlinks() navlinks}.
+		Annotation <c><ja>@HtmlDoc</ja>(links)</c> renamed to {@del oajr.annotation.HtmlDoc#navlinks() navlinks}.
 	<li>
-		New annotation {@link oajr.annotation.HtmlDoc#head() @HtmlDoc(head)}.
+		New annotation {@del oajr.annotation.HtmlDoc#head() @HtmlDoc(head)}.
 		<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>.
@@ -50,5 +50,5 @@
 		</p>
 	<li>
 		Removed several of the HTMLDOC-related methods from the <c>RestResponse/RestConfig/RestContext</c>
-		classes and moved it into the new {@link oajr.HtmlDocBuilder} class.
+		classes and moved it into the new {@del oajr.HtmlDocBuilder} class.
 </ul>
diff --git a/juneau-doc/docs/ReleaseNotes/7.0.1.html b/juneau-doc/docs/ReleaseNotes/7.0.1.html
index 4811591..0db0e09 100644
--- a/juneau-doc/docs/ReleaseNotes/7.0.1.html
+++ b/juneau-doc/docs/ReleaseNotes/7.0.1.html
@@ -41,7 +41,7 @@
 			<li>{@link oaj.parser.ParserGroup#create()}
 			<li>{@link oaj.encoders.EncoderGroup#create()}
 			<li>{@link oajrc.RestClient#create()}
-			<li><dc>ConfigFile.create()</dc>
+			<li>{@del ConfigFile#create()}
 		</ul>
 	<li>
 		The order of the parameters in {@link oaj.serializer.SerializerSession#serialize(Object,Object)}
@@ -63,8 +63,8 @@
 <h5 class='topic w800'>juneau-rest-server</h5>
 <ul class='spaced-list'>
 	<li>
-		New <dc>@RestResource(maxInput)</dc> and 
-		{@link oajr.annotation.RestMethod#maxInput() @RestMethod(maxInput)} for alleviating
+		New {@del @RestResource(maxInput)} and 
+		{@del oajr.annotation.RestMethod#maxInput() @RestMethod(maxInput)} for alleviating
 		potential DoS attacks.
 </ul>
 
@@ -134,7 +134,7 @@
 			<li>New methods on {@link oaj.microservice.Microservice}
 				<ul>
 					<li>{@link oaj.microservice.Microservice#startConsole() startConsole()}
-					<li><dc>createConsoleCommands()</dc>
+					<li>{@del createConsoleCommands()}
 					<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 bdf45cc..efe6f92 100644
--- a/juneau-doc/docs/ReleaseNotes/7.1.0.html
+++ b/juneau-doc/docs/ReleaseNotes/7.1.0.html
@@ -104,14 +104,14 @@
 				<li class='jc'>{@link oaj.httppart.HttpPartType}
 				<li class='jic'>{@link oaj.httppart.HttpPartSerializer}
 				<ul>
-					<li class='jc'><dc>UonPartSerializer</dc>
-					<li class='jc'><dc>SimpleUonPartSerializer</dc>
+					<li class='jc'>{@del UonPartSerializer}
+					<li class='jc'>{@del SimpleUonPartSerializer}
 					<li class='jc'>{@link oaj.httppart.SimplePartSerializer}
 				</ul>
 				<li class='jic'>{@link oaj.httppart.HttpPartParser}
 				<ul>
-					<li class='jc'><dc>UonPartParser</dc>
-					<li class='jc'><dc>SimplePartParser</dc>
+					<li class='jc'>{@del UonPartParser}
+					<li class='jc'>{@del SimplePartParser}
 				</ul>
 			</ul>
 		</ul>
@@ -121,11 +121,11 @@
 	<li>
 		<c>ResourceFinder</c> class has been replaced with the following:
 		<ul>
-			<li>{@link oaj.utils.ClasspathResourceFinder}
-			<li>{@link oaj.utils.ClasspathResourceFinderSimple}
-			<li>{@link oaj.utils.ClasspathResourceFinderBasic}
-			<li>{@link oaj.utils.ClasspathResourceFinderRecursive}
-			<li>{@link oaj.utils.ClasspathResourceManager}
+			<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}
 		</ul>
 	<li>
 		New methods on {@link oaj.serializer.SerializerSession}:
@@ -220,41 +220,41 @@
 		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 {@link oajr.RestRequest#getFormData(String)}.
+			<li><js>"$RF{key1[,key2...]}"</js> - {@link oajr.vars.RequestFormDataVar}, first non-null value returned by {@del oajr.RestRequest#getFormData(String)}.
 			<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> - {@link oajr.vars.RestInfoVar}, first non-null value returned by {@link oajr.RestRequest#getInfoProvider()}.
+			<li><js>"$RI{key1[,key2...]}"</js> - {@del oajr.vars.RestInfoVar}, first non-null value returned by {@del oajr.RestRequest#getInfoProvider()}.
 				<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 {@link oajr.RestInfoProvider#getDescription(RestRequest)}
+					<li><js>"description"</js> - Value returned by {@del oajr.RestInfoProvider#getDescription(RestRequest)}
 					<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 {@link oajr.RestInfoProvider#getMethodDescription(Method,RestRequest)}
-					<li><js>"methodSummary"</js> - Value returned by {@link oajr.RestInfoProvider#getMethodSummary(Method,RestRequest)}
-					<li><js>"siteName"</js> - Value returned by {@link oajr.RestInfoProvider#getSiteName(RestRequest)}
+					<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>"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 {@link oajr.RestInfoProvider#getTitle(RestRequest)}
+					<li><js>"title"</js> - See {@del oajr.RestInfoProvider#getTitle(RestRequest)}
 					<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 {@link oajr.RestRequest#getPath(String)}.
-			<li><js>"$RQ{key1[,key2...]}"</js> - {@link oajr.vars.RequestQueryVar}, first non-null value returned by {@link oajr.RestRequest#getQuery(String)}
+			<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>"$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 {@link oajr.RestRequest#getMethodDescription()}
-					<li><js>"methodSummary"</js> - Value returned by {@link oajr.RestRequest#getMethodSummary()}
+					<li><js>"methodDescription"</js> - Value returned by {@del oajr.RestRequest#getMethodDescription()}
+					<li><js>"methodSummary"</js> - Value returned by {@del oajr.RestRequest#getMethodSummary()}
 					<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 {@link oajr.RestRequest#getResourceDescription()}
-					<li><js>"resourceTitle"</js> - See {@link oajr.RestRequest#getResourceTitle()}
+					<li><js>"resourceDescription"</js> - Value returned by {@del oajr.RestRequest#getResourceDescription()}
+					<li><js>"resourceTitle"</js> - See {@del oajr.RestRequest#getResourceTitle()}
 					<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 {@link oajr.RestRequest#getSiteName()}
+					<li><js>"siteName"</js> - See {@del RestRequest#getSiteName()}
 				</ul>
 		</ul>
 	<li>
@@ -262,130 +262,130 @@
 		<br>Settings on {@link oajr.RestContext} objects can now be set declaratively through the 
 			following new properties:
 		<ul>
-			<li>{@link oajr.RestContext#REST_allowHeaderParams REST_allowHeaderParams}
-			<li>{@link oajr.RestContext#REST_allowBodyParam REST_allowBodyParam}
+			<li>{@del RestContext#REST_allowHeaderParams}
+			<li>{@del RestContext#REST_allowBodyParam}
 			<li>{@link oajr.RestContext#REST_allowedMethodParams REST_allowedMethodParams}
 			<li>{@link oajr.RestContext#REST_renderResponseStackTraces REST_renderResponseStackTraces}
-			<li>{@link oajr.RestContext#REST_useStackTraceHashes REST_useStackTraceHashes}
+			<li>{@del RestContext#REST_useStackTraceHashes}
 			<li>{@link oajr.RestContext#REST_defaultCharset REST_defaultCharset}
 			<li>{@link oajr.RestContext#REST_maxInput REST_maxInput}
-			<li>{@link oajr.RestContext#REST_paramResolvers REST_paramResolvers}
+			<li>{@del RestContext#REST_paramResolvers}
 			<li>{@link oajr.RestContext#REST_converters REST_converters}
 			<li>{@link oajr.RestContext#REST_guards REST_guards}
-			<li>{@link oajr.RestContext#REST_responseHandlers REST_responseHandlers}
-			<li><dc>REST_defaultRequestHeaders</dc>
-			<li><dc>REST_defaultResponseHeaders</dc>
+			<li>{@del RestContext#REST_responseHandlers}
+			<li>{@del RestContext#REST_defaultRequestHeaders}
+			<li>{@del RestContext#REST_defaultResponseHeaders}
 			<li>{@link oajr.RestContext#REST_produces REST_produces}
 			<li>{@link oajr.RestContext#REST_consumes REST_consumes}
 			<li>{@link oajr.RestContext#REST_clientVersionHeader REST_clientVersionHeader}
-			<li>{@link oajr.RestContext#REST_resourceResolver REST_resourceResolver}
-			<li>{@link oajr.RestContext#REST_logger REST_logger}
-			<li>{@link oajr.RestContext#REST_callHandler REST_callHandler}
-			<li>{@link oajr.RestContext#REST_infoProvider REST_infoProvider}
+			<li>{@del RestContext#REST_resourceResolver}
+			<li>{@del RestContext#REST_logger}
+			<li>{@del RestContext#REST_callHandler}
+			<li>{@del RestContext#REST_infoProvider}
 			<li>{@link oajr.RestContext#REST_path REST_path}
-			<li><dc>REST_contextPath</dc>
+			<li>{@del RestContext#REST_contextPath}
 			<li>{@link oajr.RestContext#REST_staticFiles REST_staticFiles}
-			<li>{@link oajr.RestContext#REST_staticFileResponseHeaders REST_staticFileResponseHeaders}
-			<li>{@link oajr.RestContext#REST_classpathResourceFinder REST_classpathResourceFinder}
-			<li>{@link oajr.RestContext#REST_useClasspathResourceCaching REST_useClasspathResourceCaching}
-			<li>{@link oajr.RestContext#REST_widgets REST_widgets}
-			<li>{@link oajr.RestContext#REST_mimeTypes REST_mimeTypes}
+			<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}
 		</ul>
 	<li>
 		Support for static files has been simplified and improved.
 		<ul>
-			<li>Syntax on <dc>@RestResource(staticFiles)</dc> has been simplified, and
+			<li>Syntax on {@del @RestResource(staticFiles)} 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 
-				{@link oajr.RestContext#REST_staticFileResponseHeaders REST_staticFileResponseHeaders}.
+				{@del RestContext#REST_staticFileResponseHeaders}
 			<li>Static file in-memory caching now configurable through 
-				{@link oajr.RestContext#REST_useClasspathResourceCaching REST_useClasspathResourceCaching}.
+				{@del RestContext#REST_useClasspathResourceCaching}
 			<li>Static file retrieval can be customized through 
-				{@link oajr.RestContext#REST_classpathResourceFinder REST_classpathResourceFinder}
+				{@del RestContext#REST_classpathResourceFinder}
 		</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>
-		<dc>@RestResource.allowMethodParam</dc> renamed to <dc>RestResource.allowedMethodParams</dc>.
+		{@del @RestResource#allowMethodParam} renamed to {@del RestResource#allowedMethodParams}.
 	<li>
 		<c>@RestMethod.serializersInherit</c> and <c>@RestMethod.parsersInherit</c> replaced with
-		simplified <dc>@RestMethod(inherit)</dc>. 
+		simplified {@del @RestMethod(inherit)}. 
 	<li>
 		Changes to {@link oajr.RequestFormData}:
 		<ul>
-			<li>{@link oajr.RequestFormData#addDefault(Map) addDefault(Map)} takes in a 
+			<li>{@del oajr.RequestFormData#addDefault(Map) addDefault(Map)} 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.RequestHeaders}:
 		<ul>
-			<li>{@link oajr.RequestHeaders#addDefault(Map) addDefault(Map)} takes in a 
+			<li>{@del oajr.RequestHeaders#addDefault(Map) addDefault(Map)} 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.RequestQuery}:
 		<ul>
-			<li>{@link oajr.RequestQuery#addDefault(Map) addDefault(Map)} takes in a 
+			<li>{@del oajr.RequestQuery#addDefault(Map) addDefault(Map)} 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 <dc>getClasspathResource(String,Locale)</dc>
-			<li><c>getResourceAsString(String,Locale)</c> renamed to <dc>getClasspathResourceAsString(String,Locale)</dc>
-			<li><c>getResource(Class,MediaType,String,Locale)</c> renamed to <dc>getClasspathResourceAsString(Class,MediaType,String,Locale)</dc>
-			<li>New method <dc>getClasspathResource(Class,String,Locale)</dc>.
-			<li>New method <dc>getClasspathResourceAsString(Class,String,Locale)</dc>.
-			<li>New method <dc>getClasspathResource(Class,Class,MediaType,String,Locale)</dc>.
-			<li><dc>RestContext.getDefaultRequestHeaders()</dc> returns a 
+			<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 
 				<c>Map&lt;String,Object&gt;</c> instead of <c>Map&lt;String,String&gt;</c>.
-			<li><dc>RestContext.getDefaultResponseHeaders()</dc> returns a 
+			<li>{@del RestContext#getDefaultResponseHeaders()} 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
-				{@link oajr.RestRequest#getConsumes() getConsumes()} and
-				{@link oajr.RestRequest#getProduces() getProduces()}.
+				{@del oajr.RestRequest#getConsumes() getConsumes()} and
+				{@del oajr.RestRequest#getProduces() getProduces()}.
 			<li><c>getReaderResource(String,boolean,MediaType)</c> renamed to 
-				<dc>getClasspathReaderResource(String,boolean,MediaType)</dc>
+				{@del getClasspathReaderResource(String,boolean,MediaType)}
 			<li><c>getReaderResource(String,boolean)</c> renamed to 
-				{@link oajr.RestRequest#getClasspathHttpResource(String,boolean) getClasspathHttpResource(String,boolean)}
+				{@del getClasspathHttpResource(String,boolean)}
 			<li><c>getReaderResource(String)</c> renamed to 
-				{@link oajr.RestRequest#getClasspathHttpResource(String) getClasspathHttpResource(String)}
+				{@del getClasspathHttpResource(String)}
 		</ul>
 	<li>
-		Changes to <dc>@RestResource</dc>
+		Changes to {@del @RestResource}
 		<ul>
-			<li>New <dc>mimeTypes()</dc> annotation.
+			<li>New {@del mimeTypes()} annotation.
 		</ul>
 	<li>
-		Changes to {@link oajr.annotation.RestMethod @RestMethod}:
+		Changes to {@del oajr.annotation.RestMethod @RestMethod}:
 		<ul>
-			<li>New {@link oajr.annotation.RestMethod#consumes() consumes()} and
-				{@link oajr.annotation.RestMethod#produces() produces()}
+			<li>New {@del oajr.annotation.RestMethod#consumes() consumes()} and
+				{@del oajr.annotation.RestMethod#produces() produces()}
 				for overriding the supported media types inferred from the serializers and parsers.
 		</ul>
 	<li>
-		<c>RestCallHandler</c> split up into {@link oajr.RestCallHandler} and 
-		<dc>BasicRestCallHandler</dc>
+		<c>RestCallHandler</c> split up into {@del oajr.RestCallHandler} and 
+		{@del BasicRestCallHandler}
 	<li>
-		<c>RestInfoProvider</c> split up into {@link oajr.RestInfoProvider} and 
-		{@link oajr.BasicRestInfoProvider}
+		<c>RestInfoProvider</c> split up into {@del oajr.RestInfoProvider} and 
+		{@del oajr.BasicRestInfoProvider}
 	<li>
-		<c>RestLogger</c> split up into {@link oajr.RestLogger}, 
-		{@link oajr.BasicRestLogger} and {@link oajr.NoOpRestLogger}
+		<c>RestLogger</c> split up into {@del oajr.RestLogger}, 
+		{@del oajr.BasicRestLogger} and {@del oajr.NoOpRestLogger}
 	<li>
-		<c>RestResourceResolverSimple</c> renamed to {@link oajr.BasicRestResourceResolver}
+		<c>RestResourceResolverSimple</c> renamed to {@del oajr.BasicRestResourceResolver}
 	<li>
 		Introduced the following classes that helps make the code more understandable:
 		<ul>
-			<li>{@link oajr.RestContextProperties}
-			<li>{@link oajr.RestMethodProperties}
-			<li>{@link oajr.RequestProperties}
+			<li>{@del oajr.RestContextProperties}
+			<li>{@del oajr.RestMethodProperties}
+			<li>{@del oajr.RequestProperties}
 		</ul>
 	<li>
 		Eliminated the <c>@Messages</c> and <c>@Properties</c> REST java method parameter
@@ -393,23 +393,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 {@link oajr.RestInfoProvider} class.
+		Revamped the {@del oajr.RestInfoProvider} class.
 	<li>
 		New builder classes:
 		<ul>
-			<li><dc>ReaderResourceBuilder</dc>
-			<li><dc>StreamResourceBuilder</dc>
+			<li>{@del ReaderResourceBuilder}
+			<li>{@del StreamResourceBuilder}
 		</ul>
 	<li>
 		{@link oajr.RestResponse#getNegotiatedOutputStream()} now returns a 
-		<dc>FinishableServletOutputStream</dc> and {@link oajr.RestResponse#getNegotiatedWriter()}
-		now returns a <dc>FinishablePrintWriter</dc> that allows you to finish the output
+		{@del FinishableServletOutputStream} and {@link oajr.RestResponse#getNegotiatedWriter()}
+		now returns a {@del FinishablePrintWriter} that allows you to finish the output
 		without closing the stream.
-		<br>The {@link oajr.reshandlers.DefaultHandler} class now calls <c>finish()</c>
+		<br>The {@del oajr.reshandlers.DefaultHandler} class now calls <c>finish()</c>
 		instead of <c>close()</c> on the stream.
 	<li>
 		Added the following annotations to the {@link oajr.BasicRestServlet} class
-		(which were previously defined on the <dc>Resource</dc> class):
+		(which were previously defined on the {@del Resource} class):
 		<p class='bcode w800'>
 	<ja>@RestResource</ja>(
 		htmldoc=<ja>@HtmlDoc</ja>(
@@ -429,21 +429,21 @@
 <h5 class='topic w800'>juneau-rest-client</h5>
 <ul class='spaced-list'>
 	<li>
-		New configuration property {@link oajrc.RestClient#RESTCLIENT_query} and
-		builder method {@link oajrc.RestClientBuilder#query(String,Object)}.
+		New configuration property {@del oajrc.RestClient#RESTCLIENT_query} and
+		builder method {@del oajrc.RestClientBuilder#query(String,Object)}.
 	<li>
 		API changes to replace <c>PartSerializer</c> with {@link oaj.httppart.HttpPartSerializer}.
-		<br>The default value is now <dc>SimpleUonPartSerializer</dc> which will
+		<br>The default value is now {@del SimpleUonPartSerializer} 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 {@link oajrc.RestCall} class:
+		New methods on {@del oajrc.RestCall} class:
 		<ul>
-			<li>{@link oajrc.RestCall#getResponseHeader(String) getResponseHeader(String)}
-			<li>{@link oajrc.RestCall#getResponseCode() getResponseCode()}
+			<li>{@del oajrc.RestCall#getResponseHeader(String) getResponseHeader(String)}
+			<li>{@del oajrc.RestCall#getResponseCode() getResponseCode()}
 		</ul>
 	<li>
-		{@link oajrc.RestCall} and {@link oajrc.RestClient}
+		{@del oajrc.RestCall} and {@link oajrc.RestClient}
 		now implement the <c>Closeable</c> interface.
 </ul>
 
@@ -454,5 +454,5 @@
 		<br>{@link oajr.BasicRestServlet} and {@link oajr.BasicRestServletGroup} can be used instead.
 	<li>
 		<c>ResourceJena</c> and <c>ResourceJenaGroup</c> classes renamed to
-		<dc>BasicRestServletJena</dc> and <dc>BasicRestServletJenaGroup</dc>.
+		{@del BasicRestServletJena} and {@del BasicRestServletJenaGroup}.
 </ul>
diff --git a/juneau-doc/docs/ReleaseNotes/7.2.0.html b/juneau-doc/docs/ReleaseNotes/7.2.0.html
index 18839ce..c999911 100644
--- a/juneau-doc/docs/ReleaseNotes/7.2.0.html
+++ b/juneau-doc/docs/ReleaseNotes/7.2.0.html
@@ -49,20 +49,20 @@
 			and auto-generated Swagger documentation:
 		<ul class='doctree'>
 			<li class='ja'>{@link oaj.http.annotation.Contact}
-			<li class='ja'><dc>ExternalDocs</dc>
-			<li class='ja'><dc>Items</dc>
+			<li class='ja'>{@del ExternalDocs}
+			<li class='ja'>{@del Items}
 			<li class='ja'>{@link oaj.http.annotation.License}
-			<li class='ja'><dc>Schema</dc>
-			<li class='ja'><dc>SubItems</dc>
-			<li class='ja'>{@link oaj.http.annotation.Tag}
+			<li class='ja'>{@del Schema}
+			<li class='ja'>{@del SubItems}
+			<li class='ja'>{@del oaj.http.annotation.Tag}
 		</ul>
 		<br>Additionally, the <ja>@Remoteable</ja> annotation has been split into the following two annotations:
 		<ul class='doctree'>
-			<li class='ja'>{@link oaj.remote.RemoteInterface} 
+			<li class='ja'>{@del oaj.remote.RemoteInterface} 
 				- Used for remote proxy interfaces served up through 
-				<dc>RemoteInterfaceServlet</dc> or REST <js>"PROXY"</js> methods.
+				{@del RemoteInterfaceServlet} or REST <js>"PROXY"</js> methods.
 				<br>Defaults to <js>"POST"</js> with method signatures as paths.
-			<li class='ja'><dc>RemoteResource</dc> 
+			<li class='ja'>{@del RemoteResource} 
 				- Used for 3rd-party REST interfaces.
 				<br>Defaults to <js>"GET"</js> with standardized naming conventions for paths.
 		</ul>
@@ -78,13 +78,13 @@
 	<li>
 		Support for POJO examples:
 		<ul class='doctree'>
-			<li class='jf'>{@link oaj.BeanContext#BEAN_examples}
+			<li class='jf'>{@del BeanContext#BEAN_examples}
 			<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 <dc>@BeanProperty(name)</dc> but forget to
+		A runtime exception is now thrown if you define a {@del @BeanProperty(name)} 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
@@ -102,8 +102,8 @@
 	<li>
 		Added support for auto-detection of fluent-style setters:
 		<ul class='doctree'>
-			<li class='jf'>{@link oaj.BeanContext#BEAN_fluentSetters}
-			<li class='ja'>{@link oaj.annotation.Bean#fluentSetters()}
+			<li class='jf'>{@del oaj.BeanContext#BEAN_fluentSetters}
+			<li class='ja'>{@del oaj.annotation.Bean#fluentSetters()}
 		</ul>
 	<li>
 		The <jsf>SERIALIZER_abridged</jsf> setting has been replaced with {@link oaj.serializer.Serializer#SERIALIZER_addRootType SERIALIZER_addRootType}
@@ -138,7 +138,7 @@
 		New property {@link oaj.BeanContext#BEAN_useEnumNames} for controlling whether enums are serialized
 		using their name or the <c>toString()</c> method.
 	<li>
-		New property {@link oaj.BeanContext#BEAN_examples} for defining examples of POJOs.
+		New property {@del BeanContext#BEAN_examples} 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.
@@ -148,14 +148,14 @@
 	<li>
 		Significant improvements to JSON-Schema serialization support.
 		<ul>
-			<li>New <dc>@JsonSchema</dc> annotation.
+			<li>New {@del @JsonSchema} 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 {@link oaj.annotation.BeanProperty#name()}
+		<br>See new options #4 on {@del oaj.annotation.BeanProperty#name()}
 	<li>
 		New formats for the {@link oaj.html.annotation.Html#format() @Html(format)} annotation:
 		<ul class='doctree'>
@@ -167,19 +167,19 @@
 		<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 {@link oaj.ObjectMap ObjectMaps} and {@link oaj.ObjectList ObjectLists}.
+		New methods for creating unmodifiable {@del oaj.ObjectMap ObjectMaps} and {@del oaj.ObjectList ObjectLists}.
 		<ul class='doctree'>
-			<li class='jc'>{@link oaj.ObjectMap}
+			<li class='jc'>{@del oaj.ObjectMap}
 			<ul>
-				<li class='jm'>{@link oaj.ObjectMap#isUnmodifiable() isUnmodifable()}
-				<li class='jm'>{@link oaj.ObjectMap#unmodifiable() unmodifiable()}
-				<li class='jm'>{@link oaj.ObjectMap#modifiable() modifiable()}
+				<li class='jm'>{@del oaj.ObjectMap#isUnmodifiable() isUnmodifable()}
+				<li class='jm'>{@del oaj.ObjectMap#unmodifiable() unmodifiable()}
+				<li class='jm'>{@del oaj.ObjectMap#modifiable() modifiable()}
 			</ul>
-			<li class='jp'>{@link oaj.ObjectList}
+			<li class='jp'>{@del oaj.ObjectList}
 			<ul>
-				<li class='jm'>{@link oaj.ObjectList#isUnmodifiable() isUnmodifable()}
-				<li class='jm'>{@link oaj.ObjectList#unmodifiable() unmodifiable()}
-				<li class='jm'>{@link oaj.ObjectList#modifiable() modifiable()}
+				<li class='jm'>{@del oaj.ObjectList#isUnmodifiable() isUnmodifable()}
+				<li class='jm'>{@del oaj.ObjectList#unmodifiable() unmodifiable()}
+				<li class='jm'>{@del oaj.ObjectList#modifiable() modifiable()}
 			</ul>
 		</ul>
 	<li>
@@ -246,7 +246,7 @@
 <h5 class='topic w800'>juneau-dto</h5>
 <ul class='spaced-list'>
 	<li>
-		Fixed bug where Swagger {@link oaj.dto.swagger.SchemaInfo#required(Object...)} was defined as a boolean
+		Fixed bug where Swagger {@del oaj.dto.swagger.SchemaInfo#required(Object...)} was defined as a boolean
 		instead of a list of strings.
 	<li>
 		Boolean attributes are now handled correctly for HTML5.
@@ -258,16 +258,16 @@
 	<li>
 		Auto-generated {@doc RestSwagger Swagger UI}.
 	<li>
-		Simplified <dc>@RestResource(swagger)</dc>
-		and {@link oajr.annotation.RestMethod#swagger() @RestMethod(swagger)} annotations.
+		Simplified {@del @RestResource(swagger)}
+		and {@del oajr.annotation.RestMethod#swagger() @RestMethod(swagger)} 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 <dc>RemoteInterfaceServlet</dc>.
+		The <c>RemoteableServlet</c> class has been moved and renamed to {@del RemoteInterfaceServlet}.
 	<li>
-		<dc>RemoteInterfaceServlet</dc> now provides a form page for invoking remote interface methods in a browser.
+		{@del RemoteInterfaceServlet} 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>
@@ -292,86 +292,86 @@
 			<ul>
 				<li class='jc'>{@link oajr.helper.BeanDescription}
 				<li class='jc'>{@link oajr.helper.ChildResourceDescriptions}
-				<li class='jc'><dc>ReaderResource</dc>
-				<li class='jc'><dc>ReaderResourceBuilder</dc>
+				<li class='jc'>{@del ReaderResource}
+				<li class='jc'>{@del ReaderResourceBuilder}
 				<li class='jc'>{@link oajr.helper.SeeOtherRoot}
 				<li class='jc'>{@link oajr.helper.ResourceDescription}
-				<li class='jc'><dc>StreamResource</dc>
-				<li class='jc'><dc>StreamResourceBuilder</dc>
+				<li class='jc'>{@del StreamResource}
+				<li class='jc'>{@del StreamResourceBuilder}
 			</ul>
 		</ul>
 	<li>
 		Predefined HTTP responses.
 		<ul class='doctree'>
-			<li class='jp'>{@link oajr.response}
+			<li class='jp'>{@del oajr.response}
 			<ul>
-				<li class='jc'>{@link oajr.response.Accepted}
-				<li class='jc'>{@link oajr.response.AlreadyReported}
-				<li class='jc'>{@link oajr.response.Continue}
-				<li class='jc'>{@link oajr.response.Created}
-				<li class='jc'>{@link oajr.response.EarlyHints}
-				<li class='jc'>{@link oajr.response.Found}
-				<li class='jc'>{@link oajr.response.IMUsed}
-				<li class='jc'>{@link oajr.response.MovedPermanently}
-				<li class='jc'>{@link oajr.response.MultipleChoices}
-				<li class='jc'>{@link oajr.response.MultiStatus}
-				<li class='jc'>{@link oajr.response.NoContent}
-				<li class='jc'>{@link oajr.response.NonAuthoritiveInformation}
-				<li class='jc'>{@link oajr.response.NotModified}
-				<li class='jc'>{@link oajr.response.Ok}
-				<li class='jc'>{@link oajr.response.PartialContent}
-				<li class='jc'>{@link oajr.response.PermanentRedirect}
-				<li class='jc'>{@link oajr.response.Processing}
-				<li class='jc'>{@link oajr.response.ResetContent}
-				<li class='jc'>{@link oajr.response.SeeOther}
-				<li class='jc'>{@link oajr.response.SwitchingProtocols}
-				<li class='jc'>{@link oajr.response.TemporaryRedirect}
-				<li class='jc'>{@link oajr.response.UseProxy}			
+				<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}			
 			</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'>{@link oajr.exception}
+			<li class='jp'>{@del oajr.exception}
 			<ul>
-				<li class='jc'>{@link oajr.exception.BadRequest}
-				<li class='jc'>{@link oajr.exception.Conflict}
-				<li class='jc'>{@link oajr.exception.ExpectationFailed}
-				<li class='jc'>{@link oajr.exception.FailedDependency}
-				<li class='jc'>{@link oajr.exception.Forbidden}
-				<li class='jc'>{@link oajr.exception.Gone}
-				<li class='jc'>{@link oajr.exception.HttpVersionNotSupported}
-				<li class='jc'>{@link oajr.exception.InsufficientStorage}
-				<li class='jc'>{@link oajr.exception.InternalServerError}
-				<li class='jc'>{@link oajr.exception.LengthRequired}
-				<li class='jc'>{@link oajr.exception.Locked}
-				<li class='jc'>{@link oajr.exception.LoopDetected}
-				<li class='jc'>{@link oajr.exception.MethodNotAllowed}
-				<li class='jc'>{@link oajr.exception.MisdirectedRequest}
-				<li class='jc'>{@link oajr.exception.NetworkAuthenticationRequired}
-				<li class='jc'>{@link oajr.exception.NotAcceptable}
-				<li class='jc'>{@link oajr.exception.NotExtended}
-				<li class='jc'>{@link oajr.exception.NotFound}
-				<li class='jc'>{@link oajr.exception.NotImplemented}
-				<li class='jc'>{@link oajr.exception.PayloadTooLarge}
-				<li class='jc'>{@link oajr.exception.PreconditionFailed}
-				<li class='jc'>{@link oajr.exception.PreconditionRequired}
-				<li class='jc'>{@link oajr.exception.RangeNotSatisfiable}
-				<li class='jc'>{@link oajr.exception.RequestHeaderFieldsTooLarge}
-				<li class='jc'>{@link oajr.exception.ServiceUnavailable}
-				<li class='jc'>{@link oajr.exception.TooManyRequests}
-				<li class='jc'>{@link oajr.exception.Unauthorized}
-				<li class='jc'>{@link oajr.exception.UnavailableForLegalReasons}
-				<li class='jc'>{@link oajr.exception.UnprocessableEntity}
-				<li class='jc'>{@link oajr.exception.UnsupportedMediaType}
-				<li class='jc'>{@link oajr.exception.UpgradeRequired}
-				<li class='jc'>{@link oajr.exception.UriTooLong}
-				<li class='jc'>{@link oajr.exception.VariantAlsoNegotiates}
+				<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}
 			</ul>
 		</ul>	
 	<li>
-		The {@link oajr.annotation.HtmlDoc#nav() @HtmlDoc(nav)} and {@link oajr.annotation.HtmlDoc#navlinks() @HtmlDoc(navlinks)}
+		The {@del oajr.annotation.HtmlDoc#nav() @HtmlDoc(nav)} and {@del oajr.annotation.HtmlDoc#navlinks() @HtmlDoc(navlinks)}
 		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>
@@ -396,14 +396,14 @@
 		<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 <dc>RestResource.nowrap()</dc> annotation has been changed to a string with a default value of <js>"true"</js>.
+		The {@del RestResource#nowrap()} 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'><dc>MockRest</dc>
+			<li class='jc'>{@del MockRest}
 		</ul>
 	<li>
 		<c><ja>@RestMethod</ja>(inherit)</c> annotation has been removed and replaced with the following classes:
@@ -413,14 +413,14 @@
 		</ul>
 		<br>These can be used in the following locations:
 		<ul class='doctree'>
-			<li class='ja'><dc>RestResource.serializers()</dc>
-			<li class='ja'><dc>RestResource.parsers()</dc>
-			<li class='ja'><dc>RestResource.beanFilters()</dc>
-			<li class='ja'><dc>RestResource.pojoSwaps()</dc>
-			<li class='ja'>{@link oajr.annotation.RestMethod#serializers()}
-			<li class='ja'>{@link oajr.annotation.RestMethod#parsers()}
-			<li class='ja'>{@link oajr.annotation.RestMethod#beanFilters()}
-			<li class='ja'>{@link oajr.annotation.RestMethod#pojoSwaps()}
+			<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()}
 		</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>
@@ -437,8 +437,8 @@
 		<ul class='doctree'>
 			<li class='jc'>{@link oajr.widget.MenuItemWidget}
 			<ul>
-				<li class='jm'><dc>getBeforeShowScript(RestRequest)</dc>
-				<li class='jm'><dc>getAfterShowScript(RestRequest)</dc>
+				<li class='jm'>{@del getBeforeShowScript(RestRequest)}
+				<li class='jm'>{@del getAfterShowScript(RestRequest)}
 			</ul>
 		</ul>
 	<li>
@@ -446,16 +446,16 @@
 		<ul class='doctree'>
 			<li class='jc'>{@link oajr.widget.Widget}
 			<ul>
-				<li class='jm'><dc>loadHtmlWithVars(RestRequest,String)</dc>
-				<li class='jm'><dc>loadScriptWithVars(RestRequest,String)</dc>
-				<li class='jm'><dc>loadStyleWithVars(RestRequest,String)</dc>
+				<li class='jm'>{@del loadHtmlWithVars(RestRequest,String)}
+				<li class='jm'>{@del loadScriptWithVars(RestRequest,String)}
+				<li class='jm'>{@del loadStyleWithVars(RestRequest,String)}
 			</ul>
 		</ul>
 	<li>
 		New/updated documentation: 
 		<br><dc>juneau-rest-server.UnitTesting</dc>
 	<li>
-		The behavior of the default values for {@link oajr.annotation.RestMethod#name()} and {@link oajr.annotation.RestMethod#path()}
+		The behavior of the default values for {@del oajr.annotation.RestMethod#name()} and {@del oajr.annotation.RestMethod#path()}
 		have changed.
 		<br>If not specified, the values are inferred from the Java method name.
 		<br>See Also: {@doc RestMethod}
@@ -475,15 +475,15 @@
 	<li>
 		New convenience annotations for specifying default <c>Accept</c> and <c>Content-Type</c> headers:
 		<ul class='doctree'>	
-			<li class='jc'><dc>RestResource</dc>
+			<li class='jc'>{@del RestResource}
 			<ul>
-				<li class='jf'><dc>defaultAccept</dc>
-				<li class='jf'><dc>defaultContentType</dc>
+				<li class='jf'>{@del defaultAccept}
+				<li class='jf'>{@del defaultContentType}
 			</ul>	
-			<li class='jc'>{@link oajr.annotation.RestMethod}
+			<li class='jc'>{@del oajr.annotation.RestMethod}
 			<ul>
-				<li class='jf'>{@link oajr.annotation.RestMethod#defaultAccept defaultAccept}
-				<li class='jf'>{@link oajr.annotation.RestMethod#defaultContentType defaultContentType}
+				<li class='jf'>{@del oajr.annotation.RestMethod#defaultAccept defaultAccept}
+				<li class='jf'>{@del oajr.annotation.RestMethod#defaultContentType defaultContentType}
 			</ul>	
 		</ul>
 </ul>
@@ -498,13 +498,13 @@
 		<ul class='doctree'>
 			<li class='jc'>{@link oajrc.RestClientBuilder}
 			<ul>
-				<li class='jf'>{@link oajrc.RestClientBuilder#sslProtocols(String...) sslProtocols(String...)}
-				<li class='jf'>{@link oajrc.RestClientBuilder#cipherSuites(String...) cipherSuites(String...)}
-				<li class='jf'>{@link oajrc.RestClientBuilder#hostnameVerifier(HostnameVerifier) hostnameVerifier(HostnameVerifier)}
-				<li class='jf'>{@link oajrc.RestClientBuilder#keyManagers(KeyManager...) keyManagers(KeyManager...)}
-				<li class='jf'>{@link oajrc.RestClientBuilder#trustManagers(TrustManager...)}
-				<li class='jf'>{@link oajrc.RestClientBuilder#secureRandom(SecureRandom)}
-				<li class='jf'>{@link oajrc.RestClientBuilder#httpClientConnectionManager(HttpClientConnectionManager)}
+				<li class='jf'>{@del oajrc.RestClientBuilder#sslProtocols(String...) sslProtocols(String...)}
+				<li class='jf'>{@del oajrc.RestClientBuilder#cipherSuites(String...) cipherSuites(String...)}
+				<li class='jf'>{@del oajrc.RestClientBuilder#hostnameVerifier(HostnameVerifier) hostnameVerifier(HostnameVerifier)}
+				<li class='jf'>{@del oajrc.RestClientBuilder#keyManagers(KeyManager...) keyManagers(KeyManager...)}
+				<li class='jf'>{@del oajrc.RestClientBuilder#trustManagers(TrustManager...)}
+				<li class='jf'>{@del oajrc.RestClientBuilder#secureRandom(SecureRandom)}
+				<li class='jf'>{@del oajrc.RestClientBuilder#httpClientConnectionManager(HttpClientConnectionManager)}
 			</ul>
 		</ul>
 	<li>
@@ -521,7 +521,7 @@
 				<li class='jf'>{@link oajrc.RestClientBuilder#html() html()}
 				<li class='jf'>{@link oajrc.RestClientBuilder#uon() uon()}
 				<li class='jf'>{@link oajrc.RestClientBuilder#urlEnc() urlEnc()}
-				<li class='jf'>{@link oajrc.RestClientBuilder#msgpack() msgpack()}
+				<li class='jf'>{@link oajrc.RestClientBuilder#msgPack() msgPack()}
 				<li class='jf'>{@link oajrc.RestClientBuilder#plainText() plainText()}
 			</ul>
 		</ul>
@@ -530,14 +530,14 @@
 		<ul class='doctree'>
 			<li class='jc'>{@link oajrc.RestClientBuilder}
 			<ul>
-				<li class='jf'><dc>mockHttpConnection(MockHttpConnection)</dc>
+				<li class='jf'>{@del mockHttpConnection(MockHttpConnection)}
 			</ul>
 		</ul>
 	<li>
 		Removed the deprecated <c>RestCall.execute()</c> method.
-		<br>Use {@link oajrc.RestCall#run()}.
+		<br>Use {@del oajrc.RestCall#run()}.
 	<li>
-		<c>RestCall.input(Object)</c> method renamed to {@link oajrc.RestCall#body(Object)} to match OpenAPI terminology.
+		<c>RestCall.input(Object)</c> method renamed to {@del oajrc.RestCall#body(Object)} to match OpenAPI terminology.
 	<li>
 		Made constructors on <c>RestClient</c> and <c>RestClientBuilder</c> protected so that they can be subclassed.
 	<li>
@@ -545,12 +545,12 @@
 		<ul class='doctree'>
 			<li class='jc'>{@link oajrc.RestClient}
 			<ul>
-				<li class='jm'><dc>RestClient.getRemoteInterface(Class)</dc>
-				<li class='jm'><dc>RestClient.getRemoteInterface(Class,Object)</dc>
-				<li class='jm'><dc>RestClient.getRemoteInterface(Class,Object,Serializer,Parser)</dc>
-				<li class='jm'>{@link oajrc.RestClient#getRemoteResource(Class)}
-				<li class='jm'>{@link oajrc.RestClient#getRemoteResource(Class,Object)}
-				<li class='jm'>{@link oajrc.RestClient#getRemoteResource(Class,Object,Serializer,Parser)}
+				<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)}
 			</ul>
 		</ul>
 </ul>
diff --git a/juneau-doc/docs/ReleaseNotes/7.2.1.html b/juneau-doc/docs/ReleaseNotes/7.2.1.html
index 34e9e30..cea3379 100644
--- a/juneau-doc/docs/ReleaseNotes/7.2.1.html
+++ b/juneau-doc/docs/ReleaseNotes/7.2.1.html
@@ -23,7 +23,7 @@
 <h5 class='topic w800'>juneau-marshall</h5>
 <ul class='spaced-list'>
 	<li>
-		The <dc>@JsonSchema</dc> annotation has been merged with the {@link oaj.jsonschema.annotation.Schema @Schema} annotation.
+		The {@del @JsonSchema} 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.
@@ -39,7 +39,7 @@
 	<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 <dc>ResolvingReaderResource</dc> class has been added that includes the variable-resolving support since
+		<br>A new {@del ResolvingReaderResource} 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 dbc4d7a..ed45a64 100644
--- a/juneau-doc/docs/ReleaseNotes/8.0.0.html
+++ b/juneau-doc/docs/ReleaseNotes/8.0.0.html
@@ -93,11 +93,11 @@
 	<li>
 		New methods on {@link oajr.RestServlet}:
 		<ul class='javatree'>
-			<li class='jm'>{@link oajr.RestServlet#setRestResourceResolver(RestResourceResolver) setRestResourceResolver(RestResourceResolver)}
+			<li class='jm'>{@del oajr.RestServlet#setRestResourceResolver(RestResourceResolver) setRestResourceResolver(RestResourceResolver)}
 			<li class='jm'>{@link oajr.RestServlet#getPath() getPath()}
 		</ul>
 	<li>
-		The registered resource resolver is now used to instantiate objects of classes defined via <dc>@RestResource</dc>.
+		The registered resource resolver is now used to instantiate objects of classes defined via {@del @RestResource}.
 		<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 2c0ccbe..20174f5 100644
--- a/juneau-doc/docs/ReleaseNotes/8.1.0.html
+++ b/juneau-doc/docs/ReleaseNotes/8.1.0.html
@@ -211,16 +211,16 @@
 			<li class='jc'>{@link oajr.RequestAttributes}
 			<li class='jc'>{@link oajr.RestContext}
 			<ul>
-				<li class='jf'><dc>REST_attrs</dc>
+				<li class='jf'>{@del REST_attrs}
 			</ul>
 			<li class='jc'>{@link oajr.RestContextBuilder}
 			<ul>
-				<li class='jm'><dc>attrs(String...)</dc>
-				<li class='jm'><dc>attr(String,Object)</dc>
+				<li class='jm'>{@del attrs(String...)}
+				<li class='jm'>{@del attr(String,Object)}
 			</ul>
-			<li class='jc'>{@link oajr.RestMethodContext}
+			<li class='jc'>{@del oajr.RestMethodContext}
 			<ul>
-				<li class='jf'>{@link oajr.RestMethodContext#RESTMETHOD_attrs RESTMETHOD_attrs}
+				<li class='jf'>{@del oajr.RestMethodContext#RESTMETHOD_attrs RESTMETHOD_attrs}
 			</ul>
 			<li class='jc'>{@link oajr.RestRequest}
 			<ul>
@@ -232,17 +232,17 @@
 				<li class='jm'>{@link oajr.RestResponse#attr(String,Object) attr(String,Object)}
 			</ul>
 			<li class='ja'>{@link oajr.annotation.Attr}
-			<li class='ja'><dc>RestMethod#attrs()</dc>
-			<li class='ja'><dc>RestResource.attrs()</dc>
+			<li class='ja'>{@del RestMethod#attrs()}
+			<li class='ja'>{@del RestResource#attrs()}
 		</ul>
 		<br>This deprecates the following APIs:
 		<ul class='javatree'>
-			<li class='jc'>{@link oajr.RequestProperties}
-			<li class='jc'>{@link oajr.RestMethodProperties}
+			<li class='jc'>{@del oajr.RequestProperties}
+			<li class='jc'>{@del oajr.RestMethodProperties}
 			<li class='jc'>{@link oajr.RestRequest}
 			<ul>
-				<li class='jm'>{@link oajr.RestRequest#getProperties() getProperties()}
-				<li class='jm'>{@link oajr.RestRequest#prop(String,Object) prop(String,Object)}
+				<li class='jm'>{@del oajr.RestRequest#getProperties() getProperties()}
+				<li class='jm'>{@del oajr.RestRequest#prop(String,Object) prop(String,Object)}
 			</ul>
 		</ul>
 	<li>
@@ -250,8 +250,8 @@
 		<br>This fixes an issue where instances of {@link oajr.BasicRestServlet} are registered as top-level servlets even though
 		you don't want them to be.  
 		<ul class='javatree'>
-			<li class='jac'>{@link oajr.BasicRest} - Non-servlet equivalent to {@link oajr.BasicRestServlet}
-			<li class='jac'>{@link oajr.BasicRestGroup} - Non-servlet equivalent to {@link oajr.BasicRestServletGroup}
+			<li class='jac'>{@del oajr.BasicRest} - Non-servlet equivalent to {@link oajr.BasicRestServlet}
+			<li class='jac'>{@del oajr.BasicRestGroup} - Non-servlet equivalent to {@link oajr.BasicRestServletGroup}
 			<li class='jac'>{@link oajr.BasicRestJena} - Non-servlet equivalent to {@link oajr.BasicRestServletJena}
 			<li class='jac'>{@link oajr.BasicRestJenaGroup} - Non-servlet equivalent to {@link oajr.BasicRestServletJenaGroup}
 		</ul>
@@ -260,29 +260,29 @@
 	<li>
 		New annotations for simplified role-based guards on classes and methods:
 		<ul class='javatree'>
-			<li class='ja'><dc>RestResource</dc> 
+			<li class='ja'>{@del RestResource} 
 			<ul>
-				<li class='jm'><dc>roleGuard()</dc>
-				<li class='jm'><dc>rolesDeclared()</dc>
+				<li class='jm'>{@del roleGuard()}
+				<li class='jm'>{@del rolesDeclared()}
 			</ul>
-			<li class='ja'>{@link oajr.annotation.RestMethod} 
+			<li class='ja'>{@del oajr.annotation.RestMethod} 
 			<ul>
-				<li class='jm'>{@link oajr.annotation.RestMethod#roleGuard roleGuard()}
-				<li class='jm'>{@link oajr.annotation.RestMethod#rolesDeclared rolesDeclared()}
+				<li class='jm'>{@del oajr.annotation.RestMethod#roleGuard roleGuard()}
+				<li class='jm'>{@del oajr.annotation.RestMethod#rolesDeclared rolesDeclared()}
 			</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'><dc>RestResource</dc> 
+			<li class='ja'>{@del RestResource} 
 			<ul>
-				<li class='jm'><dc>allowedHeaderParams()</dc>
-				<li class='jm'><dc>allowedMethodHeaders()}</dc>
-				<li class='jm'><dc>allowedMethodParams()</dc>
+				<li class='jm'>{@del allowedHeaderParams()}
+				<li class='jm'>{@del allowedMethodHeaders()}
+				<li class='jm'>{@del allowedMethodParams()}
 			</ul>
 		</ul>
 	<li>
-		The <dc>@RestResource(path)</dc> annotation can now use variables:
+		The {@del @RestResource(path)} annotation can now use variables:
 		<p class='bcode'>
 	<ja>@RestResource</ja>(
 		path=<js>"/myResource/{foo}/{bar}"</js>
@@ -304,13 +304,13 @@
 	<li>
 		New interface method for catching arbitrary thrown objects and converting them to other throwables.
 		<ul class='javatree'>
-			<li class='jc'>{@link oajr.RestCallHandler}
+			<li class='jc'>{@del oajr.RestCallHandler}
 			<ul>
-				<li class='jm'>{@link oajr.RestCallHandler#convertThrowable(Throwable) convertThrowable(Throwable)}
+				<li class='jm'>{@del oajr.RestCallHandler#convertThrowable(Throwable) convertThrowable(Throwable)}
 			</ul>
-			<li class='jc'><dc>BasicRestCallHandler</dc>
+			<li class='jc'>{@del BasicRestCallHandler}
 			<ul>
-				<li class='jm'><dc>convertThrowable(Throwable)</dc>
+				<li class='jm'>{@del convertThrowable(Throwable)}
 			</ul>
 		</ul>
 	<li>
diff --git a/juneau-doc/docs/ReleaseNotes/8.1.1.html b/juneau-doc/docs/ReleaseNotes/8.1.1.html
index 872bd1e..efcb9b5 100644
--- a/juneau-doc/docs/ReleaseNotes/8.1.1.html
+++ b/juneau-doc/docs/ReleaseNotes/8.1.1.html
@@ -31,7 +31,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'>{@link oaj.http.exception}
+			<li class='jp'>{@del oaj.http.exception}
 			<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.
@@ -49,10 +49,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 {@link 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>
-		{@link oajr.RestException} has been deprecated and replaced by {@link oaj.http.exception.HttpException}.
+		{@del oajr.RestException} has been deprecated and replaced by {@del oaj.http.exception.HttpException}.
 	<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
@@ -66,28 +66,28 @@
 		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 {@link oajr.BasicRest} to provide feature-parity with {@link oajr.RestServlet}:
+		New methods on {@del oajr.BasicRest} to provide feature-parity with {@link oajr.RestServlet}:
 		<ul class='javatree'>
-			<li class='jc'>{@link oajr.BasicRest}
+			<li class='jc'>{@del oajr.BasicRest}
 			<ul>
-				<li class='jm'>{@link oajr.BasicRest#getContext() getContext()}
-				<li class='jm'>{@link oajr.BasicRest#getRequest() getRequest()}
-				<li class='jm'>{@link oajr.BasicRest#getResponse() getResponse()}
-				<li class='jm'>{@link oajr.BasicRest#log(String) log(String)}
-				<li class='jm'>{@link oajr.BasicRest#log(String,Throwable) log(String,Throwable)}
-				<li class='jm'>{@link oajr.BasicRest#log(Level,String,Object[]) log(Level,String,Object[])}
-				<li class='jm'><dc>logObjects(Level,String,Object[])</dc>
-				<li class='jm'>{@link oajr.BasicRest#log(Level,Throwable,String,Object[]) log(Level,Throwable,String,Object[])}
+				<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[])}
 			</ul>
 		</ul>
 	<li>
-		The <dc>@RestResource(staticFiles)</dc> annotation now supports absolute path locations and multiple mappings:
+		The {@del @RestResource(staticFiles)} annotation now supports absolute path locations and multiple mappings:
 		<p class='bcode w800'>
 	<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 <dc>@RestResource(staticFiles)</dc> where the order of lookup between parent and child resources
+		Fixed a bug in {@del @RestResource(staticFiles)} 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 069bf42..6f5479d 100644
--- a/juneau-doc/docs/ReleaseNotes/8.1.2.html
+++ b/juneau-doc/docs/ReleaseNotes/8.1.2.html
@@ -24,29 +24,29 @@
 	<li>
 		Support for read-only and write-only properties.
 		<ul>
-			<li class='ja'>{@link oaj.annotation.Bean#bpro()}
-			<li class='ja'>{@link oaj.annotation.Bean#bpwo()}
+			<li class='ja'>{@del oaj.annotation.Bean#bpro()}
+			<li class='ja'>{@del oaj.annotation.Bean#bpwo()}
 			<li class='ja'>{@link oaj.annotation.Beanp#ro()}
 			<li class='ja'>{@link oaj.annotation.Beanp#wo()}
-			<li class='jf'>{@link oaj.BeanContext#BEAN_bpro}
-			<li class='jf'>{@link oaj.BeanContext#BEAN_bpwo}
-			<li class='jm'>{@link oaj.BeanContextBuilder#bpro(Map)}
-			<li class='jm'>{@link oaj.BeanContextBuilder#bpwo(Map)}
+			<li class='jf'>{@del BEAN_bpro}
+			<li class='jf'>{@del BEAN_bpwo}
+			<li class='jm'>{@del oaj.BeanContextBuilder#bpro(Map)}
+			<li class='jm'>{@del oaj.BeanContextBuilder#bpwo(Map)}
 		</ul>
 	<li>
 		New convenience methods:
 		<ul>	
-			<li class='jm'>{@link oaj.ObjectMap#parse(CharSequence)}
-			<li class='jm'>{@link oaj.ObjectList#parse(CharSequence)}
+			<li class='jm'>{@del oaj.ObjectMap#parse(CharSequence)}
+			<li class='jm'>{@del oaj.ObjectList#parse(CharSequence)}
 		</ul>
 	<li>
 		{@link oaj.marshall.CharMarshall} and {@link oaj.marshall.StreamMarshall} now have public constructors.
 	<li>
-		{@link oaj.annotation.Beanp @Beanp} replaces {@link oaj.annotation.BeanProperty @BeanProperty}.
+		{@link oaj.annotation.Beanp @Beanp} replaces {@del oaj.annotation.BeanProperty @BeanProperty}.
 	<li>
-		{@link oaj.annotation.Beanc @Beanc} replaces {@link oaj.annotation.BeanConstructor @BeanConstructor}.
+		{@link oaj.annotation.Beanc @Beanc} replaces {@del oaj.annotation.BeanConstructor @BeanConstructor}.
 	<li>
-		{@link oaj.http.remote.Remote @Remote} replaces {@link oaj.http.remote.RemoteResource @RemoteResource}.
+		{@link oaj.http.remote.Remote @Remote} replaces {@del oaj.http.remote.RemoteResource @RemoteResource}.
 	<li>
 		Shortened names for {@link oaj.annotation.Bean#dictionary @Bean(dictionary)} and {@link oaj.BeanContextBuilder#dictionary(Object...)}.
 </ul>
@@ -54,9 +54,9 @@
 <h5 class='topic w800'>juneau-rest-server</h5>
 <ul class='spaced-list'>
 	<li>
-		{@link oajr.annotation.Rest @Rest} replaces {@link oajr.annotation.RestResource @RestResource} with shorter syntax.
+		{@link oajr.annotation.Rest @Rest} replaces {@del oajr.annotation.RestResource @RestResource} with shorter syntax.
 	<li>
-		New method {@link oajr.RestResponse#setHeaderSafe(String,String)} to strip invalid characters from header values.
+		New method {@del oajr.RestResponse#setHeaderSafe(String,String)} to strip invalid characters from header values.
 	<li>
 		Fixed issues related to invalid characters being set on HTTP header values.
 </ul>
@@ -65,7 +65,7 @@
 <ul class='spaced-list'>
 	<li>
 		{@link oajrc.RestClient} is now extendible.  The constructor has been made public and simplified to:
-		{@link oajrc.RestClient#RestClient(RestClientBuilder)}.
+		{@del oajrc.RestClient#RestClient(RestClientBuilder)}.
 	<li>
 		Duplicate methods between {@link oajrc.RestClientBuilder} and {@link org.apache.http.impl.client.HttpClientBuilder}
 		have been made deprecated on the former.  This eliminates the need to try to keep the two builder classes in
diff --git a/juneau-doc/docs/ReleaseNotes/8.1.3.html b/juneau-doc/docs/ReleaseNotes/8.1.3.html
index f853917..715ea51 100644
--- a/juneau-doc/docs/ReleaseNotes/8.1.3.html
+++ b/juneau-doc/docs/ReleaseNotes/8.1.3.html
@@ -43,7 +43,7 @@
 <h5 class='topic w800'>juneau-rest-server</h5>
 <ul class='spaced-list'>
 	<li> 
-		Fixed bug in <dc>BasicRestCallHandler</dc> where if you have the following REST methods...
+		Fixed bug in {@del BasicRestCallHandler} where if you have the following REST methods...
 		<p class='bcode w800'>
 	<ja>@RestMethod</ja>(name=<js>"GET"</js>, path=<js>"/foo"</js>)
 	<ja>@RestMethod</ja>(name=<js>"*"</js>, path=<js>"/bar"</js>)
@@ -53,7 +53,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 {@link oajr.BasicRestConfig} (and implementers):
+		<br>Solution was to add a default no-op error method to the {@del oajr.BasicRestConfig} (and implementers):
 		<p class='bcode w800'>
 	<ja>@RestMethod</ja>(name=<js>"*"</js>, path=<js>"/error"</js>)
 	<jk>public void</jk> error() {}
@@ -64,11 +64,11 @@
 	<li>
 		Renamed the following annotations:
 		<ul>
-			<li><ja>@Rest(attrs)</ja> --&gt; {@link oajr.annotation.Rest#reqAttrs() @Rest(reqAttrs)}
-			<li><ja>@Rest(defaultRequestHeaders)</ja> --&gt; {@link oajr.annotation.Rest#reqHeaders() @Rest(reqHeaders)}
-			<li><ja>@Rest(defaultResponseHeaders)</ja> --&gt; {@link oajr.annotation.Rest#resHeaders() @Rest(resHeaders)}
-			<li><ja>@RestMethod(attrs)</ja> --&gt; {@link oajr.annotation.RestMethod#reqAttrs() @RestMethod(reqAttrs)}
-			<li><ja>@RestMethod(defaultRequestHeaders)</ja> --&gt; {@link oajr.annotation.RestMethod#reqHeaders() @RestMethod(reqHeaders)}
+			<li><ja>@Rest(attrs)</ja> --&gt; {@del oajr.annotation.Rest#reqAttrs() @Rest(reqAttrs)}
+			<li><ja>@Rest(defaultRequestHeaders)</ja> --&gt; {@del oajr.annotation.Rest#reqHeaders() @Rest(reqHeaders)}
+			<li><ja>@Rest(defaultResponseHeaders)</ja> --&gt; {@del oajr.annotation.Rest#resHeaders() @Rest(resHeaders)}
+			<li><ja>@RestMethod(attrs)</ja> --&gt; {@del oajr.annotation.RestMethod#reqAttrs() @RestMethod(reqAttrs)}
+			<li><ja>@RestMethod(defaultRequestHeaders)</ja> --&gt; {@del oajr.annotation.RestMethod#reqHeaders() @RestMethod(reqHeaders)}
 		</ul>
 	<li>
 		New auto-generated REST method execution statistics: {@doc RestExecutionStatistics}
diff --git a/juneau-doc/docs/ReleaseNotes/8.2.0.html b/juneau-doc/docs/ReleaseNotes/8.2.0.html
index 070f739..4b4c57f 100644
--- a/juneau-doc/docs/ReleaseNotes/8.2.0.html
+++ b/juneau-doc/docs/ReleaseNotes/8.2.0.html
@@ -17,7 +17,7 @@
 
 <p>
 Juneau 8.2.0 is a major release. 
-The most significant change is the addition of an entirely new {@link oajr.client2.RestClient} API build from scratch
+The most significant change is the addition of an entirely new {@del oajr.client2.RestClient} 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>
@@ -59,14 +59,14 @@ The new API is located in the <c>org.apache.juneau.rest.client2</c> package and
 		<ul class='javatree'>
 			<li class='jc'>{@link oaj.BeanContextBuilder}
 			<ul>
-				<li class='jm'>{@link oaj.BeanContextBuilder#bpi(Class,String) bpi(Class,String)}
-				<li class='jm'>{@link oaj.BeanContextBuilder#bpi(String,String) bpi(String,String)}
-				<li class='jm'>{@link oaj.BeanContextBuilder#bpx(Class,String) bpx(Class,String)}
-				<li class='jm'>{@link oaj.BeanContextBuilder#bpx(String,String) bpx(String,String)}
-				<li class='jm'>{@link oaj.BeanContextBuilder#bpro(Class,String) bpro(Class,String)}
-				<li class='jm'>{@link oaj.BeanContextBuilder#bpro(String,String) bpro(String,String)}
-				<li class='jm'>{@link oaj.BeanContextBuilder#bpwo(Class,String) bpwo(Class,String}
-				<li class='jm'>{@link oaj.BeanContextBuilder#bpwo(String,String) bpwo(String,String}
+				<li class='jm'>{@del oaj.BeanContextBuilder#bpi(Class,String) bpi(Class,String)}
+				<li class='jm'>{@del oaj.BeanContextBuilder#bpi(String,String) bpi(String,String)}
+				<li class='jm'>{@del oaj.BeanContextBuilder#bpx(Class,String) bpx(Class,String)}
+				<li class='jm'>{@del oaj.BeanContextBuilder#bpx(String,String) bpx(String,String)}
+				<li class='jm'>{@del oaj.BeanContextBuilder#bpro(Class,String) bpro(Class,String)}
+				<li class='jm'>{@del oaj.BeanContextBuilder#bpro(String,String) bpro(String,String)}
+				<li class='jm'>{@del oaj.BeanContextBuilder#bpwo(Class,String) bpwo(Class,String}
+				<li class='jm'>{@del oaj.BeanContextBuilder#bpwo(String,String) bpwo(String,String}
 			</ul>
 		</ul>
 	<li>
@@ -94,7 +94,7 @@ The new API is located in the <c>org.apache.juneau.rest.client2</c> package and
 			<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> {@link oaj.annotation.URI}
+			<li class'jc'>{@link oaj.annotation.UriAnnotation} <jk>implements</jk> {@del oaj.annotation.URI}
 			<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'>{@link oaj.jso.annotation.JsoAnnotation} <jk>implements</jk> {@link oaj.jso.annotation.Jso}
@@ -168,11 +168,11 @@ The new API is located in the <c>org.apache.juneau.rest.client2</c> package and
 			<li class='jc'>{@link oaj.collections.OList}
 		</ul>
 	<li>
-		{@link oaj.ObjectMap} is being deprecated and replaced with {@link oaj.collections.OMap}.
+		{@del oaj.ObjectMap} is being deprecated and replaced with {@link oaj.collections.OMap}.
 	<li>
-		{@link oaj.ObjectList} is being deprecated and replaced with {@link oaj.collections.OList}.
+		{@del oaj.ObjectList} is being deprecated and replaced with {@link oaj.collections.OList}.
 	<li>
-		All classes in the {@link oaj.http.response} and {@link oaj.http.exception} now have <c>header(String,Object)</c>
+		All classes in the {@link oaj.http.response} and {@del oaj.http.exception} now have <c>header(String,Object)</c>
 		methods for adding response headers.
 		<p class='bcode w800'>
 	<jc>// Method that performs a BASIC Auth handshake.</jc>
@@ -269,73 +269,73 @@ The new API is located in the <c>org.apache.juneau.rest.client2</c> package and
 <h5 class='topic w800'>juneau-rest-server</h5>
 <ul class='spaced-list'>
 	<li>
-		New {@link oajr.RestContext#REST_context REST_context}/{@link oajr.annotation.Rest#context() @Rest(context)} setting to allow you to extend the {@link oajr.RestContext}
+		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}
 		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'>{@link oajr.RestCallHandler} - Normally defined through {@link oajr.annotation.Rest#callHandler() @Rest.callHandler()}.
-			<li class='jic'>{@link oajr.RestInfoProvider} - Normally defined through {@link oajr.annotation.Rest#infoProvider() @Rest.infoProvider()}.
-			<li class='jic'>{@link oajr.RestCallLogger} - Normally defined through {@link oajr.annotation.Rest#callLogger() @Rest.callLogger()}.
-			<li class='jic'>{@link oaj.utils.ClasspathResourceFinder} - Normally defined through {@link oajr.annotation.Rest#classpathResourceFinder() @Rest.classpathResourceFinder()}.
+			<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()}.
 		</ul>
-		<br>The methods added for {@link oajr.RestInfoProvider} are:
+		<br>The methods added for {@del oajr.RestInfoProvider} are:
 		<ul>
 			<li class='jac'>{@link oajr.RestServlet}
 			<ul>
-				<li class='jm'>{@link oajr.RestServlet#getSwagger(RestRequest) getSwagger(RestRequest)}
-				<li class='jm'>{@link oajr.RestServlet#getSiteName(RestRequest) getSiteName(RestRequest)}
-				<li class='jm'>{@link oajr.RestServlet#getTitle(RestRequest) getTitle(RestRequest)}
-				<li class='jm'>{@link oajr.RestServlet#getDescription(RestRequest) getDescription(RestRequest)}
-				<li class='jm'>{@link oajr.RestServlet#getMethodSummary(Method,RestRequest) getMethodSummary(Method,RestRequest)}
-				<li class='jm'>{@link oajr.RestServlet#getMethodDescription(Method,RestRequest) getMethodDescription(Method,RestRequest)}
+				<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)}
 			</ul>
-			<li class='jac'>{@link oajr.BasicRest}
+			<li class='jac'>{@del BasicRest}
 			<ul>
-				<li class='jm'>{@link oajr.BasicRest#getSwagger(RestRequest) getSwagger(RestRequest)}
-				<li class='jm'>{@link oajr.BasicRest#getSiteName(RestRequest) getSiteName(RestRequest)}
-				<li class='jm'>{@link oajr.BasicRest#getTitle(RestRequest) getTitle(RestRequest)}
-				<li class='jm'>{@link oajr.BasicRest#getDescription(RestRequest) getDescription(RestRequest)}
-				<li class='jm'>{@link oajr.BasicRest#getMethodSummary(Method,RestRequest) getMethodSummary(Method,RestRequest)}
-				<li class='jm'>{@link oajr.BasicRest#getMethodDescription(Method,RestRequest) getMethodDescription(Method,RestRequest)}
+				<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)}
 			</ul>
 		</ul>
-		<br>The methods added for {@link oajr.RestCallLogger} are:
+		<br>The methods added for {@del oajr.RestCallLogger} are:
 		<ul>
 			<li class='jac'>{@link oajr.RestServlet}
 			<ul>
-				<li class='jm'>{@link oajr.RestServlet#log(RestCallLoggerConfig,HttpServletRequest,HttpServletResponse) log(RestCallLoggerConfig,HttpServletRequest,HttpServletResponse)}
+				<li class='jm'>{@del oajr.RestServlet#log(RestCallLoggerConfig,HttpServletRequest,HttpServletResponse) log(RestCallLoggerConfig,HttpServletRequest,HttpServletResponse)}
 			</ul>
-			<li class='jac'>{@link oajr.BasicRest}
+			<li class='jac'>{@del oajr.BasicRest}
 			<ul>
-				<li class='jm'>{@link oajr.BasicRest#log(RestCallLoggerConfig,HttpServletRequest,HttpServletResponse) log(RestCallLoggerConfig,HttpServletRequest,HttpServletResponse)}
+				<li class='jm'>{@del oajr.BasicRest#log(RestCallLoggerConfig,HttpServletRequest,HttpServletResponse) log(RestCallLoggerConfig,HttpServletRequest,HttpServletResponse)}
 			</ul>
 		</ul>
-		<br>The methods added for {@link oaj.utils.ClasspathResourceFinder} are:
+		<br>The methods added for {@del oaj.utils.ClasspathResourceFinder} are:
 		<ul>
 			<li class='jac'>{@link oajr.RestServlet}
 			<ul>
-				<li class='jm'>{@link oajr.RestServlet#findResource(Class,String,Locale) findResource(Class,String,Locale)}
+				<li class='jm'>{@del oajr.RestServlet#findResource(Class,String,Locale) findResource(Class,String,Locale)}
 			</ul>
-			<li class='jac'>{@link oajr.BasicRest}
+			<li class='jac'>{@del oajr.BasicRest}
 			<ul>
-				<li class='jm'>{@link oajr.BasicRest#findResource(Class,String,Locale) findResource(Class,String,Locale)}
+				<li class='jm'>{@del oajr.BasicRest#findResource(Class,String,Locale) findResource(Class,String,Locale)}
 			</ul>
 		</ul>
-		<br>The methods added for {@link oajr.RestResourceResolver} are:
+		<br>The methods added for {@del oajr.RestResourceResolver} are:
 		<ul>
 			<li class='jac'>{@link oajr.RestServlet}
 			<ul>
-				<li class='jm'>{@link oajr.RestServlet#resolve(Object,Class,RestContextBuilder,Object...) resolve(Object,Class&lt;T&gt;,RestContextBuilder,Object...)}
+				<li class='jm'>{@del oajr.RestServlet#resolve(Object,Class,RestContextBuilder,Object...) resolve(Object,Class&lt;T&gt;,RestContextBuilder,Object...)}
 			</ul>
-			<li class='jac'>{@link oajr.BasicRest}
+			<li class='jac'>{@del oajr.BasicRest}
 			<ul>
-				<li class='jm'>{@link oajr.BasicRest#resolve(Object,Class,RestContextBuilder,Object...) resolve(Object,Class&lt;T&gt;,RestContextBuilder,Object...)}
+				<li class='jm'>{@del oajr.BasicRest#resolve(Object,Class,RestContextBuilder,Object...) resolve(Object,Class&lt;T&gt;,RestContextBuilder,Object...)}
 			</ul>
 		</ul>
 	<li>
-		Added the following convenience hook methods on the {@link oajr.RestServlet} and {@link oajr.BasicRest} classes:
+		Added the following convenience hook methods on the {@link oajr.RestServlet} and {@del oajr.BasicRest} classes:
 		<ul>
 			<li class='jac'>{@link oajr.RestServlet}
 			<ul>
@@ -348,16 +348,16 @@ The new API is located in the <c>org.apache.juneau.rest.client2</c> package and
 				<li class='jm'>{@link oajr.RestServlet#onPostCall(RestRequest,RestResponse) onPostCall(RestRequest,RestResponse)}
 				<li class='jm'>{@link oajr.RestServlet#onEndCall(HttpServletRequest,HttpServletResponse) onEndCall(HttpServletRequest,HttpServletResponse)}
 			</ul>
-			<li class='jac'>{@link oajr.BasicRest}
+			<li class='jac'>{@del oajr.BasicRest}
 			<ul>
-				<li class='jm'>{@link oajr.BasicRest#onInit(RestContextBuilder) onInit(RestContextBuilder)}
-				<li class='jm'>{@link oajr.BasicRest#onPostInit(RestContext) onPostInit(RestContext)}
-				<li class='jm'>{@link oajr.BasicRest#onPostInitChildFirst(RestContext) onPostInitChildFirst(RestContext)}
-				<li class='jm'>{@link oajr.BasicRest#onDestroy(RestContext) onDestroy(RestContext)}
-				<li class='jm'>{@link oajr.BasicRest#onStartCall(HttpServletRequest,HttpServletResponse) onStartCall(HttpServletRequest,HttpServletResponse)}
-				<li class='jm'>{@link oajr.BasicRest#onPreCall(RestRequest,RestResponse) onPreCall(RestRequest,RestResponse)}
-				<li class='jm'>{@link oajr.BasicRest#onPostCall(RestRequest,RestResponse) onPostCall(RestRequest,RestResponse)}
-				<li class='jm'>{@link oajr.BasicRest#onEndCall(HttpServletRequest,HttpServletResponse) onEndCall(HttpServletRequest,HttpServletResponse)}
+				<li class='jm'>{@del oajr.BasicRest#onInit(RestContextBuilder) onInit(RestContextBuilder)}
+				<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)}
 			</ul>
 		</ul>
 	<li>
@@ -377,17 +377,17 @@ The new API is located in the <c>org.apache.juneau.rest.client2</c> package and
 		}
 		 </p>
 	<li>
-		{@link oajr.BasicRestConfig} has been broken up into {@link oajr.BasicRestConfig} and {@link oajr.BasicRestMethods} so that
+		{@del oajr.BasicRestConfig} has been broken up into {@del BasicRestConfig} and {@del oajr.BasicRestMethods} 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'>{@link oajr.RestCallHandler}
-			<li class='jc'>{@link oajr.RestCallLogger}
-			<li class='jc'>{@link oajr.RestInfoProvider}
-			<li class='jc'>{@link oaj.utils.ClasspathResourceFinder}
-			<li class='jc'>{@link oajr.RestResourceResolver}
+			<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'>{@link oajr.RestGuard}
 			<li class='jc'>{@link oajr.ResponseHandler}
 		</ul>
@@ -413,7 +413,7 @@ The new API is located in the <c>org.apache.juneau.rest.client2</c> package and
 		</p>
 		<br>This allows the child resource to be mapped to multiple parents that may resolve various different path variables.
 	<li>
-		New {@link oajr.annotation.RestMethod#paths() @RestMethod(paths)} annotation that allows you to map multiple
+		New {@del oajr.annotation.RestMethod#paths() @RestMethod(paths)} annotation that allows you to map multiple
 		paths to the same Java method.
 		<br>Example:
 		<p class='bcode w800'>
@@ -424,7 +424,7 @@ The new API is located in the <c>org.apache.juneau.rest.client2</c> package and
 	<jk>public</jk> String doGet(<ja>@Path</ja>(name=<js>"foo"</js>,required=<jk>false</jk>) String foo) {...}
 		</p>
 	<li>
-		The {@link oajr.annotation.RestMethod @RestMethod} annotation is now implied on all unannotated methods of a {@link oajr.annotation.Rest @Rest}-annotated
+		The {@del oajr.annotation.RestMethod @RestMethod} annotation is now implied on all unannotated methods of a {@link oajr.annotation.Rest @Rest}-annotated
 		interface.
 		<p class='bcode w800'>
 	<ja>@Rest
@@ -439,7 +439,7 @@ The new API is located in the <c>org.apache.juneau.rest.client2</c> package and
 <h5 class='topic w800'>juneau-rest-server-springboot</h5>
 <ul class='spaced-list'>
 	<li>
-		{@link oajr.springboot.JuneauRestInitializer} now provides a no-arg constructor so that it can be used in
+		{@del oajr.springboot.JuneauRestInitializer} 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>
@@ -477,7 +477,7 @@ The new API is located in the <c>org.apache.juneau.rest.client2</c> package and
 	<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>{@link oaj.http.remote.Remote#headerSupplier headerSupplier} - Adds a dynamic supplier of headers to all requests.
+		<li>{@del headerSupplier} - Adds a dynamic supplier of headers to all requests.
 	</ul>
 </ul>
 
@@ -485,6 +485,6 @@ The new API is located in the <c>org.apache.juneau.rest.client2</c> package and
 <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 {@link oajr.mock2.MockRestClient} class.  All REST test mocking can be 
+		have been moved into the improved {@del oajr.mock2.MockRestClient} class.  All REST test mocking can be 
 		done through this single class.
 </ui>
diff --git a/juneau-doc/docs/ReleaseNotes/9.0.0.html b/juneau-doc/docs/ReleaseNotes/9.0.0.html
index e5b5031..9fb699c 100644
--- a/juneau-doc/docs/ReleaseNotes/9.0.0.html
+++ b/juneau-doc/docs/ReleaseNotes/9.0.0.html
@@ -19,12 +19,24 @@
 Juneau 9.0.0 is a major release. 
 </p>
 
+<h5 class='topic w800'>General changes</h5>
+<ul class='spaced-list'>
+	<li>Configuration property names that are enabled by default have been replaced with disabler properties.
+		<br>For example, <jsf>BEAN_useInterfaceProxies</jsf> which was enabled by default has been replaced with <jsf>BEAN_disableUseInterfaceProxies</jsf>.
+</ul>
+
 <h5 class='topic w800'>juneau-marshall</h5>
 <ul class='spaced-list'>
 	<li>
-		New {@link aoj.annotation.Marshalled @Marshalled} annotation for non-bean classes.
+		New {@del oaj.annotation.Marshalled @Marshalled} annotation for non-bean classes.
+	<li>
+		New {@link oaj.annotation.Bean#example() @Bean(example)} annotation.
 	<li>
-		New {@link aoj.annotation.Bean#example() @Bean(example)} annotation.
+		Changes to {@link oaj.annotation.Bean @Bean} annotation.
+		<ul>
+			<li><c>@Bean(bpi|bpx|bpro|bpwo)</c> replaced with <c>@Bean(properties|propertiesExclude|propertiesReadOnly|propertiesWriteOnly|p|xp|ro|o)</c>
+			<li>New {@link oaj.annotation.Bean#example() @Bean(example)} annotation.
+		</ul>
 	<li>
 		Eliminated the various <c><ja>@XConfig</ja>(applyX={...})</c> annotations and replaced them with the ability
 		to apply targeted annotations directly to configuration classes and methods (such as REST classes/methods).
@@ -41,13 +53,13 @@ Juneau 9.0.0 is a major release.
 	}
 		</p>
 	<li>
-		New shortened form {@link oaj.http.remote.annotation.RemoteMethod#value()} for specifying http method name and path.
+		New shortened form {@link oaj.http.remote.RemoteOp#value()} for specifying http method name and path.
 		<p class='bpcode w800'>
 	<jc>// Normal form</jc>
-	<ja>@RemoteMethod</ja>(method=<jsf>PUT</jsf>, path=<js>"/foo"</js>)
+	<ja>@RemoteOp</ja>(method=<jsf>PUT</jsf>, path=<js>"/foo"</js>)
 	
 	<jc>// Shortened form</jc>
-	<ja>@RemoteMethod</ja>(<js>"PUT /foo"</js>)
+	<ja>@RemoteOp</ja>(<js>"PUT /foo"</js>)
 		</p>
 </ul>
 
@@ -58,7 +70,7 @@ Juneau 9.0.0 is a major release.
 	<li>
 		Removed the <c><ja>@RestMethod</ja>(name)</c> annotation.  Use <c><ja>@RestMethod</ja>(method)</c> instead.
 	<li>
-		New shortened form {@link oajr.annotation.RestMethod#value()} for specifying http method name and path.
+		New shortened form {@del oajr.annotation.RestMethod#value()} for specifying http method name and path.
 		<p class='bpcode w800'>
 	<jc>// Normal form</jc>
 	<ja>@RestMethod</ja>(method=<jsf>PUT</jsf>, path=<js>"/{propertyName}"</js>)
diff --git a/juneau-doc/docs/Topics/02.juneau-marshall/05.JavaBeansSupport.html b/juneau-doc/docs/Topics/02.juneau-marshall/05.JavaBeansSupport.html
index 4a7fa6e..a3320db 100644
--- a/juneau-doc/docs/Topics/02.juneau-marshall/05.JavaBeansSupport.html
+++ b/juneau-doc/docs/Topics/02.juneau-marshall/05.JavaBeansSupport.html
@@ -13,7 +13,7 @@
  ***************************************************************************************************************************/
  -->
 
-{title:'Java Beans Support', created:'8.2.0'} 
+{title:'Java Beans Support', created:'8.2.0', flags:'todo'} 
 
 <p>
 	Out-of-the-box, Juneau supports marshalling of Java beans with standard public getters and setters, public
@@ -68,34 +68,34 @@
 	Several settings exist to allow you to customize how bean properties are handled by serializers and parsers:
 </p>
 <ul class='javatree'>
-	<li class='jc'>{@link oaj.BeanContext}
+	<li class='jc'>{@link oaj.BeanContextBuilder}
 	<ul>
-		<li class='jf'>{@link oaj.BeanContext#BEAN_beanClassVisibility BEAN_beanClassVisibility} - Allows non-public POJOs to be treated as beans.
-		<li class='jf'>{@link oaj.BeanContext#BEAN_beanConstructorVisibility BEAN_beanConstructorVisibility} - Allows non-public constructors to be used on beans.
-		<li class='jf'>{@link oaj.BeanContext#BEAN_beanFieldVisibility BEAN_beanFieldVisibility} - Allows non-public fields to be used as bean properties.
-		<li class='jf'>{@link oaj.BeanContext#BEAN_beanMethodVisibility BEAN_beanMethodVisibility} - Allows non-public methods to be used as bean getters and setters.
-		<li class='jf'>{@link oaj.BeanContext#BEAN_beansRequireDefaultConstructor BEAN_beansRequireDefaultConstructor} - Don't treat a POJO as a bean if it doesn't have a default no-arg constructor.
-		<li class='jf'>{@link oaj.BeanContext#BEAN_beansRequireSerializable BEAN_beansRequireSerializable} - Don't treat a POJO as a bean if it doesn't implement <c>Serializable</c>.
-		<li class='jf'>{@link oaj.BeanContext#BEAN_beansRequireSettersForGetters BEAN_beansRequireSettersForGetters} - Ignore getter methods if they don't have setter methods.
-		<li class='jf'>{@link oaj.BeanContext#BEAN_beansRequireSomeProperties BEAN_beansRequireSomeProperties} - Don't treat a POJO as a bean if it doesn't have at least one property defined.
+		<li class='jm'>{@link oaj.BeanContextBuilder#beanClassVisibility(Visibility) beanClassVisibility(Visibility)} - Allows non-public POJOs to be treated as beans.
+		<li class='jm'>{@link oaj.BeanContextBuilder#beanConstructorVisibility beanConstructorVisibility(Visibility)} - Allows non-public constructors to be used on beans.
+		<li class='jm'>{@link oaj.BeanContextBuilder#beanFieldVisibility beanFieldVisibility(Visibility)} - Allows non-public fields to be used as bean properties.
+		<li class='jm'>{@link oaj.BeanContextBuilder#beanMethodVisibility beanMethodVisibility(Visibility)} - Allows non-public methods to be used as bean getters and setters.
+		<li class='jm'>{@link oaj.BeanContextBuilder#beansRequireDefaultConstructor() beansRequireDefaultConstructor()} - Don't treat a POJO as a bean if it doesn't have a default no-arg constructor.
+		<li class='jm'>{@link oaj.BeanContextBuilder#beansRequireSerializable() beansRequireSerializable()} - Don't treat a POJO as a bean if it doesn't implement <c>Serializable</c>.
+		<li class='jm'>{@link oaj.BeanContextBuilder#beansRequireSettersForGetters beansRequireSettersForGetters} - Ignore getter methods if they don't have setter methods.
+		<li class='jm'>{@link oaj.BeanContextBuilder#disableBeansRequireSomeProperties disableBeansRequireSomeProperties} - Don't treat a POJO as a bean if it doesn't have at least one property defined.
 	</ul>
 </ul>
 <p>
 	Settings and equivalent annotations are also available to control which properties are marshalled and how they are ordered.
 </p>
 <ul class='javatree'>
-	<li class='jc'>{@link oaj.BeanContext}
+	<li class='jc'>{@link oaj.BeanContextBuilder}
 	<ul>
-		<li class='jf'>{@link oaj.BeanContext#BEAN_bpi BEAN_bpi} - Specifies properties to include and property order during marshalling.
-		<li class='jf'>{@link oaj.BeanContext#BEAN_bpx BEAN_bpx} - Specifies properties to exclude during marshalling.
-		<li class='jf'>{@link oaj.BeanContext#BEAN_bpro BEAN_bpro} - Specifies read-only properties (ignored during parsing).
-		<li class='jf'>{@link oaj.BeanContext#BEAN_bpwo BEAN_bpwo} - Specifies write-only properties (ignored during reading).
+		<li class='jm'>{@link oaj.BeanContextBuilder#beanProperties(Class,String) beanProperties(Class,String)} - Specifies properties to include and property order during marshalling.
+		<li class='jm'>{@link oaj.BeanContextBuilder#beanPropertiesExcludes(Class,String) beanPropertiesExcludes(Class,String)} - Specifies properties to exclude during marshalling.
+		<li class='jm'>{@link oaj.BeanContextBuilder#beanPropertiesReadOnly(Class,String) beanPropertiesReadOnly(Class,String) } - Specifies read-only properties (ignored during parsing).
+		<li class='jm'>{@link oaj.BeanContextBuilder#beanPropertiesWriteOnly(Class,String) beanPropertiesWriteOnly(Class,String)} - Specifies write-only properties (ignored during reading).
 	</ul>
 </ul>
 <p>
-	It's common to use the {@link oaj.annotation.Bean#bpi @Bean(bpi)} annotation to force the ordering
+	It's common to use the {@link oaj.annotation.Bean#properties @Bean(properties|p)} annotation to force the ordering
 	of properties during marshalling.  IBM JVMs keep the ordering of fields and methods in the compiled bytecode, but
-	Oracle JVMs do not and return fields/methods in random order.  The {@link oaj.annotation.Bean#bpi @Bean(bpi)} annotation was added to 
+	Oracle JVMs do not and return fields/methods in random order.  The {@link oaj.annotation.Bean#properties @Bean(properties|p)} annotation was added to 
 	help with this limitation.
 </p>
 <p class='bpcode w800'>
diff --git a/juneau-doc/docs/Topics/02.juneau-marshall/05.JavaBeansSupport/01.BeanAnnotation.html b/juneau-doc/docs/Topics/02.juneau-marshall/05.JavaBeansSupport/01.BeanAnnotation.html
index e2cdfd3..5bdea06 100644
--- a/juneau-doc/docs/Topics/02.juneau-marshall/05.JavaBeansSupport/01.BeanAnnotation.html
+++ b/juneau-doc/docs/Topics/02.juneau-marshall/05.JavaBeansSupport/01.BeanAnnotation.html
@@ -13,7 +13,7 @@
  ***************************************************************************************************************************/
  -->
 
-{title:'@Bean Annotation', updated:'8.2.0'} 
+{title:'@Bean Annotation', updated:'8.2.0', flags:'review'} 
 
 <p>
 	The {@link oaj.annotation.Bean @Bean} annotation is used to tailor how beans are 
@@ -30,7 +30,7 @@
 	<jk>public class</jk> Address { ... }
 </p>
 <p> 
-	Bean properties can be excluded using the {@link oaj.annotation.Bean#bpx() @Bean(bpx)}
+	Bean properties can be excluded using the {@link oaj.annotation.Bean#excludeProperties() @Bean(excludeProperties|xp)}
 	annotation.
 </p>
 <p class='bpcode w800'>
diff --git a/juneau-doc/docs/Topics/02.juneau-marshall/05.JavaBeansSupport/02.BeanpAnnotation.html b/juneau-doc/docs/Topics/02.juneau-marshall/05.JavaBeansSupport/02.BeanpAnnotation.html
index fc158ea..565f490 100644
--- a/juneau-doc/docs/Topics/02.juneau-marshall/05.JavaBeansSupport/02.BeanpAnnotation.html
+++ b/juneau-doc/docs/Topics/02.juneau-marshall/05.JavaBeansSupport/02.BeanpAnnotation.html
@@ -13,7 +13,7 @@
  ***************************************************************************************************************************/
  -->
 
-{title:'@Beanp Annotation', updated:'8.1.0,8.1.2'} 
+{title:'@Beanp Annotation', updated:'8.1.0,8.1.2', flags:'todo'} 
 
 <p>
 	The {@link oaj.annotation.Beanp @Beanp} annotation is used to tailor how 
@@ -157,7 +157,7 @@
 	}
 </p>
 <p>
-	The {@link oaj.annotation.BeanProperty#params() @Beanp(params)} annotation
+	The {@link oaj.annotation.Beanp#params() @Beanp(params)} annotation
 	is for bean properties of type map or collection.
 	It's used to identify the class types of the contents of the bean property object when
 	the general parameter types are interfaces or abstract classes.
diff --git a/juneau-doc/docs/Topics/02.juneau-marshall/05.JavaBeansSupport/08.BeanFilters.html b/juneau-doc/docs/Topics/02.juneau-marshall/05.JavaBeansSupport/08.BeanFilters.html
index 9f49ced..6a4e4ff 100644
--- a/juneau-doc/docs/Topics/02.juneau-marshall/05.JavaBeansSupport/08.BeanFilters.html
+++ b/juneau-doc/docs/Topics/02.juneau-marshall/05.JavaBeansSupport/08.BeanFilters.html
@@ -13,10 +13,10 @@
  ***************************************************************************************************************************/
  -->
 
-{title:'BeanFilter Class'}
+{title:'BeanFilter Class', flags:'todo'}
 
 <p>
-	The {@link oaj.transform.BeanFilter} class is the programmatic equivalent to the
+	The {@del oaj.transform.BeanFilter} class is the programmatic equivalent to the
 	{@link oaj.annotation.Bean @Bean} annotation.
 </p>
 <p>
@@ -26,7 +26,7 @@
 	to existing code.
 </p>
 <p>
-	Bean filters are defined through {@link oaj.transform.BeanFilterBuilder BeanFilterBuilders}.
+	Bean filters are defined through {@del oaj.transform.BeanFilterBuilder BeanFilterBuilders}.
 </p>
 <p>
 	In the previous examples, we defined this bean annotation:
@@ -51,8 +51,8 @@
 	Bean filters are added to serializers and parsers using the following:
 </p>
 <ul class='javatree'>
-	<li class='jf'>{@link oaj.BeanContext#BEAN_beanFilters}
-	<li class='jm'>{@link oaj.BeanContextBuilder#beanFilters(Object...)}
+	<li class='jf'>{@del BEAN_beanFilters}
+	<li class='jm'>{@del BeanContextBuilder#beanFilters(Object...)}</dc>
 </ul>
 <p>
 	For example:
@@ -69,8 +69,8 @@
 	The annotations will be detected and bean filters will automatically be created for them.
 </p>
 <p>
-	The {@link oaj.BeanContextBuilder#beanFilters(Object...)} method also allows you to pass in interfaces.
-	Any class that's not a subclass of {@link oaj.transform.BeanFilterBuilder} get interpreted 
+	The {@del BeanContextBuilder#beanFilters(Object...)} method also allows you to pass in interfaces.
+	Any class that's not a subclass of {@del oaj.transform.BeanFilterBuilder} get interpreted 
 	as bean interface classes.
 	These cause bean implementations of those interfaces to only expose the properties defined on the 
 	interface.
diff --git a/juneau-doc/docs/Topics/02.juneau-marshall/05.JavaBeansSupport/09.InterfaceFilters.html b/juneau-doc/docs/Topics/02.juneau-marshall/05.JavaBeansSupport/09.InterfaceFilters.html
index 400f0c0..3b7b4f1 100644
--- a/juneau-doc/docs/Topics/02.juneau-marshall/05.JavaBeansSupport/09.InterfaceFilters.html
+++ b/juneau-doc/docs/Topics/02.juneau-marshall/05.JavaBeansSupport/09.InterfaceFilters.html
@@ -13,7 +13,7 @@
  ***************************************************************************************************************************/
  -->
 
-{title:'Interface Filters'}
+{title:'Interface Filters', flags:'todo'}
 
 <p>
 	Occasionally, you may want to limit bean properties to only those defined on a parent class or interface.  
@@ -23,9 +23,9 @@
 	Interface filters are defined through the following:
 </p>
 <ul class='javatree'>
-	<li class='jf'>{@link oaj.BeanContext#BEAN_beanFilters}
+	<li class='jf'>{@del BeanContext#BEAN_beanFilters}
 	<li class='ja'>{@link oaj.annotation.Bean#interfaceClass() Bean(interfaceClass)}
-	<li class='jm'>{@link oaj.transform.BeanFilterBuilder#interfaceClass(Class)}
+	<li class='jm'>{@del oaj.transform.BeanFilterBuilder#interfaceClass(Class)}
 </ul>
 <p>
 	For example, let's define the following interface and implementation:
@@ -71,7 +71,7 @@
 	String <jv>json</jv> = <jv>serializer</jv>.serialize(<jv>object</jv>);  
 </p>	
 <p>
-	The {@link oaj.BeanContextBuilder#beanFilters(Object...)} method will automatically interpret any 
+	The {@del BeanContextBuilder#beanFilters(Object...)} method will automatically interpret any 
 	non-<c>BeanFilter</c> classes passed in as meaning interface classes. 
 	So in the previous example, the <c>BeanFilter</c> class could have been avoided altogether by just 
 	passing in <c>MyInterface.<jk>class</jk></c> to the serializer, like so:
diff --git a/juneau-doc/docs/Topics/02.juneau-marshall/05.JavaBeansSupport/10.StopClasses.html b/juneau-doc/docs/Topics/02.juneau-marshall/05.JavaBeansSupport/10.StopClasses.html
index 8205037..ac910ab 100644
--- a/juneau-doc/docs/Topics/02.juneau-marshall/05.JavaBeansSupport/10.StopClasses.html
+++ b/juneau-doc/docs/Topics/02.juneau-marshall/05.JavaBeansSupport/10.StopClasses.html
@@ -13,7 +13,7 @@
  ***************************************************************************************************************************/
  -->
 
-{title:'Stop Classes'}
+{title:'Stop Classes', flags:'todo'}
 
 <p>
 	Whereas interface filters limit properties defined on child classes, stop filters 
@@ -24,7 +24,7 @@
 </p>
 <ul class='javatree'>
 	<li class='ja'>{@link oaj.annotation.Bean#stopClass() Bean(stopClass)}
-	<li class='jf'>{@link oaj.transform.BeanFilterBuilder#stopClass(Class)}
+	<li class='jf'>{@del oaj.transform.BeanFilterBuilder#stopClass(Class)}
 </ul>
 <p>
 	Stop classes are identical in purpose to the stop class specified by {@link java.beans.Introspector#getBeanInfo(Class, Class)}.
diff --git a/juneau-doc/docs/Topics/02.juneau-marshall/10.ConfigurableAnnotations.html b/juneau-doc/docs/Topics/02.juneau-marshall/10.ConfigurableAnnotations.html
index 50a34b8..6f3599a 100644
--- a/juneau-doc/docs/Topics/02.juneau-marshall/10.ConfigurableAnnotations.html
+++ b/juneau-doc/docs/Topics/02.juneau-marshall/10.ConfigurableAnnotations.html
@@ -13,7 +13,7 @@
  ***************************************************************************************************************************/
  -->
 
-{title:'Configurable Annotations', created:'8.1.0', updated:'8.1.3,8.2.0'} 
+{title:'Configurable Annotations', created:'8.1.0', updated:'8.1.3,8.2.0', flags:'todo'} 
 
 <p>
 	All configurable properties described in the previous section have annotation equivalents that can be applied on
@@ -134,7 +134,7 @@
 	<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> {@link oaj.annotation.URI}
+	<li class'jc'>{@link oaj.annotation.UriAnnotation} <jk>implements</jk> {@link oaj.annotation.Uri}
 	<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'>{@link oaj.jso.annotation.JsoAnnotation} <jk>implements</jk> {@link oaj.jso.annotation.Jso}
diff --git a/juneau-doc/docs/Topics/02.juneau-marshall/11.OMap.html b/juneau-doc/docs/Topics/02.juneau-marshall/11.OMap.html
index 4dd790a..bc2b0c0 100644
--- a/juneau-doc/docs/Topics/02.juneau-marshall/11.OMap.html
+++ b/juneau-doc/docs/Topics/02.juneau-marshall/11.OMap.html
@@ -53,8 +53,8 @@
 </p>
 <ol class='spaced-list'>
 	<li>
-		Using the provided {@link oaj.collections.OMap#serializeTo(java.io.Writer)} or 
-		{@link oaj.collections.OList#serializeTo(java.io.Writer)} methods.
+		Using the provided {@link oaj.collections.OMap#writeTo(java.io.Writer)} or 
+		{@link oaj.collections.OList#writeTo(java.io.Writer)} methods.
 	<li>
 		Passing them to one of the {@link oaj.serializer.Serializer} serialize methods.
 	<li>
diff --git a/juneau-doc/docs/Topics/02.juneau-marshall/14.Transforms.html b/juneau-doc/docs/Topics/02.juneau-marshall/14.Transforms.html
index 0ea132c..610c0af 100644
--- a/juneau-doc/docs/Topics/02.juneau-marshall/14.Transforms.html
+++ b/juneau-doc/docs/Topics/02.juneau-marshall/14.Transforms.html
@@ -13,7 +13,7 @@
  ***************************************************************************************************************************/
  -->
 
-{title:'Transforms'}
+{title:'Transforms', flags:'todo'}
 
 <p>
 	By default, the Juneau framework can serialize and parse a wide variety of POJOs out-of-the-box.  
@@ -21,7 +21,7 @@
 	These classes are:
 </p>
 <ul class='javatree'>
-	<li class='jc'>{@link oaj.transform.BeanFilter} - Transforms that alter the way beans are handled.
+	<li class='jc'>{@del oaj.transform.BeanFilter} - Transforms that alter the way beans are handled.
 	<li class='jac'>{@link oaj.transform.PojoSwap} - Transforms that swap non-serializable POJOs with 
 		serializable POJOs during serialization (and optionally vis-versa during parsing).
 		<ul>
@@ -38,7 +38,7 @@
 <ul class='javatree'>
 	<li class='jc'>{@link oaj.BeanContext}
 	<ul>
-		<li class='jf'>{@link oaj.BeanContext#BEAN_beanFilters BEAN_beanFilters}
+		<li class='jf'>{@del BeanContext#BEAN_beanFilters BEAN_beanFilters}
 		<li class='jf'>{@link oaj.BeanContext#BEAN_swaps BEAN_swaps}
 	</ul>
 </ul>
@@ -68,6 +68,6 @@
 		{@link oaj.annotation.ParentProperty} 
 		- Identifies a setter as a method for adding a parent reference to a child object.
 	<li class='ja'>
-		{@link oaj.annotation.URI} 
+		{@link oaj.annotation.Uri} 
 		- Used to identify a class or bean property as a URI.
 </ul>
diff --git a/juneau-doc/docs/Topics/02.juneau-marshall/14.Transforms/06.SwapAnnotation.html b/juneau-doc/docs/Topics/02.juneau-marshall/14.Transforms/06.SwapAnnotation.html
index 67c0a21..cb4dad3 100644
--- a/juneau-doc/docs/Topics/02.juneau-marshall/14.Transforms/06.SwapAnnotation.html
+++ b/juneau-doc/docs/Topics/02.juneau-marshall/14.Transforms/06.SwapAnnotation.html
@@ -13,7 +13,7 @@
  ***************************************************************************************************************************/
  -->
 
-{title:'@Swap Annotation', updated:'8.0.0'} 
+{title:'@Swap Annotation', updated:'8.0.0', flags:'todo'} 
 
 <p>
 	{@link oaj.annotation.Swap @Swap} can be used to associate a swap class using an 
@@ -37,7 +37,7 @@
 	}
 </p>
 <p>
-	Multiple swaps can be associated with a POJO by using the {@link oaj.annotation.Swaps @Swaps} annotation:
+	Multiple swaps can be associated with a POJO by using the {@del oaj.annotation.Swaps @Swaps} annotation:
 </p>
 <p class='bpcode w800'>
 	<ja>@Swaps</ja>(
diff --git a/juneau-doc/docs/Topics/02.juneau-marshall/15.DynamicallyAppliedAnnotations.html b/juneau-doc/docs/Topics/02.juneau-marshall/15.DynamicallyAppliedAnnotations.html
index 16d7c8e..4c549b5 100644
--- a/juneau-doc/docs/Topics/02.juneau-marshall/15.DynamicallyAppliedAnnotations.html
+++ b/juneau-doc/docs/Topics/02.juneau-marshall/15.DynamicallyAppliedAnnotations.html
@@ -74,7 +74,7 @@
 	<li class='ja'>{@link oaj.annotation.NameProperty}
 	<li class='ja'>{@link oaj.annotation.ParentProperty}
 	<li class='ja'>{@link oaj.annotation.Swap}
-	<li class='ja'>{@link oaj.annotation.URI}
+	<li class='ja'>{@link oaj.annotation.Uri}
 	<li class='ja'>{@link oaj.csv.annotation.Csv}
 	<li class='ja'>{@link oaj.html.annotation.Html}
 	<li class='ja'>{@link oaj.jso.annotation.Jso}
diff --git a/juneau-doc/docs/Topics/02.juneau-marshall/17.VirtualBeans.html b/juneau-doc/docs/Topics/02.juneau-marshall/17.VirtualBeans.html
index da37e1f..eb6ab2f 100644
--- a/juneau-doc/docs/Topics/02.juneau-marshall/17.VirtualBeans.html
+++ b/juneau-doc/docs/Topics/02.juneau-marshall/17.VirtualBeans.html
@@ -13,10 +13,10 @@
  ***************************************************************************************************************************/
  -->
 
-{title:'Virtual Beans'}
+{title:'Virtual Beans', flags:'todo'}
 
 <p>
-	The {@link oaj.BeanContext#BEAN_useInterfaceProxies} setting (enabled by default) allows
+	The {@link oaj.BeanContextBuilder#disableInterfaceProxies()} setting (enabled by default) allows
 	the Juneau parsers to parse content into virtual beans (bean interfaces without implementation classes).
 </p>
 <p>
diff --git a/juneau-doc/docs/Topics/02.juneau-marshall/21.MarshallingUris.html b/juneau-doc/docs/Topics/02.juneau-marshall/21.MarshallingUris.html
index 8ce1cd2..f01cfdb 100644
--- a/juneau-doc/docs/Topics/02.juneau-marshall/21.MarshallingUris.html
+++ b/juneau-doc/docs/Topics/02.juneau-marshall/21.MarshallingUris.html
@@ -126,7 +126,7 @@
 <p>
 	Juneau automatically interprets any {@link java.net.URL} and {@link java.net.URI} objects as URIs and will
 	resolve them accordingly.
-	The {@link oaj.annotation.URI @URI} annotation can be used to extend that to other bean 
+	The {@link oaj.annotation.Uri @Uri} annotation can be used to extend that to other bean 
 	properties and class types so that they also get interpreted as URIs.
 	For example:
 </p>
diff --git a/juneau-doc/docs/Topics/02.juneau-marshall/22.JacksonComparison.html b/juneau-doc/docs/Topics/02.juneau-marshall/22.JacksonComparison.html
index 3911198..f8890fb 100644
--- a/juneau-doc/docs/Topics/02.juneau-marshall/22.JacksonComparison.html
+++ b/juneau-doc/docs/Topics/02.juneau-marshall/22.JacksonComparison.html
@@ -13,7 +13,7 @@
  ***************************************************************************************************************************/
  -->
 
-{title:'Comparison with Jackson'}
+{title:'Comparison with Jackson', flags:'review'}
 
 <p>
 	Juneau was developed independently from Jackson, but shares many of the same features and capabilities.
@@ -57,7 +57,7 @@
 	<tr>
 		<td><c><ja>@JsonIgnoreProperties</ja>({...})</c></td>
 		<td>
-			{@link oaj.annotation.Bean#bpx @Bean(bpx="...")}
+			{@link oaj.annotation.Bean#excludeProperties @Bean(excludeProperties|xp)}
 		</td>
 	</tr>
 	<tr>
diff --git a/juneau-doc/docs/Topics/02.juneau-marshall/26.XmlDetails/02.XmlSerializers.html b/juneau-doc/docs/Topics/02.juneau-marshall/26.XmlDetails/02.XmlSerializers.html
index 67e2e7f..659e983 100644
--- a/juneau-doc/docs/Topics/02.juneau-marshall/26.XmlDetails/02.XmlSerializers.html
+++ b/juneau-doc/docs/Topics/02.juneau-marshall/26.XmlDetails/02.XmlSerializers.html
@@ -13,7 +13,7 @@
  ***************************************************************************************************************************/
  -->
 
-{title:'XML Serializers'}
+{title:'XML Serializers', flags:'todo'}
 
 <p>
 	The {@link oaj.xml.XmlSerializer} class is used to serialize POJOs into XML.
@@ -31,11 +31,10 @@
 	<ul>
 		<li class='jf'>{@link oaj.xml.XmlSerializer#XML_addBeanTypes XML_addBeanTypes}
 		<li class='jf'>{@link oaj.xml.XmlSerializer#XML_addNamespaceUrisToRoot XML_addNamespaceUrisToRoot}
-		<li class='jf'>{@link oaj.xml.XmlSerializer#XML_autoDetectNamespaces XML_autoDetectNamespaces}
+		<li class='jf'>{@link oaj.xml.XmlSerializer#XML_disableAutoDetectNamespaces XML_disableAutoDetectNamespaces}
 		<li class='jf'>{@link oaj.xml.XmlSerializer#XML_defaultNamespace XML_defaultNamespace}
 		<li class='jf'>{@link oaj.xml.XmlSerializer#XML_enableNamespaces XML_enableNamespaces}
 		<li class='jf'>{@link oaj.xml.XmlSerializer#XML_namespaces XML_namespaces}
-		<li class='jf'>{@link oaj.xml.XmlSerializer#XML_xsNamespace XML_xsNamespace}
 	</ul>
 </ul>
 <p>
diff --git a/juneau-doc/docs/Topics/02.juneau-marshall/26.XmlDetails/07.XmlNamespaces.html b/juneau-doc/docs/Topics/02.juneau-marshall/26.XmlDetails/07.XmlNamespaces.html
index 70483ac..dae00a4 100644
--- a/juneau-doc/docs/Topics/02.juneau-marshall/26.XmlDetails/07.XmlNamespaces.html
+++ b/juneau-doc/docs/Topics/02.juneau-marshall/26.XmlDetails/07.XmlNamespaces.html
@@ -13,7 +13,7 @@
  ***************************************************************************************************************************/
  -->
 
-{title:'Namespaces'}
+{title:'Namespaces', flags:'review'}
 
 <p>
 	Let's go back to the example of our original <c>Person</c> bean class, but add some namespace annotations:
@@ -160,12 +160,11 @@
 	<xt>&lt;/person&gt;</xt>
 </p>
 <p>
-	One important property on the XML serializer class is 
-	{@link oaj.xml.XmlSerializer#XML_autoDetectNamespaces XML_autoDetectNamespaces}.
-	This property tells the serializer to make a first-pass over the data structure to look for namespaces 
+	By default, the XML serializer class will make a first-pass over the data structure to look for namespaces 
 	defined on classes and bean properties.
 	In high-performance environments, you may want to consider disabling auto-detection and providing your 
-	own explicit list of namespaces to the serializer to avoid this scanning step.
+	own explicit list of namespaces to the serializer to avoid this scanning step using 
+	{@link oaj.xml.XmlSerializerBuilder#disableAutoDetectNamespaces()}.
 </p>
 <p>
 	The following code will produce the same output as before, but will perform slightly better since it 
diff --git a/juneau-doc/docs/Topics/02.juneau-marshall/27.HtmlDetails/02.HtmlSerializers.html b/juneau-doc/docs/Topics/02.juneau-marshall/27.HtmlDetails/02.HtmlSerializers.html
index f1904f9..4bf1f2a 100644
--- a/juneau-doc/docs/Topics/02.juneau-marshall/27.HtmlDetails/02.HtmlSerializers.html
+++ b/juneau-doc/docs/Topics/02.juneau-marshall/27.HtmlDetails/02.HtmlSerializers.html
@@ -13,7 +13,7 @@
  ***************************************************************************************************************************/
  -->
 
-{title:'HTML Serializers'}
+{title:'HTML Serializers', flags:'todo'}
 
 <p>
 	The {@link oaj.html.HtmlSerializer} class is used to serialize POJOs into HTML.
@@ -27,29 +27,31 @@
 </p>
 <ul class='javatree'>
 	<li class='link'>{@doc GlossaryConfigurableProperties Configurable Properties}
-	<li class='jc'>{@link oaj.html.HtmlSerializer}
+	<li class='jc'>{@link oaj.html.HtmlSerializerBuilder}
 	<ul>
-		<li class='jf'>{@link oaj.html.HtmlSerializer#HTML_addBeanTypes HTML_addBeanTypes}
-		<li class='jf'>{@link oaj.html.HtmlSerializer#HTML_addKeyValueTableHeaders HTML_addKeyValueTableHeaders}
-		<li class='jf'>{@link oaj.html.HtmlSerializer#HTML_detectLabelParameters HTML_detectLabelParameters}
-		<li class='jf'>{@link oaj.html.HtmlSerializer#HTML_detectLinksInStrings HTML_detectLinksInStrings}
-		<li class='jf'>{@link oaj.html.HtmlSerializer#HTML_labelParameter HTML_labelParameter}
-		<li class='jf'>{@link oaj.html.HtmlSerializer#HTML_uriAnchorText HTML_uriAnchorText}
+		<li class='jf'>{@link oaj.html.HtmlSerializerBuilder#addBeanTypes() addBeanTypes()}
+		<li class='jf'>{@link oaj.html.HtmlSerializerBuilder#addKeyValueTableHeaders() addKeyValueTableHeaders()}
+		<li class='jf'>{@link oaj.html.HtmlSerializerBuilder#disableDetectLabelParameters() disableDetectLabelParameters()}
+		<li class='jf'>{@link oaj.html.HtmlSerializerBuilder#disableDetectLinksInStrings() disableDetectLinksInStrings()}
+		<li class='jf'>{@link oaj.html.HtmlSerializerBuilder#labelParameter(String) labelParameter(String)}
+		<li class='jf'>{@link oaj.html.HtmlSerializerBuilder#uriAnchorText(AnchorText) uriAnchorText(AnchorText)}
 	</ul>
-	<li class='jc'>{@link oaj.html.HtmlDocSerializer}
+	<li class='jc'>{@link oaj.html.HtmlDocSerializerBuilder}
 	<ul>
-		<li class='jf'>{@link oaj.html.HtmlDocSerializer#HTMLDOC_aside HTMLDOC_aside}
-		<li class='jf'>{@link oaj.html.HtmlDocSerializer#HTMLDOC_footer HTMLDOC_footer}
-		<li class='jf'>{@link oaj.html.HtmlDocSerializer#HTMLDOC_head HTMLDOC_head}
-		<li class='jf'>{@link oaj.html.HtmlDocSerializer#HTMLDOC_header HTMLDOC_header}
-		<li class='jf'>{@link oaj.html.HtmlDocSerializer#HTMLDOC_nav HTMLDOC_nav}
-		<li class='jf'>{@link oaj.html.HtmlDocSerializer#HTMLDOC_navlinks HTMLDOC_navlinks}
-		<li class='jf'>{@link oaj.html.HtmlDocSerializer#HTMLDOC_noResultsMessage HTMLDOC_noResultsMessage}
-		<li class='jf'>{@link oaj.html.HtmlDocSerializer#HTMLDOC_nowrap HTMLDOC_nowrap}
-		<li class='jf'>{@link oaj.html.HtmlDocSerializer#HTMLDOC_script HTMLDOC_script}
-		<li class='jf'>{@link oaj.html.HtmlDocSerializer#HTMLDOC_style HTMLDOC_style}
-		<li class='jf'>{@link oaj.html.HtmlDocSerializer#HTMLDOC_stylesheet HTMLDOC_stylesheet}
-		<li class='jf'>{@link oaj.html.HtmlDocSerializer#HTMLDOC_template HTMLDOC_template}				
+		<li class='jf'>{@link oaj.html.HtmlDocSerializerBuilder#aside(String[]) #aside(String[])}
+		<li class='jf'>{@link oaj.html.HtmlDocSerializerBuilder#asideFloat(Float) #asideFloat(Float)}
+		<li class='jf'>{@link oaj.html.HtmlDocSerializerBuilder#footer(String[]) footer(String[])}
+		<li class='jf'>{@link oaj.html.HtmlDocSerializerBuilder#head(String[]) head(String[])}
+		<li class='jf'>{@link oaj.html.HtmlDocSerializerBuilder#header(String[]) header(String[])}
+		<li class='jf'>{@link oaj.html.HtmlDocSerializerBuilder#nav(String[]) nav(String[])}
+		<li class='jf'>{@link oaj.html.HtmlDocSerializerBuilder#navlinks(String[]) navlinks(String[])}
+		<li class='jf'>{@link oaj.html.HtmlDocSerializerBuilder#noResultsMessage(String) noResultsMessage(String)}
+		<li class='jf'>{@link oaj.html.HtmlDocSerializerBuilder#nowrap() nowrap()}
+		<li class='jf'>{@link oaj.html.HtmlDocSerializerBuilder#script(String[]) script(String[])}
+		<li class='jf'>{@link oaj.html.HtmlDocSerializerBuilder#style(String[]) style(String[])}
+		<li class='jf'>{@link oaj.html.HtmlDocSerializerBuilder#stylesheet(String[]) stylesheet(String[])}
+		<li class='jf'>{@link oaj.html.HtmlDocSerializerBuilder#template(Class) template(Class)}				
+		<li class='jf'>{@link oaj.html.HtmlDocSerializerBuilder#widgets(Class...) widgets(Class...)}				
 	</ul>
 </ul>
 <p>
diff --git a/juneau-doc/docs/Topics/02.juneau-marshall/32.SimpleVariableLanguage/01.SvlVariables.html b/juneau-doc/docs/Topics/02.juneau-marshall/32.SimpleVariableLanguage/01.SvlVariables.html
index 90d26df..eaa5e67 100644
--- a/juneau-doc/docs/Topics/02.juneau-marshall/32.SimpleVariableLanguage/01.SvlVariables.html
+++ b/juneau-doc/docs/Topics/02.juneau-marshall/32.SimpleVariableLanguage/01.SvlVariables.html
@@ -199,8 +199,4 @@
 		<td>{@link oajr.vars.UrlEncodeVar}</td>
 		<td class='code'>$UE{uriPart}</td>
 	</tr>
-	<tr class='dark dd'>
-		<td>{@link oajr.vars.WidgetVar} <i>(deprecated)</i></td>
-		<td class='code'>$W{name}</td>
-	</tr>
 </table>
diff --git a/juneau-doc/docs/Topics/02.juneau-marshall/32.SimpleVariableLanguage/02.VarResolvers.html b/juneau-doc/docs/Topics/02.juneau-marshall/32.SimpleVariableLanguage/02.VarResolvers.html
index 6d47b56..77784db 100644
--- a/juneau-doc/docs/Topics/02.juneau-marshall/32.SimpleVariableLanguage/02.VarResolvers.html
+++ b/juneau-doc/docs/Topics/02.juneau-marshall/32.SimpleVariableLanguage/02.VarResolvers.html
@@ -13,7 +13,7 @@
  ***************************************************************************************************************************/
  -->
 
-{title:'VarResolvers and VarResolverSessions'}
+{title:'VarResolvers and VarResolverSessions', flags:'todo'}
 
 <p>
 	The main class for performing variable resolution is {@link oaj.svl.VarResolver}.
@@ -48,15 +48,15 @@
 	Context and session objects are set through the following methods:
 </p>
 <ul class='javatree'>
-	<li class='jm'>{@link oaj.svl.VarResolverBuilder#contextObject(String,Object)} - Context objects.
-	<li class='jm'>{@link oaj.svl.VarResolverSession#sessionObject(String,Object)} - Session objects.
-	<li class='jm'>{@link oaj.svl.VarResolver#createSession(Map)} - Session objects.
+	<li class='jm'>{@del VarResolverBuilder#contextObject(String,Object)} - Context objects.
+	<li class='jm'>{@del VarResolverSession#sessionObject(String,Object)} - Session objects.
+	<li class='jm'>{@del VarResolver#createSession(Map)} - Session objects.
 </ul>
 <p>
 	Both kinds of objects are accessible through the following method:
 </p>
 <ul class='javatree'>
-	<li class='jm'>{@link oaj.svl.VarResolverSession#getSessionObject(Class, String, boolean)}
+	<li class='jm'>{@del VarResolverSession#getSessionObject(Class, String, boolean)}
 </ul>
 <p>
 	Var resolvers can be cloned and extended by using the {@link oaj.svl.VarResolver#copy()} method.
diff --git a/juneau-doc/docs/Topics/03.juneau-marshall-rdf/01.RdfDetails/01.RdfSerializers.html b/juneau-doc/docs/Topics/03.juneau-marshall-rdf/01.RdfDetails/01.RdfSerializers.html
index 8f7c82a..4a51a8c 100644
--- a/juneau-doc/docs/Topics/03.juneau-marshall-rdf/01.RdfDetails/01.RdfSerializers.html
+++ b/juneau-doc/docs/Topics/03.juneau-marshall-rdf/01.RdfDetails/01.RdfSerializers.html
@@ -13,7 +13,7 @@
  ***************************************************************************************************************************/
  -->
 
-RDF Serializers
+{title:'RDF Serializers', flags:'todo'}
 
 <p>
 	The {@link oaj.jena.RdfSerializer} class is the top-level class for all Jena-based serializers.
@@ -32,47 +32,40 @@ RDF Serializers
 
 <ul class='javatree'>
 	<li class='link'>{@doc GlossaryConfigurableProperties Configurable Properties}
-	<li class='jic'>{@link oaj.jena.RdfCommon}
+	<li class='jc'>{@link oaj.jena.RdfSerializerBuilder}
 	<ul>
-		<li class='jf'>{@link oaj.jena.RdfCommon#RDF_arp_embedding RDF_arp_embedding}
-		<li class='jf'>{@link oaj.jena.RdfCommon#RDF_arp_err_ RDF_arp_err_}
-		<li class='jf'>{@link oaj.jena.RdfCommon#RDF_arp_errorMode RDF_arp_errorMode}
-		<li class='jf'>{@link oaj.jena.RdfCommon#RDF_arp_ign_ RDF_arp_ign_}
-		<li class='jf'>{@link oaj.jena.RdfCommon#RDF_arp_iriRules RDF_arp_iriRules}
-		<li class='jf'>{@link oaj.jena.RdfCommon#RDF_arp_warn_ RDF_arp_warn_}
-		<li class='jf'>{@link oaj.jena.RdfCommon#RDF_collectionFormat RDF_collectionFormat}
-		<li class='jf'>{@link oaj.jena.RdfCommon#RDF_juneauBpNs RDF_juneauBpNs}
-		<li class='jf'>{@link oaj.jena.RdfCommon#RDF_juneauNs RDF_juneauNs}
-		<li class='jf'>{@link oaj.jena.RdfCommon#RDF_language RDF_language}
-		<li class='jf'>{@link oaj.jena.RdfCommon#RDF_looseCollections RDF_looseCollections}
-		<li class='jf'>{@link oaj.jena.RdfCommon#RDF_n3_abbrevBaseUri RDF_n3_abbrevBaseUri}
-		<li class='jf'>{@link oaj.jena.RdfCommon#RDF_n3_indentProperty RDF_n3_indentProperty}
-		<li class='jf'>{@link oaj.jena.RdfCommon#RDF_n3_minGap RDF_n3_minGap}
-		<li class='jf'>{@link oaj.jena.RdfCommon#RDF_n3_objectLists RDF_n3_objectLists}
-		<li class='jf'>{@link oaj.jena.RdfCommon#RDF_n3_propertyColumn RDF_n3_propertyColumn}
-		<li class='jf'>{@link oaj.jena.RdfCommon#RDF_n3_subjectColumn RDF_n3_subjectColumn}
-		<li class='jf'>{@link oaj.jena.RdfCommon#RDF_n3_useDoubles RDF_n3_useDoubles}
-		<li class='jf'>{@link oaj.jena.RdfCommon#RDF_n3_usePropertySymbols RDF_n3_usePropertySymbols}
-		<li class='jf'>{@link oaj.jena.RdfCommon#RDF_n3_useTripleQuotedStrings RDF_n3_useTripleQuotedStrings}
-		<li class='jf'>{@link oaj.jena.RdfCommon#RDF_n3_widePropertyLen RDF_n3_widePropertyLen}
-		<li class='jf'>{@link oaj.jena.RdfCommon#RDF_rdfxml_allowBadUris RDF_rdfxml_allowBadUris}
-		<li class='jf'>{@link oaj.jena.RdfCommon#RDF_rdfxml_attributeQuoteChar RDF_rdfxml_attributeQuoteChar}
-		<li class='jf'>{@link oaj.jena.RdfCommon#RDF_rdfxml_blockRules RDF_rdfxml_blockRules}
-		<li class='jf'>{@link oaj.jena.RdfCommon#RDF_rdfxml_longId RDF_rdfxml_longId}
-		<li class='jf'>{@link oaj.jena.RdfCommon#RDF_rdfxml_relativeUris RDF_rdfxml_relativeUris}
-		<li class='jf'>{@link oaj.jena.RdfCommon#RDF_rdfxml_showDoctypeDeclaration RDF_rdfxml_showDoctypeDeclaration}
-		<li class='jf'>{@link oaj.jena.RdfCommon#RDF_rdfxml_showXmlDeclaration RDF_rdfxml_showXmlDeclaration}
-		<li class='jf'>{@link oaj.jena.RdfCommon#RDF_rdfxml_tab RDF_rdfxml_tab}
-		<li class='jf'>{@link oaj.jena.RdfCommon#RDF_rdfxml_xmlBase RDF_rdfxml_xmlBase}
-	</ul>
-	<li class='jc'>{@link oaj.jena.RdfSerializer}
-	<ul>
-		<li class='jf'>{@link oaj.jena.RdfSerializer#RDF_addBeanTypes RDF_addBeanTypes}
-		<li class='jf'>{@link oaj.jena.RdfSerializer#RDF_addLiteralTypes RDF_addLiteralTypes}
-		<li class='jf'>{@link oaj.jena.RdfSerializer#RDF_addRootProperty RDF_addRootProperty}
-		<li class='jf'>{@link oaj.jena.RdfSerializer#RDF_autoDetectNamespaces RDF_autoDetectNamespaces}
-		<li class='jf'>{@link oaj.jena.RdfSerializer#RDF_namespaces RDF_namespaces}				
-		<li class='jf'>{@link oaj.jena.RdfSerializer#RDF_useXmlNamespaces RDF_useXmlNamespaces}					
+		<li class='jm'>{@link oaj.jena.RdfSerializerBuilder#addLiteralTypes() addLiteralTypes()}
+		<li class='jm'>{@link oaj.jena.RdfSerializerBuilder#addRootProperty() addRootProperty()}
+		<li class='jm'>{@link oaj.jena.RdfSerializerBuilder#arp_embedding(boolean) arp_embedding(boolean)}
+		<li class='jm'>{@link oaj.jena.RdfSerializerBuilder#arp_errorMode(String) arp_errorMode(String)}
+		<li class='jm'>{@link oaj.jena.RdfSerializerBuilder#arp_iriRules(String) arp_iriRules(String) }
+		<li class='jm'>{@link oaj.jena.RdfSerializerBuilder#collectionFormat(RdfCollectionFormat) collectionFormat(RdfCollectionFormat)}
+		<li class='jm'>{@link oaj.jena.RdfSerializerBuilder#disableAutoDetectNamespaces() disableAutoDetectNamespaces()}
+		<li class='jm'>{@link oaj.jena.RdfSerializerBuilder#disableUseXmlNamespaces() disableUseXmlNamespaces()}					
+		<li class='jm'>{@link oaj.jena.RdfSerializerBuilder#juneauBpNs(Namespace) juneauBpNs(Namespace)}
+		<li class='jm'>{@link oaj.jena.RdfSerializerBuilder#juneauNs(Namespace) juneauNs(Namespace)}
+		<li class='jm'>{@link oaj.jena.RdfSerializerBuilder#language(String) language(String)}
+		<li class='jm'>{@link oaj.jena.RdfSerializerBuilder#looseCollections() looseCollections()}
+		<li class='jm'>{@link oaj.jena.RdfSerializerBuilder#n3_disableAbbrevBaseUri() n3_disableAbbrevBaseUri()}
+		<li class='jm'>{@link oaj.jena.RdfSerializerBuilder#n3_disableObjectLists() n3_disableObjectLists()}
+		<li class='jm'>{@link oaj.jena.RdfSerializerBuilder#n3_disableUseDoubles() n3_disableUseDoubles()}
+		<li class='jm'>{@link oaj.jena.RdfSerializerBuilder#n3_disableUsePropertySymbols() n3_disableUsePropertySymbols()}
+		<li class='jm'>{@link oaj.jena.RdfSerializerBuilder#n3_disableUseTripleQuotedStrings() n3_disableUseTripleQuotedStrings()}
+		<li class='jm'>{@link oaj.jena.RdfSerializerBuilder#n3_indentProperty(int) n3_indentProperty(int)}
+		<li class='jm'>{@link oaj.jena.RdfSerializerBuilder#n3_minGap(int) n3_minGap(int)}
+		<li class='jm'>{@link oaj.jena.RdfSerializerBuilder#n3_propertyColumn(int) n3_propertyColumn(int)}
+		<li class='jm'>{@link oaj.jena.RdfSerializerBuilder#n3_subjectColumn(int) n3_subjectColumn(int)}
+		<li class='jm'>{@link oaj.jena.RdfSerializerBuilder#n3_widePropertyLen(int) n3_widePropertyLen(int)}
+		<li class='jm'>{@link oaj.jena.RdfSerializerBuilder#namespaces(Namespace...) namespaces(Namespace...)}				
+		<li class='jm'>{@link oaj.jena.RdfSerializerBuilder#rdfxml_allowBadUris() rdfxml_allowBadUris()}
+		<li class='jm'>{@link oaj.jena.RdfSerializerBuilder#rdfxml_attributeQuoteChar(String) rdfxml_attributeQuoteChar(String)}
+		<li class='jm'>{@link oaj.jena.RdfSerializerBuilder#rdfxml_blockRules(String) rdfxml_blockRules(String)}
+		<li class='jm'>{@link oaj.jena.RdfSerializerBuilder#rdfxml_disableShowDoctypeDeclaration() rdfxml_disableShowDoctypeDeclaration()}
+		<li class='jm'>{@link oaj.jena.RdfSerializerBuilder#rdfxml_longId(boolean) rdfxml_longId(boolean)}
+		<li class='jm'>{@link oaj.jena.RdfSerializerBuilder#rdfxml_relativeUris(String) rdfxml_relativeUris(String)}
+		<li class='jm'>{@link oaj.jena.RdfSerializerBuilder#rdfxml_showXmlDeclaration(String) rdfxml_showXmlDeclaration(String)}
+		<li class='jm'>{@link oaj.jena.RdfSerializerBuilder#rdfxml_tab(int) rdfxml_tab(int)}
+		<li class='jm'>{@link oaj.jena.RdfSerializerBuilder#rdfxml_xmlBase(String) rdfxml_xmlBase(String)}
 	</ul>
 </ul>
 <p>
diff --git a/juneau-doc/docs/Topics/03.juneau-marshall-rdf/01.RdfDetails/02.RdfParsers.html b/juneau-doc/docs/Topics/03.juneau-marshall-rdf/01.RdfDetails/02.RdfParsers.html
index de2302d..04062cc 100644
--- a/juneau-doc/docs/Topics/03.juneau-marshall-rdf/01.RdfDetails/02.RdfParsers.html
+++ b/juneau-doc/docs/Topics/03.juneau-marshall-rdf/01.RdfDetails/02.RdfParsers.html
@@ -13,7 +13,7 @@
  ***************************************************************************************************************************/
  -->
 
-RDF Parsers
+{title:'RDF Parsers', flags:'todo'}
 
 <p>
 	The {@link oaj.jena.RdfParser} class is the top-level class for all Jena-based parsers.
@@ -36,38 +36,35 @@ RDF Parsers
 </p>
 <ul class='javatree'>
 	<li class='link'>{@doc GlossaryConfigurableProperties Configurable Properties}
-	<li class='jic'>{@link oaj.jena.RdfCommon}
+	<li class='jic'>{@link oaj.jena.RdfParserBuilder}
 	<ul>
-		<li class='jf'>{@link oaj.jena.RdfCommon#RDF_arp_embedding RDF_arp_embedding}
-		<li class='jf'>{@link oaj.jena.RdfCommon#RDF_arp_err_ RDF_arp_err_}
-		<li class='jf'>{@link oaj.jena.RdfCommon#RDF_arp_errorMode RDF_arp_errorMode}
-		<li class='jf'>{@link oaj.jena.RdfCommon#RDF_arp_ign_ RDF_arp_ign_}
-		<li class='jf'>{@link oaj.jena.RdfCommon#RDF_arp_iriRules RDF_arp_iriRules}
-		<li class='jf'>{@link oaj.jena.RdfCommon#RDF_arp_warn_ RDF_arp_warn_}
-		<li class='jf'>{@link oaj.jena.RdfCommon#RDF_collectionFormat RDF_collectionFormat}
-		<li class='jf'>{@link oaj.jena.RdfCommon#RDF_juneauBpNs RDF_juneauBpNs}
-		<li class='jf'>{@link oaj.jena.RdfCommon#RDF_juneauNs RDF_juneauNs}
-		<li class='jf'>{@link oaj.jena.RdfCommon#RDF_language RDF_language}
-		<li class='jf'>{@link oaj.jena.RdfCommon#RDF_looseCollections RDF_looseCollections}
-		<li class='jf'>{@link oaj.jena.RdfCommon#RDF_n3_abbrevBaseUri RDF_n3_abbrevBaseUri}
-		<li class='jf'>{@link oaj.jena.RdfCommon#RDF_n3_indentProperty RDF_n3_indentProperty}
-		<li class='jf'>{@link oaj.jena.RdfCommon#RDF_n3_minGap RDF_n3_minGap}
-		<li class='jf'>{@link oaj.jena.RdfCommon#RDF_n3_objectLists RDF_n3_objectLists}
-		<li class='jf'>{@link oaj.jena.RdfCommon#RDF_n3_propertyColumn RDF_n3_propertyColumn}
-		<li class='jf'>{@link oaj.jena.RdfCommon#RDF_n3_subjectColumn RDF_n3_subjectColumn}
-		<li class='jf'>{@link oaj.jena.RdfCommon#RDF_n3_useDoubles RDF_n3_useDoubles}
-		<li class='jf'>{@link oaj.jena.RdfCommon#RDF_n3_usePropertySymbols RDF_n3_usePropertySymbols}
-		<li class='jf'>{@link oaj.jena.RdfCommon#RDF_n3_useTripleQuotedStrings RDF_n3_useTripleQuotedStrings}
-		<li class='jf'>{@link oaj.jena.RdfCommon#RDF_n3_widePropertyLen RDF_n3_widePropertyLen}
-		<li class='jf'>{@link oaj.jena.RdfCommon#RDF_rdfxml_allowBadUris RDF_rdfxml_allowBadUris}
-		<li class='jf'>{@link oaj.jena.RdfCommon#RDF_rdfxml_attributeQuoteChar RDF_rdfxml_attributeQuoteChar}
-		<li class='jf'>{@link oaj.jena.RdfCommon#RDF_rdfxml_blockRules RDF_rdfxml_blockRules}
-		<li class='jf'>{@link oaj.jena.RdfCommon#RDF_rdfxml_longId RDF_rdfxml_longId}
-		<li class='jf'>{@link oaj.jena.RdfCommon#RDF_rdfxml_relativeUris RDF_rdfxml_relativeUris}
-		<li class='jf'>{@link oaj.jena.RdfCommon#RDF_rdfxml_showDoctypeDeclaration RDF_rdfxml_showDoctypeDeclaration}
-		<li class='jf'>{@link oaj.jena.RdfCommon#RDF_rdfxml_showXmlDeclaration RDF_rdfxml_showXmlDeclaration}
-		<li class='jf'>{@link oaj.jena.RdfCommon#RDF_rdfxml_tab RDF_rdfxml_tab}
-		<li class='jf'>{@link oaj.jena.RdfCommon#RDF_rdfxml_xmlBase RDF_rdfxml_xmlBase}
+		<li class='jf'>{@link oaj.jena.RdfParserBuilder#arp_embedding(boolean) arp_embedding(boolean)}
+		<li class='jf'>{@link oaj.jena.RdfParserBuilder#arp_errorMode(String) arp_errorMode(String)}
+		<li class='jf'>{@link oaj.jena.RdfParserBuilder#arp_iriRules(String) arp_iriRules(String)}
+		<li class='jf'>{@link oaj.jena.RdfParserBuilder#collectionFormat(RdfCollectionFormat) collectionFormat(RdfCollectionFormat)}
+		<li class='jf'>{@link oaj.jena.RdfParserBuilder#juneauBpNs(Namespace) juneauBpNs(Namespace0}
+		<li class='jf'>{@link oaj.jena.RdfParserBuilder#juneauNs(Namespace) juneauNs(Namespace0}
+		<li class='jf'>{@link oaj.jena.RdfParserBuilder#language(String) language(String)}
+		<li class='jf'>{@link oaj.jena.RdfParserBuilder#looseCollections() looseCollections90}
+		<li class='jf'>{@link oaj.jena.RdfParserBuilder#n3_disableAbbrevBaseUri() n3_disableAbbrevBaseUri()}
+		<li class='jf'>{@link oaj.jena.RdfParserBuilder#n3_indentProperty(int) n3_indentProperty(int)}
+		<li class='jf'>{@link oaj.jena.RdfParserBuilder#n3_minGap(int) n3_minGap(int)}
+		<li class='jf'>{@link oaj.jena.RdfParserBuilder#n3_disableObjectLists() n3_disableObjectLists()}
+		<li class='jf'>{@link oaj.jena.RdfParserBuilder#n3_propertyColumn(int) n3_propertyColumn(int)}
+		<li class='jf'>{@link oaj.jena.RdfParserBuilder#n3_subjectColumn(int) n3_subjectColumn(int)}
+		<li class='jf'>{@link oaj.jena.RdfParserBuilder#n3_disableUseDoubles() n3_disableUseDoubles()}
+		<li class='jf'>{@link oaj.jena.RdfParserBuilder#n3_disableUsePropertySymbols() n3_disableUsePropertySymbols()}
+		<li class='jf'>{@link oaj.jena.RdfParserBuilder#n3_disableUseTripleQuotedStrings() n3_disableUseTripleQuotedStrings()}
+		<li class='jf'>{@link oaj.jena.RdfParserBuilder#n3_widePropertyLen(int) n3_widePropertyLen(int)}
+		<li class='jf'>{@link oaj.jena.RdfParserBuilder#rdfxml_allowBadUris(boolean) rdfxml_allowBadUris(boolean)}
+		<li class='jf'>{@link oaj.jena.RdfParserBuilder#rdfxml_attributeQuoteChar(String) rdfxml_attributeQuoteChar(String)}
+		<li class='jf'>{@link oaj.jena.RdfParserBuilder#rdfxml_blockRules(String) rdfxml_blockRules(String)}
+		<li class='jf'>{@link oaj.jena.RdfParserBuilder#rdfxml_longId(boolean) rdfxml_longId(boolean)}
+		<li class='jf'>{@link oaj.jena.RdfParserBuilder#rdfxml_relativeUris(String) rdfxml_relativeUris(String)}
+		<li class='jf'>{@link oaj.jena.RdfParserBuilder#rdfxml_disableShowDoctypeDeclaration() rdfxml_disableShowDoctypeDeclaration()}
+		<li class='jf'>{@link oaj.jena.RdfParserBuilder#rdfxml_showXmlDeclaration(String) rdfxml_showXmlDeclaration(String)}
+		<li class='jf'>{@link oaj.jena.RdfParserBuilder#rdfxml_tab(int) rdfxml_tab(int)}
+		<li class='jf'>{@link oaj.jena.RdfParserBuilder#rdfxml_xmlBase(String) rdfxml_xmlBase(String)}
 	</ul>
 	<li class='jc'>{@link oaj.jena.RdfParser}
 	<ul>
diff --git a/juneau-doc/docs/Topics/03.juneau-marshall-rdf/01.RdfDetails/03.RdfAnnotation.html b/juneau-doc/docs/Topics/03.juneau-marshall-rdf/01.RdfDetails/03.RdfAnnotation.html
index 5afd6ba..fa5db70 100644
--- a/juneau-doc/docs/Topics/03.juneau-marshall-rdf/01.RdfDetails/03.RdfAnnotation.html
+++ b/juneau-doc/docs/Topics/03.juneau-marshall-rdf/01.RdfDetails/03.RdfAnnotation.html
@@ -13,7 +13,7 @@
  ***************************************************************************************************************************/
  -->
 
-@Rdf Annotation
+{title:'@Rdf Annotation'}
 
 <p>
 	The {@link oaj.jena.annotation.Rdf @Rdf} annotation
diff --git a/juneau-doc/docs/Topics/03.juneau-marshall-rdf/01.RdfDetails/04.RdfNamespaces.html b/juneau-doc/docs/Topics/03.juneau-marshall-rdf/01.RdfDetails/04.RdfNamespaces.html
index bde1e9c..3a8d2c7 100644
--- a/juneau-doc/docs/Topics/03.juneau-marshall-rdf/01.RdfDetails/04.RdfNamespaces.html
+++ b/juneau-doc/docs/Topics/03.juneau-marshall-rdf/01.RdfDetails/04.RdfNamespaces.html
@@ -13,7 +13,7 @@
  ***************************************************************************************************************************/
  -->
 
-Namespaces
+{title:'Namespaces', flags:'review'}
 
 <p>
 	You'll notice in the previous example that Juneau namespaces are used to represent bean property names.
@@ -75,18 +75,17 @@ Namespaces
 	<xt>&lt;/rdf:RDF&gt;</xt>
 </p>
 <p>
-	Namespace auto-detection ({@link oaj.xml.XmlSerializer#XML_autoDetectNamespaces}) is 
-	enabled on serializers by default.
+	Namespace auto-detection is enabled on serializers by default.
 	This causes the serializer to make a first-pass over the data structure to look for namespaces.
 	In high-performance environments, you may want to consider disabling auto-detection and providing an 
-	explicit list of namespaces to the serializer to avoid this scanning step.
+	explicit list of namespaces to the serializer to avoid this scanning step using {@link oaj.xml.XmlSerializerBuilder#disableAutoDetectNamespaces()}.
 </p>
 <p class='bpcode w800'>
 	<jc>// Create a new serializer, but manually specify the namespaces.</jc>
 	RdfSerializer <jv>serializer</jv> = RdfSerializer.<jsm>create</jsm>()
 		.xmlabbrev()
 		.set(RdfProperties.<jsf>RDF_rdfxml_tab</jsf>, 3)
-		.autoDetectNamespaces(<jk>false</jk>)
+		.disableAutoDetectNamespaces()
 		.namespaces(<js>"{per:'http://www.apache.org/person/'}"</js>)
 		.build();
 </p>
diff --git a/juneau-doc/docs/Topics/03.juneau-marshall-rdf/01.RdfDetails/05.RdfUriProperties.html b/juneau-doc/docs/Topics/03.juneau-marshall-rdf/01.RdfDetails/05.RdfUriProperties.html
index b039acd..20df811 100644
--- a/juneau-doc/docs/Topics/03.juneau-marshall-rdf/01.RdfDetails/05.RdfUriProperties.html
+++ b/juneau-doc/docs/Topics/03.juneau-marshall-rdf/01.RdfDetails/05.RdfUriProperties.html
@@ -13,7 +13,7 @@
  ***************************************************************************************************************************/
  -->
 
-URI Properties
+{title:'URI Properties'}
 
 <p>
 	Bean properties of type <c>java.net.URI</c> or <c>java.net.URL</c> have special meaning to the 
@@ -71,7 +71,7 @@ URI Properties
 	<xt>&lt;/rdf:RDF&gt;</xt>
 </p>
 <p>
-	The {@link oaj.annotation.URI @URI} annotation can also be used on classes and properties 
+	The {@link oaj.annotation.Uri @Uri} annotation can also be used on classes and properties 
 	to identify them as URLs when they're not instances of <c>java.net.URI</c> or <c>java.net.URL</c> 
 	(not needed if <c><ja>@Rdf</ja>(beanUri=<jk>true</jk>)</c> is already specified).
 </p>
diff --git a/juneau-doc/docs/Topics/03.juneau-marshall-rdf/01.RdfDetails/06.RdfRootProperty.html b/juneau-doc/docs/Topics/03.juneau-marshall-rdf/01.RdfDetails/06.RdfRootProperty.html
index f873f34..ecba375 100644
--- a/juneau-doc/docs/Topics/03.juneau-marshall-rdf/01.RdfDetails/06.RdfRootProperty.html
+++ b/juneau-doc/docs/Topics/03.juneau-marshall-rdf/01.RdfDetails/06.RdfRootProperty.html
@@ -13,7 +13,7 @@
  ***************************************************************************************************************************/
  -->
 
-Root Property
+{title:'Root Property'}
 
 <p>
 	For all RDF languages, the POJO objects get broken down into simple triplets.
diff --git a/juneau-doc/docs/Topics/03.juneau-marshall-rdf/01.RdfDetails/07.RdfTypedLiterals.html b/juneau-doc/docs/Topics/03.juneau-marshall-rdf/01.RdfDetails/07.RdfTypedLiterals.html
index 0f3879d..3ac1135 100644
--- a/juneau-doc/docs/Topics/03.juneau-marshall-rdf/01.RdfDetails/07.RdfTypedLiterals.html
+++ b/juneau-doc/docs/Topics/03.juneau-marshall-rdf/01.RdfDetails/07.RdfTypedLiterals.html
@@ -13,7 +13,7 @@
  ***************************************************************************************************************************/
  -->
 
-Typed Literals
+{title:'Typed Literals'}
 
 <p>
 	XML-Schema data-types can be added to non-<c>String</c> literals through the 
diff --git a/juneau-doc/docs/Topics/05.juneau-config/12.ConfigStores/02.ConfigFileStore.html b/juneau-doc/docs/Topics/05.juneau-config/12.ConfigStores/02.ConfigFileStore.html
index 67e0d0a..b7aba3f 100644
--- a/juneau-doc/docs/Topics/05.juneau-config/12.ConfigStores/02.ConfigFileStore.html
+++ b/juneau-doc/docs/Topics/05.juneau-config/12.ConfigStores/02.ConfigFileStore.html
@@ -13,20 +13,20 @@
  ***************************************************************************************************************************/
  -->
 
-{title:'ConfigFileStore'}
+{title:'ConfigFileStore', flags:'todo'}
 
 <p>
 	The {@link oaj.config.store.ConfigFileStore} is the typical store used for configuration files.
 	It provides the following configurable settings:
 </p>
 <ul class='javatree'>
-	<li class='jc'>{@link oaj.config.store.ConfigFileStore}
+	<li class='jc'>{@link oaj.config.store.ConfigFileStoreBuilder}
 	<ul>
-		<li class='jm'>{@link oaj.config.store.ConfigFileStore#FILESTORE_charset FILESTORE_charset}
-		<li class='jm'>{@link oaj.config.store.ConfigFileStore#FILESTORE_directory FILESTORE_directory}
-		<li class='jm'>{@link oaj.config.store.ConfigFileStore#FILESTORE_updateOnWrite FILESTORE_updateOnWrite}
-		<li class='jm'>{@link oaj.config.store.ConfigFileStore#FILESTORE_useWatcher FILESTORE_useWatcher}
-		<li class='jm'>{@link oaj.config.store.ConfigFileStore#FILESTORE_watcherSensitivity FILESTORE_watcherSensitivity}
+		<li class='jm'>{@link oaj.config.store.ConfigFileStoreBuilder#charset(Charset) charset(Charset)}
+		<li class='jm'>{@link oaj.config.store.ConfigFileStoreBuilder#directory(File) directory(File)}
+		<li class='jm'>{@link oaj.config.store.ConfigFileStoreBuilder#enableUpdateOnWrite() enableUpdateOnWrite()}
+		<li class='jm'>{@link oaj.config.store.ConfigFileStoreBuilder#enableWatcher() enableWatcher()}
+		<li class='jm'>{@link oaj.config.store.ConfigFileStoreBuilder#watcherSensitivity(WatcherSensitivity) watcherSensitivity(WatcherSensitivity)}
 	</ul>
 </ul>
 
diff --git a/juneau-doc/docs/Topics/06.juneau-rest-server/02.RestClassHierarchy.html b/juneau-doc/docs/Topics/06.juneau-rest-server/02.RestClassHierarchy.html
index b2ac279..9cf4889 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/02.RestClassHierarchy.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/02.RestClassHierarchy.html
@@ -48,12 +48,12 @@
 </p>
 <ul class='javatree'>
 	<li class='jic'>
-		{@link oajr.BasicRestConfig} 
+		{@del BasicRestConfig} 
 		<ul>
-			<li class='jac'>{@link oajr.BasicRest org.apache.juneau.rest.BasicRest}
+			<li class='jac'>{@del oajr.BasicRest org.apache.juneau.rest.BasicRest}
 				<br>Provides a default set of serializers, parsers, options page, stylesheet, and other common settings.
 				<ul>
-					<li class='jac'>{@link oajr.BasicRestGroup org.apache.juneau.rest.BasicRestGroup}
+					<li class='jac'>{@del oajr.BasicRestGroup org.apache.juneau.rest.BasicRestGroup}
 						<br>A default implementation for "router" pages.
 					</li>
 				</ul>
diff --git a/juneau-doc/docs/Topics/06.juneau-rest-server/03.RestInstantiation/02.BasicRestServlet.html b/juneau-doc/docs/Topics/06.juneau-rest-server/03.RestInstantiation/02.BasicRestServlet.html
index 6fcb428..0d2162b 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/03.RestInstantiation/02.BasicRestServlet.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/03.RestInstantiation/02.BasicRestServlet.html
@@ -96,7 +96,7 @@
 	}
 </p>
 <p>
-	Additional annotations are pulled in from the {@link oajr.BasicRestConfig} interface which simply
+	Additional annotations are pulled in from the {@del oajr.BasicRestConfig} interface which simply
 	exists to define a common set of annotations.  
 	Notice that it has no code at all.
 </p>
diff --git a/juneau-doc/docs/Topics/06.juneau-rest-server/03.RestInstantiation/03.BasicRest.html b/juneau-doc/docs/Topics/06.juneau-rest-server/03.RestInstantiation/03.BasicRest.html
index 5972813..a899603 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/03.RestInstantiation/03.BasicRest.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/03.RestInstantiation/03.BasicRest.html
@@ -16,7 +16,7 @@
 {title:'BasicRest', created:'8.1.0', flags:'todo'} 
 
 <p>
-	The {@link oajr.BasicRest} class is identical to the {@link oajr.BasicRestServlet} class except that
+	The {@del oajr.BasicRest} class is identical to the {@link oajr.BasicRestServlet} class except that
 	it does not extend from <c>HttpServlet</c>.
 	It defines the exact same set of serializers, parsers, etc., but it cannot be deployed as a top-level
 	servlet.  It can however be used for child resources registered via the {@link oajr.annotation.Rest#children() @Rest(children)} 
diff --git a/juneau-doc/docs/Topics/06.juneau-rest-server/03.RestInstantiation/06.BasicRestGroup.html b/juneau-doc/docs/Topics/06.juneau-rest-server/03.RestInstantiation/06.BasicRestGroup.html
index ab0b140..f66ce03 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/03.RestInstantiation/06.BasicRestGroup.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/03.RestInstantiation/06.BasicRestGroup.html
@@ -16,7 +16,7 @@
 {title:'BasicRestGroup', created:'8.1.0', flags:'todo'}
 
 <p>
-	The {@link oajr.BasicRestGroup} class is identical to the {@link oajr.BasicRestServletGroup} class except that
+	The {@del oajr.BasicRestGroup} class is identical to the {@link oajr.BasicRestServletGroup} class except that
 	it does not extend from <c>HttpServlet</c>.
 	It defines the exact same set of serializers, parsers, etc., but it cannot be deployed as a top-level
 	servlet.  It can however be used for child resources registered via the {@link oajr.annotation.Rest#children() @Rest(children)} 
diff --git a/juneau-doc/docs/Topics/06.juneau-rest-server/03.RestInstantiation/07.RestResourceResolvers.html b/juneau-doc/docs/Topics/06.juneau-rest-server/03.RestInstantiation/07.RestResourceResolvers.html
index 1c92bba..f61f621 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/03.RestInstantiation/07.RestResourceResolvers.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/03.RestInstantiation/07.RestResourceResolvers.html
@@ -31,9 +31,9 @@
 	Resource object resolution is controlled through the following API:
 </p>
 <ul class='javatree'>
-	<li class='jic'>{@link oajr.RestResourceResolver}
+	<li class='jic'>{@del oajr.RestResourceResolver}
 	<ul>
-		<li class='jc'>{@link oajr.BasicRestResourceResolver}
+		<li class='jc'>{@del oajr.BasicRestResourceResolver}
 	</ul>
 </ul>
 <p>
@@ -41,5 +41,5 @@
 	Later topics discuss how to use this API to instantiate resources using Spring.
 </p>
 <ul class='seealso'>
-	<li class='jf'>{@link oajr.RestContext#REST_resourceResolver}
+	<li class='jf'>{@del RestContext#REST_resourceResolver}
 </ul>
diff --git a/juneau-doc/docs/Topics/06.juneau-rest-server/04.RestAnnotation/01.RestAnnotationInheritance.html b/juneau-doc/docs/Topics/06.juneau-rest-server/04.RestAnnotation/01.RestAnnotationInheritance.html
index 80b932e..c334fe3 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/04.RestAnnotation/01.RestAnnotationInheritance.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/04.RestAnnotation/01.RestAnnotationInheritance.html
@@ -47,7 +47,7 @@
 		</td>
 	</tr>
 	<tr>
-		<td>{@link oajr.annotation.Rest#properties() properties()}</td>
+		<td>{@del Rest#properties()}</td>
 		<td>
 			Properties on child are combined with those on parent class.
 			<br>Properties are applied parent-to-child in the order they appear in the annotation.
@@ -73,7 +73,7 @@
 		</td>
 	</tr>
 	<tr>
-		<td>{@link oajr.annotation.Rest#responseHandlers() responseHandlers()}</td>
+		<td>{@del Rest#responseHandlers()}</td>
 		<td>
 			Response handlers on child are combined with those on parent class.
 		</td>
@@ -85,7 +85,7 @@
 		</td>
 	</tr>
 	<tr>
-		<td>{@link oajr.annotation.Rest#reqHeaders() reqHeaders()}</td>
+		<td>{@del Rest#reqHeaders()}</td>
 		<td>
 			Headers on child are combined with those on parent class.
 			<br>Headers are applied parent-to-child in the order they appear in the annotation.
@@ -93,7 +93,7 @@
 		</td>
 	</tr>
 	<tr>
-		<td>{@link oajr.annotation.Rest#resHeaders() resHeaders()}</td>
+		<td>{@del Rest#resHeaders()}</td>
 		<td>
 			Headers on child are combined with those on parent class.
 			<br>Headers are applied parent-to-child in the order they appear in the annotation.
diff --git a/juneau-doc/docs/Topics/06.juneau-rest-server/04.RestAnnotation/02.RestPath.html b/juneau-doc/docs/Topics/06.juneau-rest-server/04.RestAnnotation/02.RestPath.html
index 8a716e4..44c5aca 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/04.RestAnnotation/02.RestPath.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/04.RestAnnotation/02.RestPath.html
@@ -16,14 +16,14 @@
 {title:'@Rest(path)', created:'8.1.0', updated:'8.1.2', flags:'todo'}
 
 <p>
-	The {@link oajr.annotation.RestResource#path() @RestResource(path)} annotation is used in the following situations:
+	The {@del oajr.annotation.RestResource#path() @RestResource(path)} annotation is used in the following situations:
 <p>
 <ul class='spaced-list'>
 	<li>
-		On child resources (resource classes attached to parents via the {@link oajr.annotation.RestResource#children() @RestResource(children)} annotation) to identify
+		On child resources (resource classes attached to parents via the {@del oajr.annotation.RestResource#children() @RestResource(children)} annotation) to identify
 		the subpath used to access the child resource relative to the parent.
 	<li>
-		On top-level {@link oajr.RestServlet} classes deployed as Spring beans when {@link oajr.springboot.JuneauRestInitializer} is being used.
+		On top-level {@link oajr.RestServlet} classes deployed as Spring beans when {@del oajr.springboot.JuneauRestInitializer} is being used.
 </ul>
 
 <h5 class='topic'>On child resources</h5>
@@ -70,7 +70,7 @@
 
 <h5 class='topic'>On top-level resources deployed as Spring beans</h5>
 <p>
-	The path can also be used on top-level resources deployed as Spring beans when used with the {@link oajr.springboot.JuneauRestInitializer}
+	The path can also be used on top-level resources deployed as Spring beans when used with the {@del oajr.springboot.JuneauRestInitializer}
 	Spring Boot initializer class:
 </p>
 <h5 class='figure'>Example:</h5>
@@ -108,7 +108,7 @@
 <h5 class='topic'>Path variables</h5>
 <p>
 	The path can contain variables that get resolved to {@link oaj.http.annotation.Path @Path} parameters
-	or access through the {@link oajr.RestRequest#getPathMatch()} method.
+	or access through the {@link oajr.RestRequest#getPathParams()} method.
 </p>
 <h5 class='figure'>Example:</h5>
 <p class='bpcode'>
diff --git a/juneau-doc/docs/Topics/06.juneau-rest-server/06.RestMethod/01.RestmParameters.html b/juneau-doc/docs/Topics/06.juneau-rest-server/06.RestMethod/01.RestmParameters.html
index ce30805..041b671 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/06.RestMethod/01.RestmParameters.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/06.RestMethod/01.RestmParameters.html
@@ -73,7 +73,7 @@
 			<li><b>Localization:</b>
 				<ul>
 					<li class='jc'>{@link java.util.ResourceBundle} - Client-localized resource bundle.
-					<li class='jc'>{@link oaj.utils.MessageBundle} - A resource bundle with additional features.
+					<li class='jc'>{@del oaj.utils.MessageBundle} - A resource bundle with additional features.
 					<li class='jc'>{@link java.util.Locale} - Client locale.
 				</ul>
 			<li><b>Request APIs:</b>
@@ -87,14 +87,14 @@
 			<li><b>Other:</b>
 				<ul>
 					<li class='jc'>{@link oaj.http.HttpMethod} - The method name matched (when using <c><ja>@RestOp</ja>(method=<js>"*"</js>)</c>)
-					<li class='jc'>{@link oajr.RestLogger} - Logger with additional features.
+					<li class='jc'>{@del oajr.RestLogger} - Logger with additional features.
 					<li class='jc'>{@link oajr.RestContext} - The resource read-only context.
 					<li class='jc'>{@link oaj.parser.Parser} - The parser matching the request content type.
 					<li class='jc'>{@link oaj.parser.ReaderParser} - The reader parser matching the request content type.
 					<li class='jc'>{@link oaj.parser.InputStreamParser} - The input stream parser matching the request content type.
 					<li class='jc'>{@link oaj.dto.swagger.Swagger} - The auto-generated Swagger doc.
 					<li class='jc'>{@link oaj.config.Config} - The external config for the resource.
-					<li class='jc'>{@link oajr.RequestProperties} - API for modifying request-time configuration properties.
+					<li class='jc'>{@del oajr.RequestProperties} - API for modifying request-time configuration properties.
 				</ul>
 		</ul>
 	<li><b>Annotated parameters:</b>
@@ -141,5 +141,5 @@
 	<li>All annotations have programmatic equivalents on the {@link oajr.RestRequest} class.
 </ul>
 <ul class='seealso'>
-	<li class='jf'>{@link oajr.RestContext#REST_paramResolvers} - For configuring custom parameter types.
+	<li class='jf'>{@del RestContext#REST_paramResolvers} - For configuring custom parameter types.
 </ul>
diff --git a/juneau-doc/docs/Topics/06.juneau-rest-server/06.RestMethod/02.RestmRestRequest.html b/juneau-doc/docs/Topics/06.juneau-rest-server/06.RestMethod/02.RestmRestRequest.html
index 3b25141..00d0200 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/06.RestMethod/02.RestmRestRequest.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/06.RestMethod/02.RestmRestRequest.html
@@ -31,16 +31,13 @@
 	<li class='jc'><c>{@link oajr.RestRequest} <jk>extends</jk> HttpServletRequest</c>
 	<ul>
 		<li class='jm'>{@link oajr.RestRequest#getHeaders() getHeaders()} - HTTP request headers.
-		<li class='jm'>{@link oajr.RestRequest#getQuery() getQuery()} - Query parameters.
-		<li class='jm'>{@link oajr.RestRequest#getFormData() getFormData()} - Form-data parameters.
+		<li class='jm'>{@link oajr.RestRequest#getQueryParams() getQueryParams()} - Query parameters.
+		<li class='jm'>{@link oajr.RestRequest#getFormParams() getFormParams()} - Form-data parameters.
+		<li class='jm'>{@link oajr.RestRequest#getPathParams() getPathParams()} - Path match variables.
 		<li class='jm'>{@link oajr.RestRequest#getBody() getBody()} - HTTP request body.
-		<li class='jm'>{@link oajr.RestRequest#getPathMatch() getPathMatch()} - Path match variables.
-		<li class='jm'>{@link oajr.RestRequest#getLogger() getLogger()} - Logging.
-		<li class='jm'>{@link oajr.RestRequest#getInfoProvider() getInfoProvider()} - Swagger documentation provider.
 		<li class='jm'>{@link oajr.RestRequest#getSwagger() getSwagger()} - Generated Swagger information.
 		<li class='jm'>{@link oajr.RestRequest#getConfig() getConfig()} - External configuration API.
 		<li class='jm'>{@link oajr.RestRequest#getVarResolverSession() getVarResolverSession()} - String variable resolver.
 		<li class='jm'>{@link oajr.RestRequest#getMessages() getMessages()} - Localized messages.
-		<li class='jm'>{@link oajr.RestRequest#getProperties() getProperties()} - Configuration properties.
 	</ul>
 </ul>
diff --git a/juneau-doc/docs/Topics/06.juneau-rest-server/06.RestMethod/03.RestmRestResponse.html b/juneau-doc/docs/Topics/06.juneau-rest-server/06.RestMethod/03.RestmRestResponse.html
index 736e7d6..ca32503 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/06.RestMethod/03.RestmRestResponse.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/06.RestMethod/03.RestmRestResponse.html
@@ -31,7 +31,7 @@
 	<li class='jc'><c>{@link oajr.RestResponse} <jk>extends</jk> HttpServletResponse</c>
 	<ul>
 		<li class='jm'>{@link oajr.RestResponse#setOutput(Object) setOutput(Object)} - Set response output programmatically.
-		<li class='jm'>{@link oajr.RestResponse#getHtmlDocBuilder() getHtmlDocBuilder()} - Set HTTP page contents programmatically.
+		<li class='jm'>{@del RestResponse#getHtmlDocBuilder()} - Set HTTP page contents programmatically.
 		<li class='jm'>{@link oajr.RestResponse#getDirectWriter(String) getDirectWriter(String)} - Direct access to underlying response writer.
 	</ul>
 </ul>
diff --git a/juneau-doc/docs/Topics/06.juneau-rest-server/06.RestMethod/05.RestmRequestHeaders.html b/juneau-doc/docs/Topics/06.juneau-rest-server/06.RestMethod/05.RestmRequestHeaders.html
index 6e70e9b..ca529e6 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/06.RestMethod/05.RestmRequestHeaders.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/06.RestMethod/05.RestmRequestHeaders.html
@@ -44,12 +44,12 @@
 <ul class='javatree'>
 	<li class='jc'><c>{@link oajr.RequestHeaders} <jk>extends</jk> TreeMap&lt;String,String[]&gt;</c>
 	<ul>
-		<li class='jm'>{@link oajr.RequestHeaders#get(String,Class) get(String,Class)} - Get header value converted to a POJO.
-		<li class='jm'>{@link oajr.RequestHeaders#get(String,Type,Type...) get(String,Type,Type)} - Get header value converted to a map or collection of POJOs.
-		<li class='jm'>{@link oajr.RequestHeaders#getString(String,String) getString(String,String)} - Get header value as a simple string.
-		<li class='jm'>{@link oajr.RequestHeaders#getInt(String,int) getInt(String,int)} - Get header value as an integer.
-		<li class='jm'>{@link oajr.RequestHeaders#getBoolean(String,boolean) getBoolean(String,boolean)} - Get header value as a boolean.
-		<li class='jm'>{@link oajr.RequestHeaders#addDefault(String,Object) addDefault(String,Object)} - Programmatically set a default value for a header.
+		<li class='jm'>{@del RequestHeaders#get(String,Class)} - Get header value converted to a POJO.
+		<li class='jm'>{@del RequestHeaders#get(String,Type,Type...)} - Get header value converted to a map or collection of POJOs.
+		<li class='jm'>{@del RequestHeaders#getString(String,String)} - Get header value as a simple string.
+		<li class='jm'>{@del RequestHeaders#getInt(String,int)} - Get header value as an integer.
+		<li class='jm'>{@del RequestHeaders#getBoolean(String,boolean)} - Get header value as a boolean.
+		<li class='jm'>{@del RequestHeaders#addDefault(String,Object)} - Programmatically set a default value for a header.
 	</ul>
 </ul>
 
diff --git a/juneau-doc/docs/Topics/06.juneau-rest-server/06.RestMethod/07.RestmRequestQuery.html b/juneau-doc/docs/Topics/06.juneau-rest-server/06.RestMethod/07.RestmRequestQuery.html
index d804aea..7fed766 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/06.RestMethod/07.RestmRequestQuery.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/06.RestMethod/07.RestmRequestQuery.html
@@ -47,13 +47,13 @@
 <ul class='javatree'>
 	<li class='jc'><c>{@link oajr.RequestQuery} <jk>extends</jk> LinkedHashMap&lt;String,String[]&gt;</c>
 	<ul>
-		<li class='jm'>{@link oajr.RequestQuery#get(String,Class) get(String,Class)} - Get query parameter value converted to a POJO.
-		<li class='jm'>{@link oajr.RequestQuery#get(String,Type,Type...) get(String,Type,Type)} - Get query parameter value converted to a map or collection of POJOs.
-		<li class='jm'>{@link oajr.RequestQuery#getString(String,String) getString(String,String)} - Get query parameter value as a simple string.
-		<li class='jm'>{@link oajr.RequestQuery#getInt(String,int) getInt(String,int)} - Get query parameter value as an integer.
-		<li class='jm'>{@link oajr.RequestQuery#getBoolean(String,boolean) getBoolean(String,boolean)} - Get query parameter value as a boolean.
-		<li class='jm'>{@link oajr.RequestQuery#addDefault(String,Object) addDefault(String,Object)} - Programmatically set a default value for a query parameter.
-		<li class='jm'>{@link oajr.RequestQuery#getSearchArgs() getSearchArgs()} - Returns query parameter search arguments.
+		<li class='jm'>{@del RequestQuery#get(String,Class)} - Get query parameter value converted to a POJO.
+		<li class='jm'>{@del RequestQuery#get(String,Type,Type...)} - Get query parameter value converted to a map or collection of POJOs.
+		<li class='jm'>{@del RequestQuery#getString(String,String)} - Get query parameter value as a simple string.
+		<li class='jm'>{@del RequestQuery#getInt(String,int)} - Get query parameter value as an integer.
+		<li class='jm'>{@del RequestQuery#getBoolean(String,boolean)} - Get query parameter value as a boolean.
+		<li class='jm'>{@del RequestQuery#addDefault(String,Object)} - Programmatically set a default value for a query parameter.
+		<li class='jm'>{@del RequestQuery#getSearchArgs()} - Returns query parameter search arguments.
 	</ul>
 </ul>
 
diff --git a/juneau-doc/docs/Topics/06.juneau-rest-server/06.RestMethod/08.RestmRequestFormData.html b/juneau-doc/docs/Topics/06.juneau-rest-server/06.RestMethod/08.RestmRequestFormData.html
index 9255bd0..901381f 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/06.RestMethod/08.RestmRequestFormData.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/06.RestMethod/08.RestmRequestFormData.html
@@ -43,12 +43,12 @@
 <ul class='javatree'>
 	<li class='jc'><c>{@link oajr.RequestFormData} <jk>extends</jk> LinkedHashMap&lt;String,String[]&gt;</c>
 	<ul>
-		<li class='jm'>{@link oajr.RequestFormData#get(String,Class) get(String,Class)} - Get form-data parameter values converted to a POJO.
-		<li class='jm'>{@link oajr.RequestFormData#get(String,Type,Type...) get(String,Type,Type)} - Get form-data parameter value converted to a map or collection of POJOs.
-		<li class='jm'>{@link oajr.RequestFormData#getString(String,String) getString(String,String)} - Get form-data parameter value as a simple string.
-		<li class='jm'>{@link oajr.RequestFormData#getInt(String,int) getInt(String,int)} - Get form-data parameter value as an integer.
-		<li class='jm'>{@link oajr.RequestFormData#getBoolean(String,boolean) getBoolean(String,boolean)} - Get form-data parameter value as a boolean.
-		<li class='jm'>{@link oajr.RequestFormData#addDefault(String,Object) addDefault(String,Object)} - Programmatically set a default value for a form-data parameter.
+		<li class='jm'>{@del RequestFormData#get(String,Class)} - Get form-data parameter values converted to a POJO.
+		<li class='jm'>{@del RequestFormData#get(String,Type,Type...)} - Get form-data parameter value converted to a map or collection of POJOs.
+		<li class='jm'>{@del RequestFormData#getString(String,String)} - Get form-data parameter value as a simple string.
+		<li class='jm'>{@del RequestFormData#getInt(String,int)} - Get form-data parameter value as an integer.
+		<li class='jm'>{@del RequestFormData#getBoolean(String,boolean)} - Get form-data parameter value as a boolean.
+		<li class='jm'>{@del RequestFormData#addDefault(String,Object)} - Programmatically set a default value for a form-data parameter.
 	</ul>
 </ul>
 
diff --git a/juneau-doc/docs/Topics/06.juneau-rest-server/06.RestMethod/09.RestmPath.html b/juneau-doc/docs/Topics/06.juneau-rest-server/06.RestMethod/09.RestmPath.html
index 0dd0cfe..45fcb5e 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/06.RestMethod/09.RestmPath.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/06.RestMethod/09.RestmPath.html
@@ -77,7 +77,7 @@
 <p>
 	Paths that end with <js>"/*"</js> will do a prefix match on the incoming URL.  
 	Any remainder after the match can be accessed through 
-	{@link oajr.RequestPath#getRemainder()} or parameters with the 
+	{@del RequestPath#getRemainder()} or parameters with the 
 	<c><ja>@Path</ja>(<js>"/*"</js>)</c> annotation.
 	On the other hand, paths that don't end with <js>"/*"</js> (e.g. <js>"/"</js> or <js>"/foo"</js>) will 
 	require an exact URL match, and if any remainder exists, a 404 (not found) error will be thrown.
diff --git a/juneau-doc/docs/Topics/06.juneau-rest-server/06.RestMethod/10.RestmRequestPathMatch.html b/juneau-doc/docs/Topics/06.juneau-rest-server/06.RestMethod/10.RestmRequestPathMatch.html
index 522b665..17cc27b 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/06.RestMethod/10.RestmRequestPathMatch.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/06.RestMethod/10.RestmRequestPathMatch.html
@@ -41,12 +41,12 @@
 <ul class='javatree'>
 	<li class='jc'><c>{@link oajr.RequestPath} <jk>extends</jk> TreeMap&lt;String,String&gt;</c>
 	<ul>
-		<li class='jm'>{@link oajr.RequestPath#get(String,Class) get(String,Class)} - Get path match variable converted to a POJO.
-		<li class='jm'>{@link oajr.RequestPath#get(String,Type,Type...) get(String,Type,Type)} - Get path match variable converted to a map or collection of POJOs.
-		<li class='jm'>{@link oajr.RequestPath#getString(String) getString(String)} - Get patch match variable as a simple string.
-		<li class='jm'>{@link oajr.RequestPath#getInt(String) getInt(String)} - Get path match variable as an integer.
-		<li class='jm'>{@link oajr.RequestPath#getBoolean(String) getBoolean(String)} - Get path match variable as a boolean.
-		<li class='jm'>{@link oajr.RequestPath#getRemainder() getRemainder()} - Get the path match remainder.
+		<li class='jm'>{@del RequestPath#get(String,Class)} - Get path match variable converted to a POJO.
+		<li class='jm'>{@del RequestPath.get(String,Type,Type...)} - Get path match variable converted to a map or collection of POJOs.
+		<li class='jm'>{@del RequestPath#getString(String)} - Get patch match variable as a simple string.
+		<li class='jm'>{@del RequestPath#getInt(String)} - Get path match variable as an integer.
+		<li class='jm'>{@del RequestPath#getBoolean(String)} - Get path match variable as a boolean.
+		<li class='jm'>{@del RequestPath#getRemainder()} - Get the path match remainder.
 	</ul>
 </ul>
 
diff --git a/juneau-doc/docs/Topics/06.juneau-rest-server/06.RestMethod/11.RestmReturnTypes.html b/juneau-doc/docs/Topics/06.juneau-rest-server/06.RestMethod/11.RestmReturnTypes.html
index fd0af2b..798d60b 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/06.RestMethod/11.RestmReturnTypes.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/06.RestMethod/11.RestmReturnTypes.html
@@ -45,18 +45,18 @@
 		<br>Interface that identifies that an object can be serialized directly to an output stream.
 	<li class='jc'>{@link oaj.Writable}
 		<br>Interface that identifies that an object can be serialized directly to a writer.
-	<li class='jc'>{@link oaj.utils.ZipFileList}
+	<li class='jc'>{@del oaj.utils.ZipFileList}
 		<br>Special interface for sending zip files as responses.
 </ul>
 <p>
 	This is controlled through the following extensible API:
 </p>
 <ul class='javatree'>
-	<li class='jic'>{@link oajr.ResponseHandler}
+	<li class='jic'>{@del oajr.ResponseHandler}
 	<ul>
-		<li class='jc'>{@link oajr.reshandlers.DefaultHandler}
-		<li class='jc'>{@link oajr.reshandlers.InputStreamHandler}
-		<li class='jc'>{@link oajr.reshandlers.ReaderHandler}
+		<li class='jc'>{@del oajr.reshandlers.DefaultHandler}
+		<li class='jc'>{@del oajr.reshandlers.InputStreamHandler}
+		<li class='jc'>{@del oajr.reshandlers.ReaderHandler}
 	</ul>
 </ul>
 <p>
@@ -101,5 +101,5 @@
 	}
 </p>
 <ul class='seealso'>
-	<li class='jf'>{@link oajr.RestContext#REST_responseHandlers} - For configuring custom response handlers.
+	<li class='jf'>{@del RestContext#REST_responseHandlers} - For configuring custom response handlers.
 </ul>
diff --git a/juneau-doc/docs/Topics/06.juneau-rest-server/06.RestMethod/12.RestmReaderResource.html b/juneau-doc/docs/Topics/06.juneau-rest-server/06.RestMethod/12.RestmReaderResource.html
index 2d16245..ba90afb 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/06.RestMethod/12.RestmReaderResource.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/06.RestMethod/12.RestmReaderResource.html
@@ -16,7 +16,7 @@
 {title:'ReaderResource', flags:'todo'}
 
 <p>
-	The <dc>ReaderResource</dc> class is a convenience object for defining thread-safe
+	The {@del ReaderResource} class is a convenience object for defining thread-safe
 	reusable character-based responses.
 	In essence, it's a container for character data with optional response headers and support for
 	resolving SVL variables.
diff --git a/juneau-doc/docs/Topics/06.juneau-rest-server/06.RestMethod/13.RestmStreamResource.html b/juneau-doc/docs/Topics/06.juneau-rest-server/06.RestMethod/13.RestmStreamResource.html
index 8e8e854..c6a42e2 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/06.RestMethod/13.RestmStreamResource.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/06.RestMethod/13.RestmStreamResource.html
@@ -16,7 +16,7 @@
 {title:'StreamResource', flags:'todo'}
 
 <p>
-	The <dc>oaj.http.StreamResource</dc> class is the binary equivalent to the <dc>ReaderResource</dc> object.
+	The {@del oaj.http.StreamResource} class is the binary equivalent to the {@del ReaderResource} object.
 	In essence, it's a container for binary data with optional response headers.
 </p>
 <p>
diff --git a/juneau-doc/docs/Topics/06.juneau-rest-server/06.RestMethod/16.RestmPredefinedExceptions.html b/juneau-doc/docs/Topics/06.juneau-rest-server/06.RestMethod/16.RestmPredefinedExceptions.html
index c269df2..6faa25e 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/06.RestMethod/16.RestmPredefinedExceptions.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/06.RestMethod/16.RestmPredefinedExceptions.html
@@ -38,41 +38,41 @@
 	}
 </p>
 <ul class='javatree'>
-	<li class='jp'>{@link oaj.http.exception}
+	<li class='jp'>{@del oaj.http.exception}
 	<ul>
-		<li class='jc'>{@link oaj.http.exception.BadRequest}
-		<li class='jc'>{@link oaj.http.exception.Conflict}
-		<li class='jc'>{@link oaj.http.exception.ExpectationFailed}
-		<li class='jc'>{@link oaj.http.exception.FailedDependency}
-		<li class='jc'>{@link oaj.http.exception.Forbidden}
-		<li class='jc'>{@link oaj.http.exception.Gone}
-		<li class='jc'>{@link oaj.http.exception.HttpVersionNotSupported}
-		<li class='jc'>{@link oaj.http.exception.InsufficientStorage}
-		<li class='jc'>{@link oaj.http.exception.InternalServerError}
-		<li class='jc'>{@link oaj.http.exception.LengthRequired}
-		<li class='jc'>{@link oaj.http.exception.Locked}
-		<li class='jc'>{@link oaj.http.exception.LoopDetected}
-		<li class='jc'>{@link oaj.http.exception.MethodNotAllowed}
-		<li class='jc'>{@link oaj.http.exception.MisdirectedRequest}
-		<li class='jc'>{@link oaj.http.exception.NetworkAuthenticationRequired}
-		<li class='jc'>{@link oaj.http.exception.NotAcceptable}
-		<li class='jc'>{@link oaj.http.exception.NotExtended}
-		<li class='jc'>{@link oaj.http.exception.NotFound}
-		<li class='jc'>{@link oaj.http.exception.NotImplemented}
-		<li class='jc'>{@link oaj.http.exception.PayloadTooLarge}
-		<li class='jc'>{@link oaj.http.exception.PreconditionFailed}
-		<li class='jc'>{@link oaj.http.exception.PreconditionRequired}
-		<li class='jc'>{@link oaj.http.exception.RangeNotSatisfiable}
-		<li class='jc'>{@link oaj.http.exception.RequestHeaderFieldsTooLarge}
-		<li class='jc'>{@link oaj.http.exception.ServiceUnavailable}
-		<li class='jc'>{@link oaj.http.exception.TooManyRequests}
-		<li class='jc'>{@link oaj.http.exception.Unauthorized}
-		<li class='jc'>{@link oaj.http.exception.UnavailableForLegalReasons}
-		<li class='jc'>{@link oaj.http.exception.UnprocessableEntity}
-		<li class='jc'>{@link oaj.http.exception.UnsupportedMediaType}
-		<li class='jc'>{@link oaj.http.exception.UpgradeRequired}
-		<li class='jc'>{@link oaj.http.exception.UriTooLong}
-		<li class='jc'>{@link oaj.http.exception.VariantAlsoNegotiates}
+		<li class='jc'>{@del oaj.http.exception.BadRequest}
+		<li class='jc'>{@del oaj.http.exception.Conflict}
+		<li class='jc'>{@del oaj.http.exception.ExpectationFailed}
+		<li class='jc'>{@del oaj.http.exception.FailedDependency}
+		<li class='jc'>{@del oaj.http.exception.Forbidden}
+		<li class='jc'>{@del oaj.http.exception.Gone}
+		<li class='jc'>{@del oaj.http.exception.HttpVersionNotSupported}
+		<li class='jc'>{@del oaj.http.exception.InsufficientStorage}
+		<li class='jc'>{@del oaj.http.exception.InternalServerError}
+		<li class='jc'>{@del oaj.http.exception.LengthRequired}
+		<li class='jc'>{@del oaj.http.exception.Locked}
+		<li class='jc'>{@del oaj.http.exception.LoopDetected}
+		<li class='jc'>{@del oaj.http.exception.MethodNotAllowed}
+		<li class='jc'>{@del oaj.http.exception.MisdirectedRequest}
+		<li class='jc'>{@del oaj.http.exception.NetworkAuthenticationRequired}
+		<li class='jc'>{@del oaj.http.exception.NotAcceptable}
+		<li class='jc'>{@del oaj.http.exception.NotExtended}
+		<li class='jc'>{@del oaj.http.exception.NotFound}
+		<li class='jc'>{@del oaj.http.exception.NotImplemented}
+		<li class='jc'>{@del oaj.http.exception.PayloadTooLarge}
+		<li class='jc'>{@del oaj.http.exception.PreconditionFailed}
+		<li class='jc'>{@del oaj.http.exception.PreconditionRequired}
+		<li class='jc'>{@del oaj.http.exception.RangeNotSatisfiable}
+		<li class='jc'>{@del oaj.http.exception.RequestHeaderFieldsTooLarge}
+		<li class='jc'>{@del oaj.http.exception.ServiceUnavailable}
+		<li class='jc'>{@del oaj.http.exception.TooManyRequests}
+		<li class='jc'>{@del oaj.http.exception.Unauthorized}
+		<li class='jc'>{@del oaj.http.exception.UnavailableForLegalReasons}
+		<li class='jc'>{@del oaj.http.exception.UnprocessableEntity}
+		<li class='jc'>{@del oaj.http.exception.UnsupportedMediaType}
+		<li class='jc'>{@del oaj.http.exception.UpgradeRequired}
+		<li class='jc'>{@del oaj.http.exception.UriTooLong}
+		<li class='jc'>{@del oaj.http.exception.VariantAlsoNegotiates}
 	</ul>
 </ul>
 <p>
diff --git a/juneau-doc/docs/Topics/06.juneau-rest-server/07.RestRpc.html b/juneau-doc/docs/Topics/06.juneau-rest-server/07.RestRpc.html
index 2f406c3..202701c 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/07.RestRpc.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/07.RestRpc.html
@@ -69,11 +69,11 @@
 	Remote Interface proxies are instantiated on the client side using one of the following methods:
 </p>
 <ul class='javatree'>
-	<li class='jc'>{@link oajr.client2.RestClient}
+	<li class='jc'>{@del oajr.client2.RestClient}
 	<ul>
-		<li class='jm'>{@link oajr.client2.RestClient#getRrpcInterface(Class) getRrpcInterface(Class)}
-		<li class='jm'>{@link oajr.client2.RestClient#getRrpcInterface(Class,Object) getRrpcInterface(Class,Object)}
-		<li class='jm'>{@link oajr.client2.RestClient#getRrpcInterface(Class,Object,Serializer,Parser) getRrpcInterface(Class,Object,Serializer,Parser)}
+		<li class='jm'>{@del oajr.client2.RestClient#getRrpcInterface(Class) getRrpcInterface(Class)}
+		<li class='jm'>{@del oajr.client2.RestClient#getRrpcInterface(Class,Object) getRrpcInterface(Class,Object)}
+		<li class='jm'>{@del oajr.client2.RestClient#getRrpcInterface(Class,Object,Serializer,Parser) getRrpcInterface(Class,Object,Serializer,Parser)}
 	</ul>
 </ul>
 <p>
diff --git a/juneau-doc/docs/Topics/06.juneau-rest-server/10.RestHttpPartAnnotations/09.RestResponseAnnotation.html b/juneau-doc/docs/Topics/06.juneau-rest-server/10.RestHttpPartAnnotations/09.RestResponseAnnotation.html
index 21b5603..5f92508 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/10.RestHttpPartAnnotations/09.RestResponseAnnotation.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/10.RestHttpPartAnnotations/09.RestResponseAnnotation.html
@@ -83,7 +83,7 @@
 	}
 </p>
 <p>
-	Custom exceptions can also extend from one of the predefined HTTP exceptions such as the {@link oaj.http.exception.Unauthorized} exception:
+	Custom exceptions can also extend from one of the predefined HTTP exceptions such as the {@del oaj.http.exception.Unauthorized} exception:
 </p>
 <p class='bpcode w800'>
 	<jc>// Our annotated exception.</jc>
diff --git a/juneau-doc/docs/Topics/06.juneau-rest-server/11.RestHandlingFormPosts.html b/juneau-doc/docs/Topics/06.juneau-rest-server/11.RestHandlingFormPosts.html
index 6ade73f..ab30676 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/11.RestHandlingFormPosts.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/11.RestHandlingFormPosts.html
@@ -58,7 +58,7 @@
 </p>
 <div class='warn'>
 	If you're using form input beans, DO NOT use the <l>@FormData</l> attribute or 
-	{@link oajr.RestRequest#getParameter(String)} method since this will cause the 
+	{@del RestRequest#getParameter(String)} method since this will cause the 
 	underlying JEE servlet to parse the HTTP body as a form post.
 	<br>Your input bean will end up being null since there won't be any content left after the servlet 
 	has parsed the body of the request.
diff --git a/juneau-doc/docs/Topics/06.juneau-rest-server/15.RestConfigurableProperties.html b/juneau-doc/docs/Topics/06.juneau-rest-server/15.RestConfigurableProperties.html
index 69cfa65..8da0b02 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/15.RestConfigurableProperties.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/15.RestConfigurableProperties.html
@@ -23,7 +23,7 @@
 	These properties can be defined for serializers and parsers registered on a REST resource via the following:
 </p>
 <ul class='javatree'>
-	<li class='ja'>{@link oajr.annotation.Rest#properties() Rest(properties)} 
+	<li class='ja'>{@del Rest#properties()} 
 	<li class='jc'>{@link oajr.RestContextBuilder} - Various methods on the context builder.
 </ul>
 <h5 class='figure'>Example:</h5>
@@ -68,8 +68,8 @@
 	Properties can also be overridden at the Java method level:
 </p>
 <ul class='javatree'>
-	<li class='ja'>{@link oajr.annotation.RestOp#properties() RestOp(properties)} 
-	<li class='jc'>{@link oajr.RequestProperties} 
+	<li class='ja'>{@del RestOp#properties()}
+	<li class='jc'>{@del oajr.RequestProperties} 
 </ul>
 <p class='bpcode w800'>
 	<jc>// GET method with method-level properties</jc>
@@ -90,7 +90,7 @@
 	}
 </p>
 <ul class='seealso'>
-	<li class='ja'>{@link oajr.annotation.Rest#flags() Rest(flags)} - Shorthand for boolean properties.
-	<li class='ja'>{@link oajr.annotation.RestOp#flags() RestOp(flags)} - Shorthand for boolean properties.
-	<li class='jc'>{@link oajr.RestContextProperties} 
+	<li class='ja'>{@del Rest#flags()} - Shorthand for boolean properties.
+	<li class='ja'>{@del RestOp#flags()} - Shorthand for boolean properties.
+	<li class='jc'>{@del oajr.RestContextProperties} 
 </ul>
diff --git a/juneau-doc/docs/Topics/06.juneau-rest-server/17.RestTransforms.html b/juneau-doc/docs/Topics/06.juneau-rest-server/17.RestTransforms.html
index a80fe43..1e60782 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/17.RestTransforms.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/17.RestTransforms.html
@@ -23,9 +23,9 @@
 	Transforms are associated serializers and parsers registered on a REST resource via the following:
 </p>
 <ul class='javatree'>
-	<li class='ja'>{@link oaj.annotation.BeanConfig#beanFilters() BeanConfig(beanFilters)} - On class or methods. 
+	<li class='ja'>{@del BeanConfig#beanFilters() BeanConfig(beanFilters)} - On class or methods. 
 	<li class='ja'>{@link oaj.annotation.BeanConfig#swaps() BeanConfig(swaps)} - On class or methods. 
-	<li class='jm'>{@link oajr.RestContextBuilder#beanFilters(Object...)} 
+	<li class='jm'>{@del RestContextBuilder#beanFilters(Object...)} 
 	<li class='jm'>{@link oajr.RestContextBuilder#swaps(Object...)} 
 </ul>
 <p class='bpcode w800'>
diff --git a/juneau-doc/docs/Topics/06.juneau-rest-server/24.RestSvlVariables.html b/juneau-doc/docs/Topics/06.juneau-rest-server/24.RestSvlVariables.html
index 9572000..fafd0b9 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/24.RestSvlVariables.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/24.RestSvlVariables.html
@@ -76,7 +76,7 @@
 <ul class='javatree'>
 	<li class='jm'>{@link oajr.RestContext#getVarResolver()}
 	<li class='jm'>{@link oajr.RestRequest#getVarResolverSession()}
-	<li class='jm'>{@link oajr.RestRequest#getClasspathHttpResource(String,boolean)}
+	<li class='jm'>{@del RestRequest#getClasspathHttpResource(String,boolean)}
 </ul>
 <p>
 	There are two distinct groups of variables:
@@ -86,7 +86,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 {@link oajr.annotation.HtmlDoc @HtmlDoc}. 
+		<br>These are variables that are available during HTTP-requests and can be used on annotation such as {@del oajr.annotation.HtmlDoc @HtmlDoc}. 
 		<br>{@link oajr.RestRequest#getVarResolverSession()} method returns initialization and request-time variables.
 </ul>
 <p>
@@ -276,7 +276,7 @@
 		<td class='code'>$U{servlet:/foo?bar=$UE{$RA{bar}}</td>
 	</tr>
 	<tr class='dark dd'>
-		<td>{@link oajr.vars.WidgetVar}</td>
+		<td>{@del oajr.vars.WidgetVar}</td>
 		<td class='code'>$W{name}</td>
 		<td style='text-align:center;font-weight:bold'>no</td>
 		<td style='text-align:center;font-weight:bold'>yes</td>
diff --git a/juneau-doc/docs/Topics/06.juneau-rest-server/26.RestStaticFiles.html b/juneau-doc/docs/Topics/06.juneau-rest-server/26.RestStaticFiles.html
index cda3b3f..3e8d238 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/26.RestStaticFiles.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/26.RestStaticFiles.html
@@ -54,7 +54,7 @@
 		<br>Child resources can override mappings made on parent resources.
 	<li>
 		The media type on the response is determined by the 
-		{@link oajr.RestContext#getMediaTypeForName(String)} method.
+		{@del RestContext#getMediaTypeForName(String)} method.
 </ul>
 
 <ul class='seealso'>
diff --git a/juneau-doc/docs/Topics/06.juneau-rest-server/28.RestInfoProvider.html b/juneau-doc/docs/Topics/06.juneau-rest-server/28.RestInfoProvider.html
index 586bffb..274a4fe 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/28.RestInfoProvider.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/28.RestInfoProvider.html
@@ -16,7 +16,7 @@
 {title:'RestInfoProvider', flags:'todo'}
 
 <p>
-	The {@link oajr.RestInfoProvider} class is used to find the title
+	The {@del oajr.RestInfoProvider} class is used to find the title
 	and description for your resource and also generate the Swagger documentation.
 	It can be overridden to provide your own custom Swagger documentation.
 </p>
@@ -24,14 +24,14 @@
 	The methods on this interface are:
 </p>
 <ul class='javatree'>
-	<li class='jic'>{@link oajr.RestInfoProvider}
+	<li class='jic'>{@del RestInfoProvider}
 	<ul>
-		<li class='jm'>{@link oajr.RestInfoProvider#getSwagger(RestRequest) getSwagger(RestRequest)}
-		<li class='jm'>{@link oajr.RestInfoProvider#getSiteName(RestRequest) getSiteName(RestRequest)}
-		<li class='jm'>{@link oajr.RestInfoProvider#getTitle(RestRequest) getTitle(RestRequest)}
-		<li class='jm'>{@link oajr.RestInfoProvider#getDescription(RestRequest) getDescription(RestRequest)}
-		<li class='jm'>{@link oajr.RestInfoProvider#getMethodSummary(Method,RestRequest) getMethodSummary(Method,RestRequest)}
-		<li class='jm'>{@link oajr.RestInfoProvider#getMethodDescription(Method,RestRequest) getMethodDescription(Method,RestRequest)}
+		<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)}
 	</ul>
 </ul>
 <p>
@@ -41,18 +41,18 @@
 	<li class='jc'>{@link oajr.RestRequest}
 	<ul>
 		<li class='jm'>{@link oajr.RestRequest#getSwagger() getSwagger()}
-		<li class='jm'>{@link oajr.RestRequest#getSiteName() getSiteName()}
-		<li class='jm'>{@link oajr.RestRequest#getResourceTitle() getResourceTitle()}
-		<li class='jm'>{@link oajr.RestRequest#getResourceDescription() getResourceDescription()}
-		<li class='jm'>{@link oajr.RestRequest#getMethodSummary() getMethodSummary()}
-		<li class='jm'>{@link oajr.RestRequest#getMethodDescription() getMethodDescription()}
+		<li class='jm'>{@del getSiteName()}
+		<li class='jm'>{@del getResourceTitle()}
+		<li class='jm'>{@del getResourceDescription()}
+		<li class='jm'>{@del getMethodSummary()}
+		<li class='jm'>{@del getMethodDescription()}
 	</ul>
 </ul>
 <p>
 	Info providers are registered through the following property:
 </p>
 <ul class='javatree'>
-	<li class='jf'>{@link oajr.RestContext#REST_infoProvider}
+	<li class='jf'>{@del RestContext#REST_infoProvider}
 </ul>
 <p>
 	While you can implement this interface from scratch, you may want to instead consider extending
diff --git a/juneau-doc/docs/Topics/06.juneau-rest-server/28.RestInfoProvider/01.BasicRestInfoProvider.html b/juneau-doc/docs/Topics/06.juneau-rest-server/28.RestInfoProvider/01.BasicRestInfoProvider.html
index 6ad1cd6..34c492c 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/28.RestInfoProvider/01.BasicRestInfoProvider.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/28.RestInfoProvider/01.BasicRestInfoProvider.html
@@ -16,8 +16,8 @@
 {title:'BasicRestInfoProvider', flags:'todo'}
 
 <p>
-	The {@link oajr.BasicRestInfoProvider} class is the default implementation of the
-	{@link oajr.RestInfoProvider} interface.
+	The {@del oajr.BasicRestInfoProvider} class is the default implementation of the
+	{@del oajr.RestInfoProvider} interface.
 </p>
 <p>
 	It finds and collects information gathered from the following locations:
diff --git a/juneau-doc/docs/Topics/06.juneau-rest-server/29.RestSwagger/01.RestSwaggerBasicRestServlet.html b/juneau-doc/docs/Topics/06.juneau-rest-server/29.RestSwagger/01.RestSwaggerBasicRestServlet.html
index 4eb12d3..984626d 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/29.RestSwagger/01.RestSwaggerBasicRestServlet.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/29.RestSwagger/01.RestSwaggerBasicRestServlet.html
@@ -21,7 +21,7 @@
 </p>
 <p>
 	The underlying mechanics are simple.  
-	The {@link oajr.BasicRestServlet#getOptions(RestRequest)} method returns a {@link oaj.dto.swagger.Swagger} bean
+	The {@link oajr.BasicRestServlet#getSwagger(RestRequest)} method returns a {@link oaj.dto.swagger.Swagger} bean
 	consisting of information gathered from annotations and other sources.
 	Then that bean is swapped for a {@link oaj.dto.swagger.ui.SwaggerUI} bean when rendered as HTML.
 </p>
diff --git a/juneau-doc/docs/Topics/06.juneau-rest-server/29.RestSwagger/06.RestSwaggerParameterExamples.html b/juneau-doc/docs/Topics/06.juneau-rest-server/29.RestSwagger/06.RestSwaggerParameterExamples.html
index de6df1d..083ee19 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/29.RestSwagger/06.RestSwaggerParameterExamples.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/29.RestSwagger/06.RestSwaggerParameterExamples.html
@@ -212,7 +212,7 @@
 	}
 </p>
 <p>
-	Examples can also be specified via generic properties as well using the {@link oaj.BeanContext#BEAN_examples} property or {@link oaj.annotation.BeanConfig#examples() @BeanConfig(examples)} annotation at either the class or method level.
+	Examples can also be specified via generic properties as well using the {@link oaj.BeanContextBuilder#example(Class,Object)} setting or {@del oaj.annotation.BeanConfig#examples() @BeanConfig(examples)} annotation at either the class or method level.
 </p>
 <h5 class='figure'>Example:</h5>
 <p class='bpcode w800'>
@@ -224,9 +224,9 @@
 </p>
 <ul class='seealso'>
 	<li class='ja'>{@link oaj.annotation.Example}
-	<li class='jc'>{@link oaj.BeanContext}
+	<li class='jc'>{@link oaj.BeanContextBuilder}
 	<ul>
-		<li class='jf'>{@link oaj.BeanContext#BEAN_examples BEAN_examples}
+		<li class='jf'>{@link oaj.BeanContextBuilder#example(Class,Object) example(Class,Object)}
 	</ul>
 	<li class='jc'>{@link oaj.jsonschema.JsonSchemaGenerator}
 	<ul>
diff --git a/juneau-doc/docs/Topics/06.juneau-rest-server/29.RestSwagger/08.RestSwaggerResponseExamples.html b/juneau-doc/docs/Topics/06.juneau-rest-server/29.RestSwagger/08.RestSwaggerResponseExamples.html
index 176557c..b102e79 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/29.RestSwagger/08.RestSwaggerResponseExamples.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/29.RestSwagger/08.RestSwaggerResponseExamples.html
@@ -147,14 +147,15 @@
 	}
 </p>
 <p>
-	Examples can also be specified via generic properties as well using the {@link oaj.BeanContext#BEAN_examples} property 
-	or {@link oaj.annotation.BeanConfig#examples @BeanConfig(examples)} annotation at either the class or method level.
+	Examples can also be specified via generic properties as well using the {@del oaj.BeanContextBuilder#example(String,Object)} setting 
+	or {@link oaj.annotation.Bean#example @Bean(example)} annotation at either the class or method level.
 </p>
 <p class='bpcode w800'>
 	<jc>// Examples defined at class level.</jc>
 	<ja>@Rest</ja>(...)
-	<ja>@BeanConfig</ja>(
-		examples=<js>"{PetCreate: {name:'Doggie',price:9.99,species:'Dog',tags:['friendly','cute']}}"</js>
+	<ja>@Bean</ja>(
+		onClass=PetCreate.<jk>class</jk>,
+		example=<js>"{name:'Doggie',price:9.99,species:'Dog',tags:['friendly','cute']}"</js>
 	)
 </p>
 <p>
diff --git a/juneau-doc/docs/Topics/06.juneau-rest-server/31.RestHtmlDocAnnotation.html b/juneau-doc/docs/Topics/06.juneau-rest-server/31.RestHtmlDocAnnotation.html
index 6f976b0..d5a652d 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/31.RestHtmlDocAnnotation.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/31.RestHtmlDocAnnotation.html
@@ -75,7 +75,7 @@
 </p>
 <p>
 	The outline above is controlled by the {@link oaj.html.HtmlDocTemplate} interface
-	which can be overridden via the {@link oajr.annotation.HtmlDoc#template @HtmlDoc(template)} annotation.
+	which can be overridden via the {@del oajr.annotation.HtmlDoc#template @HtmlDoc(template)} annotation.
 </p>
 <p>
 	The <l>HelloWorldResource</l> class was an example of the <l>@HtmlDoc</l> annotation in use:
diff --git a/juneau-doc/docs/Topics/06.juneau-rest-server/31.RestHtmlDocAnnotation/02.RestHtmlWidgets.html b/juneau-doc/docs/Topics/06.juneau-rest-server/31.RestHtmlDocAnnotation/02.RestHtmlWidgets.html
index 5f88a5b..52f2b44 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/31.RestHtmlDocAnnotation/02.RestHtmlWidgets.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/31.RestHtmlDocAnnotation/02.RestHtmlWidgets.html
@@ -21,10 +21,10 @@
 	<br>They are registered in the following locations:
 </p>
 <ul class='javatree'>
-	<li class='ja'>{@link oajr.annotation.HtmlDoc#widgets() HtmlDoc(widgets)}
-	<li class='jm'>{@link oajr.RestContextBuilder#widgets(Class...)}
-	<li class='jm'>{@link oajr.RestContextBuilder#widgets(Widget...)}
-	<li class='jf'>{@link oajr.RestContext#REST_widgets}
+	<li class='ja'>{@del oajr.annotation.HtmlDoc#widgets() HtmlDoc(widgets)}
+	<li class='jm'>{@del RestContextBuilder#widgets(Class...)}
+	<li class='jm'>{@del RestContextBuilder#widgets(Widget...)}
+	<li class='jf'>{@del RestContext#REST_widgets}
 </ul>
 <h5 class='figure'>Example:</h5>
 <p class='bpcode w800'>
@@ -103,8 +103,8 @@
 <ul class='javatree'>
 	<li class='jac'>{@link oajr.widget.Widget}
 	<ul>
-		<li class='jm'>{@link oajr.widget.Widget#getClasspathResourceAsString(String) getClasspathResourceAsString(String)}
-		<li class='jm'>{@link oajr.widget.Widget#getClasspathResourceAsString(String,Locale) getClasspathResourceAsString(String,Locale)}
+		<li class='jm'>{@del getClasspathResourceAsString(String)}
+		<li class='jm'>{@del getClasspathResourceAsString(String,Locale)}
 	</ul>
 </ul>
 <h5 class='figure'>Example:</h5>
@@ -125,5 +125,5 @@
 	}
 </p>
 <ul class='seealso'>
-	<li class='jf'>{@link oajr.RestContext#REST_widgets}
+	<li class='jf'>{@del oajr.RestContext#REST_widgets}
 </ul>
diff --git a/juneau-doc/docs/Topics/06.juneau-rest-server/31.RestHtmlDocAnnotation/03.RestHtmlPredefinedWidgets.html b/juneau-doc/docs/Topics/06.juneau-rest-server/31.RestHtmlDocAnnotation/03.RestHtmlPredefinedWidgets.html
index 6336fa6..0a8ce85 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/31.RestHtmlDocAnnotation/03.RestHtmlPredefinedWidgets.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/31.RestHtmlDocAnnotation/03.RestHtmlPredefinedWidgets.html
@@ -115,7 +115,7 @@
 </p>
 <p>
 	This widget is designed to be used in conjunction with the {@link oajr.converters.Queryable} converter, although implementations
-	can process the query parameters themselves if they wish to do so by using the {@link oajr.RequestQuery#getSearchArgs()}
+	can process the query parameters themselves if they wish to do so by using the {@del RequestQuery#getSearchArgs()}
 	method to retrieve the arguments and process the data themselves.
 </p>
 <p>
diff --git a/juneau-doc/docs/Topics/06.juneau-rest-server/32.RestDefaultHeaders.html b/juneau-doc/docs/Topics/06.juneau-rest-server/32.RestDefaultHeaders.html
index edbb9a2..fbef513 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/32.RestDefaultHeaders.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/32.RestDefaultHeaders.html
@@ -20,10 +20,10 @@
 </p>
 <ul class='javatree'>
 	<li class='ja'>
-		{@link oajr.annotation.Rest#reqHeaders() Rest(reqHeaders)} 
+		{@del Rest#reqHeaders()} 
 		<br>Defines default headers on request when the client doesn't specify them.
 	<li class='ja'>
-		{@link oajr.annotation.Rest#resHeaders() Rest(resHeaders)}
+		{@del Rest#resHeaders()}
 		<br>Appends the specified headers if they weren't already set programmatically.	
 </ul>		
 
@@ -50,9 +50,9 @@
 		{@link oajr.RestContextBuilder}
 		<ul>
 			<li class='jm'>
-				{@link oajr.RestContextBuilder#reqHeaders(String[])}
+				{@link oajr.RestContextBuilder#defaultRequestHeaders(Header...)}
 			<li class='jm'>
-				{@link oajr.RestContextBuilder#resHeaders(String[])}
+				{@link oajr.RestContextBuilder#defaultResponseHeaders(Header...)}
 		</ul>
 	</li>
 </ul>
diff --git a/juneau-doc/docs/Topics/06.juneau-rest-server/33.RestLoggingAndDebugging.html b/juneau-doc/docs/Topics/06.juneau-rest-server/33.RestLoggingAndDebugging.html
index 59d4d08..0d73455 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/33.RestLoggingAndDebugging.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/33.RestLoggingAndDebugging.html
@@ -25,53 +25,53 @@
 	<li class='ja'>
 		{@link oajr.annotation.Rest}
 		<ul>
-			<li class='jm'>{@link oajr.annotation.Rest#logging() logging()} - Class-level logging configuration and rules.
+			<li class='jm'>{@del logging()} - Class-level logging configuration and rules.
 			<li class='jm'>{@link oajr.annotation.Rest#debug() debug()} - Enable debug mode.
 		</ul>
 	</li>
 	<li class='ja'>
 		{@link oajr.annotation.RestOp}
 		<ul>
-			<li class='jm'>{@link oajr.annotation.RestOp#logging() logging()} - Class-level logging configuration.
+			<li class='jm'>{@del logging()} - Class-level logging configuration.
 			<li class='jm'>{@link oajr.annotation.RestOp#debug() debug()} - Enable debug mode.
 		</ul>
 	</li>
 	<li class='jc'>
 		{@link oajr.RestContext}
 		<ul>
-			<li class='jf'>{@link oajr.RestContext#REST_callLoggerConfig REST_callLoggerConfig} - Underlying configuration property for {@link oajr.annotation.Rest#logging() @Rest(logging)}.
+			<li class='jf'>{@del RestContext#REST_callLoggerConfig} - Underlying configuration property for {@del @Rest(logging)}.
 			<li class='jf'>{@link oajr.RestContext#REST_debug REST_debug} - Underlying configuration property for {@link oajr.annotation.Rest#debug() @Rest(debug)}.
 		</ul>
 	</li>
 	<li class='ja'>
-		{@link oajr.annotation.Logging} - Annotation for {@link oajr.annotation.Rest#logging() @Rest(logging)} and {@link oajr.annotation.RestOp#logging() @RestOp(logging)}
+		{@del oajr.annotation.Logging} - Annotation for {@del @Rest(logging)} and {@del @RestOp(logging)}
 		<ul>
-			<li class='jm'>{@link oajr.annotation.Logging#level() level()} - The logging level.
-			<li class='jm'>{@link oajr.annotation.Logging#rules() rules()} - The logging rules.
-			<li class='jm'>{@link oajr.annotation.Logging#useStackTraceHashing() useStackTraceHashing()} - Enables de-duplication of logged stack traces and replacement with hash IDs. 
-			<li class='jm'>{@link oajr.annotation.Logging#stackTraceHashingTimeout() stackTraceHashingTimeout()} - Controls how frequently hashed stack traces are re-logged.
-			<li class='jm'>{@link oajr.annotation.Logging#disabled() disabled()} - Disables logging completely or per-request.
+			<li class='jm'>{@del oajr.annotation.Logging#level() level()} - The logging level.
+			<li class='jm'>{@del oajr.annotation.Logging#rules() rules()} - The logging rules.
+			<li class='jm'>{@del oajr.annotation.Logging#useStackTraceHashing() useStackTraceHashing()} - Enables de-duplication of logged stack traces and replacement with hash IDs. 
+			<li class='jm'>{@del oajr.annotation.Logging#stackTraceHashingTimeout() stackTraceHashingTimeout()} - Controls how frequently hashed stack traces are re-logged.
+			<li class='jm'>{@del oajr.annotation.Logging#disabled() disabled()} - Disables logging completely or per-request.
 		</ul>
 	</li>
 	<li class='ja'>
-		{@link oajr.annotation.LoggingRule} - Annotation for {@link oajr.annotation.Logging#rules() @Logging(rules)}
+		{@del oajr.annotation.LoggingRule} - Annotation for {@del oajr.annotation.Logging#rules() @Logging(rules)}
 		<ul>
-			<li class='jm'>{@link oajr.annotation.LoggingRule#level() level()} - The logging level.
-			<li class='jm'>{@link oajr.annotation.LoggingRule#codes() codes()} - Status code patterns and ranges to match against.
-			<li class='jm'>{@link oajr.annotation.LoggingRule#exceptions() exceptions()} - Exception class names and patterns to match against.
-			<li class='jm'>{@link oajr.annotation.LoggingRule#debugOnly() debugOnly()} - Match only if debug is set on the request.
-			<li class='jm'>{@link oajr.annotation.LoggingRule#req() req()} - The level of request detail.
-			<li class='jm'>{@link oajr.annotation.LoggingRule#res() res()} - The level of response detail.
-			<li class='jm'>{@link oajr.annotation.LoggingRule#verbose() verbose()} - Shortcut for <jsf>LONG</jsf> request and response detail.
-			<li class='jm'>{@link oajr.annotation.LoggingRule#disabled() disabled()} - Disables logging completely or per-request.
+			<li class='jm'>{@del oajr.annotation.LoggingRule#level() level()} - The logging level.
+			<li class='jm'>{@del oajr.annotation.LoggingRule#codes() codes()} - Status code patterns and ranges to match against.
+			<li class='jm'>{@del oajr.annotation.LoggingRule#exceptions() exceptions()} - Exception class names and patterns to match against.
+			<li class='jm'>{@del oajr.annotation.LoggingRule#debugOnly() debugOnly()} - Match only if debug is set on the request.
+			<li class='jm'>{@del oajr.annotation.LoggingRule#req() req()} - The level of request detail.
+			<li class='jm'>{@del oajr.annotation.LoggingRule#res() res()} - The level of response detail.
+			<li class='jm'>{@del oajr.annotation.LoggingRule#verbose() verbose()} - Shortcut for <jsf>LONG</jsf> request and response detail.
+			<li class='jm'>{@del oajr.annotation.LoggingRule#disabled() disabled()} - Disables logging completely or per-request.
 		</ul>
 	</li>
 </ul>
 
 <h5 class='topic'>Request/response details</h5>
 <p>
-	The amount of detail on requests and responses is controlled via the {@link oajr.annotation.LoggingRule#req() @LoggingRule(req)} 
-	and {@link oajr.annotation.LoggingRule#res() @LoggingRule(res)} annotations:
+	The amount of detail on requests and responses is controlled via the {@del oajr.annotation.LoggingRule#req() @LoggingRule(req)} 
+	and {@del oajr.annotation.LoggingRule#res() @LoggingRule(res)} annotations:
 </p>
 <ul>
 	<li><js>"short"</js> - Results in simple one-line log lines containing the HTTP method + url + response code.
@@ -250,7 +250,7 @@
 
 <h5 class='topic'>No-trace (disabled) mode</h5>
 <p>
-	The {@link oajr.annotation.Logging#disabled() @Logging(disabled)} and {@link oajr.annotation.LoggingRule#disabled() @LoggingRule(disabled)} annotations
+	The {@del oajr.annotation.Logging#disabled() @Logging(disabled)} and {@del oajr.annotation.LoggingRule#disabled() @LoggingRule(disabled)} annotations
 	can be used to disable logging entirely or on a per-request basis:
 </p>
 <p class='bpcode'>
@@ -285,7 +285,7 @@
 
 <h5 class='topic'>Stacktrace hashing</h5>
 <p>
-	The {@link oajr.annotation.Logging#useStackTraceHashing() @Logging(useStackTraceHashing)} setting can be used to eliminate duplicate stacktraces
+	The {@del oajr.annotation.Logging#useStackTraceHashing() @Logging(useStackTraceHashing)} setting can be used to eliminate duplicate stacktraces
 	in your log file by logging them once and then logging identifying hash IDs.
 </p>
 <p>
@@ -342,6 +342,6 @@
 	WARNING: [500,9b85cc96.2] HTTP POST /foo
 </p>
 <p>
-	The {@link oajr.annotation.Logging#stackTraceHashingTimeout() @Logging(stackTraceHashingTimeout)} setting can be used to periodically log the stacktrace
+	The {@del oajr.annotation.Logging#stackTraceHashingTimeout() @Logging(stackTraceHashingTimeout)} setting can be used to periodically log the stacktrace
 	to the log file again.
 </p>
\ No newline at end of file
diff --git a/juneau-doc/docs/Topics/06.juneau-rest-server/34.RestHttpStatusCodes.html b/juneau-doc/docs/Topics/06.juneau-rest-server/34.RestHttpStatusCodes.html
index b314b5b..89576f5 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/34.RestHttpStatusCodes.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/34.RestHttpStatusCodes.html
@@ -20,7 +20,7 @@
 	successfully.
 </p>
 <p>
-	Other status codes can be generated by throwing a {@link oajr.RestException} with a 
+	Other status codes can be generated by throwing a {@del oajr.RestException} with a 
 	specific HTTP status code, or calling {@link javax.servlet.http.HttpServletResponse#setStatus(int)}.
 </p>
 <p>
@@ -74,6 +74,6 @@
 	<tr>
 		<td><l>500</l></td>
 		<td>Internal Server Error</td>
-		<td>The Java method threw an exception other than {@link oajr.RestException}</td>
+		<td>The Java method threw an exception other than {@del oajr.RestException}</td>
 	</tr>
 </table>
diff --git a/juneau-doc/docs/Topics/06.juneau-rest-server/39.RestInjection.html b/juneau-doc/docs/Topics/06.juneau-rest-server/39.RestInjection.html
index 9fe849a..e3d31de 100644
--- a/juneau-doc/docs/Topics/06.juneau-rest-server/39.RestInjection.html
+++ b/juneau-doc/docs/Topics/06.juneau-rest-server/39.RestInjection.html
@@ -19,7 +19,7 @@
 	The Juneau REST server API is compatible with dependency injection frameworks such as Spring.
 </p>
 <p>
-	The important class is the {@link oajr.RestResourceResolver} class which is used
+	The important class is the {@del oajr.RestResourceResolver} class which is used
 	to resolve child servlet/resource implementation classes inside parent contexts.
 	In other words, it's used for resolving {@link oajr.annotation.Rest#children() @Rest(children)} instances.
 </p>
diff --git a/juneau-doc/docs/Topics/08.juneau-rest-server-springboot/01.SpringBootOverview.html b/juneau-doc/docs/Topics/08.juneau-rest-server-springboot/01.SpringBootOverview.html
index 0b38101..aa22233 100644
--- a/juneau-doc/docs/Topics/08.juneau-rest-server-springboot/01.SpringBootOverview.html
+++ b/juneau-doc/docs/Topics/08.juneau-rest-server-springboot/01.SpringBootOverview.html
@@ -20,11 +20,11 @@
 </p>
 <ul class='javatree'>
 	<li class='ja'>{@link oajr.springboot.annotation.JuneauRestRoot}
-	<li class='jc'>{@link oajr.springboot.JuneauRestInitializer}
-	<li class='jc'>{@link oajr.springboot.SpringRestResourceResolver}
+	<li class='jc'>{@del oajr.springboot.JuneauRestInitializer}
+	<li class='jc'>{@del oajr.springboot.SpringRestResourceResolver}
 </ul>
 <p>
-	A typical Spring Boot application can use the {@link oajr.springboot.JuneauRestInitializer} to find
+	A typical Spring Boot application can use the {@del oajr.springboot.JuneauRestInitializer} to find
 	and register Juneau REST servlets via the {@link oajr.springboot.annotation.JuneauRestRoot} annotation.
 </p>
 <h5 class='figure'>Example:</h5>
@@ -67,7 +67,7 @@
 	}
 </p>
 <p>
-	The root servlets are given an instance of {@link oajr.springboot.SpringRestResourceResolver} which allows
+	The root servlets are given an instance of {@del oajr.springboot.SpringRestResourceResolver} which allows
 	for child resources to be defined as injectable Spring beans.  
 </p>
 <p>
diff --git a/juneau-doc/docs/Topics/08.juneau-rest-server-springboot/02.SpringBootChildResources.html b/juneau-doc/docs/Topics/08.juneau-rest-server-springboot/02.SpringBootChildResources.html
index bf5bfc0..fd3aebe 100644
--- a/juneau-doc/docs/Topics/08.juneau-rest-server-springboot/02.SpringBootChildResources.html
+++ b/juneau-doc/docs/Topics/08.juneau-rest-server-springboot/02.SpringBootChildResources.html
@@ -16,7 +16,7 @@
 {title:'Child Resources', created:'8.1.0', flags:'todo'}
 
 <p>
-	When using the <ja>@JuneauRestRoot</ja> annotation, servlet are given an instance of {@link oajr.springboot.SpringRestResourceResolver}.  
+	When using the <ja>@JuneauRestRoot</ja> annotation, servlet are given an instance of {@del oajr.springboot.SpringRestResourceResolver}.  
 	The resource resolver gets passed down through the children hierarchy, allowing child resources to be defined as injectable Spring beans.
 </p>
 <h5 class='figure'>Example:</h5>
@@ -59,7 +59,7 @@
 <p>
 	Because Spring Boot will automatically register any beans that extend from <c>HttpServlet</c>, we
 	DON'T want the child classes to extend from <c>HttpServlet</c>.  Instead, we extend from
-	{@link oajr.BasicRestGroup} and {@link oajr.BasicRest} instead:
+	{@del oajr.BasicRestGroup} and {@del oajr.BasicRest} instead:
 </p>
 
 <p class='bpcode w800'>
diff --git a/juneau-doc/docs/Topics/09.juneau-rest-client.html b/juneau-doc/docs/Topics/09.juneau-rest-client.html
index 28b920e..7c15a27 100644
--- a/juneau-doc/docs/Topics/09.juneau-rest-client.html
+++ b/juneau-doc/docs/Topics/09.juneau-rest-client.html
@@ -100,20 +100,20 @@ specific language governing permissions and limitations under the License.
 	The classes are closely tied to Apache HttpClient, yet provide lots of additional functionality:
 </p>
 <ul class='javatree'>
-	<li class='jc'>{@link oajr.client2.RestClient} <jk>extends</jk> {@link org.apache.http.client.HttpClient}, creates {@link oajr.client2.RestRequest} objects.
-	<li class='jc'>{@link oajr.client2.RestRequest} <jk>extends</jk> {@link org.apache.http.client.methods.HttpUriRequest}, creates {@link oajr.client2.RestResponse} objects.
-	<li class='jc'>{@link oajr.client2.RestResponse} <jk>extends</jk> {@link org.apache.http.HttpResponse}, creates {@link oajr.client2.RestResponseBody} and {@link oajr.client2.RestResponseHeader} objects.
-	<li class='jc'>{@link oajr.client2.RestResponseBody} <jk>extends</jk> {@link org.apache.http.HttpEntity}
-	<li class='jc'>{@link oajr.client2.RestResponseHeader} <jk>extends</jk> {@link org.apache.http.Header}
+	<li class='jc'>{@del oajr.client2.RestClient} <jk>extends</jk> {@link org.apache.http.client.HttpClient}, creates {@del oajr.client2.RestRequest} objects.
+	<li class='jc'>{@del oajr.client2.RestRequest} <jk>extends</jk> {@link org.apache.http.client.methods.HttpUriRequest}, creates {@del oajr.client2.RestResponse} objects.
+	<li class='jc'>{@del oajr.client2.RestResponse} <jk>extends</jk> {@link org.apache.http.HttpResponse}, creates {@del oajr.client2.RestResponseBody} and {@del oajr.client2.RestResponseHeader} objects.
+	<li class='jc'>{@del oajr.client2.RestResponseBody} <jk>extends</jk> {@link org.apache.http.HttpEntity}
+	<li class='jc'>{@del oajr.client2.RestResponseHeader} <jk>extends</jk> {@link org.apache.http.Header}
 </ul>
 
 <p>
-	Instances of this class are built using the {@link oajr.client2.RestClientBuilder} class which can be constructed using
-	the {@link oajr.client2.RestClient#create() RestClient.create()} method as shown above.
+	Instances of this class are built using the {@del oajr.client2.RestClientBuilder} class which can be constructed using
+	the {@del oajr.client2.RestClient#create() RestClient.create()} method as shown above.
 </p>
 <p>
 	Clients are typically created with a root URI so that relative URIs can be used when making requests.
-	This is done using the {@link oajr.client2.RestClientBuilder#rootUri(Object)} method.
+	This is done using the {@del oajr.client2.RestClientBuilder#rootUri(Object)} method.
 </p>
 
 <h5 class='figure'>Example:</h5>
@@ -126,41 +126,41 @@ specific language governing permissions and limitations under the License.
 </p>
 
 <p>
-	The {@link oajr.client2.RestClient} class creates {@link oajr.client2.RestRequest} objects using the following methods:
+	The {@del oajr.client2.RestClient} class creates {@del oajr.client2.RestRequest} objects using the following methods:
 </p>
 
 <ul class='javatree'>
-	<li class='jc'>{@link oajr.client2.RestClient}
+	<li class='jc'>{@del oajr.client2.RestClient}
 	<ul>
-		<li class='jm'>{@link oajr.client2.RestClient#get(Object) get(uri)} / {@link oajr.client2.RestClient#get() get()}
-		<li class='jm'>{@link oajr.client2.RestClient#put(Object,Object) put(uri,body)} / {@link oajr.client2.RestClient#put(Object) put(uri)}
-		<li class='jm'>{@link oajr.client2.RestClient#post(Object) post(uri,body)} / {@link oajr.client2.RestClient#post(Object) post(uri)}
-		<li class='jm'>{@link oajr.client2.RestClient#patch(Object,Object) patch(uri,body)} / {@link oajr.client2.RestClient#patch(Object) patch(uri)}
-		<li class='jm'>{@link oajr.client2.RestClient#delete(Object) delete(uri)}
-		<li class='jm'>{@link oajr.client2.RestClient#head(Object) head(uri)}
-		<li class='jm'>{@link oajr.client2.RestClient#options(Object) options(uri)}
-		<li class='jm'>{@link oajr.client2.RestClient#formPost(Object,Object) formPost(uri,body)} / {@link oajr.client2.RestClient#formPost(Object) formPost(uri)}
-		<li class='jm'>{@link oajr.client2.RestClient#formPostPairs(Object,Object...) formPostPairs(uri,parameters...)}
-		<li class='jm'>{@link oajr.client2.RestClient#request(String,Object,Object) request(method,uri,body)}
+		<li class='jm'>{@del oajr.client2.RestClient#get(Object) get(uri)} / {@del oajr.client2.RestClient#get() get()}
+		<li class='jm'>{@del oajr.client2.RestClient#put(Object,Object) put(uri,body)} / {@del oajr.client2.RestClient#put(Object) put(uri)}
+		<li class='jm'>{@del oajr.client2.RestClient#post(Object) post(uri,body)} / {@del oajr.client2.RestClient#post(Object) post(uri)}
+		<li class='jm'>{@del oajr.client2.RestClient#patch(Object,Object) patch(uri,body)} / {@del oajr.client2.RestClient#patch(Object) patch(uri)}
+		<li class='jm'>{@del oajr.client2.RestClient#delete(Object) delete(uri)}
+		<li class='jm'>{@del oajr.client2.RestClient#head(Object) head(uri)}
+		<li class='jm'>{@del oajr.client2.RestClient#options(Object) options(uri)}
+		<li class='jm'>{@del oajr.client2.RestClient#formPost(Object,Object) formPost(uri,body)} / {@del oajr.client2.RestClient#formPost(Object) formPost(uri)}
+		<li class='jm'>{@del oajr.client2.RestClient#formPostPairs(Object,Object...) formPostPairs(uri,parameters...)}
+		<li class='jm'>{@del oajr.client2.RestClient#request(String,Object,Object) request(method,uri,body)}
 	</ul>
 </ul>
  
 <p>
-	The {@link oajr.client2.RestRequest} class creates {@link oajr.client2.RestResponse} objects using the following methods:
+	The {@del oajr.client2.RestRequest} class creates {@del oajr.client2.RestResponse} objects using the following methods:
 </p>
 
 <ul class='javatree'>
-	<li class='jc'>{@link oajr.client2.RestRequest}
+	<li class='jc'>{@del oajr.client2.RestRequest}
 	<ul>
-		<li class='jm'>{@link oajr.client2.RestRequest#run() run()}
-		<li class='jm'>{@link oajr.client2.RestRequest#complete() complete()}
+		<li class='jm'>{@del oajr.client2.RestRequest#run() run()}
+		<li class='jm'>{@del oajr.client2.RestRequest#complete() complete()}
 	</ul>
 </ul>
 
 <p>
-	The distinction between the two methods is that {@link oajr.client2.RestRequest#complete() complete()} automatically consumes the response body and
-	{@link oajr.client2.RestRequest#run() run()} does not.  Note that you must consume response bodies in order for HTTP connections to be freed up
-	for reuse!  The {@link java.io.InputStream InputStreams} returned by the {@link oajr.client2.RestResponseBody} object are auto-closing once
+	The distinction between the two methods is that {@del oajr.client2.RestRequest#complete() complete()} automatically consumes the response body and
+	{@del oajr.client2.RestRequest#run() run()} does not.  Note that you must consume response bodies in order for HTTP connections to be freed up
+	for reuse!  The {@link java.io.InputStream InputStreams} returned by the {@del oajr.client2.RestResponseBody} object are auto-closing once
 	they are exhausted, so it is often not necessary to explicitly close them.
 </p>
 
diff --git a/juneau-doc/docs/Topics/09.juneau-rest-client/01.RestcPojoMarshalling.html b/juneau-doc/docs/Topics/09.juneau-rest-client/01.RestcPojoMarshalling.html
index 83db9f0..b8aa781 100644
--- a/juneau-doc/docs/Topics/09.juneau-rest-client/01.RestcPojoMarshalling.html
+++ b/juneau-doc/docs/Topics/09.juneau-rest-client/01.RestcPojoMarshalling.html
@@ -20,17 +20,17 @@
 	Other languages can be specified using any of the following builder methods:
 </p>
 <ul class='javatree'>
-	<li class='jc'>{@link oajr.client2.RestClientBuilder}
+	<li class='jc'>{@del oajr.client2.RestClientBuilder}
 	<ul>
-		<li class='jm'>{@link oajr.client2.RestClientBuilder#json() json()}
-		<li class='jm'>{@link oajr.client2.RestClientBuilder#simpleJson() simpleJson()}
-		<li class='jm'>{@link oajr.client2.RestClientBuilder#xml() xml()}
-		<li class='jm'>{@link oajr.client2.RestClientBuilder#html() html()}
-		<li class='jm'>{@link oajr.client2.RestClientBuilder#plainText() plainText()}
-		<li class='jm'>{@link oajr.client2.RestClientBuilder#msgPack() msgPack()}
-		<li class='jm'>{@link oajr.client2.RestClientBuilder#uon() uon()}
-		<li class='jm'>{@link oajr.client2.RestClientBuilder#urlEnc() urlEnc()}
-		<li class='jm'>{@link oajr.client2.RestClientBuilder#openApi() openApi()}
+		<li class='jm'>{@del oajr.client2.RestClientBuilder#json() json()}
+		<li class='jm'>{@del oajr.client2.RestClientBuilder#simpleJson() simpleJson()}
+		<li class='jm'>{@del oajr.client2.RestClientBuilder#xml() xml()}
+		<li class='jm'>{@del oajr.client2.RestClientBuilder#html() html()}
+		<li class='jm'>{@del oajr.client2.RestClientBuilder#plainText() plainText()}
+		<li class='jm'>{@del oajr.client2.RestClientBuilder#msgPack() msgPack()}
+		<li class='jm'>{@del oajr.client2.RestClientBuilder#uon() uon()}
+		<li class='jm'>{@del oajr.client2.RestClientBuilder#urlEnc() urlEnc()}
+		<li class='jm'>{@del oajr.client2.RestClientBuilder#openApi() openApi()}
 	</ul>
 </ul>
 
@@ -82,7 +82,7 @@
 </p>
 
 <p>
-	The {@link oajr.client2.RestClientBuilder} class provides convenience methods for setting common serializer and parser
+	The {@del oajr.client2.RestClientBuilder} class provides convenience methods for setting common serializer and parser
 	settings.
 </p>
 <h5 class='figure'>Example:</h5>
@@ -104,11 +104,11 @@
 	Other methods are also provided for specifying the serializers and parsers used for lower-level marshalling support:
 </p>
 <ul class='javatree'>
-	<li class='jc'>{@link oajr.client2.RestClientBuilder}
+	<li class='jc'>{@del oajr.client2.RestClientBuilder}
 	<ul>
-		<li class='jm'>{@link oajr.client2.RestClientBuilder#serializer(Serializer) serializer(Serializer)}
-		<li class='jm'>{@link oajr.client2.RestClientBuilder#parser(Parser) parser(Parser)}
-		<li class='jm'>{@link oajr.client2.RestClientBuilder#marshall(Marshall) marshall(Marshall)}
+		<li class='jm'>{@del oajr.client2.RestClientBuilder#serializer(Serializer) serializer(Serializer)}
+		<li class='jm'>{@del oajr.client2.RestClientBuilder#parser(Parser) parser(Parser)}
+		<li class='jm'>{@del oajr.client2.RestClientBuilder#marshall(Marshall) marshall(Marshall)}
 	</ul>
 </ul>
 
@@ -118,9 +118,9 @@
 	{@link oaj.oapi.OpenApiParser}.  These can be overridden using the following methods:
 </p>
 <ul class='javatree'>
-	<li class='jc'>{@link oajr.client2.RestClientBuilder}
+	<li class='jc'>{@del oajr.client2.RestClientBuilder}
 	<ul>
-		<li class='jm'>{@link oajr.client2.RestClientBuilder#partSerializer(Class) partSerializer(Class&lt;? extends HttpPartSerializer>)}
-		<li class='jm'>{@link oajr.client2.RestClientBuilder#partParser(Class) partParser(Class&lt;? extends HttpPartParser>)}
+		<li class='jm'>{@del oajr.client2.RestClientBuilder#partSerializer(Class) partSerializer(Class&lt;? extends HttpPartSerializer>)}
+		<li class='jm'>{@del oajr.client2.RestClientBuilder#partParser(Class) partParser(Class&lt;? extends HttpPartParser>)}
 	</ul>
 </ul>
diff --git a/juneau-doc/docs/Topics/09.juneau-rest-client/02.RestcRequestHeaders.html b/juneau-doc/docs/Topics/09.juneau-rest-client/02.RestcRequestHeaders.html
index 27e4bf8..f4d70e4 100644
--- a/juneau-doc/docs/Topics/09.juneau-rest-client/02.RestcRequestHeaders.html
+++ b/juneau-doc/docs/Topics/09.juneau-rest-client/02.RestcRequestHeaders.html
@@ -19,26 +19,26 @@
 	Per-client or per-request headers can be specified using the following methods:
 </p>
 <ul class='javatree'>
-	<li class='jc'>{@link oajr.client2.RestClientBuilder}
+	<li class='jc'>{@del oajr.client2.RestClientBuilder}
 	<ul>
-		<li class='jm'>{@link oajr.client2.RestClientBuilder#header(String,Object) header(String,Object)}
-		<li class='jm'>{@link oajr.client2.RestClientBuilder#header(String,Object,HttpPartSchema) header(String,Object,HttpPartSchema)}
-		<li class='jm'>{@link oajr.client2.RestClientBuilder#header(String,Supplier) header(String,Supplier&lt;?&gt;)}
-		<li class='jm'>{@link oajr.client2.RestClientBuilder#header(String,Supplier,HttpPartSchema) header(String,Supplier&lt;?&gt;,HttpPartSchema)}
-		<li class='jm'>{@link oajr.client2.RestClientBuilder#header(Header) header(Header)}
-		<li class='jm'>{@link oajr.client2.RestClientBuilder#headers(Object...) headers(Object...)}
-		<li class='jm'>{@link oajr.client2.RestClientBuilder#headerPairs(Object...) headerPairs(Object...)}
+		<li class='jm'>{@del oajr.client2.RestClientBuilder#header(String,Object) header(String,Object)}
+		<li class='jm'>{@del oajr.client2.RestClientBuilder#header(String,Object,HttpPartSchema) header(String,Object,HttpPartSchema)}
+		<li class='jm'>{@del oajr.client2.RestClientBuilder#header(String,Supplier) header(String,Supplier&lt;?&gt;)}
+		<li class='jm'>{@del oajr.client2.RestClientBuilder#header(String,Supplier,HttpPartSchema) header(String,Supplier&lt;?&gt;,HttpPartSchema)}
+		<li class='jm'>{@del oajr.client2.RestClientBuilder#header(Header) header(Header)}
+		<li class='jm'>{@del oajr.client2.RestClientBuilder#headers(Object...) headers(Object...)}
+		<li class='jm'>{@del oajr.client2.RestClientBuilder#headerPairs(Object...) headerPairs(Object...)}
 	</ul>
-	<li class='jc'>{@link oajr.client2.RestRequest}
+	<li class='jc'>{@del oajr.client2.RestRequest}
 	<ul>
-		<li class='jm'>{@link oajr.client2.RestRequest#header(String,Object) header(String,Object)}
-		<li class='jm'>{@link oajr.client2.RestRequest#header(String,Object,HttpPartSchema) header(String,Object,HttpPartSchema)}
-		<li class='jm'>{@link oajr.client2.RestRequest#header(AddFlag,String,Object) header(AddFlag,String,Object)}
-		<li class='jm'>{@link oajr.client2.RestRequest#header(AddFlag,String,Object,HttpPartSchema) header(AddFlag,String,Object,HttpPartSchema)}
-		<li class='jm'>{@link oajr.client2.RestRequest#header(Header) header(Header)}
-		<li class='jm'>{@link oajr.client2.RestRequest#headers(Object...) headers(Object...)}
-		<li class='jm'>{@link oajr.client2.RestRequest#headers(AddFlag,Object...) headers(AddFlag,Object...)}
-		<li class='jm'>{@link oajr.client2.RestRequest#headerPairs(Object...) headers(Object...)}
+		<li class='jm'>{@del oajr.client2.RestRequest#header(String,Object) header(String,Object)}
+		<li class='jm'>{@del oajr.client2.RestRequest#header(String,Object,HttpPartSchema) header(String,Object,HttpPartSchema)}
+		<li class='jm'>{@del oajr.client2.RestRequest#header(AddFlag,String,Object) header(AddFlag,String,Object)}
+		<li class='jm'>{@del oajr.client2.RestRequest#header(AddFlag,String,Object,HttpPartSchema) header(AddFlag,String,Object,HttpPartSchema)}
+		<li class='jm'>{@del oajr.client2.RestRequest#header(Header) header(Header)}
+		<li class='jm'>{@del oajr.client2.RestRequest#headers(Object...) headers(Object...)}
+		<li class='jm'>{@del oajr.client2.RestRequest#headers(AddFlag,Object...) headers(AddFlag,Object...)}
+		<li class='jm'>{@del oajr.client2.RestRequest#headerPairs(Object...) headers(Object...)}
 	</ul>
 </ul>
 
@@ -52,8 +52,8 @@
 </p>
 
 <p>
-	{@link oajr.client2.RestClientBuilder#headers(Object...) headers(Object...)} allows you to pass in a variety
-	of header objects, and {@link oajr.client2.RestClientBuilder#headerPairs(Object...) headerPairs(Object...)} allows
+	{@del oajr.client2.RestClientBuilder#headers(Object...) headers(Object...)} allows you to pass in a variety
+	of header objects, and {@del oajr.client2.RestClientBuilder#headerPairs(Object...) headerPairs(Object...)} allows
 	you to specify several headers in a compact fashion.
 </p>
 
@@ -76,7 +76,7 @@
 
 <p>
 	Additionally, methods are provided on the client builder and per request for all standard HTTP headers
-	such as {@link oajr.client2.RestClientBuilder#authorization(Object) authorization(Object)}.
+	such as {@del oajr.client2.RestClientBuilder#authorization(Object) authorization(Object)}.
 </p>
 
 <h5 class='figure'>Example:</h5>
@@ -116,7 +116,7 @@
 </p>
 
 <p>
-	The methods with {@link oaj.AddFlag} parameters allow you to control whether new headers get appended, prepended, or
+	The methods with {@del oaj.AddFlag} parameters allow you to control whether new headers get appended, prepended, or
 	replace existing headers with the same name.
 </p>
 
diff --git a/juneau-doc/docs/Topics/09.juneau-rest-client/03.RestcRequestQueryParameters.html b/juneau-doc/docs/Topics/09.juneau-rest-client/03.RestcRequestQueryParameters.html
index 729aa74..93724e3 100644
--- a/juneau-doc/docs/Topics/09.juneau-rest-client/03.RestcRequestQueryParameters.html
+++ b/juneau-doc/docs/Topics/09.juneau-rest-client/03.RestcRequestQueryParameters.html
@@ -19,23 +19,23 @@
 	Per-client or per-request query parameters can be specified using the following methods:
 </p>
 <ul class='javatree'>
-	<li class='jc'>{@link oajr.client2.RestClientBuilder}
+	<li class='jc'>{@del oajr.client2.RestClientBuilder}
 	<ul>
-		<li class='jm'>{@link oajr.client2.RestClientBuilder#query(String,Object) query(String,Object)}
-		<li class='jm'>{@link oajr.client2.RestClientBuilder#query(String,Object,HttpPartSchema) query(String,Object,HttpPartSchema)}
-		<li class='jm'>{@link oajr.client2.RestClientBuilder#query(String,Supplier) query(String,Supplier&lt;?&gt;)}
-		<li class='jm'>{@link oajr.client2.RestClientBuilder#query(String,Supplier,HttpPartSchema) query(String,Supplier&lt;?&gt;,HttpPartSchema)}
-		<li class='jm'>{@link oajr.client2.RestClientBuilder#queries(Object...) queries(Object...)}
-		<li class='jm'>{@link oajr.client2.RestClientBuilder#queryPairs(Object...) queryPairs(Object...)}
+		<li class='jm'>{@del oajr.client2.RestClientBuilder#query(String,Object) query(String,Object)}
+		<li class='jm'>{@del oajr.client2.RestClientBuilder#query(String,Object,HttpPartSchema) query(String,Object,HttpPartSchema)}
+		<li class='jm'>{@del oajr.client2.RestClientBuilder#query(String,Supplier) query(String,Supplier&lt;?&gt;)}
+		<li class='jm'>{@del oajr.client2.RestClientBuilder#query(String,Supplier,HttpPartSchema) query(String,Supplier&lt;?&gt;,HttpPartSchema)}
+		<li class='jm'>{@del oajr.client2.RestClientBuilder#queries(Object...) queries(Object...)}
+		<li class='jm'>{@del oajr.client2.RestClientBuilder#queryPairs(Object...) queryPairs(Object...)}
 	</ul>
-	<li class='jc'>{@link oajr.client2.RestRequest}
+	<li class='jc'>{@del oajr.client2.RestRequest}
 	<ul>
-		<li class='jm'>{@link oajr.client2.RestRequest#query(String,Object) query(String,Object)}
-		<li class='jm'>{@link oajr.client2.RestRequest#query(AddFlag,String,Object) query(AddFlag,String,Object)}
-		<li class='jm'>{@link oajr.client2.RestRequest#queries(Object...) queries(Object...)}
-		<li class='jm'>{@link oajr.client2.RestRequest#queries(AddFlag,Object...) queries(AddFlag,Object...)}
-		<li class='jm'>{@link oajr.client2.RestRequest#queryPairs(Object...) queryPairs(Object...)}
-		<li class='jm'>{@link oajr.client2.RestRequest#queryCustom(Object) queryCustom(Object)}
+		<li class='jm'>{@del oajr.client2.RestRequest#query(String,Object) query(String,Object)}
+		<li class='jm'>{@del oajr.client2.RestRequest#query(AddFlag,String,Object) query(AddFlag,String,Object)}
+		<li class='jm'>{@del oajr.client2.RestRequest#queries(Object...) queries(Object...)}
+		<li class='jm'>{@del oajr.client2.RestRequest#queries(AddFlag,Object...) queries(AddFlag,Object...)}
+		<li class='jm'>{@del oajr.client2.RestRequest#queryPairs(Object...) queryPairs(Object...)}
+		<li class='jm'>{@del oajr.client2.RestRequest#queryCustom(Object) queryCustom(Object)}
 	</ul>
 </ul>
 
@@ -49,8 +49,8 @@
 </p>
 
 <p>
-	{@link oajr.client2.RestClientBuilder#queries(Object...) queries(Object...)} allows you to pass in a variety
-	of query parameter objects, and {@link oajr.client2.RestClientBuilder#queryPairs(Object...) queryPairs(Object...)} allows
+	{@del oajr.client2.RestClientBuilder#queries(Object...) queries(Object...)} allows you to pass in a variety
+	of query parameter objects, and {@del oajr.client2.RestClientBuilder#queryPairs(Object...) queryPairs(Object...)} allows
 	you to specify several query parameters in a compact fashion.
 </p>
 
@@ -84,7 +84,7 @@
 </p>
 
 <p>
-	The methods with {@link oaj.AddFlag} parameters allow you to control whether new query parameters get appended, prepended, or
+	The methods with {@del oaj.AddFlag} parameters allow you to control whether new query parameters get appended, prepended, or
 	replace existing query parameters with the same name.
 </p>
 
diff --git a/juneau-doc/docs/Topics/09.juneau-rest-client/04.RestcRequestFormData.html b/juneau-doc/docs/Topics/09.juneau-rest-client/04.RestcRequestFormData.html
index 0a4bfd4..bda4f6e 100644
--- a/juneau-doc/docs/Topics/09.juneau-rest-client/04.RestcRequestFormData.html
+++ b/juneau-doc/docs/Topics/09.juneau-rest-client/04.RestcRequestFormData.html
@@ -19,23 +19,23 @@
 	Per-client or per-request form-data parameters can be specified using the following methods:
 </p>
 <ul class='javatree'>
-	<li class='jc'>{@link oajr.client2.RestClientBuilder}
+	<li class='jc'>{@del oajr.client2.RestClientBuilder}
 	<ul>
-		<li class='jm'>{@link oajr.client2.RestClientBuilder#formData(String,Object) formData(String,Object)}
-		<li class='jm'>{@link oajr.client2.RestClientBuilder#formData(String,Object,HttpPartSchema) formData(String,Object,HttpPartSchema)}
-		<li class='jm'>{@link oajr.client2.RestClientBuilder#formData(String,Supplier) formData(String,Supplier&lt;?&gt;)}
-		<li class='jm'>{@link oajr.client2.RestClientBuilder#formData(String,Supplier,HttpPartSchema) formData(String,Supplier&lt;?&gt;,HttpPartSchema)}
-		<li class='jm'>{@link oajr.client2.RestClientBuilder#formDatas(Object...) formDatas(Object...)}
-		<li class='jm'>{@link oajr.client2.RestClientBuilder#formDataPairs(Object...) formDataPairs(Object...)}
+		<li class='jm'>{@del oajr.client2.RestClientBuilder#formData(String,Object) formData(String,Object)}
+		<li class='jm'>{@del oajr.client2.RestClientBuilder#formData(String,Object,HttpPartSchema) formData(String,Object,HttpPartSchema)}
+		<li class='jm'>{@del oajr.client2.RestClientBuilder#formData(String,Supplier) formData(String,Supplier&lt;?&gt;)}
+		<li class='jm'>{@del oajr.client2.RestClientBuilder#formData(String,Supplier,HttpPartSchema) formData(String,Supplier&lt;?&gt;,HttpPartSchema)}
+		<li class='jm'>{@del oajr.client2.RestClientBuilder#formDatas(Object...) formDatas(Object...)}
+		<li class='jm'>{@del oajr.client2.RestClientBuilder#formDataPairs(Object...) formDataPairs(Object...)}
 	</ul>
-	<li class='jc'>{@link oajr.client2.RestRequest}
+	<li class='jc'>{@del oajr.client2.RestRequest}
 	<ul>
-		<li class='jm'>{@link oajr.client2.RestRequest#formData(String,Object) formData(String,Object)}
-		<li class='jm'>{@link oajr.client2.RestRequest#formData(AddFlag,String,Object) formData(AddFlag,String,Object)}
-		<li class='jm'>{@link oajr.client2.RestRequest#formDatas(Object...) formDatas(Object...)}
-		<li class='jm'>{@link oajr.client2.RestRequest#formDatas(AddFlag,Object...) formDatas(AddFlag,Object...)}
-		<li class='jm'>{@link oajr.client2.RestRequest#formDataPairs(Object...) formDataPairs(Object...)}
-		<li class='jm'>{@link oajr.client2.RestRequest#formDataCustom(Object) formDataCustom(Object)}
+		<li class='jm'>{@del oajr.client2.RestRequest#formData(String,Object) formData(String,Object)}
+		<li class='jm'>{@del oajr.client2.RestRequest#formData(AddFlag,String,Object) formData(AddFlag,String,Object)}
+		<li class='jm'>{@del oajr.client2.RestRequest#formDatas(Object...) formDatas(Object...)}
+		<li class='jm'>{@del oajr.client2.RestRequest#formDatas(AddFlag,Object...) formDatas(AddFlag,Object...)}
+		<li class='jm'>{@del oajr.client2.RestRequest#formDataPairs(Object...) formDataPairs(Object...)}
+		<li class='jm'>{@del oajr.client2.RestRequest#formDataCustom(Object) formDataCustom(Object)}
 	</ul>
 </ul>
 
@@ -49,8 +49,8 @@
 </p>
 
 <p>
-	{@link oajr.client2.RestClientBuilder#formDatas(Object...) formDatas(Object...)} allows you to pass in a variety
-	of form-data parameter objects, and {@link oajr.client2.RestClientBuilder#formDataPairs(Object...) formDataPairs(Object...)} allows
+	{@del oajr.client2.RestClientBuilder#formDatas(Object...) formDatas(Object...)} allows you to pass in a variety
+	of form-data parameter objects, and {@del oajr.client2.RestClientBuilder#formDataPairs(Object...) formDataPairs(Object...)} allows
 	you to specify several form-data parameters in a compact fashion.
 </p>
 
@@ -84,7 +84,7 @@
 </p>
 
 <p>
-	The methods with {@link oaj.AddFlag} parameters allow you to control whether new form-data parameters get appended, prepended, or
+	The methods with {@del oaj.AddFlag} parameters allow you to control whether new form-data parameters get appended, prepended, or
 	replace existing form-data parameters with the same name.
 </p>
 
diff --git a/juneau-doc/docs/Topics/09.juneau-rest-client/05.RestcRequestBody.html b/juneau-doc/docs/Topics/09.juneau-rest-client/05.RestcRequestBody.html
index 54255c1..4d3ab94 100644
--- a/juneau-doc/docs/Topics/09.juneau-rest-client/05.RestcRequestBody.html
+++ b/juneau-doc/docs/Topics/09.juneau-rest-client/05.RestcRequestBody.html
@@ -16,14 +16,14 @@
 {title:'Request Body', created:'8.2.0', flags:'todo'}
 
 <p>
-	The request body can either be passed in with the client creator method (e.g. {@link oajr.client2.RestClient#post(Object,Object) post(uri,body)}),
+	The request body can either be passed in with the client creator method (e.g. {@del oajr.client2.RestClient#post(Object,Object) post(uri,body)}),
 	or can be specified via the following methods:
 </p>
 <ul class='javatree'>
-	<li class='jc'>{@link oajr.client2.RestRequest}
+	<li class='jc'>{@del oajr.client2.RestRequest}
 	<ul>
-		<li class='jm'>{@link oajr.client2.RestRequest#body(Object) body(Object)}
-		<li class='jm'>{@link oajr.client2.RestRequest#body(Object,HttpPartSchema) body(Object,HttpPartSchema)}
+		<li class='jm'>{@del oajr.client2.RestRequest#body(Object) body(Object)}
+		<li class='jm'>{@del oajr.client2.RestRequest#body(Object,HttpPartSchema) body(Object,HttpPartSchema)}
 	</ul>
 </ul>
 
diff --git a/juneau-doc/docs/Topics/09.juneau-rest-client/06.RestcResponseStatus.html b/juneau-doc/docs/Topics/09.juneau-rest-client/06.RestcResponseStatus.html
index b44f77c..19b3d2a 100644
--- a/juneau-doc/docs/Topics/09.juneau-rest-client/06.RestcResponseStatus.html
+++ b/juneau-doc/docs/Topics/09.juneau-rest-client/06.RestcResponseStatus.html
@@ -16,16 +16,16 @@
 {title:'Response Status', created:'8.1.0', flags:'todo'}
 
 <p>
-	After execution using {@link oajr.client2.RestRequest#run()} or {@link oajr.client2.RestRequest#complete()}, the following methods can be used
+	After execution using {@del oajr.client2.RestRequest#run()} or {@del oajr.client2.RestRequest#complete()}, the following methods can be used
 	to get the response status:
 </p>
 <ul class='javatree'>
-	<li class='jc'>{@link oajr.client2.RestResponse}
+	<li class='jc'>{@del oajr.client2.RestResponse}
 	<ul>
-		<li class='jm'><c>{@link oajr.client2.RestResponse#getStatusLine() getStatusLine()} <jk>returns</jk> {@link org.apache.http.StatusLine}</c>
-		<li class='jm'><c>{@link oajr.client2.RestResponse#getStatusCode() getStatusCode()} <jk>returns</jk> <jk>int</jk></c>
-		<li class='jm'><c>{@link oajr.client2.RestResponse#getReasonPhrase() getReasonPhrase()} <jk>returns</jk> String</c>
-		<li class='jm'><c>{@link oajr.client2.RestResponse#assertStatus() assertStatus()} <jk>returns</jk> {@link oajr.client2.RestResponseStatusLineAssertion}</c>
+		<li class='jm'><c>{@del oajr.client2.RestResponse#getStatusLine() getStatusLine()} <jk>returns</jk> {@link org.apache.http.StatusLine}</c>
+		<li class='jm'><c>{@del oajr.client2.RestResponse#getStatusCode() getStatusCode()} <jk>returns</jk> <jk>int</jk></c>
+		<li class='jm'><c>{@del oajr.client2.RestResponse#getReasonPhrase() getReasonPhrase()} <jk>returns</jk> String</c>
+		<li class='jm'><c>{@del oajr.client2.RestResponse#assertStatus() assertStatus()} <jk>returns</jk> {@del oajr.client2.RestResponseStatusLineAssertion}</c>
 	</ul>
 </ul>
 
@@ -50,8 +50,8 @@
 </p>
 
 <ul class='notes'>
-	<li>If you are only interested in the response status and not the response body, be sure to use {@link oajr.client2.RestRequest#complete()} instead
-		of {@link oajr.client2.RestRequest#run()} to make sure the response body gets automatically cleaned up.  Otherwise you must
+	<li>If you are only interested in the response status and not the response body, be sure to use {@del oajr.client2.RestRequest#complete()} instead
+		of {@del oajr.client2.RestRequest#run()} to make sure the response body gets automatically cleaned up.  Otherwise you must
 		consume the response yourself.
 </ul>
 
diff --git a/juneau-doc/docs/Topics/09.juneau-rest-client/07.RestcResponseHeaders.html b/juneau-doc/docs/Topics/09.juneau-rest-client/07.RestcResponseHeaders.html
index ef261ff..f8ce469 100644
--- a/juneau-doc/docs/Topics/09.juneau-rest-client/07.RestcResponseHeaders.html
+++ b/juneau-doc/docs/Topics/09.juneau-rest-client/07.RestcResponseHeaders.html
@@ -19,21 +19,21 @@
 	Response headers are accessed through the following methods:
 </p>
 <ul class='javatree'>
-	<li class='jc'>{@link oajr.client2.RestResponse}
+	<li class='jc'>{@del oajr.client2.RestResponse}
 	<ul>
-		<li class='jm'><c>{@link oajr.client2.RestResponse#getHeader(String) getHeader(String)} <jk>returns</jk> {@link oajr.client2.RestResponseHeader}</c>
-		<li class='jm'><c>{@link oajr.client2.RestResponse#getHeaders(String) getHeaders(String)} <jk>returns</jk> {@link oajr.client2.RestResponseHeader}[]</c>
-		<li class='jm'><c>{@link oajr.client2.RestResponse#getFirstHeader(String) getFirstHeader(String)} <jk>returns</jk> {@link oajr.client2.RestResponseHeader}</c>
-		<li class='jm'><c>{@link oajr.client2.RestResponse#getLastHeader(String) getLastHeader(String)} <jk>returns</jk> {@link oajr.client2.RestResponseHeader}</c>
-		<li class='jm'><c>{@link oajr.client2.RestResponse#getAllHeaders() getAllHeaders()} <jk>returns</jk> {@link oajr.client2.RestResponseHeader}[]</c>
-		<li class='jm'><c>{@link oajr.client2.RestResponse#getStringHeader(String) getStringHeader(String)} <jk>returns</jk> String</c>
-		<li class='jm'><c>{@link oajr.client2.RestResponse#containsHeader(String) containsHeader(String)} <jk>returns</jk> <jk>boolean</jk></c>
+		<li class='jm'><c>{@del oajr.client2.RestResponse#getHeader(String) getHeader(String)} <jk>returns</jk> {@del oajr.client2.RestResponseHeader}</c>
+		<li class='jm'><c>{@del oajr.client2.RestResponse#getHeaders(String) getHeaders(String)} <jk>returns</jk> {@del oajr.client2.RestResponseHeader}[]</c>
+		<li class='jm'><c>{@del oajr.client2.RestResponse#getFirstHeader(String) getFirstHeader(String)} <jk>returns</jk> {@del oajr.client2.RestResponseHeader}</c>
+		<li class='jm'><c>{@del oajr.client2.RestResponse#getLastHeader(String) getLastHeader(String)} <jk>returns</jk> {@del oajr.client2.RestResponseHeader}</c>
+		<li class='jm'><c>{@del oajr.client2.RestResponse#getAllHeaders() getAllHeaders()} <jk>returns</jk> {@del oaj.client2.RestResponseHeader}[]</c>
+		<li class='jm'><c>{@del oajr.client2.RestResponse#getStringHeader(String) getStringHeader(String)} <jk>returns</jk> String</c>
+		<li class='jm'><c>{@del oajr.client2.RestResponse#containsHeader(String) containsHeader(String)} <jk>returns</jk> <jk>boolean</jk></c>
 	</ul>
 </ul>
 
 <p>
-	Unlike {@link oajr.client2.RestResponse#getFirstHeader(String)} and {@link oajr.client2.RestResponse#getLastHeader(String)}, the {@link oajr.client2.RestResponse#getHeader(String)}
-	method returns an empty {@link oajr.client2.RestResponseHeader} object instead of returning <jk>null</jk>.
+	Unlike {@del oajr.client2.RestResponse#getFirstHeader(String)} and {@del oajr.client2.RestResponse#getLastHeader(String)}, the {@del oajr.client2.RestResponse#getHeader(String)}
+	method returns an empty {@del oajr.client2.RestResponseHeader} object instead of returning <jk>null</jk>.
 	This allows it to be used more easily in fluent calls.
 </p>
 
@@ -44,37 +44,37 @@
 </p>
 
 <p>
-	The {@link oajr.client2.RestResponseHeader} class extends from the HttpClient {@link org.apache.http.Header} class and provides several convenience
+	The {@del oajr.client2.RestResponseHeader} class extends from the HttpClient {@link org.apache.http.Header} class and provides several convenience
 	methods:
 </p>
 
 <ul class='javatree'>
-	<li class='jc'>{@link oajr.client2.RestResponseHeader}
+	<li class='jc'>{@del oajr.client2.RestResponseHeader}
 	<ul>
-		<li class='jm'><c>{@link oajr.client2.RestResponseHeader#exists() exists()} <jk>returns</jk> <jk>boolean</jk></c>
-		<li class='jm'><c>{@link oajr.client2.RestResponseHeader#asString() asString()} <jk>returns</jk> String</c>
-		<li class='jm'><c>{@link oajr.client2.RestResponseHeader#asOptionalString() asOptionalString()} <jk>returns</jk> Optional&lt;String&gt;</c>
-		<li class='jm'><c>{@link oajr.client2.RestResponseHeader#asStringOrElse(String) asStringOrElse(String)} <jk>returns</jk> String</c>
-		<li class='jm'><c>{@link oajr.client2.RestResponseHeader#as(Type,Type...) as(Type,Type...)} <jk>returns</jk> T</c>
-		<li class='jm'><c>{@link oajr.client2.RestResponseHeader#as(Class) as(Class&lt;T&gt;)} <jk>returns</jk> T</c>
-		<li class='jm'><c>{@link oajr.client2.RestResponseHeader#asOptional(Type,Type...) asOptional(Type,Type...)} <jk>returns</jk> Optional&lt;T&gt;</c>
-		<li class='jm'><c>{@link oajr.client2.RestResponseHeader#asOptional(Class) asOptional(Class&lt;T&gt;)} <jk>returns</jk> Optional&lt;T&gt;</c>
-		<li class='jm'><c>{@link oajr.client2.RestResponseHeader#asMatcher(Pattern) asMatcher(Pattern)} <jk>returns</jk> {@link java.util.regex.Matcher}</c>
-		<li class='jm'><c>{@link oajr.client2.RestResponseHeader#asMatcher(String) asMatcher(String)} <jk>returns</jk> {@link java.util.regex.Matcher}</c>
-		<li class='jm'><c>{@link oajr.client2.RestResponseHeader#asHeader(Class) asHeader(Class&lt;T <jk>extends</jk> BasicHeader&gt; c)} <jk>returns</jk> {@link oaj.http.BasicHeader}</c>
-		<li class='jm'><c>{@link oajr.client2.RestResponseHeader#asStringHeader() asStringHeader()} <jk>returns</jk> {@link oaj.http.header.BasicIntegerHeader}</c>
-		<li class='jm'><c>{@link oajr.client2.RestResponseHeader#asIntegerHeader() asIntegerHeader()} <jk>returns</jk> {@link oaj.http.header.BasicStringHeader}</c>
-		<li class='jm'><c>{@link oajr.client2.RestResponseHeader#asLongHeader() asLongHeader()} <jk>returns</jk> {@link oaj.http.header.BasicLongHeader}</c>
-		<li class='jm'><c>{@link oajr.client2.RestResponseHeader#asDateHeader() asDateHeader()} <jk>returns</jk> {@link oaj.http.header.BasicDateHeader}</c>
-		<li class='jm'><c>{@link oajr.client2.RestResponseHeader#asCsvArrayHeader() asCsvArrayHeader()} <jk>returns</jk> {@link oaj.http.header.BasicCsvArrayHeader}</c>
-		<li class='jm'><c>{@link oajr.client2.RestResponseHeader#asEntityTagArrayHeader() asEntityTagArrayHeader()} <jk>returns</jk> {@link oaj.http.header.BasicEntityTagArrayHeader}</c>
-		<li class='jm'><c>{@link oajr.client2.RestResponseHeader#asStringRangeArrayHeader() asStringRangeArrayHeader()} <jk>returns</jk> {@link oaj.http.header.BasicStringRangeArrayHeader}</c>
-		<li class='jm'><c>{@link oajr.client2.RestResponseHeader#asUriHeader() asUriHeader()} <jk>returns</jk> {@link oaj.http.header.BasicUriHeader}</c>
+		<li class='jm'><c>{@del oajr.client2.RestResponseHeader#exists() exists()} <jk>returns</jk> <jk>boolean</jk></c>
+		<li class='jm'><c>{@del oajr.client2.RestResponseHeader#asString() asString()} <jk>returns</jk> String</c>
+		<li class='jm'><c>{@del oajr.client2.RestResponseHeader#asOptionalString() asOptionalString()} <jk>returns</jk> Optional&lt;String&gt;</c>
+		<li class='jm'><c>{@del oajr.client2.RestResponseHeader#asStringOrElse(String) asStringOrElse(String)} <jk>returns</jk> String</c>
+		<li class='jm'><c>{@del oajr.client2.RestResponseHeader#as(Type,Type...) as(Type,Type...)} <jk>returns</jk> T</c>
+		<li class='jm'><c>{@del oajr.client2.RestResponseHeader#as(Class) as(Class&lt;T&gt;)} <jk>returns</jk> T</c>
+		<li class='jm'><c>{@del oajr.client2.RestResponseHeader#asOptional(Type,Type...) asOptional(Type,Type...)} <jk>returns</jk> Optional&lt;T&gt;</c>
+		<li class='jm'><c>{@del oajr.client2.RestResponseHeader#asOptional(Class) asOptional(Class&lt;T&gt;)} <jk>returns</jk> Optional&lt;T&gt;</c>
+		<li class='jm'><c>{@del oajr.client2.RestResponseHeader#asMatcher(Pattern) asMatcher(Pattern)} <jk>returns</jk> {@link java.util.regex.Matcher}</c>
+		<li class='jm'><c>{@del oajr.client2.RestResponseHeader#asMatcher(String) asMatcher(String)} <jk>returns</jk> {@link java.util.regex.Matcher}</c>
+		<li class='jm'><c>{@del oajr.client2.RestResponseHeader#asHeader(Class) asHeader(Class&lt;T <jk>extends</jk> BasicHeader&gt; c)} <jk>returns</jk> {@link oaj.http.BasicHeader}</c>
+		<li class='jm'><c>{@del oajr.client2.RestResponseHeader#asStringHeader() asStringHeader()} <jk>returns</jk> {@link oaj.http.header.BasicIntegerHeader}</c>
+		<li class='jm'><c>{@del oajr.client2.RestResponseHeader#asIntegerHeader() asIntegerHeader()} <jk>returns</jk> {@link oaj.http.header.BasicStringHeader}</c>
+		<li class='jm'><c>{@del oajr.client2.RestResponseHeader#asLongHeader() asLongHeader()} <jk>returns</jk> {@link oaj.http.header.BasicLongHeader}</c>
+		<li class='jm'><c>{@del oajr.client2.RestResponseHeader#asDateHeader() asDateHeader()} <jk>returns</jk> {@link oaj.http.header.BasicDateHeader}</c>
+		<li class='jm'><c>{@del oajr.client2.RestResponseHeader#asCsvArrayHeader() asCsvArrayHeader()} <jk>returns</jk> {@link oaj.http.header.BasicCsvArrayHeader}</c>
+		<li class='jm'><c>{@del oajr.client2.RestResponseHeader#asEntityTagArrayHeader() asEntityTagArrayHeader()} <jk>returns</jk> {@link oaj.http.header.BasicEntityTagArrayHeader}</c>
+		<li class='jm'><c>{@del oajr.client2.RestResponseHeader#asStringRangeArrayHeader() asStringRangeArrayHeader()} <jk>returns</jk> {@link oaj.http.header.BasicStringRangeArrayHeader}</c>
+		<li class='jm'><c>{@del oajr.client2.RestResponseHeader#asUriHeader() asUriHeader()} <jk>returns</jk> {@link oaj.http.header.BasicUriHeader}</c>
 	</ul>
 </ul>
 
 <p>
-	The {@link oajr.client2.RestResponseHeader#schema(HttpPartSchema)} method allows you to perform parsing of OpenAPI formats for
+	The {@del oajr.client2.RestResponseHeader#schema(HttpPartSchema)} method allows you to perform parsing of OpenAPI formats for
 	header parts.
 </p>
 	
@@ -92,17 +92,17 @@
 </p>
 
 <ul class='javatree'>
-	<li class='jc'>{@link oajr.client2.RestResponseHeader}
+	<li class='jc'>{@del oajr.client2.RestResponseHeader}
 	<ul>
-		<li class='jm'><c>{@link oajr.client2.RestResponseHeader#assertString() assertString()} <jk>returns</jk> {@link oaj.assertions.FluentStringAssertion}</c>
-		<li class='jm'><c>{@link oajr.client2.RestResponseHeader#assertInteger() assertInteger()} <jk>returns</jk> {@link oaj.assertions.FluentIntegerAssertion}</c>
-		<li class='jm'><c>{@link oajr.client2.RestResponseHeader#assertLong() assertLong()} <jk>returns</jk> {@link oaj.assertions.FluentLongAssertion}</c>
-		<li class='jm'><c>{@link oajr.client2.RestResponseHeader#assertDate() assertDate()} <jk>returns</jk> {@link oaj.assertions.FluentDateAssertion}</c>
+		<li class='jm'><c>{@del oajr.client2.RestResponseHeader#assertString() assertString()} <jk>returns</jk> {@link oaj.assertions.FluentStringAssertion}</c>
+		<li class='jm'><c>{@del oajr.client2.RestResponseHeader#assertInteger() assertInteger()} <jk>returns</jk> {@link oaj.assertions.FluentIntegerAssertion}</c>
+		<li class='jm'><c>{@del oajr.client2.RestResponseHeader#assertLong() assertLong()} <jk>returns</jk> {@link oaj.assertions.FluentLongAssertion}</c>
+		<li class='jm'><c>{@del oajr.client2.RestResponseHeader#assertDate() assertDate()} <jk>returns</jk> {@link oaj.assertions.FluentDateAssertion}</c>
 	</ul>
 </ul>
 
 <p>
-	Note how in the following example, the fluent assertion returns control to the {@link oajr.client2.RestResponse} object after
+	Note how in the following example, the fluent assertion returns control to the {@del oajr.client2.RestResponse} object after
 	the assertion has been completed:
 </p>
 
diff --git a/juneau-doc/docs/Topics/09.juneau-rest-client/08.RestcResponseBody.html b/juneau-doc/docs/Topics/09.juneau-rest-client/08.RestcResponseBody.html
index 983b64e..e1aaf36 100644
--- a/juneau-doc/docs/Topics/09.juneau-rest-client/08.RestcResponseBody.html
+++ b/juneau-doc/docs/Topics/09.juneau-rest-client/08.RestcResponseBody.html
@@ -20,36 +20,36 @@
 </p>
 
 <ul class='javatree'>
-	<li class='jc'>{@link oajr.client2.RestResponse}
+	<li class='jc'>{@del oajr.client2.RestResponse}
 	<ul>
-		<li class='jm'><c>{@link oajr.client2.RestResponse#getBody() getBody()} <jk>returns</jk> {@link oajr.client2.RestResponseBody}</c>
+		<li class='jm'><c>{@del oajr.client2.RestResponse#getBody() getBody()} <jk>returns</jk> {@del oajr.client2.RestResponseBody}</c>
 	</ul>
 </ul>
 
 <p>
-	The {@link oajr.client2.RestResponseBody} class extends from the HttpClient {@link org.apache.http.HttpEntity} class and provides several convenience
+	The {@del oajr.client2.RestResponseBody} class extends from the HttpClient {@link org.apache.http.HttpEntity} class and provides several convenience
 	methods:
 </p>
 
 <ul class='javatree'>
-	<li class='jc'>{@link oajr.client2.RestResponseBody}
+	<li class='jc'>{@del oajr.client2.RestResponseBody}
 	<ul>
-		<li class='jm'><c>{@link oajr.client2.RestResponseBody#asInputStream() asInputStream()} <jk>returns</jk> InputStream</c>
-		<li class='jm'><c>{@link oajr.client2.RestResponseBody#asReader() asReader()} <jk>returns</jk> Reader</c>
-		<li class='jm'><c>{@link oajr.client2.RestResponseBody#asReader(Charset) asReader(Charset)} <jk>returns</jk> Reader</c>
-		<li class='jm'><c>{@link oajr.client2.RestResponseBody#pipeTo(OutputStream) pipeTo(OutputStream)} <jk>returns</jk> {@link oajr.client2.RestResponse}</c>
-		<li class='jm'><c>{@link oajr.client2.RestResponseBody#pipeTo(Writer) pipeTo(Writer)} <jk>returns</jk> {@link oajr.client2.RestResponse}</c>
-		<li class='jm'><c>{@link oajr.client2.RestResponseBody#as(Type,Type...) as(Type,Type...)} <jk>returns</jk> T</c>
-		<li class='jm'><c>{@link oajr.client2.RestResponseBody#as(Class) as(Class&lt;T&gt;)} <jk>returns</jk> T</c>
-		<li class='jm'><c>{@link oajr.client2.RestResponseBody#asFuture(Class) asFuture(Class&lt;T&gt;)} <jk>returns</jk> Future&lt;T&gt;</c>
-		<li class='jm'><c>{@link oajr.client2.RestResponseBody#asFuture(Type,Type...) asFuture(Type,Type...)} <jk>returns</jk> Future&lt;T&gt;</c>
-		<li class='jm'><c>{@link oajr.client2.RestResponseBody#asString() asString()} <jk>returns</jk> String</c>
-		<li class='jm'><c>{@link oajr.client2.RestResponseBody#asStringFuture() asStringFuture()} <jk>returns</jk> Future&lt;String&gt;</c>
-		<li class='jm'><c>{@link oajr.client2.RestResponseBody#asAbbreviatedString(int) asAbbreviatedString(int)} <jk>returns</jk> String</c>
-		<li class='jm'><c>{@link oajr.client2.RestResponseBody#asPojoRest(Class) asPojoRest(Class&lt;?&gt;)} <jk>returns</jk> {@link oaj.utils.PojoRest}</c>
-		<li class='jm'><c>{@link oajr.client2.RestResponseBody#asPojoRest() asPojoRest()} <jk>returns</jk> {@link oaj.utils.PojoRest}</c>
-		<li class='jm'><c>{@link oajr.client2.RestResponseBody#asMatcher(Pattern) asMatcher(Pattern)} <jk>returns</jk> {@link java.util.regex.Matcher}</c>
-		<li class='jm'><c>{@link oajr.client2.RestResponseBody#asMatcher(String) asMatcher(String)} <jk>returns</jk> {@link java.util.regex.Matcher}</c>
+		<li class='jm'><c>{@del oajr.client2.RestResponseBody#asInputStream() asInputStream()} <jk>returns</jk> InputStream</c>
+		<li class='jm'><c>{@del oajr.client2.RestResponseBody#asReader() asReader()} <jk>returns</jk> Reader</c>
+		<li class='jm'><c>{@del oajr.client2.RestResponseBody#asReader(Charset) asReader(Charset)} <jk>returns</jk> Reader</c>
+		<li class='jm'><c>{@del oajr.client2.RestResponseBody#pipeTo(OutputStream) pipeTo(OutputStream)} <jk>returns</jk> {@del oajr.client2.RestResponse}</c>
+		<li class='jm'><c>{@del oajr.client2.RestResponseBody#pipeTo(Writer) pipeTo(Writer)} <jk>returns</jk> {@del oajr.client2.RestResponse}</c>
+		<li class='jm'><c>{@del oajr.client2.RestResponseBody#as(Type,Type...) as(Type,Type...)} <jk>returns</jk> T</c>
+		<li class='jm'><c>{@del oajr.client2.RestResponseBody#as(Class) as(Class&lt;T&gt;)} <jk>returns</jk> T</c>
+		<li class='jm'><c>{@del oajr.client2.RestResponseBody#asFuture(Class) asFuture(Class&lt;T&gt;)} <jk>returns</jk> Future&lt;T&gt;</c>
+		<li class='jm'><c>{@del oajr.client2.RestResponseBody#asFuture(Type,Type...) asFuture(Type,Type...)} <jk>returns</jk> Future&lt;T&gt;</c>
+		<li class='jm'><c>{@del oajr.client2.RestResponseBody#asString() asString()} <jk>returns</jk> String</c>
+		<li class='jm'><c>{@del oajr.client2.RestResponseBody#asStringFuture() asStringFuture()} <jk>returns</jk> Future&lt;String&gt;</c>
+		<li class='jm'><c>{@del oajr.client2.RestResponseBody#asAbbreviatedString(int) asAbbreviatedString(int)} <jk>returns</jk> String</c>
+		<li class='jm'><c>{@del oajr.client2.RestResponseBody#asPojoRest(Class) asPojoRest(Class&lt;?&gt;)} <jk>returns</jk> {@link oaj.utils.PojoRest}</c>
+		<li class='jm'><c>{@del oajr.client2.RestResponseBody#asPojoRest() asPojoRest()} <jk>returns</jk> {@link oaj.utils.PojoRest}</c>
+		<li class='jm'><c>{@del oajr.client2.RestResponseBody#asMatcher(Pattern) asMatcher(Pattern)} <jk>returns</jk> {@link java.util.regex.Matcher}</c>
+		<li class='jm'><c>{@del oajr.client2.RestResponseBody#asMatcher(String) asMatcher(String)} <jk>returns</jk> {@link java.util.regex.Matcher}</c>
 	</ul>
 </ul>
 
@@ -94,9 +94,9 @@
 
 <p>
 	The response body can only be consumed once unless it has been cached into memory.  In many cases, the body is
-	automatically cached when using the assertions methods or methods such as {@link oajr.client2.RestResponseBody#asString()}.
+	automatically cached when using the assertions methods or methods such as {@del oajr.client2.RestResponseBody#asString()}.
 	However, methods that involve reading directly from the input stream cannot be called twice.
-	In these cases, the {@link oajr.client2.RestResponse#cacheBody()} and {@link oajr.client2.RestResponseBody#cache()} methods are provided
+	In these cases, the {@del oajr.client2.RestResponse#cacheBody()} and {@del oajr.client2.RestResponseBody#cache()} methods are provided
 	to cache the response body in memory so that you can perform several operations against it.
 </p>
 
@@ -115,11 +115,11 @@
 </p>
 
 <ul class='javatree'>
-	<li class='jc'>{@link oajr.client2.RestResponseBody}
+	<li class='jc'>{@del oajr.client2.RestResponseBody}
 	<ul>
-		<li class='jm'><c>{@link oajr.client2.RestResponseBody#assertString() assertString()} <jk>returns</jk> {@link oaj.assertions.FluentStringAssertion}</c>
-		<li class='jm'><c>{@link oajr.client2.RestResponseBody#assertObject(Class) assertObject(Class&lt;?&gt;)} <jk>returns</jk> {@link oaj.assertions.FluentObjectAssertion}</c>
-		<li class='jm'><c>{@link oajr.client2.RestResponseBody#assertBytes() assertBytes()} <jk>returns</jk> {@link oaj.assertions.FluentByteArrayAssertion}</c>
+		<li class='jm'><c>{@del oajr.client2.RestResponseBody#assertString() assertString()} <jk>returns</jk> {@link oaj.assertions.FluentStringAssertion}</c>
+		<li class='jm'><c>{@del oajr.client2.RestResponseBody#assertObject(Class) assertObject(Class&lt;?&gt;)} <jk>returns</jk> {@link oaj.assertions.FluentObjectAssertion}</c>
+		<li class='jm'><c>{@del oajr.client2.RestResponseBody#assertBytes() assertBytes()} <jk>returns</jk> {@link oaj.assertions.FluentByteArrayAssertion}</c>
 	</ul>
 </ul>
 
diff --git a/juneau-doc/docs/Topics/09.juneau-rest-client/09.RestcCustomCallHandlers.html b/juneau-doc/docs/Topics/09.juneau-rest-client/09.RestcCustomCallHandlers.html
index 25b2d85..b87e74b 100644
--- a/juneau-doc/docs/Topics/09.juneau-rest-client/09.RestcCustomCallHandlers.html
+++ b/juneau-doc/docs/Topics/09.juneau-rest-client/09.RestcCustomCallHandlers.html
@@ -16,18 +16,18 @@
 {title:'Custom Call Handlers', created:'8.2.0', flags:'todo'}
 
 <p>
-	The {@link oajr.client2.RestCallHandler} interface provides the ability to provide custom handling of requests.
+	The {@del oajr.client2.RestCallHandler} interface provides the ability to provide custom handling of requests.
 </p>
 
 <ul class='javatree'>
-	<li class='jc'>{@link oajr.client2.RestClientBuilder}
+	<li class='jc'>{@del oajr.client2.RestClientBuilder}
 	<ul>
-		<li class='jm'>{@link oajr.client2.RestClientBuilder#callHandler(Class) callHandler(Class&lt;? extends RestCallHandler&gt;)}
-		<li class='jm'>{@link oajr.client2.RestClientBuilder#callHandler(RestCallHandler) callHandler(RestCallHandler)}
+		<li class='jm'>{@del oajr.client2.RestClientBuilder#callHandler(Class) callHandler(Class&lt;? extends RestCallHandler&gt;)}
+		<li class='jm'>{@del oajr.client2.RestClientBuilder#callHandler(RestCallHandler) callHandler(RestCallHandler)}
 	</ul>
-	<li class='jic'>{@link oajr.client2.RestCallHandler}
+	<li class='jic'>{@del oajr.client2.RestCallHandler}
 	<ul>
-		<li class='jm'><c>{@link oajr.client2.RestCallHandler#run(HttpHost,HttpRequest,HttpContext) run(HttpHost,HttpRequest,HttpContext)} <jk>returns</jk> HttpResponse</c>
+		<li class='jm'><c>{@del oajr.client2.RestCallHandler#run(HttpHost,HttpRequest,HttpContext) run(HttpHost,HttpRequest,HttpContext)} <jk>returns</jk> HttpResponse</c>
 	</ul>
 </ul>
 
@@ -61,8 +61,8 @@
 </p>
  
 <p>
-	Note that there are other ways of accomplishing this such as extending the {@link oajr.client2.RestClient} class and overriding
-	the {@link oaj.rest.client2.RestClient#run(HttpHost,HttpRequest,HttpContext)} method
+	Note that there are other ways of accomplishing this such as extending the {@del oajr.client2.RestClient} class and overriding
+	the {@del oaj.rest.client2.RestClient#run(HttpHost,HttpRequest,HttpContext)} method
 	or by defining your own {@link org.apache.http.protocol.HttpRequestExecutor}.  Using this interface is often simpler though.
 </p>
 	
\ No newline at end of file
diff --git a/juneau-doc/docs/Topics/09.juneau-rest-client/10.RestcInterceptors.html b/juneau-doc/docs/Topics/09.juneau-rest-client/10.RestcInterceptors.html
index 9e3dbdd..c9e7209 100644
--- a/juneau-doc/docs/Topics/09.juneau-rest-client/10.RestcInterceptors.html
+++ b/juneau-doc/docs/Topics/09.juneau-rest-client/10.RestcInterceptors.html
@@ -16,24 +16,24 @@ specific language governing permissions and limitations under the License.
 {title:'Interceptors', created:'8.2.0', flags:'todo'}
 
 <p>
-	The {@link oajr.client2.RestCallInterceptor} API provides a quick way of intercepting and manipulating requests and responses beyond
+	The {@del oajr.client2.RestCallInterceptor} API provides a quick way of intercepting and manipulating requests and responses beyond
 	the existing {@link org.apache.http.protocol.HttpRequestInterceptor} and {@link org.apache.http.protocol.HttpResponseInterceptor} APIs.
 </p>
 
 <ul class='javatree'>
-	<li class='jc'>{@link oajr.client2.RestClientBuilder}
+	<li class='jc'>{@del oajr.client2.RestClientBuilder}
 	<ul>
-		<li class='jm'>{@link oajr.client2.RestClientBuilder#interceptors(Object...) interceptors(Object...)}
+		<li class='jm'>{@del oajr.client2.RestClientBuilder#interceptors(Object...) interceptors(Object...)}
 	</ul>
-	<li class='jc'>{@link oajr.client2.RestRequest}
+	<li class='jc'>{@del oajr.client2.RestRequest}
 	<ul>
-		<li class='jm'>{@link oajr.client2.RestRequest#interceptors(RestCallInterceptor...) interceptors(RestCallInterceptor...)}
+		<li class='jm'>{@del oajr.client2.RestRequest#interceptors(RestCallInterceptor...) interceptors(RestCallInterceptor...)}
 	</ul>
-	<li class='jic'>{@link oajr.client2.RestCallInterceptor}
+	<li class='jic'>{@del oajr.client2.RestCallInterceptor}
 	<ul>
-		<li class='jm'>{@link oajr.client2.RestCallInterceptor#onInit(RestRequest) onInit(RestRequest)}
-		<li class='jm'>{@link oajr.client2.RestCallInterceptor#onConnect(RestRequest,RestResponse) onConnect(RestRequest,RestResponse)}
-		<li class='jm'>{@link oajr.client2.RestCallInterceptor#onClose(RestRequest,RestResponse) onClose(RestRequest,RestResponse)}
+		<li class='jm'>{@del oajr.client2.RestCallInterceptor#onInit(RestRequest) onInit(RestRequest)}
+		<li class='jm'>{@del oajr.client2.RestCallInterceptor#onConnect(RestRequest,RestResponse) onConnect(RestRequest,RestResponse)}
+		<li class='jm'>{@del oajr.client2.RestCallInterceptor#onClose(RestRequest,RestResponse) onClose(RestRequest,RestResponse)}
 	</ul>
 </ul>
 
diff --git a/juneau-doc/docs/Topics/09.juneau-rest-client/11.RestcProxies.html b/juneau-doc/docs/Topics/09.juneau-rest-client/11.RestcProxies.html
index f4512bf..acb33aa 100644
--- a/juneau-doc/docs/Topics/09.juneau-rest-client/11.RestcProxies.html
+++ b/juneau-doc/docs/Topics/09.juneau-rest-client/11.RestcProxies.html
@@ -25,11 +25,11 @@
 </p>
 
 <ul class='javatree'>
-	<li class='jc'>{@link oajr.client2.RestClient}
+	<li class='jc'>{@del oajr.client2.RestClient}
 	<ul>
-		<li class='jm'><c>{@link oajr.client2.RestClient#getRemote(Class) getRemote(Class&lt;T&gt;)} <jk>returns</jk> T</c>
-		<li class='jm'><c>{@link oajr.client2.RestClient#getRemote(Class,Object) getRemote(Class&lt;T&gt;,Object)} <jk>returns</jk> T</c>
-		<li class='jm'><c>{@link oajr.client2.RestClient#getRemote(Class,Object,Serializer,Parser) getRemote(Class&lt;T&gt;,Object,Serializer,Parser)} <jk>returns</jk> T</c>
+		<li class='jm'><c>{@del oajr.client2.RestClient#getRemote(Class) getRemote(Class&lt;T&gt;)} <jk>returns</jk> T</c>
+		<li class='jm'><c>{@del oajr.client2.RestClient#getRemote(Class,Object) getRemote(Class&lt;T&gt;,Object)} <jk>returns</jk> T</c>
+		<li class='jm'><c>{@del oajr.client2.RestClient#getRemote(Class,Object,Serializer,Parser) getRemote(Class&lt;T&gt;,Object,Serializer,Parser)} <jk>returns</jk> T</c>
 	</ul>
 </ul>
 
diff --git a/juneau-doc/docs/Topics/09.juneau-rest-client/11.RestcProxies/01.RestcRemote.html b/juneau-doc/docs/Topics/09.juneau-rest-client/11.RestcProxies/01.RestcRemote.html
index 2dc7ddb..4c762e1 100644
--- a/juneau-doc/docs/Topics/09.juneau-rest-client/11.RestcProxies/01.RestcRemote.html
+++ b/juneau-doc/docs/Topics/09.juneau-rest-client/11.RestcProxies/01.RestcRemote.html
@@ -25,7 +25,7 @@ specific language governing permissions and limitations under the License.
 	<ul>
 		<li class='jf'>{@link oaj.http.remote.Remote#path path}
 		<li class='jf'>{@link oaj.http.remote.Remote#headers headers}
-		<li class='jf'>{@link oaj.http.remote.Remote#headerSupplier headerSupplier}
+		<li class='jf'>{@del headerSupplier}
 		<li class='jf'>{@link oaj.http.remote.Remote#version version}
 		<li class='jf'>{@link oaj.http.remote.Remote#versionHeader versionHeader}
 	</ul>
@@ -106,7 +106,7 @@ specific language governing permissions and limitations under the License.
 
 <h5 class='topic'>@Remote(headers/headerSupplier)</h5>
 <p>
-	The {@link oaj.http.remote.Remote#headers @Remote(headers)} and {@link oaj.http.remote.Remote#headerSupplier @Remote(headerSupplier)} 
+	The {@link oaj.http.remote.Remote#headers @Remote(headers)} and {@del @Remote(headerSupplier)} 
 	annotations are used to add headers on all requests.  
 </p>
 
diff --git a/juneau-doc/docs/Topics/09.juneau-rest-client/12.RestcLoggingAndDebugging.html b/juneau-doc/docs/Topics/09.juneau-rest-client/12.RestcLoggingAndDebugging.html
index 191ac52..6d56a66 100644
--- a/juneau-doc/docs/Topics/09.juneau-rest-client/12.RestcLoggingAndDebugging.html
+++ b/juneau-doc/docs/Topics/09.juneau-rest-client/12.RestcLoggingAndDebugging.html
@@ -20,11 +20,11 @@
 </p>
 
 <ul class='javatree'>
-	<li class='jc'>{@link oajr.client2.RestClientBuilder}
+	<li class='jc'>{@del oajr.client2.RestClientBuilder}
 	<ul>
-		<li class='jm'>{@link oajr.client2.RestClientBuilder#logger(Logger) logger(Logger)}
-		<li class='jm'>{@link oajr.client2.RestClientBuilder#logToConsole() logToConsole()}
-		<li class='jm'>{@link oajr.client2.RestClientBuilder#logRequests(DetailLevel,Level,BiPredicate) logRequests(DetailLevel,Level,BiPredicate)}
+		<li class='jm'>{@del oajr.client2.RestClientBuilder#logger(Logger) logger(Logger)}
+		<li class='jm'>{@del oajr.client2.RestClientBuilder#logToConsole() logToConsole()}
+		<li class='jm'>{@del oajr.client2.RestClientBuilder#logRequests(DetailLevel,Level,BiPredicate) logRequests(DetailLevel,Level,BiPredicate)}
 	</ul>
 </ul>
 
@@ -81,9 +81,9 @@
 </p>
 
 <ul class='javatree'>
-	<li class='jc'>{@link oajr.client2.RestClientBuilder}
+	<li class='jc'>{@del oajr.client2.RestClientBuilder}
 	<ul>
-		<li class='jm'>{@link oajr.client2.RestClientBuilder#debug() debug()}
+		<li class='jm'>{@del oajr.client2.RestClientBuilder#debug() debug()}
 	</ul>
 </ul>
 
@@ -93,6 +93,6 @@
 
 <ul>
 	<li>{@link oaj.Context#CONTEXT_debug} is enabled.
-	<li>{@link oajr.client2.RestClient#RESTCLIENT_leakDetection} is enabled.
-	<li>{@link oajr.client2.RestClientBuilder#logToConsole()} is called.
+	<li>{@del oajr.client2.RestClient#RESTCLIENT_leakDetection} is enabled.
+	<li>{@del oajr.client2.RestClientBuilder#logToConsole()} is called.
 </ul>
diff --git a/juneau-doc/docs/Topics/09.juneau-rest-client/13.RestcCustomizingHttpClient.html b/juneau-doc/docs/Topics/09.juneau-rest-client/13.RestcCustomizingHttpClient.html
index c4bb304..ad70dc8 100644
--- a/juneau-doc/docs/Topics/09.juneau-rest-client/13.RestcCustomizingHttpClient.html
+++ b/juneau-doc/docs/Topics/09.juneau-rest-client/13.RestcCustomizingHttpClient.html
@@ -20,12 +20,12 @@
 </p>
 
 <ul class='javatree'>
-	<li class='jc'>{@link oajr.client2.RestClientBuilder}
+	<li class='jc'>{@del oajr.client2.RestClientBuilder}
 	<ul>
-		<li class='jm'>{@link oajr.client2.RestClientBuilder#httpClientBuilder(HttpClientBuilder) httpClientBuilder(HttpClientBuilder)} - Set the client builder yourself.
-		<li class='jm'>{@link oajr.client2.RestClientBuilder#createHttpClientBuilder() createHttpClientBuilder()} - Override to create the client builder.
-		<li class='jm'>{@link oajr.client2.RestClientBuilder#createHttpClient() createHttpClient()} - Override to create the client.
-		<li class='jm'>{@link oajr.client2.RestClientBuilder#createConnectionManager() createConnectionManager()} - Override to create the connection management.
+		<li class='jm'>{@del oajr.client2.RestClientBuilder#httpClientBuilder(HttpClientBuilder) httpClientBuilder(HttpClientBuilder)} - Set the client builder yourself.
+		<li class='jm'>{@del oajr.client2.RestClientBuilder#createHttpClientBuilder() createHttpClientBuilder()} - Override to create the client builder.
+		<li class='jm'>{@del oajr.client2.RestClientBuilder#createHttpClient() createHttpClient()} - Override to create the client.
+		<li class='jm'>{@del oajr.client2.RestClientBuilder#createConnectionManager() createConnectionManager()} - Override to create the connection management.
 	</ul>
 </ul>
 
@@ -45,5 +45,5 @@
 </p>
 
 <p>
-	Refer to the {@link org.apache.http.client.impl.HttpClientBuilder HttpClientBuilder} docs for more information.
+	Refer to the {@del org.apache.http.client.impl.HttpClientBuilder HttpClientBuilder} docs for more information.
 </p>
diff --git a/juneau-doc/docs/Topics/09.juneau-rest-client/14.RestcExtendingRestClient.html b/juneau-doc/docs/Topics/09.juneau-rest-client/14.RestcExtendingRestClient.html
index 9cdace0..5439565 100644
--- a/juneau-doc/docs/Topics/09.juneau-rest-client/14.RestcExtendingRestClient.html
+++ b/juneau-doc/docs/Topics/09.juneau-rest-client/14.RestcExtendingRestClient.html
@@ -40,7 +40,7 @@
 </p>
 
 <p>
-	The {@link oajr.client2.RestRequest} and {@link oajr.client2.RestResponse} objects can also be extended and integrated by overriding the
-	{@link oajr.client2.RestClient#createRequest(URI, String, boolean)} and {@link oajr.client2.RestClient#createResponse(RestRequest, HttpResponse, Parser)} methods.
+	The {@del oajr.client2.RestRequest} and {@del oajr.client2.RestResponse} objects can also be extended and integrated by overriding the
+	{@del oajr.client2.RestClient#createRequest(URI, String, boolean)} and {@del oajr.client2.RestClient#createResponse(RestRequest, HttpResponse, Parser)} methods.
 </p>
 	
\ No newline at end of file
diff --git a/juneau-doc/docs/Topics/09.juneau-rest-client/15.RestcAuthentication/01.RestcAuthenticationBASIC.html b/juneau-doc/docs/Topics/09.juneau-rest-client/15.RestcAuthentication/01.RestcAuthenticationBASIC.html
index 8912489..d9e6c52 100644
--- a/juneau-doc/docs/Topics/09.juneau-rest-client/15.RestcAuthentication/01.RestcAuthenticationBASIC.html
+++ b/juneau-doc/docs/Topics/09.juneau-rest-client/15.RestcAuthentication/01.RestcAuthenticationBASIC.html
@@ -16,7 +16,7 @@
 {title:'BASIC Authentication', flags:'todo'}
 
 <p>
-	The {@link oajr.client2.RestClientBuilder#basicAuth(String,int,String,String)} method 
+	The {@del oajr.client2.RestClientBuilder#basicAuth(String,int,String,String)} method 
 	can be used to quickly enable BASIC authentication support.
 </p>
 
diff --git a/juneau-doc/docs/Topics/09.juneau-rest-client/15.RestcAuthentication/02.RestcAuthenticationFormFORM.html b/juneau-doc/docs/Topics/09.juneau-rest-client/15.RestcAuthentication/02.RestcAuthenticationFormFORM.html
index f92a628..4d92374 100644
--- a/juneau-doc/docs/Topics/09.juneau-rest-client/15.RestcAuthentication/02.RestcAuthenticationFormFORM.html
+++ b/juneau-doc/docs/Topics/09.juneau-rest-client/15.RestcAuthentication/02.RestcAuthenticationFormFORM.html
@@ -16,11 +16,11 @@
 {title:'FORM-based Authentication', flags:'todo'}
 
 <p>
-	The {@link oajr.client2.RestClientBuilder} class does not itself provide FORM-based 
+	The {@del oajr.client2.RestClientBuilder} class does not itself provide FORM-based 
 	authentication since there is no standard way of providing such support. 
 	Typically, to perform FORM-based or other types of authentication, you'll want to create your own
-	subclass of {@link oajr.client2.RestClientBuilder} and override the 
-	{@link oajr.client2.RestClientBuilder#createHttpClient()} method to provide an 
+	subclass of {@del oajr.client2.RestClientBuilder} and override the 
+	{@del oajr.client2.RestClientBuilder#createHttpClient()} method to provide an 
 	authenticated client.
 </p>
 <p>
diff --git a/juneau-doc/docs/Topics/10.juneau-rest-mock/01.MockRestClient.html b/juneau-doc/docs/Topics/10.juneau-rest-mock/01.MockRestClient.html
index 748a96a..a78fb5e 100644
--- a/juneau-doc/docs/Topics/10.juneau-rest-mock/01.MockRestClient.html
+++ b/juneau-doc/docs/Topics/10.juneau-rest-mock/01.MockRestClient.html
@@ -16,11 +16,11 @@
 {title:'MockRestClient', created:'8.2.0', flags:'todo'}
 
 <p>
-	The {@link oajr.mock2.MockRestClient} class is used for performing serverless unit testing of {@link oajr.annotation.Rest @Rest}-annotated
+	The {@del oajr.mock2.MockRestClient} class is used for performing serverless unit testing of {@link oajr.annotation.Rest @Rest}-annotated
 	and {@link oaj.http.remote.Remote @Remote}-annotated classes.
 </p>
 <p>
-	The {@link oajr.mock2.MockRestClient} itself extends from {@link oajr.client.RestClient} providing it with the rich
+	The {@del oajr.mock2.MockRestClient} itself extends from {@link oajr.client.RestClient} providing it with the rich
 	feature set of that API.
 	The following shows a simple example of invoking a PUT method on a simple REST interface and asserting
 	the correct status code and response body: 
@@ -92,8 +92,8 @@
 	}
 </p>
 <p>
-	The concept of the design is simple.  The {@link oajr.mock2.MockRestClient} class is used to create instances of {@link oajr.mock2.MockServletRequest}
-	and {@link oajr.mock2.MockServletResponse} which are passed directly to the call handler on the resource class {@link oajr.RestCallHandler#execute(HttpServletRequest,HttpServletResponse)}.
+	The concept of the design is simple.  The {@del oajr.mock2.MockRestClient} class is used to create instances of {@del oajr.mock2.MockServletRequest}
+	and {@del oajr.mock2.MockServletResponse} which are passed directly to the call handler on the resource class {@del oajr.RestCallHandler#execute(HttpServletRequest,HttpServletResponse)}.
 	In effect, you're fully testing your REST API as if it were running in a live servlet container, yet not
 	actually having to run in a servlet container.	
 	All aspects of the client and server side code are tested, yet no servlet container is required.  The actual
@@ -145,7 +145,7 @@
 
 <hr>
 <p>
-	The {@link oajr.mock2.MockRestRequest} object has convenience methods provided to allow you to set properties
+	The {@del oajr.mock2.MockRestRequest} object has convenience methods provided to allow you to set properties
 	directly on the underlying {@link javax.servlet.HttpServletRequest} object.  The following example shows how
 	this can be used to directly set roles on the request object to perform security testing.
 </p>
@@ -170,7 +170,7 @@
 </p>
 <hr>
 <p>
-	The {@link oajr.mock2.MockRestClient} class has a debug mode that will cause your HTTP requests and responses to
+	The {@del oajr.mock2.MockRestClient} class has a debug mode that will cause your HTTP requests and responses to
 	be sent to the console:
 </p>
 <p class='bpcode w800'>
@@ -182,7 +182,7 @@
 </p>
 <hr>
 <p>
-	The {@link oajr.mock2.MockRestClient} class can also be used for testing of {@link oaj.http.remote.Remote}-annotated
+	The {@del oajr.mock2.MockRestClient} class can also be used for testing of {@link oaj.http.remote.Remote}-annotated
 	interfaces against {@link oajr.annotation.Rest @Rest}-annotated resources.
 </p>
 <h5 class='figure'>Example:</h5>
diff --git a/juneau-doc/docs/Topics/11.juneau-microservice-core/05.MicroserviceConfig.html b/juneau-doc/docs/Topics/11.juneau-microservice-core/05.MicroserviceConfig.html
index 045108a..27a1b5b 100644
--- a/juneau-doc/docs/Topics/11.juneau-microservice-core/05.MicroserviceConfig.html
+++ b/juneau-doc/docs/Topics/11.juneau-microservice-core/05.MicroserviceConfig.html
@@ -107,7 +107,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 {@link oajr.BasicRestConfig} interface.
+	implementing the {@del oajr.BasicRestConfig} interface.
 <p>
 <h5 class='figure'>BasicRestConfig.java</h5>
 <p class='bpcode w800'>
diff --git a/juneau-doc/docs/Topics/11.juneau-microservice-core/07.MicroserviceVarResolver.html b/juneau-doc/docs/Topics/11.juneau-microservice-core/07.MicroserviceVarResolver.html
index ecbbde0..b6a1739 100644
--- a/juneau-doc/docs/Topics/11.juneau-microservice-core/07.MicroserviceVarResolver.html
+++ b/juneau-doc/docs/Topics/11.juneau-microservice-core/07.MicroserviceVarResolver.html
@@ -25,7 +25,7 @@
 	<li class='jc'>{@link oaj.microservice.MicroserviceBuilder}
 	<ul>
 		<li class='jm'>{@link oaj.microservice.MicroserviceBuilder#vars(Class...) vars(Class...)} 
-		<li class='jm'>{@link oaj.microservice.MicroserviceBuilder#varContext(String, Object) varContext(String,Object)} 
+		<li class='jm'>{@link oaj.microservice.MicroserviceBuilder#varBean(Class,Object) varBean(Class,Object)} 
 	</ul>
 </ul>
 <p>
diff --git a/juneau-doc/docs/Topics/12.juneau-microservice-jetty/05.MicroserviceJettyConfig.html b/juneau-doc/docs/Topics/12.juneau-microservice-jetty/05.MicroserviceJettyConfig.html
index a0cdf8c..e9d4b1d 100644
--- a/juneau-doc/docs/Topics/12.juneau-microservice-jetty/05.MicroserviceJettyConfig.html
+++ b/juneau-doc/docs/Topics/12.juneau-microservice-jetty/05.MicroserviceJettyConfig.html
@@ -23,7 +23,7 @@
 </p>	
 <p>
 	The most common usage for the configuration file is to reference values using the {@link oaj.config.vars.ConfigVar $C} variable in annotations.
-	For example, the {@link oajr.BasicRestConfig} interface that defines the annotations that control the look-and-feel of
+	For example, the {@del oajr.BasicRestConfig} interface that defines the annotations that control the look-and-feel of
 	classes that extend from {@link oajr.BasicRestServlet} use several <c>$C</c> variables to externalize values:
 </p>
 <p class='bpcode w800'>
diff --git a/juneau-doc/docs/Topics/12.juneau-microservice-jetty/07.MicroserviceJettyUiCustomization.html b/juneau-doc/docs/Topics/12.juneau-microservice-jetty/07.MicroserviceJettyUiCustomization.html
index 5c21ff0..9c90b98 100644
--- a/juneau-doc/docs/Topics/12.juneau-microservice-jetty/07.MicroserviceJettyUiCustomization.html
+++ b/juneau-doc/docs/Topics/12.juneau-microservice-jetty/07.MicroserviceJettyUiCustomization.html
@@ -57,7 +57,7 @@
 		<cv>&lt;/a&gt;</cv>
 </p>
 <p>
-	The {@link oajr.BasicRestConfig} interface (which defines the default settings for {@link oajr.BasicRestServlet} 
+	The {@del oajr.BasicRestConfig} interface (which defines the default settings for {@link oajr.BasicRestServlet} 
 	pulls in this information using {@link oaj.config.vars.ConfigVar $C} and {@link oajr.vars.UrlVar $U} variables:
 </p>
 <p class='bpcode w800'>
diff --git a/juneau-doc/docs/Topics/16.juneau-examples-rest/02.RestExamplesHelloWorldResource.html b/juneau-doc/docs/Topics/16.juneau-examples-rest/02.RestExamplesHelloWorldResource.html
index eaecf08..3cd7b5f 100644
--- a/juneau-doc/docs/Topics/16.juneau-examples-rest/02.RestExamplesHelloWorldResource.html
+++ b/juneau-doc/docs/Topics/16.juneau-examples-rest/02.RestExamplesHelloWorldResource.html
@@ -48,7 +48,7 @@
 </p>
 <p>
 	Notice that in this case we're not extending from {@link oajr.RestServlet}.  
-	We are however implementing {@link oajr.BasicRestConfig} which is a no-op
+	We are however implementing {@del oajr.BasicRestConfig} which is a no-op
 	interface that defines a default <ja>@Rest</ja> annotation with all the serializers, parsers, 
 	and configuration defined on the {@link oajr.BasicRestServlet} class.
 </p>
diff --git a/juneau-doc/docs/Topics/20.Glossaries/01.GlossaryLanguageSupport.html b/juneau-doc/docs/Topics/20.Glossaries/01.GlossaryLanguageSupport.html
index 7585720..89376ed 100644
--- a/juneau-doc/docs/Topics/20.Glossaries/01.GlossaryLanguageSupport.html
+++ b/juneau-doc/docs/Topics/20.Glossaries/01.GlossaryLanguageSupport.html
@@ -153,11 +153,4 @@
 		<td><ul><li class='jc'>{@link oaj.marshall.Xml}</ul></td>
 		<td>{@doc XmlDetails XML Details}</td>
 	</tr>
-	<tr>
-		<td><c>text/xml+schema</c></td>
-		<td><ul><li class='jc'>{@link oaj.xmlschema.XmlSchemaSerializer}<li class='jc'>{@link oaj.xmlschema.XmlSchemaDocSerializer}</ul></td>
-		<td>&nbsp;</td>
-		<td>&nbsp;</td>
-		<td>{@doc XmlSchema XML-Schema Support}</td>
-	</tr>
 </table>
diff --git a/juneau-doc/docs/Topics/20.Glossaries/02.GlossaryAnnotations.html b/juneau-doc/docs/Topics/20.Glossaries/02.GlossaryAnnotations.html
index 574447f..6f7b932 100644
--- a/juneau-doc/docs/Topics/20.Glossaries/02.GlossaryAnnotations.html
+++ b/juneau-doc/docs/Topics/20.Glossaries/02.GlossaryAnnotations.html
@@ -147,19 +147,13 @@
 		<td>Associates swaps and surrogates with POJOs and bean properties.</td>
 	</tr>
 	<tr>
-		<td><ul style='margin-left:20px'><li class='ja'>{@link oaj.annotation.Swaps}</ul></td>
-		<td><ul><li>Classes</ul></td>
-		<td>All serializers and parsers</td>
-		<td>Associates multiple swaps with the same POJO class.</td>
-	</tr>
-	<tr>
 		<td><ul style='margin-left:20px'><li class='ja'>{@link oaj.uon.annotation.Uon}</ul></td>
 		<td><ul><li>Classes<li>Methods<li>Fields</ul></td>
 		<td><ul><li class='jc'>{@link oaj.uon.UonSerializer}<li class='jc'>{@link oaj.uon.UonParser}</ul></td>
 		<td>UON-specific tweaks.</td>
 	</tr>
 	<tr>
-		<td><ul style='margin-left:20px'><li class='ja'>{@link oaj.annotation.URI}</ul></td>
+		<td><ul style='margin-left:20px'><li class='ja'>{@link oaj.annotation.Uri}</ul></td>
 		<td><ul><li>Classes<li>Methods<li>Fields</ul></td>
 		<td>HTML and XML serializers</td>
 		<td>Identifies a class or bean property as a URI.</td>
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
new file mode 100644
index 0000000..3826f3a
--- /dev/null
+++ b/juneau-doc/src/main/java/org/apache/juneau/doc/internal/DelTag.java
@@ -0,0 +1,99 @@
+// ***************************************************************************************************************************
+// * 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 dac578b..268ef02 100644
--- a/juneau-doc/src/main/javadoc/overview.html
+++ b/juneau-doc/src/main/javadoc/overview.html
@@ -170,7 +170,7 @@
 		<li><p><a class='doclink' href='#juneau-marshall.Serializers'>Serializers</a></p>
 		<li><p><a class='doclink' href='#juneau-marshall.Parsers'>Parsers</a></p>
 		<li><p><a class='doclink' href='#juneau-marshall.Marshalls'>Marshalls</a></p>
-		<li><p><a class='doclink' href='#juneau-marshall.JavaBeansSupport'>Java Beans Support</a><span class='update'>created: 8.2.0</span></p>
+		<li><p><a class='doclink' href='#juneau-marshall.JavaBeansSupport'>Java Beans Support</a><span class='update'>created: 8.2.0, <b><red>todo</red></b></span></p>
 		<ol>
 			<li><p><a class='doclink' href='#juneau-marshall.JavaBeansSupport.BeanAnnotation'>@Bean Annotation</a><span class='update'>updated: 8.2.0</span></p>
 			<li><p><a class='doclink' href='#juneau-marshall.JavaBeansSupport.BeanpAnnotation'>@Beanp Annotation</a><span class='update'>updated: 8.1.0,8.1.2</span></p>
@@ -179,27 +179,27 @@
 			<li><p><a class='doclink' href='#juneau-marshall.JavaBeansSupport.NamePropertyAnnotation'>@NameProperty Annotation</a></p>
 			<li><p><a class='doclink' href='#juneau-marshall.JavaBeansSupport.ParentPropertyAnnotation'>@ParentProperty Annotation</a></p>
 			<li><p><a class='doclink' href='#juneau-marshall.JavaBeansSupport.PojoBuilders'>POJO Builders</a></p>
-			<li><p><a class='doclink' href='#juneau-marshall.JavaBeansSupport.BeanFilters'>BeanFilter Class</a></p>
-			<li><p><a class='doclink' href='#juneau-marshall.JavaBeansSupport.InterfaceFilters'>Interface Filters</a></p>
-			<li><p><a class='doclink' href='#juneau-marshall.JavaBeansSupport.StopClasses'>Stop Classes</a></p>
+			<li><p><a class='doclink' href='#juneau-marshall.JavaBeansSupport.BeanFilters'>BeanFilter Class</a><span class='update'><b><red>todo</red></b></span></p>
+			<li><p><a class='doclink' href='#juneau-marshall.JavaBeansSupport.InterfaceFilters'>Interface Filters</a><span class='update'><b><red>todo</red></b></span></p>
+			<li><p><a class='doclink' href='#juneau-marshall.JavaBeansSupport.StopClasses'>Stop Classes</a><span class='update'><b><red>todo</red></b></span></p>
 			<li><p><a class='doclink' href='#juneau-marshall.JavaBeansSupport.BypassSerialization'>Bypass Serialization using Readers and InputStreams</a></p>
 		</ol>
 		<li><p><a class='doclink' href='#juneau-marshall.Generics'>Generics</a><span class='update'>created: <b>9.0.0</b>, <b><red>todo</red></b></span></p>
 		<li><p><a class='doclink' href='#juneau-marshall.HttpPartSerializers'>HTTP Part Serializers</a><span class='update'>updated: 8.2.0</span></p>
 		<li><p><a class='doclink' href='#juneau-marshall.HttpPartParsers'>HTTP Part Parsers</a><span class='update'>updated: 8.2.0</span></p>
 		<li><p><a class='doclink' href='#juneau-marshall.MarshallConfigurableProperties'>Configurable Properties</a><span class='update'>updated: 8.1.3</span></p>
-		<li><p><a class='doclink' href='#juneau-marshall.ConfigurableAnnotations'>Configurable Annotations</a><span class='update'>created: 8.1.0, updated: 8.1.3,8.2.0</span></p>
+		<li><p><a class='doclink' href='#juneau-marshall.ConfigurableAnnotations'>Configurable Annotations</a><span class='update'>created: 8.1.0, updated: 8.1.3,8.2.0, <b><red>todo</red></b></span></p>
 		<li><p><a class='doclink' href='#juneau-marshall.OMap'>OMap and OList</a><span class='update'>updated: 8.2.0</span></p>
 		<li><p><a class='doclink' href='#juneau-marshall.Groups'>SerializerGroups and ParserGroups</a></p>
 		<li><p><a class='doclink' href='#juneau-marshall.ContextsBuildersSessionsPropertyStores'>Contexts, Builders, Sessions, and ContextProperties</a><span class='update'>updated: <b>9.0.0</b>, <b><red>review</red></b></span></p>
-		<li><p><a class='doclink' href='#juneau-marshall.Transforms'>Transforms</a></p>
+		<li><p><a class='doclink' href='#juneau-marshall.Transforms'>Transforms</a><span class='update'><b><red>todo</red></b></span></p>
 		<ol>
 			<li><p><a class='doclink' href='#juneau-marshall.Transforms.PojoSwaps'>Swaps</a><span class='update'>updated: 8.1.0,8.2.0</span></p>
 			<li><p><a class='doclink' href='#juneau-marshall.Transforms.DefaultPojoSwaps'>Default PojoSwaps</a></p>
 			<li><p><a class='doclink' href='#juneau-marshall.Transforms.AutoPojoSwaps'>Auto-detected POJO swaps</a><span class='update'>created: 8.1.0</span></p>
 			<li><p><a class='doclink' href='#juneau-marshall.Transforms.PerMediaTypePojoSwaps'>Per-media-type Swaps</a><span class='update'>updated: 8.1.0,8.2.0</span></p>
 			<li><p><a class='doclink' href='#juneau-marshall.Transforms.OneWayPojoSwaps'>One-way Swaps</a></p>
-			<li><p><a class='doclink' href='#juneau-marshall.Transforms.SwapAnnotation'>@Swap Annotation</a><span class='update'>updated: 8.0.0</span></p>
+			<li><p><a class='doclink' href='#juneau-marshall.Transforms.SwapAnnotation'>@Swap Annotation</a><span class='update'>updated: 8.0.0, <b><red>todo</red></b></span></p>
 			<li><p><a class='doclink' href='#juneau-marshall.Transforms.TemplatedSwaps'>Templated Swaps</a></p>
 			<li><p><a class='doclink' href='#juneau-marshall.Transforms.SurrogateClasses'>Surrogate Classes</a></p>
 		</ol>
@@ -208,7 +208,7 @@
 		<ol>
 			<li><p><a class='doclink' href='#juneau-marshall.BeanDictionaries.BeanSubTypes'>Bean Subtypes</a></p>
 		</ol>
-		<li><p><a class='doclink' href='#juneau-marshall.VirtualBeans'>Virtual Beans</a></p>
+		<li><p><a class='doclink' href='#juneau-marshall.VirtualBeans'>Virtual Beans</a><span class='update'><b><red>todo</red></b></span></p>
 		<li><p><a class='doclink' href='#juneau-marshall.Recursion'>Non-Tree Models and Recursion Detection</a></p>
 		<li><p><a class='doclink' href='#juneau-marshall.ParsingIntoGenericModels'>Parsing into Generic Models</a><span class='update'>updated: 8.2.0</span></p>
 		<li><p><a class='doclink' href='#juneau-marshall.ReadingContinuousStreams'>Reading Continuous Streams</a></p>
@@ -238,7 +238,7 @@
 		<li><p><a class='doclink' href='#juneau-marshall.HtmlDetails'>HTML Details</a></p>
 		<ol>
 			<li><p><a class='doclink' href='#juneau-marshall.HtmlDetails.HtmlMethodology'>HTML Methodology</a></p>
-			<li><p><a class='doclink' href='#juneau-marshall.HtmlDetails.HtmlSerializers'>HTML Serializers</a></p>
+			<li><p><a class='doclink' href='#juneau-marshall.HtmlDetails.HtmlSerializers'>HTML Serializers</a><span class='update'><b><red>todo</red></b></span></p>
 			<li><p><a class='doclink' href='#juneau-marshall.HtmlDetails.HtmlParsers'>HTML Parsers</a></p>
 			<li><p><a class='doclink' href='#juneau-marshall.HtmlDetails.HtmlAnnotation'>@Html Annotation</a></p>
 			<li><p><a class='doclink' href='#juneau-marshall.HtmlDetails.HtmlRenderAnnotation'>@Html(render) Annotation</a></p>
@@ -274,7 +274,7 @@
 		<li><p><a class='doclink' href='#juneau-marshall.SimpleVariableLanguage'>Simple Variable Language</a></p>
 		<ol>
 			<li><p><a class='doclink' href='#juneau-marshall.SimpleVariableLanguage.SvlVariables'>SVL Variables</a><span class='update'>updated: 8.0.0,8.1.0</span></p>
-			<li><p><a class='doclink' href='#juneau-marshall.SimpleVariableLanguage.VarResolvers'>VarResolvers and VarResolverSessions</a></p>
+			<li><p><a class='doclink' href='#juneau-marshall.SimpleVariableLanguage.VarResolvers'>VarResolvers and VarResolverSessions</a><span class='update'><b><red>todo</red></b></span></p>
 			<li><p><a class='doclink' href='#juneau-marshall.SimpleVariableLanguage.DefaultVarResolver'>VarResolver.DEFAULT</a><span class='update'>created: 8.1.0</span></p>
 			<li><p><a class='doclink' href='#juneau-marshall.SimpleVariableLanguage.SvlOtherNotes'>Other Notes</a></p>
 		</ol>
@@ -284,8 +284,8 @@
 	<ol>
 		<li><p><a class='doclink' href='#juneau-marshall-rdf.RdfDetails'>RDF Details</a></p>
 		<ol>
-			<li><p><a class='doclink' href='#juneau-marshall-rdf.RdfDetails.RdfSerializers'>RDF Serializers</a></p>
-			<li><p><a class='doclink' href='#juneau-marshall-rdf.RdfDetails.RdfParsers'>RDF Parsers</a></p>
+			<li><p><a class='doclink' href='#juneau-marshall-rdf.RdfDetails.RdfSerializers'>RDF Serializers</a><span class='update'><b><red>todo</red></b></span></p>
+			<li><p><a class='doclink' href='#juneau-marshall-rdf.RdfDetails.RdfParsers'>RDF Parsers</a><span class='update'><b><red>todo</red></b></span></p>
 			<li><p><a class='doclink' href='#juneau-marshall-rdf.RdfDetails.RdfAnnotation'>@Rdf Annotation</a></p>
 			<li><p><a class='doclink' href='#juneau-marshall-rdf.RdfDetails.RdfNamespaces'>Namespaces</a></p>
 			<li><p><a class='doclink' href='#juneau-marshall-rdf.RdfDetails.RdfUriProperties'>URI Properties</a></p>
@@ -331,7 +331,7 @@
 		<li><p><a class='doclink' href='#juneau-config.ConfigStores'>Config Stores</a></p>
 		<ol>
 			<li><p><a class='doclink' href='#juneau-config.ConfigStores.ConfigMemoryStore'>ConfigMemoryStore</a></p>
-			<li><p><a class='doclink' href='#juneau-config.ConfigStores.ConfigFileStore'>ConfigFileStore</a></p>
+			<li><p><a class='doclink' href='#juneau-config.ConfigStores.ConfigFileStore'>ConfigFileStore</a><span class='update'><b><red>todo</red></b></span></p>
 			<li><p><a class='doclink' href='#juneau-config.ConfigStores.CustomConfigStores'>Custom ConfigStores</a></p>
 			<li><p><a class='doclink' href='#juneau-config.ConfigStores.ConfigStoreListeners'>ConfigStore Listeners</a></p>
 		</ol>
@@ -1254,7 +1254,7 @@
 
 <!-- ==================================================================================================== -->
 
-<h3 class='topic' onclick='toggle(this)'><a href='#juneau-marshall.JavaBeansSupport' id='juneau-marshall.JavaBeansSupport'>2.5 - Java Beans Support</a><span class='update'>created: 8.2.0</span></h3>
+<h3 class='topic' onclick='toggle(this)'><a href='#juneau-marshall.JavaBeansSupport' id='juneau-marshall.JavaBeansSupport'>2.5 - Java Beans Support</a><span class='update'>created: 8.2.0, <b><red>todo</red></b></span></h3>
 <div class='topic'><!-- START: 2.5 - juneau-marshall.JavaBeansSupport -->
 <p>
 	Out-of-the-box, Juneau supports marshalling of Java beans with standard public getters and setters, public
@@ -1309,34 +1309,34 @@
 	Several settings exist to allow you to customize how bean properties are handled by serializers and parsers:
 </p>
 <ul class='javatree'>
-	<li class='jc'>{@link org.apache.juneau.BeanContext}
+	<li class='jc'>{@link org.apache.juneau.BeanContextBuilder}
 	<ul>
-		<li class='jf'>{@link org.apache.juneau.BeanContext#BEAN_beanClassVisibility BEAN_beanClassVisibility} - Allows non-public POJOs to be treated as beans.
-		<li class='jf'>{@link org.apache.juneau.BeanContext#BEAN_beanConstructorVisibility BEAN_beanConstructorVisibility} - Allows non-public constructors to be used on beans.
-		<li class='jf'>{@link org.apache.juneau.BeanContext#BEAN_beanFieldVisibility BEAN_beanFieldVisibility} - Allows non-public fields to be used as bean properties.
-		<li class='jf'>{@link org.apache.juneau.BeanContext#BEAN_beanMethodVisibility BEAN_beanMethodVisibility} - Allows non-public methods to be used as bean getters and setters.
-		<li class='jf'>{@link org.apache.juneau.BeanContext#BEAN_beansRequireDefaultConstructor BEAN_beansRequireDefaultConstructor} - Don't treat a POJO as a bean if it doesn't have a default no-arg constructor.
-		<li class='jf'>{@link org.apache.juneau.BeanContext#BEAN_beansRequireSerializable BEAN_beansRequireSerializable} - Don't treat a POJO as a bean if it doesn't implement <c>Serializable</c>.
-		<li class='jf'>{@link org.apache.juneau.BeanContext#BEAN_beansRequireSettersForGetters BEAN_beansRequireSettersForGetters} - Ignore getter methods if they don't have setter methods.
-		<li class='jf'>{@link org.apache.juneau.BeanContext#BEAN_beansRequireSomeProperties BEAN_beansRequireSomeProperties} - Don't treat a POJO as a bean if it doesn't have at least one property defined.
+		<li class='jm'>{@link org.apache.juneau.BeanContextBuilder#beanClassVisibility(Visibility) beanClassVisibility(Visibility)} - Allows non-public POJOs to be treated as beans.
+		<li class='jm'>{@link org.apache.juneau.BeanContextBuilder#beanConstructorVisibility beanConstructorVisibility(Visibility)} - Allows non-public constructors to be used on beans.
+		<li class='jm'>{@link org.apache.juneau.BeanContextBuilder#beanFieldVisibility beanFieldVisibility(Visibility)} - Allows non-public fields to be used as bean properties.
+		<li class='jm'>{@link org.apache.juneau.BeanContextBuilder#beanMethodVisibility beanMethodVisibility(Visibility)} - Allows non-public methods to be used as bean getters and setters.
+		<li class='jm'>{@link org.apache.juneau.BeanContextBuilder#beansRequireDefaultConstructor() beansRequireDefaultConstructor()} - Don't treat a POJO as a bean if it doesn't have a default no-arg constructor.
+		<li class='jm'>{@link org.apache.juneau.BeanContextBuilder#beansRequireSerializable() beansRequireSerializable()} - Don't treat a POJO as a bean if it doesn't implement <c>Serializable</c>.
+		<li class='jm'>{@link org.apache.juneau.BeanContextBuilder#beansRequireSettersForGetters beansRequireSettersForGetters} - Ignore getter methods if they don't have setter methods.
+		<li class='jm'>{@link org.apache.juneau.BeanContextBuilder#disableBeansRequireSomeProperties disableBeansRequireSomeProperties} - Don't treat a POJO as a bean if it doesn't have at least one property defined.
 	</ul>
 </ul>
 <p>
 	Settings and equivalent annotations are also available to control which properties are marshalled and how they are ordered.
 </p>
 <ul class='javatree'>
-	<li class='jc'>{@link org.apache.juneau.BeanContext}
+	<li class='jc'>{@link org.apache.juneau.BeanContextBuilder}
 	<ul>
-		<li class='jf'>{@link org.apache.juneau.BeanContext#BEAN_bpi BEAN_bpi} - Specifies properties to include and property order during marshalling.
-		<li class='jf'>{@link org.apache.juneau.BeanContext#BEAN_bpx BEAN_bpx} - Specifies properties to exclude during marshalling.
-		<li class='jf'>{@link org.apache.juneau.BeanContext#BEAN_bpro BEAN_bpro} - Specifies read-only properties (ignored during parsing).
-		<li class='jf'>{@link org.apache.juneau.BeanContext#BEAN_bpwo BEAN_bpwo} - Specifies write-only properties (ignored during reading).
+		<li class='jm'>{@link org.apache.juneau.BeanContextBuilder#beanProperties(Class,String) beanProperties(Class,String)} - Specifies properties to include and property order during marshalling.
+		<li class='jm'>{@link org.apache.juneau.BeanContextBuilder#beanPropertiesExcludes(Class,String) beanPropertiesExcludes(Class,String)} - Specifies properties to exclude during marshalling.
+		<li class='jm'>{@link org.apache.juneau.BeanContextBuilder#beanPropertiesReadOnly(Class,String) beanPropertiesReadOnly(Class,String) } - Specifies read-only properties (ignored during parsing).
+		<li class='jm'>{@link org.apache.juneau.BeanContextBuilder#beanPropertiesWriteOnly(Class,String) beanPropertiesWriteOnly(Class,String)} - Specifies write-only properties (ignored during reading).
 	</ul>
 </ul>
 <p>
-	It's common to use the {@link org.apache.juneau.annotation.Bean#bpi @Bean(bpi)} annotation to force the ordering
+	It's common to use the {@link org.apache.juneau.annotation.Bean#properties @Bean(properties|p)} annotation to force the ordering
 	of properties during marshalling.  IBM JVMs keep the ordering of fields and methods in the compiled bytecode, but
-	Oracle JVMs do not and return fields/methods in random order.  The {@link org.apache.juneau.annotation.Bean#bpi @Bean(bpi)} annotation was added to 
+	Oracle JVMs do not and return fields/methods in random order.  The {@link org.apache.juneau.annotation.Bean#properties @Bean(properties|p)} annotation was added to 
 	help with this limitation.
 </p>
 <p class='bpcode w800'>
@@ -1388,7 +1388,7 @@
 	<jk>public class</jk> Address { ... }
 </p>
 <p> 
-	Bean properties can be excluded using the {@link org.apache.juneau.annotation.Bean#bpx() @Bean(bpx)}
+	Bean properties can be excluded using the {@link org.apache.juneau.annotation.Bean#excludeProperties() @Bean(excludeProperties|xp)}
 	annotation.
 </p>
 <p class='bpcode w800'>
@@ -1652,7 +1652,7 @@
 	}
 </p>
 <p>
-	The {@link org.apache.juneau.annotation.BeanProperty#params() @Beanp(params)} annotation
+	The {@link org.apache.juneau.annotation.Beanp#params() @Beanp(params)} annotation
 	is for bean properties of type map or collection.
 	It's used to identify the class types of the contents of the bean property object when
 	the general parameter types are interfaces or abstract classes.
@@ -1978,10 +1978,10 @@
 
 <!-- ==================================================================================================== -->
 
-<h4 class='topic' onclick='toggle(this)'><a href='#juneau-marshall.JavaBeansSupport.BeanFilters' id='juneau-marshall.JavaBeansSupport.BeanFilters'>2.5.8 - BeanFilter Class</a></h4>
+<h4 class='topic' onclick='toggle(this)'><a href='#juneau-marshall.JavaBeansSupport.BeanFilters' id='juneau-marshall.JavaBeansSupport.BeanFilters'>2.5.8 - BeanFilter Class</a><span class='update'><b><red>todo</red></b></span></h4>
 <div class='topic'><!-- START: 2.5.8 - juneau-marshall.JavaBeansSupport.BeanFilters -->
 <p>
-	The {@link org.apache.juneau.transform.BeanFilter} class is the programmatic equivalent to the
+	The {@del org.apache.juneau.transform.BeanFilter} class is the programmatic equivalent to the
 	{@link org.apache.juneau.annotation.Bean @Bean} annotation.
 </p>
 <p>
@@ -1991,7 +1991,7 @@
 	to existing code.
 </p>
 <p>
-	Bean filters are defined through {@link org.apache.juneau.transform.BeanFilterBuilder BeanFilterBuilders}.
+	Bean filters are defined through {@del org.apache.juneau.transform.BeanFilterBuilder BeanFilterBuilders}.
 </p>
 <p>
 	In the previous examples, we defined this bean annotation:
@@ -2016,8 +2016,8 @@
 	Bean filters are added to serializers and parsers using the following:
 </p>
 <ul class='javatree'>
-	<li class='jf'>{@link org.apache.juneau.BeanContext#BEAN_beanFilters}
-	<li class='jm'>{@link org.apache.juneau.BeanContextBuilder#beanFilters(Object...)}
+	<li class='jf'>{@del BEAN_beanFilters}
+	<li class='jm'>{@del BeanContextBuilder#beanFilters(Object...)}</dc>
 </ul>
 <p>
 	For example:
@@ -2034,8 +2034,8 @@
 	The annotations will be detected and bean filters will automatically be created for them.
 </p>
 <p>
-	The {@link org.apache.juneau.BeanContextBuilder#beanFilters(Object...)} method also allows you to pass in interfaces.
-	Any class that's not a subclass of {@link org.apache.juneau.transform.BeanFilterBuilder} get interpreted 
+	The {@del BeanContextBuilder#beanFilters(Object...)} method also allows you to pass in interfaces.
+	Any class that's not a subclass of {@del org.apache.juneau.transform.BeanFilterBuilder} get interpreted 
 	as bean interface classes.
 	These cause bean implementations of those interfaces to only expose the properties defined on the 
 	interface.
@@ -2067,7 +2067,7 @@
 
 <!-- ==================================================================================================== -->
 
-<h4 class='topic' onclick='toggle(this)'><a href='#juneau-marshall.JavaBeansSupport.InterfaceFilters' id='juneau-marshall.JavaBeansSupport.InterfaceFilters'>2.5.9 - Interface Filters</a></h4>
+<h4 class='topic' onclick='toggle(this)'><a href='#juneau-marshall.JavaBeansSupport.InterfaceFilters' id='juneau-marshall.JavaBeansSupport.InterfaceFilters'>2.5.9 - Interface Filters</a><span class='update'><b><red>todo</red></b></span></h4>
 <div class='topic'><!-- START: 2.5.9 - juneau-marshall.JavaBeansSupport.InterfaceFilters -->
 <p>
 	Occasionally, you may want to limit bean properties to only those defined on a parent class or interface.  
@@ -2077,9 +2077,9 @@
 	Interface filters are defined through the following:
 </p>
 <ul class='javatree'>
-	<li class='jf'>{@link org.apache.juneau.BeanContext#BEAN_beanFilters}
+	<li class='jf'>{@del BeanContext#BEAN_beanFilters}
 	<li class='ja'>{@link org.apache.juneau.annotation.Bean#interfaceClass() Bean(interfaceClass)}
-	<li class='jm'>{@link org.apache.juneau.transform.BeanFilterBuilder#interfaceClass(Class)}
+	<li class='jm'>{@del org.apache.juneau.transform.BeanFilterBuilder#interfaceClass(Class)}
 </ul>
 <p>
 	For example, let's define the following interface and implementation:
@@ -2125,7 +2125,7 @@
 	String <jv>json</jv> = <jv>serializer</jv>.serialize(<jv>object</jv>);  
 </p>	
 <p>
-	The {@link org.apache.juneau.BeanContextBuilder#beanFilters(Object...)} method will automatically interpret any 
+	The {@del BeanContextBuilder#beanFilters(Object...)} method will automatically interpret any 
 	non-<c>BeanFilter</c> classes passed in as meaning interface classes. 
 	So in the previous example, the <c>BeanFilter</c> class could have been avoided altogether by just 
 	passing in <c>MyInterface.<jk>class</jk></c> to the serializer, like so:
@@ -2171,7 +2171,7 @@
 
 <!-- ==================================================================================================== -->
 
-<h4 class='topic' onclick='toggle(this)'><a href='#juneau-marshall.JavaBeansSupport.StopClasses' id='juneau-marshall.JavaBeansSupport.StopClasses'>2.5.10 - Stop Classes</a></h4>
+<h4 class='topic' onclick='toggle(this)'><a href='#juneau-marshall.JavaBeansSupport.StopClasses' id='juneau-marshall.JavaBeansSupport.StopClasses'>2.5.10 - Stop Classes</a><span class='update'><b><red>todo</red></b></span></h4>
 <div class='topic'><!-- START: 2.5.10 - juneau-marshall.JavaBeansSupport.StopClasses -->
 <p>
 	Whereas interface filters limit properties defined on child classes, stop filters 
@@ -2182,7 +2182,7 @@
 </p>
 <ul class='javatree'>
 	<li class='ja'>{@link org.apache.juneau.annotation.Bean#stopClass() Bean(stopClass)}
-	<li class='jf'>{@link org.apache.juneau.transform.BeanFilterBuilder#stopClass(Class)}
+	<li class='jf'>{@del org.apache.juneau.transform.BeanFilterBuilder#stopClass(Class)}
 </ul>
 <p>
 	Stop classes are identical in purpose to the stop class specified by {@link java.beans.Introspector#getBeanInfo(Class, Class)}.
@@ -2448,7 +2448,7 @@
 
 <!-- ==================================================================================================== -->
 
-<h3 class='topic' onclick='toggle(this)'><a href='#juneau-marshall.ConfigurableAnnotations' id='juneau-marshall.ConfigurableAnnotations'>2.10 - Configurable Annotations</a><span class='update'>created: 8.1.0, updated: 8.1.3,8.2.0</span></h3>
+<h3 class='topic' onclick='toggle(this)'><a href='#juneau-marshall.ConfigurableAnnotations' id='juneau-marshall.ConfigurableAnnotations'>2.10 - Configurable Annotations</a><span class='update'>created: 8.1.0, updated: 8.1.3,8.2.0, <b><red>todo</red></b></span></h3>
 <div class='topic'><!-- START: 2.10 - juneau-marshall.ConfigurableAnnotations -->
 <p>
 	All configurable properties described in the previous section have annotation equivalents that can be applied on
@@ -2458,7 +2458,9 @@
 	In the section on the REST server API, we describe how to configure serializers and parsers using <ja>@Property</ja>
 	annotations such as shown below:
 </p>
+{@review}
 <p class='bpcode w800'>
+
 	<jc>// Configuring serializers/parsers using @Property annotations.</jc>
 	<ja>@Rest</ja>(
 		path=<js>"/atom"</js>,
@@ -2569,7 +2571,7 @@
 	<li class'jc'>{@link org.apache.juneau.annotation.NamePropertyAnnotation} <jk>implements</jk> {@link org.apache.juneau.annotation.NameProperty}
 	<li class'jc'>{@link org.apache.juneau.annotation.ParentPropertyAnnotation} <jk>implements</jk> {@link org.apache.juneau.annotation.ParentProperty}
 	<li class'jc'>{@link org.apache.juneau.annotation.SwapAnnotation} <jk>implements</jk> {@link org.apache.juneau.annotation.Swap}
-	<li class'jc'>{@link org.apache.juneau.annotation.UriAnnotation} <jk>implements</jk> {@link org.apache.juneau.annotation.URI}
+	<li class'jc'>{@link org.apache.juneau.annotation.UriAnnotation} <jk>implements</jk> {@link org.apache.juneau.annotation.Uri}
 	<li class'jc'>{@link org.apache.juneau.csv.annotation.CsvAnnotation} <jk>implements</jk> {@link org.apache.juneau.csv.annotation.Csv}
 	<li class'jc'>{@link org.apache.juneau.html.annotation.HtmlAnnotation} <jk>implements</jk> {@link org.apache.juneau.html.annotation.Html}
 	<li class'jc'>{@link org.apache.juneau.jso.annotation.JsoAnnotation} <jk>implements</jk> {@link org.apache.juneau.jso.annotation.Jso}
@@ -2646,8 +2648,8 @@
 </p>
 <ol class='spaced-list'>
 	<li>
-		Using the provided {@link org.apache.juneau.collections.OMap#serializeTo(java.io.Writer)} or 
-		{@link org.apache.juneau.collections.OList#serializeTo(java.io.Writer)} methods.
+		Using the provided {@link org.apache.juneau.collections.OMap#writeTo(java.io.Writer)} or 
+		{@link org.apache.juneau.collections.OList#writeTo(java.io.Writer)} methods.
 	<li>
 		Passing them to one of the {@link org.apache.juneau.serializer.Serializer} serialize methods.
 	<li>
@@ -2895,7 +2897,7 @@
 
 <!-- ==================================================================================================== -->
 
-<h3 class='topic' onclick='toggle(this)'><a href='#juneau-marshall.Transforms' id='juneau-marshall.Transforms'>2.14 - Transforms</a></h3>
+<h3 class='topic' onclick='toggle(this)'><a href='#juneau-marshall.Transforms' id='juneau-marshall.Transforms'>2.14 - Transforms</a><span class='update'><b><red>todo</red></b></span></h3>
 <div class='topic'><!-- START: 2.14 - juneau-marshall.Transforms -->
 <p>
 	By default, the Juneau framework can serialize and parse a wide variety of POJOs out-of-the-box.  
@@ -2903,7 +2905,7 @@
 	These classes are:
 </p>
 <ul class='javatree'>
-	<li class='jc'>{@link org.apache.juneau.transform.BeanFilter} - Transforms that alter the way beans are handled.
+	<li class='jc'>{@del org.apache.juneau.transform.BeanFilter} - Transforms that alter the way beans are handled.
 	<li class='jac'>{@link org.apache.juneau.transform.PojoSwap} - Transforms that swap non-serializable POJOs with 
 		serializable POJOs during serialization (and optionally vis-versa during parsing).
 		<ul>
@@ -2920,7 +2922,7 @@
 <ul class='javatree'>
 	<li class='jc'>{@link org.apache.juneau.BeanContext}
 	<ul>
-		<li class='jf'>{@link org.apache.juneau.BeanContext#BEAN_beanFilters BEAN_beanFilters}
+		<li class='jf'>{@del BeanContext#BEAN_beanFilters BEAN_beanFilters}
 		<li class='jf'>{@link org.apache.juneau.BeanContext#BEAN_swaps BEAN_swaps}
 	</ul>
 </ul>
@@ -2950,7 +2952,7 @@
 		{@link org.apache.juneau.annotation.ParentProperty} 
 		- Identifies a setter as a method for adding a parent reference to a child object.
 	<li class='ja'>
-		{@link org.apache.juneau.annotation.URI} 
+		{@link org.apache.juneau.annotation.Uri} 
 		- Used to identify a class or bean property as a URI.
 </ul>
 
@@ -3474,7 +3476,7 @@
 
 <!-- ==================================================================================================== -->
 
-<h4 class='topic' onclick='toggle(this)'><a href='#juneau-marshall.Transforms.SwapAnnotation' id='juneau-marshall.Transforms.SwapAnnotation'>2.14.6 - @Swap Annotation</a><span class='update'>updated: 8.0.0</span></h4>
+<h4 class='topic' onclick='toggle(this)'><a href='#juneau-marshall.Transforms.SwapAnnotation' id='juneau-marshall.Transforms.SwapAnnotation'>2.14.6 - @Swap Annotation</a><span class='update'>updated: 8.0.0, <b><red>todo</red></b></span></h4>
 <div class='topic'><!-- START: 2.14.6 - juneau-marshall.Transforms.SwapAnnotation -->
 <p>
 	{@link org.apache.juneau.annotation.Swap @Swap} can be used to associate a swap class using an 
@@ -3498,7 +3500,7 @@
 	}
 </p>
 <p>
-	Multiple swaps can be associated with a POJO by using the {@link org.apache.juneau.annotation.Swaps @Swaps} annotation:
+	Multiple swaps can be associated with a POJO by using the {@del org.apache.juneau.annotation.Swaps @Swaps} annotation:
 </p>
 <p class='bpcode w800'>
 	<ja>@Swaps</ja>(
@@ -3737,7 +3739,7 @@
 	<li class='ja'>{@link org.apache.juneau.annotation.NameProperty}
 	<li class='ja'>{@link org.apache.juneau.annotation.ParentProperty}
 	<li class='ja'>{@link org.apache.juneau.annotation.Swap}
-	<li class='ja'>{@link org.apache.juneau.annotation.URI}
+	<li class='ja'>{@link org.apache.juneau.annotation.Uri}
 	<li class='ja'>{@link org.apache.juneau.csv.annotation.Csv}
 	<li class='ja'>{@link org.apache.juneau.html.annotation.Html}
 	<li class='ja'>{@link org.apache.juneau.jso.annotation.Jso}
@@ -4069,10 +4071,10 @@
 
 <!-- ==================================================================================================== -->
 
-<h3 class='topic' onclick='toggle(this)'><a href='#juneau-marshall.VirtualBeans' id='juneau-marshall.VirtualBeans'>2.17 - Virtual Beans</a></h3>
+<h3 class='topic' onclick='toggle(this)'><a href='#juneau-marshall.VirtualBeans' id='juneau-marshall.VirtualBeans'>2.17 - Virtual Beans</a><span class='update'><b><red>todo</red></b></span></h3>
 <div class='topic'><!-- START: 2.17 - juneau-marshall.VirtualBeans -->
 <p>
-	The {@link org.apache.juneau.BeanContext#BEAN_useInterfaceProxies} setting (enabled by default) allows
+	The {@link org.apache.juneau.BeanContextBuilder#disableInterfaceProxies()} setting (enabled by default) allows
 	the Juneau parsers to parse content into virtual beans (bean interfaces without implementation classes).
 </p>
 <p>
@@ -4471,7 +4473,7 @@
 <p>
 	Juneau automatically interprets any {@link java.net.URL} and {@link java.net.URI} objects as URIs and will
 	resolve them accordingly.
-	The {@link org.apache.juneau.annotation.URI @URI} annotation can be used to extend that to other bean 
+	The {@link org.apache.juneau.annotation.Uri @Uri} annotation can be used to extend that to other bean 
 	properties and class types so that they also get interpreted as URIs.
 	For example:
 </p>
@@ -4545,7 +4547,7 @@
 	<tr>
 		<td><c><ja>@JsonIgnoreProperties</ja>({...})</c></td>
 		<td>
-			{@link org.apache.juneau.annotation.Bean#bpx @Bean(bpx="...")}
+			{@link org.apache.juneau.annotation.Bean#excludeProperties @Bean(excludeProperties|xp)}
 		</td>
 	</tr>
 	<tr>
@@ -6093,11 +6095,10 @@
 	<ul>
 		<li class='jf'>{@link org.apache.juneau.xml.XmlSerializer#XML_addBeanTypes XML_addBeanTypes}
 		<li class='jf'>{@link org.apache.juneau.xml.XmlSerializer#XML_addNamespaceUrisToRoot XML_addNamespaceUrisToRoot}
-		<li class='jf'>{@link org.apache.juneau.xml.XmlSerializer#XML_autoDetectNamespaces XML_autoDetectNamespaces}
+		<li class='jf'>{@link org.apache.juneau.xml.XmlSerializer#XML_disableAutoDetectNamespaces XML_disableAutoDetectNamespaces}
 		<li class='jf'>{@link org.apache.juneau.xml.XmlSerializer#XML_defaultNamespace XML_defaultNamespace}
 		<li class='jf'>{@link org.apache.juneau.xml.XmlSerializer#XML_enableNamespaces XML_enableNamespaces}
 		<li class='jf'>{@link org.apache.juneau.xml.XmlSerializer#XML_namespaces XML_namespaces}
-		<li class='jf'>{@link org.apache.juneau.xml.XmlSerializer#XML_xsNamespace XML_xsNamespace}
 	</ul>
 </ul>
 <p>
@@ -7581,12 +7582,11 @@
 	<xt>&lt;/person&gt;</xt>
 </p>
 <p>
-	One important property on the XML serializer class is 
-	{@link org.apache.juneau.xml.XmlSerializer#XML_autoDetectNamespaces XML_autoDetectNamespaces}.
-	This property tells the serializer to make a first-pass over the data structure to look for namespaces 
+	By default, the XML serializer class will make a first-pass over the data structure to look for namespaces 
 	defined on classes and bean properties.
 	In high-performance environments, you may want to consider disabling auto-detection and providing your 
-	own explicit list of namespaces to the serializer to avoid this scanning step.
+	own explicit list of namespaces to the serializer to avoid this scanning step using 
+	{@link org.apache.juneau.xml.XmlSerializerBuilder#disableAutoDetectNamespaces()}.
 </p>
 <p>
 	The following code will produce the same output as before, but will perform slightly better since it 
@@ -8131,7 +8131,7 @@
 
 <!-- ==================================================================================================== -->
 
-<h4 class='topic' onclick='toggle(this)'><a href='#juneau-marshall.HtmlDetails.HtmlSerializers' id='juneau-marshall.HtmlDetails.HtmlSerializers'>2.27.2 - HTML Serializers</a></h4>
+<h4 class='topic' onclick='toggle(this)'><a href='#juneau-marshall.HtmlDetails.HtmlSerializers' id='juneau-marshall.HtmlDetails.HtmlSerializers'>2.27.2 - HTML Serializers</a><span class='update'><b><red>todo</red></b></span></h4>
 <div class='topic'><!-- START: 2.27.2 - juneau-marshall.HtmlDetails.HtmlSerializers -->
 <p>
 	The {@link org.apache.juneau.html.HtmlSerializer} class is used to serialize POJOs into HTML.
@@ -8145,29 +8145,31 @@
 </p>
 <ul class='javatree'>
 	<li class='link'>{@doc GlossaryConfigurableProperties Configurable Properties}
-	<li class='jc'>{@link org.apache.juneau.html.HtmlSerializer}
+	<li class='jc'>{@link org.apache.juneau.html.HtmlSerializerBuilder}
 	<ul>
-		<li class='jf'>{@link org.apache.juneau.html.HtmlSerializer#HTML_addBeanTypes HTML_addBeanTypes}
-		<li class='jf'>{@link org.apache.juneau.html.HtmlSerializer#HTML_addKeyValueTableHeaders HTML_addKeyValueTableHeaders}
-		<li class='jf'>{@link org.apache.juneau.html.HtmlSerializer#HTML_detectLabelParameters HTML_detectLabelParameters}
-		<li class='jf'>{@link org.apache.juneau.html.HtmlSerializer#HTML_detectLinksInStrings HTML_detectLinksInStrings}
-		<li class='jf'>{@link org.apache.juneau.html.HtmlSerializer#HTML_labelParameter HTML_labelParameter}
-		<li class='jf'>{@link org.apache.juneau.html.HtmlSerializer#HTML_uriAnchorText HTML_uriAnchorText}
+		<li class='jf'>{@link org.apache.juneau.html.HtmlSerializerBuilder#addBeanTypes() addBeanTypes()}
+		<li class='jf'>{@link org.apache.juneau.html.HtmlSerializerBuilder#addKeyValueTableHeaders() addKeyValueTableHeaders()}
+		<li class='jf'>{@link org.apache.juneau.html.HtmlSerializerBuilder#disableDetectLabelParameters() disableDetectLabelParameters()}
+		<li class='jf'>{@link org.apache.juneau.html.HtmlSerializerBuilder#disableDetectLinksInStrings() disableDetectLinksInStrings()}
+		<li class='jf'>{@link org.apache.juneau.html.HtmlSerializerBuilder#labelParameter(String) labelParameter(String)}
+		<li class='jf'>{@link org.apache.juneau.html.HtmlSerializerBuilder#uriAnchorText(AnchorText) uriAnchorText(AnchorText)}
 	</ul>
-	<li class='jc'>{@link org.apache.juneau.html.HtmlDocSerializer}
+	<li class='jc'>{@link org.apache.juneau.html.HtmlDocSerializerBuilder}
 	<ul>
-		<li class='jf'>{@link org.apache.juneau.html.HtmlDocSerializer#HTMLDOC_aside HTMLDOC_aside}
-		<li class='jf'>{@link org.apache.juneau.html.HtmlDocSerializer#HTMLDOC_footer HTMLDOC_footer}
-		<li class='jf'>{@link org.apache.juneau.html.HtmlDocSerializer#HTMLDOC_head HTMLDOC_head}
-		<li class='jf'>{@link org.apache.juneau.html.HtmlDocSerializer#HTMLDOC_header HTMLDOC_header}
-		<li class='jf'>{@link org.apache.juneau.html.HtmlDocSerializer#HTMLDOC_nav HTMLDOC_nav}
-		<li class='jf'>{@link org.apache.juneau.html.HtmlDocSerializer#HTMLDOC_navlinks HTMLDOC_navlinks}
-		<li class='jf'>{@link org.apache.juneau.html.HtmlDocSerializer#HTMLDOC_noResultsMessage HTMLDOC_noResultsMessage}
-		<li class='jf'>{@link org.apache.juneau.html.HtmlDocSerializer#HTMLDOC_nowrap HTMLDOC_nowrap}
-		<li class='jf'>{@link org.apache.juneau.html.HtmlDocSerializer#HTMLDOC_script HTMLDOC_script}
-		<li class='jf'>{@link org.apache.juneau.html.HtmlDocSerializer#HTMLDOC_style HTMLDOC_style}
-		<li class='jf'>{@link org.apache.juneau.html.HtmlDocSerializer#HTMLDOC_stylesheet HTMLDOC_stylesheet}
-		<li class='jf'>{@link org.apache.juneau.html.HtmlDocSerializer#HTMLDOC_template HTMLDOC_template}				
+		<li class='jf'>{@link org.apache.juneau.html.HtmlDocSerializerBuilder#aside(String[]) #aside(String[])}
+		<li class='jf'>{@link org.apache.juneau.html.HtmlDocSerializerBuilder#asideFloat(Float) #asideFloat(Float)}
+		<li class='jf'>{@link org.apache.juneau.html.HtmlDocSerializerBuilder#footer(String[]) footer(String[])}
+		<li class='jf'>{@link org.apache.juneau.html.HtmlDocSerializerBuilder#head(String[]) head(String[])}
+		<li class='jf'>{@link org.apache.juneau.html.HtmlDocSerializerBuilder#header(String[]) header(String[])}
+		<li class='jf'>{@link org.apache.juneau.html.HtmlDocSerializerBuilder#nav(String[]) nav(String[])}
+		<li class='jf'>{@link org.apache.juneau.html.HtmlDocSerializerBuilder#navlinks(String[]) navlinks(String[])}
+		<li class='jf'>{@link org.apache.juneau.html.HtmlDocSerializerBuilder#noResultsMessage(String) noResultsMessage(String)}
+		<li class='jf'>{@link org.apache.juneau.html.HtmlDocSerializerBuilder#nowrap() nowrap()}
+		<li class='jf'>{@link org.apache.juneau.html.HtmlDocSerializerBuilder#script(String[]) script(String[])}
+		<li class='jf'>{@link org.apache.juneau.html.HtmlDocSerializerBuilder#style(String[]) style(String[])}
+		<li class='jf'>{@link org.apache.juneau.html.HtmlDocSerializerBuilder#stylesheet(String[]) stylesheet(String[])}
+		<li class='jf'>{@link org.apache.juneau.html.HtmlDocSerializerBuilder#template(Class) template(Class)}				
+		<li class='jf'>{@link org.apache.juneau.html.HtmlDocSerializerBuilder#widgets(Class...) widgets(Class...)}				
 	</ul>
 </ul>
 <p>
@@ -10393,16 +10395,12 @@
 		<td>{@link org.apache.juneau.rest.vars.UrlEncodeVar}</td>
 		<td class='code'>$UE{uriPart}</td>
 	</tr>
-	<tr class='dark dd'>
-		<td>{@link org.apache.juneau.rest.vars.WidgetVar} <i>(deprecated)</i></td>
-		<td class='code'>$W{name}</td>
-	</tr>
 </table>
 </div><!-- END: 2.32.1 - juneau-marshall.SimpleVariableLanguage.SvlVariables -->
 
 <!-- ==================================================================================================== -->
 
-<h4 class='topic' onclick='toggle(this)'><a href='#juneau-marshall.SimpleVariableLanguage.VarResolvers' id='juneau-marshall.SimpleVariableLanguage.VarResolvers'>2.32.2 - VarResolvers and VarResolverSessions</a></h4>
+<h4 class='topic' onclick='toggle(this)'><a href='#juneau-marshall.SimpleVariableLanguage.VarResolvers' id='juneau-marshall.SimpleVariableLanguage.VarResolvers'>2.32.2 - VarResolvers and VarResolverSessions</a><span class='update'><b><red>todo</red></b></span></h4>
 <div class='topic'><!-- START: 2.32.2 - juneau-marshall.SimpleVariableLanguage.VarResolvers -->
 <p>
 	The main class for performing variable resolution is {@link org.apache.juneau.svl.VarResolver}.
@@ -10437,15 +10435,15 @@
 	Context and session objects are set through the following methods:
 </p>
 <ul class='javatree'>
-	<li class='jm'>{@link org.apache.juneau.svl.VarResolverBuilder#contextObject(String,Object)} - Context objects.
-	<li class='jm'>{@link org.apache.juneau.svl.VarResolverSession#sessionObject(String,Object)} - Session objects.
-	<li class='jm'>{@link org.apache.juneau.svl.VarResolver#createSession(Map)} - Session objects.
+	<li class='jm'>{@del VarResolverBuilder#contextObject(String,Object)} - Context objects.
+	<li class='jm'>{@del VarResolverSession#sessionObject(String,Object)} - Session objects.
+	<li class='jm'>{@del VarResolver#createSession(Map)} - Session objects.
 </ul>
 <p>
 	Both kinds of objects are accessible through the following method:
 </p>
 <ul class='javatree'>
-	<li class='jm'>{@link org.apache.juneau.svl.VarResolverSession#getSessionObject(Class, String, boolean)}
+	<li class='jm'>{@del VarResolverSession#getSessionObject(Class, String, boolean)}
 </ul>
 <p>
 	Var resolvers can be cloned and extended by using the {@link org.apache.juneau.svl.VarResolver#copy()} method.
@@ -10629,7 +10627,7 @@
 
 <!-- ==================================================================================================== -->
 
-<h4 class='topic' onclick='toggle(this)'><a href='#juneau-marshall-rdf.RdfDetails.RdfSerializers' id='juneau-marshall-rdf.RdfDetails.RdfSerializers'>3.1.1 - RDF Serializers</a></h4>
+<h4 class='topic' onclick='toggle(this)'><a href='#juneau-marshall-rdf.RdfDetails.RdfSerializers' id='juneau-marshall-rdf.RdfDetails.RdfSerializers'>3.1.1 - RDF Serializers</a><span class='update'><b><red>todo</red></b></span></h4>
 <div class='topic'><!-- START: 3.1.1 - juneau-marshall-rdf.RdfDetails.RdfSerializers -->
 <p>
 	The {@link org.apache.juneau.jena.RdfSerializer} class is the top-level class for all Jena-based serializers.
@@ -10648,47 +10646,40 @@
 
 <ul class='javatree'>
 	<li class='link'>{@doc GlossaryConfigurableProperties Configurable Properties}
-	<li class='jic'>{@link org.apache.juneau.jena.RdfCommon}
+	<li class='jc'>{@link org.apache.juneau.jena.RdfSerializerBuilder}
 	<ul>
-		<li class='jf'>{@link org.apache.juneau.jena.RdfCommon#RDF_arp_embedding RDF_arp_embedding}
-		<li class='jf'>{@link org.apache.juneau.jena.RdfCommon#RDF_arp_err_ RDF_arp_err_}
-		<li class='jf'>{@link org.apache.juneau.jena.RdfCommon#RDF_arp_errorMode RDF_arp_errorMode}
-		<li class='jf'>{@link org.apache.juneau.jena.RdfCommon#RDF_arp_ign_ RDF_arp_ign_}
-		<li class='jf'>{@link org.apache.juneau.jena.RdfCommon#RDF_arp_iriRules RDF_arp_iriRules}
-		<li class='jf'>{@link org.apache.juneau.jena.RdfCommon#RDF_arp_warn_ RDF_arp_warn_}
-		<li class='jf'>{@link org.apache.juneau.jena.RdfCommon#RDF_collectionFormat RDF_collectionFormat}
-		<li class='jf'>{@link org.apache.juneau.jena.RdfCommon#RDF_juneauBpNs RDF_juneauBpNs}
-		<li class='jf'>{@link org.apache.juneau.jena.RdfCommon#RDF_juneauNs RDF_juneauNs}
-		<li class='jf'>{@link org.apache.juneau.jena.RdfCommon#RDF_language RDF_language}
-		<li class='jf'>{@link org.apache.juneau.jena.RdfCommon#RDF_looseCollections RDF_looseCollections}
-		<li class='jf'>{@link org.apache.juneau.jena.RdfCommon#RDF_n3_abbrevBaseUri RDF_n3_abbrevBaseUri}
-		<li class='jf'>{@link org.apache.juneau.jena.RdfCommon#RDF_n3_indentProperty RDF_n3_indentProperty}
-		<li class='jf'>{@link org.apache.juneau.jena.RdfCommon#RDF_n3_minGap RDF_n3_minGap}
-		<li class='jf'>{@link org.apache.juneau.jena.RdfCommon#RDF_n3_objectLists RDF_n3_objectLists}
-		<li class='jf'>{@link org.apache.juneau.jena.RdfCommon#RDF_n3_propertyColumn RDF_n3_propertyColumn}
-		<li class='jf'>{@link org.apache.juneau.jena.RdfCommon#RDF_n3_subjectColumn RDF_n3_subjectColumn}
-		<li class='jf'>{@link org.apache.juneau.jena.RdfCommon#RDF_n3_useDoubles RDF_n3_useDoubles}
-		<li class='jf'>{@link org.apache.juneau.jena.RdfCommon#RDF_n3_usePropertySymbols RDF_n3_usePropertySymbols}
-		<li class='jf'>{@link org.apache.juneau.jena.RdfCommon#RDF_n3_useTripleQuotedStrings RDF_n3_useTripleQuotedStrings}
-		<li class='jf'>{@link org.apache.juneau.jena.RdfCommon#RDF_n3_widePropertyLen RDF_n3_widePropertyLen}
-		<li class='jf'>{@link org.apache.juneau.jena.RdfCommon#RDF_rdfxml_allowBadUris RDF_rdfxml_allowBadUris}
-		<li class='jf'>{@link org.apache.juneau.jena.RdfCommon#RDF_rdfxml_attributeQuoteChar RDF_rdfxml_attributeQuoteChar}
-		<li class='jf'>{@link org.apache.juneau.jena.RdfCommon#RDF_rdfxml_blockRules RDF_rdfxml_blockRules}
-		<li class='jf'>{@link org.apache.juneau.jena.RdfCommon#RDF_rdfxml_longId RDF_rdfxml_longId}
-		<li class='jf'>{@link org.apache.juneau.jena.RdfCommon#RDF_rdfxml_relativeUris RDF_rdfxml_relativeUris}
-		<li class='jf'>{@link org.apache.juneau.jena.RdfCommon#RDF_rdfxml_showDoctypeDeclaration RDF_rdfxml_showDoctypeDeclaration}
-		<li class='jf'>{@link org.apache.juneau.jena.RdfCommon#RDF_rdfxml_showXmlDeclaration RDF_rdfxml_showXmlDeclaration}
-		<li class='jf'>{@link org.apache.juneau.jena.RdfCommon#RDF_rdfxml_tab RDF_rdfxml_tab}
-		<li class='jf'>{@link org.apache.juneau.jena.RdfCommon#RDF_rdfxml_xmlBase RDF_rdfxml_xmlBase}
-	</ul>
-	<li class='jc'>{@link org.apache.juneau.jena.RdfSerializer}
-	<ul>
-		<li class='jf'>{@link org.apache.juneau.jena.RdfSerializer#RDF_addBeanTypes RDF_addBeanTypes}
-		<li class='jf'>{@link org.apache.juneau.jena.RdfSerializer#RDF_addLiteralTypes RDF_addLiteralTypes}
-		<li class='jf'>{@link org.apache.juneau.jena.RdfSerializer#RDF_addRootProperty RDF_addRootProperty}
-		<li class='jf'>{@link org.apache.juneau.jena.RdfSerializer#RDF_autoDetectNamespaces RDF_autoDetectNamespaces}
-		<li class='jf'>{@link org.apache.juneau.jena.RdfSerializer#RDF_namespaces RDF_namespaces}				
-		<li class='jf'>{@link org.apache.juneau.jena.RdfSerializer#RDF_useXmlNamespaces RDF_useXmlNamespaces}					
+		<li class='jm'>{@link org.apache.juneau.jena.RdfSerializerBuilder#addLiteralTypes() addLiteralTypes()}
+		<li class='jm'>{@link org.apache.juneau.jena.RdfSerializerBuilder#addRootProperty() addRootProperty()}
+		<li class='jm'>{@link org.apache.juneau.jena.RdfSerializerBuilder#arp_embedding(boolean) arp_embedding(boolean)}
+		<li class='jm'>{@link org.apache.juneau.jena.RdfSerializerBuilder#arp_errorMode(String) arp_errorMode(String)}
+		<li class='jm'>{@link org.apache.juneau.jena.RdfSerializerBuilder#arp_iriRules(String) arp_iriRules(String) }
+		<li class='jm'>{@link org.apache.juneau.jena.RdfSerializerBuilder#collectionFormat(RdfCollectionFormat) collectionFormat(RdfCollectionFormat)}
+		<li class='jm'>{@link org.apache.juneau.jena.RdfSerializerBuilder#disableAutoDetectNamespaces() disableAutoDetectNamespaces()}
+		<li class='jm'>{@link org.apache.juneau.jena.RdfSerializerBuilder#disableUseXmlNamespaces() disableUseXmlNamespaces()}					
+		<li class='jm'>{@link org.apache.juneau.jena.RdfSerializerBuilder#juneauBpNs(Namespace) juneauBpNs(Namespace)}
+		<li class='jm'>{@link org.apache.juneau.jena.RdfSerializerBuilder#juneauNs(Namespace) juneauNs(Namespace)}
+		<li class='jm'>{@link org.apache.juneau.jena.RdfSerializerBuilder#language(String) language(String)}
+		<li class='jm'>{@link org.apache.juneau.jena.RdfSerializerBuilder#looseCollections() looseCollections()}
+		<li class='jm'>{@link org.apache.juneau.jena.RdfSerializerBuilder#n3_disableAbbrevBaseUri() n3_disableAbbrevBaseUri()}
+		<li class='jm'>{@link org.apache.juneau.jena.RdfSerializerBuilder#n3_disableObjectLists() n3_disableObjectLists()}
+		<li class='jm'>{@link org.apache.juneau.jena.RdfSerializerBuilder#n3_disableUseDoubles() n3_disableUseDoubles()}
+		<li class='jm'>{@link org.apache.juneau.jena.RdfSerializerBuilder#n3_disableUsePropertySymbols() n3_disableUsePropertySymbols()}
+		<li class='jm'>{@link org.apache.juneau.jena.RdfSerializerBuilder#n3_disableUseTripleQuotedStrings() n3_disableUseTripleQuotedStrings()}
+		<li class='jm'>{@link org.apache.juneau.jena.RdfSerializerBuilder#n3_indentProperty(int) n3_indentProperty(int)}
+		<li class='jm'>{@link org.apache.juneau.jena.RdfSerializerBuilder#n3_minGap(int) n3_minGap(int)}
+		<li class='jm'>{@link org.apache.juneau.jena.RdfSerializerBuilder#n3_propertyColumn(int) n3_propertyColumn(int)}
+		<li class='jm'>{@link org.apache.juneau.jena.RdfSerializerBuilder#n3_subjectColumn(int) n3_subjectColumn(int)}
+		<li class='jm'>{@link org.apache.juneau.jena.RdfSerializerBuilder#n3_widePropertyLen(int) n3_widePropertyLen(int)}
+		<li class='jm'>{@link org.apache.juneau.jena.RdfSerializerBuilder#namespaces(Namespace...) namespaces(Namespace...)}				
+		<li class='jm'>{@link org.apache.juneau.jena.RdfSerializerBuilder#rdfxml_allowBadUris() rdfxml_allowBadUris()}
+		<li class='jm'>{@link org.apache.juneau.jena.RdfSerializerBuilder#rdfxml_attributeQuoteChar(String) rdfxml_attributeQuoteChar(String)}
+		<li class='jm'>{@link org.apache.juneau.jena.RdfSerializerBuilder#rdfxml_blockRules(String) rdfxml_blockRules(String)}
+		<li class='jm'>{@link org.apache.juneau.jena.RdfSerializerBuilder#rdfxml_disableShowDoctypeDeclaration() rdfxml_disableShowDoctypeDeclaration()}
+		<li class='jm'>{@link org.apache.juneau.jena.RdfSerializerBuilder#rdfxml_longId(boolean) rdfxml_longId(boolean)}
+		<li class='jm'>{@link org.apache.juneau.jena.RdfSerializerBuilder#rdfxml_relativeUris(String) rdfxml_relativeUris(String)}
+		<li class='jm'>{@link org.apache.juneau.jena.RdfSerializerBuilder#rdfxml_showXmlDeclaration(String) rdfxml_showXmlDeclaration(String)}
+		<li class='jm'>{@link org.apache.juneau.jena.RdfSerializerBuilder#rdfxml_tab(int) rdfxml_tab(int)}
+		<li class='jm'>{@link org.apache.juneau.jena.RdfSerializerBuilder#rdfxml_xmlBase(String) rdfxml_xmlBase(String)}
 	</ul>
 </ul>
 <p>
@@ -10727,7 +10718,7 @@
 
 <!-- ==================================================================================================== -->
 
-<h4 class='topic' onclick='toggle(this)'><a href='#juneau-marshall-rdf.RdfDetails.RdfParsers' id='juneau-marshall-rdf.RdfDetails.RdfParsers'>3.1.2 - RDF Parsers</a></h4>
+<h4 class='topic' onclick='toggle(this)'><a href='#juneau-marshall-rdf.RdfDetails.RdfParsers' id='juneau-marshall-rdf.RdfDetails.RdfParsers'>3.1.2 - RDF Parsers</a><span class='update'><b><red>todo</red></b></span></h4>
 <div class='topic'><!-- START: 3.1.2 - juneau-marshall-rdf.RdfDetails.RdfParsers -->
 <p>
 	The {@link org.apache.juneau.jena.RdfParser} class is the top-level class for all Jena-based parsers.
@@ -10750,38 +10741,35 @@
 </p>
 <ul class='javatree'>
 	<li class='link'>{@doc GlossaryConfigurableProperties Configurable Properties}
-	<li class='jic'>{@link org.apache.juneau.jena.RdfCommon}
+	<li class='jic'>{@link org.apache.juneau.jena.RdfParserBuilder}
 	<ul>
-		<li class='jf'>{@link org.apache.juneau.jena.RdfCommon#RDF_arp_embedding RDF_arp_embedding}
-		<li class='jf'>{@link org.apache.juneau.jena.RdfCommon#RDF_arp_err_ RDF_arp_err_}
-		<li class='jf'>{@link org.apache.juneau.jena.RdfCommon#RDF_arp_errorMode RDF_arp_errorMode}
-		<li class='jf'>{@link org.apache.juneau.jena.RdfCommon#RDF_arp_ign_ RDF_arp_ign_}
-		<li class='jf'>{@link org.apache.juneau.jena.RdfCommon#RDF_arp_iriRules RDF_arp_iriRules}
-		<li class='jf'>{@link org.apache.juneau.jena.RdfCommon#RDF_arp_warn_ RDF_arp_warn_}
-		<li class='jf'>{@link org.apache.juneau.jena.RdfCommon#RDF_collectionFormat RDF_collectionFormat}
-		<li class='jf'>{@link org.apache.juneau.jena.RdfCommon#RDF_juneauBpNs RDF_juneauBpNs}
-		<li class='jf'>{@link org.apache.juneau.jena.RdfCommon#RDF_juneauNs RDF_juneauNs}
-		<li class='jf'>{@link org.apache.juneau.jena.RdfCommon#RDF_language RDF_language}
-		<li class='jf'>{@link org.apache.juneau.jena.RdfCommon#RDF_looseCollections RDF_looseCollections}
-		<li class='jf'>{@link org.apache.juneau.jena.RdfCommon#RDF_n3_abbrevBaseUri RDF_n3_abbrevBaseUri}
-		<li class='jf'>{@link org.apache.juneau.jena.RdfCommon#RDF_n3_indentProperty RDF_n3_indentProperty}
-		<li class='jf'>{@link org.apache.juneau.jena.RdfCommon#RDF_n3_minGap RDF_n3_minGap}
-		<li class='jf'>{@link org.apache.juneau.jena.RdfCommon#RDF_n3_objectLists RDF_n3_objectLists}
-		<li class='jf'>{@link org.apache.juneau.jena.RdfCommon#RDF_n3_propertyColumn RDF_n3_propertyColumn}
-		<li class='jf'>{@link org.apache.juneau.jena.RdfCommon#RDF_n3_subjectColumn RDF_n3_subjectColumn}
-		<li class='jf'>{@link org.apache.juneau.jena.RdfCommon#RDF_n3_useDoubles RDF_n3_useDoubles}
-		<li class='jf'>{@link org.apache.juneau.jena.RdfCommon#RDF_n3_usePropertySymbols RDF_n3_usePropertySymbols}
-		<li class='jf'>{@link org.apache.juneau.jena.RdfCommon#RDF_n3_useTripleQuotedStrings RDF_n3_useTripleQuotedStrings}
-		<li class='jf'>{@link org.apache.juneau.jena.RdfCommon#RDF_n3_widePropertyLen RDF_n3_widePropertyLen}
-		<li class='jf'>{@link org.apache.juneau.jena.RdfCommon#RDF_rdfxml_allowBadUris RDF_rdfxml_allowBadUris}
-		<li class='jf'>{@link org.apache.juneau.jena.RdfCommon#RDF_rdfxml_attributeQuoteChar RDF_rdfxml_attributeQuoteChar}
-		<li class='jf'>{@link org.apache.juneau.jena.RdfCommon#RDF_rdfxml_blockRules RDF_rdfxml_blockRules}
-		<li class='jf'>{@link org.apache.juneau.jena.RdfCommon#RDF_rdfxml_longId RDF_rdfxml_longId}
-		<li class='jf'>{@link org.apache.juneau.jena.RdfCommon#RDF_rdfxml_relativeUris RDF_rdfxml_relativeUris}
-		<li class='jf'>{@link org.apache.juneau.jena.RdfCommon#RDF_rdfxml_showDoctypeDeclaration RDF_rdfxml_showDoctypeDeclaration}
-		<li class='jf'>{@link org.apache.juneau.jena.RdfCommon#RDF_rdfxml_showXmlDeclaration RDF_rdfxml_showXmlDeclaration}
-		<li class='jf'>{@link org.apache.juneau.jena.RdfCommon#RDF_rdfxml_tab RDF_rdfxml_tab}
-		<li class='jf'>{@link org.apache.juneau.jena.RdfCommon#RDF_rdfxml_xmlBase RDF_rdfxml_xmlBase}
+		<li class='jf'>{@link org.apache.juneau.jena.RdfParserBuilder#arp_embedding(boolean) arp_embedding(boolean)}
+		<li class='jf'>{@link org.apache.juneau.jena.RdfParserBuilder#arp_errorMode(String) arp_errorMode(String)}
+		<li class='jf'>{@link org.apache.juneau.jena.RdfParserBuilder#arp_iriRules(String) arp_iriRules(String)}
+		<li class='jf'>{@link org.apache.juneau.jena.RdfParserBuilder#collectionFormat(RdfCollectionFormat) collectionFormat(RdfCollectionFormat)}
+		<li class='jf'>{@link org.apache.juneau.jena.RdfParserBuilder#juneauBpNs(Namespace) juneauBpNs(Namespace0}
+		<li class='jf'>{@link org.apache.juneau.jena.RdfParserBuilder#juneauNs(Namespace) juneauNs(Namespace0}
+		<li class='jf'>{@link org.apache.juneau.jena.RdfParserBuilder#language(String) language(String)}
+		<li class='jf'>{@link org.apache.juneau.jena.RdfParserBuilder#looseCollections() looseCollections90}
+		<li class='jf'>{@link org.apache.juneau.jena.RdfParserBuilder#n3_disableAbbrevBaseUri() n3_disableAbbrevBaseUri()}
+		<li class='jf'>{@link org.apache.juneau.jena.RdfParserBuilder#n3_indentProperty(int) n3_indentProperty(int)}
+		<li class='jf'>{@link org.apache.juneau.jena.RdfParserBuilder#n3_minGap(int) n3_minGap(int)}
+		<li class='jf'>{@link org.apache.juneau.jena.RdfParserBuilder#n3_disableObjectLists() n3_disableObjectLists()}
+		<li class='jf'>{@link org.apache.juneau.jena.RdfParserBuilder#n3_propertyColumn(int) n3_propertyColumn(int)}
+		<li class='jf'>{@link org.apache.juneau.jena.RdfParserBuilder#n3_subjectColumn(int) n3_subjectColumn(int)}
+		<li class='jf'>{@link org.apache.juneau.jena.RdfParserBuilder#n3_disableUseDoubles() n3_disableUseDoubles()}
+		<li class='jf'>{@link org.apache.juneau.jena.RdfParserBuilder#n3_disableUsePropertySymbols() n3_disableUsePropertySymbols()}
+		<li class='jf'>{@link org.apache.juneau.jena.RdfParserBuilder#n3_disableUseTripleQuotedStrings() n3_disableUseTripleQuotedStrings()}
+		<li class='jf'>{@link org.apache.juneau.jena.RdfParserBuilder#n3_widePropertyLen(int) n3_widePropertyLen(int)}
+		<li class='jf'>{@link org.apache.juneau.jena.RdfParserBuilder#rdfxml_allowBadUris(boolean) rdfxml_allowBadUris(boolean)}
+		<li class='jf'>{@link org.apache.juneau.jena.RdfParserBuilder#rdfxml_attributeQuoteChar(String) rdfxml_attributeQuoteChar(String)}
+		<li class='jf'>{@link org.apache.juneau.jena.RdfParserBuilder#rdfxml_blockRules(String) rdfxml_blockRules(String)}
+		<li class='jf'>{@link org.apache.juneau.jena.RdfParserBuilder#rdfxml_longId(boolean) rdfxml_longId(boolean)}
+		<li class='jf'>{@link org.apache.juneau.jena.RdfParserBuilder#rdfxml_relativeUris(String) rdfxml_relativeUris(String)}
+		<li class='jf'>{@link org.apache.juneau.jena.RdfParserBuilder#rdfxml_disableShowDoctypeDeclaration() rdfxml_disableShowDoctypeDeclaration()}
+		<li class='jf'>{@link org.apache.juneau.jena.RdfParserBuilder#rdfxml_showXmlDeclaration(String) rdfxml_showXmlDeclaration(String)}
+		<li class='jf'>{@link org.apache.juneau.jena.RdfParserBuilder#rdfxml_tab(int) rdfxml_tab(int)}
+		<li class='jf'>{@link org.apache.juneau.jena.RdfParserBuilder#rdfxml_xmlBase(String) rdfxml_xmlBase(String)}
 	</ul>
 	<li class='jc'>{@link org.apache.juneau.jena.RdfParser}
 	<ul>
@@ -10897,18 +10885,17 @@
 	<xt>&lt;/rdf:RDF&gt;</xt>
 </p>
 <p>
-	Namespace auto-detection ({@link org.apache.juneau.xml.XmlSerializer#XML_autoDetectNamespaces}) is 
-	enabled on serializers by default.
+	Namespace auto-detection is enabled on serializers by default.
 	This causes the serializer to make a first-pass over the data structure to look for namespaces.
 	In high-performance environments, you may want to consider disabling auto-detection and providing an 
-	explicit list of namespaces to the serializer to avoid this scanning step.
+	explicit list of namespaces to the serializer to avoid this scanning step using {@link org.apache.juneau.xml.XmlSerializerBuilder#disableAutoDetectNamespaces()}.
 </p>
 <p class='bpcode w800'>
 	<jc>// Create a new serializer, but manually specify the namespaces.</jc>
 	RdfSerializer <jv>serializer</jv> = RdfSerializer.<jsm>create</jsm>()
 		.xmlabbrev()
 		.set(RdfProperties.<jsf>RDF_rdfxml_tab</jsf>, 3)
-		.autoDetectNamespaces(<jk>false</jk>)
+		.disableAutoDetectNamespaces()
 		.namespaces(<js>"{per:'http://www.apache.org/person/'}"</js>)
 		.build();
 </p>
@@ -10978,7 +10965,7 @@
 	<xt>&lt;/rdf:RDF&gt;</xt>
 </p>
 <p>
-	The {@link org.apache.juneau.annotation.URI @URI} annotation can also be used on classes and properties 
+	The {@link org.apache.juneau.annotation.Uri @Uri} annotation can also be used on classes and properties 
 	to identify them as URLs when they're not instances of <c>java.net.URI</c> or <c>java.net.URL</c> 
 	(not needed if <c><ja>@Rdf</ja>(beanUri=<jk>true</jk>)</c> is already specified).
 </p>
@@ -12985,20 +12972,20 @@
 
 <!-- ==================================================================================================== -->
 
-<h4 class='topic' onclick='toggle(this)'><a href='#juneau-config.ConfigStores.ConfigFileStore' id='juneau-config.ConfigStores.ConfigFileStore'>5.12.2 - ConfigFileStore</a></h4>
+<h4 class='topic' onclick='toggle(this)'><a href='#juneau-config.ConfigStores.ConfigFileStore' id='juneau-config.ConfigStores.ConfigFileStore'>5.12.2 - ConfigFileStore</a><span class='update'><b><red>todo</red></b></span></h4>
 <div class='topic'><!-- START: 5.12.2 - juneau-config.ConfigStores.ConfigFileStore -->
 <p>
 	The {@link org.apache.juneau.config.store.ConfigFileStore} is the typical store used for configuration files.
 	It provides the following configurable settings:
 </p>
 <ul class='javatree'>
-	<li class='jc'>{@link org.apache.juneau.config.store.ConfigFileStore}
+	<li class='jc'>{@link org.apache.juneau.config.store.ConfigFileStoreBuilder}
 	<ul>
-		<li class='jm'>{@link org.apache.juneau.config.store.ConfigFileStore#FILESTORE_charset FILESTORE_charset}
-		<li class='jm'>{@link org.apache.juneau.config.store.ConfigFileStore#FILESTORE_directory FILESTORE_directory}
-		<li class='jm'>{@link org.apache.juneau.config.store.ConfigFileStore#FILESTORE_updateOnWrite FILESTORE_updateOnWrite}
-		<li class='jm'>{@link org.apache.juneau.config.store.ConfigFileStore#FILESTORE_useWatcher FILESTORE_useWatcher}
-		<li class='jm'>{@link org.apache.juneau.config.store.ConfigFileStore#FILESTORE_watcherSensitivity FILESTORE_watcherSensitivity}
+		<li class='jm'>{@link org.apache.juneau.config.store.ConfigFileStoreBuilder#charset(Charset) charset(Charset)}
+		<li class='jm'>{@link org.apache.juneau.config.store.ConfigFileStoreBuilder#directory(File) directory(File)}
+		<li class='jm'>{@link org.apache.juneau.config.store.ConfigFileStoreBuilder#enableUpdateOnWrite() enableUpdateOnWrite()}
+		<li class='jm'>{@link org.apache.juneau.config.store.ConfigFileStoreBuilder#enableWatcher() enableWatcher()}
+		<li class='jm'>{@link org.apache.juneau.config.store.ConfigFileStoreBuilder#watcherSensitivity(WatcherSensitivity) watcherSensitivity(WatcherSensitivity)}
 	</ul>
 </ul>
 
@@ -13540,12 +13527,12 @@
 </p>
 <ul class='javatree'>
 	<li class='jic'>
-		{@link org.apache.juneau.rest.BasicRestConfig} 
+		{@del BasicRestConfig} 
 		<ul>
-			<li class='jac'>{@link org.apache.juneau.rest.BasicRest org.apache.juneau.rest.BasicRest}
+			<li class='jac'>{@del org.apache.juneau.rest.BasicRest org.apache.juneau.rest.BasicRest}
 				<br>Provides a default set of serializers, parsers, options page, stylesheet, and other common settings.
 				<ul>
-					<li class='jac'>{@link org.apache.juneau.rest.BasicRestGroup org.apache.juneau.rest.BasicRestGroup}
+					<li class='jac'>{@del org.apache.juneau.rest.BasicRestGroup org.apache.juneau.rest.BasicRestGroup}
 						<br>A default implementation for "router" pages.
 					</li>
 				</ul>
@@ -13744,7 +13731,7 @@
 	}
 </p>
 <p>
-	Additional annotations are pulled in from the {@link org.apache.juneau.rest.BasicRestConfig} interface which simply
+	Additional annotations are pulled in from the {@del org.apache.juneau.rest.BasicRestConfig} interface which simply
 	exists to define a common set of annotations.  
 	Notice that it has no code at all.
 </p>
@@ -13853,7 +13840,7 @@
 <h4 class='topic' onclick='toggle(this)'><a href='#juneau-rest-server.RestInstantiation.BasicRest' id='juneau-rest-server.RestInstantiation.BasicRest'>6.3.3 - BasicRest</a><span class='update'>created: 8.1.0, <b><red>todo</red></b></span></h4>
 <div class='topic'><!-- START: 6.3.3 - juneau-rest-server.RestInstantiation.BasicRest -->
 <p>
-	The {@link org.apache.juneau.rest.BasicRest} class is identical to the {@link org.apache.juneau.rest.BasicRestServlet} class except that
+	The {@del org.apache.juneau.rest.BasicRest} class is identical to the {@link org.apache.juneau.rest.BasicRestServlet} class except that
 	it does not extend from <c>HttpServlet</c>.
 	It defines the exact same set of serializers, parsers, etc., but it cannot be deployed as a top-level
 	servlet.  It can however be used for child resources registered via the {@link org.apache.juneau.rest.annotation.Rest#children() @Rest(children)} 
@@ -14031,7 +14018,7 @@
 <h4 class='topic' onclick='toggle(this)'><a href='#juneau-rest-server.RestInstantiation.BasicRestGroup' id='juneau-rest-server.RestInstantiation.BasicRestGroup'>6.3.6 - BasicRestGroup</a><span class='update'>created: 8.1.0, <b><red>todo</red></b></span></h4>
 <div class='topic'><!-- START: 6.3.6 - juneau-rest-server.RestInstantiation.BasicRestGroup -->
 <p>
-	The {@link org.apache.juneau.rest.BasicRestGroup} class is identical to the {@link org.apache.juneau.rest.BasicRestServletGroup} class except that
+	The {@del org.apache.juneau.rest.BasicRestGroup} class is identical to the {@link org.apache.juneau.rest.BasicRestServletGroup} class except that
 	it does not extend from <c>HttpServlet</c>.
 	It defines the exact same set of serializers, parsers, etc., but it cannot be deployed as a top-level
 	servlet.  It can however be used for child resources registered via the {@link org.apache.juneau.rest.annotation.Rest#children() @Rest(children)} 
@@ -14070,9 +14057,9 @@
 	Resource object resolution is controlled through the following API:
 </p>
 <ul class='javatree'>
-	<li class='jic'>{@link org.apache.juneau.rest.RestResourceResolver}
+	<li class='jic'>{@del org.apache.juneau.rest.RestResourceResolver}
 	<ul>
-		<li class='jc'>{@link org.apache.juneau.rest.BasicRestResourceResolver}
+		<li class='jc'>{@del org.apache.juneau.rest.BasicRestResourceResolver}
 	</ul>
 </ul>
 <p>
@@ -14080,7 +14067,7 @@
 	Later topics discuss how to use this API to instantiate resources using Spring.
 </p>
 <ul class='seealso'>
-	<li class='jf'>{@link org.apache.juneau.rest.RestContext#REST_resourceResolver}
+	<li class='jf'>{@del RestContext#REST_resourceResolver}
 </ul>
 </div><!-- END: 6.3.7 - juneau-rest-server.RestInstantiation.RestResourceResolvers -->
 
@@ -14193,7 +14180,7 @@
 		</td>
 	</tr>
 	<tr>
-		<td>{@link org.apache.juneau.rest.annotation.Rest#properties() properties()}</td>
+		<td>{@del Rest#properties()}</td>
 		<td>
 			Properties on child are combined with those on parent class.
 			<br>Properties are applied parent-to-child in the order they appear in the annotation.
@@ -14219,7 +14206,7 @@
 		</td>
 	</tr>
 	<tr>
-		<td>{@link org.apache.juneau.rest.annotation.Rest#responseHandlers() responseHandlers()}</td>
+		<td>{@del Rest#responseHandlers()}</td>
 		<td>
 			Response handlers on child are combined with those on parent class.
 		</td>
@@ -14231,7 +14218,7 @@
 		</td>
 	</tr>
 	<tr>
-		<td>{@link org.apache.juneau.rest.annotation.Rest#reqHeaders() reqHeaders()}</td>
+		<td>{@del Rest#reqHeaders()}</td>
 		<td>
 			Headers on child are combined with those on parent class.
 			<br>Headers are applied parent-to-child in the order they appear in the annotation.
@@ -14239,7 +14226,7 @@
 		</td>
 	</tr>
 	<tr>
-		<td>{@link org.apache.juneau.rest.annotation.Rest#resHeaders() resHeaders()}</td>
+		<td>{@del Rest#resHeaders()}</td>
 		<td>
 			Headers on child are combined with those on parent class.
 			<br>Headers are applied parent-to-child in the order they appear in the annotation.
@@ -14291,14 +14278,14 @@
 <h4 class='topic' onclick='toggle(this)'><a href='#juneau-rest-server.RestAnnotation.RestPath' id='juneau-rest-server.RestAnnotation.RestPath'>6.4.2 - @Rest(path)</a><span class='update'>created: 8.1.0, updated: 8.1.2, <b><red>todo</red></b></span></h4>
 <div class='topic'><!-- START: 6.4.2 - juneau-rest-server.RestAnnotation.RestPath -->
 <p>
-	The {@link org.apache.juneau.rest.annotation.RestResource#path() @RestResource(path)} annotation is used in the following situations:
+	The {@del org.apache.juneau.rest.annotation.RestResource#path() @RestResource(path)} annotation is used in the following situations:
 <p>
 <ul class='spaced-list'>
 	<li>
-		On child resources (resource classes attached to parents via the {@link org.apache.juneau.rest.annotation.RestResource#children() @RestResource(children)} annotation) to identify
+		On child resources (resource classes attached to parents via the {@del org.apache.juneau.rest.annotation.RestResource#children() @RestResource(children)} annotation) to identify
 		the subpath used to access the child resource relative to the parent.
 	<li>
-		On top-level {@link org.apache.juneau.rest.RestServlet} classes deployed as Spring beans when {@link org.apache.juneau.rest.springboot.JuneauRestInitializer} is being used.
+		On top-level {@link org.apache.juneau.rest.RestServlet} classes deployed as Spring beans when {@del org.apache.juneau.rest.springboot.JuneauRestInitializer} is being used.
 </ul>
 
 <h5 class='topic'>On child resources</h5>
@@ -14345,7 +14332,7 @@
 
 <h5 class='topic'>On top-level resources deployed as Spring beans</h5>
 <p>
-	The path can also be used on top-level resources deployed as Spring beans when used with the {@link org.apache.juneau.rest.springboot.JuneauRestInitializer}
+	The path can also be used on top-level resources deployed as Spring beans when used with the {@del org.apache.juneau.rest.springboot.JuneauRestInitializer}
 	Spring Boot initializer class:
 </p>
 <h5 class='figure'>Example:</h5>
@@ -14383,7 +14370,7 @@
 <h5 class='topic'>Path variables</h5>
 <p>
 	The path can contain variables that get resolved to {@link org.apache.juneau.http.annotation.Path @Path} parameters
-	or access through the {@link org.apache.juneau.rest.RestRequest#getPathMatch()} method.
+	or access through the {@link org.apache.juneau.rest.RestRequest#getPathParams()} method.
 </p>
 <h5 class='figure'>Example:</h5>
 <p class='bpcode'>
@@ -14601,7 +14588,7 @@
 			<li><b>Localization:</b>
 				<ul>
 					<li class='jc'>{@link java.util.ResourceBundle} - Client-localized resource bundle.
-					<li class='jc'>{@link org.apache.juneau.utils.MessageBundle} - A resource bundle with additional features.
+					<li class='jc'>{@del org.apache.juneau.utils.MessageBundle} - A resource bundle with additional features.
 					<li class='jc'>{@link java.util.Locale} - Client locale.
 				</ul>
 			<li><b>Request APIs:</b>
@@ -14615,14 +14602,14 @@
 			<li><b>Other:</b>
 				<ul>
 					<li class='jc'>{@link org.apache.juneau.http.HttpMethod} - The method name matched (when using <c><ja>@RestOp</ja>(method=<js>"*"</js>)</c>)
-					<li class='jc'>{@link org.apache.juneau.rest.RestLogger} - Logger with additional features.
+					<li class='jc'>{@del org.apache.juneau.rest.RestLogger} - Logger with additional features.
 					<li class='jc'>{@link org.apache.juneau.rest.RestContext} - The resource read-only context.
 					<li class='jc'>{@link org.apache.juneau.parser.Parser} - The parser matching the request content type.
 					<li class='jc'>{@link org.apache.juneau.parser.ReaderParser} - The reader parser matching the request content type.
 					<li class='jc'>{@link org.apache.juneau.parser.InputStreamParser} - The input stream parser matching the request content type.
 					<li class='jc'>{@link org.apache.juneau.dto.swagger.Swagger} - The auto-generated Swagger doc.
 					<li class='jc'>{@link org.apache.juneau.config.Config} - The external config for the resource.
-					<li class='jc'>{@link org.apache.juneau.rest.RequestProperties} - API for modifying request-time configuration properties.
+					<li class='jc'>{@del org.apache.juneau.rest.RequestProperties} - API for modifying request-time configuration properties.
 				</ul>
 		</ul>
 	<li><b>Annotated parameters:</b>
@@ -14669,7 +14656,7 @@
 	<li>All annotations have programmatic equivalents on the {@link org.apache.juneau.rest.RestRequest} class.
 </ul>
 <ul class='seealso'>
-	<li class='jf'>{@link org.apache.juneau.rest.RestContext#REST_paramResolvers} - For configuring custom parameter types.
+	<li class='jf'>{@del RestContext#REST_paramResolvers} - For configuring custom parameter types.
 </ul>
 </div><!-- END: 6.6.1 - juneau-rest-server.RestMethod.RestmParameters -->
 
@@ -14693,17 +14680,14 @@
 	<li class='jc'><c>{@link org.apache.juneau.rest.RestRequest} <jk>extends</jk> HttpServletRequest</c>
 	<ul>
 		<li class='jm'>{@link org.apache.juneau.rest.RestRequest#getHeaders() getHeaders()} - HTTP request headers.
-		<li class='jm'>{@link org.apache.juneau.rest.RestRequest#getQuery() getQuery()} - Query parameters.
-		<li class='jm'>{@link org.apache.juneau.rest.RestRequest#getFormData() getFormData()} - Form-data parameters.
+		<li class='jm'>{@link org.apache.juneau.rest.RestRequest#getQueryParams() getQueryParams()} - Query parameters.
+		<li class='jm'>{@link org.apache.juneau.rest.RestRequest#getFormParams() getFormParams()} - Form-data parameters.
+		<li class='jm'>{@link org.apache.juneau.rest.RestRequest#getPathParams() getPathParams()} - Path match variables.
 		<li class='jm'>{@link org.apache.juneau.rest.RestRequest#getBody() getBody()} - HTTP request body.
-		<li class='jm'>{@link org.apache.juneau.rest.RestRequest#getPathMatch() getPathMatch()} - Path match variables.
-		<li class='jm'>{@link org.apache.juneau.rest.RestRequest#getLogger() getLogger()} - Logging.
-		<li class='jm'>{@link org.apache.juneau.rest.RestRequest#getInfoProvider() getInfoProvider()} - Swagger documentation provider.
 		<li class='jm'>{@link org.apache.juneau.rest.RestRequest#getSwagger() getSwagger()} - Generated Swagger information.
 		<li class='jm'>{@link org.apache.juneau.rest.RestRequest#getConfig() getConfig()} - External configuration API.
 		<li class='jm'>{@link org.apache.juneau.rest.RestRequest#getVarResolverSession() getVarResolverSession()} - String variable resolver.
 		<li class='jm'>{@link org.apache.juneau.rest.RestRequest#getMessages() getMessages()} - Localized messages.
-		<li class='jm'>{@link org.apache.juneau.rest.RestRequest#getProperties() getProperties()} - Configuration properties.
 	</ul>
 </ul>
 </div><!-- END: 6.6.2 - juneau-rest-server.RestMethod.RestmRestRequest -->
@@ -14728,7 +14712,7 @@
 	<li class='jc'><c>{@link org.apache.juneau.rest.RestResponse} <jk>extends</jk> HttpServletResponse</c>
 	<ul>
 		<li class='jm'>{@link org.apache.juneau.rest.RestResponse#setOutput(Object) setOutput(Object)} - Set response output programmatically.
-		<li class='jm'>{@link org.apache.juneau.rest.RestResponse#getHtmlDocBuilder() getHtmlDocBuilder()} - Set HTTP page contents programmatically.
+		<li class='jm'>{@del RestResponse#getHtmlDocBuilder()} - Set HTTP page contents programmatically.
 		<li class='jm'>{@link org.apache.juneau.rest.RestResponse#getDirectWriter(String) getDirectWriter(String)} - Direct access to underlying response writer.
 	</ul>
 </ul>
@@ -14809,12 +14793,12 @@
 <ul class='javatree'>
 	<li class='jc'><c>{@link org.apache.juneau.rest.RequestHeaders} <jk>extends</jk> TreeMap&lt;String,String[]&gt;</c>
 	<ul>
-		<li class='jm'>{@link org.apache.juneau.rest.RequestHeaders#get(String,Class) get(String,Class)} - Get header value converted to a POJO.
-		<li class='jm'>{@link org.apache.juneau.rest.RequestHeaders#get(String,Type,Type...) get(String,Type,Type)} - Get header value converted to a map or collection of POJOs.
-		<li class='jm'>{@link org.apache.juneau.rest.RequestHeaders#getString(String,String) getString(String,String)} - Get header value as a simple string.
-		<li class='jm'>{@link org.apache.juneau.rest.RequestHeaders#getInt(String,int) getInt(String,int)} - Get header value as an integer.
-		<li class='jm'>{@link org.apache.juneau.rest.RequestHeaders#getBoolean(String,boolean) getBoolean(String,boolean)} - Get header value as a boolean.
-		<li class='jm'>{@link org.apache.juneau.rest.RequestHeaders#addDefault(String,Object) addDefault(String,Object)} - Programmatically set a default value for a header.
+		<li class='jm'>{@del RequestHeaders#get(String,Class)} - Get header value converted to a POJO.
+		<li class='jm'>{@del RequestHeaders#get(String,Type,Type...)} - Get header value converted to a map or collection of POJOs.
+		<li class='jm'>{@del RequestHeaders#getString(String,String)} - Get header value as a simple string.
+		<li class='jm'>{@del RequestHeaders#getInt(String,int)} - Get header value as an integer.
+		<li class='jm'>{@del RequestHeaders#getBoolean(String,boolean)} - Get header value as a boolean.
+		<li class='jm'>{@del RequestHeaders#addDefault(String,Object)} - Programmatically set a default value for a header.
 	</ul>
 </ul>
 
@@ -14894,13 +14878,13 @@
 <ul class='javatree'>
 	<li class='jc'><c>{@link org.apache.juneau.rest.RequestQuery} <jk>extends</jk> LinkedHashMap&lt;String,String[]&gt;</c>
 	<ul>
-		<li class='jm'>{@link org.apache.juneau.rest.RequestQuery#get(String,Class) get(String,Class)} - Get query parameter value converted to a POJO.
-		<li class='jm'>{@link org.apache.juneau.rest.RequestQuery#get(String,Type,Type...) get(String,Type,Type)} - Get query parameter value converted to a map or collection of POJOs.
-		<li class='jm'>{@link org.apache.juneau.rest.RequestQuery#getString(String,String) getString(String,String)} - Get query parameter value as a simple string.
-		<li class='jm'>{@link org.apache.juneau.rest.RequestQuery#getInt(String,int) getInt(String,int)} - Get query parameter value as an integer.
-		<li class='jm'>{@link org.apache.juneau.rest.RequestQuery#getBoolean(String,boolean) getBoolean(String,boolean)} - Get query parameter value as a boolean.
-		<li class='jm'>{@link org.apache.juneau.rest.RequestQuery#addDefault(String,Object) addDefault(String,Object)} - Programmatically set a default value for a query parameter.
-		<li class='jm'>{@link org.apache.juneau.rest.RequestQuery#getSearchArgs() getSearchArgs()} - Returns query parameter search arguments.
+		<li class='jm'>{@del RequestQuery#get(String,Class)} - Get query parameter value converted to a POJO.
+		<li class='jm'>{@del RequestQuery#get(String,Type,Type...)} - Get query parameter value converted to a map or collection of POJOs.
+		<li class='jm'>{@del RequestQuery#getString(String,String)} - Get query parameter value as a simple string.
+		<li class='jm'>{@del RequestQuery#getInt(String,int)} - Get query parameter value as an integer.
+		<li class='jm'>{@del RequestQuery#getBoolean(String,boolean)} - Get query parameter value as a boolean.
+		<li class='jm'>{@del RequestQuery#addDefault(String,Object)} - Programmatically set a default value for a query parameter.
+		<li class='jm'>{@del RequestQuery#getSearchArgs()} - Returns query parameter search arguments.
 	</ul>
 </ul>
 
@@ -14942,12 +14926,12 @@
 <ul class='javatree'>
 	<li class='jc'><c>{@link org.apache.juneau.rest.RequestFormData} <jk>extends</jk> LinkedHashMap&lt;String,String[]&gt;</c>
 	<ul>
-		<li class='jm'>{@link org.apache.juneau.rest.RequestFormData#get(String,Class) get(String,Class)} - Get form-data parameter values converted to a POJO.
-		<li class='jm'>{@link org.apache.juneau.rest.RequestFormData#get(String,Type,Type...) get(String,Type,Type)} - Get form-data parameter value converted to a map or collection of POJOs.
-		<li class='jm'>{@link org.apache.juneau.rest.RequestFormData#getString(String,String) getString(String,String)} - Get form-data parameter value as a simple string.
-		<li class='jm'>{@link org.apache.juneau.rest.RequestFormData#getInt(String,int) getInt(String,int)} - Get form-data parameter value as an integer.
-		<li class='jm'>{@link org.apache.juneau.rest.RequestFormData#getBoolean(String,boolean) getBoolean(String,boolean)} - Get form-data parameter value as a boolean.
-		<li class='jm'>{@link org.apache.juneau.rest.RequestFormData#addDefault(String,Object) addDefault(String,Object)} - Programmatically set a default value for a form-data parameter.
+		<li class='jm'>{@del RequestFormData#get(String,Class)} - Get form-data parameter values converted to a POJO.
+		<li class='jm'>{@del RequestFormData#get(String,Type,Type...)} - Get form-data parameter value converted to a map or collection of POJOs.
+		<li class='jm'>{@del RequestFormData#getString(String,String)} - Get form-data parameter value as a simple string.
+		<li class='jm'>{@del RequestFormData#getInt(String,int)} - Get form-data parameter value as an integer.
+		<li class='jm'>{@del RequestFormData#getBoolean(String,boolean)} - Get form-data parameter value as a boolean.
+		<li class='jm'>{@del RequestFormData#addDefault(String,Object)} - Programmatically set a default value for a form-data parameter.
 	</ul>
 </ul>
 
@@ -15023,7 +15007,7 @@
 <p>
 	Paths that end with <js>"/*"</js> will do a prefix match on the incoming URL.  
 	Any remainder after the match can be accessed through 
-	{@link org.apache.juneau.rest.RequestPath#getRemainder()} or parameters with the 
+	{@del RequestPath#getRemainder()} or parameters with the 
 	<c><ja>@Path</ja>(<js>"/*"</js>)</c> annotation.
 	On the other hand, paths that don't end with <js>"/*"</js> (e.g. <js>"/"</js> or <js>"/foo"</js>) will 
 	require an exact URL match, and if any remainder exists, a 404 (not found) error will be thrown.
@@ -15090,12 +15074,12 @@
 <ul class='javatree'>
 	<li class='jc'><c>{@link org.apache.juneau.rest.RequestPath} <jk>extends</jk> TreeMap&lt;String,String&gt;</c>
 	<ul>
-		<li class='jm'>{@link org.apache.juneau.rest.RequestPath#get(String,Class) get(String,Class)} - Get path match variable converted to a POJO.
-		<li class='jm'>{@link org.apache.juneau.rest.RequestPath#get(String,Type,Type...) get(String,Type,Type)} - Get path match variable converted to a map or collection of POJOs.
-		<li class='jm'>{@link org.apache.juneau.rest.RequestPath#getString(String) getString(String)} - Get patch match variable as a simple string.
-		<li class='jm'>{@link org.apache.juneau.rest.RequestPath#getInt(String) getInt(String)} - Get path match variable as an integer.
-		<li class='jm'>{@link org.apache.juneau.rest.RequestPath#getBoolean(String) getBoolean(String)} - Get path match variable as a boolean.
-		<li class='jm'>{@link org.apache.juneau.rest.RequestPath#getRemainder() getRemainder()} - Get the path match remainder.
+		<li class='jm'>{@del RequestPath#get(String,Class)} - Get path match variable converted to a POJO.
+		<li class='jm'>{@del RequestPath.get(String,Type,Type...)} - Get path match variable converted to a map or collection of POJOs.
+		<li class='jm'>{@del RequestPath#getString(String)} - Get patch match variable as a simple string.
+		<li class='jm'>{@del RequestPath#getInt(String)} - Get path match variable as an integer.
+		<li class='jm'>{@del RequestPath#getBoolean(String)} - Get path match variable as a boolean.
+		<li class='jm'>{@del RequestPath#getRemainder()} - Get the path match remainder.
 	</ul>
 </ul>
 
@@ -15138,18 +15122,18 @@
 		<br>Interface that identifies that an object can be serialized directly to an output stream.
 	<li class='jc'>{@link org.apache.juneau.Writable}
 		<br>Interface that identifies that an object can be serialized directly to a writer.
-	<li class='jc'>{@link org.apache.juneau.utils.ZipFileList}
+	<li class='jc'>{@del org.apache.juneau.utils.ZipFileList}
 		<br>Special interface for sending zip files as responses.
 </ul>
 <p>
 	This is controlled through the following extensible API:
 </p>
 <ul class='javatree'>
-	<li class='jic'>{@link org.apache.juneau.rest.ResponseHandler}
+	<li class='jic'>{@del org.apache.juneau.rest.ResponseHandler}
 	<ul>
-		<li class='jc'>{@link org.apache.juneau.rest.reshandlers.DefaultHandler}
-		<li class='jc'>{@link org.apache.juneau.rest.reshandlers.InputStreamHandler}
-		<li class='jc'>{@link org.apache.juneau.rest.reshandlers.ReaderHandler}
+		<li class='jc'>{@del org.apache.juneau.rest.reshandlers.DefaultHandler}
+		<li class='jc'>{@del org.apache.juneau.rest.reshandlers.InputStreamHandler}
+		<li class='jc'>{@del org.apache.juneau.rest.reshandlers.ReaderHandler}
 	</ul>
 </ul>
 <p>
@@ -15194,7 +15178,7 @@
 	}
 </p>
 <ul class='seealso'>
-	<li class='jf'>{@link org.apache.juneau.rest.RestContext#REST_responseHandlers} - For configuring custom response handlers.
+	<li class='jf'>{@del RestContext#REST_responseHandlers} - For configuring custom response handlers.
 </ul>
 </div><!-- END: 6.6.11 - juneau-rest-server.RestMethod.RestmReturnTypes -->
 
@@ -15203,7 +15187,7 @@
 <h4 class='topic' onclick='toggle(this)'><a href='#juneau-rest-server.RestMethod.RestmReaderResource' id='juneau-rest-server.RestMethod.RestmReaderResource'>6.6.12 - ReaderResource</a><span class='update'><b><red>todo</red></b></span></h4>
 <div class='topic'><!-- START: 6.6.12 - juneau-rest-server.RestMethod.RestmReaderResource -->
 <p>
-	The <dc>ReaderResource</dc> class is a convenience object for defining thread-safe
+	The {@del ReaderResource} class is a convenience object for defining thread-safe
 	reusable character-based responses.
 	In essence, it's a container for character data with optional response headers and support for
 	resolving SVL variables.
@@ -15234,7 +15218,7 @@
 <h4 class='topic' onclick='toggle(this)'><a href='#juneau-rest-server.RestMethod.RestmStreamResource' id='juneau-rest-server.RestMethod.RestmStreamResource'>6.6.13 - StreamResource</a><span class='update'><b><red>todo</red></b></span></h4>
 <div class='topic'><!-- START: 6.6.13 - juneau-rest-server.RestMethod.RestmStreamResource -->
 <p>
-	The <dc>org.apache.juneau.http.StreamResource</dc> class is the binary equivalent to the <dc>ReaderResource</dc> object.
+	The {@del org.apache.juneau.http.StreamResource} class is the binary equivalent to the {@del ReaderResource} object.
 	In essence, it's a container for binary data with optional response headers.
 </p>
 <p>
@@ -15457,41 +15441,41 @@
 	}
 </p>
 <ul class='javatree'>
-	<li class='jp'>{@link org.apache.juneau.http.exception}
+	<li class='jp'>{@del org.apache.juneau.http.exception}
 	<ul>
-		<li class='jc'>{@link org.apache.juneau.http.exception.BadRequest}
-		<li class='jc'>{@link org.apache.juneau.http.exception.Conflict}
-		<li class='jc'>{@link org.apache.juneau.http.exception.ExpectationFailed}
-		<li class='jc'>{@link org.apache.juneau.http.exception.FailedDependency}
-		<li class='jc'>{@link org.apache.juneau.http.exception.Forbidden}
-		<li class='jc'>{@link org.apache.juneau.http.exception.Gone}
-		<li class='jc'>{@link org.apache.juneau.http.exception.HttpVersionNotSupported}
-		<li class='jc'>{@link org.apache.juneau.http.exception.InsufficientStorage}
-		<li class='jc'>{@link org.apache.juneau.http.exception.InternalServerError}
-		<li class='jc'>{@link org.apache.juneau.http.exception.LengthRequired}
-		<li class='jc'>{@link org.apache.juneau.http.exception.Locked}
-		<li class='jc'>{@link org.apache.juneau.http.exception.LoopDetected}
-		<li class='jc'>{@link org.apache.juneau.http.exception.MethodNotAllowed}
-		<li class='jc'>{@link org.apache.juneau.http.exception.MisdirectedRequest}
-		<li class='jc'>{@link org.apache.juneau.http.exception.NetworkAuthenticationRequired}
-		<li class='jc'>{@link org.apache.juneau.http.exception.NotAcceptable}
-		<li class='jc'>{@link org.apache.juneau.http.exception.NotExtended}
-		<li class='jc'>{@link org.apache.juneau.http.exception.NotFound}
-		<li class='jc'>{@link org.apache.juneau.http.exception.NotImplemented}
-		<li class='jc'>{@link org.apache.juneau.http.exception.PayloadTooLarge}
-		<li class='jc'>{@link org.apache.juneau.http.exception.PreconditionFailed}
-		<li class='jc'>{@link org.apache.juneau.http.exception.PreconditionRequired}
-		<li class='jc'>{@link org.apache.juneau.http.exception.RangeNotSatisfiable}
-		<li class='jc'>{@link org.apache.juneau.http.exception.RequestHeaderFieldsTooLarge}
-		<li class='jc'>{@link org.apache.juneau.http.exception.ServiceUnavailable}
-		<li class='jc'>{@link org.apache.juneau.http.exception.TooManyRequests}
-		<li class='jc'>{@link org.apache.juneau.http.exception.Unauthorized}
-		<li class='jc'>{@link org.apache.juneau.http.exception.UnavailableForLegalReasons}
-		<li class='jc'>{@link org.apache.juneau.http.exception.UnprocessableEntity}
-		<li class='jc'>{@link org.apache.juneau.http.exception.UnsupportedMediaType}
-		<li class='jc'>{@link org.apache.juneau.http.exception.UpgradeRequired}
-		<li class='jc'>{@link org.apache.juneau.http.exception.UriTooLong}
-		<li class='jc'>{@link org.apache.juneau.http.exception.VariantAlsoNegotiates}
+		<li class='jc'>{@del org.apache.juneau.http.exception.BadRequest}
+		<li class='jc'>{@del org.apache.juneau.http.exception.Conflict}
+		<li class='jc'>{@del org.apache.juneau.http.exception.ExpectationFailed}
+		<li class='jc'>{@del org.apache.juneau.http.exception.FailedDependency}
+		<li class='jc'>{@del org.apache.juneau.http.exception.Forbidden}
+		<li class='jc'>{@del org.apache.juneau.http.exception.Gone}
+		<li class='jc'>{@del org.apache.juneau.http.exception.HttpVersionNotSupported}
+		<li class='jc'>{@del org.apache.juneau.http.exception.InsufficientStorage}
+		<li class='jc'>{@del org.apache.juneau.http.exception.InternalServerError}
+		<li class='jc'>{@del org.apache.juneau.http.exception.LengthRequired}
+		<li class='jc'>{@del org.apache.juneau.http.exception.Locked}
+		<li class='jc'>{@del org.apache.juneau.http.exception.LoopDetected}
+		<li class='jc'>{@del org.apache.juneau.http.exception.MethodNotAllowed}
+		<li class='jc'>{@del org.apache.juneau.http.exception.MisdirectedRequest}
+		<li class='jc'>{@del org.apache.juneau.http.exception.NetworkAuthenticationRequired}
+		<li class='jc'>{@del org.apache.juneau.http.exception.NotAcceptable}
+		<li class='jc'>{@del org.apache.juneau.http.exception.NotExtended}
+		<li class='jc'>{@del org.apache.juneau.http.exception.NotFound}
+		<li class='jc'>{@del org.apache.juneau.http.exception.NotImplemented}
+		<li class='jc'>{@del org.apache.juneau.http.exception.PayloadTooLarge}
+		<li class='jc'>{@del org.apache.juneau.http.exception.PreconditionFailed}
+		<li class='jc'>{@del org.apache.juneau.http.exception.PreconditionRequired}
+		<li class='jc'>{@del org.apache.juneau.http.exception.RangeNotSatisfiable}
+		<li class='jc'>{@del org.apache.juneau.http.exception.RequestHeaderFieldsTooLarge}
+		<li class='jc'>{@del org.apache.juneau.http.exception.ServiceUnavailable}
+		<li class='jc'>{@del org.apache.juneau.http.exception.TooManyRequests}
+		<li class='jc'>{@del org.apache.juneau.http.exception.Unauthorized}
+		<li class='jc'>{@del org.apache.juneau.http.exception.UnavailableForLegalReasons}
+		<li class='jc'>{@del org.apache.juneau.http.exception.UnprocessableEntity}
+		<li class='jc'>{@del org.apache.juneau.http.exception.UnsupportedMediaType}
+		<li class='jc'>{@del org.apache.juneau.http.exception.UpgradeRequired}
+		<li class='jc'>{@del org.apache.juneau.http.exception.UriTooLong}
+		<li class='jc'>{@del org.apache.juneau.http.exception.VariantAlsoNegotiates}
 	</ul>
 </ul>
 <p>
@@ -15776,11 +15760,11 @@
 	Remote Interface proxies are instantiated on the client side using one of the following methods:
 </p>
 <ul class='javatree'>
-	<li class='jc'>{@link org.apache.juneau.rest.client2.RestClient}
+	<li class='jc'>{@del org.apache.juneau.rest.client2.RestClient}
 	<ul>
-		<li class='jm'>{@link org.apache.juneau.rest.client2.RestClient#getRrpcInterface(Class) getRrpcInterface(Class)}
-		<li class='jm'>{@link org.apache.juneau.rest.client2.RestClient#getRrpcInterface(Class,Object) getRrpcInterface(Class,Object)}
-		<li class='jm'>{@link org.apache.juneau.rest.client2.RestClient#getRrpcInterface(Class,Object,Serializer,Parser) getRrpcInterface(Class,Object,Serializer,Parser)}
+		<li class='jm'>{@del org.apache.juneau.rest.client2.RestClient#getRrpcInterface(Class) getRrpcInterface(Class)}
+		<li class='jm'>{@del org.apache.juneau.rest.client2.RestClient#getRrpcInterface(Class,Object) getRrpcInterface(Class,Object)}
+		<li class='jm'>{@del org.apache.juneau.rest.client2.RestClient#getRrpcInterface(Class,Object,Serializer,Parser) getRrpcInterface(Class,Object,Serializer,Parser)}
 	</ul>
 </ul>
 <p>
@@ -17444,7 +17428,7 @@
 	}
 </p>
 <p>
-	Custom exceptions can also extend from one of the predefined HTTP exceptions such as the {@link org.apache.juneau.http.exception.Unauthorized} exception:
+	Custom exceptions can also extend from one of the predefined HTTP exceptions such as the {@del org.apache.juneau.http.exception.Unauthorized} exception:
 </p>
 <p class='bpcode w800'>
 	<jc>// Our annotated exception.</jc>
@@ -17960,7 +17944,7 @@
 </p>
 <div class='warn'>
 	If you're using form input beans, DO NOT use the <l>@FormData</l> attribute or 
-	{@link org.apache.juneau.rest.RestRequest#getParameter(String)} method since this will cause the 
+	{@del RestRequest#getParameter(String)} method since this will cause the 
 	underlying JEE servlet to parse the HTTP body as a form post.
 	<br>Your input bean will end up being null since there won't be any content left after the servlet 
 	has parsed the body of the request.
@@ -18187,7 +18171,7 @@
 	These properties can be defined for serializers and parsers registered on a REST resource via the following:
 </p>
 <ul class='javatree'>
-	<li class='ja'>{@link org.apache.juneau.rest.annotation.Rest#properties() Rest(properties)} 
+	<li class='ja'>{@del Rest#properties()} 
 	<li class='jc'>{@link org.apache.juneau.rest.RestContextBuilder} - Various methods on the context builder.
 </ul>
 <h5 class='figure'>Example:</h5>
@@ -18232,8 +18216,8 @@
 	Properties can also be overridden at the Java method level:
 </p>
 <ul class='javatree'>
-	<li class='ja'>{@link org.apache.juneau.rest.annotation.RestOp#properties() RestOp(properties)} 
-	<li class='jc'>{@link org.apache.juneau.rest.RequestProperties} 
+	<li class='ja'>{@del RestOp#properties()}
+	<li class='jc'>{@del org.apache.juneau.rest.RequestProperties} 
 </ul>
 <p class='bpcode w800'>
 	<jc>// GET method with method-level properties</jc>
@@ -18254,9 +18238,9 @@
 	}
 </p>
 <ul class='seealso'>
-	<li class='ja'>{@link org.apache.juneau.rest.annotation.Rest#flags() Rest(flags)} - Shorthand for boolean properties.
-	<li class='ja'>{@link org.apache.juneau.rest.annotation.RestOp#flags() RestOp(flags)} - Shorthand for boolean properties.
-	<li class='jc'>{@link org.apache.juneau.rest.RestContextProperties} 
+	<li class='ja'>{@del Rest#flags()} - Shorthand for boolean properties.
+	<li class='ja'>{@del RestOp#flags()} - Shorthand for boolean properties.
+	<li class='jc'>{@del org.apache.juneau.rest.RestContextProperties} 
 </ul>
 </div><!-- END: 6.15 - juneau-rest-server.RestConfigurableProperties -->
 
@@ -18335,9 +18319,9 @@
 	Transforms are associated serializers and parsers registered on a REST resource via the following:
 </p>
 <ul class='javatree'>
-	<li class='ja'>{@link org.apache.juneau.annotation.BeanConfig#beanFilters() BeanConfig(beanFilters)} - On class or methods. 
+	<li class='ja'>{@del BeanConfig#beanFilters() BeanConfig(beanFilters)} - On class or methods. 
 	<li class='ja'>{@link org.apache.juneau.annotation.BeanConfig#swaps() BeanConfig(swaps)} - On class or methods. 
-	<li class='jm'>{@link org.apache.juneau.rest.RestContextBuilder#beanFilters(Object...)} 
+	<li class='jm'>{@del RestContextBuilder#beanFilters(Object...)} 
 	<li class='jm'>{@link org.apache.juneau.rest.RestContextBuilder#swaps(Object...)} 
 </ul>
 <p class='bpcode w800'>
@@ -18917,7 +18901,7 @@ Resource bundles are searched using the following base name patterns:
 <ul class='javatree'>
 	<li class='jm'>{@link org.apache.juneau.rest.RestContext#getVarResolver()}
 	<li class='jm'>{@link org.apache.juneau.rest.RestRequest#getVarResolverSession()}
-	<li class='jm'>{@link org.apache.juneau.rest.RestRequest#getClasspathHttpResource(String,boolean)}
+	<li class='jm'>{@del RestRequest#getClasspathHttpResource(String,boolean)}
 </ul>
 <p>
 	There are two distinct groups of variables:
@@ -18927,7 +18911,7 @@ Resource bundles are searched using the following base name patterns:
 		<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 {@link 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 org.apache.juneau.rest.annotation.HtmlDoc @HtmlDoc}. 
 		<br>{@link org.apache.juneau.rest.RestRequest#getVarResolverSession()} method returns initialization and request-time variables.
 </ul>
 <p>
@@ -19117,7 +19101,7 @@ Resource bundles are searched using the following base name patterns:
 		<td class='code'>$U{servlet:/foo?bar=$UE{$RA{bar}}</td>
 	</tr>
 	<tr class='dark dd'>
-		<td>{@link org.apache.juneau.rest.vars.WidgetVar}</td>
+		<td>{@del org.apache.juneau.rest.vars.WidgetVar}</td>
 		<td class='code'>$W{name}</td>
 		<td style='text-align:center;font-weight:bold'>no</td>
 		<td style='text-align:center;font-weight:bold'>yes</td>
@@ -19339,7 +19323,7 @@ Resource bundles are searched using the following base name patterns:
 		<br>Child resources can override mappings made on parent resources.
 	<li>
 		The media type on the response is determined by the 
-		{@link org.apache.juneau.rest.RestContext#getMediaTypeForName(String)} method.
+		{@del RestContext#getMediaTypeForName(String)} method.
 </ul>
 
 <ul class='seealso'>
@@ -19399,7 +19383,7 @@ Resource bundles are searched using the following base name patterns:
 <h3 class='topic' onclick='toggle(this)'><a href='#juneau-rest-server.RestInfoProvider' id='juneau-rest-server.RestInfoProvider'>6.28 - RestInfoProvider</a><span class='update'><b><red>todo</red></b></span></h3>
 <div class='topic'><!-- START: 6.28 - juneau-rest-server.RestInfoProvider -->
 <p>
-	The {@link org.apache.juneau.rest.RestInfoProvider} class is used to find the title
+	The {@del org.apache.juneau.rest.RestInfoProvider} class is used to find the title
 	and description for your resource and also generate the Swagger documentation.
 	It can be overridden to provide your own custom Swagger documentation.
 </p>
@@ -19407,14 +19391,14 @@ Resource bundles are searched using the following base name patterns:
 	The methods on this interface are:
 </p>
 <ul class='javatree'>
-	<li class='jic'>{@link org.apache.juneau.rest.RestInfoProvider}
+	<li class='jic'>{@del RestInfoProvider}
 	<ul>
-		<li class='jm'>{@link org.apache.juneau.rest.RestInfoProvider#getSwagger(RestRequest) getSwagger(RestRequest)}
-		<li class='jm'>{@link org.apache.juneau.rest.RestInfoProvider#getSiteName(RestRequest) getSiteName(RestRequest)}
-		<li class='jm'>{@link org.apache.juneau.rest.RestInfoProvider#getTitle(RestRequest) getTitle(RestRequest)}
-		<li class='jm'>{@link org.apache.juneau.rest.RestInfoProvider#getDescription(RestRequest) getDescription(RestRequest)}
-		<li class='jm'>{@link org.apache.juneau.rest.RestInfoProvider#getMethodSummary(Method,RestRequest) getMethodSummary(Method,RestRequest)}
-		<li class='jm'>{@link org.apache.juneau.rest.RestInfoProvider#getMethodDescription(Method,RestRequest) getMethodDescription(Method,RestRequest)}
+		<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)}
 	</ul>
 </ul>
 <p>
@@ -19424,18 +19408,18 @@ Resource bundles are searched using the following base name patterns:
 	<li class='jc'>{@link org.apache.juneau.rest.RestRequest}
 	<ul>
 		<li class='jm'>{@link org.apache.juneau.rest.RestRequest#getSwagger() getSwagger()}
-		<li class='jm'>{@link org.apache.juneau.rest.RestRequest#getSiteName() getSiteName()}
-		<li class='jm'>{@link org.apache.juneau.rest.RestRequest#getResourceTitle() getResourceTitle()}
-		<li class='jm'>{@link org.apache.juneau.rest.RestRequest#getResourceDescription() getResourceDescription()}
-		<li class='jm'>{@link org.apache.juneau.rest.RestRequest#getMethodSummary() getMethodSummary()}
-		<li class='jm'>{@link org.apache.juneau.rest.RestRequest#getMethodDescription() getMethodDescription()}
+		<li class='jm'>{@del getSiteName()}
+		<li class='jm'>{@del getResourceTitle()}
+		<li class='jm'>{@del getResourceDescription()}
+		<li class='jm'>{@del getMethodSummary()}
+		<li class='jm'>{@del getMethodDescription()}
 	</ul>
 </ul>
 <p>
 	Info providers are registered through the following property:
 </p>
 <ul class='javatree'>
-	<li class='jf'>{@link org.apache.juneau.rest.RestContext#REST_infoProvider}
+	<li class='jf'>{@del RestContext#REST_infoProvider}
 </ul>
 <p>
 	While you can implement this interface from scratch, you may want to instead consider extending
@@ -19447,8 +19431,8 @@ Resource bundles are searched using the following base name patterns:
 <h4 class='topic' onclick='toggle(this)'><a href='#juneau-rest-server.RestInfoProvider.BasicRestInfoProvider' id='juneau-rest-server.RestInfoProvider.BasicRestInfoProvider'>6.28.1 - BasicRestInfoProvider</a><span class='update'><b><red>todo</red></b></span></h4>
 <div class='topic'><!-- START: 6.28.1 - juneau-rest-server.RestInfoProvider.BasicRestInfoProvider -->
 <p>
-	The {@link org.apache.juneau.rest.BasicRestInfoProvider} class is the default implementation of the
-	{@link org.apache.juneau.rest.RestInfoProvider} interface.
+	The {@del org.apache.juneau.rest.BasicRestInfoProvider} class is the default implementation of the
+	{@del org.apache.juneau.rest.RestInfoProvider} interface.
 </p>
 <p>
 	It finds and collects information gathered from the following locations:
@@ -19493,7 +19477,7 @@ Resource bundles are searched using the following base name patterns:
 </p>
 <p>
 	The underlying mechanics are simple.  
-	The {@link org.apache.juneau.rest.BasicRestServlet#getOptions(RestRequest)} method returns a {@link org.apache.juneau.dto.swagger.Swagger} bean
+	The {@link org.apache.juneau.rest.BasicRestServlet#getSwagger(RestRequest)} method returns a {@link org.apache.juneau.dto.swagger.Swagger} bean
 	consisting of information gathered from annotations and other sources.
 	Then that bean is swapped for a {@link org.apache.juneau.dto.swagger.ui.SwaggerUI} bean when rendered as HTML.
 </p>
@@ -20210,7 +20194,7 @@ Resource bundles are searched using the following base name patterns:
 	}
 </p>
 <p>
-	Examples can also be specified via generic properties as well using the {@link org.apache.juneau.BeanContext#BEAN_examples} property or {@link org.apache.juneau.annotation.BeanConfig#examples() @BeanConfig(examples)} annotation at either the class or method level.
+	Examples can also be specified via generic properties as well using the {@link org.apache.juneau.BeanContextBuilder#example(Class,Object)} setting or {@del org.apache.juneau.annotation.BeanConfig#examples() @BeanConfig(examples)} annotation at either the class or method level.
 </p>
 <h5 class='figure'>Example:</h5>
 <p class='bpcode w800'>
@@ -20222,9 +20206,9 @@ Resource bundles are searched using the following base name patterns:
 </p>
 <ul class='seealso'>
 	<li class='ja'>{@link org.apache.juneau.annotation.Example}
-	<li class='jc'>{@link org.apache.juneau.BeanContext}
+	<li class='jc'>{@link org.apache.juneau.BeanContextBuilder}
 	<ul>
-		<li class='jf'>{@link org.apache.juneau.BeanContext#BEAN_examples BEAN_examples}
+		<li class='jf'>{@link org.apache.juneau.BeanContextBuilder#example(Class,Object) example(Class,Object)}
 	</ul>
 	<li class='jc'>{@link org.apache.juneau.jsonschema.JsonSchemaGenerator}
 	<ul>
@@ -20414,14 +20398,15 @@ Resource bundles are searched using the following base name patterns:
 	}
 </p>
 <p>
-	Examples can also be specified via generic properties as well using the {@link org.apache.juneau.BeanContext#BEAN_examples} property 
-	or {@link org.apache.juneau.annotation.BeanConfig#examples @BeanConfig(examples)} annotation at either the class or method level.
+	Examples can also be specified via generic properties as well using the {@del org.apache.juneau.BeanContextBuilder#example(String,Object)} setting 
+	or {@link org.apache.juneau.annotation.Bean#example @Bean(example)} annotation at either the class or method level.
 </p>
 <p class='bpcode w800'>
 	<jc>// Examples defined at class level.</jc>
 	<ja>@Rest</ja>(...)
-	<ja>@BeanConfig</ja>(
-		examples=<js>"{PetCreate: {name:'Doggie',price:9.99,species:'Dog',tags:['friendly','cute']}}"</js>
+	<ja>@Bean</ja>(
+		onClass=PetCreate.<jk>class</jk>,
+		example=<js>"{name:'Doggie',price:9.99,species:'Dog',tags:['friendly','cute']}"</js>
 	)
 </p>
 <p>
@@ -20710,7 +20695,7 @@ Resource bundles are searched using the following base name patterns:
 </p>
 <p>
 	The outline above is controlled by the {@link org.apache.juneau.html.HtmlDocTemplate} interface
-	which can be overridden via the {@link org.apache.juneau.rest.annotation.HtmlDoc#template @HtmlDoc(template)} annotation.
+	which can be overridden via the {@del org.apache.juneau.rest.annotation.HtmlDoc#template @HtmlDoc(template)} annotation.
 </p>
 <p>
 	The <l>HelloWorldResource</l> class was an example of the <l>@HtmlDoc</l> annotation in use:
@@ -20819,10 +20804,10 @@ Resource bundles are searched using the following base name patterns:
 	<br>They are registered in the following locations:
 </p>
 <ul class='javatree'>
-	<li class='ja'>{@link org.apache.juneau.rest.annotation.HtmlDoc#widgets() HtmlDoc(widgets)}
-	<li class='jm'>{@link org.apache.juneau.rest.RestContextBuilder#widgets(Class...)}
-	<li class='jm'>{@link org.apache.juneau.rest.RestContextBuilder#widgets(Widget...)}
-	<li class='jf'>{@link org.apache.juneau.rest.RestContext#REST_widgets}
+	<li class='ja'>{@del org.apache.juneau.rest.annotation.HtmlDoc#widgets() HtmlDoc(widgets)}
+	<li class='jm'>{@del RestContextBuilder#widgets(Class...)}
+	<li class='jm'>{@del RestContextBuilder#widgets(Widget...)}
+	<li class='jf'>{@del RestContext#REST_widgets}
 </ul>
 <h5 class='figure'>Example:</h5>
 <p class='bpcode w800'>
@@ -20901,8 +20886,8 @@ Resource bundles are searched using the following base name patterns:
 <ul class='javatree'>
 	<li class='jac'>{@link org.apache.juneau.rest.widget.Widget}
 	<ul>
-		<li class='jm'>{@link org.apache.juneau.rest.widget.Widget#getClasspathResourceAsString(String) getClasspathResourceAsString(String)}
-		<li class='jm'>{@link org.apache.juneau.rest.widget.Widget#getClasspathResourceAsString(String,Locale) getClasspathResourceAsString(String,Locale)}
+		<li class='jm'>{@del getClasspathResourceAsString(String)}
+		<li class='jm'>{@del getClasspathResourceAsString(String,Locale)}
 	</ul>
 </ul>
 <h5 class='figure'>Example:</h5>
@@ -20923,7 +20908,7 @@ Resource bundles are searched using the following base name patterns:
 	}
 </p>
 <ul class='seealso'>
-	<li class='jf'>{@link org.apache.juneau.rest.RestContext#REST_widgets}
+	<li class='jf'>{@del org.apache.juneau.rest.RestContext#REST_widgets}
 </ul>
 </div><!-- END: 6.31.2 - juneau-rest-server.RestHtmlDocAnnotation.RestHtmlWidgets -->
 
@@ -21031,7 +21016,7 @@ Resource bundles are searched using the following base name patterns:
 </p>
 <p>
 	This widget is designed to be used in conjunction with the {@link org.apache.juneau.rest.converters.Queryable} converter, although implementations
-	can process the query parameters themselves if they wish to do so by using the {@link org.apache.juneau.rest.RequestQuery#getSearchArgs()}
+	can process the query parameters themselves if they wish to do so by using the {@del RequestQuery#getSearchArgs()}
 	method to retrieve the arguments and process the data themselves.
 </p>
 <p>
@@ -21441,10 +21426,10 @@ Resource bundles are searched using the following base name patterns:
 </p>
 <ul class='javatree'>
 	<li class='ja'>
-		{@link org.apache.juneau.rest.annotation.Rest#reqHeaders() Rest(reqHeaders)} 
+		{@del Rest#reqHeaders()} 
 		<br>Defines default headers on request when the client doesn't specify them.
 	<li class='ja'>
-		{@link org.apache.juneau.rest.annotation.Rest#resHeaders() Rest(resHeaders)}
+		{@del Rest#resHeaders()}
 		<br>Appends the specified headers if they weren't already set programmatically.	
 </ul>		
 
@@ -21471,9 +21456,9 @@ Resource bundles are searched using the following base name patterns:
 		{@link org.apache.juneau.rest.RestContextBuilder}
 		<ul>
 			<li class='jm'>
-				{@link org.apache.juneau.rest.RestContextBuilder#reqHeaders(String[])}
+				{@link org.apache.juneau.rest.RestContextBuilder#defaultRequestHeaders(Header...)}
 			<li class='jm'>
-				{@link org.apache.juneau.rest.RestContextBuilder#resHeaders(String[])}
+				{@link org.apache.juneau.rest.RestContextBuilder#defaultResponseHeaders(Header...)}
 		</ul>
 	</li>
 </ul>
@@ -21493,53 +21478,53 @@ Resource bundles are searched using the following base name patterns:
 	<li class='ja'>
 		{@link org.apache.juneau.rest.annotation.Rest}
 		<ul>
-			<li class='jm'>{@link org.apache.juneau.rest.annotation.Rest#logging() logging()} - Class-level logging configuration and rules.
+			<li class='jm'>{@del logging()} - Class-level logging configuration and rules.
 			<li class='jm'>{@link org.apache.juneau.rest.annotation.Rest#debug() debug()} - Enable debug mode.
 		</ul>
 	</li>
 	<li class='ja'>
 		{@link org.apache.juneau.rest.annotation.RestOp}
 		<ul>
-			<li class='jm'>{@link org.apache.juneau.rest.annotation.RestOp#logging() logging()} - Class-level logging configuration.
+			<li class='jm'>{@del logging()} - Class-level logging configuration.
 			<li class='jm'>{@link org.apache.juneau.rest.annotation.RestOp#debug() debug()} - Enable debug mode.
 		</ul>
 	</li>
 	<li class='jc'>
 		{@link org.apache.juneau.rest.RestContext}
 		<ul>
-			<li class='jf'>{@link org.apache.juneau.rest.RestContext#REST_callLoggerConfig REST_callLoggerConfig} - Underlying configuration property for {@link org.apache.juneau.rest.annotation.Rest#logging() @Rest(logging)}.
+			<li class='jf'>{@del RestContext#REST_callLoggerConfig} - Underlying configuration property for {@del @Rest(logging)}.
 			<li class='jf'>{@link org.apache.juneau.rest.RestContext#REST_debug REST_debug} - Underlying configuration property for {@link org.apache.juneau.rest.annotation.Rest#debug() @Rest(debug)}.
 		</ul>
 	</li>
 	<li class='ja'>
-		{@link org.apache.juneau.rest.annotation.Logging} - Annotation for {@link org.apache.juneau.rest.annotation.Rest#logging() @Rest(logging)} and {@link org.apache.juneau.rest.annotation.RestOp#logging() @RestOp(logging)}
+		{@del org.apache.juneau.rest.annotation.Logging} - Annotation for {@del @Rest(logging)} and {@del @RestOp(logging)}
 		<ul>
-			<li class='jm'>{@link org.apache.juneau.rest.annotation.Logging#level() level()} - The logging level.
-			<li class='jm'>{@link org.apache.juneau.rest.annotation.Logging#rules() rules()} - The logging rules.
-			<li class='jm'>{@link org.apache.juneau.rest.annotation.Logging#useStackTraceHashing() useStackTraceHashing()} - Enables de-duplication of logged stack traces and replacement with hash IDs. 
-			<li class='jm'>{@link org.apache.juneau.rest.annotation.Logging#stackTraceHashingTimeout() stackTraceHashingTimeout()} - Controls how frequently hashed stack traces are re-logged.
-			<li class='jm'>{@link org.apache.juneau.rest.annotation.Logging#disabled() disabled()} - Disables logging completely or per-request.
+			<li class='jm'>{@del org.apache.juneau.rest.annotation.Logging#level() level()} - The logging level.
+			<li class='jm'>{@del org.apache.juneau.rest.annotation.Logging#rules() rules()} - The logging rules.
+			<li class='jm'>{@del org.apache.juneau.rest.annotation.Logging#useStackTraceHashing() useStackTraceHashing()} - Enables de-duplication of logged stack traces and replacement with hash IDs. 
+			<li class='jm'>{@del org.apache.juneau.rest.annotation.Logging#stackTraceHashingTimeout() stackTraceHashingTimeout()} - Controls how frequently hashed stack traces are re-logged.
+			<li class='jm'>{@del org.apache.juneau.rest.annotation.Logging#disabled() disabled()} - Disables logging completely or per-request.
 		</ul>
 	</li>
 	<li class='ja'>
-		{@link org.apache.juneau.rest.annotation.LoggingRule} - Annotation for {@link org.apache.juneau.rest.annotation.Logging#rules() @Logging(rules)}
+		{@del org.apache.juneau.rest.annotation.LoggingRule} - Annotation for {@del org.apache.juneau.rest.annotation.Logging#rules() @Logging(rules)}
 		<ul>
-			<li class='jm'>{@link org.apache.juneau.rest.annotation.LoggingRule#level() level()} - The logging level.
-			<li class='jm'>{@link org.apache.juneau.rest.annotation.LoggingRule#codes() codes()} - Status code patterns and ranges to match against.
-			<li class='jm'>{@link org.apache.juneau.rest.annotation.LoggingRule#exceptions() exceptions()} - Exception class names and patterns to match against.
-			<li class='jm'>{@link org.apache.juneau.rest.annotation.LoggingRule#debugOnly() debugOnly()} - Match only if debug is set on the request.
-			<li class='jm'>{@link org.apache.juneau.rest.annotation.LoggingRule#req() req()} - The level of request detail.
-			<li class='jm'>{@link org.apache.juneau.rest.annotation.LoggingRule#res() res()} - The level of response detail.
-			<li class='jm'>{@link org.apache.juneau.rest.annotation.LoggingRule#verbose() verbose()} - Shortcut for <jsf>LONG</jsf> request and response detail.
-			<li class='jm'>{@link org.apache.juneau.rest.annotation.LoggingRule#disabled() disabled()} - Disables logging completely or per-request.
+			<li class='jm'>{@del org.apache.juneau.rest.annotation.LoggingRule#level() level()} - The logging level.
+			<li class='jm'>{@del org.apache.juneau.rest.annotation.LoggingRule#codes() codes()} - Status code patterns and ranges to match against.
+			<li class='jm'>{@del org.apache.juneau.rest.annotation.LoggingRule#exceptions() exceptions()} - Exception class names and patterns to match against.
+			<li class='jm'>{@del org.apache.juneau.rest.annotation.LoggingRule#debugOnly() debugOnly()} - Match only if debug is set on the request.
+			<li class='jm'>{@del org.apache.juneau.rest.annotation.LoggingRule#req() req()} - The level of request detail.
+			<li class='jm'>{@del org.apache.juneau.rest.annotation.LoggingRule#res() res()} - The level of response detail.
+			<li class='jm'>{@del org.apache.juneau.rest.annotation.LoggingRule#verbose() verbose()} - Shortcut for <jsf>LONG</jsf> request and response detail.
+			<li class='jm'>{@del org.apache.juneau.rest.annotation.LoggingRule#disabled() disabled()} - Disables logging completely or per-request.
 		</ul>
 	</li>
 </ul>
 
 <h5 class='topic'>Request/response details</h5>
 <p>
-	The amount of detail on requests and responses is controlled via the {@link org.apache.juneau.rest.annotation.LoggingRule#req() @LoggingRule(req)} 
-	and {@link org.apache.juneau.rest.annotation.LoggingRule#res() @LoggingRule(res)} annotations:
+	The amount of detail on requests and responses is controlled via the {@del org.apache.juneau.rest.annotation.LoggingRule#req() @LoggingRule(req)} 
+	and {@del org.apache.juneau.rest.annotation.LoggingRule#res() @LoggingRule(res)} annotations:
 </p>
 <ul>
 	<li><js>"short"</js> - Results in simple one-line log lines containing the HTTP method + url + response code.
@@ -21718,7 +21703,7 @@ Resource bundles are searched using the following base name patterns:
 
 <h5 class='topic'>No-trace (disabled) mode</h5>
 <p>
-	The {@link org.apache.juneau.rest.annotation.Logging#disabled() @Logging(disabled)} and {@link org.apache.juneau.rest.annotation.LoggingRule#disabled() @LoggingRule(disabled)} annotations
+	The {@del org.apache.juneau.rest.annotation.Logging#disabled() @Logging(disabled)} and {@del org.apache.juneau.rest.annotation.LoggingRule#disabled() @LoggingRule(disabled)} annotations
 	can be used to disable logging entirely or on a per-request basis:
 </p>
 <p class='bpcode'>
@@ -21753,7 +21738,7 @@ Resource bundles are searched using the following base name patterns:
 
 <h5 class='topic'>Stacktrace hashing</h5>
 <p>
-	The {@link org.apache.juneau.rest.annotation.Logging#useStackTraceHashing() @Logging(useStackTraceHashing)} setting can be used to eliminate duplicate stacktraces
+	The {@del org.apache.juneau.rest.annotation.Logging#useStackTraceHashing() @Logging(useStackTraceHashing)} setting can be used to eliminate duplicate stacktraces
 	in your log file by logging them once and then logging identifying hash IDs.
 </p>
 <p>
@@ -21810,7 +21795,7 @@ Resource bundles are searched using the following base name patterns:
 	WARNING: [500,9b85cc96.2] HTTP POST /foo
 </p>
 <p>
-	The {@link org.apache.juneau.rest.annotation.Logging#stackTraceHashingTimeout() @Logging(stackTraceHashingTimeout)} setting can be used to periodically log the stacktrace
+	The {@del org.apache.juneau.rest.annotation.Logging#stackTraceHashingTimeout() @Logging(stackTraceHashingTimeout)} setting can be used to periodically log the stacktrace
 	to the log file again.
 </p>
 </div><!-- END: 6.33 - juneau-rest-server.RestLoggingAndDebugging -->
@@ -21824,7 +21809,7 @@ Resource bundles are searched using the following base name patterns:
 	successfully.
 </p>
 <p>
-	Other status codes can be generated by throwing a {@link org.apache.juneau.rest.RestException} with a 
+	Other status codes can be generated by throwing a {@del org.apache.juneau.rest.RestException} with a 
 	specific HTTP status code, or calling {@link javax.servlet.http.HttpServletResponse#setStatus(int)}.
 </p>
 <p>
@@ -21878,7 +21863,7 @@ Resource bundles are searched using the following base name patterns:
 	<tr>
 		<td><l>500</l></td>
 		<td>Internal Server Error</td>
-		<td>The Java method threw an exception other than {@link org.apache.juneau.rest.RestException}</td>
+		<td>The Java method threw an exception other than {@del org.apache.juneau.rest.RestException}</td>
 	</tr>
 </table>
 </div><!-- END: 6.34 - juneau-rest-server.RestHttpStatusCodes -->
@@ -22172,7 +22157,7 @@ Resource bundles are searched using the following base name patterns:
 	The Juneau REST server API is compatible with dependency injection frameworks such as Spring.
 </p>
 <p>
-	The important class is the {@link org.apache.juneau.rest.RestResourceResolver} class which is used
+	The important class is the {@del org.apache.juneau.rest.RestResourceResolver} class which is used
 	to resolve child servlet/resource implementation classes inside parent contexts.
 	In other words, it's used for resolving {@link org.apache.juneau.rest.annotation.Rest#children() @Rest(children)} instances.
 </p>
@@ -22434,11 +22419,11 @@ Resource bundles are searched using the following base name patterns:
 </p>
 <ul class='javatree'>
 	<li class='ja'>{@link org.apache.juneau.rest.springboot.annotation.JuneauRestRoot}
-	<li class='jc'>{@link org.apache.juneau.rest.springboot.JuneauRestInitializer}
-	<li class='jc'>{@link org.apache.juneau.rest.springboot.SpringRestResourceResolver}
+	<li class='jc'>{@del org.apache.juneau.rest.springboot.JuneauRestInitializer}
+	<li class='jc'>{@del org.apache.juneau.rest.springboot.SpringRestResourceResolver}
 </ul>
 <p>
-	A typical Spring Boot application can use the {@link org.apache.juneau.rest.springboot.JuneauRestInitializer} to find
+	A typical Spring Boot application can use the {@del org.apache.juneau.rest.springboot.JuneauRestInitializer} to find
 	and register Juneau REST servlets via the {@link org.apache.juneau.rest.springboot.annotation.JuneauRestRoot} annotation.
 </p>
 <h5 class='figure'>Example:</h5>
@@ -22481,7 +22466,7 @@ Resource bundles are searched using the following base name patterns:
 	}
 </p>
 <p>
-	The root servlets are given an instance of {@link org.apache.juneau.rest.springboot.SpringRestResourceResolver} which allows
+	The root servlets are given an instance of {@del org.apache.juneau.rest.springboot.SpringRestResourceResolver} which allows
 	for child resources to be defined as injectable Spring beans.  
 </p>
 <p>
@@ -22495,7 +22480,7 @@ Resource bundles are searched using the following base name patterns:
 <h3 class='topic' onclick='toggle(this)'><a href='#juneau-rest-server-springboot.SpringBootChildResources' id='juneau-rest-server-springboot.SpringBootChildResources'>8.2 - Child Resources</a><span class='update'>created: 8.1.0, <b><red>todo</red></b></span></h3>
 <div class='topic'><!-- START: 8.2 - juneau-rest-server-springboot.SpringBootChildResources -->
 <p>
-	When using the <ja>@JuneauRestRoot</ja> annotation, servlet are given an instance of {@link org.apache.juneau.rest.springboot.SpringRestResourceResolver}.  
+	When using the <ja>@JuneauRestRoot</ja> annotation, servlet are given an instance of {@del org.apache.juneau.rest.springboot.SpringRestResourceResolver}.  
 	The resource resolver gets passed down through the children hierarchy, allowing child resources to be defined as injectable Spring beans.
 </p>
 <h5 class='figure'>Example:</h5>
... 6427 lines suppressed ...