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

[juneau] branch master updated: Upgrade to Java 11.

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 a82600ae2 Upgrade to Java 11.
a82600ae2 is described below

commit a82600ae2a68848df90ef0ec16c3e571c6819243
Author: JamesBognar <ja...@salesforce.com>
AuthorDate: Fri Oct 21 12:00:45 2022 -0400

    Upgrade to Java 11.
---
 .../dto/html5/{package.html => package2.html}      |    0
 .../dto/jsonschema/{package.html => package2.html} |    0
 juneau-doc/docs/ReleaseNotes/5.0.0.00.html         |    4 +-
 juneau-doc/docs/ReleaseNotes/5.0.0.07.html         |    4 +-
 juneau-doc/docs/ReleaseNotes/5.0.0.09.html         |    2 +-
 juneau-doc/docs/ReleaseNotes/5.0.0.10.html         |    2 +-
 juneau-doc/docs/ReleaseNotes/5.0.0.14.html         |    4 +-
 juneau-doc/docs/ReleaseNotes/5.0.0.18.html         |    2 +-
 juneau-doc/docs/ReleaseNotes/5.0.0.19.html         |    6 +-
 juneau-doc/docs/ReleaseNotes/5.0.0.20.html         |    4 +-
 juneau-doc/docs/ReleaseNotes/5.0.0.24.html         |    2 +-
 juneau-doc/docs/ReleaseNotes/5.0.0.27.html         |    2 +-
 juneau-doc/docs/ReleaseNotes/5.0.0.34.html         |   32 +-
 juneau-doc/docs/ReleaseNotes/5.0.0.36.html         |    4 +-
 juneau-doc/docs/ReleaseNotes/5.1.0.00.html         |    4 +-
 juneau-doc/docs/ReleaseNotes/5.1.0.03.html         |    2 +-
 juneau-doc/docs/ReleaseNotes/5.1.0.04.html         |    2 +-
 juneau-doc/docs/ReleaseNotes/5.1.0.05.html         |    4 +-
 juneau-doc/docs/ReleaseNotes/5.1.0.10.html         |   12 +-
 juneau-doc/docs/ReleaseNotes/5.1.0.11.html         |    6 +-
 juneau-doc/docs/ReleaseNotes/5.1.0.13.html         |    2 +-
 juneau-doc/docs/ReleaseNotes/5.1.0.14.html         |    6 +-
 juneau-doc/docs/ReleaseNotes/5.1.0.15.html         |   40 +-
 juneau-doc/docs/ReleaseNotes/5.1.0.16.html         |   12 +-
 juneau-doc/docs/ReleaseNotes/5.1.0.17.html         |   46 +-
 juneau-doc/docs/ReleaseNotes/5.1.0.18.html         |    2 +-
 juneau-doc/docs/ReleaseNotes/5.1.0.19.html         |    2 +-
 juneau-doc/docs/ReleaseNotes/5.1.0.20.html         |   22 +-
 juneau-doc/docs/ReleaseNotes/5.2.0.0.html          |  238 +--
 juneau-doc/docs/ReleaseNotes/5.2.0.1.html          |   14 +-
 juneau-doc/docs/ReleaseNotes/6.0.0.html            |   46 +-
 juneau-doc/docs/ReleaseNotes/6.0.1.html            |    6 +-
 juneau-doc/docs/ReleaseNotes/6.1.0.html            |   54 +-
 juneau-doc/docs/ReleaseNotes/6.2.0.html            |   68 +-
 juneau-doc/docs/ReleaseNotes/6.3.0.html            |   88 +-
 juneau-doc/docs/ReleaseNotes/6.3.1.html            |   28 +-
 juneau-doc/docs/ReleaseNotes/6.4.0.html            |   62 +-
 juneau-doc/docs/ReleaseNotes/7.0.0.html            |    2 +-
 juneau-doc/docs/ReleaseNotes/7.0.1.html            |    8 +-
 juneau-doc/docs/ReleaseNotes/7.1.0.html            |  104 +-
 juneau-doc/docs/ReleaseNotes/7.2.0.html            |  110 +-
 juneau-doc/docs/ReleaseNotes/7.2.1.html            |    2 +-
 juneau-doc/docs/ReleaseNotes/8.0.0.html            |    4 +-
 juneau-doc/docs/ReleaseNotes/8.1.0.html            |   32 +-
 juneau-doc/docs/ReleaseNotes/8.1.1.html            |   16 +-
 juneau-doc/docs/ReleaseNotes/8.1.2.html            |   14 +-
 juneau-doc/docs/ReleaseNotes/8.1.3.html            |   10 +-
 juneau-doc/docs/ReleaseNotes/8.2.0.html            |   82 +-
 .../docs/Topics/01.Overview/01.o.Marshalling.html  |    6 +-
 .../docs/Topics/01.Overview/03.o.RestServer.html   |    2 +-
 .../Topics/01.Overview/07.o.FluentAssertions.html  |    4 +-
 .../02.juneau-marshall/01.jm.Marshallers.html      |   10 -
 .../07.jm.ContextAnnotations.html                  |    1 -
 .../10.jm.SerializerSetsParserSets.html            |    6 +-
 .../Topics/02.juneau-marshall/11.jm.Swaps.html     |    2 +-
 .../11.jm.Swaps/01.jm.DefaultSwaps.html            |    4 +-
 .../11.jm.Swaps/03.jm.PerMediaTypeSwaps.html       |    4 +-
 .../12.jm.DynamicallyAppliedAnnotations.html       |    1 -
 .../01.jm.SvlVariables.html                        |    2 +-
 .../Topics/02.juneau-marshall/22.jm.Encoders.html  |    2 +-
 .../02.juneau-marshall/23.jm.ObjectTools.html      |    4 +-
 .../05.jm.HtmlRenderAnnotation.html                |    2 +-
 .../02.juneau-marshall/32.jm.OpenApiDetails.html   |    1 -
 .../03.juneau-marshall-rdf/01.jmr.RdfDetails.html  |   69 -
 .../01.jmr.RdfDetails/01.jmr.Serializers.html      |  101 -
 .../01.jmr.RdfDetails/02.jmr.Parsers.html          |   90 -
 .../01.jmr.RdfDetails/03.jmr.RdfAnnotation.html    |   33 -
 .../01.jmr.RdfDetails/04.jmr.Namespaces.html       |   97 -
 .../01.jmr.RdfDetails/05.jmr.UriProperties.html    |  120 --
 .../01.jmr.RdfDetails/06.jmr.RootProperty.html     |   84 -
 .../01.jmr.RdfDetails/07.jmr.TypedLiterals.html    |   67 -
 .../10.jc.ConfigStores/03.jc.CustomStores.html     |    6 +-
 .../06.juneau-assertions/01.ja.Overview.html       |    4 +-
 .../01.jrc.HelperClasses.html                      |    4 +-
 .../07.juneau-rest-common/03.jrc.HttpHeaders.html  |    4 +-
 .../07.juneau-rest-common/04.jrc.HttpParts.html    |    2 +-
 .../01.jrs.PredefinedClasses.html                  |    1 -
 .../02.jrs.JavaMethodParameters.html               |    2 +-
 .../06.jrs.Matchers.html                           |    2 +-
 .../08.juneau-rest-server/05.jrs.Marshalling.html  |    2 -
 .../06.jrs.HandlingFormPosts.html                  |    4 +-
 .../08.juneau-rest-server/12.jrs.SvlVariables.html |    4 +-
 .../01.jrs.BasicRestServletSwagger.html            |    2 +-
 .../15.jrs.Swagger/05.jrs.SwaggerParameters.html   |    2 +-
 .../18.jrs.LoggingAndDebugging.html                |   22 +-
 .../19.jrs.HttpStatusCodes.html                    |    2 +-
 .../01.jrss.Overview.html                          |    4 +-
 .../10.juneau-rest-client/02.jrc.RequestParts.html |    2 +-
 .../04.jrc.ResponseStatus.html                     |    4 +-
 .../05.jrc.ResponseHeaders.html                    |    2 +-
 .../10.juneau-rest-client/08.jrc.Interceptors.html |    2 +-
 .../10.jrc.LoggingAndDebugging.html                |    2 +-
 .../11.juneau-rest-mock/01.jrm.MockRestClient.html |    2 +-
 .../08.jmc.ConsoleCommands.html                    |    4 +-
 .../05.jmj.Config.html                             |    8 +-
 .../07.jmj.UiCustomization.html                    |    2 +-
 .../01.mjm.Installing.html                         |    8 +-
 .../14.my-jetty-microservice/02.mjm.Running.html   |    4 +-
 .../14.my-jetty-microservice/03.mjm.Building.html  |    2 +-
 .../02.msm.Running.html                            |    2 +-
 .../02.jp.juneau-petstore-api.html                 |    8 +-
 .../04.jp.juneau-petstore-server.html              |    2 +-
 juneau-doc/docs/overview_template.html             |   29 -
 .../org/apache/juneau/doc/internal/Console.java    |   16 +-
 juneau-doc/src/main/javadoc/overview.html          | 2004 +++++++-------------
 juneau-doc/src/main/javadoc/resources/docs.txt     |    8 -
 .../src/main/javadoc/resources/fragments/toc.html  |   12 -
 juneau-env.sh                                      |    2 +-
 .../org/apache/juneau/examples/rest/TestUtils.java |   67 -
 pom.xml                                            |    4 +-
 110 files changed, 1381 insertions(+), 2812 deletions(-)

diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/package.html b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/package2.html
similarity index 100%
rename from juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/package.html
rename to juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/package2.html
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/package.html b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/package2.html
similarity index 100%
rename from juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/package.html
rename to juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/package2.html
diff --git a/juneau-doc/docs/ReleaseNotes/5.0.0.00.html b/juneau-doc/docs/ReleaseNotes/5.0.0.00.html
index 8a96410e6..62fc06205 100644
--- a/juneau-doc/docs/ReleaseNotes/5.0.0.00.html
+++ b/juneau-doc/docs/ReleaseNotes/5.0.0.00.html
@@ -132,8 +132,8 @@
 		<li>
 			Various default filters provided:
 			<ul>
-				<li>byte[]&lt;-->Base64 encoded strings</li>
-				<li>Date/Calendar&lt;-->ISO8601/RFC822/Long</li>
+				<li>byte[]&lt;--&gt;Base64 encoded strings</li>
+				<li>Date/Calendar&lt;--&gt;ISO8601/RFC822/Long</li>
 			</ul>
 		</li>
 		<li>
diff --git a/juneau-doc/docs/ReleaseNotes/5.0.0.07.html b/juneau-doc/docs/ReleaseNotes/5.0.0.07.html
index 0489177fd..8bf452b08 100644
--- a/juneau-doc/docs/ReleaseNotes/5.0.0.07.html
+++ b/juneau-doc/docs/ReleaseNotes/5.0.0.07.html
@@ -112,7 +112,7 @@
 			Improvements to Javadocs.
 		</li>
 		<li>
-			Improved {@link oaj.utils.PojoQuery} support.
+			Improved <del>PojoQuery</del> support.
 		</li>
 	</ul>
 	<h5 class='topic w800'>REST client updates</h5>
@@ -154,7 +154,7 @@
 			</ul>
 		</li>
 		<li>
-			HTTP response content POJOs can now simply be returned from methods instead of calling <del>RestResponse#setOutput(Object)</del>.		
+			HTTP response content POJOs can now simply be returned from methods instead of calling <del>RestResponse.setOutput(Object)</del>.		
 		</li>	
 	</ul>
 </div>
\ No newline at end of file
diff --git a/juneau-doc/docs/ReleaseNotes/5.0.0.09.html b/juneau-doc/docs/ReleaseNotes/5.0.0.09.html
index 05ce5c73a..d5f7f4049 100644
--- a/juneau-doc/docs/ReleaseNotes/5.0.0.09.html
+++ b/juneau-doc/docs/ReleaseNotes/5.0.0.09.html
@@ -41,7 +41,7 @@
 		<li>New <del>RestMethod.serializers() @RestMethod(serializers)</del>and <del>RestMethod.parsers() @RestMethod(parsers)</del>annotations.</li>
 		<li>New <del>RestMethod.properties() @RestMethod(properties)</del> annotation.</li>
 		<li>New <del>@RestMethod(defaultRequestHeaders)</del>annotation.</li>
-		<li>New <del>RestMethod.matchers() @RestMethod(matchers)</del> annotation and {@link oajr.RestMatcher} class.</li>
+		<li>New <del>RestMethod.matchers() @RestMethod(matchers)</del> annotation and <del>RestMatcher</del> class.</li>
 		<li><c>Readers</c> and <c>InputStreams</c> can be specified on <del>@Content</del> annotated parameters.</li>
 		<li>New <del>@HasParam</del>annotation.</li>
 		<li>Full RFC2616 support for matching <c>Accept</c> headers to serializers.</li>		
diff --git a/juneau-doc/docs/ReleaseNotes/5.0.0.10.html b/juneau-doc/docs/ReleaseNotes/5.0.0.10.html
index 617147441..e3685cddf 100644
--- a/juneau-doc/docs/ReleaseNotes/5.0.0.10.html
+++ b/juneau-doc/docs/ReleaseNotes/5.0.0.10.html
@@ -32,7 +32,7 @@
 		<li>New <c>RestServletProperties.REST_useStackTraceHashes</c> property to prevent the same stack trace from being logged multiple times.</li>
 		<li>New <c>RestServletProperties.REST_renderResponseStackTraces</c> property for preventing stack traces in responses for security reasons.</li>
 		<li>New overridable <c>RestServlet.onError(HttpServletRequest,HttpServletResponse,RestException,boolean)</c> and <del>RestServlet.onSuccess(RestRequest,RestResponse,long)</del>methods for plugging in your own logging and peformance monitoring.</li>
-		<li>Eliminated <c>RestServlet.getInitParams()</c> method, since it's now redundant with <del>RestServlet#getProperties()</del>.</li>
+		<li>Eliminated <c>RestServlet.getInitParams()</c> method, since it's now redundant with <del>RestServlet.getProperties()</del>.</li>
 		<li>Header parameters passed as URL parameters are now case-insensitive.</li>			
 	</ul>
 </div>
\ No newline at end of file
diff --git a/juneau-doc/docs/ReleaseNotes/5.0.0.14.html b/juneau-doc/docs/ReleaseNotes/5.0.0.14.html
index 3f5ba1576..69d717d96 100644
--- a/juneau-doc/docs/ReleaseNotes/5.0.0.14.html
+++ b/juneau-doc/docs/ReleaseNotes/5.0.0.14.html
@@ -52,7 +52,7 @@
 			<ul>
 				<li>Cleaner class structure.</li>
 				<li>Improved <del>BeanFilter</del> class for defining property filters on beans.</li>
-				<li>Improved {@link oaj.utils.PojoQuery} class for defining filters on objects (previously called <c>ObjectFilter</c>).</li>
+				<li>Improved <del>PojoQuery</del> class for defining filters on objects (previously called <c>ObjectFilter</c>).</li>
 	       		</ul>
 	       	</li>
 	       	<li>
@@ -92,7 +92,7 @@
 			<c>JsonMap</c> and <c>JsonList</c> changed to <del>ObjectMap</del> and <del>ObjectList</del> to better reflect that they're not limited to just JSON support.
 	   		</li>
 	   		<li>
-			Renamed <c>PojoSwap</c> to {@link oaj.utils.PojoQuery} to not confuse it with the new Filter API.
+			Renamed <c>PojoSwap</c> to <del>PojoQuery</del> to not confuse it with the new Filter API.
 		</li>
 	</ul>
 	<h5 class='topic w800'>REST server API changes</h5>
diff --git a/juneau-doc/docs/ReleaseNotes/5.0.0.18.html b/juneau-doc/docs/ReleaseNotes/5.0.0.18.html
index c94fac90c..b08e7c87d 100644
--- a/juneau-doc/docs/ReleaseNotes/5.0.0.18.html
+++ b/juneau-doc/docs/ReleaseNotes/5.0.0.18.html
@@ -20,7 +20,7 @@
 		Juno 5.0.0.18 is a moderate update.
 	</p>
 	<p>
-		The biggest change is the introduction of the {@link oaj.jena.RdfSerializer} class that uses Jena to generate RDF/XML, RDF/XML-ABBREV, N-Tuple, N3, and Turtle output.
+		The biggest change is the introduction of the <del>RdfSerializer</del> class that uses Jena to generate RDF/XML, RDF/XML-ABBREV, N-Tuple, N3, and Turtle output.
 	</p>
 	<p>
 		This code should be considered prototype-quality, and subject to change in the future.<br>  
diff --git a/juneau-doc/docs/ReleaseNotes/5.0.0.19.html b/juneau-doc/docs/ReleaseNotes/5.0.0.19.html
index 9197b7ade..d7feb88fe 100644
--- a/juneau-doc/docs/ReleaseNotes/5.0.0.19.html
+++ b/juneau-doc/docs/ReleaseNotes/5.0.0.19.html
@@ -23,12 +23,12 @@
 		<li>
 			New methods on <del>RestServlet</del>:
 			<ul>
-				<li><del>RestServlet#onPreCall(RestRequest)</del></li>
-				<li><del>RestServlet#onPostCall(RestRequest,RestResponse)</del></li>
+				<li><del>RestServlet.onPreCall(RestRequest)</del></li>
+				<li><del>RestServlet.onPostCall(RestRequest,RestResponse)</del></li>
 			</ul>
 		</li>
 		<li>
-			<jsf>TRIM_NULLS</jsf> setting changed to <del>SerializerContext#SERIALIZER_trimNullProperties</del>.<br>
+			<jsf>TRIM_NULLS</jsf> setting changed to <del>SerializerContext.SERIALIZER_trimNullProperties</del>.<br>
 			New property default is <jk>true</jk>. 
 			Only applies to bean properties, not map or collection entries.
 		</li>
diff --git a/juneau-doc/docs/ReleaseNotes/5.0.0.20.html b/juneau-doc/docs/ReleaseNotes/5.0.0.20.html
index eb2e9149f..2a8c5ad7c 100644
--- a/juneau-doc/docs/ReleaseNotes/5.0.0.20.html
+++ b/juneau-doc/docs/ReleaseNotes/5.0.0.20.html
@@ -22,11 +22,11 @@
 	<h5 class='topic w800'>Core API changes</h5>
 	<ul class='spaced-list'>
 		<li>
-			New Jena-based {@link oaj.jena.RdfSerializer} for serializing POJOs to RDF/XML, RDF/XML-ABBREV, N-Triple, Turtle, and N3.<br>
+			New Jena-based <del>RdfSerializer</del> for serializing POJOs to RDF/XML, RDF/XML-ABBREV, N-Triple, Turtle, and N3.<br>
 			Serializes ANY POJOs to RDF, even simple objects and primitives.
 		</li>
 		<li>
-			New Jena-based {@link oaj.jena.RdfParser} for parsing RDF/XML, RDF/XML-ABBREV, N3, Turtle, and N-Triple back into POJOs.
+			New Jena-based <del>RdfParser</del> for parsing RDF/XML, RDF/XML-ABBREV, N3, Turtle, and N-Triple back into POJOs.
 		</li>
 		<li>
 			<del>XmlSerializerContext.XML_autoDetectNamespaces</del>default changed to <jk>true</jk>.<br>
diff --git a/juneau-doc/docs/ReleaseNotes/5.0.0.24.html b/juneau-doc/docs/ReleaseNotes/5.0.0.24.html
index 02472b6fb..57002984e 100644
--- a/juneau-doc/docs/ReleaseNotes/5.0.0.24.html
+++ b/juneau-doc/docs/ReleaseNotes/5.0.0.24.html
@@ -59,7 +59,7 @@
 	<ul>
 		<li>New {@link oaj.json JSON Support Overview} document.</li>
 		<li>New {@link oaj.xml XML Support Overview} document.</li>
-		<li>New {@link oaj.jena RDF Languages Support Overview} document.</li>
+		<li>New <del>RDF Languages Support Overview</del> document.</li>
 		<li>New {@link oaj.dto.atom ATOM Support Overview} document.</li>
 	</ul>
 </div>
\ No newline at end of file
diff --git a/juneau-doc/docs/ReleaseNotes/5.0.0.27.html b/juneau-doc/docs/ReleaseNotes/5.0.0.27.html
index 783b66012..091cca702 100644
--- a/juneau-doc/docs/ReleaseNotes/5.0.0.27.html
+++ b/juneau-doc/docs/ReleaseNotes/5.0.0.27.html
@@ -27,7 +27,7 @@
 	  			<del>BasicRestServlet</del> now includes {@link oaj.plaintext.PlainTextSerializer} and {@link oaj.plaintext.PlainTextParser} for plain-text support.
 	  		</li>
 	  		<li>
-			Child resources now render on default <c>OPTIONS</c> pages through new method <del>ResourceOptions#getChildren()</del>.
+			Child resources now render on default <c>OPTIONS</c> pages through new method <del>ResourceOptions.getChildren()</del>.
 		</li>
 		<li>
 			Changes to {@link oaj.urlencoding.UrlEncodingSerializer}/{@link oaj.urlencoding.UrlEncodingParser} to reduce the need for quoted string values.<br>
diff --git a/juneau-doc/docs/ReleaseNotes/5.0.0.34.html b/juneau-doc/docs/ReleaseNotes/5.0.0.34.html
index a810f73d0..5b865211b 100644
--- a/juneau-doc/docs/ReleaseNotes/5.0.0.34.html
+++ b/juneau-doc/docs/ReleaseNotes/5.0.0.34.html
@@ -43,8 +43,8 @@
 		<li>
 			New methods on {@link oajr.RestRequest}:
 			<ul>
-				<li><del>RestRequest#getVarResolver()</del></li>
-				<li><del>RestRequest#getServletURI()</del></li>
+				<li><del>RestRequest.getVarResolver()</del></li>
+				<li><del>RestRequest.getServletURI()</del></li>
 				<li><del>RestRequest.getRequestParentURI()</del></li>
 			</ul>
 		</li>
@@ -57,20 +57,20 @@
 		<li>
 			New methods on <del>RestServlet</del>that allow easier customization by subclasses:
 			<ul>
-				<li><del>RestServlet#createConfigFactory()</del></li>
-				<li><del>RestServlet#createConverters()</del></li>
-				<li><del>RestServlet#createDefaultRequestHeaders()</del></li>
-				<li><del>RestServlet#createDefaultResponseHeaders()</del></li>
-				<li><del>RestServlet#createEncoders()</del></li>
-				<li><del>RestServlet#createFilters()</del></li>
-				<li><del>RestServlet#createGuards()</del></li>
-				<li><del>RestServlet#createMimetypesFileTypeMap()</del></li>
-				<li><del>RestServlet#createParsers()</del></li>
-				<li><del>RestServlet#createProperties()</del></li>
-				<li><del>RestServlet#createRequestProperties(ObjectMap,RestRequest)</del></li>
-				<li><del>RestServlet#createRequestVarResolver(RestRequest)</del></li>
-				<li><del>RestServlet#createSerializers()</del></li>
-				<li><del>RestServlet#createUrlEncodingParser()</del></li>
+				<li><del>RestServlet.createConfigFactory()</del></li>
+				<li><del>RestServlet.createConverters()</del></li>
+				<li><del>RestServlet.createDefaultRequestHeaders()</del></li>
+				<li><del>RestServlet.createDefaultResponseHeaders()</del></li>
+				<li><del>RestServlet.createEncoders()</del></li>
+				<li><del>RestServlet.createFilters()</del></li>
+				<li><del>RestServlet.createGuards()</del></li>
+				<li><del>RestServlet.createMimetypesFileTypeMap()</del></li>
+				<li><del>RestServlet.createParsers()</del></li>
+				<li><del>RestServlet.createProperties()</del></li>
+				<li><del>RestServlet.createRequestProperties(ObjectMap,RestRequest)</del></li>
+				<li><del>RestServlet.createRequestVarResolver(RestRequest)</del></li>
+				<li><del>RestServlet.createSerializers()</del></li>
+				<li><del>RestServlet.createUrlEncodingParser()</del></li>
 			</ul>
 		</li>
 		<li>
diff --git a/juneau-doc/docs/ReleaseNotes/5.0.0.36.html b/juneau-doc/docs/ReleaseNotes/5.0.0.36.html
index 00e45c4df..68cf2fc53 100644
--- a/juneau-doc/docs/ReleaseNotes/5.0.0.36.html
+++ b/juneau-doc/docs/ReleaseNotes/5.0.0.36.html
@@ -21,12 +21,12 @@
 	</p>
 	<ul class='spaced-list'>
 		<li>Implemented <c>org.apache.juneau.urlencoding.UrlEncodingParser.parseArgs(Reader,int,ClassMeta[])</c>.
-		<li><c>name</c> parameter of <del>ResourceDescription#ResourceDescription(String,String,String)</del>. 
+		<li><c>name</c> parameter of <del>ResourceDescription.ResourceDescription(String,String,String)</del>. 
 			is now automatically URL-encoded so that the name can contain special characters (e.g. <js>"foo/bar(baz)"</js>).
 		<li>Support for URL-matching and path info containing encoded characters (e.g. <js>'/'</js>) now supported.	
 		<li>Removed some lazy-initialization of bean information in {@link oaj.ClassMeta} that allowed the removal of
 			some synchronized blocks.
-		<li>Improved support of <del>BeanContext#getClassMetaFromString(String)</del>.
+		<li>Improved support of <del>BeanContext.getClassMetaFromString(String)</del>.
 			Now supports primitive arrays such as <js>"long[]"</js> in addition to the previous support for the equivalent <js>"[J"</js>.
 		<li>Various new convenience methods added to {@link oaj.internal.StringUtils} and {@link oaj.internal.ClassUtils}.
 	</ul>	
diff --git a/juneau-doc/docs/ReleaseNotes/5.1.0.00.html b/juneau-doc/docs/ReleaseNotes/5.1.0.00.html
index 5d57178e9..41b176263 100644
--- a/juneau-doc/docs/ReleaseNotes/5.1.0.00.html
+++ b/juneau-doc/docs/ReleaseNotes/5.1.0.00.html
@@ -56,12 +56,12 @@
 		<li>Removed lazy-initialization that required locking in {@link oaj.ClassMeta}.  
 		<li>New <c>BeanContext.setDefaultParser(ReaderParser)</c> method added for specifying 
 			a default parser to use in a bean context (used when converting beans to <c>Strings</c> using 
-			<del>BeanContext#convertToType(Object,Class)</del>.
+			<del>BeanContext.convertToType(Object,Class)</del>.
 			Old behavior simply used the default JSON serializer in these cases.
 		<li>More consistent handling of exceptions across all parsers.
 		<li>Minor changes to {@link oajr.RestRequest} class.
 		<ul>
-			<li>Changed the order of parameters on <del>RestRequest#getParameter(String,Class)</del>.
+			<li>Changed the order of parameters on <del>RestRequest.getParameter(String,Class)</del>.
 			<li>Added <c>RestRequest.getMapParameter(String,Class,Class,Class)</c> and 
 				<c>RestRequest.getCollectionParameter(String,Class,Class)}</c> methods.
 		</ul>
diff --git a/juneau-doc/docs/ReleaseNotes/5.1.0.03.html b/juneau-doc/docs/ReleaseNotes/5.1.0.03.html
index 44c122425..f9fc08dd4 100644
--- a/juneau-doc/docs/ReleaseNotes/5.1.0.03.html
+++ b/juneau-doc/docs/ReleaseNotes/5.1.0.03.html
@@ -56,7 +56,7 @@
 	<h5 class='topic w800'>REST Server API updates</h5>
 	<ul class='spaced-list'>
 		<li>New <del>RestRequest.getJavaMethod()</del>method for getting access to the method used to handle a request.
-			Useful for accessing the method name or annotations during requests, such as in calls to <del>RestGuard#guard(RestRequest,RestResponse)</del>.
+			Useful for accessing the method name or annotations during requests, such as in calls to <del>RestGuard.guard(RestRequest,RestResponse)</del>.
 		<li>Fixed bug when using Jetty where you tried to read text input after a header was written.
 		<li>Added new string variables <dc>$A{...}</dc> (request attributes) and <dc>$P{...}</dc> (request parameters) to <c>RestServlet.createRequestVarResolver(RestRequest)</c>.
 	</ul>
diff --git a/juneau-doc/docs/ReleaseNotes/5.1.0.04.html b/juneau-doc/docs/ReleaseNotes/5.1.0.04.html
index 83b1e8265..a9c6f92ef 100644
--- a/juneau-doc/docs/ReleaseNotes/5.1.0.04.html
+++ b/juneau-doc/docs/ReleaseNotes/5.1.0.04.html
@@ -29,7 +29,7 @@
 		<li>Better behavior on overriding of filters in <c>BeanContext.addTransforms(Class[])</c>.
 			Previously, adding multiple conflicting filters resulted in random behavior.  
 			Now filters are overridden when multiple matching filters are applied.
-		<li>Allow <del>HtmlDocSerializerContext</del>properties to be set via <del>Serializer#setProperty(String,Object)</del>.
+		<li>Allow <del>HtmlDocSerializerContext</del>properties to be set via <del>Serializer.setProperty(String,Object)</del>.
 			Previously, these could only be defined through override properties (e.g. through REST class and method annotations).
 		<li>Fixed memory leak in XML parser.	
 	</ul>
diff --git a/juneau-doc/docs/ReleaseNotes/5.1.0.05.html b/juneau-doc/docs/ReleaseNotes/5.1.0.05.html
index b67c5ede5..6e1074b7d 100644
--- a/juneau-doc/docs/ReleaseNotes/5.1.0.05.html
+++ b/juneau-doc/docs/ReleaseNotes/5.1.0.05.html
@@ -21,13 +21,13 @@
 	</p>
 	<ul class='spaced-list'>
 		<li>New <del>Redirect</del> class that simplifies performing redirections in REST methods.
-		<li>New pluggable {@link oajr.ResponseHandler} class and <del>@RestResource(responseHandlers)</del> annotation
+		<li>New pluggable <del>ResponseHandler</del> class and <del>@RestResource(responseHandlers)</del> annotation
 			for defining customer response handlers for special kinds of POJOs.
 		<li>New method <del>UrlEncodingSerializer.serializeUrlPart(Object)</del>method.
 		<li>New method <del>RestRequest.getServletURIBuilder()</del>for construcing servlet-based URLs more efficiently.
 		<li>New method {@link oajr.RestResponse#getNegotiatedOutputStream()} that uses encoders if a match is found, 
 			and {@link oajr.RestResponse#getOutputStream()} that just return the underlying output stream without any modifications.
-		<li>Fixed bug where some properties were not being propagated correctly when using <del>CoreObject#setProperties(ObjectMap)</del>
+		<li>Fixed bug where some properties were not being propagated correctly when using <del>CoreObject.setProperties(ObjectMap)</del>
 			on serializer and parser subclasses.
 		<li>Fixed bug in {@link oaj.html.HtmlSerializer} where URL keys in Maps were not being serialized as hyperlinks.
 		<li>Fixed bug in {@link oaj.json.JsonSerializer} where <js>"_class"</js> and <js>"items"</js> attributes were not quoted in strict mode when using SERIALIZER_addClassAttrs feature.	
diff --git a/juneau-doc/docs/ReleaseNotes/5.1.0.10.html b/juneau-doc/docs/ReleaseNotes/5.1.0.10.html
index ab650485c..5ae935c67 100644
--- a/juneau-doc/docs/ReleaseNotes/5.1.0.10.html
+++ b/juneau-doc/docs/ReleaseNotes/5.1.0.10.html
@@ -42,7 +42,7 @@
 		<li>Fixed major issue that prevented parsing URL-Encoded form posts into POJOs.
 			Calling <del>HttpServlet.getParameter(String)</del>was forcing the underlying servlet code to process the HTTP body itself, preventing the <c>UrlEncodingSerializer</c>
 			class from being able to parse the content.  Updated code no longer inadvertantly calls this method.
-		<li>New <del>RestRequest#getQueryParameter(String)</del>, <del>RestRequest#hasQueryParameter(String)</del>, and <del>RestRequest.hasAnyQueryParameters(String[])</del>
+		<li>New <del>RestRequest.getQueryParameter(String)</del>, <del>RestRequest.hasQueryParameter(String)</del>, and <del>RestRequest.hasAnyQueryParameters(String[])</del>
 			methods that only look for parameters in the URL query string to prevent loading and parsing of URL-Encoded form posts.
 		<li>New <del>@QParam</del> and <del>@HasQParam</del>annotations for accessing query parameters from the URL query string.
 		<li><c>&amp;plainText</c> parameter can now specify a false value.
@@ -59,11 +59,11 @@
 		<li>Improved performance on URL-Encoded form posts by serializing directly to output stream instead of serialized to string first.
 		<li>New methods on {@link oajrc.RestClient} class that makes it easier to associate serializer and parser attributes with registered serializer and parser:
 			<ul>
-				<li><del>RestClient#setProperty(String,Object)</del>			
-				<li><del>RestClient#setProperties(ObjectMap)</del>	
-				<li><del>RestClient#addNotBeanClasses(Class[])</del>		
-				<li><del>RestClient#addTransforms(Class[])</del>		
-				<li><del>RestClient#addImplClass(Class,Class)</del>	
+				<li><del>RestClient.setProperty(String,Object)</del>			
+				<li><del>RestClient.setProperties(ObjectMap)</del>	
+				<li><del>RestClient.addNotBeanClasses(Class[])</del>		
+				<li><del>RestClient.addTransforms(Class[])</del>		
+				<li><del>RestClient.addImplClass(Class,Class)</del>	
 			</ul>
 		<li>Renamed <c>RestClient.shutdown()</c> to {@link oajrc.RestClient#close()} to mirror change in Apache API.		
 	</ul>
diff --git a/juneau-doc/docs/ReleaseNotes/5.1.0.11.html b/juneau-doc/docs/ReleaseNotes/5.1.0.11.html
index ca13814a7..d75d15ba6 100644
--- a/juneau-doc/docs/ReleaseNotes/5.1.0.11.html
+++ b/juneau-doc/docs/ReleaseNotes/5.1.0.11.html
@@ -69,8 +69,8 @@
 		<li>Performance improvements around query parameters.
 		<li>New methods on {@link oajr.RestRequest} for handling multi-part parameters:
 			<ul>
-				<li><del>RestRequest#getParameters(String,Class)</del>
-				<li><del>RestRequest#getQueryParameters(String,Class)</del>
+				<li><del>RestRequest.getParameters(String,Class)</del>
+				<li><del>RestRequest.getQueryParameters(String,Class)</del>
 			</ul>
 		</li>
 		<li>Fixed Jetty issue in {@link oajr.RestResponse#setHeader(String,String)} where setting 
@@ -83,7 +83,7 @@
 			
 	<h5 class='topic w800'>Client</h5>		
 	<ul class='spaced-list'>
-		<li>New method <del>RestCall#allowRedirectsOnPosts(boolean)</del>.
+		<li>New method <del>RestCall.allowRedirectsOnPosts(boolean)</del>.
 		<li>New method <c>RestCall.peekInputStream()</c> allows you to read response bodies without interrupting execution flow.
 		<li>New method <del>RestCall.toString()</del> now useful for debugging purposes.  
 			Shows all request/response headers and bodies.
diff --git a/juneau-doc/docs/ReleaseNotes/5.1.0.13.html b/juneau-doc/docs/ReleaseNotes/5.1.0.13.html
index b69ced489..8e132c290 100644
--- a/juneau-doc/docs/ReleaseNotes/5.1.0.13.html
+++ b/juneau-doc/docs/ReleaseNotes/5.1.0.13.html
@@ -34,7 +34,7 @@
 	
 	<h5 class='topic w800'>Server</h5>		
 	<ul class='spaced-list'>
-		<li>{@link oajr.RestConverter} API fixed to handle the existence of POJO filters.
+		<li><del>RestConverter</del> API fixed to handle the existence of POJO filters.
 			<del>Introspectable</del>/<del>Queryable</del>/<del>Traversable</del> classes can now work with filtered POJOs.  
 		<li><del>@RestResource(messages)</del>annotation can now be defined on super and subclasses so that NLS messages can be defined in multiple resource bundles.
 		<li>Performance improvements in <c>RestServletNls</c> class. 
diff --git a/juneau-doc/docs/ReleaseNotes/5.1.0.14.html b/juneau-doc/docs/ReleaseNotes/5.1.0.14.html
index 59506d8ff..dbf7c3a07 100644
--- a/juneau-doc/docs/ReleaseNotes/5.1.0.14.html
+++ b/juneau-doc/docs/ReleaseNotes/5.1.0.14.html
@@ -34,7 +34,7 @@
 	<ul class='spaced-list'>
 		<li>New methods in {@link oajrc.RestClient} for working with remoteable services:
 		<ul>
-			<li><del>RestClient#setRemoteableServletUri(String)</del>
+			<li><del>RestClient.setRemoteableServletUri(String)</del>
 			<li><del>RestClient.getRemoteableProxy(Class)</del>
 		</ul>
 	</ul>
@@ -46,8 +46,8 @@
 			explicitly specify which HTTP methods can be used in the <c>&amp;method</c> parameter.
 		<li>New methods added to {@link oajr.RestRequest}:
 		<ul>
-			<li><del>RestRequest#getParser()</del>
-			<li><del>RestRequest#getReaderParser()</del>
+			<li><del>RestRequest.getParser()</del>
+			<li><del>RestRequest.getReaderParser()</del>
 		</ul>
 	</ul>
 </div>
\ No newline at end of file
diff --git a/juneau-doc/docs/ReleaseNotes/5.1.0.15.html b/juneau-doc/docs/ReleaseNotes/5.1.0.15.html
index cb63c8a4f..bd2d5b6f8 100644
--- a/juneau-doc/docs/ReleaseNotes/5.1.0.15.html
+++ b/juneau-doc/docs/ReleaseNotes/5.1.0.15.html
@@ -24,8 +24,8 @@
 	<ul class='spaced-list'>
 		<li>New properties in <del>SerializerContext</del>:
 			<ol>
-				<li><del>SerializerContext#SERIALIZER_relativeUriBase</del>
-				<li><del>SerializerContext#SERIALIZER_absolutePathUriBase</del>
+				<li><del>SerializerContext.SERIALIZER_relativeUriBase</del>
+				<li><del>SerializerContext.SERIALIZER_absolutePathUriBase</del>
 			</ol>
 			These replace the <c>SERIALIZER_uriAuthority</c> and <c>SERIALIZER_uriContext</c> properties.
 		</li>
@@ -47,24 +47,24 @@
 	<ul class='spaced-list'>
 		<li>New methods in <del>RestCall</del>:
 			<ol>
-				<li><del>RestRequest#getHeader(String,Class)</del>
-				<li><del>RestRequest#getHeader(String,Object,Class)</del>
-				<li>{@del RestRequest#getHeader(String,Type,Type...)}
-				<li><del>RestRequest#getQueryParameter(String,Class)</del>
-				<li><del>RestRequest#getQueryParameter(String,Object,Class)</del>
-				<li>{@del RestRequest#getQueryParameter(String,Type,Type...)}
-				<li>{@del RestRequest#getQueryParameter(String,Object,Type,Type...)}
-				<li><del>RestRequest#getQueryParameters(String,Class)</del>
-				<li>{@del RestRequest#getQueryParameters(String,Type,Type...)}
-				<li><del>RestRequest#getFormDataParameter(String,Class)</del>
-				<li><del>RestRequest#getFormDataParameter(String,Object,Class)</del>
-				<li><del>RestRequest#getFormDataParameters(String,Class)</del>
-				<li>{@del RestRequest#getFormDataParameter(String,Type,Type...)}
-				<li>{@del RestRequest#getFormDataParameters(String,Type,Type...)}
-				<li><del>RestRequest#getPathParameter(String,Class)</del>
-				<li>{@del RestRequest#getPathParameter(String,Type,Type...)}
-				<li><del>RestRequest#getBody(Class)</del>
-				<li>{@del RestRequest#getBody(Type,Type...)}
+				<li><del>RestRequest.getHeader(String,Class)</del>
+				<li><del>RestRequest.getHeader(String,Object,Class)</del>
+				<li><del>RestRequest.getHeader(String,Type,Type...)</del>
+				<li><del>RestRequest.getQueryParameter(String,Class)</del>
+				<li><del>RestRequest.getQueryParameter(String,Object,Class)</del>
+				<li><del>RestRequest.getQueryParameter(String,Type,Type...)</del>
+				<li><del>RestRequest.getQueryParameter(String,Object,Type,Type...)</del>
+				<li><del>RestRequest.getQueryParameters(String,Class)</del>
+				<li><del>RestRequest.getQueryParameters(String,Type,Type...)</del>
+				<li><del>RestRequest.getFormDataParameter(String,Class)</del>
+				<li><del>RestRequest.getFormDataParameter(String,Object,Class)</del>
+				<li><del>RestRequest.getFormDataParameters(String,Class)</del>
+				<li><del>RestRequest.getFormDataParameter(String,Type,Type...)</del>
+				<li><del>RestRequest.getFormDataParameters(String,Type,Type...)</del>
+				<li><del>RestRequest.getPathParameter(String,Class)</del>
+				<li><del>RestRequest.getPathParameter(String,Type,Type...)</del>
+				<li><del>RestRequest.getBody(Class)</del>
+				<li><del> RestRequest.getBody(Type,Type...)</del>
 			</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 af09453ca..a64cc22f6 100644
--- a/juneau-doc/docs/ReleaseNotes/5.1.0.16.html
+++ b/juneau-doc/docs/ReleaseNotes/5.1.0.16.html
@@ -25,18 +25,18 @@
 		<li>New methods on {@link oaj.ClassMeta} that eliminates language-specific code in 
 			the general class metadata.
 			<ul>
-				<li><del>ClassMeta#getXmlMeta()</del>
-				<li><del>ClassMeta#getJsonMeta()</del>
-				<li><del>ClassMeta#getHtmlMeta()</del>
-				<li><del>ClassMeta#getUrlEncodingMeta()</del>
-				<li><del>ClassMeta#getRdfMeta()</del>
+				<li><del>ClassMeta.getXmlMeta()</del>
+				<li><del>ClassMeta.getJsonMeta()</del>
+				<li><del>ClassMeta.getHtmlMeta()</del>
+				<li><del>ClassMeta.getUrlEncodingMeta()</del>
+				<li><del>ClassMeta.getRdfMeta()</del>
 			</ul>
 		<li>New {@link oaj.dto.jsonschema.JsonType#ANY} enum.
 		<li>New <del>@Html(asPlainText)</del> annotation.
 		<li>New <del>HtmlDocSerializerContext.HTMLDOC_cssImports</del>property.
 		<li>Significant changes to RDF support.
 			<ul>
-				<li>New {@link oaj.jena.annotation.Rdf @Rdf} and {@link oaj.jena.annotation.RdfSchema @RdfSchema}
+				<li>New <del>@Rdf</del> and <del>@RdfSchema</del>
 					annotations.  These replace the use of defining namespaced through the XML annotations, and allows XML and RDF to be
 					serialized using different namespaces.
 				<li>Support for serializing arrays/collections as RDF bags, RDF lists, and multi-valued properties.   
diff --git a/juneau-doc/docs/ReleaseNotes/5.1.0.17.html b/juneau-doc/docs/ReleaseNotes/5.1.0.17.html
index e360708e5..e1e829a5c 100644
--- a/juneau-doc/docs/ReleaseNotes/5.1.0.17.html
+++ b/juneau-doc/docs/ReleaseNotes/5.1.0.17.html
@@ -63,15 +63,15 @@
 			<ul>
 				<li>Added new methods:
 					<ul>
-						<li><del>RestRequest#getQueryParameterMap()</del>
-						<li><del>RestRequest#getQueryParameterNames()</del>
-						<li><del>RestRequest#getPathInfoUndecoded()</del>
-						<li><del>RestRequest#getPathRemainderUndecoded()</del>
-						<li><del>RestRequest#getTrimmedRequestURI()</del>
-						<li><del>RestRequest#getTrimmedRequestURL()</del>
-						<li><del>RestRequest#getServletTitle()</del>
-						<li><del>RestRequest#getServletDescription()</del>
-						<li><del>RestRequest#getMethodDescription()</del>
+						<li><del>RestRequest.getQueryParameterMap()</del>
+						<li><del>RestRequest.getQueryParameterNames()</del>
+						<li><del>RestRequest.getPathInfoUndecoded()</del>
+						<li><del>RestRequest.getPathRemainderUndecoded()</del>
+						<li><del>RestRequest.getTrimmedRequestURI()</del>
+						<li><del>RestRequest.getTrimmedRequestURL()</del>
+						<li><del>RestRequest.getServletTitle()</del>
+						<li><del>RestRequest.getServletDescription()</del>
+						<li><del>RestRequest.getMethodDescription()</del>
 					</ul>
 				<li>Behavior changes to {@link oajr.RestRequest#getPathInfo()} to follow Servlet specs.
 					Returns <jk>null</jk> instead of blank for no path info.
@@ -83,10 +83,10 @@
 		<li>New string replacement variables:
 			<ul>
 				<li><c>$R{contextPath}</c> - Returns value from {@link oajr.RestRequest#getContextPath()}
-				<li><c>$R{methodDescription}</c> - Returns value from <del>RestRequest#getMethodDescription()</del>
-				<li><c>$R{resourceTitle}</c> - Returns value from <del>RestRequest#getServletTitle()</del>
-				<li><c>$R{resourceDescription}</c> - Returns value from <del>RestRequest#getServletDescription()</del>
-				<li><c>$R{trimmedRequestURI}</c> - Returns value from <del>RestRequest#getTrimmedRequestURI()</del>
+				<li><c>$R{methodDescription}</c> - Returns value from <del>RestRequest.getMethodDescription()</del>
+				<li><c>$R{resourceTitle}</c> - Returns value from <del>RestRequest.getServletTitle()</del>
+				<li><c>$R{resourceDescription}</c> - Returns value from <del>RestRequest.getServletDescription()</del>
+				<li><c>$R{trimmedRequestURI}</c> - Returns value from <del>RestRequest.getTrimmedRequestURI()</del>
 				<li><c>$E{var}</c> - Environment variables.
 			</ul>
 		<li>Added methods <del>RestServlet.getDescription(RestRequest)</del>and <del>RestServlet.getLabel(RestRequest)</del>.
@@ -107,17 +107,17 @@
 		<li>New annotations for providing labels and descriptions.  Useful if you don't plan on having to support other languages, so you don't 
 			want to provide labels in resource bundles.
 			<ul>
-				<li><del>RestResource#label()</del>
+				<li><del>RestResource.label()</del>
 				<li><del>@RestResource(description)</del>
-				<li><del>RestMethod#description() @RestMethod(description)</del>
-				<li><del>RestMethod#responses()</del>
-				<li><del>Attr#description()</del>
-				<li><del>Content#description()</del>
-				<li><del>HasParam#description()</del>
-				<li><del>HasQParam#description()</del>
-				<li><del>Header#description()</del>
-				<li><del>Param#description()</del>
-				<li><del>QParam#description()</del>
+				<li><del>RestMethod.description() @RestMethod(description)</del>
+				<li><del>RestMethod.responses()</del>
+				<li><del>Attr.description()</del>
+				<li><del>Content.description()</del>
+				<li><del>HasParam.description()</del>
+				<li><del>HasQParam.description()</del>
+				<li><del>Header.description()</del>
+				<li><del>Param.description()</del>
+				<li><del>QParam.description()</del>
 			</ul>
 		<li>Support for sorting resources by name in <del>ChildResourceDescriptions</del>.
 	</ul>
diff --git a/juneau-doc/docs/ReleaseNotes/5.1.0.18.html b/juneau-doc/docs/ReleaseNotes/5.1.0.18.html
index 8ea9e080b..2a6102520 100644
--- a/juneau-doc/docs/ReleaseNotes/5.1.0.18.html
+++ b/juneau-doc/docs/ReleaseNotes/5.1.0.18.html
@@ -24,7 +24,7 @@
 	<ul class='spaced-list'>
 		<li>Fixed bug where localized strings weren't resolving when using chained resource bundles.
 		<li>Servlet and method labels and descriptions can now contain embedded string variables.
-		<li>New <del>RestMethod.input()</del>and <del>RestMethod#responses()</del>
+		<li>New <del>RestMethod.input()</del>and <del>RestMethod.responses()</del>
 			annotations.
 			These replace the various <c>description</c> annotations added 2 days ago with a simpler design.
 		<li>New methods on <del>RestServlet</del>:
diff --git a/juneau-doc/docs/ReleaseNotes/5.1.0.19.html b/juneau-doc/docs/ReleaseNotes/5.1.0.19.html
index 749eac177..046cddd0d 100644
--- a/juneau-doc/docs/ReleaseNotes/5.1.0.19.html
+++ b/juneau-doc/docs/ReleaseNotes/5.1.0.19.html
@@ -27,7 +27,7 @@
 			See <dc>Serializing to ObjectMaps</dc> for details.
 		<li>New <del>ObjectMap.include(String[])</del>and <del>ObjectMap.exclude(String[])</del>methods.
 		<li>{@link oaj.html.annotation.Html @Html} annotations can now be applied to bean properties.
-		<li>New {@link oaj.utils.IOPipe} utility class.
+		<li>New <del>IOPipe</del> utility class.
 		<li>Behavior change on <del>StringVarResolver</del>.  <jk>null</jk> input now results in blank strings instead of <jk>null</jk>.
 	</ul>
 	
diff --git a/juneau-doc/docs/ReleaseNotes/5.1.0.20.html b/juneau-doc/docs/ReleaseNotes/5.1.0.20.html
index c6157d5d5..574740312 100644
--- a/juneau-doc/docs/ReleaseNotes/5.1.0.20.html
+++ b/juneau-doc/docs/ReleaseNotes/5.1.0.20.html
@@ -44,7 +44,7 @@
 		<li>{@link oaj.json.JsonParser} now handles parsing JSON boolean/numeric values as strings to bean properties of type boolean or number. 
 		<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>Various internal improvements to <del>IOPipe</del>.
 		<li>New <del>ReflectionUtils.getResource(Class,String)</del>method.
 		<li>{@link oaj.internal.StringUtils#parseNumber(String,Class)} now returns zero for empty strings. 
 			This affects the way most parsers handle blank values.
@@ -57,14 +57,14 @@
 		<li>Changes to <del>RestServlet</del>:
 			<ul>
 				<li>New methods for accessing external INI config files:<br>  
-					<del>RestServlet#getConfig()</del><br>
-					<del>RestServlet#createConfigFile()</del>
+					<del>RestServlet.getConfig()</del><br>
+					<del>RestServlet.createConfigFile()</del>
 				<li>New <js>"$C{...}"</js> variable that resolve to INI config file values.
 				<li>New <js>"$UE{...}"</js> variable that  URL-encodes the value inside the variable.
 				<li>New convenience methods for retrieving classpath resource files:<br>  
-					<del>RestServlet#getResource(String)</del><br>
-					<del>RestServlet#getResourceAsString(String)</del><br>
-					<del>RestServlet#getResource(Class,String,String)</del>.
+					<del>RestServlet.getResource(String)</del><br>
+					<del>RestServlet.getResourceAsString(String)</del><br>
+					<del>RestServlet.getResource(Class,String,String)</del>.
 						Useful if you want to load predefined POJOs from JSON files in your classpath.
 				<li>New <del>RestServlet.handleNotFound(int,RestRequest,RestResponse)</del> method for customized handling
 					of when a resource or method was not found.  
@@ -73,9 +73,9 @@
 			overriding the new <del>RestServlet.handleNotFound(int,RestRequest,RestResponse)</del>method.
 		<li>New {@link oajr.RestRequest} methods: 
 			<ul>
-				<li><del>RestRequest#resolveVars(String)</del>
+				<li><del>RestRequest.resolveVars(String)</del>
 				<li><c>RestRequest.getVarResource(String)</c>
-				<li><del>RestRequest#getConfig()</del>
+				<li><del>RestRequest.getConfig()</del>
 			</ul>
 		<li>New {@link oajr.RestResponse} methods: 
 			<ul>
@@ -89,10 +89,10 @@
 			Allows encoders to be fine-tuned at the method level.
 		<li>New <del>@RestResource(config)</del> annotation for associating external <del>ConfigFile</del>config files with servlets.
 		<li><del>ResourceLink</del>.
-		<li>New <c>org.apache.juneau.rest.matcher</c> package for commonly-used {@link oajr.RestMatcher RestMatchers}:
+		<li>New <c>org.apache.juneau.rest.matcher</c> package for commonly-used <del>RestMatchers</del>:
 			<ul>
-				<li><del>matchers#MultipartFormDataMatcher</del>
-				<li><del>matchers#UrlEncodedFormMatcher</del>
+				<li><del>MultipartFormDataMatcher</del>
+				<li><del>UrlEncodedFormMatcher</del>
 			</ul>
 	</ul>
 			
diff --git a/juneau-doc/docs/ReleaseNotes/5.2.0.0.html b/juneau-doc/docs/ReleaseNotes/5.2.0.0.html
index e86bd115f..3ae693694 100644
--- a/juneau-doc/docs/ReleaseNotes/5.2.0.0.html
+++ b/juneau-doc/docs/ReleaseNotes/5.2.0.0.html
@@ -28,7 +28,7 @@
 				<li>More consistent handling of comma-delimited lists of objects.
 				<li>New methods in <del>ConfigFile</del>:
 					<ul>
-						<li><del>ConfigFile#getStringArray(String)</del>,<del>ConfigFile#getStringArray(String,String[])</del>
+						<li><del>ConfigFile.getStringArray(String)</del>,<del>ConfigFile.getStringArray(String,String[])</del>
 						<li><del>ConfigFile.getSectionAsBean(String,Class)</del>- Instantiate a new bean with property values in the specified section..
 						<li><del>ConfigFile.writeProperties(String,Object,boolean,Class[])</del>- Copy the properties in a config file section into properties on an existing bean or POJO.
 						<li><del>ConfigFile.getSectionMap(String)</del>- Get all the resolved values in a section.
@@ -36,15 +36,15 @@
 						<li><del>ConfigFile.isEncoded(String)</del>
 						<li><del>ConfigFile.addListener(ConfigFileListener)</del>- Listen for modification events on the config file.
 						<li><del>ConfigFile.merge(ConfigFile)</del>- Merge the contents of another config file into this config file.
-						<li><del>ConfigFile#getResolving()</del>, <del>ConfigFile.getResolving(StringVarResolver)</del>- Return an instance of the config file that resolves string variables.
+						<li><del>ConfigFile.getResolving()</del>, <del>ConfigFile.getResolving(StringVarResolver)</del>- Return an instance of the config file that resolves string variables.
 							Much more efficient than the previous design since the same underlying config file object is shared.
 						<li><del>ConfigFile.toWritable()</del> - Wraps the config file in a <del>Writable</del>interface so that it can be serialized by the REST interface as a plain-text INI file instead of as a serialized POJO.
 						<li><del>ConfigFile.getInt(String)</del>- Now supports <js>"M"</js> and <js>"K"</js> to identify millions and thousands.
 					</ul>
 				<li>New methods in <del>ConfigMgr</del>:
 					<ul>
-						<li><del>ConfigMgr#create()</del>, <del>ConfigMgr#create(Reader)</del>, <del>ConfigMgr#create(File)</del>
-						<li><del>ConfigMgr#deleteAll()</del>	
+						<li><del>ConfigMgr.create()</del>, <del>ConfigMgr.create(Reader)</del>, <del>ConfigMgr.create(File)</del>
+						<li><del>ConfigMgr.deleteAll()</del>	
 					</ul>
 				<li>New methods in <del>Section</del>:
 					<ul>
@@ -100,44 +100,44 @@
 			</ul> 
 		<li>New fields on <del>ObjectList</del>:
 			<ul>
-				<li><del>ObjectList#EMPTY_LIST</del>
+				<li><del>ObjectList.EMPTY_LIST</del>
 			</ul>
 		<li>New fields and methods on <del>ObjectMap</del>:
 			<ul>
-				<li><del>ObjectMap#EMPTY_MAP</del>
-				<li><del>ObjectMap#getStringArray(String)</del>
-				<li><del>ObjectMap#getStringArray(String,String[])</del>
-				<li><del>ObjectMap#putIfNull(String,Object)</del>
-				<li><del>ObjectMap#putIfEmpty(String,Object)</del>
+				<li><del>ObjectMap.EMPTY_MAP</del>
+				<li><del>ObjectMap.getStringArray(String)</del>
+				<li><del>ObjectMap.getStringArray(String,String[])</del>
+				<li><del>ObjectMap.putIfNull(String,Object)</del>
+				<li><del>ObjectMap.putIfEmpty(String,Object)</del>
 			</ul>
 		<li>New methods in {@link oaj.internal.ArrayUtils}:
 			<ul>
-				<li><del>ArrayUtils#contains(Object,Object[])</del>
-				<li><del>ArrayUtils#indexOf(Object,Object[])</del>
-				<li><del>ArrayUtils#toPrimitiveArray(Object)</del>
+				<li><del>ArrayUtils.contains(Object,Object[])</del>
+				<li><del>ArrayUtils.indexOf(Object,Object[])</del>
+				<li><del>ArrayUtils.toPrimitiveArray(Object)</del>
 			</ul>	
 		<li>New methods in {@link oaj.internal.IOUtils}:
 			<ul>
-				<li><del>IOUtils#pipe(Reader,Writer)</del>
+				<li><del>IOUtils.pipe(Reader,Writer)</del>
 				<li>{@link oaj.internal.IOUtils#read(File)}
-				<li><del>IOUtils#readFile(String)</del>
-				<li><del>IOUtils#write(File,Reader)</del>
+				<li><del>IOUtils.readFile(String)</del>
+				<li><del>IOUtils.write(File,Reader)</del>
 			</ul>
 		<li>New methods on <del>PojoRest</del>:
 			<ul>
-				<li><del>PojoRest#get(Class,String,Object)</del>
-				<li><del>PojoRest#getString(String)</del>
-				<li><del>PojoRest#getString(String,String)</del>
-				<li><del>PojoRest#getInt(String)</del>
-				<li><del>PojoRest#getInt(String,Integer)</del>
-				<li><del>PojoRest#getLong(String)</del>
-				<li><del>PojoRest#getLong(String,Long)</del>
-				<li><del>PojoRest#getBoolean(String)</del>
-				<li><del>PojoRest#getBoolean(String,Boolean)</del>
-				<li><del>PojoRest#getMap(String)</del>
-				<li><del>PojoRest#getMap(String,Map)</del>
-				<li><del>PojoRest#getList(String)</del>
-				<li><del>PojoRest#getList(String,List)</del>
+				<li><del>PojoRest.get(Class,String,Object)</del>
+				<li><del>PojoRest.getString(String)</del>
+				<li><del>PojoRest.getString(String,String)</del>
+				<li><del>PojoRest.getInt(String)</del>
+				<li><del>PojoRest.getInt(String,Integer)</del>
+				<li><del>PojoRest.getLong(String)</del>
+				<li><del>PojoRest.getLong(String,Long)</del>
+				<li><del>PojoRest.getBoolean(String)</del>
+				<li><del>PojoRest.getBoolean(String,Boolean)</del>
+				<li><del>PojoRest.getMap(String)</del>
+				<li><del>PojoRest.getMap(String,Map)</del>
+				<li><del>PojoRest.getList(String)</del>
+				<li><del>PojoRest.getList(String,List)</del>
 				<li><del>getObjectMap(String)</del>
 				<li><del>getObjectMap(String,ObjectMap)</del>
 				<li><del>getObjectList(String)</del>
@@ -145,27 +145,27 @@
 			</ul>
 		<li>New methods on <del>ProcBuilder</del>:
 			<ul>
-				<li><del>ProcBuilder#pipeTo(Writer,boolean)</del>
-				<li><del>ProcBuilder#pipeTo(Writer)</del>
-				<li><del>ProcBuilder#logTo(Writer,boolean)</del>
-				<li><del>ProcBuilder#logTo(Writer)</del>
-				<li><del>ProcBuilder#logTo(Level,Logger)</del>
-				<li><del>ProcBuilder#maxExitStatus(int)</del>
+				<li><del>ProcBuilder.pipeTo(Writer,boolean)</del>
+				<li><del>ProcBuilder.pipeTo(Writer)</del>
+				<li><del>ProcBuilder.logTo(Writer,boolean)</del>
+				<li><del>ProcBuilder.logTo(Writer)</del>
+				<li><del>ProcBuilder.logTo(Level,Logger)</del>
+				<li><del>ProcBuilder.maxExitStatus(int)</del>
 			</ul>
 		<li>New methods on {@link oaj.internal.StringUtils}:
 			<ul>
-				<li><del>StringUtils#isEmpty(Object)</del>
+				<li><del>StringUtils.isEmpty(Object)</del>
 				<li>{@link oaj.internal.StringUtils#nullIfEmpty(String)}
 				<li>{@link oaj.internal.StringUtils#base64EncodeToString(String)}
 				<li>{@link oaj.internal.StringUtils#base64Encode(byte[])}
 				<li>{@link oaj.internal.StringUtils#base64DecodeToString(String)}
 				<li>{@link oaj.internal.StringUtils#base64Decode(String)}
-				<li><del>StringUtils#generateUUID(int)</del>
+				<li><del>StringUtils.generateUUID(int)</del>
 				<li>{@link oaj.internal.StringUtils#trim(String)}
-				<li><del>StringUtils#parseISO8601Date(String)</del>
+				<li><del>StringUtils.parseISO8601Date(String)</del>
 				<li>{@link oaj.internal.StringUtils#replaceVars(String,Map)}
-				<li><del>StringUtils#pathStartsWith(String,String)</del>
-				<li><del>StringUtils#pathStartsWith(String,String[])</del>
+				<li><del>StringUtils.pathStartsWith(String,String)</del>
+				<li><del>StringUtils.pathStartsWith(String,String[])</del>
 			</ul>
 		<li>New <del>StringVar.doResolve(String)</del>method.
 		<li>New <del>StringVarResolver.DEFAULT</del>field.
@@ -186,14 +186,14 @@
 		<li>New <del>UrlEncodingSerializer.DEFAULT_SIMPLE_EXPANDED</del>serializer.
 		<li>Changes to <del>Args</del>:
 			<ul>
-				<li><c>getMainArg(int)</c> changed to <del>Args#getArg(int)</del>.  
+				<li><c>getMainArg(int)</c> changed to <del>Args.getArg(int)</del>.  
 					Non-existent arguments are returned as <jk>null</jk> instead of blank strings.  
 					This is more inline with the behavior of the rest of the library.
 				<li>New <del>Args.hasArg(int)</del> method.
 			</ul> 
 		<li>Removed <c>org.apache.juneau.utils.CharsetUtils</c> class.
 		<li>Removed <c>org.apache.juneau.utils.ConcurrentIdentityList</c> class.
-		<li>Fixed bug in {@link oaj.internal.MultiIterable} class.
+		<li>Fixed bug in <del>MultiIterable</del> class.
 		<li><del>PojoIntrospector</del> must now be instantiated with a <c>ReaderParser</c>.
 			Simplifies the API on the class.
 		<li><del>PojoRest</del> must now be instantiated with a <c>ReaderParser</c>.
@@ -205,7 +205,7 @@
 		<li><del>SerializerGroup</del> and <del>ParserGroup</del>now ignores <c>NoClassDefFoundErrors</c>
 			so that resources that include Jena support can continue to operate even if the Jena libraries are not present.
 		<li>New {@link oaj.internal.FileUtils#createTempFile(String)} method.
-		<li>New {@link oaj.utils.PojoQuery} modified to handle bean getters that throw exceptions.
+		<li>New <del>PojoQuery</del> modified to handle bean getters that throw exceptions.
 	</ul>
 	
 	<h5 class='topic w800'>Client</h5>
@@ -222,90 +222,90 @@
 		<li>Removed <c>org.apache.juneau.rest.client.LaxRedirectStrategy</c>.  Use HTTP Client equivalent.
 		<li>New methods on <del>RestCall</del>:
 			<ul>
-				<li><del>RestCall#addInterceptor(RestCallInterceptor)</del>
-				<li><del>RestCall#pipeTo(Writer)</del>
-				<li><del>RestCall#pipeTo(Writer,boolean)</del>
-				<li><del>RestCall#pipeTo(String,Writer,boolean)</del>
-				<li><del>RestCall#getWriter(String)</del>
-				<li><del>RestCall#pipeTo(OutputStream)</del>
-				<li><del>RestCall#pipeTo(OutputStream,boolean)</del>
-				<li><del>RestCall#pipeTo(String,OutputStream,boolean)</del>
-				<li><del>RestCall#getOutputStream(String)</del>
-				<li><del>RestCall#byLines()</del>
-				<li><del>RestCall#captureResponse()</del>
-				<li><del>RestCall#successPattern(String)</del>
-				<li><del>RestCall#failurePattern(String)</del>
-				<li><del>RestCall#addResponsePattern(ResponsePattern)</del>
+				<li><del>RestCall.addInterceptor(RestCallInterceptor)</del>
+				<li><del>RestCall.pipeTo(Writer)</del>
+				<li><del>RestCall.pipeTo(Writer,boolean)</del>
+				<li><del>RestCall.pipeTo(String,Writer,boolean)</del>
+				<li><del>RestCall.getWriter(String)</del>
+				<li><del>RestCall.pipeTo(OutputStream)</del>
+				<li><del>RestCall.pipeTo(OutputStream,boolean)</del>
+				<li><del>RestCall.pipeTo(String,OutputStream,boolean)</del>
+				<li><del>RestCall.getOutputStream(String)</del>
+				<li><del>RestCall.byLines()</del>
+				<li><del>RestCall.captureResponse()</del>
+				<li><del>RestCall.successPattern(String)</del>
+				<li><del>RestCall.failurePattern(String)</del>
+				<li><del>RestCall.addResponsePattern(ResponsePattern)</del>
 				<li><del>RestCall.run()</del>- Renamed from <c>execute()</c>.
-				<li><del>RestCall#getCapturedResponse()</del>
-				<li><del>RestCall#getResponsePojoRest(Class)</del>
-				<li><del>RestCall#getResponsePojoRest()</del>
-				<li><del>RestCall#logTo(Level,Logger)</del>
-				<li><del>RestCall#setConfig(RequestConfig)</del>
+				<li><del>RestCall.getCapturedResponse()</del>
+				<li><del>RestCall.getResponsePojoRest(Class)</del>
+				<li><del>RestCall.getResponsePojoRest()</del>
+				<li><del>RestCall.logTo(Level,Logger)</del>
+				<li><del>RestCall.setConfig(RequestConfig)</del>
 			</ul>
 		<li>New lifecycle listener methods on <del>RestCallInterceptor</del>:
 			<ul>
-				<li><del>RestCallInterceptor#onInit(RestCall)</del>
-				<li><del>RestCallInterceptor#onClose(RestCall)</del>
+				<li><del>RestCallInterceptor.onInit(RestCall)</del>
+				<li><del>RestCallInterceptor.onClose(RestCall)</del>
 			</ul>
 		<li>New methods on {@link oajrc.RestClient}:
 			<ul>
-				<li><del>RestClient#setBasicAuth(String,int,String,String)</del>
-				<li><del>RestClient#logTo(Level,Logger)</del>
-				<li><del>RestClient#setRootUrl(String)</del>
-				<li><del>RestClient#enableSSL(SSLOpts)</del>
-				<li><del>RestClient#enableLaxSSL()</del>
-				<li><del>RestClient#doCall(HttpMethod,Object,Object)</del>
-				<li><del>RestClient#createHttpClientBuilder()</del>
+				<li><del>RestClient.setBasicAuth(String,int,String,String)</del>
+				<li><del>RestClient.logTo(Level,Logger)</del>
+				<li><del>RestClient.setRootUrl(String)</del>
+				<li><del>RestClient.enableSSL(SSLOpts)</del>
+				<li><del>RestClient.enableLaxSSL()</del>
+				<li><del>RestClient.doCall(HttpMethod,Object,Object)</del>
+				<li><del>RestClient.createHttpClientBuilder()</del>
 			</ul>
 		<li>New passthrough methods on {@link oajrc.RestClient} defined on <c>HttpClientBuilder</c>:
 			<ul>
-				<li><del>RestClient#setRedirectStrategy(RedirectStrategy)</del>
-				<li><del>RestClient#setDefaultCookieSpecRegistry(Lookup)</del>
-				<li><del>RestClient#setRequestExecutor(HttpRequestExecutor)</del>
-				<li><del>RestClient#setSSLHostnameVerifier(HostnameVerifier)</del>
-				<li><del>RestClient#setPublicSuffixMatcher(PublicSuffixMatcher)</del>
-				<li><del>RestClient#setSSLContext(SSLContext)</del>
-				<li><del>RestClient#setSSLSocketFactory(LayeredConnectionSocketFactory)</del>
-				<li><del>RestClient#setMaxConnTotal(int)</del>
-				<li><del>RestClient#setMaxConnPerRoute(int)</del>
-				<li><del>RestClient#setDefaultSocketConfig(SocketConfig)</del>
-				<li><del>RestClient#setDefaultConnectionConfig(ConnectionConfig)</del>
-				<li><del>RestClient#setConnectionTimeToLive(long,TimeUnit)</del>
-				<li><del>RestClient#setConnectionManager(HttpClientConnectionManager)</del>
-				<li><del>RestClient#setConnectionManagerShared(boolean)</del>
-				<li><del>RestClient#setConnectionReuseStrategy(ConnectionReuseStrategy)</del>
-				<li><del>RestClient#setKeepAliveStrategy(ConnectionKeepAliveStrategy)</del>
-				<li><del>RestClient#setTargetAuthenticationStrategy(AuthenticationStrategy)</del>
-				<li><del>RestClient#setProxyAuthenticationStrategy(AuthenticationStrategy)</del>
-				<li><del>RestClient#setUserTokenHandler(UserTokenHandler)</del>
-				<li><del>RestClient#disableConnectionState()</del>
-				<li><del>RestClient#setSchemePortResolver(SchemePortResolver)</del>
+				<li><del>RestClient.setRedirectStrategy(RedirectStrategy)</del>
+				<li><del>RestClient.setDefaultCookieSpecRegistry(Lookup)</del>
+				<li><del>RestClient.setRequestExecutor(HttpRequestExecutor)</del>
+				<li><del>RestClient.setSSLHostnameVerifier(HostnameVerifier)</del>
+				<li><del>RestClient.setPublicSuffixMatcher(PublicSuffixMatcher)</del>
+				<li><del>RestClient.setSSLContext(SSLContext)</del>
+				<li><del>RestClient.setSSLSocketFactory(LayeredConnectionSocketFactory)</del>
+				<li><del>RestClient.setMaxConnTotal(int)</del>
+				<li><del>RestClient.setMaxConnPerRoute(int)</del>
+				<li><del>RestClient.setDefaultSocketConfig(SocketConfig)</del>
+				<li><del>RestClient.setDefaultConnectionConfig(ConnectionConfig)</del>
+				<li><del>RestClient.setConnectionTimeToLive(long,TimeUnit)</del>
+				<li><del>RestClient.setConnectionManager(HttpClientConnectionManager)</del>
+				<li><del>RestClient.setConnectionManagerShared(boolean)</del>
+				<li><del>RestClient.setConnectionReuseStrategy(ConnectionReuseStrategy)</del>
+				<li><del>RestClient.setKeepAliveStrategy(ConnectionKeepAliveStrategy)</del>
+				<li><del>RestClient.setTargetAuthenticationStrategy(AuthenticationStrategy)</del>
+				<li><del>RestClient.setProxyAuthenticationStrategy(AuthenticationStrategy)</del>
+				<li><del>RestClient.setUserTokenHandler(UserTokenHandler)</del>
+				<li><del>RestClient.disableConnectionState()</del>
+				<li><del>RestClient.setSchemePortResolver(SchemePortResolver)</del>
 				<li><del>setUserAgent(String)</del>
-				<li><del>RestClient#setDefaultHeaders(Collection)</del>
-				<li><del>RestClient#addInterceptorFirst(HttpResponseInterceptor)</del>
-				<li><del>RestClient#addInterceptorLast(HttpResponseInterceptor)</del>
-				<li><del>RestClient#addInterceptorFirst(HttpRequestInterceptor)</del>
-				<li><del>RestClient#addInterceptorLast(HttpRequestInterceptor)</del>
-				<li><del>RestClient#disableCookieManagement()</del>
-				<li><del>RestClient#disableContentCompression()</del>
-				<li><del>RestClient#disableAuthCaching()</del>
-				<li><del>RestClient#setHttpProcessor(HttpProcessor)</del>
-				<li><del>RestClient#setRetryHandler(HttpRequestRetryHandler)</del>
-				<li><del>RestClient#disableAutomaticRetries()</del>
-				<li><del>RestClient#setProxy(HttpHost)</del>
-				<li><del>RestClient#setRoutePlanner(HttpRoutePlanner)</del>
-				<li><del>RestClient#disableRedirectHandling()</del>
-				<li><del>RestClient#setConnectionBackoffStrategy(ConnectionBackoffStrategy)</del>
-				<li><del>RestClient#setBackoffManager(BackoffManager)</del>
-				<li><del>RestClient#setServiceUnavailableRetryStrategy(ServiceUnavailableRetryStrategy)</del>
-				<li><del>RestClient#setDefaultCookieStore(CookieStore)</del>
-				<li><del>RestClient#setDefaultCredentialsProvider(CredentialsProvider)</del>
-				<li><del>RestClient#setDefaultAuthSchemeRegistry(Lookup)</del>
-				<li><del>RestClient#setContentDecoderRegistry(Map)</del>
-				<li><del>RestClient#setDefaultRequestConfig(RequestConfig)</del>
-				<li><del>RestClient#useSystemProperties()</del>
-				<li><del>RestClient#evictExpiredConnections()</del>
+				<li><del>RestClient.setDefaultHeaders(Collection)</del>
+				<li><del>RestClient.addInterceptorFirst(HttpResponseInterceptor)</del>
+				<li><del>RestClient.addInterceptorLast(HttpResponseInterceptor)</del>
+				<li><del>RestClient.addInterceptorFirst(HttpRequestInterceptor)</del>
+				<li><del>RestClient.addInterceptorLast(HttpRequestInterceptor)</del>
+				<li><del>RestClient.disableCookieManagement()</del>
+				<li><del>RestClient.disableContentCompression()</del>
+				<li><del>RestClient.disableAuthCaching()</del>
+				<li><del>RestClient.setHttpProcessor(HttpProcessor)</del>
+				<li><del>RestClient.setRetryHandler(HttpRequestRetryHandler)</del>
+				<li><del>RestClient.disableAutomaticRetries()</del>
+				<li><del>RestClient.setProxy(HttpHost)</del>
+				<li><del>RestClient.setRoutePlanner(HttpRoutePlanner)</del>
+				<li><del>RestClient.disableRedirectHandling()</del>
+				<li><del>RestClient.setConnectionBackoffStrategy(ConnectionBackoffStrategy)</del>
+				<li><del>RestClient.setBackoffManager(BackoffManager)</del>
+				<li><del>RestClient.setServiceUnavailableRetryStrategy(ServiceUnavailableRetryStrategy)</del>
+				<li><del>RestClient.setDefaultCookieStore(CookieStore)</del>
+				<li><del>RestClient.setDefaultCredentialsProvider(CredentialsProvider)</del>
+				<li><del>RestClient.setDefaultAuthSchemeRegistry(Lookup)</del>
+				<li><del>RestClient.setContentDecoderRegistry(Map)</del>
+				<li><del>RestClient.setDefaultRequestConfig(RequestConfig)</del>
+				<li><del>RestClient.useSystemProperties()</del>
+				<li><del>RestClient.evictExpiredConnections()</del>
 				<li><del>RestClient.evictIdleConnections(long,TimeUnit)</del>
 			</ul>
 		<li><c>JazzRestClient</c> now supports OIDC authentication.
@@ -334,7 +334,7 @@
 			<ul>
 				<li><del>RestRequest.getReaderResource(String)</del>- Replaces <c>getVarResource(String)</c>.
 				<li><del>RestRequest.getReaderResource(String,boolean)</del>
-				<li><del>RestRequest#getReaderResource(String,boolean,String)</del>
+				<li><del>RestRequest.getReaderResource(String,boolean,String)</del>
 			</ul>
 		<li>Changes in {@link oajr.RestResponse}:
 			<ul>
@@ -359,8 +359,8 @@
 		<li>Removed <c>RestServletProperties.REST_htDocsFolder</c>.  Replaced with <del>@RestResource(staticFiles)</del>}.
 		<li>New annotations on <del>@RestResource</del>.
 			<ul>
-				<li><del>RestResource#stylesheet()</del>
-				<li><del>RestResource#favicon()</del>
+				<li><del>RestResource.stylesheet()</del>
+				<li><del>RestResource.favicon()</del>
 				<li><del>@RestResource(staticFiles)</del>
 			</ul>
 		<li>Eliminated <c>org.apache.juneau.rest.jaxrs.JsonProvider</c> class.  
diff --git a/juneau-doc/docs/ReleaseNotes/5.2.0.1.html b/juneau-doc/docs/ReleaseNotes/5.2.0.1.html
index 92d9064a7..514753a90 100644
--- a/juneau-doc/docs/ReleaseNotes/5.2.0.1.html
+++ b/juneau-doc/docs/ReleaseNotes/5.2.0.1.html
@@ -28,16 +28,16 @@
 		<li>Fixed issue in {@link oaj.xml.XmlSerializer} where <js>'\r'</js> and <js>'\n'</js> characters were not being handled per XML specs.
 		<li>New methods on <del>ObjectList</del>:  
 			<ul>
-				<li><del>ObjectList#getAt(Class,String)</del>
-				<li><del>ObjectList#putAt(String,Object)</del>
-				<li><del>ObjectList#postAt(String,Object)</del>
-				<li><del>ObjectList#deleteAt(String)</del>
+				<li><del>ObjectList.getAt(Class,String)</del>
+				<li><del>ObjectList.putAt(String,Object)</del>
+				<li><del>ObjectList.postAt(String,Object)</del>
+				<li><del>ObjectList.deleteAt(String)</del>
 			</ul>
 		<li>New methods on <del>ObjectMap</del>:  
 			<ul>
-				<li><del>ObjectMap#getAt(Class,String)</del>
-				<li><del>ObjectMap#putAt(String,Object)</del>
-				<li><del>ObjectMap#postAt(String,Object)</del>
+				<li><del>ObjectMap.getAt(Class,String)</del>
+				<li><del>ObjectMap.putAt(String,Object)</del>
+				<li><del>ObjectMap.postAt(String,Object)</del>
 				<li><del>ObjectMap.deleteAt(String)</del>
 			</ul>
 		<li><del>@ThreadSafe</del>annotation.
diff --git a/juneau-doc/docs/ReleaseNotes/6.0.0.html b/juneau-doc/docs/ReleaseNotes/6.0.0.html
index fd42fd1c4..c9bbb5aa8 100644
--- a/juneau-doc/docs/ReleaseNotes/6.0.0.html
+++ b/juneau-doc/docs/ReleaseNotes/6.0.0.html
@@ -28,9 +28,9 @@
 		<li>Major changes around how serializer and parser class properties are defined to improve performance
 			and concurrency.
 			<ul>
-				<li>New {@link oaj.PropertyStore} class - Used for creating context objects.
+				<li>New <del>PropertyStore</del> class - Used for creating context objects.
 				<li>New {@link oaj.Context} class - Read-only configurations for serializers and parsers.
-				<li>New {@link oaj.Session} class - One-time use objects used by serializers and parsers.
+				<li>New <del>Session</del> class - One-time use objects used by serializers and parsers.
 				<li>All context context properties can now also be specified via system properties.
 			</ul>
 		</li>
@@ -58,7 +58,7 @@
 					during parsing. 
 				<li><del>BEAN_beanTypePropertyName</del> - The overridable type property name.  Default is <js>"_type"</js>.
 				<li><del>@BeanProperty(beanDictionary)</del>- Define a type dictionary
-					for a particular bean property value.  This overrides the value specified using <del>BeanContext#BEAN_beanDictionary</del>.
+					for a particular bean property value.  This overrides the value specified using <del>BeanContext.BEAN_beanDictionary</del>.
 				<li><del>SerializerContext.SERIALIZER_addBeanTypeProperties</del>- Controls whether type properties are serialized.
 			</ul>
 			In addition, the {@link oaj.annotation.Bean#typeName() @Bean(typeName)} value replaces the <c>@Xml(name)</c> annotation, and the 
@@ -77,13 +77,13 @@
 		<li>New methods on {@link oaj.parser.Parser}:
 			<ul>
 				<li><c>org.apache.juneau.parser.Parser.createSession(ObjectMap,Method,Object)</c>
-				<li><del>Parser#getMediaRanges()</del>
+				<li><del>Parser.getMediaRanges()</del>
 			</ul>
 		</li>
 		<li>New methods on {@link oaj.serializer.Serializer}:
 			<ul>
 				<li><c>org.apache.juneau.serializer.Serializer.createSession(ObjectMap,Method)</c>
-				<li><del>Serializer#getMediaRanges()</del>
+				<li><del>Serializer.getMediaRanges()</del>
 			</ul>
 		</li>
 		<li>New {@link oaj.annotation.Bean#sort() @Bean(sort)} annotation.
@@ -93,7 +93,7 @@
 		<li>Serializers and parsers now automatically convert {@link java.lang.Class} objects to readable names via <del>ClassUtils.getReadableClassName(Class)</del>.
 		<li>Eliminated the <c>ClassFilter</c> class since it's no longer needed.
 		<li>Code and concurrency improvements to <del>SerializerGroup</del>and <del>ParserGroup</del>.
-		<li>Various enhancements to <del>BeanContext#convertToType(Object,Class)</del>.
+		<li>Various enhancements to <del>BeanContext.convertToType(Object,Class)</del>.
 		<li>New properties on {@link oaj.html.HtmlSerializer}:
 			<ul>
 				<li><del>HtmlSerializerContext.HTML_detectLinksInStrings</del>- Automatically detect hyperlinks in strings.
@@ -119,7 +119,7 @@
 		<li>OPTIONS pages replaced with Swagger documents.
 			Lots of changes related to supporting Swagger.
 			<ul>
-				<li>Annotation name changes to conform to Swagger specs:  <ja>@Attr</ja>-><ja>@Path</ja>, <ja>@QParam</ja>-><ja>@Query</ja>, <ja>@Param</ja>-><ja>@FormData</ja>, <ja>@Content</ja>-><ja>@Body</ja>
+				<li>Annotation name changes to conform to Swagger specs:  <ja>@Attr</ja>-&gt;<ja>@Path</ja>, <ja>@QParam</ja>-&gt;<ja>@Query</ja>, <ja>@Param</ja>-&gt;<ja>@FormData</ja>, <ja>@Content</ja>-&gt;<ja>@Body</ja>
 				<li>Eliminated <c>ResourceOptions</c> and related code.
 				<li>New annotations and related methods:
 					<ul>
@@ -131,7 +131,7 @@
 						<li><del>@RestResource(version)</del>/ <del>RestInfoProvider.getVersion(RestRequest)</del>
 						<li><del>@RestResource(tags)</del>/ <del>RestInfoProvider.getTags(RestRequest)</del>
 						<li><del>@RestResource(externalDocs)</del>/ <del>RestInfoProvidergetExternalDocs(RestRequest)</del>
-						<li><del>RestMethod.summary() @RestMethod(summary)</del>/ <del>RestInfoProvider#getMethodSummary(String,RestRequest)</del>
+						<li><del>RestMethod.summary() @RestMethod(summary)</del>/ <del>RestInfoProvider.getMethodSummary(String,RestRequest)</del>
 						<li><del>RestMethod.description() @RestMethod(description)</del>/<del>RestInfoProvider.getMethodDescription(String,RestRequest)</del>
 						<li><del>@RestMethod(externalDocs)</del>
 						<li><del>@RestMethod(tags)</del>
@@ -144,20 +144,20 @@
 		<li>New <del>RestServletContext.paramFormat</del>context property.
 		<li>New/updated methods on <del>RestServlet</del>:
 			<ul>
-				<li><del>RestServlet#createProperties()</del>
-				<li><del>RestServlet#createBeanContext(ObjectMap,Class[],Class[])</del>
-				<li><del>RestServlet#createBeanFilters()</del>
-				<li><del>RestServlet#createPojoSwaps()</del>
-				<li><del>RestServlet#createParsers(ObjectMap,Class[],Class[])</del>
-				<li><del>RestServlet#createUrlEncodingSerializer(ObjectMap,Class[],Class[])</del>
-				<li><del>RestServlet#createUrlEncodingParser(ObjectMap,Class[],Class[])</del>
-				<li><del>RestServlet#createConverters(ObjectMap)</del>
-				<li><del>RestServlet#createDefaultRequestHeaders(ObjectMap)</del>
-				<li><del>RestServlet#createDefaultResponseHeaders(ObjectMap)</del>
-				<li><del>RestServlet#createEncoders(ObjectMap)</del>
-				<li><del>RestServlet#createGuards(ObjectMap)</del>
-				<li><del>RestServlet#createMimetypesFileTypeMap(ObjectMap)</del>
-				<li><del>RestServlet#createResponseHandlers(ObjectMap)</del>
+				<li><del>RestServlet.createProperties()</del>
+				<li><del>RestServlet.createBeanContext(ObjectMap,Class[],Class[])</del>
+				<li><del>RestServlet.createBeanFilters()</del>
+				<li><del>RestServlet.createPojoSwaps()</del>
+				<li><del>RestServlet.createParsers(ObjectMap,Class[],Class[])</del>
+				<li><del>RestServlet.createUrlEncodingSerializer(ObjectMap,Class[],Class[])</del>
+				<li><del>RestServlet.createUrlEncodingParser(ObjectMap,Class[],Class[])</del>
+				<li><del>RestServlet.createConverters(ObjectMap)</del>
+				<li><del>RestServlet.createDefaultRequestHeaders(ObjectMap)</del>
+				<li><del>RestServlet.createDefaultResponseHeaders(ObjectMap)</del>
+				<li><del>RestServlet.createEncoders(ObjectMap)</del>
+				<li><del>RestServlet.createGuards(ObjectMap)</del>
+				<li><del>RestServlet.createMimetypesFileTypeMap(ObjectMap)</del>
+				<li><del>RestServlet.createResponseHandlers(ObjectMap)</del>
 			</ul>
 		</li>
 		<li>New client-version annotations:
@@ -171,6 +171,6 @@
 	<h5 class='topic w800'>org.apache.juneau.rest.client</h5>
 	<ul class='spaced-list'>
 		<li>Removed the <c>JazzRestClient</c> class.
-		<li>New method <del>RestClient#setClientVersion(String)</del>.
+		<li>New method <del>RestClient.setClientVersion(String)</del>.
 	</ul>		
 </div>
\ No newline at end of file
diff --git a/juneau-doc/docs/ReleaseNotes/6.0.1.html b/juneau-doc/docs/ReleaseNotes/6.0.1.html
index 34eaddc50..b83ff8bbc 100644
--- a/juneau-doc/docs/ReleaseNotes/6.0.1.html
+++ b/juneau-doc/docs/ReleaseNotes/6.0.1.html
@@ -28,9 +28,9 @@
 			</ul>
 		<li>New properties in <del>ParserContext</del>.
 			<ul>
-				<li><del>ParserContext#PARSER_strict</del>
-				<li><del>ParserContext#PARSER_inputStreamCharset</del>
-				<li><del>ParserContext#PARSER_fileCharset</del>
+				<li><del>ParserContext.PARSER_strict</del>
+				<li><del>ParserContext.PARSER_inputStreamCharset</del>
+				<li><del>ParserContext.PARSER_fileCharset</del>
 			</ul>
 		<li>Removed <c>JsonParserContext.JSON_strictMode</c>.  Replaced by <c>PARSER_strict</c>.		
 		<li><c><jk>byte[]</jk></c> arrays can now be passed to {@link oaj.parser.Parser#parse(Object,Class)} for reader-based parsers.	
diff --git a/juneau-doc/docs/ReleaseNotes/6.1.0.html b/juneau-doc/docs/ReleaseNotes/6.1.0.html
index e93ab3fdf..1adc881f0 100644
--- a/juneau-doc/docs/ReleaseNotes/6.1.0.html
+++ b/juneau-doc/docs/ReleaseNotes/6.1.0.html
@@ -21,7 +21,7 @@
 	</p>
 	<p>
 		In particular, this release cleans up the {@link oaj.BeanContext} API to match
-		the {@link oaj.PropertyStore}/{@link oaj.Context}/{@link oaj.Session} paradigm
+		the <del>PropertyStore</del>/{@link oaj.Context}/<del>Session</del> paradigm
 		previously used in the serializer and parser APIs.
 		It also makes several improvements to the HTML and XML serialization support and introduces HTML5 DTO beans.
 	</p>
@@ -127,8 +127,8 @@
 		</ul>
 		<li>Simplified <del>PojoSwap</del> class.  Now just two methods:
 		<ul>
-			<li><del>PojoSwap#swap(BeanSession,Object)</del>
-			<li><del>PojoSwap#unswap(BeanSession,Object,ClassMeta)</del>
+			<li><del>PojoSwap.swap(BeanSession,Object)</del>
+			<li><del>PojoSwap.unswap(BeanSession,Object,ClassMeta)</del>
 		</ul>
 		<li>General code improvements made to {@link oaj.ClassMeta} class.
 		<ul>
@@ -152,17 +152,17 @@
 			<li><del>DateTimeSimple</del>,<del>DateTimeSimple</del> - To simple <js>"yyyy/MM/dd HH:mm:ss"</js> date-time strings.
 			<li><del>DateSimple</del>,<del>DateSimple</del> - To simple <js>"yyyy/MM/dd"</js> date strings.
 			<li><del>TimeSimple</del>,<del>TimeSimple</del> - To simple <js>"HH:mm:ss"</js> time strings.
-			<li><del>DateFull</del>,<del>DateFull</del> - To {@link java.text.DateFormat.FULL} date strings.
+			<li><del>DateFull</del>,<del>DateFull</del> - To {@link java.text.DateFormat#FULL} date strings.
 			<li><del>DateLong</del>,<del>DateLong</del>- To {@link java.text.DateFormat#LONG} date strings.
-			<li><del>DateMedium</del>,<del>DateMedium</del> - To {@link java.text.DateFormat.MEDIUM} date strings.
+			<li><del>DateMedium</del>,<del>DateMedium</del> - To {@link java.text.DateFormat#MEDIUM} date strings.
 			<li><del>DateShort</del>,<del>DateShort</del>- To {@link java.text.DateFormat#SHORT} date strings.
-			<li><del>TimeFull</del>,<del>TimeFull</del> - To {@link java.text.DateFormat.FULL} time strings.
+			<li><del>TimeFull</del>,<del>TimeFull</del> - To {@link java.text.DateFormat#FULL} time strings.
 			<li><del>TimeLong</del>,<del>TimeLong</del>- To {@link java.text.DateFormat#LONG} time strings.
-			<li><del>TimeMedium</del>,<del>TimeMedium</del> - To {@link java.text.DateFormat.MEDIUM} time strings.
+			<li><del>TimeMedium</del>,<del>TimeMedium</del> - To {@link java.text.DateFormat#MEDIUM} time strings.
 			<li><del>TimeShort</del>,<del>TimeShort</del>- To {@link java.text.DateFormat#SHORT} time strings.
-			<li><del>DateTimeFull</del>,<del>DateTimeFull</del> - To {@link java.text.DateFormat.FULL} date-time strings.
+			<li><del>DateTimeFull</del>,<del>DateTimeFull</del> - To {@link java.text.DateFormat#FULL} date-time strings.
 			<li><del>DateTimeLong</del>,<del>DateTimeLong</del>- To {@link java.text.DateFormat#LONG} date-time strings.
-			<li><del>DateTimeMedium</del>,<del>DateTimeMedium</del> - To {@link java.text.DateFormat.MEDIUM} date-time strings.
+			<li><del>DateTimeMedium</del>,<del>DateTimeMedium</del> - To {@link java.text.DateFormat#MEDIUM} date-time strings.
 			<li><del>DateTimeShort</del>,<del>DateTimeShort</del>- To {@link java.text.DateFormat#SHORT} date-time strings.
 		</ul>  
 		<li>New method <del>SerializerGroup.getSerializerMatch(String)</del>that returns the matched serializer and media type.
@@ -221,24 +221,24 @@
 		<li>Standardized the following methods in {@link oajr.RestRequest} to remove dependency on <c>ClassMeta</c>
 			objects and eliminate the need for casts:
 			<ul>
-				<li><del>RestRequest#getHeader(String,Class)</del>
-				<li><del>RestRequest#getHeader(String,Object,Class)</del>
-				<li>{@del RestRequest#getHeader(String,Type,Type...)}
-				<li><del>RestRequest#getQueryParameter(String,Class)</del>
-				<li><del>RestRequest#getQueryParameter(String,Object,Class)</del>
-				<li>{@del RestRequest#getQueryParameter(String,Type,Type...)}
-				<li>{@del RestRequest#getQueryParameter(String,Object,Type,Type...)}
-				<li><del>RestRequest#getQueryParameters(String,Class)</del>
-				<li>{@del RestRequest#getQueryParameters(String,Type,Type...)}
-				<li><del>RestRequest#getFormDataParameter(String,Class)</del>
-				<li><del>RestRequest#getFormDataParameter(String,Object,Class)</del>
-				<li><del>RestRequest#getFormDataParameters(String,Class)</del>
-				<li>{@del RestRequest#getFormDataParameter(String,Type,Type...)}
-				<li>{@del RestRequest#getFormDataParameters(String,Type,Type...)}
-				<li><del>RestRequest#getPathParameter(String,Class)</del>
-				<li>{@del RestRequest#getPathParameter(String,Type,Type...)}
-				<li><del>RestRequest#getBody(Class)</del>
-				<li>{@del RestRequest#getBody(Type,Type...)}
+				<li><del>RestRequest.getHeader(String,Class)</del>
+				<li><del>RestRequest.getHeader(String,Object,Class)</del>
+				<li><del> RestRequest.getHeader(String,Type,Type...)</del>
+				<li><del>RestRequest.getQueryParameter(String,Class)</del>
+				<li><del>RestRequest.getQueryParameter(String,Object,Class)</del>
+				<li><del> RestRequest.getQueryParameter(String,Type,Type...)</del>
+				<li><del> RestRequest.getQueryParameter(String,Object,Type,Type...)</del>
+				<li><del>RestRequest.getQueryParameters(String,Class)</del>
+				<li><del> RestRequest.getQueryParameters(String,Type,Type...)</del>
+				<li><del>RestRequest.getFormDataParameter(String,Class)</del>
+				<li><del>RestRequest.getFormDataParameter(String,Object,Class)</del>
+				<li><del>RestRequest.getFormDataParameters(String,Class)</del>
+				<li><del> RestRequest.getFormDataParameter(String,Type,Type...)</del>
+				<li><del> RestRequest.getFormDataParameters(String,Type,Type...)</del>
+				<li><del>RestRequest.getPathParameter(String,Class)</del>
+				<li><del> RestRequest.getPathParameter(String,Type,Type...)</del>
+				<li><del>RestRequest.getBody(Class)</del>
+				<li><del> RestRequest.getBody(Type,Type...)</del>
 			</ul>
 		<li>New methods on <del>NameValuePairs</del>
 		<li>Fixed issue where whitespace was not added to UON/URL-Encoding output when <c>&amp;plainText=true</c> specified.
diff --git a/juneau-doc/docs/ReleaseNotes/6.2.0.html b/juneau-doc/docs/ReleaseNotes/6.2.0.html
index 8b671fb07..33c3d36de 100644
--- a/juneau-doc/docs/ReleaseNotes/6.2.0.html
+++ b/juneau-doc/docs/ReleaseNotes/6.2.0.html
@@ -57,12 +57,12 @@
 			<del>SerializerContext.SERIALIZER_addBeanTypeProperties</del>setting
 			for individual serializers in a serializer group:
 			<ul>
-				<li><del>HtmlSerializerContext#HTML_addBeanTypeProperties</del>
-				<li><del>JsonSerializerContext#JSON_addBeanTypeProperties</del>
-				<li><del>MsgPackSerializerContext#MSGPACK_addBeanTypeProperties</del>
-				<li><del>UonSerializerContext#UON_addBeanTypeProperties</del>
-				<li><del>XmlSerializerContext#XML_addBeanTypeProperties</del>
-				<li><del>RdfSerializerContext#RDF_addBeanTypeProperties</del>
+				<li><del>HtmlSerializerContext.HTML_addBeanTypeProperties</del>
+				<li><del>JsonSerializerContext.JSON_addBeanTypeProperties</del>
+				<li><del>MsgPackSerializerContext.MSGPACK_addBeanTypeProperties</del>
+				<li><del>UonSerializerContext.UON_addBeanTypeProperties</del>
+				<li><del>XmlSerializerContext.XML_addBeanTypeProperties</del>
+				<li><del>RdfSerializerContext.RDF_addBeanTypeProperties</del>
 			</ul>
 		<li>UON notation serializers and parsers moved into the new <c>org.apache.juneau.uon</c> package.
 		<li>New {@link oaj.xml.annotation.XmlFormat#VOID} format to identify HTML void elements.
@@ -104,10 +104,10 @@
 			<br><ja>@Remoteable</ja> annotation has been moved to this package.
 		<li>Updated doc: <dc>6 - Remoteable Services</dc>
 		<li>New doc: <dc>6.1 -  Interface proxies against 3rd-party REST interfaces</dc>
-		<li>New URL-encoding serializer setting: <del>UrlEncodingSerializerContext#URLENC_paramFormat</del>.
+		<li>New URL-encoding serializer setting: <del>UrlEncodingSerializerContext.URLENC_paramFormat</del>.
 		<li>New methods on {@link oaj.urlencoding.UrlEncodingSerializer.Builder}:
 		<ul>
-			<li><del>Builder#paramFormat(String)</del>	
+			<li><del>Builder.paramFormat(String)</del>	
 			<li><del>Builder.plainTextParams()</del>	
 		</ul> 		
 	</ul>
@@ -225,40 +225,40 @@
 		<ul>
 			<li><del>RestClient.getRemoteableProxy(Class,Object)</del>- For interface proxies defined using <c><ja>@RestMethod</ja>(name=<js>"PROXY"</js>)</c>.
 			<li><del>RestClient.getRemoteableProxy(Class,Object,Serializer,Parser)</del>- Same as above but overrides the serializer and parser defined on the client.
-			<li><del>RestClient#doPost(Object)</del>
+			<li><del>RestClient.doPost(Object)</del>
 			<li><del>RestClient.doCall(HttpMethod,Object,Object)</del> - Can now pass in instances of <del>NameValuePairs</del>for easy form posts.
 				<br>This extends to all methods that take in the input.
 		</ul>
 		<li>New methods on <del>RestCall</del>:
 			<ul>
-				<li><del>RestCall#uri(Object) uri(Object)</del>
+				<li><del>RestCall.uri(Object) uri(Object)</del>
 				<li><del>query(String,Object,boolean,PartSerializer)</del>
-				<li><del>RestCall#query(String,Object) query(String,Object)</del>
-				<li><del>RestCall#queryIfNE(String,Object) queryIfNE(String,Object)</del>
-				<li><del>RestCall#query(Map) query(Map)</del>
-				<li><del>RestCall#queryIfNE(Map) queryIfNE(Map)</del>
-				<li><del>RestCall#query(String) query(String)</del>
+				<li><del>RestCall.query(String,Object) query(String,Object)</del>
+				<li><del>RestCall.queryIfNE(String,Object) queryIfNE(String,Object)</del>
+				<li><del>RestCall.query(Map) query(Map)</del>
+				<li><del>RestCall.queryIfNE(Map) queryIfNE(Map)</del>
+				<li><del>RestCall.query(String) query(String)</del>
 				<li><del>formData(String,Object,boolean,PartSerializer)</del>
-				<li><del>RestCall#formData(String,Object) formData(String,Object)</del>
-				<li><del>RestCall#formDataIfNE(String,Object) formDataIfNE(String,Object)</del>
-				<li><del>RestCall#formData(Map) formData(Map)</del>
-				<li><del>RestCall#formDataIfNE(Map) formDataIfNE(Map)</del>
+				<li><del>RestCall.formData(String,Object) formData(String,Object)</del>
+				<li><del>RestCall.formDataIfNE(String,Object) formDataIfNE(String,Object)</del>
+				<li><del>RestCall.formData(Map) formData(Map)</del>
+				<li><del>RestCall.formDataIfNE(Map) formDataIfNE(Map)</del>
 				<li><del>header(String,Object,boolean,PartSerializer)</del>
-				<li><del>RestCall#header(String,Object) header(String,Object)</del>
-				<li><del>RestCall#headerIfNE(String,Object) headerIfNE(String,Object)</del>
-				<li><del>RestCall#headers(Map) headers(Map)</del>
-				<li><del>RestCall#headersIfNE(Map) headersIfNE(Map)</del>
-				<li><del>RestCall#host(String) host(String)</del>
-				<li><del>RestCall#port(int) port(int)</del>
-				<li><del>RestCall#userInfo(String,String) userInfo(String,String)</del>
-				<li><del>RestCall#userInfo(String) userInfo(String)</del>
-				<li><del>RestCall#scheme(String) scheme(String)</del>
+				<li><del>RestCall.header(String,Object) header(String,Object)</del>
+				<li><del>RestCall.headerIfNE(String,Object) headerIfNE(String,Object)</del>
+				<li><del>RestCall.headers(Map) headers(Map)</del>
+				<li><del>RestCall.headersIfNE(Map) headersIfNE(Map)</del>
+				<li><del>RestCall.host(String) host(String)</del>
+				<li><del>RestCall.port(int) port(int)</del>
+				<li><del>RestCall.userInfo(String,String) userInfo(String,String)</del>
+				<li><del>RestCall.userInfo(String) userInfo(String)</del>
+				<li><del>RestCall.scheme(String) scheme(String)</del>
 			</ul>
 		<li>New methods added to {@link oajrc.RestClient.Builder}:
 			<ul>
 				<li>{@link oajrc.RestClient.Builder#executorService(ExecutorService,boolean) executorService(ExecutorService,boolean)}
-				<li><del>Builder#paramFormat(String)</del>
-				<li><del>Builder#plainTextParams()</del>
+				<li><del>Builder.paramFormat(String)</del>
+				<li><del>Builder.plainTextParams()</del>
 				<li>{@link oajrc.RestClient.Builder#noTrace() noTrace()} - Adds a <c>No-Trace: true</c> header on all requests to prevent
 					the servlet from logging errors.
 					<br>Useful for testing scenarios when you don't want the console to end up showing errors done on purpose.
@@ -266,10 +266,10 @@
 			</ul>
 		<li>New methods added/updated to <del>RestCall</del>:
 			<ul>
-				<li><del>RestCall#runFuture() runFuture()</del>
-				<li><del>RestCall#getResponseFuture(Class) getResponseFuture(Class)</del>
-				<li>{@del oajrc.RestCall#getResponseFuture(Type,Type...) getResponseFuture(Type,Type...)}
-				<li><del>RestCall#getResponseAsStringFuture() getResponseAsStringFuture()</del>
+				<li><del>RestCall.runFuture() runFuture()</del>
+				<li><del>RestCall.getResponseFuture(Class) getResponseFuture(Class)</del>
+				<li><del> oajrc.RestCall.getResponseFuture(Type,Type...) getResponseFuture(Type,Type...)</del>
+				<li><del>RestCall.getResponseAsStringFuture() getResponseAsStringFuture()</del>
 				<li><del>RestCall.serializer(Serializer) serializer(Serializer)</del>- Override the serializer defined on the client for a single call.
 				<li><del>RestCall.parser(Parser) parser(Parser)</del> - Override the parser defined on the client for a single call.
 				<li><del>input(Object)</del>- Now accepts instances of <del>NameValuePairs</del>.
diff --git a/juneau-doc/docs/ReleaseNotes/6.3.0.html b/juneau-doc/docs/ReleaseNotes/6.3.0.html
index e4ef84f41..d8164ad5b 100644
--- a/juneau-doc/docs/ReleaseNotes/6.3.0.html
+++ b/juneau-doc/docs/ReleaseNotes/6.3.0.html
@@ -40,19 +40,19 @@
 			</p>
 		<li>New/modified methods on <del>ConfigFile</del>:
 			<ul>
-				<li><del>ConfigFile#put(String,String,String,boolean)</del>
-				<li><del>ConfigFile#put(String,String,Object,Serializer,boolean,boolean)</del>
-				<li>{@del ConfigFile#getObject(String,Type,Type...)}
-				<li>{@del ConfigFile#getObject(String,Parser,Type,Type...)}
-				<li><del>ConfigFile#getObject(String,Class)</del>
-				<li><del>ConfigFile#getObject(String,Parser,Class)</del>
-				<li>{@del ConfigFile#getObject(String,String,Type,Type...)}
-				<li>{@del ConfigFile#getObject(String,String,Parser,Type,Type...)}
-				<li><del>ConfigFile#getObject(String,String,Class)</del>
-				<li><del>ConfigFile#getObject(String,String,Parser,Class)</del>
-				<li>{@del ConfigFile#getObjectWithDefault(String,Object,Type,Type...)}
-				<li>{@del ConfigFile#getObjectWithDefault(String,Parser,Object,Type,Type...)}
-				<li><del>ConfigFile#getObjectWithDefault(String,Object,Class)</del>
+				<li><del>ConfigFile.put(String,String,String,boolean)</del>
+				<li><del>ConfigFile.put(String,String,Object,Serializer,boolean,boolean)</del>
+				<li><del> ConfigFile.getObject(String,Type,Type...)</del>
+				<li><del> ConfigFile.getObject(String,Parser,Type,Type...)</del>
+				<li><del>ConfigFile.getObject(String,Class)</del>
+				<li><del>ConfigFile.getObject(String,Parser,Class)</del>
+				<li><del> ConfigFile.getObject(String,String,Type,Type...)</del>
+				<li><del> ConfigFile.getObject(String,String,Parser,Type,Type...)</del>
+				<li><del>ConfigFile.getObject(String,String,Class)</del>
+				<li><del>ConfigFile.getObject(String,String,Parser,Class)</del>
+				<li><del> ConfigFile.getObjectWithDefault(String,Object,Type,Type...)</del>
+				<li><del> ConfigFile.getObjectWithDefault(String,Parser,Object,Type,Type...)</del>
+				<li><del>ConfigFile.getObjectWithDefault(String,Object,Class)</del>
 				<li><del>ConfigFile.getObjectWithDefault(String,Parser,Object,Class)</del>
 			</ul>
 		<li>New ability to interact with config file sections with proxy interfaces with new method <del>ConfigFile.getSectionAsInterface(String,Class)</del>.
@@ -61,9 +61,9 @@
 		<li>New methods on {@link oaj.serializer.SerializerSession} and {@link oaj.parser.ParserSession}
 			for retrieving context and runtime-override properties:
 			<ul>
-				<li><del>Session#getProperty(String)</del>
-				<li><del>Session#getProperty(String,String)</del>
-				<li><del>Session#getProperty(Class,String)</del>
+				<li><del>Session.getProperty(String)</del>
+				<li><del>Session.getProperty(String,String)</del>
+				<li><del>Session.getProperty(Class,String)</del>
 				<li><del>Session.getProperty(Class,String,Object)</del>
 			</ul>	
 		<li>New <del>PartSerializer</del>interface particularly tailored to HTTP
@@ -71,14 +71,14 @@
 			<br>Allows easy user-defined serialization of these objects.
 			<br>The interface can be used in the following locations:
 			<ul>
-				<li><del>Builder#partSerializer(Class)</del>
-				<li><del>Path#serializer</del>
-				<li><del>Query#serializer</del>
-				<li><del>QueryIfNE#serializer</del>
-				<li><del>FormData#serializer</del>
-				<li><del>FormDataIfNE#serializer</del>
-				<li><del>Header#serializer</del>
-				<li><del>HeaderIfNE#serializer</del>
+				<li><del>Builder.partSerializer(Class)</del>
+				<li><del>Path.serializer</del>
+				<li><del>Query.serializer</del>
+				<li><del>QueryIfNE.serializer</del>
+				<li><del>FormData.serializer</del>
+				<li><del>FormDataIfNE.serializer</del>
+				<li><del>Header.serializer</del>
+				<li><del>HeaderIfNE.serializer</del>
 			</ul>
 		<li>Across-the-board improvements to the URI-resolution support (i.e. how URIs get serialized).
 			<ul>
@@ -109,10 +109,10 @@
 						<li>{@link oaj.UriResolver}
 					</ul>
 				<li>New configuration properties:
-					<li><del>SerializerContext#SERIALIZER_uriContext</del>
-					<li><del>SerializerContext#SERIALIZER_uriRelativity</del>
-					<li><del>SerializerContext#SERIALIZER_uriResolution</del>
-					<li><del>SerializerContext#SERIALIZER_maxIndent</del>
+					<li><del>SerializerContext.SERIALIZER_uriContext</del>
+					<li><del>SerializerContext.SERIALIZER_uriRelativity</del>
+					<li><del>SerializerContext.SERIALIZER_uriResolution</del>
+					<li><del>SerializerContext.SERIALIZER_maxIndent</del>
 			</ul>
 		<li>New annotation property: <del>@BeanProperty(value)</del>.
 			<br>The following two annotations are considered equivalent:
@@ -122,7 +122,7 @@
 		<ja>@BeanProperty</ja>(<js>"foo"</js>)
 			</p>
 		<li>Fixed a race condition in ClassMeta.
-		<li><jsf>URLENC_paramFormat</jsf> has been moved to <del>UonSerializer#UON_paramFormat</del>, 
+		<li><jsf>URLENC_paramFormat</jsf> has been moved to <del>UonSerializer.UON_paramFormat</del>, 
 			and the UON/URL-Encoding serializers will now always serialize all values as plain text.
 			<br>This means that arrays and maps are converted to simple comma-delimited lists.
 		<li>Listener APIs added to serializers and parsers:
@@ -130,11 +130,11 @@
 				<li>{@link oaj.serializer.SerializerListener}
 				<li>{@link oaj.serializer.Serializer.Builder#listener(Class)}
 				<li><del>@RestResource(serializerListener)</del>
-				<li><del>RestConfig#serializerListener(Class)</del>
+				<li><del>RestConfig.serializerListener(Class)</del>
 				<li>{@link oaj.parser.ParserListener}
 				<li>{@link oaj.parser.Parser.Builder#listener(Class)}
 				<li><del>@RestResource(parserListener)</del>
-				<li><del>RestConfig#parserListener(Class)</del>
+				<li><del>RestConfig.parserListener(Class)</del>
 				<li><del>Builder.listeners(Class,Class)</del>
 			</ul>juneau-examples-core.import1.pngjuneau-examples-core.import1.png
 		<li>The <del>BEAN_debug</del>flag will now capture parser input and make it
@@ -149,17 +149,17 @@
 					<br>Annotation can be applied to POJO classes and bean properties.
 				<li>Several new properties for customizing parts of the HTML page:
 					<ul>
-						<li><del>HtmlDocSerializerContext#HTMLDOC_title</del>
-						<li><del>HtmlDocSerializerContext#HTMLDOC_description</del>
-						<li><del>HtmlDocSerializerContext#HTMLDOC_branding</del>
-						<li><del>HtmlDocSerializerContext#HTMLDOC_header</del>
-						<li><del>HtmlDocSerializerContext#HTMLDOC_nav</del>
-						<li><del>HtmlDocSerializerContext#HTMLDOC_aside</del>
-						<li><del>HtmlDocSerializerContext#HTMLDOC_footer</del>
-						<li><del>HtmlDocSerializerContext#HTMLDOC_noResultsMessage</del>
-						<li><del>HtmlDocSerializerContext#HTMLDOC_cssUrl</del>
-						<li><del>HtmlDocSerializerContext#HTMLDOC_css</del>
-						<li><del>HtmlDocSerializerContext#HTMLDOC_template</del>
+						<li><del>HtmlDocSerializerContext.HTMLDOC_title</del>
+						<li><del>HtmlDocSerializerContext.HTMLDOC_description</del>
+						<li><del>HtmlDocSerializerContext.HTMLDOC_branding</del>
+						<li><del>HtmlDocSerializerContext.HTMLDOC_header</del>
+						<li><del>HtmlDocSerializerContext.HTMLDOC_nav</del>
+						<li><del>HtmlDocSerializerContext.HTMLDOC_aside</del>
+						<li><del>HtmlDocSerializerContext.HTMLDOC_footer</del>
+						<li><del>HtmlDocSerializerContext.HTMLDOC_noResultsMessage</del>
+						<li><del>HtmlDocSerializerContext.HTMLDOC_cssUrl</del>
+						<li><del>HtmlDocSerializerContext.HTMLDOC_css</del>
+						<li><del>HtmlDocSerializerContext.HTMLDOC_template</del>
 					</ul>
 				<li>New interface {@link oaj.html.HtmlDocTemplate} that allows full control over rendering
 					of HTML produced by {@link oaj.html.HtmlDocSerializer}.
@@ -294,7 +294,7 @@
 		<li>
 			New annotations added to <del>RestMethod @RestMethod</del>:
 			<ul>
-				<li><del>RestMethod#defaultQuery() defaultQuery()</del>
+				<li><del>RestMethod.defaultQuery() defaultQuery()</del>
 				<li><del>RestMethod.defaultFormData() defaultFormData()</del>
 				<li><del>bpIncludes()</del>
 				<li><del>bpExcludes()</del>
@@ -319,7 +319,7 @@
 			New attributes on <del>RestMethod @RestMethod</del>:
 			<ul>
 				<li><del>widgets()</del>
-				<li><del>RestMethod#swagger() swagger()</del>
+				<li><del>RestMethod.swagger() swagger()</del>
 				<li><del>RestMethod.htmldoc() htmldoc()</del>
 			</ul>
 		<li>
diff --git a/juneau-doc/docs/ReleaseNotes/6.3.1.html b/juneau-doc/docs/ReleaseNotes/6.3.1.html
index 9ddae877b..9aba172c5 100644
--- a/juneau-doc/docs/ReleaseNotes/6.3.1.html
+++ b/juneau-doc/docs/ReleaseNotes/6.3.1.html
@@ -23,7 +23,7 @@
 	<h5 class='topic w800'>org.apache.juneau</h5>
 	<ul class='spaced-list'>
 		<li>
-			{@link oaj.utils.PojoQuery} improvements.
+			<del>PojoQuery</del> improvements.
 		<li>
 			New <del>RemoteMethod.returns()</del> annotation.
 			<br>Allows you to specify whether the remote method returns the HTTP body or status code.
@@ -94,12 +94,12 @@
 				<li>Several annotations are now arrays of strings instead of simple strings.
 					Values are simply concatenated with newlines which makes multi-line values cleaner.
 					<ul>
-						<li><del>HtmlDoc#header() header()</del>
-						<li><del>HtmlDoc#nav() nav()</del>
-						<li><del>HtmlDoc#aside() aside()</del>
-						<li><del>HtmlDoc#footer() footer()</del>
-						<li><del>HtmlDoc#script() script()</del>
-						<li><del>HtmlDoc#style() style()</del>
+						<li><del>HtmlDoc.header() header()</del>
+						<li><del>HtmlDoc.nav() nav()</del>
+						<li><del>HtmlDoc.aside() aside()</del>
+						<li><del>HtmlDoc.footer() footer()</del>
+						<li><del>HtmlDoc.script() script()</del>
+						<li><del>HtmlDoc.style() style()</del>
 					</ul>
 					Additionally, the <js>"INHERIT"</js> string literal can be used to combine the value with
 					the value defined on the servlet or parent class.  Links can also be inserted at specific
@@ -111,9 +111,9 @@
 				<li>
 					You can now add arbitrary CSS and Javascript along with your widgets through new methods:
 					<ul>
-						<li><del>Widget#getHtml(RestRequest)</del>
-						<li><del>Widget#getScript(RestRequest)</del>
-						<li><del>Widget#getStyle(RestRequest)</del>
+						<li><del>Widget.getHtml(RestRequest)</del>
+						<li><del>Widget.getScript(RestRequest)</del>
+						<li><del>Widget.getStyle(RestRequest)</del>
 					</ul>
 				</li>
 				<li>
@@ -125,8 +125,8 @@
 				<li>
 					Renamed widgets:
 					<ul>
-						<li><c>PoweredByApacheWidget</c> -> <c>PoweredByApache</c>  
-						<li><c>PoweredByJuneauWidget</c> -> <c>PoweredByJuneau</c>  
+						<li><c>PoweredByApacheWidget</c> -&gt; <c>PoweredByApache</c>  
+						<li><c>PoweredByJuneauWidget</c> -&gt; <c>PoweredByJuneau</c>  
 					</ul>
 				<li>
 					New {@link oajr.widget.MenuItemWidget} can be used as a starting point for creatint pull-down menu items.
@@ -159,8 +159,8 @@
 		<li>
 			Two convenience methods added to {@link oajr.RestRequest}:
 			<ul>
-				<li><del>RestRequest#attr(String,Object)</del>
-				<li><del>RestRequest#prop(String,Object)</del>
+				<li><del>RestRequest.attr(String,Object)</del>
+				<li><del>RestRequest.prop(String,Object)</del>
 			</ul>
 		</li>
 		<li>
diff --git a/juneau-doc/docs/ReleaseNotes/6.4.0.html b/juneau-doc/docs/ReleaseNotes/6.4.0.html
index ac3fe1a46..55d9fcca1 100644
--- a/juneau-doc/docs/ReleaseNotes/6.4.0.html
+++ b/juneau-doc/docs/ReleaseNotes/6.4.0.html
@@ -267,7 +267,7 @@
 		<li>
 			New <del>Surrogate</del> interface for identifying surrogate classes.
 		<li>
-			Serializers can now serialize to {@link java.util.StringBuilder StringBuilders}.
+			Serializers can now serialize to {@link java.lang.StringBuilder StringBuilders}.
 		<li>
 			Serializers now serialize the contents of {@link java.io.Reader Readers} and {@link java.io.InputStream InputStreams}
 			directly to the output stream or writer.
@@ -321,33 +321,33 @@
 		<li>
 			New methods on <del>ObjectList</del>:
 			<ul>
-				<li><del>ObjectList#get(int,Class) get(int,Class)</del>
-				<li>{@del oaj.ObjectList#get(int,Type,Type...) get(int,Type,Type...)}
-				<li><del>ObjectList#getMap(int,Class,Class) getMap(int,Class,Class)</del>
-				<li><del>ObjectList#getList(int,Class) getList(int,Class)</del>
+				<li><del>ObjectList.get(int,Class) get(int,Class)</del>
+				<li><del> oaj.ObjectList.get(int,Type,Type...) get(int,Type,Type...)</del>
+				<li><del>ObjectList.getMap(int,Class,Class) getMap(int,Class,Class)</del>
+				<li><del>ObjectList.getList(int,Class) getList(int,Class)</del>
 			</ul>
 		<li>
 			New methods on <del>ObjectMap</del>:
 			<ul>
-				<li><del>ObjectMap#get(String,Class) get(String,Class)</del>
-				<li>{@del oaj.ObjectMap#get(String,Type,Type...) get(String,Type,Type...)}
-				<li><del>ObjectMap#getWithDefault(String,Object) getWithDefault(String,Object)</del>
-				<li><del>ObjectMap#getWithDefault(String,Object,Class) getWithDefault(String,Object,Class)</del>
-				<li>{@del oaj.ObjectMap#getWithDefault(String,Object,Type,Type...) getWithDefault(String,Object,Type,Type...)}
-				<li><del>ObjectMap#getSwapped(String,PojoSwap) getSwapped(String,PojoSwap)</del>
-				<li><del>ObjectMap#getAt(String,Class) getAt(String,Class)</del>
-				<li>{@del oaj.ObjectMap#getAt(String,Type,Type...) getAt(String,Type,Type...)}
-				<li><del>ObjectMap#getMap(String,Class,Class,Map) getMap(String,Class,Class,Map)</del>
-				<li><del>ObjectMap#getList(String,Class,List) getList(String,Class,List)</del>
+				<li><del>ObjectMap.get(String,Class) get(String,Class)</del>
+				<li><del> oaj.ObjectMap.get(String,Type,Type...) get(String,Type,Type...)</del>
+				<li><del>ObjectMap.getWithDefault(String,Object) getWithDefault(String,Object)</del>
+				<li><del>ObjectMap.getWithDefault(String,Object,Class) getWithDefault(String,Object,Class)</del>
+				<li><del> oaj.ObjectMap.getWithDefault(String,Object,Type,Type...) getWithDefault(String,Object,Type,Type...)</del>
+				<li><del>ObjectMap.getSwapped(String,PojoSwap) getSwapped(String,PojoSwap)</del>
+				<li><del>ObjectMap.getAt(String,Class) getAt(String,Class)</del>
+				<li><del> oaj.ObjectMap.getAt(String,Type,Type...) getAt(String,Type,Type...)</del>
+				<li><del>ObjectMap.getMap(String,Class,Class,Map) getMap(String,Class,Class,Map)</del>
+				<li><del>ObjectMap.getList(String,Class,List) getList(String,Class,List)</del>
 			</ul>
 		<li>
 			New methods on <del>PojoRest</del>:
 			<ul>
-				<li><del>PojoRest#get(String,Class) get(String,Class)</del>
-				<li>{@del oaj.utils.PojoRest#get(String,Type,Type...) get(String,Type,Type...)}
-				<li><del>PojoRest#getWithDefault(String,Object) getWithDefault(String,Object)</del>
-				<li><del>PojoRest#getWithDefault(String,Object,Class) getWithDefault(String,Object,Class)</del>
-				<li>{@del oaj.utils.PojoRest#getWithDefault(String,Object,Type,Type...) getWithDefault(String,Object,Type,Type...)}
+				<li><del>PojoRest.get(String,Class) get(String,Class)</del>
+				<li><del> oaj.utils.PojoRest.get(String,Type,Type...) get(String,Type,Type...)</del>
+				<li><del>PojoRest.getWithDefault(String,Object) getWithDefault(String,Object)</del>
+				<li><del>PojoRest.getWithDefault(String,Object,Class) getWithDefault(String,Object,Class)</del>
+				<li><del> oaj.utils.PojoRest.getWithDefault(String,Object,Type,Type...) getWithDefault(String,Object,Type,Type...)</del>
 			</ul>
 		<li>
 			Fixed bug where {@link oaj.BeanSession#getMediaType()} wasn't returning a value.
@@ -368,7 +368,7 @@
 	<h5 class='topic w800'>juneau-dto</h5>
 	<ul class='spaced-list'>
 		<li>
-			{@link oaj.dto.html5.HtmlElementMixed.children(Object...)} can now take in collections
+			{@link oaj.dto.html5.HtmlElementMixed#children(Object...)} can now take in collections
 			of objects.
 		<li>
 			The DTO beans can now be serialized to strings of their typical language by calling the <c>toString()</c> method.
@@ -385,25 +385,25 @@
 			<ul>
 				<li>The <del>RestServlet.init(ServletConfig)</del>method is now final and can
 					no longer be extended.
-					<br>Instead, use {@link oajr.annotation.HookEvent#INIT} or 
-					{@link oajr.annotation.HookEvent#POST_INIT} for initialization.
+					<br>Instead, use <del>HookEvent.INIT</del> or 
+					<del>HookEvent.POST_INIT</del> for initialization.
 				<li>The following methods on <del>RestServlet</del> have been removed:
 					<ul>
 						<li><c>init(RestConfig)</c> 
-							- Use {@link oajr.annotation.HookEvent#INIT} instead.
+							- Use <del>HookEvent.INIT</del> instead.
 						<li><c>onSuccess(RestRequest, RestResponse, long)</c>
-							- Use {@link oajr.annotation.HookEvent#END_CALL} instead.
+							- Use <del>HookEvent.END_CALL</del> instead.
 						<li><c>onPreCall(RestRequest)</c>
-							- Use {@link oajr.annotation.HookEvent#PRE_CALL} instead.
+							- Use <del>HookEvent.PRE_CALL</del> instead.
 						<li><c>onPostCall(RestRequest, RestResponse)</c>
-							- Use {@link oajr.annotation.HookEvent#POST_CALL} instead.
+							- Use <del>HookEvent.POST_CALL</del> instead.
 					</ul> 	
 			</ul>
 		<li>
 			Simplified {@link oajr.widget.MenuItemWidget}.
 			<br>Exposes an abstract method <del>getContent(RestRequest)</del> that
 			can return raw HTML via readers or char-sequences, or any other object (such as HTML5 beans) that will
-			get converted to HTML using {@link oaj.html.HtmlSerializer.DEFAULT}.
+			get converted to HTML using {@link oaj.html.HtmlSerializer#DEFAULT}.
 		<li>
 			<del>RestResourceResolver</del> instances are now inherited from parent resources to child resources
 			unless explicitly overridden at the child level.
@@ -441,9 +441,9 @@
 			The following implementation classes can now be defined as non-static inner classes of servlets/resources:
 			<ul>
 				<li>{@link oajr.widget.Widget}
-				<li>{@link oajr.RestConverter}
+				<li><del>RestConverter</del>
 				<li><del>RestGuard</del>
-				<li>{@link oajr.ResponseHandler}
+				<li><del>ResponseHandler</del>
 				<li><del>RestCallHandler</del>
 				<li><del>RestInfoProvider</del>
 				<li><del>RestResourceResolver</del>
@@ -487,7 +487,7 @@
 		<li>
 			New methods on {@link oaj.microservice.Microservice}:
 			<ul>
-				<li>{@link oaj.microservice.Microservice.getInstance() getInstance()}
+				<li>{@link oaj.microservice.Microservice#getInstance() getInstance()}
 			</ul>
 		<li>
 			New class <del>JettyLogger</del> for directing Jetty logging to the
diff --git a/juneau-doc/docs/ReleaseNotes/7.0.0.html b/juneau-doc/docs/ReleaseNotes/7.0.0.html
index 71b295392..6629f1cd4 100644
--- a/juneau-doc/docs/ReleaseNotes/7.0.0.html
+++ b/juneau-doc/docs/ReleaseNotes/7.0.0.html
@@ -36,7 +36,7 @@
 	<h5 class='topic w800'>juneau-rest-server</h5>
 	<ul class='spaced-list'>
 		<li>
-			Annotation <c><ja>@HtmlDoc</ja>(links)</c> renamed to <del>HtmlDoc#navlinks() navlinks</del>.
+			Annotation <c><ja>@HtmlDoc</ja>(links)</c> renamed to <del>HtmlDoc.navlinks() navlinks</del>.
 		<li>
 			New annotation <del>HtmlDoc.head() @HtmlDoc(head)</del>.
 			<br>Allows you to specify arbitrary HTML content in the <xt>&lt;head&gt;</xt> section of the page.
diff --git a/juneau-doc/docs/ReleaseNotes/7.0.1.html b/juneau-doc/docs/ReleaseNotes/7.0.1.html
index b05b91209..f35c73d8a 100644
--- a/juneau-doc/docs/ReleaseNotes/7.0.1.html
+++ b/juneau-doc/docs/ReleaseNotes/7.0.1.html
@@ -38,11 +38,11 @@
 			</p>
 			<br>The same static create methods have also been added to the following classes:
 			<ul>
-				<li><del>SerializerGroup#create()</del>
-				<li><del>ParserGroup#create()</del>
-				<li><del>EncoderGroup#create()</del>
+				<li><del>SerializerGroup.create()</del>
+				<li><del>ParserGroup.create()</del>
+				<li><del>EncoderGroup.create()</del>
 				<li>{@link oajrc.RestClient#create()}
-				<li><del>ConfigFile#create()</del>
+				<li><del>ConfigFile.create()</del>
 			</ul>
 		<li>
 			The order of the parameters in {@link oaj.serializer.SerializerSession#serialize(Object,Object)}
diff --git a/juneau-doc/docs/ReleaseNotes/7.1.0.html b/juneau-doc/docs/ReleaseNotes/7.1.0.html
index 7dc4144ca..57b37e7c7 100644
--- a/juneau-doc/docs/ReleaseNotes/7.1.0.html
+++ b/juneau-doc/docs/ReleaseNotes/7.1.0.html
@@ -55,7 +55,7 @@
 					Session objects also now have a consistent class hierarchy.
 					<br>For example, the class hierarchy of <c>JsonSerializerSession</c> is now:
 					<ul class='doctree'>
-						<li class='jac'>{@link oaj.Session}
+						<li class='jac'><del>Session</del>
 						<ul>
 							<li class='jc'>{@link oaj.BeanSession}
 							<ul>
@@ -87,8 +87,8 @@
 					</ul>
 					Builder objects are used for building up and creating <c>Context</c> objects.
 				<li>
-					The {@link oaj.PropertyStore} class has been completely rewritten.
-					It is now a read-only configuration store build using the {@link oaj.PropertyStoreBuilder}
+					The <del>PropertyStore</del> class has been completely rewritten.
+					It is now a read-only configuration store build using the <del>PropertyStoreBuilder</del>
 					class.
 					<br>The previous <c>PropertyStore</c> class was overly-complicated with many read/write
 					locks to ensure thread-safety. 
@@ -118,7 +118,7 @@
 			</ul>
 			Code for marshalling of parts have been removed from the URL-Encoding serializers and parsers.
 		<li>	
-			<c>Context.Builder.property(String,Object)</c> renamed to <del>Builder#set(String,Object)</del>.
+			<c>Context.Builder.property(String,Object)</c> renamed to <del>Builder.set(String,Object)</del>.
 		<li>
 			<c>ResourceFinder</c> class has been replaced with the following:
 			<ul>
@@ -221,41 +221,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 <del>RestRequest#getFormData(String)</del>.
+				<li><js>"$RF{key1[,key2...]}"</js> - {@link oajr.vars.RequestFormDataVar}, first non-null value returned by <del>RestRequest.getFormData(String)</del>.
 				<li><js>"$RH{key1[,key2...]}"</js> - {@link oajr.vars.RequestHeaderVar}, first non-null value returned by {@link oajr.RestRequest#getHeader(String)}.
-				<li><js>"$RI{key1[,key2...]}"</js> - <del>RestInfoVar</del>, first non-null value returned by <del>RestRequest#getInfoProvider()</del>.
+				<li><js>"$RI{key1[,key2...]}"</js> - <del>RestInfoVar</del>, first non-null value returned by <del>RestRequest.getInfoProvider()</del>.
 					<br>The possible values are:
 					<ul>
 						<li><js>"contact"</js> - Value returned by {@link oaj.dto.swagger.Info#getContact()}
-						<li><js>"description"</js> - Value returned by <del>RestInfoProvider#getDescription(RestRequest)</del>
+						<li><js>"description"</js> - Value returned by <del>RestInfoProvider.getDescription(RestRequest)</del>
 						<li><js>"externalDocs"</js> - Value returned by {@link oaj.dto.swagger.Swagger#getExternalDocs()}
 						<li><js>"license"</js> - Value returned by {@link oaj.dto.swagger.Info#getLicense()}
-						<li><js>"methodDescription"</js> - Value returned by <del>RestInfoProvider#getMethodDescription(Method,RestRequest)</del>
-						<li><js>"methodSummary"</js> - Value returned by <del>RestInfoProvider#getMethodSummary(Method,RestRequest)</del>
-						<li><js>"siteName"</js> - Value returned by <del>RestInfoProvider#getSiteName(RestRequest)</del>
+						<li><js>"methodDescription"</js> - Value returned by <del>RestInfoProvider.getMethodDescription(Method,RestRequest)</del>
+						<li><js>"methodSummary"</js> - Value returned by <del>RestInfoProvider.getMethodSummary(Method,RestRequest)</del>
+						<li><js>"siteName"</js> - Value returned by <del>RestInfoProvider.getSiteName(RestRequest)</del>
 						<li><js>"tags"</js> - Value returned by {@link oaj.dto.swagger.Swagger#getTags()}
 						<li><js>"termsOfService"</js> - Value returned by {@link oaj.dto.swagger.Info#getTermsOfService()}
-						<li><js>"title"</js> - See <del>RestInfoProvider#getTitle(RestRequest)</del>
+						<li><js>"title"</js> - See <del>RestInfoProvider.getTitle(RestRequest)</del>
 						<li><js>"version"</js> - See {@link oaj.dto.swagger.Info#getVersion()}
 					</ul>					
-				<li><js>"$RP{key1[,key2...]}"</js> - {@link oajr.vars.RequestPathVar}, first non-null value returned by <del>RestRequest#getPath(String)</del>.
-				<li><js>"$RQ{key1[,key2...]}"</js> - {@link oajr.vars.RequestQueryVar}, first non-null value returned by <del>RestRequest#getQuery(String)</del>.
+				<li><js>"$RP{key1[,key2...]}"</js> - {@link oajr.vars.RequestPathVar}, first non-null value returned by <del>RestRequest.getPath(String)</del>.
+				<li><js>"$RQ{key1[,key2...]}"</js> - {@link oajr.vars.RequestQueryVar}, first non-null value returned by <del>RestRequest.getQuery(String)</del>.
 				<li><js>"$R{key1[,key2...]}"</js> - {@link oajr.vars.RequestVar}, first non-null other request variable.
 					<br>The possible values are:
 					<ul>
 						<li><js>"contextPath"</js> - Value returned by {@link oajr.RestRequest#getContextPath()}
 						<li><js>"method"</js> - Value returned by {@link oajr.RestRequest#getMethod()}
-						<li><js>"methodDescription"</js> - Value returned by <del>RestRequest#getMethodDescription()</del>
-						<li><js>"methodSummary"</js> - Value returned by <del>RestRequest#getMethodSummary()</del>
+						<li><js>"methodDescription"</js> - Value returned by <del>RestRequest.getMethodDescription()</del>
+						<li><js>"methodSummary"</js> - Value returned by <del>RestRequest.getMethodSummary()</del>
 						<li><js>"pathInfo"</js> - Value returned by {@link oajr.RestRequest#getPathInfo()}
 						<li><js>"requestParentURI"</js> - Value returned by {@link oaj.UriContext#getRootRelativePathInfoParent()}
 						<li><js>"requestURI"</js> - Value returned by {@link oajr.RestRequest#getRequestURI()}
-						<li><js>"resourceDescription"</js> - Value returned by <del>RestRequest#getResourceDescription()</del>
-						<li><js>"resourceTitle"</js> - See <del>RestRequest#getResourceTitle()</del>
+						<li><js>"resourceDescription"</js> - Value returned by <del>RestRequest.getResourceDescription()</del>
+						<li><js>"resourceTitle"</js> - See <del>RestRequest.getResourceTitle()</del>
 						<li><js>"servletParentURI"</js> - Value returned by {@link oaj.UriContext#getRootRelativeServletPathParent()}
 						<li><js>"servletPath"</js> - See {@link oajr.RestRequest#getServletPath()}
 						<li><js>"servletURI"</js> - See {@link oaj.UriContext#getRootRelativeServletPath()}
-						<li><js>"siteName"</js> - See <del>RestRequest#getSiteName()</del>
+						<li><js>"siteName"</js> - See <del>RestRequest.getSiteName()</del>
 					</ul>
 			</ul>
 		<li>
@@ -263,33 +263,33 @@
 			<br>Settings on {@link oajr.RestContext} objects can now be set declaratively through the 
 				following new properties:
 			<ul>
-				<li><del>RestContext#REST_allowHeaderParams</del>
-				<li><del>RestContext#REST_allowBodyParam</del>
-				<li><del>RestContext#REST_allowedMethodParams REST_allowedMethodParams</del>
-				<li><del>RestContext#REST_renderResponseStackTraces REST_renderResponseStackTraces</del>
-				<li><del>RestContext#REST_useStackTraceHashes</del>
-				<li><del>RestContext#REST_defaultCharset REST_defaultCharset</del>
-				<li><del>RestContext#REST_maxInput REST_maxInput</del>
-				<li><del>RestContext#REST_paramResolvers</del>
-				<li><del>RestContext#REST_converters REST_converters</del>
-				<li><del>RestContext#REST_guards REST_guards</del>
-				<li><del>RestContext#REST_responseHandlers</del>
-				<li><del>RestContext#REST_defaultRequestHeaders</del>
-				<li><del>RestContext#REST_defaultResponseHeaders</del>
-				<li><del>RestContext#REST_produces REST_produces</del>
-				<li><del>RestContext#REST_consumes REST_consumes</del>
-				<li><del>RestContext#REST_clientVersionHeader REST_clientVersionHeader</del>
-				<li><del>RestContext#REST_resourceResolver</del>
-				<li><del>RestContext#REST_logger</del>
-				<li><del>RestContext#REST_callHandler</del>
-				<li><del>RestContext#REST_infoProvider</del>
-				<li><del>RestContext#REST_path REST_path</del>
-				<li><del>RestContext#REST_contextPath</del>
-				<li><del>RestContext#REST_staticFiles REST_staticFiles</del>
-				<li><del>RestContext#REST_staticFileResponseHeaders</del>
-				<li><del>RestContext#REST_classpathResourceFinder</del>
-				<li><del>RestContext#REST_useClasspathResourceCaching</del>
-				<li><del>RestContext#REST_widgets</del>
+				<li><del>RestContext.REST_allowHeaderParams</del>
+				<li><del>RestContext.REST_allowBodyParam</del>
+				<li><del>RestContext.REST_allowedMethodParams REST_allowedMethodParams</del>
+				<li><del>RestContext.REST_renderResponseStackTraces REST_renderResponseStackTraces</del>
+				<li><del>RestContext.REST_useStackTraceHashes</del>
+				<li><del>RestContext.REST_defaultCharset REST_defaultCharset</del>
+				<li><del>RestContext.REST_maxInput REST_maxInput</del>
+				<li><del>RestContext.REST_paramResolvers</del>
+				<li><del>RestContext.REST_converters REST_converters</del>
+				<li><del>RestContext.REST_guards REST_guards</del>
+				<li><del>RestContext.REST_responseHandlers</del>
+				<li><del>RestContext.REST_defaultRequestHeaders</del>
+				<li><del>RestContext.REST_defaultResponseHeaders</del>
+				<li><del>RestContext.REST_produces REST_produces</del>
+				<li><del>RestContext.REST_consumes REST_consumes</del>
+				<li><del>RestContext.REST_clientVersionHeader REST_clientVersionHeader</del>
+				<li><del>RestContext.REST_resourceResolver</del>
+				<li><del>RestContext.REST_logger</del>
+				<li><del>RestContext.REST_callHandler</del>
+				<li><del>RestContext.REST_infoProvider</del>
+				<li><del>RestContext.REST_path REST_path</del>
+				<li><del>RestContext.REST_contextPath</del>
+				<li><del>RestContext.REST_staticFiles REST_staticFiles</del>
+				<li><del>RestContext.REST_staticFileResponseHeaders</del>
+				<li><del>RestContext.REST_classpathResourceFinder</del>
+				<li><del>RestContext.REST_useClasspathResourceCaching</del>
+				<li><del>RestContext.REST_widgets</del>
 				<li><del>RestContext.REST_mimeTypes</del>
 			</ul>
 		<li>
@@ -298,18 +298,18 @@
 				<li>Syntax on <del>@RestResource(staticFiles)</del>has been simplified, and
 					now allows you to specify response headers in the strings.
 				<li>Response headers for static files can also be configured through 
-					<del>RestContext#REST_staticFileResponseHeaders</del>
+					<del>RestContext.REST_staticFileResponseHeaders</del>
 				<li>Static file in-memory caching now configurable through 
-					<del>RestContext#REST_useClasspathResourceCaching</del>
+					<del>RestContext.REST_useClasspathResourceCaching</del>
 				<li>Static file retrieval can be customized through 
-					<del>RestContext#REST_classpathResourceFinder</del>
+					<del>RestContext.REST_classpathResourceFinder</del>
 			</ul>
 		<li>
 			Eliminated the <c>RestMatcherReflecting</c> class.
-			<br>You can now simply create a {@link oajr.RestMatcher} that has a public constructor that 
+			<br>You can now simply create a <del>RestMatcher</del> that has a public constructor that 
 			takes in the server and method arguments.
 		<li>
-			<del>@RestResource.allowMethodParam</del>renamed to <del>RestResource#allowedMethodParams</del>.
+			<del>@RestResource.allowMethodParam</del>renamed to <del>RestResource.allowedMethodParams</del>.
 		<li>
 			<c>@RestMethod.serializersInherit</c> and <c>@RestMethod.parsersInherit</c> replaced with
 			simplified <del>@RestMethod(inherit)</del>. 
@@ -402,7 +402,7 @@
 				<li><del>StreamResourceBuilder</del>
 			</ul>
 		<li>
-			{@link oajr.RestResponse.getNegotiatedOutputStream()} now returns a 
+			{@link oajr.RestResponse#getNegotiatedOutputStream()} now returns a 
 			<del>FinishableServletOutputStream</del>and {@link oajr.RestResponse#getNegotiatedWriter()}
 			now returns a <del>FinishablePrintWriter</del> that allows you to finish the output
 			without closing the stream.
@@ -440,7 +440,7 @@
 		<li>
 			New methods on <del>RestCall</del>class:
 			<ul>
-				<li><del>RestCall#getResponseHeader(String) getResponseHeader(String)</del>
+				<li><del>RestCall.getResponseHeader(String) getResponseHeader(String)</del>
 				<li><del>RestCall.getResponseCode() getResponseCode()</del>
 			</ul>
 		<li>
diff --git a/juneau-doc/docs/ReleaseNotes/7.2.0.html b/juneau-doc/docs/ReleaseNotes/7.2.0.html
index ddfa2e4c6..030c7cda0 100644
--- a/juneau-doc/docs/ReleaseNotes/7.2.0.html
+++ b/juneau-doc/docs/ReleaseNotes/7.2.0.html
@@ -37,7 +37,7 @@
 			<br>This fixes a long-standing problem where it was easy to mix up using client-side annotations in server-side code, and vis-versa.
 			<br>Additionally, much work has been done on these annotations to add support for Swagger-style validations and documentation.
 			<ul class='doctree'>
-				<li class='ja'>{@link oaj.http.annotation.Body}
+				<li class='ja'><del>Body</del>
 				<li class='ja'>{@link oaj.http.annotation.FormData}
 				<li class='ja'>{@link oaj.http.annotation.Header}
 				<li class='ja'>{@link oaj.http.annotation.Path}
@@ -97,19 +97,19 @@
 		<li>
 			New settings for binary-based serializers and parsers:
 			<ul class='doctree'>
-				<li class='jf'><del>OutputStreamSerializer#OSSERIALIZER_binaryFormat</del>
-				<li class='jf'><del>InputStreamParser#ISPARSER_binaryFormat</del>
+				<li class='jf'><del>OutputStreamSerializer.OSSERIALIZER_binaryFormat</del>
+				<li class='jf'><del>InputStreamParser.ISPARSER_binaryFormat</del>
 			</ul>
 		<li>
 			Added support for auto-detection of fluent-style setters:
 			<ul class='doctree'>
-				<li class='jf'><del>BeanContext#BEAN_fluentSetters</del>
-				<li class='ja'><del>Bean#fluentSetters()</del>
+				<li class='jf'><del>BeanContext.BEAN_fluentSetters</del>
+				<li class='ja'><del>Bean.fluentSetters()</del>
 			</ul>
 		<li>
-			The <jsf>SERIALIZER_abridged</jsf> setting has been replaced with <del>Serializer#SERIALIZER_addRootType SERIALIZER_addRootType</del>
+			The <jsf>SERIALIZER_abridged</jsf> setting has been replaced with <del>Serializer.SERIALIZER_addRootType SERIALIZER_addRootType</del>
 		<li>
-			The <jsf>SERIALIZER_addBeanTypeProperties</jsf> setting has been replaced with <del>Serializer#SERIALIZER_addBeanTypes SERIALIZER_addBeanTypes</del>
+			The <jsf>SERIALIZER_addBeanTypeProperties</jsf> setting has been replaced with <del>Serializer.SERIALIZER_addBeanTypes SERIALIZER_addBeanTypes</del>
 			and is disabled by default.
 		<li>
 			Parse exception messages are now clearer and include code snippets of where a parse exception occurred:
@@ -156,7 +156,7 @@
 			which returns a <jk>null</jk> value.
 		<li>
 			New option for dyna-property (i.e. <c><ja>@Bean</ja>(<js>"*"</js>)</c>) using a method that returns a collection of extra keys.
-			<br>See new options #4 on <del>BeanProperty#name()</del>
+			<br>See new options #4 on <del>BeanProperty.name()</del>
 		<li>
 			New formats for the {@link oaj.html.annotation.Html#format() @Html(format)} annotation:
 			<ul class='doctree'>
@@ -172,15 +172,15 @@
 			<ul class='doctree'>
 				<li class='jc'><del>ObjectMap</del>
 				<ul>
-					<li class='jm'><del>ObjectMap#isUnmodifiable() isUnmodifable()</del>
-					<li class='jm'><del>ObjectMap#unmodifiable() unmodifiable()</del>
-					<li class='jm'><del>ObjectMap#modifiable() modifiable()</del>
+					<li class='jm'><del>ObjectMap.isUnmodifiable() isUnmodifable()</del>
+					<li class='jm'><del>ObjectMap.unmodifiable() unmodifiable()</del>
+					<li class='jm'><del>ObjectMap.modifiable() modifiable()</del>
 				</ul>
 				<li class='jp'><del>ObjectList</del>
 				<ul>
-					<li class='jm'><del>ObjectList#isUnmodifiable() isUnmodifable()</del>
-					<li class='jm'><del>ObjectList#unmodifiable() unmodifiable()</del>
-					<li class='jm'><del>ObjectList#modifiable() modifiable()</del>
+					<li class='jm'><del>ObjectList.isUnmodifiable() isUnmodifable()</del>
+					<li class='jm'><del>ObjectList.unmodifiable() unmodifiable()</del>
+					<li class='jm'><del>ObjectList.modifiable() modifiable()</del>
 				</ul>
 			</ul>
 		<li>
@@ -188,15 +188,15 @@
 		<li>
 			RDF serializer subclasses have been moved into top-level classes:
 			<ul>
-				<li><c>RdfSerializer.Xml</c> -> {@link oaj.jena.RdfXmlSerializer}
-				<li><c>RdfSerializer.XmlAbbrev</c> -> {@link oaj.jena.RdfXmlAbbrevSerializer}
-				<li><c>RdfSerializer.N3</c> -> {@link oaj.jena.N3Serializer}
-				<li><c>RdfSerializer.NTriple</c> -> {@link oaj.jena.NTripleSerializer}
-				<li><c>RdfSerializer.Turtle</c> -> {@link oaj.jena.TurtleSerializer}
-				<li><c>RdfParser.Xml</c> -> {@link oaj.jena.RdfXmlParser}
-				<li><c>RdfParser.N3</c> -> {@link oaj.jena.N3Parser}
-				<li><c>RdfParser.NTriple</c> -> {@link oaj.jena.NTripleParser}
-				<li><c>RdfParser.Turtle</c> -> {@link oaj.jena.TurtleParser}
+				<li><c>RdfSerializer.Xml</c> -&gt; <del>RdfXmlSerializer</del>
+				<li><c>RdfSerializer.XmlAbbrev</c> -&gt; <del>RdfXmlAbbrevSerializer</del>
+				<li><c>RdfSerializer.N3</c> -&gt; <del>N3Serializer</del>
+				<li><c>RdfSerializer.NTriple</c> -&gt; <del>NTripleSerializer</del>
+				<li><c>RdfSerializer.Turtle</c> -&gt; <del>TurtleSerializer</del>
+				<li><c>RdfParser.Xml</c> -&gt; <del>RdfXmlParser</del>
+				<li><c>RdfParser.N3</c> -&gt; <del>N3Parser</del>
+				<li><c>RdfParser.NTriple</c> -&gt; <del>NTripleParser</del>
+				<li><c>RdfParser.Turtle</c> -&gt; <del>TurtleParser</del>
 			</ul>
 		<li>
 			New API for pairing serializers and parsers for simplified syntax:
@@ -247,7 +247,7 @@
 	<h5 class='topic w800'>juneau-dto</h5>
 	<ul class='spaced-list'>
 		<li>
-			Fixed bug where Swagger {@del oaj.dto.swagger.SchemaInfo#required(Object...)} was defined as a boolean
+			Fixed bug where Swagger <del> oaj.dto.swagger.SchemaInfo.required(Object...)</del> was defined as a boolean
 			instead of a list of strings.
 		<li>
 			Boolean attributes are now handled correctly for HTML5.
@@ -277,7 +277,7 @@
 		<li>
 			Swagger fields added to the following annotations:
 			<ul class='doctree'>
-				<li class='ja'>{@link oaj.http.annotation.Body}
+				<li class='ja'><del>Body</del>
 				<li class='ja'>{@link oaj.http.annotation.FormData}
 				<li class='ja'>{@link oaj.http.annotation.Header}
 				<li class='ja'>{@link oaj.http.annotation.Path}
@@ -372,7 +372,7 @@
 				</ul>
 			</ul>	
 		<li>
-			The <del>HtmlDoc.nav() @HtmlDoc(nav)</del>and <del>HtmlDoc#navlinks() @HtmlDoc(navlinks)</del>
+			The <del>HtmlDoc.nav() @HtmlDoc(nav)</del>and <del>HtmlDoc.navlinks() @HtmlDoc(navlinks)</del>
 			can now both be used on the same annotation.
 			<br>The contents of <c>nav()</c> are free-form HTML that gets rendered immediately after the navigation links.
 		<li>
@@ -414,14 +414,14 @@
 			</ul>
 			<br>These can be used in the following locations:
 			<ul class='doctree'>
-				<li class='ja'><del>RestResource#serializers()</del>
-				<li class='ja'><del>RestResource#parsers()</del>
-				<li class='ja'><del>RestResource#beanFilters()</del>
-				<li class='ja'><del>RestResource#pojoSwaps()</del>
-				<li class='ja'><del>RestMethod#serializers()</del>
-				<li class='ja'><del>RestMethod#parsers()</del>
-				<li class='ja'><del>RestMethod#beanFilters()</del>
-				<li class='ja'><del>RestMethod#pojoSwaps()</del>
+				<li class='ja'><del>RestResource.serializers()</del>
+				<li class='ja'><del>RestResource.parsers()</del>
+				<li class='ja'><del>RestResource.beanFilters()</del>
+				<li class='ja'><del>RestResource.pojoSwaps()</del>
+				<li class='ja'><del>RestMethod.serializers()</del>
+				<li class='ja'><del>RestMethod.parsers()</del>
+				<li class='ja'><del>RestMethod.beanFilters()</del>
+				<li class='ja'><del>RestMethod.pojoSwaps()</del>
 			</ul>
 			<br>One advantage is that you now have control over the precedence of serializers and parsers by where you insert the <c>Inherit</c> class. 
 		<li>
@@ -456,7 +456,7 @@
 			New/updated documentation: 
 			<br><dc>juneau-rest-server.UnitTesting</dc>
 		<li>
-			The behavior of the default values for <del>RestMethod.name()</del>and <del>RestMethod#path()</del>
+			The behavior of the default values for <del>RestMethod.name()</del>and <del>RestMethod.path()</del>
 			have changed.
 			<br>If not specified, the values are inferred from the Java method name.
 			<br>See Also: <del>RestMethod</del>
@@ -467,10 +467,10 @@
 			<ul class='doctree'>
 				<li class='jc'>{@link oajr.RestContext}
 				<ul>
-					<li class='jf'><del>RestContext#REST_uriAuthority REST_uriAuthority</del>
-					<li class='jf'><del>RestContext#REST_uriContext REST_uriContext</del>
-					<li class='jf'><del>RestContext#REST_uriRelativity REST_uriRelativity</del>
-					<li class='jf'><del>RestContext#REST_uriResolution REST_uriResolution</del>
+					<li class='jf'><del>RestContext.REST_uriAuthority REST_uriAuthority</del>
+					<li class='jf'><del>RestContext.REST_uriContext REST_uriContext</del>
+					<li class='jf'><del>RestContext.REST_uriRelativity REST_uriRelativity</del>
+					<li class='jf'><del>RestContext.REST_uriResolution REST_uriResolution</del>
 				</ul>
 			</ul>
 		<li>
@@ -483,8 +483,8 @@
 				</ul>	
 				<li class='jc'><del>RestMethod</del>
 				<ul>
-					<li class='jf'><del>RestMethod#defaultAccept defaultAccept</del>
-					<li class='jf'><del>RestMethod#defaultContentType defaultContentType</del>
+					<li class='jf'><del>RestMethod.defaultAccept defaultAccept</del>
+					<li class='jf'><del>RestMethod.defaultContentType defaultContentType</del>
 				</ul>	
 			</ul>
 	</ul>
@@ -499,13 +499,13 @@
 			<ul class='doctree'>
 				<li class='jc'>{@link oajrc.RestClient.Builder}
 				<ul>
-					<li class='jf'>{@del oajrc.RestClient.Builder#sslProtocols(String...) sslProtocols(String...)}
-					<li class='jf'>{@del oajrc.RestClient.Builder#cipherSuites(String...) cipherSuites(String...)}
-					<li class='jf'><del>Builder#hostnameVerifier(HostnameVerifier) hostnameVerifier(HostnameVerifier)</del>
-					<li class='jf'>{@del oajrc.RestClient.Builder#keyManagers(KeyManager...) keyManagers(KeyManager...)}
-					<li class='jf'>{@del oajrc.RestClient.Builder#trustManagers(TrustManager...)}
-					<li class='jf'><del>Builder#secureRandom(SecureRandom)</del>
-					<li class='jf'><del>Builder#httpClientConnectionManager(HttpClientConnectionManager)</del>
+					<li class='jf'><del> oajrc.RestClient.Builder.sslProtocols(String...) sslProtocols(String...)</del>
+					<li class='jf'><del> oajrc.RestClient.Builder.cipherSuites(String...) cipherSuites(String...)</del>
+					<li class='jf'><del>Builder.hostnameVerifier(HostnameVerifier) hostnameVerifier(HostnameVerifier)</del>
+					<li class='jf'><del> oajrc.RestClient.Builder.keyManagers(KeyManager...) keyManagers(KeyManager...)</del>
+					<li class='jf'><del> oajrc.RestClient.Builder.trustManagers(TrustManager...)</del>
+					<li class='jf'><del>Builder.secureRandom(SecureRandom)</del>
+					<li class='jf'><del>Builder.httpClientConnectionManager(HttpClientConnectionManager)</del>
 				</ul>
 			</ul>
 		<li>
@@ -536,7 +536,7 @@
 			</ul>
 		<li>
 			Removed the deprecated <c>RestCall.execute()</c> method.
-			<br>Use <del>RestCall#run()</del>.
+			<br>Use <del>RestCall.run()</del>.
 		<li>
 			<c>RestCall.input(Object)</c> method renamed to <del>RestCall.body(Object)</del>to match OpenAPI terminology.
 		<li>
@@ -546,12 +546,12 @@
 			<ul class='doctree'>
 				<li class='jc'>{@link oajrc.RestClient}
 				<ul>
-					<li class='jm'><del>RestClient#getRemoteInterface(Class)</del>
-					<li class='jm'><del>RestClient#getRemoteInterface(Class,Object)</del>
-					<li class='jm'><del>RestClient#getRemoteInterface(Class,Object,Serializer,Parser)</del>
-					<li class='jm'><del>RestClient#getRemoteResource(Class)</del>
-					<li class='jm'><del>RestClient#getRemoteResource(Class,Object)</del>
-					<li class='jm'><del>RestClient#getRemoteResource(Class,Object,Serializer,Parser)</del>
+					<li class='jm'><del>RestClient.getRemoteInterface(Class)</del>
+					<li class='jm'><del>RestClient.getRemoteInterface(Class,Object)</del>
+					<li class='jm'><del>RestClient.getRemoteInterface(Class,Object,Serializer,Parser)</del>
+					<li class='jm'><del>RestClient.getRemoteResource(Class)</del>
+					<li class='jm'><del>RestClient.getRemoteResource(Class,Object)</del>
+					<li class='jm'><del>RestClient.getRemoteResource(Class,Object,Serializer,Parser)</del>
 				</ul>
 			</ul>
 	</ul>
diff --git a/juneau-doc/docs/ReleaseNotes/7.2.1.html b/juneau-doc/docs/ReleaseNotes/7.2.1.html
index c6cfb12ae..629d6d4f4 100644
--- a/juneau-doc/docs/ReleaseNotes/7.2.1.html
+++ b/juneau-doc/docs/ReleaseNotes/7.2.1.html
@@ -24,7 +24,7 @@
 	<h5 class='topic w800'>juneau-marshall</h5>
 	<ul class='spaced-list'>
 		<li>
-			The <del>@JsonSchema</del> annotation has been merged with the {@link oaj.jsonschema.annotation.Schema @Schema} annotation.
+			The <del>@JsonSchema</del> annotation has been merged with the <del>@Schema</del> 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.
diff --git a/juneau-doc/docs/ReleaseNotes/8.0.0.html b/juneau-doc/docs/ReleaseNotes/8.0.0.html
index bf62819eb..41370a43d 100644
--- a/juneau-doc/docs/ReleaseNotes/8.0.0.html
+++ b/juneau-doc/docs/ReleaseNotes/8.0.0.html
@@ -94,8 +94,8 @@
 		<li>
 			New methods on <del>RestServlet</del>:
 			<ul class='javatree'>
-				<li class='jm'><del>RestServlet#setRestResourceResolver(RestResourceResolver) setRestResourceResolver(RestResourceResolver)</del>
-				<li class='jm'><del>RestServlet#getPath() getPath()</del>
+				<li class='jm'><del>RestServlet.setRestResourceResolver(RestResourceResolver) setRestResourceResolver(RestResourceResolver)</del>
+				<li class='jm'><del>RestServlet.getPath() getPath()</del>
 			</ul>
 		<li>
 			The registered resource resolver is now used to instantiate objects of classes defined via <del>@RestResource</del>.
diff --git a/juneau-doc/docs/ReleaseNotes/8.1.0.html b/juneau-doc/docs/ReleaseNotes/8.1.0.html
index 5281a3825..3462396e2 100644
--- a/juneau-doc/docs/ReleaseNotes/8.1.0.html
+++ b/juneau-doc/docs/ReleaseNotes/8.1.0.html
@@ -57,8 +57,8 @@
 			<ul class='javatree'>
 				<li class='jc'>{@link oaj.serializer.WriterSerializer}
 				<ul>
-					<li class='jf'><del>WriterSerializer#WSERIALIZER_fileCharset WSERIALIZER_fileCharset</del>
-					<li class='jf'><del>WriterSerializer#WSERIALIZER_streamCharset WSERIALIZER_streamCharset</del>
+					<li class='jf'><del>WriterSerializer.WSERIALIZER_fileCharset WSERIALIZER_fileCharset</del>
+					<li class='jf'><del>WriterSerializer.WSERIALIZER_streamCharset WSERIALIZER_streamCharset</del>
 				</ul>
 			</ul>
 		<li>
@@ -79,9 +79,9 @@
 			<ul class='javatree'>
 				<li class='jc'><del>Marshall</del>
 				<ul>
-					<li class='jm'>{@del oaj.marshall.Marshall#format(String,Object...) format(String,Object...)} - <c>MessageFormat</c>-style formatter.
-					<li class='jm'>{@del oaj.marshall.Marshall#out(String,Object...) out(String,Object...)} - Prints <c>MessageFormat</c>-style messages to STDOUT.
-					<li class='jm'>{@del oaj.marshall.Marshall#err(String,Object...) err(String,Object...)} - Prints <c>MessageFormat</c>-style messages to STDERR.
+					<li class='jm'><del> oaj.marshall.Marshall.format(String,Object...) format(String,Object...)</del> - <c>MessageFormat</c>-style formatter.
+					<li class='jm'><del> oaj.marshall.Marshall.out(String,Object...) out(String,Object...)</del> - Prints <c>MessageFormat</c>-style messages to STDOUT.
+					<li class='jm'><del> oaj.marshall.Marshall.err(String,Object...) err(String,Object...)</del> - Prints <c>MessageFormat</c>-style messages to STDERR.
 				</ul>
 			</ul>
 		<li>
@@ -111,7 +111,7 @@
 				<li class='jc'>{@link java.time.OffsetTime} - ISO offset time.
 				<li class='jc'>{@link java.time.Year} - ISO year.
 				<li class='jc'>{@link java.time.YearMonth} - ISO year-month.
-				<li class='jc'>{@link java.time.Temporal} - ISO instant.
+				<li class='jc'>{@link java.time.temporal.Temporal} - ISO instant.
 				<li class='jc'>{@link java.util.TimeZone}
 				<li class='jc'>{@link javax.xml.datatype.XMLGregorianCalendar}
 				<li class='jc'>{@link java.time.ZoneId}
@@ -133,10 +133,10 @@
 			The <del>ConfigFileStore</del>now automatically resolves file extensions.
 			<br>New configuration property for specifying search paths for file extensions:
 			<ul class='javatree'>
-				<li class='jf'><del>ConfigFileStore#FILESTORE_extensions</del>
+				<li class='jf'><del>ConfigFileStore.FILESTORE_extensions</del>
 			</ul>
 		<li>
-			Fixed a bug where instances of {@link oaj.config.store.ConfigMemoryStore} ended up resolving to the same object.
+			Fixed a bug where instances of <del>ConfigMemoryStore</del> ended up resolving to the same object.
 		<li>
 			Uses <js>"application.properties"</js> file as a system default if present.
 			<br>Useful when being used in a Spring Boot application.
@@ -199,7 +199,7 @@
 				<li class='ja'>{@link oaj.oapi.annotation.OpenApiConfig OpenApiConfig}
 				<li class='ja'>{@link oaj.parser.annotation.ParserConfig ParserConfig}
 				<li class='ja'>{@link oaj.plaintext.annotation.PlainTextConfig PlainTextConfig}
-				<li class='ja'>{@link oaj.jena.annotation.RdfConfig RdfConfig}
+				<li class='ja'><del>RdfConfig</del>
 				<li class='ja'>{@link oaj.serializer.annotation.SerializerConfig SerializerConfig}
 				<li class='ja'>{@link oaj.soap.annotation.SoapXmlConfig SoapXmlConfig}
 				<li class='ja'>{@link oaj.uon.annotation.UonConfig UonConfig}
@@ -216,12 +216,12 @@
 				</ul>
 				<li class='jc'>{@link oajr.RestContext.Builder}
 				<ul>
-					<li class='jm'>{@del attrs(String...)}
+					<li class='jm'><del> attrs(String...)</del>
 					<li class='jm'><del>attr(String,Object)</del>
 				</ul>
 				<li class='jc'><del>RestMethodContext</del>
 				<ul>
-					<li class='jf'><del>RestMethodContext#RESTMETHOD_attrs RESTMETHOD_attrs</del>
+					<li class='jf'><del>RestMethodContext.RESTMETHOD_attrs RESTMETHOD_attrs</del>
 				</ul>
 				<li class='jc'>{@link oajr.RestRequest}
 				<ul>
@@ -230,11 +230,11 @@
 				<li class='jc'>{@link oajr.RestResponse}
 				<ul>
 					<li class='jm'>{@link oajr.RestResponse#getAttributes() getAttributes()}
-					<li class='jm'><del>RestResponse#attr(String,Object) attr(String,Object)</del>
+					<li class='jm'><del>RestResponse.attr(String,Object) attr(String,Object)</del>
 				</ul>
 				<li class='ja'>{@link oajr.annotation.Attr}
-				<li class='ja'><del>RestMethod#attrs()</del>
-				<li class='ja'><del>RestResource#attrs()</del>
+				<li class='ja'><del>RestMethod.attrs()</del>
+				<li class='ja'><del>RestResource.attrs()</del>
 			</ul>
 			<br>This deprecates the following APIs:
 			<ul class='javatree'>
@@ -242,7 +242,7 @@
 				<li class='jc'><del>RestMethodProperties</del>
 				<li class='jc'>{@link oajr.RestRequest}
 				<ul>
-					<li class='jm'><del>RestRequest#getProperties() getProperties()</del>
+					<li class='jm'><del>RestRequest.getProperties() getProperties()</del>
 					<li class='jm'><del>RestRequest.prop(String,Object) prop(String,Object)</del>
 				</ul>
 			</ul>
@@ -268,7 +268,7 @@
 				</ul>
 				<li class='ja'><del>RestMethod</del>
 				<ul>
-					<li class='jm'><del>RestMethod#roleGuard roleGuard()</del>
+					<li class='jm'><del>RestMethod.roleGuard roleGuard()</del>
 					<li class='jm'><del>RestMethod.rolesDeclared rolesDeclared()</del>
 				</ul>
 			</ul>
diff --git a/juneau-doc/docs/ReleaseNotes/8.1.1.html b/juneau-doc/docs/ReleaseNotes/8.1.1.html
index cef9f926d..ce7c62b2c 100644
--- a/juneau-doc/docs/ReleaseNotes/8.1.1.html
+++ b/juneau-doc/docs/ReleaseNotes/8.1.1.html
@@ -50,7 +50,7 @@
 			Support for {@link java.util.Optional} on method parameters annotated with {@link oaj.http.annotation.Header}, {@link oaj.http.annotation.FormData},  
 			{@link oaj.http.annotation.Query}, {@link oaj.http.annotation.Path}.
 		<li>
-			Fixed issue where {@del oajr.annotation.RestMethod.debug() RestMethod.debug()} annotation wasn't resulting
+			Fixed issue where <del> oajr.annotation.RestMethod.debug() RestMethod.debug()</del> annotation wasn't resulting
 			in the HTTP request being logged.
 		<li>
 			<del>RestException</del> has been deprecated and replaced by <del>HttpException</del>.
@@ -71,13 +71,13 @@
 			<ul class='javatree'>
 				<li class='jc'><del>BasicRest</del>
 					<ul class='javatreec'>
-						<li class='jm'><del>BasicRest#getContext() getContext()</del>
-						<li class='jm'><del>BasicRest#getRequest() getRequest()</del>
-						<li class='jm'><del>BasicRest#getResponse() getResponse()</del>
-						<li class='jm'><del>BasicRest#log(String) log(String)</del>
-						<li class='jm'><del>BasicRest#log(String,Throwable) log(String,Throwable)</del>
-						<li class='jm'><del>BasicRest#log(Level,String,Object[]) log(Level,String,Object[])</del>
-						<li class='jm'><del>BasicRest#logObjects(Level,String,Object[])</del>
+						<li class='jm'><del>BasicRest.getContext() getContext()</del>
+						<li class='jm'><del>BasicRest.getRequest() getRequest()</del>
+						<li class='jm'><del>BasicRest.getResponse() getResponse()</del>
+						<li class='jm'><del>BasicRest.log(String) log(String)</del>
+						<li class='jm'><del>BasicRest.log(String,Throwable) log(String,Throwable)</del>
+						<li class='jm'><del>BasicRest.log(Level,String,Object[]) log(Level,String,Object[])</del>
+						<li class='jm'><del>BasicRest.logObjects(Level,String,Object[])</del>
 						<li class='jm'><del>BasicRest.log(Level,Throwable,String,Object[]) log(Level,Throwable,String,Object[])</del>
 					</ul>
 				</li>
diff --git a/juneau-doc/docs/ReleaseNotes/8.1.2.html b/juneau-doc/docs/ReleaseNotes/8.1.2.html
index ab6f0e8c8..a544cc271 100644
--- a/juneau-doc/docs/ReleaseNotes/8.1.2.html
+++ b/juneau-doc/docs/ReleaseNotes/8.1.2.html
@@ -25,23 +25,23 @@
 		<li>
 			Support for read-only and write-only properties.
 			<ul>
-				<li class='ja'><del>Bean#bpro()</del>
-				<li class='ja'><del>Bean#bpwo()</del>
+				<li class='ja'><del>Bean.bpro()</del>
+				<li class='ja'><del>Bean.bpwo()</del>
 				<li class='ja'>{@link oaj.annotation.Beanp#ro()}
 				<li class='ja'>{@link oaj.annotation.Beanp#wo()}
 				<li class='jf'><del>BEAN_bpro</del>
 				<li class='jf'><del>BEAN_bpwo</del>
-				<li class='jm'><del>Builder#bpro(Map)</del>
-				<li class='jm'><del>Builder#bpwo(Map)</del>
+				<li class='jm'><del>Builder.bpro(Map)</del>
+				<li class='jm'><del>Builder.bpwo(Map)</del>
 			</ul>
 		<li>
 			New convenience methods:
 			<ul>	
-				<li class='jm'><del>ObjectMap#parse(CharSequence)</del>
+				<li class='jm'><del>ObjectMap.parse(CharSequence)</del>
 				<li class='jm'><del>ObjectList.parse(CharSequence)</del>
 			</ul>
 		<li>
-			<del>CharMarshall</del>and {@link oaj.marshall.StreamMarshall} now have public constructors.
+			<del>CharMarshall</del>and <del>StreamMarshall</del> now have public constructors.
 		<li>
 			{@link oaj.annotation.Beanp @Beanp} replaces <del>BeanProperty @BeanProperty</del>.
 		<li>
@@ -66,7 +66,7 @@
 	<ul class='spaced-list'>
 		<li>
 			{@link oajrc.RestClient} is now extendible.  The constructor has been made public and simplified to:
-			{@del oajrc.RestClient#RestClient(RestClient.Builder)}.
+			<del> oajrc.RestClient.RestClient(RestClient.Builder)</del>.
 		<li>
 			Duplicate methods between {@link oajrc.RestClient.Builder} 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 c59304d65..cf827aee0 100644
--- a/juneau-doc/docs/ReleaseNotes/8.1.3.html
+++ b/juneau-doc/docs/ReleaseNotes/8.1.3.html
@@ -65,11 +65,11 @@
 		<li>
 			Renamed the following annotations:
 			<ul>
-				<li><ja>@Rest(attrs)</ja> --> <del>Rest#reqAttrs() @Rest(reqAttrs)</del>
-				<li><ja>@Rest(defaultRequestHeaders)</ja> --> <del>Rest#reqHeaders() @Rest(reqHeaders)</del>
-				<li><ja>@Rest(defaultResponseHeaders)</ja> --> <del>Rest#resHeaders() @Rest(resHeaders)</del>
-				<li><ja>@RestMethod(attrs)</ja> --> <del>RestMethod#reqAttrs() @RestMethod(reqAttrs)</del>
-				<li><ja>@RestMethod(defaultRequestHeaders)</ja> --> <del>RestMethod#reqHeaders() @RestMethod(reqHeaders)</del>
+				<li><ja>@Rest(attrs)</ja> --&gt; <del>Rest.reqAttrs() @Rest(reqAttrs)</del>
+				<li><ja>@Rest(defaultRequestHeaders)</ja> --&gt; <del>Rest.reqHeaders() @Rest(reqHeaders)</del>
+				<li><ja>@Rest(defaultResponseHeaders)</ja> --&gt; <del>Rest.resHeaders() @Rest(resHeaders)</del>
+				<li><ja>@RestMethod(attrs)</ja> --&gt; <del>RestMethod.reqAttrs() @RestMethod(reqAttrs)</del>
+				<li><ja>@RestMethod(defaultRequestHeaders)</ja> --&gt; <del>RestMethod.reqHeaders() @RestMethod(reqHeaders)</del>
 			</ul>
 		<li>
 			New auto-generated REST method execution statistics: <del>RestExecutionStatistics</del>
diff --git a/juneau-doc/docs/ReleaseNotes/8.2.0.html b/juneau-doc/docs/ReleaseNotes/8.2.0.html
index 97180b16f..56575503d 100644
--- a/juneau-doc/docs/ReleaseNotes/8.2.0.html
+++ b/juneau-doc/docs/ReleaseNotes/8.2.0.html
@@ -60,14 +60,14 @@
 			<ul class='javatree'>
 				<li class='jc'>{@link oaj.BeanContext.Builder}
 					<ul class='javatreec'>
-						<li class='jm'><del>Builder#bpi(Class,String) bpi(Class,String)</del>
-						<li class='jm'><del>Builder#bpi(String,String) bpi(String,String)</del>
-						<li class='jm'><del>Builder#bpx(Class,String) bpx(Class,String)</del>
-						<li class='jm'><del>Builder#bpx(String,String) bpx(String,String)</del>
-						<li class='jm'><del>Builder#bpro(Class,String) bpro(Class,String)</del>
-						<li class='jm'><del>Builder#bpro(String,String) bpro(String,String)</del>
-						<li class='jm'><del>Builder#bpwo(Class,String) bpwo(Class,String</del>
-						<li class='jm'><del>Builder#bpwo(String,String) bpwo(String,String</del>
+						<li class='jm'><del>Builder.bpi(Class,String) bpi(Class,String)</del>
+						<li class='jm'><del>Builder.bpi(String,String) bpi(String,String)</del>
+						<li class='jm'><del>Builder.bpx(Class,String) bpx(Class,String)</del>
+						<li class='jm'><del>Builder.bpx(String,String) bpx(String,String)</del>
+						<li class='jm'><del>Builder.bpro(Class,String) bpro(Class,String)</del>
+						<li class='jm'><del>Builder.bpro(String,String) bpro(String,String)</del>
+						<li class='jm'><del>Builder.bpwo(Class,String) bpwo(Class,String</del>
+						<li class='jm'><del>Builder.bpwo(String,String) bpwo(String,String</del>
 					</ul>
 				</li>
 			</ul>
@@ -101,7 +101,7 @@
 				<li class='jc'>{@link oaj.html.annotation.HtmlAnnotation} <jk>implements</jk> {@link oaj.html.annotation.Html}
 				<li class='jc'><del>JsoAnnotation</del> <jk>implements</jk> <del>Jso</del>
 				<li class='jc'>{@link oaj.json.annotation.JsonAnnotation} <jk>implements</jk> {@link oaj.json.annotation.Json}
-				<li class='jc'>{@link oaj.jsonschema.annotation.SchemaAnnotation} <jk>implements</jk> {@link oaj.jsonschema.annotation.Schema}
+				<li class='jc'><del>SchemaAnnotation</del> <jk>implements</jk> <del>Schema</del>
 				<li class='jc'>{@link oaj.msgpack.annotation.MsgPackAnnotation} <jk>implements</jk> {@link oaj.msgpack.annotation.MsgPack}
 				<li class='jc'>{@link oaj.oapi.annotation.OpenApiAnnotation} <jk>implements</jk> {@link oaj.oapi.annotation.OpenApi}
 				<li class='jc'>{@link oaj.plaintext.annotation.PlainTextAnnotation} <jk>implements</jk> {@link oaj.plaintext.annotation.PlainText}
@@ -121,7 +121,7 @@
 			</p>
 		<li>
 			Bean maps now have the concept of "hidden" properties (properties that aren't serialized but otherwise accessible).
-			<br>For example, the {@link oaj.html.annotation.Html.link()} can now reference hidden properties:
+			<br>For example, the {@link oaj.html.annotation.Html#link()} can now reference hidden properties:
 			<p class='bcode'>
 		<ja>@Bean</ja>(bpi=<js>"a"</js>) <jc>// Will be overridden</jc>
 		<jk>public class</jk> MyBean {
@@ -188,15 +188,15 @@
 		<li>
 			New annotations for multi-part support:
 			<ul>
-				<li class='jm'><del>Header#multi()</del>
-				<li class='jm'><del>Query#multi()</del>
-				<li class='jm'><del>FormData#multi()</del>
+				<li class='jm'><del>Header.multi()</del>
+				<li class='jm'><del>Query.multi()</del>
+				<li class='jm'><del>FormData.multi()</del>
 			</ul>
 		<li>
 			<del>BeanTraverseContext.BEANTRAVERSE_ignoreRecursions</del>setting no longer requires <del>BeanTraverseContext.BEANTRAVERSE_detectRecursions</del>
 			to be enabled.
 		<li>
-			Fixed bug in JSON/UON/URL-Encoding serializers where indentation was not correct of first line when <del>BeanTraverseContext#BEANTRAVERSE_initialDepth</del>
+			Fixed bug in JSON/UON/URL-Encoding serializers where indentation was not correct of first line when <del>BeanTraverseContext.BEANTRAVERSE_initialDepth</del>
 			used.
 		<li>
 			Fixed bug in JSON/UON/URL-Encoding serializers where properties past the max depth were being serialized as null instead
@@ -204,7 +204,7 @@
 		<li>
 			Fixed bug in HTML serializer where tables of maps were not sorted if <jsf>SERIALIZER_sortMaps</jsf> was specified.
 		<li>
-			<jsf>SERIALIZER_trimNullProperties</jsf> has been replaced with <del>Serializer#SERIALIZER_keepNullProperties SERIALIZER_keepNullProperties</del>.
+			<jsf>SERIALIZER_trimNullProperties</jsf> has been replaced with <del>Serializer.SERIALIZER_keepNullProperties SERIALIZER_keepNullProperties</del>.
 		<li>
 			Improvements to OpenAPI serializer and parser:
 			<ul>
@@ -271,16 +271,16 @@
 	<h5 class='topic w800'>juneau-rest-server</h5>
 	<ul class='spaced-list'>
 		<li>
-			New <del>RestContext#REST_context REST_context</del>/<del>Rest.context() @Rest(context)</del> setting to allow you to extend the {@link oajr.RestContext}
+			New <del>RestContext.REST_context REST_context</del>/<del>Rest.context() @Rest(context)</del> setting to allow you to extend the {@link oajr.RestContext}
 			class.
 		<li>
 			{@link oajr.annotation.Rest}-annotated classes can now implement the following interfaces directly instead of having
 			to define secondary classes and hook them up through annotations:
 			<ul>
-				<li class='jic'><del>RestCallHandler</del>- Normally defined through {@del oajr.annotation.Rest#callHandler() @Rest.callHandler()}.
-				<li class='jic'><del>RestInfoProvider</del> - Normally defined through {@del oajr.annotation.Rest.infoProvider() @Rest.infoProvider()}.
-				<li class='jic'><del>RestCallLogger</del>- Normally defined through {@del oajr.annotation.Rest#callLogger() @Rest.callLogger()}.
-				<li class='jic'><del>ClasspathResourceFinder</del> - Normally defined through {@del oajr.annotation.Rest.classpathResourceFinder() @Rest.classpathResourceFinder()}.
+				<li class='jic'><del>RestCallHandler</del>- Normally defined through <del> oajr.annotation.Rest.callHandler() @Rest.callHandler()</del>.
+				<li class='jic'><del>RestInfoProvider</del> - Normally defined through <del> oajr.annotation.Rest.infoProvider() @Rest.infoProvider()</del>.
+				<li class='jic'><del>RestCallLogger</del>- Normally defined through <del> oajr.annotation.Rest.callLogger() @Rest.callLogger()</del>.
+				<li class='jic'><del>ClasspathResourceFinder</del> - Normally defined through <del> oajr.annotation.Rest.classpathResourceFinder() @Rest.classpathResourceFinder()</del>.
 			</ul>
 			<br>The methods added for <del>RestInfoProvider</del> are:
 			<ul>
@@ -307,7 +307,7 @@
 			<ul>
 				<li class='jac'><del>RestServlet</del>
 				<ul>
-					<li class='jm'><del>RestServlet#log(RestCallLoggerConfig,HttpServletRequest,HttpServletResponse) log(RestCallLoggerConfig,HttpServletRequest,HttpServletResponse)</del>
+					<li class='jm'><del>RestServlet.log(RestCallLoggerConfig,HttpServletRequest,HttpServletResponse) log(RestCallLoggerConfig,HttpServletRequest,HttpServletResponse)</del>
 				</ul>
 				<li class='jac'><del>BasicRest</del>
 				<ul>
@@ -318,7 +318,7 @@
 			<ul>
 				<li class='jac'><del>RestServlet</del>
 				<ul>
-					<li class='jm'><del>RestServlet#findResource(Class,String,Locale) findResource(Class,String,Locale)</del>
+					<li class='jm'><del>RestServlet.findResource(Class,String,Locale) findResource(Class,String,Locale)</del>
 				</ul>
 				<li class='jac'><del>BasicRest</del>
 				<ul>
@@ -329,11 +329,11 @@
 			<ul>
 				<li class='jac'><del>RestServlet</del>
 				<ul>
-					<li class='jm'>{@del oajr.RestServlet#resolve(Object,Class,RestContext.Builder,Object...) resolve(Object,Class&lt;T&gt;,RestContext.Builder,Object...)}
+					<li class='jm'><del> oajr.RestServlet.resolve(Object,Class,RestContext.Builder,Object...) resolve(Object,Class&lt;T&gt;,RestContext.Builder,Object...)</del>
 				</ul>
 				<li class='jac'><del>BasicRest</del>
 				<ul>
-					<li class='jm'>{@del oajr.BasicRest.resolve(Object,Class,RestContext.Builder,Object...) resolve(Object,Class&lt;T&gt;,RestContext.Builder,Object...)}
+					<li class='jm'><del> oajr.BasicRest.resolve(Object,Class,RestContext.Builder,Object...) resolve(Object,Class&lt;T&gt;,RestContext.Builder,Object...)</del>
 				</ul>
 			</ul>
 		<li>
@@ -341,25 +341,25 @@
 			<ul>
 				<li class='jac'><del>RestServlet</del>
 				<ul>
-					<li class='jm'>{@del oajr.RestServlet#onInit(RestContext.Builder) onInit(RestContext.Builder)}
-					<li class='jm'><del>RestServlet#onPostInit(RestContext) onPostInit(RestContext)</del>
-					<li class='jm'><del>RestServlet#onPostInitChildFirst(RestContext) onPostInitChildFirst(RestContext)</del>
-					<li class='jm'><del>RestServlet#onDestroy(RestContext) onDestroy(RestContext)</del>
-					<li class='jm'><del>RestServlet#onStartCall(HttpServletRequest,HttpServletResponse) onStartCall(HttpServletRequest,HttpServletResponse)</del>
-					<li class='jm'><del>RestServlet#onPreCall(RestRequest,RestResponse) onPreCall(RestRequest,RestResponse)</del>
-					<li class='jm'><del>RestServlet#onPostCall(RestRequest,RestResponse) onPostCall(RestRequest,RestResponse)</del>
-					<li class='jm'><del>RestServlet#onEndCall(HttpServletRequest,HttpServletResponse) onEndCall(HttpServletRequest,HttpServletResponse)</del>
+					<li class='jm'><del> oajr.RestServlet.onInit(RestContext.Builder) onInit(RestContext.Builder)</del>
+					<li class='jm'><del>RestServlet.onPostInit(RestContext) onPostInit(RestContext)</del>
+					<li class='jm'><del>RestServlet.onPostInitChildFirst(RestContext) onPostInitChildFirst(RestContext)</del>
+					<li class='jm'><del>RestServlet.onDestroy(RestContext) onDestroy(RestContext)</del>
+					<li class='jm'><del>RestServlet.onStartCall(HttpServletRequest,HttpServletResponse) onStartCall(HttpServletRequest,HttpServletResponse)</del>
+					<li class='jm'><del>RestServlet.onPreCall(RestRequest,RestResponse) onPreCall(RestRequest,RestResponse)</del>
+					<li class='jm'><del>RestServlet.onPostCall(RestRequest,RestResponse) onPostCall(RestRequest,RestResponse)</del>
+					<li class='jm'><del>RestServlet.onEndCall(HttpServletRequest,HttpServletResponse) onEndCall(HttpServletRequest,HttpServletResponse)</del>
 				</ul>
 				<li class='jac'><del>BasicRest</del>
 				<ul>
-					<li class='jm'>{@del oajr.BasicRest#onInit(RestContext.Builder) onInit(RestContext.Builder)}
-					<li class='jm'><del>BasicRest#onPostInit(RestContext) onPostInit(RestContext)</del>
-					<li class='jm'><del>BasicRest#onPostInitChildFirst(RestContext) onPostInitChildFirst(RestContext)</del>
-					<li class='jm'><del>BasicRest#onDestroy(RestContext) onDestroy(RestContext)</del>
-					<li class='jm'><del>BasicRest#onStartCall(HttpServletRequest,HttpServletResponse) onStartCall(HttpServletRequest,HttpServletResponse)</del>
-					<li class='jm'><del>BasicRest#onPreCall(RestRequest,RestResponse) onPreCall(RestRequest,RestResponse)</del>
-					<li class='jm'><del>BasicRest#onPostCall(RestRequest,RestResponse) onPostCall(RestRequest,RestResponse)</del>
-					<li class='jm'><del>BasicRest#onEndCall(HttpServletRequest,HttpServletResponse) onEndCall(HttpServletRequest,HttpServletResponse)</del>
+					<li class='jm'><del> oajr.BasicRest.onInit(RestContext.Builder) onInit(RestContext.Builder)</del>
+					<li class='jm'><del>BasicRest.onPostInit(RestContext) onPostInit(RestContext)</del>
+					<li class='jm'><del>BasicRest.onPostInitChildFirst(RestContext) onPostInitChildFirst(RestContext)</del>
+					<li class='jm'><del>BasicRest.onDestroy(RestContext) onDestroy(RestContext)</del>
+					<li class='jm'><del>BasicRest.onStartCall(HttpServletRequest,HttpServletResponse) onStartCall(HttpServletRequest,HttpServletResponse)</del>
+					<li class='jm'><del>BasicRest.onPreCall(RestRequest,RestResponse) onPreCall(RestRequest,RestResponse)</del>
+					<li class='jm'><del>BasicRest.onPostCall(RestRequest,RestResponse) onPostCall(RestRequest,RestResponse)</del>
+					<li class='jm'><del>BasicRest.onEndCall(HttpServletRequest,HttpServletResponse) onEndCall(HttpServletRequest,HttpServletResponse)</del>
 				</ul>
 			</ul>
 		<li>
@@ -391,7 +391,7 @@
 				<li class='jc'><del>ClasspathResourceFinder</del>
 				<li class='jc'><del>RestResourceResolver</del>
 				<li class='jc'><del>RestGuard</del>
-				<li class='jc'>{@link oajr.ResponseHandler}
+				<li class='jc'><del>ResponseHandler</del>
 			</ul>
 		<li>
 			New <del>Path.required() @Path(required)</del>annotation support.
diff --git a/juneau-doc/docs/Topics/01.Overview/01.o.Marshalling.html b/juneau-doc/docs/Topics/01.Overview/01.o.Marshalling.html
index e8b6c0d85..5c4c172be 100644
--- a/juneau-doc/docs/Topics/01.Overview/01.o.Marshalling.html
+++ b/juneau-doc/docs/Topics/01.Overview/01.o.Marshalling.html
@@ -382,8 +382,8 @@
 		|	SerializerSet <jv>serializerSet</jv> = SerializerSet
 		|		.<jsm>create</jsm>()
 		|		.add(JsonSerializer.<jk>class</jk>, UrlEncodingSerializer.<jk>class</jk>);
-		|		.forEach(<jv>x</jv> -> <jv>x</jv>.swaps(CalendarSwap.ISO8601DT.<jk>class</jk>))
-		|		.forEachWS(<jv>x</jv> -> <jv>x</jv>.useWhitespace())
+		|		.forEach(<jv>x</jv> -&gt; <jv>x</jv>.swaps(CalendarSwap.ISO8601DT.<jk>class</jk>))
+		|		.forEachWS(<jv>x</jv> -&gt; <jv>x</jv>.useWhitespace())
 		|		.build();
 		|
 		|	<jc>// Find the appropriate serializer by Accept type and serialize our POJO to the specified writer.</jc>
@@ -396,7 +396,7 @@
 		|	ParserSet <jv>parserSet</jv> = ParserSet
 		|		.<jsm>create</jsm>()
 		|		.add(JsonParser.<jk>class</jk>, UrlEncodingParser.<jk>class</jk>);
-		|		.forEach(<jv>x</jv> -> <jv>x</jv>.swaps(CalendarSwap.ISO8601DT.<jk>class</jk>))
+		|		.forEach(<jv>x</jv> -&gt; <jv>x</jv>.swaps(CalendarSwap.ISO8601DT.<jk>class</jk>))
 		|		.build();
 		|
 		|	Person <jv>person</jv> = <jv>parserSet</jv>
diff --git a/juneau-doc/docs/Topics/01.Overview/03.o.RestServer.html b/juneau-doc/docs/Topics/01.Overview/03.o.RestServer.html
index 1e2b999fb..1698ecd7c 100644
--- a/juneau-doc/docs/Topics/01.Overview/03.o.RestServer.html
+++ b/juneau-doc/docs/Topics/01.Overview/03.o.RestServer.html
@@ -492,7 +492,7 @@
 		|		 */</jd>
 		|		<ja>@Bean</ja>
 		|		<jk>public</jk> ServletRegistrationBean&lt;Servlet&gt; getRootServlet(RootResources <jv>rootResources</jv>) {
-		|			<jk>return new</jk> ServletRegistrationBean<>(<jv>rootResources</jv>, <js>"/*"</js>);
+		|			<jk>return new</jk> ServletRegistrationBean&lt;&gt;(<jv>rootResources</jv>, <js>"/*"</js>);
 		|		}
 		|	}
 	</p>
diff --git a/juneau-doc/docs/Topics/01.Overview/07.o.FluentAssertions.html b/juneau-doc/docs/Topics/01.Overview/07.o.FluentAssertions.html
index bd5e034bc..166565fbb 100644
--- a/juneau-doc/docs/Topics/01.Overview/07.o.FluentAssertions.html
+++ b/juneau-doc/docs/Topics/01.Overview/07.o.FluentAssertions.html
@@ -49,7 +49,7 @@
 		|	<jc>// Perform an arbitrary Predicate check against a bean.</jc>
 		|	MyBean <jv>myBean</jv> = ...;
 		|	<jsm>assertBean</jsm>(<jv>myBean</jv>)
-		|		.is(<jv>x</jv> -> <jsm>isValidCheck</jsm>(<jv>x</jv>))
+		|		.is(<jv>x</jv> -&gt; <jsm>isValidCheck</jsm>(<jv>x</jv>))
 		|	
 		|	<jc>// Check that a list of strings has less than 10 entries and the first</jc>
 		|	<jc>// 3 entries are [foo, bar*, null] using assertion predicates.</jc>
@@ -60,7 +60,7 @@
 		|			.is(<jsm>eq</jsm>(<js>"foo"</js>),<jsm>match</jsm>(<js>"bar*"</js>),<jsm>isNull</jsm>())
 		|	
 		|	<jc>// Check that an exception is thrown and is the specified type and has the specified message.</jc>
-		|	<jsm>assertThrown</jsm>(()-><jv>myBean</jv>.runBadMethod())
+		|	<jsm>assertThrown</jsm>(()-&gt;<jv>myBean</jv>.runBadMethod())
 		|		.isExists()
 		|		.isExactType(RuntimeException.<jk>class</jk>)
 		|		.asMessage().is(<js>"foo"</js>);
diff --git a/juneau-doc/docs/Topics/02.juneau-marshall/01.jm.Marshallers.html b/juneau-doc/docs/Topics/02.juneau-marshall/01.jm.Marshallers.html
index 6800b6ed8..a02806984 100644
--- a/juneau-doc/docs/Topics/02.juneau-marshall/01.jm.Marshallers.html
+++ b/juneau-doc/docs/Topics/02.juneau-marshall/01.jm.Marshallers.html
@@ -39,11 +39,6 @@
 							<li class='jc'>{@link oaj.marshaller.Uon}
 							<li class='jc'>{@link oaj.marshaller.UrlEncoding}
 							<li class='jc'>{@link oaj.marshaller.Xml}
-							<li class='jc'>{@link oaj.marshaller.N3}
-							<li class='jc'>{@link oaj.marshaller.NTriple}
-							<li class='jc'>{@link oaj.marshaller.RdfXml}
-							<li class='jc'>{@link oaj.marshaller.RdfXmlAbbrev}
-							<li class='jc'>{@link oaj.marshaller.Turtle}
 						</ul>
 					</ul>
 				<li class='jac'>{@link oaj.marshaller.StreamMarshaller}
@@ -83,11 +78,6 @@
 		<li class='jc'>{@link oaj.marshaller.Uon}
 		<li class='jc'>{@link oaj.marshaller.UrlEncoding}
 		<li class='jc'>{@link oaj.marshaller.Xml}
-		<li class='jc'>{@link oaj.marshaller.N3}
-		<li class='jc'>{@link oaj.marshaller.NTriple}
-		<li class='jc'>{@link oaj.marshaller.RdfXml}
-		<li class='jc'>{@link oaj.marshaller.RdfXmlAbbrev}
-		<li class='jc'>{@link oaj.marshaller.Turtle}
 	</ul>
 	<p>
 		Each predefined marshaller also includes static convenience from/to methods to make it even easier to
diff --git a/juneau-doc/docs/Topics/02.juneau-marshall/07.jm.ContextAnnotations.html b/juneau-doc/docs/Topics/02.juneau-marshall/07.jm.ContextAnnotations.html
index 327c0fc93..f9019854a 100644
--- a/juneau-doc/docs/Topics/02.juneau-marshall/07.jm.ContextAnnotations.html
+++ b/juneau-doc/docs/Topics/02.juneau-marshall/07.jm.ContextAnnotations.html
@@ -74,7 +74,6 @@
 		<li class='ja'>{@link oaj.oapi.annotation.OpenApiConfig OpenApiConfig}
 		<li class='ja'>{@link oaj.parser.annotation.ParserConfig ParserConfig}
 		<li class='ja'>{@link oaj.plaintext.annotation.PlainTextConfig PlainTextConfig}
-		<li class='ja'>{@link oaj.jena.annotation.RdfConfig RdfConfig}
 		<li class='ja'>{@link oaj.serializer.annotation.SerializerConfig SerializerConfig}
 		<li class='ja'>{@link oaj.soap.annotation.SoapXmlConfig SoapXmlConfig}
 		<li class='ja'>{@link oaj.uon.annotation.UonConfig UonConfig}
diff --git a/juneau-doc/docs/Topics/02.juneau-marshall/10.jm.SerializerSetsParserSets.html b/juneau-doc/docs/Topics/02.juneau-marshall/10.jm.SerializerSetsParserSets.html
index 99df5ba03..04dc69b7a 100644
--- a/juneau-doc/docs/Topics/02.juneau-marshall/10.jm.SerializerSetsParserSets.html
+++ b/juneau-doc/docs/Topics/02.juneau-marshall/10.jm.SerializerSetsParserSets.html
@@ -27,8 +27,8 @@
 		|	// to all serializers.</jc>
 		|	SerializerSet <jv>serializers</jv> = SerializerSet.<jsm>create</jsm>()
 		|		.add(JsonSerializer.<jk>class</jk>, UrlEncodingSerializer.<jk>class</jk>)
-		|		.forEach(<jv>x</jv> -> <jv>x</jv>.swaps(TemporalCalendarSwap.IsoLocalDateTime.<jk>class</jk>))
-		|		.forEachWS(<jv>x</jv> -> <jv>x</jv>.ws())   <jc>// or .useWhitespace(true)</jc>
+		|		.forEach(<jv>x</jv> -&gt; <jv>x</jv>.swaps(TemporalCalendarSwap.IsoLocalDateTime.<jk>class</jk>))
+		|		.forEachWS(<jv>x</jv> -&gt; <jv>x</jv>.ws())   <jc>// or .useWhitespace(true)</jc>
 		|		.build();
 		|
 		|	<jc>// Find the appropriate serializer by Accept type and serialize our POJO to the 
@@ -40,7 +40,7 @@
 		|	<jc>// Construct a new parser group with configuration parameters that get applied to all parsers.</jc>
 		|	ParserSet <jv>parsers</jv> = ParserSet.<jsm>create</jsm>()
 		|		.add(JsonSerializer.<jk>class</jk>, UrlEncodingSerializer.<jk>class</jk>)
-		|		.forEach(<jv>x</jv> -> <jv>x</jv>.swaps(CalendarSwap.IsoLocalDateTime.<jk>class</jk>))
+		|		.forEach(<jv>x</jv> -&gt; <jv>x</jv>.swaps(CalendarSwap.IsoLocalDateTime.<jk>class</jk>))
 		|		.build();
 		|
 		|	Person <jv>myPerson</jv> = <jv>parsers</jv>
diff --git a/juneau-doc/docs/Topics/02.juneau-marshall/11.jm.Swaps.html b/juneau-doc/docs/Topics/02.juneau-marshall/11.jm.Swaps.html
index f2d21ca95..e779a176f 100644
--- a/juneau-doc/docs/Topics/02.juneau-marshall/11.jm.Swaps.html
+++ b/juneau-doc/docs/Topics/02.juneau-marshall/11.jm.Swaps.html
@@ -116,7 +116,7 @@
 		|	WriterSerializer <jv>serializer</jv> = JsonSerializer
 		|		.<jsm>create</jsm>()
 		|		.simple()
-		|		.swap(MyBean.<jk>class</jk>, String.<jk>class</jk>, <jv>x</jv> -> <jsm>myBeanStringifier</jsm>(<jv>x</jv>))
+		|		.swap(MyBean.<jk>class</jk>, String.<jk>class</jk>, <jv>x</jv> -&gt; <jsm>myBeanStringifier</jsm>(<jv>x</jv>))
 		|		.build();
 	</p>
 </div>
\ No newline at end of file
diff --git a/juneau-doc/docs/Topics/02.juneau-marshall/11.jm.Swaps/01.jm.DefaultSwaps.html b/juneau-doc/docs/Topics/02.juneau-marshall/11.jm.Swaps/01.jm.DefaultSwaps.html
index 5f2b2fdee..479b58e44 100644
--- a/juneau-doc/docs/Topics/02.juneau-marshall/11.jm.Swaps/01.jm.DefaultSwaps.html
+++ b/juneau-doc/docs/Topics/02.juneau-marshall/11.jm.Swaps/01.jm.DefaultSwaps.html
@@ -23,7 +23,7 @@
 		<li class='jc'>{@link java.util.Enumeration}
 		<li class='jc'>{@link java.util.Iterator}
 		<li class='jc'>{@link java.util.Locale}
-		<li class='jc'>{@link java.util.Class}
+		<li class='jc'>{@link java.lang.Class}
 		<li class='jc'>{@link java.util.Calendar}
 		<li class='jc'>{@link java.util.Date}
 		<li class='jc'>{@link java.time.Instant}
@@ -35,7 +35,7 @@
 		<li class='jc'>{@link java.time.OffsetTime}
 		<li class='jc'>{@link java.time.Year}
 		<li class='jc'>{@link java.time.YearMonth}
-		<li class='jc'>{@link java.time.Temporal}
+		<li class='jc'>{@link java.time.temporal.Temporal}
 		<li class='jc'>{@link java.util.TimeZone}
 		<li class='jc'>{@link javax.xml.datatype.XMLGregorianCalendar}
 		<li class='jc'>{@link java.time.ZoneId}
diff --git a/juneau-doc/docs/Topics/02.juneau-marshall/11.jm.Swaps/03.jm.PerMediaTypeSwaps.html b/juneau-doc/docs/Topics/02.juneau-marshall/11.jm.Swaps/03.jm.PerMediaTypeSwaps.html
index 09e1e63b8..86629a272 100644
--- a/juneau-doc/docs/Topics/02.juneau-marshall/11.jm.Swaps/03.jm.PerMediaTypeSwaps.html
+++ b/juneau-doc/docs/Topics/02.juneau-marshall/11.jm.Swaps/03.jm.PerMediaTypeSwaps.html
@@ -73,8 +73,8 @@
 		|
 		|			SerializerSet <jv>serializers</jv> = SerializersSet.<jsm>create</jsm>()
 		|				.add(JsonSerializer.<jk>class</jk>, XmlSerializer.<jk>class</jk>, HtmlSerializer.<jk>class</jk>)
-		|				.forEach(<jv>x</jv> -> <jv>x</jv>.swaps(MyJsonSwap.<jk>class</jk>, MyXmlSwap.<jk>class</jk>, MyOtherSwap.<jk>class</jk>))
-		|				.forEachWS(<jv>x</jv> -> <jv>x</jv>.ws())
+		|				.forEach(<jv>x</jv> -&gt; <jv>x</jv>.swaps(MyJsonSwap.<jk>class</jk>, MyXmlSwap.<jk>class</jk>, MyOtherSwap.<jk>class</jk>))
+		|				.forEachWS(<jv>x</jv> -&gt; <jv>x</jv>.ws())
 		|				.build();
 		|
 		|			MyPojo <jv>myPojo</jv> = <jk>new</jk> MyPojo();
diff --git a/juneau-doc/docs/Topics/02.juneau-marshall/12.jm.DynamicallyAppliedAnnotations.html b/juneau-doc/docs/Topics/02.juneau-marshall/12.jm.DynamicallyAppliedAnnotations.html
index 945bd78d8..a02abc2c9 100644
--- a/juneau-doc/docs/Topics/02.juneau-marshall/12.jm.DynamicallyAppliedAnnotations.html
+++ b/juneau-doc/docs/Topics/02.juneau-marshall/12.jm.DynamicallyAppliedAnnotations.html
@@ -83,7 +83,6 @@
 		<li class='ja'>{@link oaj.uon.annotation.Uon}
 		<li class='ja'>{@link oaj.urlencoding.annotation.UrlEncoding}
 		<li class='ja'>{@link oaj.xml.annotation.Xml}
-		<li class='ja'>{@link oaj.jena.annotation.Rdf}
 	</ul>
 	<p>
 		The valid pattern matches are:
diff --git a/juneau-doc/docs/Topics/02.juneau-marshall/21.jm.SimpleVariableLanguage/01.jm.SvlVariables.html b/juneau-doc/docs/Topics/02.juneau-marshall/21.jm.SimpleVariableLanguage/01.jm.SvlVariables.html
index e51464bbf..d5c986d9a 100644
--- a/juneau-doc/docs/Topics/02.juneau-marshall/21.jm.SimpleVariableLanguage/01.jm.SvlVariables.html
+++ b/juneau-doc/docs/Topics/02.juneau-marshall/21.jm.SimpleVariableLanguage/01.jm.SvlVariables.html
@@ -197,7 +197,7 @@
 		</tr>
 		<tr class='dark'>
 			<td>{@link oajr.vars.UrlVar}</td>
-			<td class='code'>$U{uri}></td>
+			<td class='code'>$U{uri}</td>
 		</tr>
 		<tr class='dark'>
 			<td>{@link oajr.vars.UrlEncodeVar}</td>
diff --git a/juneau-doc/docs/Topics/02.juneau-marshall/22.jm.Encoders.html b/juneau-doc/docs/Topics/02.juneau-marshall/22.jm.Encoders.html
index fa7690e02..d9ea50908 100644
--- a/juneau-doc/docs/Topics/02.juneau-marshall/22.jm.Encoders.html
+++ b/juneau-doc/docs/Topics/02.juneau-marshall/22.jm.Encoders.html
@@ -30,7 +30,7 @@
 	</ul>
 	<h5 class='topic'>EncoderSet</h5>
 	<p>
-		The {@link oaj.encoders.EncoderSet} class represents the set of {@link Encoder encoders} keyed by codings.
+		The {@link oaj.encoders.EncoderSet} class represents the set of {@link oaj.encoders.Encoder encoders} keyed by codings.
 		It maintains a set of encoders and the codings that they can handle.
  		The {@link oaj.encoders.EncoderSet#getEncoderMatch(String) getEncoderMatch(String)} and {@link oaj.encoders.EncoderSet#getEncoder(String)} 
  		methods are then used to find appropriate encoders for specific <c>Accept-Encoding</c> and <c>Content-Encoding</c> header values.
diff --git a/juneau-doc/docs/Topics/02.juneau-marshall/23.jm.ObjectTools.html b/juneau-doc/docs/Topics/02.juneau-marshall/23.jm.ObjectTools.html
index a480d443e..722b71230 100644
--- a/juneau-doc/docs/Topics/02.juneau-marshall/23.jm.ObjectTools.html
+++ b/juneau-doc/docs/Topics/02.juneau-marshall/23.jm.ObjectTools.html
@@ -40,9 +40,9 @@
 	</p>
 	<ul class='spaced-list'>
 		<li>
-			{@link Map Maps} and Java beans representing JSON objects.
+			{@link java.util.Map Maps} and Java beans representing JSON objects.
 		<li>
-			{@link Collection Collections} and arrays representing JSON arrays.
+			{@link java.util.Collection Collections} and arrays representing JSON arrays.
 		<li>
 			Java beans.
 	</ul>
diff --git a/juneau-doc/docs/Topics/02.juneau-marshall/27.jm.HtmlDetails/05.jm.HtmlRenderAnnotation.html b/juneau-doc/docs/Topics/02.juneau-marshall/27.jm.HtmlDetails/05.jm.HtmlRenderAnnotation.html
index 67ac51d60..d7ebeea76 100644
--- a/juneau-doc/docs/Topics/02.juneau-marshall/27.jm.HtmlDetails/05.jm.HtmlRenderAnnotation.html
+++ b/juneau-doc/docs/Topics/02.juneau-marshall/27.jm.HtmlDetails/05.jm.HtmlRenderAnnotation.html
@@ -89,7 +89,7 @@
 		|
 		|		<ja>@Override</ja>
 		|		<jk>public</jk> Object getContent(SerializerSession <jv>session</jv>, Float <jv>value</jv>) {
-		|			<jk>if</jk> (<jv>value</jv> >= 90)
+		|			<jk>if</jk> (<jv>value</jv> &gt;= 90)
 		|				<jk>return</jk> <jsm>div</jsm>(
 		|					String.<jsm>format</jsm>(<js>"%.0f%%"</js>, <jv>value</jv>),
 		|					<jsm>style</jsm>(<js>"@keyframes color_change { from { background-color: red; } to { background-color: yellow; }"</js>)
diff --git a/juneau-doc/docs/Topics/02.juneau-marshall/32.jm.OpenApiDetails.html b/juneau-doc/docs/Topics/02.juneau-marshall/32.jm.OpenApiDetails.html
index ba5e40e6c..dbe6d8fdc 100644
--- a/juneau-doc/docs/Topics/02.juneau-marshall/32.jm.OpenApiDetails.html
+++ b/juneau-doc/docs/Topics/02.juneau-marshall/32.jm.OpenApiDetails.html
@@ -44,6 +44,5 @@
 		<li class='ja'>{@link oaj.http.annotation.FormData}
 		<li class='ja'>{@link oaj.http.annotation.Path}
 		<li class='ja'>{@link oaj.http.annotation.Response}
-		<li class='ja'>{@link oaj.http.annotation.ResponseHeader}
 	</ul>
 </div>
\ No newline at end of file
diff --git a/juneau-doc/docs/Topics/03.juneau-marshall-rdf/01.jmr.RdfDetails.html b/juneau-doc/docs/Topics/03.juneau-marshall-rdf/01.jmr.RdfDetails.html
deleted file mode 100644
index 47c23fb56..000000000
--- a/juneau-doc/docs/Topics/03.juneau-marshall-rdf/01.jmr.RdfDetails.html
+++ /dev/null
@@ -1,69 +0,0 @@
-<!--
-/***************************************************************************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *  
- *  http://www.apache.org/licenses/LICENSE-2.0
- *  
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations under the License.
- ***************************************************************************************************************************/
- -->
-
-{title:'RDF Details'}
-
-<div class='topic'>
-	<p>
-		Juneau supports serializing and parsing arbitrary POJOs to and from the following RDF formats:
-	</p>
-	<ul>
-		<li>RDF/XML
-		<li>Abbreviated RDF/XML
-		<li>N-Triple
-		<li>Turtle
-		<li>N3
-	</ul>
-	
-	<p>
-		The serializers and parsers work identically to those in <c>juneau-marshall</c> but are
-		packaged separately so that you don't need to pull in the Jena dependency unless you need it.
-	</p>
-	
-	<p class='bjava'>
-		|	<jc>// A simple bean</jc>
-		|	<jk>public class</jk> Person {
-		|		<jk>public</jk> String <jf>name</jf> = <js>"John Smith"</js>;
-		|		<jk>public int</jk> <jf>age</jf> = 21;
-		|	}
-		|	
-		|	<jc>// Serialize a bean to JSON, XML, or HTML</jc>
-		|	Person <jv>person</jv> = <jk>new</jk> Person();
-		|
-		|	<jc>// Produces:
-		|	// &lt;rdf:RDF
-		|	//  xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-		|	//  xmlns:jp="http://www.apache.org/juneaubp/"
-		|	//  xmlns:j="http://www.apache.org/juneau/"&gt;
-		|	// 	&lt;rdf:Description&gt;
-		|	// 		&lt;jp:name&gt;John Smith&lt;/jp:name&gt;
-		|	// 		&lt;jp:age&gt;21&lt;/jp:age&gt;
-		|	// 	&lt;/rdf:Description&gt;
-		|	// &lt;/rdf:RDF&gt;</jc>
-		|	String <jv>rdfXml</jv> = RdfXmlAbbrev.<jsm>of</jsm>(<jv>person</jv>);
-		|	
-		|	<jc>// Produces:
-		|	// @prefix jp:      &lt;http://www.apache.org/juneaubp/&gt; .
-		|	// @prefix j:       &lt;http://www.apache.org/juneau/&gt; .
-		|	//	[]    jp:age  "21" ;
-		|	//	      jp:name "John Smith" .</jc>
-		|	String <jv>rdfN3</jv> = N3.<jsm>of</jsm>(<jv>person</jv>);
-		|
-		|	<jc>// Produces:
-		|	// _:A3bf53c85X3aX157cf407e2dX3aXX2dX7ffd &lt;http://www.apache.org/juneaubp/name&gt; "John Smith" .
-		|	// _:A3bf53c85X3aX157cf407e2dX3aXX2dX7ffd &lt;http://www.apache.org/juneaubp/age&gt; "21" .</jc>
-		|	String <jv>rdfNTriple</jv> = NTriple.<jsm>of</jsm>(<jv>person</jv>);
-	</p>
-</div>
\ No newline at end of file
diff --git a/juneau-doc/docs/Topics/03.juneau-marshall-rdf/01.jmr.RdfDetails/01.jmr.Serializers.html b/juneau-doc/docs/Topics/03.juneau-marshall-rdf/01.jmr.RdfDetails/01.jmr.Serializers.html
deleted file mode 100644
index 96f0c17a2..000000000
--- a/juneau-doc/docs/Topics/03.juneau-marshall-rdf/01.jmr.RdfDetails/01.jmr.Serializers.html
+++ /dev/null
@@ -1,101 +0,0 @@
-<!--
-/***************************************************************************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *  
- *  http://www.apache.org/licenses/LICENSE-2.0
- *  
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations under the License.
- ***************************************************************************************************************************/
- -->
-
-{title:'RDF Serializers', updated:'9.0.0'}
-
-<div class='topic'>
-	<p>
-		The {@link oaj.jena.RdfSerializer} class is the top-level class for all Jena-based serializers.
-		Language-specific serializers are defined as inner subclasses of the <c>RdfSerializer</c> class:
-	</p>	
-	<ul class='javatree'>
-		<li class='jc'>{@link oaj.jena.RdfSerializer}
-			<ul class='javatreec'>
-				<li class='jc'>{@link oaj.jena.RdfXmlSerializer}
-				<li class='jc'>{@link oaj.jena.RdfXmlAbbrevSerializer}
-				<li class='jc'>{@link oaj.jena.N3Serializer}
-				<li class='jc'>{@link oaj.jena.NTripleSerializer}
-				<li class='jc'>{@link oaj.jena.TurtleSerializer}
-			</ul>
-		</li>
-	</ul>
-	<p>
-		The class hierarchy for the builder of this serializer is:
-	</p>
-	<ul class='javatree'>
-		<li class='jac'>{@link oaj.Context.Builder}
-			<ul>
-				<li class='jac'>{@link oaj.BeanContextable.Builder}
-					<ul>
-						<li class='jac'>{@link oaj.BeanTraverseContext.Builder}
-							<ul>
-								<li class='jac'>{@link oaj.serializer.Serializer.Builder}
-									<ul>
-										<li class='jac'>{@link oaj.serializer.WriterSerializer.Builder}
-											<ul>
-												<li class='jc'>{@link oaj.jena.RdfSerializer.Builder}
-											</ul>
-										</li>
-									</ul>
-								</li>
-							</ul>
-						</li>
-					</ul>
-				</li>
-			</ul>
-		</li>
-	</ul>
-	<p>
-		Refer to the builder javadocs for configurable settings.
-	</p>
-	<p>
-		The following pre-configured serializers are provided for convenience:
-	</p>
-	<ul class='javatree'>
-		<li class='jc'>{@link oaj.jena.RdfSerializer}
-			<ul>
-				<li class='jc'>{@link oaj.jena.RdfXmlSerializer}
-					<ul>
-						<li class='jf'>{@link oaj.jena.RdfXmlSerializer#DEFAULT DEFAULT}
-					</ul>
-				</li>
-				<li class='jc'>{@link oaj.jena.RdfXmlAbbrevSerializer}
-					<ul>
-						<li class='jf'>{@link oaj.jena.RdfXmlAbbrevSerializer#DEFAULT DEFAULT}
-					</ul>
-				</li>
-				<li class='jc'>{@link oaj.jena.N3Serializer}
-					<ul>
-						<li class='jf'>{@link oaj.jena.N3Serializer#DEFAULT DEFAULT}
-					</ul>
-				</li>
-				<li class='jc'>{@link oaj.jena.NTripleSerializer}
-					<ul>
-						<li class='jf'>{@link oaj.jena.NTripleSerializer#DEFAULT DEFAULT}
-					</ul>
-				</li>
-				<li class='jc'>{@link oaj.jena.TurtleSerializer}
-					<ul>
-						<li class='jf'>{@link oaj.jena.TurtleSerializer#DEFAULT DEFAULT}
-					</ul>
-				</li>
-			</ul>
-		</li>
-	</ul>
-	<p>
-		Abbreviated RDF/XML is currently the most widely accepted and readable RDF syntax, so the examples shown here 
-		will use that format.
-	</p>
-</div>
\ No newline at end of file
diff --git a/juneau-doc/docs/Topics/03.juneau-marshall-rdf/01.jmr.RdfDetails/02.jmr.Parsers.html b/juneau-doc/docs/Topics/03.juneau-marshall-rdf/01.jmr.RdfDetails/02.jmr.Parsers.html
deleted file mode 100644
index cb0b14f13..000000000
--- a/juneau-doc/docs/Topics/03.juneau-marshall-rdf/01.jmr.RdfDetails/02.jmr.Parsers.html
+++ /dev/null
@@ -1,90 +0,0 @@
-<!--
-/***************************************************************************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *  
- *  http://www.apache.org/licenses/LICENSE-2.0
- *  
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations under the License.
- ***************************************************************************************************************************/
- -->
-
-{title:'RDF Parsers', updated:'9.0.0'}
-
-<div class='topic'>
-	<p>
-		The {@link oaj.jena.RdfParser} class is the top-level class for all Jena-based parsers.
-		Language-specific parsers are defined as inner subclasses of the <c>RdfParser</c> class:
-	</p>	
-	<ul class='javatree'>
-		<li class='jc'>{@link oaj.jena.RdfParser}
-			<ul class='javatreec'>
-				<li class='jc'>{@link oaj.jena.RdfXmlParser}
-				<li class='jc'>{@link oaj.jena.NTripleParser}
-				<li class='jc'>{@link oaj.jena.TurtleParser}
-				<li class='jc'>{@link oaj.jena.N3Parser}
-			</ul>
-		</li>
-	</ul>
-	<p>
-		The <c>RdfParser.Xml</c> parser handles both regular and abbreviated RDF/XML.
-	</p>
-	<p>
-		The class hierarchy for the builder of this parser is:
-	</p>
-	<ul class='javatree'>
-		<li class='jac'>{@link oaj.Context.Builder}
-			<ul>
-				<li class='jac'>{@link oaj.BeanContextable.Builder}
-					<ul>
-						<li class='jac'>{@link oaj.parser.Parser.Builder}
-							<ul>
-								<li class='jac'>{@link oaj.parser.ReaderParser.Builder}
-									<ul>
-										<li class='jc'>{@link oaj.jena.RdfParser.Builder}
-									</ul>
-								</li>
-							</ul>
-						</li>
-					</ul>
-				</li>
-			</ul>
-		</li>
-	</ul>
-	<p>
-		Refer to the builder javadocs for configurable settings.
-	</p>
-	<p>
-		The following pre-configured parsers are provided for convenience:
-	</p>
-	<ul class='javatree'>
-		<li class='jc'>{@link oaj.jena.RdfParser}
-			<ul>
-				<li class='jc'>{@link oaj.jena.RdfXmlParser}
-					<ul>
-						<li class='jf'>{@link oaj.jena.RdfXmlParser#DEFAULT DEFAULT}
-					</ul>
-				</li>
-				<li class='jc'>{@link oaj.jena.N3Parser}
-					<ul>
-						<li class='jf'>{@link oaj.jena.N3Parser#DEFAULT DEFAULT}
-					</ul>
-				</li>
-				<li class='jc'>{@link oaj.jena.NTripleParser}
-					<ul>
-						<li class='jf'>{@link oaj.jena.NTripleParser#DEFAULT DEFAULT}
-					</ul>
-				</li>
-				<li class='jc'>{@link oaj.jena.TurtleParser}
-					<ul>
-						<li class='jf'>{@link oaj.jena.TurtleParser#DEFAULT DEFAULT}
-					</ul>
-				</li>
-			</ul>
-		</li>
-	</ul>
-</div>
\ No newline at end of file
diff --git a/juneau-doc/docs/Topics/03.juneau-marshall-rdf/01.jmr.RdfDetails/03.jmr.RdfAnnotation.html b/juneau-doc/docs/Topics/03.juneau-marshall-rdf/01.jmr.RdfDetails/03.jmr.RdfAnnotation.html
deleted file mode 100644
index 13771659a..000000000
--- a/juneau-doc/docs/Topics/03.juneau-marshall-rdf/01.jmr.RdfDetails/03.jmr.RdfAnnotation.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<!--
-/***************************************************************************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *  
- *  http://www.apache.org/licenses/LICENSE-2.0
- *  
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations under the License.
- ***************************************************************************************************************************/
- -->
-
-{title:'@Rdf Annotation'}
-
-<div class='topic'>
-	<p>
-		The {@link oaj.jena.annotation.Rdf @Rdf} annotation
-		is used to override the behavior of the RDF serializers and parsers on individual bean classes or properties.
-	</p>
-	<ul class='javatree'>
-		<li class='ja'>{@link oaj.jena.annotation.Rdf}
-			<ul class='javatreec'>
-				<li class='jma'>{@link oaj.jena.annotation.Rdf#beanUri() beanUri}
-				<li class='jma'>{@link oaj.jena.annotation.Rdf#collectionFormat() collectionFormat}
-				<li class='jma'>{@link oaj.jena.annotation.Rdf#namespace() namespace}
-				<li class='jma'>{@link oaj.jena.annotation.Rdf#prefix() prefix}
-			</ul>
-		</li>
-	</ul>		
-</div>
\ No newline at end of file
diff --git a/juneau-doc/docs/Topics/03.juneau-marshall-rdf/01.jmr.RdfDetails/04.jmr.Namespaces.html b/juneau-doc/docs/Topics/03.juneau-marshall-rdf/01.jmr.RdfDetails/04.jmr.Namespaces.html
deleted file mode 100644
index 38f00e459..000000000
--- a/juneau-doc/docs/Topics/03.juneau-marshall-rdf/01.jmr.RdfDetails/04.jmr.Namespaces.html
+++ /dev/null
@@ -1,97 +0,0 @@
-<!--
-/***************************************************************************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *  
- *  http://www.apache.org/licenses/LICENSE-2.0
- *  
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations under the License.
- ***************************************************************************************************************************/
- -->
-
-{title:'Namespaces', updated:'9.0.0'}
-
-<div class='topic'>
-	<p>
-		You'll notice in the previous example that Juneau namespaces are used to represent bean property names.
-		These are used by default when namespaces are not explicitly specified.
-	</p>
-	<p>
-		The <c>juneau</c> namespace is used for generic names for objects that don't have namespaces 
-		associated with them.
-	</p>
-	<p>
-		The <c>juneaubp</c> namespace is used on bean properties that don't have namespaces associated with 
-		them.
-	</p>
-	<p>
-		The easiest way to specify namespaces is through annotations.
-		In this example, we're going to associate the prefix <c>'per'</c> to our bean class and all properties 
-		of this class.
-		We do this by adding the following annotation to our class:
-	</p>
-	<p class='bjava'>
-		|	<ja>@Rdf</ja>(prefix=<js>"per"</js>)
-		|	<jk>public class</jk> Person {
-	</p>
-	<p>
-		In general, the best approach is to define the namespace URIs at the package level using a 
-		<c>package-info.java</c> class, like so:
-	</p>
-	<p class='bjava'>
-		|	<jc>// RDF namespaces used in this package</jc>
-		|	<ja>@RdfSchema</ja>(
-		|		prefix=<js>"ab"</js>,
-		|		rdfNs={
-		|			<ja>@RdfNs</ja>(prefix=<js>"ab"</js>, namespaceURI=<js>"http://www.apache.org/addressBook/"</js>),
-		|			<ja>@RdfNs</ja>(prefix=<js>"per"</js>, namespaceURI=<js>"http://www.apache.org/person/"</js>),
-		|			<ja>@RdfNs</ja>(prefix=<js>"addr"</js>, namespaceURI=<js>"http://www.apache.org/address/"</js>),
-		|			<ja>@RdfNs</ja>(prefix=<js>"mail"</js>, namespaceURI=<js>"http://www.apache.org/mail/"</js>)
-		|		}
-		|	)
-		|	<jk>package</jk> org.apache.juneau.sample.addressbook;
-		|	<jk>import</jk> org.apache.juneau.xml.annotation.*;
-	</p>
-	<p>
-		This assigns a default prefix of <js>"ab"</js> for all classes and properties within the project, and 
-		specifies various other prefixes used within this project.
-	</p>
-	<p>
-		Now when we rerun the sample code, we'll get the following:
-	</p>
-	<p class='bxml'>
-		|	<xt>&lt;rdf:RDF</xt>
-		|		<xa>xmlns:rdf</xa>=<xs>"http://www.w3.org/1999/02/22-rdf-syntax-ns#"</xs>
-		|		<xa>xmlns:j</xa>=<xs>"http://www.apache.org/juneau/"</xs>
-		|		<xa>xmlns:jp</xa>=<xs>"http://www.apache.org/juneaubp/"</xs>
-		|		<xa>xmlns:per</xa>=<xs>"http://www.apache.org/person/"</xs><xt>&gt;</xt>
-		|		<xt>&lt;rdf:Description&gt;</xt>
-		|			<xt>&lt;per:id&gt;</xt>1<xt>&lt;/per:id&gt;</xt>
-		|			<xt>&lt;per:name&gt;</xt>John Smith<xt>&lt;/per:name&gt;</xt>
-		|		<xt>&lt;/rdf:Description&gt;</xt>
-		|	<xt>&lt;/rdf:RDF&gt;</xt>
-	</p>
-	<p>
-		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 using {@link oaj.xml.XmlSerializer.Builder#disableAutoDetectNamespaces()}.
-	</p>
-	<p class='bjava'>
-		|	<jc>// Create a new serializer but manually specify the namespaces.</jc>
-		|	RdfSerializer <jv>serializer</jv> = RdfSerializer.<jsm>create</jsm>()
-		|		.xmlabbrev()
-		|		.rdfxml_tab(3)
-		|		.disableAutoDetectNamespaces()
-		|		.namespaces(<js>"{per:'http://www.apache.org/person/'}"</js>)
-		|		.build();
-	</p>
-	<p>
-		This code change will produce the same output as before but will perform slightly better since it doesn't 
-		have to crawl the POJO tree before serializing the result.
-	</p>
-</div>
\ No newline at end of file
diff --git a/juneau-doc/docs/Topics/03.juneau-marshall-rdf/01.jmr.RdfDetails/05.jmr.UriProperties.html b/juneau-doc/docs/Topics/03.juneau-marshall-rdf/01.jmr.RdfDetails/05.jmr.UriProperties.html
deleted file mode 100644
index b3363d322..000000000
--- a/juneau-doc/docs/Topics/03.juneau-marshall-rdf/01.jmr.RdfDetails/05.jmr.UriProperties.html
+++ /dev/null
@@ -1,120 +0,0 @@
-<!--
-/***************************************************************************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *  
- *  http://www.apache.org/licenses/LICENSE-2.0
- *  
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations under the License.
- ***************************************************************************************************************************/
- -->
-
-{title:'URI Properties', updated:'9.0.0'}
-
-<div class='topic'>
-	<p>
-		Bean properties of type <c>java.net.URI</c> or <c>java.net.URL</c> have special meaning to the 
-		RDF serializer.
-		They are interpreted as resource identifiers.
-	</p>
-	<p>
-		In the following code, we're adding 2 new properties.
-		The first property is annotated with <ja>@Beanp</ja> to identify that this property is the resource 
-		identifier for this bean.
-		The second un-annotated property is interpreted as a reference to another resource.
-	</p>
-	<p class='bjava'>	
-		|	<jk>public class</jk> Person {
-		|		
-		|		<jc>// Bean properties</jc>
-		|		<ja>@Rdf</ja>(beanUri=<jk>true</jk>) 
-		|		<jk>public</jk> URI <jf>uri</jf>;
-		|		
-		|		<jk>public</jk> URI <jf>addressBookUri</jf>;
-		|	
-		|		...
-		|		
-		|		<jc>// Normal constructor</jc>
-		|		<jk>public</jk> Person(<jk>int</jk> <jv>id</jv>, String <jv>name</jv>, String <jv>uri</jv>, String <jv>addressBookUri</jv>) <jk>throws</jk> URISyntaxException {
-		|			<jk>this</jk>.<jf>id</jf> = <jv>id</jv>;
-		|			<jk>this</jk>.<jf>name</jf> = <jv>name</jv>;
-		|			<jk>this</jk>.<jf>uri</jf> = <jk>new</jk> URI(<jv>uri</jv>);
-		|			<jk>this</jk>.<jf>addressBookUri</jf> = <jk>new</jk> URI(<jv>addressBookUri</jv>);
-		|		}
-		|	}
-	</p>
-	<p>
-		We alter our code to pass in values for these new properties.
-	</p>
-	<p class='bjava'>
-		|	<jc>// Create our bean.</jc>
-		|	Person <jv>person</jv> = <jk>new</jk> Person(1, <js>"John Smith"</js>, <js>"http://sample/addressBook/person/1"</js>, 
-		|		<js>"http://sample/addressBook"</js>);
-	</p>
-	<p>
-		Now when we run the sample code, we get the following:
-	</p>
-	<p class='bxml'>
-		|	<xt>&lt;rdf:RDF</xt>
-		|		<xa>xmlns:rdf</xa>=<xs>"http://www.w3.org/1999/02/22-rdf-syntax-ns#"</xs>
-		|		<xa>xmlns:j</xa>=<xs>"http://www.apache.org/juneau/"</xs>
-		|		<xa>xmlns:jp</xa>=<xs>"http://www.apache.org/juneaubp/"</xs>
-		|		<xa>xmlns:per</xa>=<xs>"http://www.apache.org/person/"</xs><xt>&gt;</xt>
-		|		<xt>&lt;rdf:Description <b><xa>rdf:about</xa>=<xs>"http://sample/addressBook/person/1"</xs></b>&gt;</xt>
-		|			<xt>&lt;per:addressBookUri</xt> <xa>rdf:resource</xa>=<xs>"http://sample/addressBook"</xs><xt>/&gt;</xt>
-		|			<xt>&lt;per:id&gt;</xt>1<xt>&lt;/per:id&gt;</xt>
-		|			<xt>&lt;per:name&gt;</xt>John Smith<xt>&lt;/per:name&gt;</xt>
-		|		<xt>&lt;/rdf:Description&gt;</xt>
-		|	<xt>&lt;/rdf:RDF&gt;</xt>
-	</p>
-	<p>
-		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>
-	<p>
-		The following properties would have produced the same output as before.  
-		Note that the <ja>@URI</ja> annotation is only needed on the second property.
-	</p>
-	<p class='bjava'>
-		|	<jk>public class</jk> Person {
-		|		
-		|		<jc>// Bean properties</jc>
-		|		<ja>@Rdf</ja>(beanUri=<jk>true</jk>) <jk>public</jk> String <jf>uri</jf>;
-		|		
-		|		<ja>@URI</ja> <jk>public</jk> String <jf>addressBookUri</jf>;
-	</p>
-	<p>
-		Also take note of the {@link oaj.serializer.Serializer.Builder#uriResolution(UriResolution)},
-		{@link oaj.serializer.Serializer.Builder#uriRelativity(UriRelativity)}, and 
-		and {@link oaj.serializer.Serializer.Builder#uriContext(UriContext)}
-		settings that can be specified on the serializer to resolve relative and context-root-relative URIs to 
-		fully-qualified URIs.
-	</p>
-	<p>
-		This can be useful if you want to keep the URI authority and context root information out of the bean logic 
-		layer.
-	</p>
-	<p>
-		The following code produces the same output as before but the URIs on the beans are relative.
-	</p>
-	<p class='bjava'>
-		|	<jc>// Create a new serializer with readable output.</jc>
-		|	RdfSerializer <jv>serializer</jv> = RdfSerializer.<jsm>create</jsm>()
-		|		.xmlabbrev()
-		|		.rdfxml_tab(3);
-		|		.relativeUriBase(<js>"http://myhost/sample"</js>);
-		|		.absolutePathUriBase(<js>"http://myhost"</js>)
-		|		.build();
-		|		
-		|	<jc>// Create our bean.</jc>
-		|	Person <jv>person</jv> = <jk>new</jk> Person(1, <js>"John Smith"</js>, <js>"person/1"</js>, <js>"/"</js>);
-		|
-		|	<jc>// Serialize the bean to RDF/XML.</jc>
-		|	String <jv>rdfXml</jv> = <jv>serializer</jv>.serialize(<jv>person</jv>);
-	</p>		
-</div>
\ No newline at end of file
diff --git a/juneau-doc/docs/Topics/03.juneau-marshall-rdf/01.jmr.RdfDetails/06.jmr.RootProperty.html b/juneau-doc/docs/Topics/03.juneau-marshall-rdf/01.jmr.RdfDetails/06.jmr.RootProperty.html
deleted file mode 100644
index 5650efe43..000000000
--- a/juneau-doc/docs/Topics/03.juneau-marshall-rdf/01.jmr.RdfDetails/06.jmr.RootProperty.html
+++ /dev/null
@@ -1,84 +0,0 @@
-<!--
-/***************************************************************************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *  
- *  http://www.apache.org/licenses/LICENSE-2.0
- *  
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations under the License.
- ***************************************************************************************************************************/
- -->
-
-{title:'Root Property', updated:'9.0.0'}
-
-<div class='topic'>
-	<p>
-		For all RDF languages, the POJO objects get broken down into simple triplets.
-		Unfortunately, for tree-structured data like the POJOs shown above, this causes the root node of the tree 
-		to become lost.
-		There is no easy way to identify that <c>person/1</c> is the root node in our tree once in triplet 
-		form, and in some cases it's impossible.
-	</p>
-	<p>
-		By default, the {@link oaj.jena.RdfParser} class handles this by scanning all the nodes and 
-		identifying the nodes without incoming references.
-		However, this is inefficient, especially for large models.
-		And in cases where the root node is referenced by another node in the model by URL, it's not possible to 
-		locate the root at all.
-	</p>
-	<p>
-		To resolve this issue, the property <del>RdfSerializer.RDF_addRootProperty</del>
-		was introduced.
-		When enabled, this adds a special <c>root</c> attribute to the root node to make it easy to locate 
-		by the parser.
-	</p>
-	<p>
-		To enable, set the <jsf>RDF_addRootProperty</jsf> property to <jk>true</jk> on the serializer:
-	</p>
-	<p class='bjava'>
-		|	<jc>// Create a new serializer.</jc>
-		|	RdfSerializer <jv>serializer</jv> = RdfSerializer.<jsm>create</jsm>()
-		|		.xmlabbrev()
-		|		.rdfxml_tab(3),
-		|		.addRootProperty()
-		|		.build();
-	</p>	
-	<p>
-		Now when we rerun the sample code, we'll see the added <c>root</c> attribute on the root resource.
-	</p>
-	<p class='bxml'>
-		|	<xt>&lt;rdf:RDF</xt>
-		|		<xa>xmlns:rdf</xa>=<xs>"http://www.w3.org/1999/02/22-rdf-syntax-ns#"</xs>
-		|		<xa>xmlns:j</xa>=<xs>"http://www.apache.org/juneau/"</xs>
-		|		<xa>xmlns:jp</xa>=<xs>"http://www.apache.org/juneaubp/"</xs>
-		|		<xa>xmlns:per</xa>=<xs>"http://www.apache.org/person/"</xs>
-		|		<xa>xmlns:mail</xa>=<xs>"http://www.apache.org/mail/"</xs>
-		|		<xa>xmlns:addr</xa>=<xs>"http://www.apache.org/address/"</xs><xt>&gt;</xt>
-		|		<xt>&lt;rdf:Description <xa>rdf:about</xa>=<xs>"http://sample/addressBook/person/1"</xs>&gt;</xt>
-		|			<b><xt>&lt;j:root&gt;</xt>true<xt>&lt;/j:root&gt;</xt></b>
-		|			<xt>&lt;per:addressBookUri</xt> <xa>rdf:resource</xa>=<xs>"http://sample/addressBook"</xs><xt>/&gt;</xt>
-		|			<xt>&lt;per:id&gt;</xt>1<xt>&lt;/per:id&gt;</xt>
-		|			<xt>&lt;per:name&gt;</xt>John Smith<xt>&lt;/per:name&gt;</xt>
-		|			<xt>&lt;per:addresses&gt;</xt>
-		|			<xt>&lt;rdf:Seq&gt;</xt>
-		|				<xt>&lt;rdf:li&gt;</xt>
-		|					<xt>&lt;rdf:Description <xa>rdf:about</xa>=<xs>"http://sample/addressBook/address/1"</xs>&gt;</xt>
-		|						<xt>&lt;addr:personUri <xa>rdf:resource</xa>=<xs>"http://sample/addressBook/person/1"</xs>/&gt;</xt>
-		|						<xt>&lt;addr:id&gt;</xt>1<xt>&lt;/addr:id&gt;</xt>
-		|						<xt>&lt;mail:street&gt;</xt>100 Main Street<xt>&lt;/mail:street&gt;</xt>
-		|						<xt>&lt;mail:city&gt;</xt>Anywhereville<xt>&lt;/mail:city&gt;</xt>
-		|						<xt>&lt;mail:state&gt;</xt>NY<xt>&lt;/mail:state&gt;</xt>
-		|						<xt>&lt;mail:zip&gt;</xt>12345<xt>&lt;/mail:zip&gt;</xt>
-		|						<xt>&lt;addr:isCurrent&gt;</xt>true<xt>&lt;/addr:isCurrent&gt;</xt>
-		|					<xt>&lt;/rdf:Description&gt;</xt>
-		|				<xt>&lt;/rdf:li&gt;</xt>
-		|			<xt>&lt;/rdf:Seq&gt;</xt>
-		|			<xt>&lt;/per:addresses&gt;</xt>
-		|		<xt>&lt;/rdf:Description&gt;</xt>
-		|	<xt>&lt;/rdf:RDF&gt;</xt>
-	</p>
-</div>
\ No newline at end of file
diff --git a/juneau-doc/docs/Topics/03.juneau-marshall-rdf/01.jmr.RdfDetails/07.jmr.TypedLiterals.html b/juneau-doc/docs/Topics/03.juneau-marshall-rdf/01.jmr.RdfDetails/07.jmr.TypedLiterals.html
deleted file mode 100644
index 81df7c3f7..000000000
--- a/juneau-doc/docs/Topics/03.juneau-marshall-rdf/01.jmr.RdfDetails/07.jmr.TypedLiterals.html
+++ /dev/null
@@ -1,67 +0,0 @@
-<!--
-/***************************************************************************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *  
- *  http://www.apache.org/licenses/LICENSE-2.0
- *  
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations under the License.
- ***************************************************************************************************************************/
- -->
-
-{title:'Typed Literals', updated:'9.0.0'}
-
-<div class='topic'>
-	<p>
-		XML-Schema data-types can be added to non-<c>String</c> literals through the 
-		<del>RdfSerializer.RDF_addLiteralTypes</del>setting.
-	</p>
-	<p>
-		To enable, set the <jsf>RDF_addLiteralTypes</jsf> property to <jk>true</jk> on the serializer:
-	</p>
-	<p class='bjava'>
-		|	<jc>// Create a new serializer (revert back to namespace autodetection).</jc>
-		|	RdfSerializer <jv>serializer</jv> = RdfSerializer.<jsm>create</jsm>()
-		|		.xmlabbrev()
-		|		.rdfxml_tab(3),
-		|		.addLiteralTypes()
-		|		.build();
-	</p>	
-	<p>
-		Now when we rerun the sample code, we'll see the added <c>root</c> attribute on the root resource.
-	</p>
-	<p class='bxml'>
-		|	<xt>&lt;rdf:RDF</xt>
-		|			<xa>xmlns:rdf</xa>=<xs>"http://www.w3.org/1999/02/22-rdf-syntax-ns#"</xs>
-		|			<xa>xmlns:j</xa>=<xs>"http://www.apache.org/juneau/"</xs>
-		|			<xa>xmlns:jp</xa>=<xs>"http://www.apache.org/juneaubp/"</xs>
-		|			<xa>xmlns:per</xa>=<xs>"http://www.apache.org/person/"</xs>
-		|			<xa>xmlns:mail</xa>=<xs>"http://www.apache.org/mail/"</xs>
-		|			<xa>xmlns:addr</xa>=<xs>"http://www.apache.org/address/"</xs><xt>&gt;</xt>
-		|		<xt>&lt;rdf:Description <xa>rdf:about</xa>=<xs>"http://sample/addressBook/person/1"</xs>&gt;</xt>
-		|			<xt>&lt;per:addressBookUri</xt> <xa>rdf:resource</xa>=<xs>"http://sample/addressBook"</xs><xt>/&gt;</xt>
-		|			<xt>&lt;per:id</xt> <b><xa>rdf:datatype</xa>=<xs>"http://www.w3.org/2001/XMLSchema#int"</xs></b><xt>&gt;</xt>1<xt>&lt;/per:id&gt;</xt>
-		|			<xt>&lt;per:name&gt;</xt>John Smith<xt>&lt;/per:name&gt;</xt>
-		|			<xt>&lt;per:addresses&gt;</xt>
-		|				<xt>&lt;rdf:Seq&gt;</xt>
-		|					<xt>&lt;rdf:li&gt;</xt>
-		|						<xt>&lt;rdf:Description <xa>rdf:about</xa>=<xs>"http://sample/addressBook/address/1"</xs>&gt;</xt>
-		|							<xt>&lt;addr:personUri <xa>rdf:resource</xa>=<xs>"http://sample/addressBook/person/1"</xs>/&gt;</xt>
-		|							<xt>&lt;addr:id</xt> <b><xa>rdf:datatype</xa>=<xs>"http://www.w3.org/2001/XMLSchema#int"</xs></b>&gt;</xt>1<xt>&lt;/addr:id&gt;</xt>
-		|							<xt>&lt;mail:street&gt;</xt>100 Main Street<xt>&lt;/mail:street&gt;</xt>
-		|							<xt>&lt;mail:city&gt;</xt>Anywhereville<xt>&lt;/mail:city&gt;</xt>
-		|							<xt>&lt;mail:state&gt;</xt>NY<xt>&lt;/mail:state&gt;</xt>
-		|							<xt>&lt;mail:zip</xt> <b><xa>rdf:datatype</xa>=<xs>"http://www.w3.org/2001/XMLSchema#int"</xs></b>&gt;</xt>12345<xt>&lt;/mail:zip&gt;</xt>
-		|							<xt>&lt;addr:isCurrent</xt> <b><xa>rdf:datatype</xa>=<xs>"http://www.w3.org/2001/XMLSchema#boolean"</xs></b>&gt;</xt>true<xt>&lt;/addr:isCurrent&gt;</xt>
-		|						<xt>&lt;/rdf:Description&gt;</xt>
-		|					<xt>&lt;/rdf:li&gt;</xt>
-		|				<xt>&lt;/rdf:Seq&gt;</xt>
-		|			<xt>&lt;/per:addresses&gt;</xt>
-		|		<xt>&lt;/rdf:Description&gt;</xt>
-		<xt>&lt;/rdf:RDF&gt;</xt>
-	</p>
-</div>
\ No newline at end of file
diff --git a/juneau-doc/docs/Topics/05.juneau-config/10.jc.ConfigStores/03.jc.CustomStores.html b/juneau-doc/docs/Topics/05.juneau-config/10.jc.ConfigStores/03.jc.CustomStores.html
index 6de461a34..70f817bc0 100644
--- a/juneau-doc/docs/Topics/05.juneau-config/10.jc.ConfigStores/03.jc.CustomStores.html
+++ b/juneau-doc/docs/Topics/05.juneau-config/10.jc.ConfigStores/03.jc.CustomStores.html
@@ -31,7 +31,7 @@
 		|		<jk>private final</jk> String <jf>jdbcUrl</jf>;
 		|		<jk>private final</jk> String <jf>tableName</jf>, <jf>nameColumn</jf>, <jf>valueColumn</jf>;
 		|		<jk>private final</jk> Timer <jf>watcher</jf>;
-		|		<jk>private final</jk> ConcurrentHashMap&låt;String,String> <jf>cache</jf> = <jk>new</jk> ConcurrentHashMap<>();
+		|		<jk>private final</jk> ConcurrentHashMap&lt;String,String&gt; <jf>cache</jf> = <jk>new</jk> ConcurrentHashMap&lt;&gt;();
 		|	
 		|		<jk>protected</jk> SqlStore(ConfigStore.Builder <jv>builder</jv>) {
 		|			<jk>super</jk>(<jv>builder</jv>);
@@ -55,7 +55,7 @@
 		|	
 		|		<jk>synchronized void</jk> poll() {
 		|			<jc>// Loop through all our entries and find the latest values.</jc>
-		|			<jk>for</jk> (Map.Entry&lt;String,String> <jv>e</jv> : <jf>cache</jf>.entrySet()) {
+		|			<jk>for</jk> (Map.Entry&lt;String,String&gt; <jv>e</jv> : <jf>cache</jf>.entrySet()) {
 		|				String <jv>name</jv> = <jv>e</jv>.getKey();
 		|				String <jv>cacheContents</jv> = <jv>e</jv>.getValue();
 		|				String <jv>newContents</jv> = getDatabaseValue(<jv>name</jv>);
@@ -97,7 +97,7 @@
 		|	
 		|			String <jv>currentContents</jv> = read(<jv>name</jv>);
 		|	
-		|			<jk>if</jk> (<jv>expectedContents</jv> != <jk>null</jk> && StringUtils.<jsm>ne</jsm>(<jv>currentContents</jv>, <jv>expectedContents</jv>))
+		|			<jk>if</jk> (<jv>expectedContents</jv> != <jk>null</jk> &amp;&amp; StringUtils.<jsm>ne</jsm>(<jv>currentContents</jv>, <jv>expectedContents</jv>))
 		|				<jk>return</jk> <jv>currentContents</jv>;
 		|	
 		|			update(<jv>name</jv>, <jv>newContents</jv>);
diff --git a/juneau-doc/docs/Topics/06.juneau-assertions/01.ja.Overview.html b/juneau-doc/docs/Topics/06.juneau-assertions/01.ja.Overview.html
index 1ed80e183..b7cbff900 100644
--- a/juneau-doc/docs/Topics/06.juneau-assertions/01.ja.Overview.html
+++ b/juneau-doc/docs/Topics/06.juneau-assertions/01.ja.Overview.html
@@ -109,7 +109,7 @@
 		|	<jc>// Perform an arbitrary Predicate check against a bean.</jc>
 		|	MyBean <jv>myBeans</jv> = ...;
 		|	<jsm>assertBean</jsm>(<jv>myBeans</jv>)
-		|		.is(<jv>x</jv> -> <jsm>isValidCheck</jsm>(<jv>x</jv>))
+		|		.is(<jv>x</jv> -&gt; <jsm>isValidCheck</jsm>(<jv>x</jv>))
 		|	
 		|	<jc>// Check that a list of strings has less than 10 entries and the first</jc>
 		|	<jc>// 3 entries are [foo, bar*, null] using assertion predicates.</jc>
@@ -120,7 +120,7 @@
 		|			.isEach(<jsm>eq</jsm>(<js>"foo"</js>),<jsm>match</jsm>(<js>"bar*"</js>),<jsm>isNull</jsm>())
 		|	
 		|	<jc>// Check that an exception is thrown and is the specified type and has the specified message.</jc>
-		|	<jsm>assertThrown</jsm>(()-><jv>myBean</jv>.runBadMethod())
+		|	<jsm>assertThrown</jsm>(()-&gt;<jv>myBean</jv>.runBadMethod())
 		|		.exists()
 		|		.isExactType(RuntimeException.<jk>class</jk>)
 		|		.asMessage().is(<js>"foo"</js>);
diff --git a/juneau-doc/docs/Topics/07.juneau-rest-common/01.jrc.HelperClasses.html b/juneau-doc/docs/Topics/07.juneau-rest-common/01.jrc.HelperClasses.html
index 9cc4f08c2..eb09cd8e2 100644
--- a/juneau-doc/docs/Topics/07.juneau-rest-common/01.jrc.HelperClasses.html
+++ b/juneau-doc/docs/Topics/07.juneau-rest-common/01.jrc.HelperClasses.html
@@ -117,7 +117,7 @@
 		|	PartList <jv>formData</jv> = 
 		|		<jsm>partList</jsm>(  <jc>// Arbitrary list of parts</jc>
 		|			<jsm>stringPart</jsm>(<js>"Name"</js>, <js>"Bill"</js>)   <jc>// Freeform part</jc>
-		|			<jsm>integerPart</jsm>(<js>"Age"</js>, () -> <jsm>calculateAge</jsm>())   <jc>// Freeform part with supplied value</jc>
+		|			<jsm>integerPart</jsm>(<js>"Age"</js>, () -&gt; <jsm>calculateAge</jsm>())   <jc>// Freeform part with supplied value</jc>
 		|		);
 	</p>
 	<p>
@@ -195,7 +195,7 @@
 	<h5 class='topic'>HttpResources</h5>
 	<p>
 		The {@link oaj.http.HttpResources} class contains convenience static methods for generating HTTP message resources.
-		Returned objects extend from {@link oaj.http.resource.HttpResource} which extends from {@link oaj.http.HttpEntity} but with
+		Returned objects extend from {@link oaj.http.resource.HttpResource} which extends from {@link org.apache.http.HttpEntity} but with
 		additional arbitrary headers.
 	</p>
 	<p>
diff --git a/juneau-doc/docs/Topics/07.juneau-rest-common/03.jrc.HttpHeaders.html b/juneau-doc/docs/Topics/07.juneau-rest-common/03.jrc.HttpHeaders.html
index 0d25a8511..9a8fa1f8d 100644
--- a/juneau-doc/docs/Topics/07.juneau-rest-common/03.jrc.HttpHeaders.html
+++ b/juneau-doc/docs/Topics/07.juneau-rest-common/03.jrc.HttpHeaders.html
@@ -162,7 +162,7 @@
 	</p>
 	<ul class='javatree'>
 		<li class='jm'>{@link oaj.http.header.HeaderList#forEach(Consumer) forEach(Consumer)} / {@link oaj.http.header.HeaderList#forEach(String,Consumer) forEach(String,Consumer)} / {@link oaj.http.header.HeaderList#forEach(Predicate,Consumer) forEach(Predicate,Consumer)} - Use consumers to process headers.
-		<li class='jm'>{@link oaj.http.header.HeaderList#headerIterator() headerIterator()} / {@link oaj.http.header.HeaderList#headerIterator(String) headerIterator(String)} - Use an {@link HeaderIterator} to process headers.
+		<li class='jm'>{@link oaj.http.header.HeaderList#headerIterator() headerIterator()} / {@link oaj.http.header.HeaderList#headerIterator(String) headerIterator(String)} - Use an {@link org.apache.http.HeaderIterator} to process headers.
 		<li class='jm'>{@link oaj.http.header.HeaderList#stream() stream()} / {@link oaj.http.header.HeaderList#stream(String) stream(String)} - Use a stream.
 	</ul>
 	<p>
@@ -185,7 +185,7 @@
 	</p>
 
 	<p>
-		By default, header names are treated as case-insensitive.  This can be changed using the {@link oaj.http.header.HeaderList.Builder#caseSensitive() caseSensitive()}
+		By default, header names are treated as case-insensitive.  This can be changed using the {@link oaj.http.header.HeaderList#caseSensitive(boolean) caseSensitive(boolean)}
 		method.
 	</p>
 
diff --git a/juneau-doc/docs/Topics/07.juneau-rest-common/04.jrc.HttpParts.html b/juneau-doc/docs/Topics/07.juneau-rest-common/04.jrc.HttpParts.html
index d3dea2b75..c08f45588 100644
--- a/juneau-doc/docs/Topics/07.juneau-rest-common/04.jrc.HttpParts.html
+++ b/juneau-doc/docs/Topics/07.juneau-rest-common/04.jrc.HttpParts.html
@@ -91,7 +91,7 @@
 	</p>
 	<ul class='javatree'>
 		<li class='jm'>{@link oaj.http.part.PartList#forEach(Consumer) forEach(Consumer)} / {@link oaj.http.part.PartList#forEach(String,Consumer) forEach(String,Consumer)} / {@link oaj.http.part.PartList#forEach(Predicate,Consumer) forEach(Predicate,Consumer)} - Use consumers to process parts.
-		<li class='jm'>{@link oaj.http.part.PartList#partIterator() partIterator()} / {@link oaj.http.part.PartList#partIterator(String) partIterator(String)} - Use an {@link PartIterator} to process parts.
+		<li class='jm'>{@link oaj.http.part.PartList#partIterator() partIterator()} / {@link oaj.http.part.PartList#partIterator(String) partIterator(String)} - Use an {@link oaj.http.part.PartIterator} to process parts.
 		<li class='jm'>{@link oaj.http.part.PartList#stream() stream()} / {@link oaj.http.part.PartList#stream(String) stream(String)} - Use a stream.
 	</ul>
 	<p>
diff --git a/juneau-doc/docs/Topics/08.juneau-rest-server/02.jrs.AnnotatedClasses/01.jrs.PredefinedClasses.html b/juneau-doc/docs/Topics/08.juneau-rest-server/02.jrs.AnnotatedClasses/01.jrs.PredefinedClasses.html
index ed264a532..4c5dc6ae8 100644
--- a/juneau-doc/docs/Topics/08.juneau-rest-server/02.jrs.AnnotatedClasses/01.jrs.PredefinedClasses.html
+++ b/juneau-doc/docs/Topics/08.juneau-rest-server/02.jrs.AnnotatedClasses/01.jrs.PredefinedClasses.html
@@ -140,7 +140,6 @@
 		<li class='jic'>{@link oajr.config.BasicSimpleJsonConfig}
 		<li class='jic'>{@link oajr.config.BasicOpenApiConfig}
 		<li class='jic'>{@link oajr.config.BasicUniversalConfig}
-		<li class='jic'>{@link oajr.config.BasicUniversalJenaConfig}
 	</ul>
 	<p>
 		For example, if you want to provide a resource that supports all languages in Juneau, 
diff --git a/juneau-doc/docs/Topics/08.juneau-rest-server/03.jrs.RestOpAnnotatedMethods/02.jrs.JavaMethodParameters.html b/juneau-doc/docs/Topics/08.juneau-rest-server/03.jrs.RestOpAnnotatedMethods/02.jrs.JavaMethodParameters.html
index 4a7779a66..ecb7c440a 100644
--- a/juneau-doc/docs/Topics/08.juneau-rest-server/03.jrs.RestOpAnnotatedMethods/02.jrs.JavaMethodParameters.html
+++ b/juneau-doc/docs/Topics/08.juneau-rest-server/03.jrs.RestOpAnnotatedMethods/02.jrs.JavaMethodParameters.html
@@ -123,7 +123,7 @@
 						<li class='jc'>{@link oaj.encoders.EncoderSet}
 						<li class='jic'>{@link oaj.cp.FileFinder}
 						<li class='jc'>{@link oaj.jsonschema.JsonSchemaGenerator}
-						<li class='jc'>{@link java.util.Logger}
+						<li class='jc'>{@link java.util.logging.Logger}
 						<li class='jc'>{@link oajr.stats.MethodExecStore}
 						<li class='jc'>{@link oaj.parser.ParserSet}
 						<li class='jc'>{@link oajr.RestChildren}
diff --git a/juneau-doc/docs/Topics/08.juneau-rest-server/03.jrs.RestOpAnnotatedMethods/06.jrs.Matchers.html b/juneau-doc/docs/Topics/08.juneau-rest-server/03.jrs.RestOpAnnotatedMethods/06.jrs.Matchers.html
index c55897aee..ad4798bf6 100644
--- a/juneau-doc/docs/Topics/08.juneau-rest-server/03.jrs.RestOpAnnotatedMethods/06.jrs.Matchers.html
+++ b/juneau-doc/docs/Topics/08.juneau-rest-server/03.jrs.RestOpAnnotatedMethods/06.jrs.Matchers.html
@@ -17,7 +17,7 @@
 
 <div class='topic'>
 	<p>
-		{@link oajr.RestMatcher RestMatchers} are used to allow multiple Java methods to be 
+		{@link oajr.matcher.RestMatcher RestMatchers} are used to allow multiple Java methods to be 
 		tied to the same HTTP method and path but differentiated by some request attribute such as a specific 
 		header value.
 	</p>
diff --git a/juneau-doc/docs/Topics/08.juneau-rest-server/05.jrs.Marshalling.html b/juneau-doc/docs/Topics/08.juneau-rest-server/05.jrs.Marshalling.html
index e5bcd8486..87194196c 100644
--- a/juneau-doc/docs/Topics/08.juneau-rest-server/05.jrs.Marshalling.html
+++ b/juneau-doc/docs/Topics/08.juneau-rest-server/05.jrs.Marshalling.html
@@ -80,7 +80,6 @@
 				<li class='jic'>{@link oajr.config.BasicSimpleJsonConfig}
 				<li class='jic'>{@link oajr.config.BasicOpenApiConfig}
 				<li class='jic'>{@link oajr.config.BasicUniversalConfig}
-				<li class='jic'>{@link oajr.config.BasicUniversalJenaConfig}
 			</ul>
 		</li>
 	</ul>
@@ -162,7 +161,6 @@
 		<li class='ja'>{@link oaj.oapi.annotation.OpenApiConfig OpenApiConfig}
 		<li class='ja'>{@link oaj.parser.annotation.ParserConfig ParserConfig}
 		<li class='ja'>{@link oaj.plaintext.annotation.PlainTextConfig PlainTextConfig}
-		<li class='ja'>{@link oaj.jena.annotation.RdfConfig RdfConfig}
 		<li class='ja'>{@link oaj.serializer.annotation.SerializerConfig SerializerConfig}
 		<li class='ja'>{@link oaj.soap.annotation.SoapXmlConfig SoapXmlConfig}
 		<li class='ja'>{@link oaj.uon.annotation.UonConfig UonConfig}
diff --git a/juneau-doc/docs/Topics/08.juneau-rest-server/06.jrs.HandlingFormPosts.html b/juneau-doc/docs/Topics/08.juneau-rest-server/06.jrs.HandlingFormPosts.html
index c4d2ab504..a6f4c8001 100644
--- a/juneau-doc/docs/Topics/08.juneau-rest-server/06.jrs.HandlingFormPosts.html
+++ b/juneau-doc/docs/Topics/08.juneau-rest-server/06.jrs.HandlingFormPosts.html
@@ -84,8 +84,8 @@
 			|	<jk>public class</jk> SpringBootAppConfig {
 			|			
 			|		<ja>@Bean</ja>
-			|		<jk>public</jk> FilterRegistrationBean&lt;HiddenHttpMethodFilter> registration(HiddenHttpMethodFilter <jv>filter</jv>) {
-			|			FilterRegistrationBean&lt;HiddenHttpMethodFilter> <jv>reg</jv> = <jk>new</jk> FilterRegistrationBean&gt;>(<jv>filter</jv>);
+			|		<jk>public</jk> FilterRegistrationBean&lt;HiddenHttpMethodFilter&gt; registration(HiddenHttpMethodFilter <jv>filter</jv>) {
+			|			FilterRegistrationBean&lt;HiddenHttpMethodFilter&gt; <jv>reg</jv> = <jk>new</jk> FilterRegistrationBean&lt;&gt;(<jv>filter</jv>);
 			|			<jv>reg</jv>.setEnabled(<jk>false</jk>);
 			|			<jk>return</jk> <jv>reg</jv>;
 			|		}
diff --git a/juneau-doc/docs/Topics/08.juneau-rest-server/12.jrs.SvlVariables.html b/juneau-doc/docs/Topics/08.juneau-rest-server/12.jrs.SvlVariables.html
index 98c857625..49cbcf307 100644
--- a/juneau-doc/docs/Topics/08.juneau-rest-server/12.jrs.SvlVariables.html
+++ b/juneau-doc/docs/Topics/08.juneau-rest-server/12.jrs.SvlVariables.html
@@ -225,7 +225,7 @@
 		</tr>
 		<tr class='dark'>
 			<td>{@link oajr.vars.UrlVar}</td>
-			<td class='code'>$U{uri}></td>
+			<td class='code'>$U{uri}</td>
 			<td style='text-align:center;font-weight:bold'>no</td>
 			<td style='text-align:center;font-weight:bold'>yes</td>
 			<td class='code'>$U{servlet:/foo}</td>
@@ -260,7 +260,7 @@
 	<h5 class='figure'>Example:</h5>
 	<p class='bjava'>
 		|	<jc>// Defined a variable that simply wrapps all strings inside [] brackets.</jc>
-		|	<jc>// e.g. "$BRACKET{foobar}" -> "[foobar]"</jc>
+		|	<jc>// e.g. "$BRACKET{foobar}" -&gt; "[foobar]"</jc>
 		|	<jk>public class</jk> BracketVar <jk>extends</jk> SimpleVar {
 		|		
 		|		<jk>public</jk> BracketVar() {
diff --git a/juneau-doc/docs/Topics/08.juneau-rest-server/15.jrs.Swagger/01.jrs.BasicRestServletSwagger.html b/juneau-doc/docs/Topics/08.juneau-rest-server/15.jrs.Swagger/01.jrs.BasicRestServletSwagger.html
index 012b4e492..967b9fcd2 100644
--- a/juneau-doc/docs/Topics/08.juneau-rest-server/15.jrs.Swagger/01.jrs.BasicRestServletSwagger.html
+++ b/juneau-doc/docs/Topics/08.juneau-rest-server/15.jrs.Swagger/01.jrs.BasicRestServletSwagger.html
@@ -32,7 +32,7 @@
 		|		<jc>// Override the nav links for the swagger page.</jc>
 		|		navlinks={
 		|			<js>"back: servlet:/"</js>,
-		|			<js>"json: servlet:/?Accept=text/json&plainText=true"</js>
+		|			<js>"json: servlet:/?Accept=text/json&amp;plainText=true"</js>
 		|		},
 		|		<jc>// Never show aside contents of page inherited from class.</jc>
 		|		aside=<js>"NONE"</js>
diff --git a/juneau-doc/docs/Topics/08.juneau-rest-server/15.jrs.Swagger/05.jrs.SwaggerParameters.html b/juneau-doc/docs/Topics/08.juneau-rest-server/15.jrs.Swagger/05.jrs.SwaggerParameters.html
index d028b437d..294ba4a74 100644
--- a/juneau-doc/docs/Topics/08.juneau-rest-server/15.jrs.Swagger/05.jrs.SwaggerParameters.html
+++ b/juneau-doc/docs/Topics/08.juneau-rest-server/15.jrs.Swagger/05.jrs.SwaggerParameters.html
@@ -106,7 +106,7 @@
 		|				+ <js>"',"</js>
 		|				+ <js>"type:'array',"</js>
 		|				+ <js>"collectionFormat:'csv',"</js>
-		|				+ <js>"x-examples:{example:'?s=Bill*,birthDate>2000'}"</js>
+		|				+ <js>"x-examples:{example:'?s=Bill*,birthDate&gt;2000'}"</js>
 		|			+ <js>"},"</js>
 		|			+ <js>"{"</js>
 		|				+ <js>"in:'query',"</js>
diff --git a/juneau-doc/docs/Topics/08.juneau-rest-server/18.jrs.LoggingAndDebugging.html b/juneau-doc/docs/Topics/08.juneau-rest-server/18.jrs.LoggingAndDebugging.html
index 60fcdcc93..bc5125288 100644
--- a/juneau-doc/docs/Topics/08.juneau-rest-server/18.jrs.LoggingAndDebugging.html
+++ b/juneau-doc/docs/Topics/08.juneau-rest-server/18.jrs.LoggingAndDebugging.html
@@ -40,7 +40,7 @@
 		<li>
 			HTTP request/response bodies are cached in memory for logging purposes.
 		<li>
-			HTTP requests/responses are logged to the registered {@link oajr.logging.RestLogger}.
+			HTTP requests/responses are logged to the registered {@link oajr.logger.CallLogger}.
 	</ul>
 	<p>
 		The possible annotation values are:
@@ -101,11 +101,11 @@
 		HTTP calls can be logged with the following levels of granularity:
 	</p>	
 	<ul class='javatree'>
-		<li class='je'>{@link oajr.logging.RestLoggingDetail}
+		<li class='je'>{@link oajr.logger.CallLoggingDetail}
 			<ul class='javatreec'>
-				<li class='jf'>{@link oajr.logging.RestLoggingDetail#STATUS_LINE STATUS_LINE}
-				<li class='jf'>{@link oajr.logging.RestLoggingDetail#HEADER HEADER}
-				<li class='jf'>{@link oajr.logging.RestLoggingDetail#ENTITY ENTITY}
+				<li class='jf'>{@link oajr.logger.CallLoggingDetail#STATUS_LINE STATUS_LINE}
+				<li class='jf'>{@link oajr.logger.CallLoggingDetail#HEADER HEADER}
+				<li class='jf'>{@link oajr.logger.CallLoggingDetail#ENTITY ENTITY}
 			</ul>
 		</li>
 	</ul>
@@ -157,8 +157,8 @@
 		|	=== END ===================================================================
 	</p>
 	<p>
-		The interface responsible for generating the log entries is {@link oajr.logging.RestLogger}
-		and the default is {@link oajr.logging.BasicRestLogger} which produces the output above.  It
+		The interface responsible for generating the log entries is {@link oajr.logger.CallLogger}
+		and the default is {@link oajr.logger.BasicCallLogger} which produces the output above.  It
 		can be changed through any of the following:
 	</p>
 	<ul class='javatree'>
@@ -185,13 +185,13 @@
 		|		.beanStore(<jv>beanStore</jv>)  <jc>// Allow injected beans in constructor</jc>
 		|		.normalRules(  <jc>// Rules when debugging is not enabled</jc>
 		|			RestLoggerRule.<jsm>create</jsm>()  <jc>// Log 500+ errors with status-line and header information</jc>
-		|				.statusFilter(<jv>x</jv> -> <jv>x</jv> >= 500)
+		|				.statusFilter(<jv>x</jv> -&gt; <jv>x</jv> &gt;= 500)
 		|				.level(<jsf>SEVERE</jsf>)
 		|				.requestDetail(<jsf>HEADER</jsf>)
 		|				.responseDetail(<jsf>HEADER</jsf>)
 		|				.build(),
 		|			RestLoggerRule.<jsm>create</jsm>()  <jc>// Log 400-500 errors with just status-line information</jc>
-		|				.statusFilter(<jv>x</jv> -> <jv>x</jv> >= 400)
+		|				.statusFilter(<jv>x</jv> -&gt; <jv>x</jv> &gt;= 400)
 		|				.level(<jsf>WARNING</jsf>)
 		|				.requestDetail(<jsf>STATUS_LINE</jsf>)
 		|				.responseDetail(<jsf>STATUS_LINE</jsf>)
@@ -225,10 +225,10 @@
 		</li>
 	</ul>
 	<ul class='notes'>
-		<li class='note'>The {@link oajr.logging.BasicTestRestLogger} class is useful for testing and
+		<li class='note'>The {@link oajr.logger.BasicTestCallLogger} class is useful for testing and
 			allows you to suppress logging when testing error conditions by passing in a <c>noTrace=true</c> query parameter
 			or <c>No-Trace: true</c> header on requests.  
-		<li class='note'>{@link oajr.debug.DebugEnablement}, {@link oajr.logging.RestLogger}, and 
+		<li class='note'>{@link oajr.debug.DebugEnablement}, {@link oajr.logger.CallLogger}, and 
 			{@link oajr.stats.ThrownStore} can all be defined globally as Spring beans in a Spring Boot environment.
 	</ul>
 </div>
\ No newline at end of file
diff --git a/juneau-doc/docs/Topics/08.juneau-rest-server/19.jrs.HttpStatusCodes.html b/juneau-doc/docs/Topics/08.juneau-rest-server/19.jrs.HttpStatusCodes.html
index 12e5e3fd1..2bac86dab 100644
--- a/juneau-doc/docs/Topics/08.juneau-rest-server/19.jrs.HttpStatusCodes.html
+++ b/juneau-doc/docs/Topics/08.juneau-rest-server/19.jrs.HttpStatusCodes.html
@@ -61,7 +61,7 @@
 			<td>Precondition Failed</td>
 			<td>
 				A path pattern matched but no Java methods were found that were not rejected by 
-				{@link oajr.RestMatcher matchers}
+				{@link oajr.matcher.RestMatcher matchers}
 			</td>
 		</tr>
 		<tr>
diff --git a/juneau-doc/docs/Topics/09.juneau-rest-server-springboot/01.jrss.Overview.html b/juneau-doc/docs/Topics/09.juneau-rest-server-springboot/01.jrss.Overview.html
index 7510800ae..7fff361c9 100644
--- a/juneau-doc/docs/Topics/09.juneau-rest-server-springboot/01.jrss.Overview.html
+++ b/juneau-doc/docs/Topics/09.juneau-rest-server-springboot/01.jrss.Overview.html
@@ -47,8 +47,8 @@
 		|		}
 		|	
 		|		<jc>// Our root REST bean.
-		|		// Note that this must extend from {@link SpringRestServlet} to allow use of injection.
-		|		// All REST objects are attached to this bean using the {@link Rest#children()} annotation.</jc>
+		|		// Note that this must extend from {@link oajr.springboot.SpringRestServlet} to allow use of injection.
+		|		// All REST objects are attached to this bean using the {@link oajr.annotation.Rest#children()} annotation.</jc>
 		|		<ja>@Bean</ja>
 		|		<jk>public</jk> RootResources getRootResources() {
 		|			<jk>return new</jk> RootResources();
diff --git a/juneau-doc/docs/Topics/10.juneau-rest-client/02.jrc.RequestParts.html b/juneau-doc/docs/Topics/10.juneau-rest-client/02.jrc.RequestParts.html
index abc17531b..417078703 100644
--- a/juneau-doc/docs/Topics/10.juneau-rest-client/02.jrc.RequestParts.html
+++ b/juneau-doc/docs/Topics/10.juneau-rest-client/02.jrc.RequestParts.html
@@ -99,7 +99,7 @@
 	<h5 class='figure'>Example:</h5>
 	<p class='bjava'>
 		|	<jc>// Create a client that adds a dynamic Authorization header to every request.</jc>
-		|	RestClient <jv>client</jv> = RestClient.<jsm>create</jsm>().header(<js>"Authorization"</js>, ()->getMyAuthToken()).build();
+		|	RestClient <jv>client</jv> = RestClient.<jsm>create</jsm>().header(<js>"Authorization"</js>, ()-&gt;getMyAuthToken()).build();
 	</p>
 	
 	<ul class='seealso'>
diff --git a/juneau-doc/docs/Topics/10.juneau-rest-client/04.jrc.ResponseStatus.html b/juneau-doc/docs/Topics/10.juneau-rest-client/04.jrc.ResponseStatus.html
index d782011b1..b739c90bb 100644
--- a/juneau-doc/docs/Topics/10.juneau-rest-client/04.jrc.ResponseStatus.html
+++ b/juneau-doc/docs/Topics/10.juneau-rest-client/04.jrc.ResponseStatus.html
@@ -26,7 +26,7 @@
 			<li class='jm'><c>{@link oajrc.RestResponse#getStatusLine() getStatusLine()} <jk>returns</jk> {@link org.apache.http.StatusLine}</c>
 			<li class='jm'><c>{@link oajrc.RestResponse#getStatusCode() getStatusCode()} <jk>returns</jk> <jk>int</jk></c>
 			<li class='jm'><c>{@link oajrc.RestResponse#getReasonPhrase() getReasonPhrase()} <jk>returns</jk> String</c>
-			<li class='jm'><c>{@link oajrc.RestResponse#assertStatus() assertStatus()} <jk>returns</jk> {@link oajrc.RestResponseStatusLineAssertion}</c>
+			<li class='jm'><c>{@link oajrc.RestResponse#assertStatus() assertStatus()} <jk>returns</jk> {@link oajrc.assertion.FluentResponseStatusLineAssertion}</c>
 		</ul>
 	</ul>
 	
@@ -71,7 +71,7 @@
 		|	<jc>// Status assertion using a predicate.</jc>
 		|	String <jv>content2</jv> = <jv>client</jv>.get(<jsf>URI</jsf>)
 		|		.run()
-		|		.assertStatus().asCode().is(<jv>x</jv> -> <jv>x</jv>&lt;400)
+		|		.assertStatus().asCode().is(<jv>x</jv> -&gt; <jv>x</jv>&lt;400)
 		|		.getContent().asString();
 	</p>
 </div>
\ No newline at end of file
diff --git a/juneau-doc/docs/Topics/10.juneau-rest-client/05.jrc.ResponseHeaders.html b/juneau-doc/docs/Topics/10.juneau-rest-client/05.jrc.ResponseHeaders.html
index c52faa46f..5d6cc5da5 100644
--- a/juneau-doc/docs/Topics/10.juneau-rest-client/05.jrc.ResponseHeaders.html
+++ b/juneau-doc/docs/Topics/10.juneau-rest-client/05.jrc.ResponseHeaders.html
@@ -67,7 +67,7 @@
 			<li class='jm'><c>{@link oajrc.ResponseHeader#as(Class) as(Class&lt;T&gt;)} <jk>returns</jk> T</c>
 			<li class='jm'><c>{@link oajrc.ResponseHeader#asMatcher(Pattern) asMatcher(Pattern)} <jk>returns</jk> {@link java.util.regex.Matcher}</c>
 			<li class='jm'><c>{@link oajrc.ResponseHeader#asMatcher(String) asMatcher(String)} <jk>returns</jk> {@link java.util.regex.Matcher}</c>
-			<li class='jm'><c>{@link oajrc.ResponseHeader#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 oajrc.ResponseHeader#asHeader(Class) asHeader(Class&lt;T <jk>extends</jk> BasicHeader&gt; c)} <jk>returns</jk> {@link oaj.http.header.BasicHeader}</c>
 			<li class='jm'><c>{@link oajrc.ResponseHeader#asStringHeader() asStringHeader()} <jk>returns</jk> {@link oaj.http.header.BasicIntegerHeader}</c>
 			<li class='jm'><c>{@link oajrc.ResponseHeader#asIntegerHeader() asIntegerHeader()} <jk>returns</jk> {@link oaj.http.header.BasicStringHeader}</c>
 			<li class='jm'><c>{@link oajrc.ResponseHeader#asLongHeader() asLongHeader()} <jk>returns</jk> {@link oaj.http.header.BasicLongHeader}</c>
diff --git a/juneau-doc/docs/Topics/10.juneau-rest-client/08.jrc.Interceptors.html b/juneau-doc/docs/Topics/10.juneau-rest-client/08.jrc.Interceptors.html
index e214dc56c..fa0f27532 100644
--- a/juneau-doc/docs/Topics/10.juneau-rest-client/08.jrc.Interceptors.html
+++ b/juneau-doc/docs/Topics/10.juneau-rest-client/08.jrc.Interceptors.html
@@ -18,7 +18,7 @@ specific language governing permissions and limitations under the License.
 <div class='topic'>
 	<p>
 		The {@link oajrc.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.
+		the existing {@link org.apache.http.HttpRequestInterceptor} and {@link org.apache.http.HttpResponseInterceptor} APIs.
 	</p>
 	
 	<ul class='javatree'>
diff --git a/juneau-doc/docs/Topics/10.juneau-rest-client/10.jrc.LoggingAndDebugging.html b/juneau-doc/docs/Topics/10.juneau-rest-client/10.jrc.LoggingAndDebugging.html
index 73ebe0c2a..e9b506304 100644
--- a/juneau-doc/docs/Topics/10.juneau-rest-client/10.jrc.LoggingAndDebugging.html
+++ b/juneau-doc/docs/Topics/10.juneau-rest-client/10.jrc.LoggingAndDebugging.html
@@ -41,7 +41,7 @@
 		|	<jv>bean</jv> = RestClient
 		|		.<jsm>create</jsm>()
 		|		.simpleJson()
-		|		.logRequests(DetailLevel.<jsf>FULL</jsf>, Level.<jsf>SEVERE</jsf>, (<jv>req</jv>,<jv>res</jv>)-><jv>req</jv>.getUri().endsWith(<js>"/bean"</js>))
+		|		.logRequests(DetailLevel.<jsf>FULL</jsf>, Level.<jsf>SEVERE</jsf>, (<jv>req</jv>,<jv>res</jv>)-&gt;<jv>req</jv>.getUri().endsWith(<js>"/bean"</js>))
 		|		.logToConsole()
 		|		.build()
 		|		.post(<js>"http://localhost/bean"</js>, <jv>bean</jv>)
diff --git a/juneau-doc/docs/Topics/11.juneau-rest-mock/01.jrm.MockRestClient.html b/juneau-doc/docs/Topics/11.juneau-rest-mock/01.jrm.MockRestClient.html
index eba7717d4..ba19f8ca9 100644
--- a/juneau-doc/docs/Topics/11.juneau-rest-mock/01.jrm.MockRestClient.html
+++ b/juneau-doc/docs/Topics/11.juneau-rest-mock/01.jrm.MockRestClient.html
@@ -147,7 +147,7 @@
 	<hr>
 	<p>
 		The {@link oajr.mock.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
+		directly on the underlying {@link javax.servlet.http.HttpServletRequest} object.  The following example shows how
 		this can be used to directly set roles on the request object to perform security testing.
 	</p>
 	<h5 class='figure'>Example:</h5>
diff --git a/juneau-doc/docs/Topics/12.juneau-microservice-core/08.jmc.ConsoleCommands.html b/juneau-doc/docs/Topics/12.juneau-microservice-core/08.jmc.ConsoleCommands.html
index 8946f2c78..cba274dc0 100644
--- a/juneau-doc/docs/Topics/12.juneau-microservice-core/08.jmc.ConsoleCommands.html
+++ b/juneau-doc/docs/Topics/12.juneau-microservice-core/08.jmc.ConsoleCommands.html
@@ -42,7 +42,7 @@
 		|		restart -- Restarts service
 		|		help -- Commands help
 		|	
-		|	> 			
+		|	&gt; 			
 	</p>
 	<p>
 		The builder methods for controlling the console are as follows:
@@ -98,7 +98,7 @@
 		</li>
 	</ul>
 	<p>
-		By default, the console input and output are taken from {@link java.lang.System.in} and {@link java.lang.System.out}.
+		By default, the console input and output are taken from {@link java.lang.System#in} and {@link java.lang.System#out}.
 		These can be overridden using the {@link oaj.microservice.Microservice.Builder#console(Scanner,PrintWriter) console(Scanner,PrintWriter)} method.
 	</p>
 </div>
\ No newline at end of file
diff --git a/juneau-doc/docs/Topics/13.juneau-microservice-jetty/05.jmj.Config.html b/juneau-doc/docs/Topics/13.juneau-microservice-jetty/05.jmj.Config.html
index 185f571e5..8eba3236e 100644
--- a/juneau-doc/docs/Topics/13.juneau-microservice-jetty/05.jmj.Config.html
+++ b/juneau-doc/docs/Topics/13.juneau-microservice-jetty/05.jmj.Config.html
@@ -24,7 +24,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.config.BasicRestConfig} interface that defines the annotations that control the look-and-feel of
+		For example, the {@link oajr.config.DefaultConfig} interface that defines the annotations that control the look-and-feel of
 		classes that extend from {@link oajr.servlet.BasicRestServlet} use several <c>$C</c> variables to externalize values:
 	</p>
 	<p class='bjava'>
@@ -132,8 +132,8 @@
 			</p>
 			<p>
 				Additional user-defined variables at the servlet level can be defined by adding a  
-				{@link oajr.annotation.HookEvent#INIT} hook method
-				and using the {@del oajr.RestContext.Builder#vars(Class...)} method.
+				{@link oajr.annotation.RestInit} hook method
+				and using the <del> oajr.RestContext.Builder.vars(Class...)</del> method.
 			</p>
 		</li>
 		<li class='jm'>
@@ -182,7 +182,7 @@
 			</p>
 			<p>
 				Additional user-defined variables can be defined at this level by overriding the 
-				{@del oajr.RestContext.Builder#vars(Class...)} method.
+				<del> oajr.RestContext.Builder.vars(Class...)</del> method.
 			</p>
 		</li>
 	</ul>
diff --git a/juneau-doc/docs/Topics/13.juneau-microservice-jetty/07.jmj.UiCustomization.html b/juneau-doc/docs/Topics/13.juneau-microservice-jetty/07.jmj.UiCustomization.html
index 8f515ccb1..92595f9cd 100644
--- a/juneau-doc/docs/Topics/13.juneau-microservice-jetty/07.jmj.UiCustomization.html
+++ b/juneau-doc/docs/Topics/13.juneau-microservice-jetty/07.jmj.UiCustomization.html
@@ -58,7 +58,7 @@
 		|		<cv>&lt;/a&gt;</cv>
 	</p>
 	<p>
-		The {@link oajr.config.BasicRestConfig} interface (which defines the default settings for {@link oajr.servlet.BasicRestServlet} 
+		The {@link oajr.config.DefaultConfig} interface (which defines the default settings for {@link oajr.servlet.BasicRestServlet} 
 		pulls in this information using {@link oaj.config.vars.ConfigVar $C} and {@link oajr.vars.UrlVar $U} variables:
 	</p>
 	<p class='bjava'>
diff --git a/juneau-doc/docs/Topics/14.my-jetty-microservice/01.mjm.Installing.html b/juneau-doc/docs/Topics/14.my-jetty-microservice/01.mjm.Installing.html
index fff858374..10666ecef 100644
--- a/juneau-doc/docs/Topics/14.my-jetty-microservice/01.mjm.Installing.html
+++ b/juneau-doc/docs/Topics/14.my-jetty-microservice/01.mjm.Installing.html
@@ -219,11 +219,11 @@
 				|	
 				|		<xt>&lt;New</xt> <xa>id</xa>=<xs>"context"</xs> <xa>class</xa>=<xs>"org.eclipse.jetty.servlet.ServletContextHandler"</xs><xt>&gt;</xt>
 				|			<xt>&lt;Set</xt> <xa>name</xa>=<xs>"contextPath"</xs><xt>&gt;/&lt;/Set&gt;</xt>
-				|			<xc>&lt;!-- Optionally specify your servlets here -->
+				|			<xc>&lt;!-- Optionally specify your servlets here --&gt;
 				|			&lt;!--Call name="addServlet"&gt;
 				|				&lt;Arg&gt;org.apache.juneau.microservice.sample.RootResources&lt;/Arg&gt;
 				|				&lt;Arg&gt;/*&lt;/Arg&gt;
-				|			&lt;/Call--></xc>
+				|			&lt;/Call--&gt;</xc>
 				|			<xt>&lt;Set</xt> <xa>name</xa>=<xs>"sessionHandler"</xs><xt>&gt;</xt>
 				|				<xt>&lt;New</xt> <xa>class</xa>=<xs>"org.eclipse.jetty.server.session.SessionHandler"</xs><xt>/&gt;</xt>
 				|			<xt>&lt;/Set&gt;</xt>
@@ -248,8 +248,8 @@
 				|			<xc>&lt;!-- Param 0: org.eclipse.jetty.server.RequestLogWriter --&gt;</xc>
 				|			<xt>&lt;Arg&gt;</xt>
 				|				<xt>&lt;New</xt> <xa>class</xa>=<xs>"org.eclipse.jetty.server.RequestLogWriter"</xs><xt>&gt;</xt>
-				|					<xt>&lt;Set</xt> <xa>name</xa>=<xs>"append"</xs><xt>&gt;</xt>false<xt>&lt;/Set&gt</xt>;
-				|					<xt>&lt;Set</xt> <xa>name</xa>=<xs>"filename"</xs><xt>&gt;&lt;Property</xt> <xa>name</xa>=<xs>"jetty.logs"</xs> <xa>default</xa>=<xs>"$C{Logging/logDir,logs}"</xs> <xt>/&gt;</xt>/jetty-requests.log<xt>&lt;/Set&gt</xt>;
+				|					<xt>&lt;Set</xt> <xa>name</xa>=<xs>"append"</xs><xt>&gt;</xt>false<xt>&lt;/Set&gt;</xt>;
+				|					<xt>&lt;Set</xt> <xa>name</xa>=<xs>"filename"</xs><xt>&gt;&lt;Property</xt> <xa>name</xa>=<xs>"jetty.logs"</xs> <xa>default</xa>=<xs>"$C{Logging/logDir,logs}"</xs> <xt>/&gt;</xt>/jetty-requests.log<xt>&lt;/Set&gt;</xt>;
 				|					<xt>&lt;Set</xt> <xa>name</xa>=<xs>"filenameDateFormat"</xs><xt>&gt;</xt>yyyy_MM_dd<xt>&lt;/Set&gt;</xt>
 				|					<xt>&lt;Set</xt> <xa>name</xa>=<xs>"retainDays"</xs><xt>&gt;</xt>90<xt>&lt;/Set&gt;</xt>
 				|					<xt>&lt;Set</xt> <xa>name</xa>=<xs>"timeZone"</xs><xt>&gt;</xt>GMT<xt>&lt;/Set&gt;</xt>
diff --git a/juneau-doc/docs/Topics/14.my-jetty-microservice/02.mjm.Running.html b/juneau-doc/docs/Topics/14.my-jetty-microservice/02.mjm.Running.html
index 986f6b7a1..a34365609 100644
--- a/juneau-doc/docs/Topics/14.my-jetty-microservice/02.mjm.Running.html
+++ b/juneau-doc/docs/Topics/14.my-jetty-microservice/02.mjm.Running.html
@@ -21,7 +21,7 @@
 		your new microservice.
 	</p>
 	<p>
-		Go to <b>Run -> Run Configurations -> Java Application -> my-jetty-microservice</b> and click <b>Run</b>.
+		Go to <b>Run -&gt; Run Configurations -&gt; Java Application -&gt; my-jetty-microservice</b> and click <b>Run</b>.
 		In your console view, you should see the following output:
 	</p>
 	<p class='bconsole'>
@@ -33,7 +33,7 @@
 		|		restart -- Restarts service
 		|		help -- Commands help
 		|	
-		|	> 			
+		|	&gt; 			
 	</p>
 	<p>
 		Now open your browser and point to <l>http://localhost:10000</l>.  
diff --git a/juneau-doc/docs/Topics/14.my-jetty-microservice/03.mjm.Building.html b/juneau-doc/docs/Topics/14.my-jetty-microservice/03.mjm.Building.html
index ac29d6111..40c636e8f 100644
--- a/juneau-doc/docs/Topics/14.my-jetty-microservice/03.mjm.Building.html
+++ b/juneau-doc/docs/Topics/14.my-jetty-microservice/03.mjm.Building.html
@@ -51,7 +51,7 @@
 		|		restart -- Restarts service
 		|		help -- Commands help
 		|	
-		|	> 			
+		|	&gt; 			
 	</p>
 	<p>
 		If you get this error message: <code class='snippet'>java.net.BindException: Address already in use</code>, 
diff --git a/juneau-doc/docs/Topics/15.my-springboot-microservice/02.msm.Running.html b/juneau-doc/docs/Topics/15.my-springboot-microservice/02.msm.Running.html
index dcf5f9c6f..a9f74fec6 100644
--- a/juneau-doc/docs/Topics/15.my-springboot-microservice/02.msm.Running.html
+++ b/juneau-doc/docs/Topics/15.my-springboot-microservice/02.msm.Running.html
@@ -21,7 +21,7 @@
 		your new microservice.
 	</p>
 	<p>
-		Go to <b>Run -> Run Configurations -> Java Application -> my-springboot-microservice</b> and click <b>Run</b>.
+		Go to <b>Run -&gt; Run Configurations -&gt; Java Application -&gt; my-springboot-microservice</b> and click <b>Run</b>.
 		In your console view, you should see the following output:
 	</p>
 	<p class='bconsole'>
diff --git a/juneau-doc/docs/Topics/16.juneau-petstore/02.jp.juneau-petstore-api.html b/juneau-doc/docs/Topics/16.juneau-petstore/02.jp.juneau-petstore-api.html
index b3b4e6e5e..069f2fdb7 100644
--- a/juneau-doc/docs/Topics/16.juneau-petstore/02.jp.juneau-petstore-api.html
+++ b/juneau-doc/docs/Topics/16.juneau-petstore/02.jp.juneau-petstore-api.html
@@ -64,7 +64,7 @@
 		|		 * Adds a pet to the database.
 		|		 *
 		|		 * @param pet The pet data to add to the database.
-		|		 * @return {@link Ok} if successful.
+		|		 * @return Ok if successful.
 		|		 * @throws IdConflict ID already in use.
 		|		 * @throws NotAcceptable Unsupported <c>Accept</c> header specified.
 		|		 * @throws UnsupportedMediaType Unsupported <c>Content-Type</c> header specified.
@@ -81,7 +81,7 @@
 		|		 * Updates a pet in the database.
 		|		 *
 		|		 * @param pet The pet data to add to the database.
-		|		 * @return {@link Ok} if successful.
+		|		 * @return Ok if successful.
 		|		 * @throws IdNotFound ID not found.
 		|		 * @throws NotAcceptable Unsupported <c>Accept</c> header specified.
 		|		 * @throws UnsupportedMediaType Unsupported <c>Content-Type</c> header specified.
@@ -125,7 +125,7 @@
 		|		 *
 		|		 * @param apiKey Security key.
 		|		 * @param petId ID of pet to delete.
-		|		 * @return {@link Ok} if successful.
+		|		 * @return Ok if successful.
 		|		 * @throws IdNotFound Pet not found.
 		|		 * @throws NotAcceptable Unsupported <c>Accept</c> header specified.
 		|		 */</jd>
@@ -149,7 +149,7 @@
 		|		<jd>/**
 		|		 * Deletes all pets in the database.
 		|		 *
-		|		 * @return {@link Ok} if successful.
+		|		 * @return Ok if successful.
 		|		 */</jd>
 		|		<ja>@RemoteDelete</ja>(<js>"/pet"</js>)
 		|		<jk>public</jk> Ok deleteAllPets();
diff --git a/juneau-doc/docs/Topics/16.juneau-petstore/04.jp.juneau-petstore-server.html b/juneau-doc/docs/Topics/16.juneau-petstore/04.jp.juneau-petstore-server.html
index 4a777b96a..233b78ef5 100644
--- a/juneau-doc/docs/Topics/16.juneau-petstore/04.jp.juneau-petstore-server.html
+++ b/juneau-doc/docs/Topics/16.juneau-petstore/04.jp.juneau-petstore-server.html
@@ -63,7 +63,7 @@
 		|	
 		|		<ja>@Bean</ja>
 		|		<jk>public</jk> ServletRegistrationBean<Servlet> getRootServlet(RootResources <jv>rootResources</jv>) {
-		|			<jk>return new</jk> ServletRegistrationBean<>(<jv>rootResources</jv>, <js>"/*"</js>);
+		|			<jk>return new</jk> ServletRegistrationBean&lt;&gt;(<jv>rootResources</jv>, <js>"/*"</js>);
 		|		}
 		|	}
 	</p>
diff --git a/juneau-doc/docs/overview_template.html b/juneau-doc/docs/overview_template.html
index fd9978a90..5b5cd14d3 100644
--- a/juneau-doc/docs/overview_template.html
+++ b/juneau-doc/docs/overview_template.html
@@ -24,45 +24,16 @@
 	<link rel='icon' type='image/png' href='http://www.apache.org/favicons/favicon-16x16.png' sizes='16x16'>
 	<link rel='shortcut icon' href='http://www.apache.org/favicons/favicon.ico'>
 	<style type='text/css'>
-		/* For viewing in file system and page designer */
-		@IMPORT url('../../../../juneau-core/java/src/main/javadoc/javadoc.css');
-		@IMPORT url('../../../../juneau-core/java/src/main/javadoc/resources/juneau-doc.css');
-		@IMPORT url('../../../../juneau-core/java/src/main/javadoc/resources/juneau-code.css');
 		body { 
 			margin: 20px; 
 		}	
 		.spaced-list li { padding:5px; }
 		.footer .spaced-list ul { margin:0 }
 	</style>
-	<script type='text/javascript'>
-		/* Replace all @code and @link tags. */	
-		window.onload = function() {
-			document.body.innerHTML = document.body.innerHTML.replace(/\{\@code ([^\}]+)\}/g, '<code>$1<\/code>');
-			document.body.innerHTML = document.body.innerHTML.replace(/\{\@link (([^\}]+)\.)?([^\.\}]+)\}/g, '<code>$3<\/code>');
-		}
-	</script>
 </head>
 <body>
 <h1 class='title'>Apache Juneau <juneauVersion>9.0.0</juneauVersion> Documentation</h1>
 
-<script type='text/javascript'>
-	function toggle(x) {
-		var div = x.nextSibling;
-		while (div != null && div.nodeType != 1)
-			div = div.nextSibling;
-		if (div != null) {
-			var d = div.style.display;
-			if (d == 'block' || d == '') {
-				div.style.display = 'none';
-				x.className += " closed";
-			} else {
-				div.style.display = 'block';
-				x.className = x.className.replace(/(?:^|\s)closed(?!\S)/g , '' );
-			}
-		}
-	}
-</script>
-
 <a href='#TOC' id='TOC'></a><h5 class='toc'>Table of Contents</h5>
 {TOC-CONTENTS}
 {CONTENTS}
diff --git a/juneau-doc/src/main/java/org/apache/juneau/doc/internal/Console.java b/juneau-doc/src/main/java/org/apache/juneau/doc/internal/Console.java
index 93ab4d399..bc789b0a9 100644
--- a/juneau-doc/src/main/java/org/apache/juneau/doc/internal/Console.java
+++ b/juneau-doc/src/main/java/org/apache/juneau/doc/internal/Console.java
@@ -14,8 +14,6 @@ package org.apache.juneau.doc.internal;
 
 import java.text.*;
 
-import com.sun.javadoc.*;
-
 /**
  * Console utilities.
  */
@@ -39,11 +37,8 @@ public class Console {
 	 * @param msg Message.
 	 * @param args Message arguments.
 	 */
-	public static void warning(SourcePosition position, String msg, Object...args) {
-		if (position != null)
-			System.err.println(position + ": warning - " + format(msg, args));  // NOT DEBUG
-		else
-			System.err.println("[WARNING] " + format(msg, args));  // NOT DEBUG
+	public static void warning(String msg, Object...args) {
+		System.err.println("[WARNING] " + format(msg, args));  // NOT DEBUG
 		System.err.flush();
 	}
 
@@ -54,11 +49,8 @@ public class Console {
 	 * @param msg Message.
 	 * @param args Message arguments.
 	 */
-	public static void error(SourcePosition position, String msg, Object...args) {
-		if (position != null)
-			System.err.println(position + ": error - " + format(msg, args));  // NOT DEBUG
-		else
-			System.err.println("[ERROR] " + format(msg, args));  // NOT DEBUG
+	public static void error(String msg, Object...args) {
+		System.err.println("[ERROR] " + format(msg, args));  // NOT DEBUG
 		System.err.flush();
 	}
 
diff --git a/juneau-doc/src/main/javadoc/overview.html b/juneau-doc/src/main/javadoc/overview.html
index ba9f65767..f630b467d 100644
--- a/juneau-doc/src/main/javadoc/overview.html
+++ b/juneau-doc/src/main/javadoc/overview.html
@@ -24,45 +24,16 @@
 	<link rel='icon' type='image/png' href='http://www.apache.org/favicons/favicon-16x16.png' sizes='16x16'>
 	<link rel='shortcut icon' href='http://www.apache.org/favicons/favicon.ico'>
 	<style type='text/css'>
-		/* For viewing in file system and page designer */
-		@IMPORT url('../../../../juneau-core/java/src/main/javadoc/javadoc.css');
-		@IMPORT url('../../../../juneau-core/java/src/main/javadoc/resources/juneau-doc.css');
-		@IMPORT url('../../../../juneau-core/java/src/main/javadoc/resources/juneau-code.css');
 		body { 
 			margin: 20px; 
 		}	
 		.spaced-list li { padding:5px; }
 		.footer .spaced-list ul { margin:0 }
 	</style>
-	<script type='text/javascript'>
-		/* Replace all @code and @link tags. */	
-		window.onload = function() {
-			document.body.innerHTML = document.body.innerHTML.replace(/\{\@code ([^\}]+)\}/g, '<code>$1<\/code>');
-			document.body.innerHTML = document.body.innerHTML.replace(/\{\@link (([^\}]+)\.)?([^\.\}]+)\}/g, '<code>$3<\/code>');
-		}
-	</script>
 </head>
 <body>
 <h1 class='title'>Apache Juneau <juneauVersion>9.0.0</juneauVersion> Documentation</h1>
 
-<script type='text/javascript'>
-	function toggle(x) {
-		var div = x.nextSibling;
-		while (div != null && div.nodeType != 1)
-			div = div.nextSibling;
-		if (div != null) {
-			var d = div.style.display;
-			if (d == 'block' || d == '') {
-				div.style.display = 'none';
-				x.className += " closed";
-			} else {
-				div.style.display = 'block';
-				x.className = x.className.replace(/(?:^|\s)closed(?!\S)/g , '' );
-			}
-		}
-	}
-</script>
-
 <a href='#TOC' id='TOC'></a><h5 class='toc'>Table of Contents</h5>
 <ol class='toc'>
 	<li><p class='toc2'><a class='doclink' href='#Overview'>Overview</a></p>
@@ -187,18 +158,6 @@
 		<li><p><a class='doclink' href='#juneau-marshall.jm.BestPractices'>Best Practices</a></p>
 	</ol>
 	<li><p class='toc2'><a class='doclink' href='#juneau-marshall-rdf'>juneau-marshall-rdf</a></p>
-	<ol>
-		<li><p><a class='doclink' href='#juneau-marshall-rdf.jmr.RdfDetails'>RDF Details</a></p>
-		<ol>
-			<li><p><a class='doclink' href='#juneau-marshall-rdf.jmr.RdfDetails.jmr.Serializers'>RDF Serializers</a><span class='update'>updated: <b>9.0.0</b></span></p>
-			<li><p><a class='doclink' href='#juneau-marshall-rdf.jmr.RdfDetails.jmr.Parsers'>RDF Parsers</a><span class='update'>updated: <b>9.0.0</b></span></p>
-			<li><p><a class='doclink' href='#juneau-marshall-rdf.jmr.RdfDetails.jmr.RdfAnnotation'>@Rdf Annotation</a></p>
-			<li><p><a class='doclink' href='#juneau-marshall-rdf.jmr.RdfDetails.jmr.Namespaces'>Namespaces</a><span class='update'>updated: <b>9.0.0</b></span></p>
-			<li><p><a class='doclink' href='#juneau-marshall-rdf.jmr.RdfDetails.jmr.UriProperties'>URI Properties</a><span class='update'>updated: <b>9.0.0</b></span></p>
-			<li><p><a class='doclink' href='#juneau-marshall-rdf.jmr.RdfDetails.jmr.RootProperty'>Root Property</a><span class='update'>updated: <b>9.0.0</b></span></p>
-			<li><p><a class='doclink' href='#juneau-marshall-rdf.jmr.RdfDetails.jmr.TypedLiterals'>Typed Literals</a><span class='update'>updated: <b>9.0.0</b></span></p>
-		</ol>
-	</ol>
 	<li><p class='toc2'><a class='doclink' href='#juneau-dto'>juneau-dto</a></p>
 	<ol>
 		<li><p><a class='doclink' href='#juneau-dto.jd.Html5'>HTML5</a></p>
@@ -1063,8 +1022,8 @@
 	SerializerSet <jv>serializerSet</jv> = SerializerSet
 		.<jsm>create</jsm>()
 		.add(JsonSerializer.<jk>class</jk>, UrlEncodingSerializer.<jk>class</jk>);
-		.forEach(<jv>x</jv> -> <jv>x</jv>.swaps(CalendarSwap.ISO8601DT.<jk>class</jk>))
-		.forEachWS(<jv>x</jv> -> <jv>x</jv>.useWhitespace())
+		.forEach(<jv>x</jv> -&gt; <jv>x</jv>.swaps(CalendarSwap.ISO8601DT.<jk>class</jk>))
+		.forEachWS(<jv>x</jv> -&gt; <jv>x</jv>.useWhitespace())
 		.build();
 
 	<jc>// Find the appropriate serializer by Accept type and serialize our POJO to the specified writer.</jc>
@@ -1077,7 +1036,7 @@
 	ParserSet <jv>parserSet</jv> = ParserSet
 		.<jsm>create</jsm>()
 		.add(JsonParser.<jk>class</jk>, UrlEncodingParser.<jk>class</jk>);
-		.forEach(<jv>x</jv> -> <jv>x</jv>.swaps(CalendarSwap.ISO8601DT.<jk>class</jk>))
+		.forEach(<jv>x</jv> -&gt; <jv>x</jv>.swaps(CalendarSwap.ISO8601DT.<jk>class</jk>))
 		.build();
 
 	Person <jv>person</jv> = <jv>parserSet</jv>
@@ -1681,7 +1640,7 @@
 		 */</jd>
 		<ja>@Bean</ja>
 		<jk>public</jk> ServletRegistrationBean&lt;Servlet&gt; getRootServlet(RootResources <jv>rootResources</jv>) {
-			<jk>return new</jk> ServletRegistrationBean<>(<jv>rootResources</jv>, <js>"/*"</js>);
+			<jk>return new</jk> ServletRegistrationBean&lt;&gt;(<jv>rootResources</jv>, <js>"/*"</js>);
 		}
 	}
 	</p>
@@ -2069,7 +2028,7 @@
 	<jc>// Perform an arbitrary Predicate check against a bean.</jc>
 	MyBean <jv>myBean</jv> = ...;
 	<jsm>assertBean</jsm>(<jv>myBean</jv>)
-		.is(<jv>x</jv> -> <jsm>isValidCheck</jsm>(<jv>x</jv>))
+		.is(<jv>x</jv> -&gt; <jsm>isValidCheck</jsm>(<jv>x</jv>))
 	
 	<jc>// Check that a list of strings has less than 10 entries and the first</jc>
 	<jc>// 3 entries are [foo, bar*, null] using assertion predicates.</jc>
@@ -2080,7 +2039,7 @@
 			.is(<jsm>eq</jsm>(<js>"foo"</js>),<jsm>match</jsm>(<js>"bar*"</js>),<jsm>isNull</jsm>())
 	
 	<jc>// Check that an exception is thrown and is the specified type and has the specified message.</jc>
-	<jsm>assertThrown</jsm>(()-><jv>myBean</jv>.runBadMethod())
+	<jsm>assertThrown</jsm>(()-&gt;<jv>myBean</jv>.runBadMethod())
 		.isExists()
 		.isExactType(RuntimeException.<jk>class</jk>)
 		.asMessage().is(<js>"foo"</js>);
@@ -2249,11 +2208,6 @@
 							<li class='jc'>{@link org.apache.juneau.marshaller.Uon}
 							<li class='jc'>{@link org.apache.juneau.marshaller.UrlEncoding}
 							<li class='jc'>{@link org.apache.juneau.marshaller.Xml}
-							<li class='jc'>{@link org.apache.juneau.marshaller.N3}
-							<li class='jc'>{@link org.apache.juneau.marshaller.NTriple}
-							<li class='jc'>{@link org.apache.juneau.marshaller.RdfXml}
-							<li class='jc'>{@link org.apache.juneau.marshaller.RdfXmlAbbrev}
-							<li class='jc'>{@link org.apache.juneau.marshaller.Turtle}
 						</ul>
 					</ul>
 				<li class='jac'>{@link org.apache.juneau.marshaller.StreamMarshaller}
@@ -2293,11 +2247,6 @@
 		<li class='jc'>{@link org.apache.juneau.marshaller.Uon}
 		<li class='jc'>{@link org.apache.juneau.marshaller.UrlEncoding}
 		<li class='jc'>{@link org.apache.juneau.marshaller.Xml}
-		<li class='jc'>{@link org.apache.juneau.marshaller.N3}
-		<li class='jc'>{@link org.apache.juneau.marshaller.NTriple}
-		<li class='jc'>{@link org.apache.juneau.marshaller.RdfXml}
-		<li class='jc'>{@link org.apache.juneau.marshaller.RdfXmlAbbrev}
-		<li class='jc'>{@link org.apache.juneau.marshaller.Turtle}
 	</ul>
 	<p>
 		Each predefined marshaller also includes static convenience from/to methods to make it even easier to
@@ -3515,7 +3464,6 @@
 		<li class='ja'>{@link org.apache.juneau.oapi.annotation.OpenApiConfig OpenApiConfig}
 		<li class='ja'>{@link org.apache.juneau.parser.annotation.ParserConfig ParserConfig}
 		<li class='ja'>{@link org.apache.juneau.plaintext.annotation.PlainTextConfig PlainTextConfig}
-		<li class='ja'>{@link org.apache.juneau.jena.annotation.RdfConfig RdfConfig}
 		<li class='ja'>{@link org.apache.juneau.serializer.annotation.SerializerConfig SerializerConfig}
 		<li class='ja'>{@link org.apache.juneau.soap.annotation.SoapXmlConfig SoapXmlConfig}
 		<li class='ja'>{@link org.apache.juneau.uon.annotation.UonConfig UonConfig}
@@ -3753,8 +3701,8 @@
 	// to all serializers.</jc>
 	SerializerSet <jv>serializers</jv> = SerializerSet.<jsm>create</jsm>()
 		.add(JsonSerializer.<jk>class</jk>, UrlEncodingSerializer.<jk>class</jk>)
-		.forEach(<jv>x</jv> -> <jv>x</jv>.swaps(TemporalCalendarSwap.IsoLocalDateTime.<jk>class</jk>))
-		.forEachWS(<jv>x</jv> -> <jv>x</jv>.ws())   <jc>// or .useWhitespace(true)</jc>
+		.forEach(<jv>x</jv> -&gt; <jv>x</jv>.swaps(TemporalCalendarSwap.IsoLocalDateTime.<jk>class</jk>))
+		.forEachWS(<jv>x</jv> -&gt; <jv>x</jv>.ws())   <jc>// or .useWhitespace(true)</jc>
 		.build();
 
 	<jc>// Find the appropriate serializer by Accept type and serialize our POJO to the 
@@ -3766,7 +3714,7 @@
 	<jc>// Construct a new parser group with configuration parameters that get applied to all parsers.</jc>
 	ParserSet <jv>parsers</jv> = ParserSet.<jsm>create</jsm>()
 		.add(JsonSerializer.<jk>class</jk>, UrlEncodingSerializer.<jk>class</jk>)
-		.forEach(<jv>x</jv> -> <jv>x</jv>.swaps(CalendarSwap.IsoLocalDateTime.<jk>class</jk>))
+		.forEach(<jv>x</jv> -&gt; <jv>x</jv>.swaps(CalendarSwap.IsoLocalDateTime.<jk>class</jk>))
 		.build();
 
 	Person <jv>myPerson</jv> = <jv>parsers</jv>
@@ -3886,7 +3834,7 @@
 	WriterSerializer <jv>serializer</jv> = JsonSerializer
 		.<jsm>create</jsm>()
 		.simple()
-		.swap(MyBean.<jk>class</jk>, String.<jk>class</jk>, <jv>x</jv> -> <jsm>myBeanStringifier</jsm>(<jv>x</jv>))
+		.swap(MyBean.<jk>class</jk>, String.<jk>class</jk>, <jv>x</jv> -&gt; <jsm>myBeanStringifier</jsm>(<jv>x</jv>))
 		.build();
 	</p>
 </div>
@@ -3903,7 +3851,7 @@
 		<li class='jc'>{@link java.util.Enumeration}
 		<li class='jc'>{@link java.util.Iterator}
 		<li class='jc'>{@link java.util.Locale}
-		<li class='jc'>{@link java.util.Class}
+		<li class='jc'>{@link java.lang.Class}
 		<li class='jc'>{@link java.util.Calendar}
 		<li class='jc'>{@link java.util.Date}
 		<li class='jc'>{@link java.time.Instant}
@@ -3915,7 +3863,7 @@
 		<li class='jc'>{@link java.time.OffsetTime}
 		<li class='jc'>{@link java.time.Year}
 		<li class='jc'>{@link java.time.YearMonth}
-		<li class='jc'>{@link java.time.Temporal}
+		<li class='jc'>{@link java.time.temporal.Temporal}
 		<li class='jc'>{@link java.util.TimeZone}
 		<li class='jc'>{@link javax.xml.datatype.XMLGregorianCalendar}
 		<li class='jc'>{@link java.time.ZoneId}
@@ -4153,8 +4101,8 @@
 
 			SerializerSet <jv>serializers</jv> = SerializersSet.<jsm>create</jsm>()
 				.add(JsonSerializer.<jk>class</jk>, XmlSerializer.<jk>class</jk>, HtmlSerializer.<jk>class</jk>)
-				.forEach(<jv>x</jv> -> <jv>x</jv>.swaps(MyJsonSwap.<jk>class</jk>, MyXmlSwap.<jk>class</jk>, MyOtherSwap.<jk>class</jk>))
-				.forEachWS(<jv>x</jv> -> <jv>x</jv>.ws())
+				.forEach(<jv>x</jv> -&gt; <jv>x</jv>.swaps(MyJsonSwap.<jk>class</jk>, MyXmlSwap.<jk>class</jk>, MyOtherSwap.<jk>class</jk>))
+				.forEachWS(<jv>x</jv> -&gt; <jv>x</jv>.ws())
 				.build();
 
 			MyPojo <jv>myPojo</jv> = <jk>new</jk> MyPojo();
@@ -4528,7 +4476,6 @@
 		<li class='ja'>{@link org.apache.juneau.uon.annotation.Uon}
 		<li class='ja'>{@link org.apache.juneau.urlencoding.annotation.UrlEncoding}
 		<li class='ja'>{@link org.apache.juneau.xml.annotation.Xml}
-		<li class='ja'>{@link org.apache.juneau.jena.annotation.Rdf}
 	</ul>
 	<p>
 		The valid pattern matches are:
@@ -5999,7 +5946,7 @@
 		</tr>
 		<tr class='dark'>
 			<td>{@link org.apache.juneau.rest.vars.UrlVar}</td>
-			<td class='code'>$U{uri}></td>
+			<td class='code'>$U{uri}</td>
 		</tr>
 		<tr class='dark'>
 			<td>{@link org.apache.juneau.rest.vars.UrlEncodeVar}</td>
@@ -6139,7 +6086,7 @@
 	</ul>
 	<h5 class='topic'>EncoderSet</h5>
 	<p>
-		The {@link org.apache.juneau.encoders.EncoderSet} class represents the set of {@link Encoder encoders} keyed by codings.
+		The {@link org.apache.juneau.encoders.EncoderSet} class represents the set of {@link org.apache.juneau.encoders.Encoder encoders} keyed by codings.
 		It maintains a set of encoders and the codings that they can handle.
  		The {@link org.apache.juneau.encoders.EncoderSet#getEncoderMatch(String) getEncoderMatch(String)} and {@link org.apache.juneau.encoders.EncoderSet#getEncoder(String)} 
  		methods are then used to find appropriate encoders for specific <c>Accept-Encoding</c> and <c>Content-Encoding</c> header values.
@@ -6218,9 +6165,9 @@
 	</p>
 	<ul class='spaced-list'>
 		<li>
-			{@link Map Maps} and Java beans representing JSON objects.
+			{@link java.util.Map Maps} and Java beans representing JSON objects.
 		<li>
-			{@link Collection Collections} and arrays representing JSON arrays.
+			{@link java.util.Collection Collections} and arrays representing JSON arrays.
 		<li>
 			Java beans.
 	</ul>
@@ -9865,7 +9812,7 @@
 
 		<ja>@Override</ja>
 		<jk>public</jk> Object getContent(SerializerSession <jv>session</jv>, Float <jv>value</jv>) {
-			<jk>if</jk> (<jv>value</jv> >= 90)
+			<jk>if</jk> (<jv>value</jv> &gt;= 90)
 				<jk>return</jk> <jsm>div</jsm>(
 					String.<jsm>format</jsm>(<js>"%.0f%%"</js>, <jv>value</jv>),
 					<jsm>style</jsm>(<js>"@keyframes color_change { from { background-color: red; } to { background-color: yellow; }"</js>)
@@ -10882,7 +10829,6 @@
 		<li class='ja'>{@link org.apache.juneau.http.annotation.FormData}
 		<li class='ja'>{@link org.apache.juneau.http.annotation.Path}
 		<li class='ja'>{@link org.apache.juneau.http.annotation.Response}
-		<li class='ja'>{@link org.apache.juneau.http.annotation.ResponseHeader}
 	</ul>
 </div>
 
@@ -11960,579 +11906,6 @@
 		<li>N3
 	</ul>				
 </div>
-
-<!-- ==================================================================================================== -->
-
-<h3 class='topic' onclick='toggle(this)'><a href='#juneau-marshall-rdf.jmr.RdfDetails' id='juneau-marshall-rdf.jmr.RdfDetails'>3.1 - RDF Details</a></h3>
-<div class='topic'><!-- START: 3.1 - juneau-marshall-rdf.jmr.RdfDetails -->
-<div class='topic'>
-	<p>
-		Juneau supports serializing and parsing arbitrary POJOs to and from the following RDF formats:
-	</p>
-	<ul>
-		<li>RDF/XML
-		<li>Abbreviated RDF/XML
-		<li>N-Triple
-		<li>Turtle
-		<li>N3
-	</ul>
-	
-	<p>
-		The serializers and parsers work identically to those in <c>juneau-marshall</c> but are
-		packaged separately so that you don't need to pull in the Jena dependency unless you need it.
-	</p>
-	
-	<p class='bjava'>
-	<jc>// A simple bean</jc>
-	<jk>public class</jk> Person {
-		<jk>public</jk> String <jf>name</jf> = <js>"John Smith"</js>;
-		<jk>public int</jk> <jf>age</jf> = 21;
-	}
-	
-	<jc>// Serialize a bean to JSON, XML, or HTML</jc>
-	Person <jv>person</jv> = <jk>new</jk> Person();
-
-	<jc>// Produces:
-	// &lt;rdf:RDF
-	//  xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-	//  xmlns:jp="http://www.apache.org/juneaubp/"
-	//  xmlns:j="http://www.apache.org/juneau/"&gt;
-	// 	&lt;rdf:Description&gt;
-	// 		&lt;jp:name&gt;John Smith&lt;/jp:name&gt;
-	// 		&lt;jp:age&gt;21&lt;/jp:age&gt;
-	// 	&lt;/rdf:Description&gt;
-	// &lt;/rdf:RDF&gt;</jc>
-	String <jv>rdfXml</jv> = RdfXmlAbbrev.<jsm>of</jsm>(<jv>person</jv>);
-	
-	<jc>// Produces:
-	// @prefix jp:      &lt;http://www.apache.org/juneaubp/&gt; .
-	// @prefix j:       &lt;http://www.apache.org/juneau/&gt; .
-	//	[]    jp:age  "21" ;
-	//	      jp:name "John Smith" .</jc>
-	String <jv>rdfN3</jv> = N3.<jsm>of</jsm>(<jv>person</jv>);
-
-	<jc>// Produces:
-	// _:A3bf53c85X3aX157cf407e2dX3aXX2dX7ffd &lt;http://www.apache.org/juneaubp/name&gt; "John Smith" .
-	// _:A3bf53c85X3aX157cf407e2dX3aXX2dX7ffd &lt;http://www.apache.org/juneaubp/age&gt; "21" .</jc>
-	String <jv>rdfNTriple</jv> = NTriple.<jsm>of</jsm>(<jv>person</jv>);
-	</p>
-</div>
-
-<!-- ==================================================================================================== -->
-
-<h5 class='topic' onclick='toggle(this)'><a href='#juneau-marshall-rdf.jmr.RdfDetails.jmr.Serializers' id='juneau-marshall-rdf.jmr.RdfDetails.jmr.Serializers'>3.1.1 - RDF Serializers</a><span class='update'>updated: <b>9.0.0</b></span></h4>
-<div class='topic'><!-- START: 3.1.1 - juneau-marshall-rdf.jmr.RdfDetails.jmr.Serializers -->
-<div class='topic'>
-	<p>
-		The {@link org.apache.juneau.jena.RdfSerializer} class is the top-level class for all Jena-based serializers.
-		Language-specific serializers are defined as inner subclasses of the <c>RdfSerializer</c> class:
-	</p>	
-	<ul class='javatree'>
-		<li class='jc'>{@link org.apache.juneau.jena.RdfSerializer}
-			<ul class='javatreec'>
-				<li class='jc'>{@link org.apache.juneau.jena.RdfXmlSerializer}
-				<li class='jc'>{@link org.apache.juneau.jena.RdfXmlAbbrevSerializer}
-				<li class='jc'>{@link org.apache.juneau.jena.N3Serializer}
-				<li class='jc'>{@link org.apache.juneau.jena.NTripleSerializer}
-				<li class='jc'>{@link org.apache.juneau.jena.TurtleSerializer}
-			</ul>
-		</li>
-	</ul>
-	<p>
-		The class hierarchy for the builder of this serializer is:
-	</p>
-	<ul class='javatree'>
-		<li class='jac'>{@link org.apache.juneau.Context.Builder}
-			<ul>
-				<li class='jac'>{@link org.apache.juneau.BeanContextable.Builder}
-					<ul>
-						<li class='jac'>{@link org.apache.juneau.BeanTraverseContext.Builder}
-							<ul>
-								<li class='jac'>{@link org.apache.juneau.serializer.Serializer.Builder}
-									<ul>
-										<li class='jac'>{@link org.apache.juneau.serializer.WriterSerializer.Builder}
-											<ul>
-												<li class='jc'>{@link org.apache.juneau.jena.RdfSerializer.Builder}
-											</ul>
-										</li>
-									</ul>
-								</li>
-							</ul>
-						</li>
-					</ul>
-				</li>
-			</ul>
-		</li>
-	</ul>
-	<p>
-		Refer to the builder javadocs for configurable settings.
-	</p>
-	<p>
-		The following pre-configured serializers are provided for convenience:
-	</p>
-	<ul class='javatree'>
-		<li class='jc'>{@link org.apache.juneau.jena.RdfSerializer}
-			<ul>
-				<li class='jc'>{@link org.apache.juneau.jena.RdfXmlSerializer}
-					<ul>
-						<li class='jf'>{@link org.apache.juneau.jena.RdfXmlSerializer#DEFAULT DEFAULT}
-					</ul>
-				</li>
-				<li class='jc'>{@link org.apache.juneau.jena.RdfXmlAbbrevSerializer}
-					<ul>
-						<li class='jf'>{@link org.apache.juneau.jena.RdfXmlAbbrevSerializer#DEFAULT DEFAULT}
-					</ul>
-				</li>
-				<li class='jc'>{@link org.apache.juneau.jena.N3Serializer}
-					<ul>
-						<li class='jf'>{@link org.apache.juneau.jena.N3Serializer#DEFAULT DEFAULT}
-					</ul>
-				</li>
-				<li class='jc'>{@link org.apache.juneau.jena.NTripleSerializer}
-					<ul>
-						<li class='jf'>{@link org.apache.juneau.jena.NTripleSerializer#DEFAULT DEFAULT}
-					</ul>
-				</li>
-				<li class='jc'>{@link org.apache.juneau.jena.TurtleSerializer}
-					<ul>
-						<li class='jf'>{@link org.apache.juneau.jena.TurtleSerializer#DEFAULT DEFAULT}
-					</ul>
-				</li>
-			</ul>
-		</li>
-	</ul>
-	<p>
-		Abbreviated RDF/XML is currently the most widely accepted and readable RDF syntax, so the examples shown here 
-		will use that format.
-	</p>
-</div>
-</div><!-- END: 3.1.1 - juneau-marshall-rdf.jmr.RdfDetails.jmr.Serializers -->
-
-<!-- ==================================================================================================== -->
-
-<h5 class='topic' onclick='toggle(this)'><a href='#juneau-marshall-rdf.jmr.RdfDetails.jmr.Parsers' id='juneau-marshall-rdf.jmr.RdfDetails.jmr.Parsers'>3.1.2 - RDF Parsers</a><span class='update'>updated: <b>9.0.0</b></span></h4>
-<div class='topic'><!-- START: 3.1.2 - juneau-marshall-rdf.jmr.RdfDetails.jmr.Parsers -->
-<div class='topic'>
-	<p>
-		The {@link org.apache.juneau.jena.RdfParser} class is the top-level class for all Jena-based parsers.
-		Language-specific parsers are defined as inner subclasses of the <c>RdfParser</c> class:
-	</p>	
-	<ul class='javatree'>
-		<li class='jc'>{@link org.apache.juneau.jena.RdfParser}
-			<ul class='javatreec'>
-				<li class='jc'>{@link org.apache.juneau.jena.RdfXmlParser}
-				<li class='jc'>{@link org.apache.juneau.jena.NTripleParser}
-				<li class='jc'>{@link org.apache.juneau.jena.TurtleParser}
-				<li class='jc'>{@link org.apache.juneau.jena.N3Parser}
-			</ul>
-		</li>
-	</ul>
-	<p>
-		The <c>RdfParser.Xml</c> parser handles both regular and abbreviated RDF/XML.
-	</p>
-	<p>
-		The class hierarchy for the builder of this parser is:
-	</p>
-	<ul class='javatree'>
-		<li class='jac'>{@link org.apache.juneau.Context.Builder}
-			<ul>
-				<li class='jac'>{@link org.apache.juneau.BeanContextable.Builder}
-					<ul>
-						<li class='jac'>{@link org.apache.juneau.parser.Parser.Builder}
-							<ul>
-								<li class='jac'>{@link org.apache.juneau.parser.ReaderParser.Builder}
-									<ul>
-										<li class='jc'>{@link org.apache.juneau.jena.RdfParser.Builder}
-									</ul>
-								</li>
-							</ul>
-						</li>
-					</ul>
-				</li>
-			</ul>
-		</li>
-	</ul>
-	<p>
-		Refer to the builder javadocs for configurable settings.
-	</p>
-	<p>
-		The following pre-configured parsers are provided for convenience:
-	</p>
-	<ul class='javatree'>
-		<li class='jc'>{@link org.apache.juneau.jena.RdfParser}
-			<ul>
-				<li class='jc'>{@link org.apache.juneau.jena.RdfXmlParser}
-					<ul>
-						<li class='jf'>{@link org.apache.juneau.jena.RdfXmlParser#DEFAULT DEFAULT}
-					</ul>
-				</li>
-				<li class='jc'>{@link org.apache.juneau.jena.N3Parser}
-					<ul>
-						<li class='jf'>{@link org.apache.juneau.jena.N3Parser#DEFAULT DEFAULT}
-					</ul>
-				</li>
-				<li class='jc'>{@link org.apache.juneau.jena.NTripleParser}
-					<ul>
-						<li class='jf'>{@link org.apache.juneau.jena.NTripleParser#DEFAULT DEFAULT}
-					</ul>
-				</li>
-				<li class='jc'>{@link org.apache.juneau.jena.TurtleParser}
-					<ul>
-						<li class='jf'>{@link org.apache.juneau.jena.TurtleParser#DEFAULT DEFAULT}
-					</ul>
-				</li>
-			</ul>
-		</li>
-	</ul>
-</div>
-</div><!-- END: 3.1.2 - juneau-marshall-rdf.jmr.RdfDetails.jmr.Parsers -->
-
-<!-- ==================================================================================================== -->
-
-<h5 class='topic' onclick='toggle(this)'><a href='#juneau-marshall-rdf.jmr.RdfDetails.jmr.RdfAnnotation' id='juneau-marshall-rdf.jmr.RdfDetails.jmr.RdfAnnotation'>3.1.3 - @Rdf Annotation</a></h4>
-<div class='topic'><!-- START: 3.1.3 - juneau-marshall-rdf.jmr.RdfDetails.jmr.RdfAnnotation -->
-<div class='topic'>
-	<p>
-		The {@link org.apache.juneau.jena.annotation.Rdf @Rdf} annotation
-		is used to override the behavior of the RDF serializers and parsers on individual bean classes or properties.
-	</p>
-	<ul class='javatree'>
-		<li class='ja'>{@link org.apache.juneau.jena.annotation.Rdf}
-			<ul class='javatreec'>
-				<li class='jma'>{@link org.apache.juneau.jena.annotation.Rdf#beanUri() beanUri}
-				<li class='jma'>{@link org.apache.juneau.jena.annotation.Rdf#collectionFormat() collectionFormat}
-				<li class='jma'>{@link org.apache.juneau.jena.annotation.Rdf#namespace() namespace}
-				<li class='jma'>{@link org.apache.juneau.jena.annotation.Rdf#prefix() prefix}
-			</ul>
-		</li>
-	</ul>		
-</div>
-</div><!-- END: 3.1.3 - juneau-marshall-rdf.jmr.RdfDetails.jmr.RdfAnnotation -->
-
-<!-- ==================================================================================================== -->
-
-<h5 class='topic' onclick='toggle(this)'><a href='#juneau-marshall-rdf.jmr.RdfDetails.jmr.Namespaces' id='juneau-marshall-rdf.jmr.RdfDetails.jmr.Namespaces'>3.1.4 - Namespaces</a><span class='update'>updated: <b>9.0.0</b></span></h4>
-<div class='topic'><!-- START: 3.1.4 - juneau-marshall-rdf.jmr.RdfDetails.jmr.Namespaces -->
-<div class='topic'>
-	<p>
-		You'll notice in the previous example that Juneau namespaces are used to represent bean property names.
-		These are used by default when namespaces are not explicitly specified.
-	</p>
-	<p>
-		The <c>juneau</c> namespace is used for generic names for objects that don't have namespaces 
-		associated with them.
-	</p>
-	<p>
-		The <c>juneaubp</c> namespace is used on bean properties that don't have namespaces associated with 
-		them.
-	</p>
-	<p>
-		The easiest way to specify namespaces is through annotations.
-		In this example, we're going to associate the prefix <c>'per'</c> to our bean class and all properties 
-		of this class.
-		We do this by adding the following annotation to our class:
-	</p>
-	<p class='bjava'>
-	<ja>@Rdf</ja>(prefix=<js>"per"</js>)
-	<jk>public class</jk> Person {
-	</p>
-	<p>
-		In general, the best approach is to define the namespace URIs at the package level using a 
-		<c>package-info.java</c> class, like so:
-	</p>
-	<p class='bjava'>
-	<jc>// RDF namespaces used in this package</jc>
-	<ja>@RdfSchema</ja>(
-		prefix=<js>"ab"</js>,
-		rdfNs={
-			<ja>@RdfNs</ja>(prefix=<js>"ab"</js>, namespaceURI=<js>"http://www.apache.org/addressBook/"</js>),
-			<ja>@RdfNs</ja>(prefix=<js>"per"</js>, namespaceURI=<js>"http://www.apache.org/person/"</js>),
-			<ja>@RdfNs</ja>(prefix=<js>"addr"</js>, namespaceURI=<js>"http://www.apache.org/address/"</js>),
-			<ja>@RdfNs</ja>(prefix=<js>"mail"</js>, namespaceURI=<js>"http://www.apache.org/mail/"</js>)
-		}
-	)
-	<jk>package</jk> org.apache.juneau.sample.addressbook;
-	<jk>import</jk> org.apache.juneau.xml.annotation.*;
-	</p>
-	<p>
-		This assigns a default prefix of <js>"ab"</js> for all classes and properties within the project, and 
-		specifies various other prefixes used within this project.
-	</p>
-	<p>
-		Now when we rerun the sample code, we'll get the following:
-	</p>
-	<p class='bxml'>
-	<xt>&lt;rdf:RDF</xt>
-		<xa>xmlns:rdf</xa>=<xs>"http://www.w3.org/1999/02/22-rdf-syntax-ns#"</xs>
-		<xa>xmlns:j</xa>=<xs>"http://www.apache.org/juneau/"</xs>
-		<xa>xmlns:jp</xa>=<xs>"http://www.apache.org/juneaubp/"</xs>
-		<xa>xmlns:per</xa>=<xs>"http://www.apache.org/person/"</xs><xt>&gt;</xt>
-		<xt>&lt;rdf:Description&gt;</xt>
-			<xt>&lt;per:id&gt;</xt>1<xt>&lt;/per:id&gt;</xt>
-			<xt>&lt;per:name&gt;</xt>John Smith<xt>&lt;/per:name&gt;</xt>
-		<xt>&lt;/rdf:Description&gt;</xt>
-	<xt>&lt;/rdf:RDF&gt;</xt>
-	</p>
-	<p>
-		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 using {@link org.apache.juneau.xml.XmlSerializer.Builder#disableAutoDetectNamespaces()}.
-	</p>
-	<p class='bjava'>
-	<jc>// Create a new serializer but manually specify the namespaces.</jc>
-	RdfSerializer <jv>serializer</jv> = RdfSerializer.<jsm>create</jsm>()
-		.xmlabbrev()
-		.rdfxml_tab(3)
-		.disableAutoDetectNamespaces()
-		.namespaces(<js>"{per:'http://www.apache.org/person/'}"</js>)
-		.build();
-	</p>
-	<p>
-		This code change will produce the same output as before but will perform slightly better since it doesn't 
-		have to crawl the POJO tree before serializing the result.
-	</p>
-</div>
-</div><!-- END: 3.1.4 - juneau-marshall-rdf.jmr.RdfDetails.jmr.Namespaces -->
-
-<!-- ==================================================================================================== -->
-
-<h5 class='topic' onclick='toggle(this)'><a href='#juneau-marshall-rdf.jmr.RdfDetails.jmr.UriProperties' id='juneau-marshall-rdf.jmr.RdfDetails.jmr.UriProperties'>3.1.5 - URI Properties</a><span class='update'>updated: <b>9.0.0</b></span></h4>
-<div class='topic'><!-- START: 3.1.5 - juneau-marshall-rdf.jmr.RdfDetails.jmr.UriProperties -->
-<div class='topic'>
-	<p>
-		Bean properties of type <c>java.net.URI</c> or <c>java.net.URL</c> have special meaning to the 
-		RDF serializer.
-		They are interpreted as resource identifiers.
-	</p>
-	<p>
-		In the following code, we're adding 2 new properties.
-		The first property is annotated with <ja>@Beanp</ja> to identify that this property is the resource 
-		identifier for this bean.
-		The second un-annotated property is interpreted as a reference to another resource.
-	</p>
-	<p class='bjava'>	
-	<jk>public class</jk> Person {
-		
-		<jc>// Bean properties</jc>
-		<ja>@Rdf</ja>(beanUri=<jk>true</jk>) 
-		<jk>public</jk> URI <jf>uri</jf>;
-		
-		<jk>public</jk> URI <jf>addressBookUri</jf>;
-	
-		...
-		
-		<jc>// Normal constructor</jc>
-		<jk>public</jk> Person(<jk>int</jk> <jv>id</jv>, String <jv>name</jv>, String <jv>uri</jv>, String <jv>addressBookUri</jv>) <jk>throws</jk> URISyntaxException {
-			<jk>this</jk>.<jf>id</jf> = <jv>id</jv>;
-			<jk>this</jk>.<jf>name</jf> = <jv>name</jv>;
-			<jk>this</jk>.<jf>uri</jf> = <jk>new</jk> URI(<jv>uri</jv>);
-			<jk>this</jk>.<jf>addressBookUri</jf> = <jk>new</jk> URI(<jv>addressBookUri</jv>);
-		}
-	}
-	</p>
-	<p>
-		We alter our code to pass in values for these new properties.
-	</p>
-	<p class='bjava'>
-	<jc>// Create our bean.</jc>
-	Person <jv>person</jv> = <jk>new</jk> Person(1, <js>"John Smith"</js>, <js>"http://sample/addressBook/person/1"</js>, 
-		<js>"http://sample/addressBook"</js>);
-	</p>
-	<p>
-		Now when we run the sample code, we get the following:
-	</p>
-	<p class='bxml'>
-	<xt>&lt;rdf:RDF</xt>
-		<xa>xmlns:rdf</xa>=<xs>"http://www.w3.org/1999/02/22-rdf-syntax-ns#"</xs>
-		<xa>xmlns:j</xa>=<xs>"http://www.apache.org/juneau/"</xs>
-		<xa>xmlns:jp</xa>=<xs>"http://www.apache.org/juneaubp/"</xs>
-		<xa>xmlns:per</xa>=<xs>"http://www.apache.org/person/"</xs><xt>&gt;</xt>
-		<xt>&lt;rdf:Description <b><xa>rdf:about</xa>=<xs>"http://sample/addressBook/person/1"</xs></b>&gt;</xt>
-			<xt>&lt;per:addressBookUri</xt> <xa>rdf:resource</xa>=<xs>"http://sample/addressBook"</xs><xt>/&gt;</xt>
-			<xt>&lt;per:id&gt;</xt>1<xt>&lt;/per:id&gt;</xt>
-			<xt>&lt;per:name&gt;</xt>John Smith<xt>&lt;/per:name&gt;</xt>
-		<xt>&lt;/rdf:Description&gt;</xt>
-	<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 
-		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>
-	<p>
-		The following properties would have produced the same output as before.  
-		Note that the <ja>@URI</ja> annotation is only needed on the second property.
-	</p>
-	<p class='bjava'>
-	<jk>public class</jk> Person {
-		
-		<jc>// Bean properties</jc>
-		<ja>@Rdf</ja>(beanUri=<jk>true</jk>) <jk>public</jk> String <jf>uri</jf>;
-		
-		<ja>@URI</ja> <jk>public</jk> String <jf>addressBookUri</jf>;
-	</p>
-	<p>
-		Also take note of the {@link org.apache.juneau.serializer.Serializer.Builder#uriResolution(UriResolution)},
-		{@link org.apache.juneau.serializer.Serializer.Builder#uriRelativity(UriRelativity)}, and 
-		and {@link org.apache.juneau.serializer.Serializer.Builder#uriContext(UriContext)}
-		settings that can be specified on the serializer to resolve relative and context-root-relative URIs to 
-		fully-qualified URIs.
-	</p>
-	<p>
-		This can be useful if you want to keep the URI authority and context root information out of the bean logic 
-		layer.
-	</p>
-	<p>
-		The following code produces the same output as before but the URIs on the beans are relative.
-	</p>
-	<p class='bjava'>
-	<jc>// Create a new serializer with readable output.</jc>
-	RdfSerializer <jv>serializer</jv> = RdfSerializer.<jsm>create</jsm>()
-		.xmlabbrev()
-		.rdfxml_tab(3);
-		.relativeUriBase(<js>"http://myhost/sample"</js>);
-		.absolutePathUriBase(<js>"http://myhost"</js>)
-		.build();
-		
-	<jc>// Create our bean.</jc>
-	Person <jv>person</jv> = <jk>new</jk> Person(1, <js>"John Smith"</js>, <js>"person/1"</js>, <js>"/"</js>);
-
-	<jc>// Serialize the bean to RDF/XML.</jc>
-	String <jv>rdfXml</jv> = <jv>serializer</jv>.serialize(<jv>person</jv>);
-	</p>		
-</div>
-</div><!-- END: 3.1.5 - juneau-marshall-rdf.jmr.RdfDetails.jmr.UriProperties -->
-
-<!-- ==================================================================================================== -->
-
-<h5 class='topic' onclick='toggle(this)'><a href='#juneau-marshall-rdf.jmr.RdfDetails.jmr.RootProperty' id='juneau-marshall-rdf.jmr.RdfDetails.jmr.RootProperty'>3.1.6 - Root Property</a><span class='update'>updated: <b>9.0.0</b></span></h4>
-<div class='topic'><!-- START: 3.1.6 - juneau-marshall-rdf.jmr.RdfDetails.jmr.RootProperty -->
-<div class='topic'>
-	<p>
-		For all RDF languages, the POJO objects get broken down into simple triplets.
-		Unfortunately, for tree-structured data like the POJOs shown above, this causes the root node of the tree 
-		to become lost.
-		There is no easy way to identify that <c>person/1</c> is the root node in our tree once in triplet 
-		form, and in some cases it's impossible.
-	</p>
-	<p>
-		By default, the {@link org.apache.juneau.jena.RdfParser} class handles this by scanning all the nodes and 
-		identifying the nodes without incoming references.
-		However, this is inefficient, especially for large models.
-		And in cases where the root node is referenced by another node in the model by URL, it's not possible to 
-		locate the root at all.
-	</p>
-	<p>
-		To resolve this issue, the property <del>RdfSerializer.RDF_addRootProperty</del>
-		was introduced.
-		When enabled, this adds a special <c>root</c> attribute to the root node to make it easy to locate 
-		by the parser.
-	</p>
-	<p>
-		To enable, set the <jsf>RDF_addRootProperty</jsf> property to <jk>true</jk> on the serializer:
-	</p>
-	<p class='bjava'>
-	<jc>// Create a new serializer.</jc>
-	RdfSerializer <jv>serializer</jv> = RdfSerializer.<jsm>create</jsm>()
-		.xmlabbrev()
-		.rdfxml_tab(3),
-		.addRootProperty()
-		.build();
-	</p>	
-	<p>
-		Now when we rerun the sample code, we'll see the added <c>root</c> attribute on the root resource.
-	</p>
-	<p class='bxml'>
-	<xt>&lt;rdf:RDF</xt>
-		<xa>xmlns:rdf</xa>=<xs>"http://www.w3.org/1999/02/22-rdf-syntax-ns#"</xs>
-		<xa>xmlns:j</xa>=<xs>"http://www.apache.org/juneau/"</xs>
-		<xa>xmlns:jp</xa>=<xs>"http://www.apache.org/juneaubp/"</xs>
-		<xa>xmlns:per</xa>=<xs>"http://www.apache.org/person/"</xs>
-		<xa>xmlns:mail</xa>=<xs>"http://www.apache.org/mail/"</xs>
-		<xa>xmlns:addr</xa>=<xs>"http://www.apache.org/address/"</xs><xt>&gt;</xt>
-		<xt>&lt;rdf:Description <xa>rdf:about</xa>=<xs>"http://sample/addressBook/person/1"</xs>&gt;</xt>
-			<b><xt>&lt;j:root&gt;</xt>true<xt>&lt;/j:root&gt;</xt></b>
-			<xt>&lt;per:addressBookUri</xt> <xa>rdf:resource</xa>=<xs>"http://sample/addressBook"</xs><xt>/&gt;</xt>
-			<xt>&lt;per:id&gt;</xt>1<xt>&lt;/per:id&gt;</xt>
-			<xt>&lt;per:name&gt;</xt>John Smith<xt>&lt;/per:name&gt;</xt>
-			<xt>&lt;per:addresses&gt;</xt>
-			<xt>&lt;rdf:Seq&gt;</xt>
-				<xt>&lt;rdf:li&gt;</xt>
-					<xt>&lt;rdf:Description <xa>rdf:about</xa>=<xs>"http://sample/addressBook/address/1"</xs>&gt;</xt>
-						<xt>&lt;addr:personUri <xa>rdf:resource</xa>=<xs>"http://sample/addressBook/person/1"</xs>/&gt;</xt>
-						<xt>&lt;addr:id&gt;</xt>1<xt>&lt;/addr:id&gt;</xt>
-						<xt>&lt;mail:street&gt;</xt>100 Main Street<xt>&lt;/mail:street&gt;</xt>
-						<xt>&lt;mail:city&gt;</xt>Anywhereville<xt>&lt;/mail:city&gt;</xt>
-						<xt>&lt;mail:state&gt;</xt>NY<xt>&lt;/mail:state&gt;</xt>
-						<xt>&lt;mail:zip&gt;</xt>12345<xt>&lt;/mail:zip&gt;</xt>
-						<xt>&lt;addr:isCurrent&gt;</xt>true<xt>&lt;/addr:isCurrent&gt;</xt>
-					<xt>&lt;/rdf:Description&gt;</xt>
-				<xt>&lt;/rdf:li&gt;</xt>
-			<xt>&lt;/rdf:Seq&gt;</xt>
-			<xt>&lt;/per:addresses&gt;</xt>
-		<xt>&lt;/rdf:Description&gt;</xt>
-	<xt>&lt;/rdf:RDF&gt;</xt>
-	</p>
-</div>
-</div><!-- END: 3.1.6 - juneau-marshall-rdf.jmr.RdfDetails.jmr.RootProperty -->
-
-<!-- ==================================================================================================== -->
-
-<h5 class='topic' onclick='toggle(this)'><a href='#juneau-marshall-rdf.jmr.RdfDetails.jmr.TypedLiterals' id='juneau-marshall-rdf.jmr.RdfDetails.jmr.TypedLiterals'>3.1.7 - Typed Literals</a><span class='update'>updated: <b>9.0.0</b></span></h4>
-<div class='topic'><!-- START: 3.1.7 - juneau-marshall-rdf.jmr.RdfDetails.jmr.TypedLiterals -->
-<div class='topic'>
-	<p>
-		XML-Schema data-types can be added to non-<c>String</c> literals through the 
-		<del>RdfSerializer.RDF_addLiteralTypes</del>setting.
-	</p>
-	<p>
-		To enable, set the <jsf>RDF_addLiteralTypes</jsf> property to <jk>true</jk> on the serializer:
-	</p>
-	<p class='bjava'>
-	<jc>// Create a new serializer (revert back to namespace autodetection).</jc>
-	RdfSerializer <jv>serializer</jv> = RdfSerializer.<jsm>create</jsm>()
-		.xmlabbrev()
-		.rdfxml_tab(3),
-		.addLiteralTypes()
-		.build();
-	</p>	
-	<p>
-		Now when we rerun the sample code, we'll see the added <c>root</c> attribute on the root resource.
-	</p>
-	<p class='bxml'>
-	<xt>&lt;rdf:RDF</xt>
-			<xa>xmlns:rdf</xa>=<xs>"http://www.w3.org/1999/02/22-rdf-syntax-ns#"</xs>
-			<xa>xmlns:j</xa>=<xs>"http://www.apache.org/juneau/"</xs>
-			<xa>xmlns:jp</xa>=<xs>"http://www.apache.org/juneaubp/"</xs>
-			<xa>xmlns:per</xa>=<xs>"http://www.apache.org/person/"</xs>
-			<xa>xmlns:mail</xa>=<xs>"http://www.apache.org/mail/"</xs>
-			<xa>xmlns:addr</xa>=<xs>"http://www.apache.org/address/"</xs><xt>&gt;</xt>
-		<xt>&lt;rdf:Description <xa>rdf:about</xa>=<xs>"http://sample/addressBook/person/1"</xs>&gt;</xt>
-			<xt>&lt;per:addressBookUri</xt> <xa>rdf:resource</xa>=<xs>"http://sample/addressBook"</xs><xt>/&gt;</xt>
-			<xt>&lt;per:id</xt> <b><xa>rdf:datatype</xa>=<xs>"http://www.w3.org/2001/XMLSchema#int"</xs></b><xt>&gt;</xt>1<xt>&lt;/per:id&gt;</xt>
-			<xt>&lt;per:name&gt;</xt>John Smith<xt>&lt;/per:name&gt;</xt>
-			<xt>&lt;per:addresses&gt;</xt>
-				<xt>&lt;rdf:Seq&gt;</xt>
-					<xt>&lt;rdf:li&gt;</xt>
-						<xt>&lt;rdf:Description <xa>rdf:about</xa>=<xs>"http://sample/addressBook/address/1"</xs>&gt;</xt>
-							<xt>&lt;addr:personUri <xa>rdf:resource</xa>=<xs>"http://sample/addressBook/person/1"</xs>/&gt;</xt>
-							<xt>&lt;addr:id</xt> <b><xa>rdf:datatype</xa>=<xs>"http://www.w3.org/2001/XMLSchema#int"</xs></b>&gt;</xt>1<xt>&lt;/addr:id&gt;</xt>
-							<xt>&lt;mail:street&gt;</xt>100 Main Street<xt>&lt;/mail:street&gt;</xt>
-							<xt>&lt;mail:city&gt;</xt>Anywhereville<xt>&lt;/mail:city&gt;</xt>
-							<xt>&lt;mail:state&gt;</xt>NY<xt>&lt;/mail:state&gt;</xt>
-							<xt>&lt;mail:zip</xt> <b><xa>rdf:datatype</xa>=<xs>"http://www.w3.org/2001/XMLSchema#int"</xs></b>&gt;</xt>12345<xt>&lt;/mail:zip&gt;</xt>
-							<xt>&lt;addr:isCurrent</xt> <b><xa>rdf:datatype</xa>=<xs>"http://www.w3.org/2001/XMLSchema#boolean"</xs></b>&gt;</xt>true<xt>&lt;/addr:isCurrent&gt;</xt>
-						<xt>&lt;/rdf:Description&gt;</xt>
-					<xt>&lt;/rdf:li&gt;</xt>
-				<xt>&lt;/rdf:Seq&gt;</xt>
-			<xt>&lt;/per:addresses&gt;</xt>
-		<xt>&lt;/rdf:Description&gt;</xt>
-		<xt>&lt;/rdf:RDF&gt;</xt>
-	</p>
-</div>
-</div><!-- END: 3.1.7 - juneau-marshall-rdf.jmr.RdfDetails.jmr.TypedLiterals -->
-</div><!-- END: 3.1 - juneau-marshall-rdf.jmr.RdfDetails -->
 </div><!-- END: 3 - juneau-marshall-rdf -->
 
 <!-- ==================================================================================================== -->
@@ -14561,7 +13934,7 @@
 		<jk>private final</jk> String <jf>jdbcUrl</jf>;
 		<jk>private final</jk> String <jf>tableName</jf>, <jf>nameColumn</jf>, <jf>valueColumn</jf>;
 		<jk>private final</jk> Timer <jf>watcher</jf>;
-		<jk>private final</jk> ConcurrentHashMap&låt;String,String> <jf>cache</jf> = <jk>new</jk> ConcurrentHashMap<>();
+		<jk>private final</jk> ConcurrentHashMap&lt;String,String&gt; <jf>cache</jf> = <jk>new</jk> ConcurrentHashMap&lt;&gt;();
 	
 		<jk>protected</jk> SqlStore(ConfigStore.Builder <jv>builder</jv>) {
 			<jk>super</jk>(<jv>builder</jv>);
@@ -14585,7 +13958,7 @@
 	
 		<jk>synchronized void</jk> poll() {
 			<jc>// Loop through all our entries and find the latest values.</jc>
-			<jk>for</jk> (Map.Entry&lt;String,String> <jv>e</jv> : <jf>cache</jf>.entrySet()) {
+			<jk>for</jk> (Map.Entry&lt;String,String&gt; <jv>e</jv> : <jf>cache</jf>.entrySet()) {
 				String <jv>name</jv> = <jv>e</jv>.getKey();
 				String <jv>cacheContents</jv> = <jv>e</jv>.getValue();
 				String <jv>newContents</jv> = getDatabaseValue(<jv>name</jv>);
@@ -14627,7 +14000,7 @@
 	
 			String <jv>currentContents</jv> = read(<jv>name</jv>);
 	
-			<jk>if</jk> (<jv>expectedContents</jv> != <jk>null</jk> && StringUtils.<jsm>ne</jsm>(<jv>currentContents</jv>, <jv>expectedContents</jv>))
+			<jk>if</jk> (<jv>expectedContents</jv> != <jk>null</jk> &amp;&amp; StringUtils.<jsm>ne</jsm>(<jv>currentContents</jv>, <jv>expectedContents</jv>))
 				<jk>return</jk> <jv>currentContents</jv>;
 	
 			update(<jv>name</jv>, <jv>newContents</jv>);
@@ -14929,7 +14302,7 @@
 	<jc>// Perform an arbitrary Predicate check against a bean.</jc>
 	MyBean <jv>myBeans</jv> = ...;
 	<jsm>assertBean</jsm>(<jv>myBeans</jv>)
-		.is(<jv>x</jv> -> <jsm>isValidCheck</jsm>(<jv>x</jv>))
+		.is(<jv>x</jv> -&gt; <jsm>isValidCheck</jsm>(<jv>x</jv>))
 	
 	<jc>// Check that a list of strings has less than 10 entries and the first</jc>
 	<jc>// 3 entries are [foo, bar*, null] using assertion predicates.</jc>
@@ -14940,7 +14313,7 @@
 			.isEach(<jsm>eq</jsm>(<js>"foo"</js>),<jsm>match</jsm>(<js>"bar*"</js>),<jsm>isNull</jsm>())
 	
 	<jc>// Check that an exception is thrown and is the specified type and has the specified message.</jc>
-	<jsm>assertThrown</jsm>(()-><jv>myBean</jv>.runBadMethod())
+	<jsm>assertThrown</jsm>(()-&gt;<jv>myBean</jv>.runBadMethod())
 		.exists()
 		.isExactType(RuntimeException.<jk>class</jk>)
 		.asMessage().is(<js>"foo"</js>);
@@ -15178,7 +14551,7 @@
 	PartList <jv>formData</jv> = 
 		<jsm>partList</jsm>(  <jc>// Arbitrary list of parts</jc>
 			<jsm>stringPart</jsm>(<js>"Name"</js>, <js>"Bill"</js>)   <jc>// Freeform part</jc>
-			<jsm>integerPart</jsm>(<js>"Age"</js>, () -> <jsm>calculateAge</jsm>())   <jc>// Freeform part with supplied value</jc>
+			<jsm>integerPart</jsm>(<js>"Age"</js>, () -&gt; <jsm>calculateAge</jsm>())   <jc>// Freeform part with supplied value</jc>
 		);
 	</p>
 	<p>
@@ -15256,7 +14629,7 @@
 	<h5 class='topic'>HttpResources</h5>
 	<p>
 		The {@link org.apache.juneau.http.HttpResources} class contains convenience static methods for generating HTTP message resources.
-		Returned objects extend from {@link org.apache.juneau.http.resource.HttpResource} which extends from {@link org.apache.juneau.http.HttpEntity} but with
+		Returned objects extend from {@link org.apache.juneau.http.resource.HttpResource} which extends from {@link org.apache.http.HttpEntity} but with
 		additional arbitrary headers.
 	</p>
 	<p>
@@ -15550,7 +14923,7 @@
 	</p>
 	<ul class='javatree'>
 		<li class='jm'>{@link org.apache.juneau.http.header.HeaderList#forEach(Consumer) forEach(Consumer)} / {@link org.apache.juneau.http.header.HeaderList#forEach(String,Consumer) forEach(String,Consumer)} / {@link org.apache.juneau.http.header.HeaderList#forEach(Predicate,Consumer) forEach(Predicate,Consumer)} - Use consumers to process headers.
-		<li class='jm'>{@link org.apache.juneau.http.header.HeaderList#headerIterator() headerIterator()} / {@link org.apache.juneau.http.header.HeaderList#headerIterator(String) headerIterator(String)} - Use an {@link HeaderIterator} to process headers.
+		<li class='jm'>{@link org.apache.juneau.http.header.HeaderList#headerIterator() headerIterator()} / {@link org.apache.juneau.http.header.HeaderList#headerIterator(String) headerIterator(String)} - Use an {@link org.apache.http.HeaderIterator} to process headers.
 		<li class='jm'>{@link org.apache.juneau.http.header.HeaderList#stream() stream()} / {@link org.apache.juneau.http.header.HeaderList#stream(String) stream(String)} - Use a stream.
 	</ul>
 	<p>
@@ -15573,7 +14946,7 @@
 	</p>
 
 	<p>
-		By default, header names are treated as case-insensitive.  This can be changed using the {@link org.apache.juneau.http.header.HeaderList.Builder#caseSensitive() caseSensitive()}
+		By default, header names are treated as case-insensitive.  This can be changed using the {@link org.apache.juneau.http.header.HeaderList#caseSensitive(boolean) caseSensitive(boolean)}
 		method.
 	</p>
 
@@ -15705,7 +15078,7 @@
 	</p>
 	<ul class='javatree'>
 		<li class='jm'>{@link org.apache.juneau.http.part.PartList#forEach(Consumer) forEach(Consumer)} / {@link org.apache.juneau.http.part.PartList#forEach(String,Consumer) forEach(String,Consumer)} / {@link org.apache.juneau.http.part.PartList#forEach(Predicate,Consumer) forEach(Predicate,Consumer)} - Use consumers to process parts.
-		<li class='jm'>{@link org.apache.juneau.http.part.PartList#partIterator() partIterator()} / {@link org.apache.juneau.http.part.PartList#partIterator(String) partIterator(String)} - Use an {@link PartIterator} to process parts.
+		<li class='jm'>{@link org.apache.juneau.http.part.PartList#partIterator() partIterator()} / {@link org.apache.juneau.http.part.PartList#partIterator(String) partIterator(String)} - Use an {@link org.apache.juneau.http.part.PartIterator} to process parts.
 		<li class='jm'>{@link org.apache.juneau.http.part.PartList#stream() stream()} / {@link org.apache.juneau.http.part.PartList#stream(String) stream(String)} - Use a stream.
 	</ul>
 	<p>
@@ -16447,7 +15820,6 @@
 		<li class='jic'>{@link org.apache.juneau.rest.config.BasicSimpleJsonConfig}
 		<li class='jic'>{@link org.apache.juneau.rest.config.BasicOpenApiConfig}
 		<li class='jic'>{@link org.apache.juneau.rest.config.BasicUniversalConfig}
-		<li class='jic'>{@link org.apache.juneau.rest.config.BasicUniversalJenaConfig}
 	</ul>
 	<p>
 		For example, if you want to provide a resource that supports all languages in Juneau, 
@@ -16959,7 +16331,7 @@
 						<li class='jc'>{@link org.apache.juneau.encoders.EncoderSet}
 						<li class='jic'>{@link org.apache.juneau.cp.FileFinder}
 						<li class='jc'>{@link org.apache.juneau.jsonschema.JsonSchemaGenerator}
-						<li class='jc'>{@link java.util.Logger}
+						<li class='jc'>{@link java.util.logging.Logger}
 						<li class='jc'>{@link org.apache.juneau.rest.stats.MethodExecStore}
 						<li class='jc'>{@link org.apache.juneau.parser.ParserSet}
 						<li class='jc'>{@link org.apache.juneau.rest.RestChildren}
@@ -17387,7 +16759,7 @@
 <div class='topic'><!-- START: 8.3.6 - juneau-rest-server.jrs.RestOpAnnotatedMethods.jrs.Matchers -->
 <div class='topic'>
 	<p>
-		{@link org.apache.juneau.rest.RestMatcher RestMatchers} are used to allow multiple Java methods to be 
+		{@link org.apache.juneau.rest.matcher.RestMatcher RestMatchers} are used to allow multiple Java methods to be 
 		tied to the same HTTP method and path but differentiated by some request attribute such as a specific 
 		header value.
 	</p>
@@ -18514,7 +17886,6 @@
 				<li class='jic'>{@link org.apache.juneau.rest.config.BasicSimpleJsonConfig}
 				<li class='jic'>{@link org.apache.juneau.rest.config.BasicOpenApiConfig}
 				<li class='jic'>{@link org.apache.juneau.rest.config.BasicUniversalConfig}
-				<li class='jic'>{@link org.apache.juneau.rest.config.BasicUniversalJenaConfig}
 			</ul>
 		</li>
 	</ul>
@@ -18596,7 +17967,6 @@
 		<li class='ja'>{@link org.apache.juneau.oapi.annotation.OpenApiConfig OpenApiConfig}
 		<li class='ja'>{@link org.apache.juneau.parser.annotation.ParserConfig ParserConfig}
 		<li class='ja'>{@link org.apache.juneau.plaintext.annotation.PlainTextConfig PlainTextConfig}
-		<li class='ja'>{@link org.apache.juneau.jena.annotation.RdfConfig RdfConfig}
 		<li class='ja'>{@link org.apache.juneau.serializer.annotation.SerializerConfig SerializerConfig}
 		<li class='ja'>{@link org.apache.juneau.soap.annotation.SoapXmlConfig SoapXmlConfig}
 		<li class='ja'>{@link org.apache.juneau.uon.annotation.UonConfig UonConfig}
@@ -18683,8 +18053,8 @@
 	<jk>public class</jk> SpringBootAppConfig {
 			
 		<ja>@Bean</ja>
-		<jk>public</jk> FilterRegistrationBean&lt;HiddenHttpMethodFilter> registration(HiddenHttpMethodFilter <jv>filter</jv>) {
-			FilterRegistrationBean&lt;HiddenHttpMethodFilter> <jv>reg</jv> = <jk>new</jk> FilterRegistrationBean&gt;>(<jv>filter</jv>);
+		<jk>public</jk> FilterRegistrationBean&lt;HiddenHttpMethodFilter&gt; registration(HiddenHttpMethodFilter <jv>filter</jv>) {
+			FilterRegistrationBean&lt;HiddenHttpMethodFilter&gt; <jv>reg</jv> = <jk>new</jk> FilterRegistrationBean&lt;&gt;(<jv>filter</jv>);
 			<jv>reg</jv>.setEnabled(<jk>false</jk>);
 			<jk>return</jk> <jv>reg</jv>;
 		}
@@ -19464,7 +18834,7 @@
 		</tr>
 		<tr class='dark'>
 			<td>{@link org.apache.juneau.rest.vars.UrlVar}</td>
-			<td class='code'>$U{uri}></td>
+			<td class='code'>$U{uri}</td>
 			<td style='text-align:center;font-weight:bold'>no</td>
 			<td style='text-align:center;font-weight:bold'>yes</td>
 			<td class='code'>$U{servlet:/foo}</td>
@@ -19499,7 +18869,7 @@
 	<h5 class='figure'>Example:</h5>
 	<p class='bjava'>
 	<jc>// Defined a variable that simply wrapps all strings inside [] brackets.</jc>
-	<jc>// e.g. "$BRACKET{foobar}" -> "[foobar]"</jc>
+	<jc>// e.g. "$BRACKET{foobar}" -&gt; "[foobar]"</jc>
 	<jk>public class</jk> BracketVar <jk>extends</jk> SimpleVar {
 		
 		<jk>public</jk> BracketVar() {
@@ -19697,7 +19067,7 @@
 		<jc>// Override the nav links for the swagger page.</jc>
 		navlinks={
 			<js>"back: servlet:/"</js>,
-			<js>"json: servlet:/?Accept=text/json&plainText=true"</js>
+			<js>"json: servlet:/?Accept=text/json&amp;plainText=true"</js>
 		},
 		<jc>// Never show aside contents of page inherited from class.</jc>
 		aside=<js>"NONE"</js>
@@ -20138,7 +19508,7 @@
 				+ <js>"',"</js>
 				+ <js>"type:'array',"</js>
 				+ <js>"collectionFormat:'csv',"</js>
-				+ <js>"x-examples:{example:'?s=Bill*,birthDate>2000'}"</js>
+				+ <js>"x-examples:{example:'?s=Bill*,birthDate&gt;2000'}"</js>
 			+ <js>"},"</js>
 			+ <js>"{"</js>
 				+ <js>"in:'query',"</js>
@@ -21173,7 +20543,7 @@
 		<li>
 			HTTP request/response bodies are cached in memory for logging purposes.
 		<li>
-			HTTP requests/responses are logged to the registered {@link org.apache.juneau.rest.logging.RestLogger}.
+			HTTP requests/responses are logged to the registered {@link org.apache.juneau.rest.logger.CallLogger}.
 	</ul>
 	<p>
 		The possible annotation values are:
@@ -21234,11 +20604,11 @@
 		HTTP calls can be logged with the following levels of granularity:
 	</p>	
 	<ul class='javatree'>
-		<li class='je'>{@link org.apache.juneau.rest.logging.RestLoggingDetail}
+		<li class='je'>{@link org.apache.juneau.rest.logger.CallLoggingDetail}
 			<ul class='javatreec'>
-				<li class='jf'>{@link org.apache.juneau.rest.logging.RestLoggingDetail#STATUS_LINE STATUS_LINE}
-				<li class='jf'>{@link org.apache.juneau.rest.logging.RestLoggingDetail#HEADER HEADER}
-				<li class='jf'>{@link org.apache.juneau.rest.logging.RestLoggingDetail#ENTITY ENTITY}
+				<li class='jf'>{@link org.apache.juneau.rest.logger.CallLoggingDetail#STATUS_LINE STATUS_LINE}
+				<li class='jf'>{@link org.apache.juneau.rest.logger.CallLoggingDetail#HEADER HEADER}
+				<li class='jf'>{@link org.apache.juneau.rest.logger.CallLoggingDetail#ENTITY ENTITY}
 			</ul>
 		</li>
 	</ul>
@@ -21290,8 +20660,8 @@
 	=== END ===================================================================
 	</p>
 	<p>
-		The interface responsible for generating the log entries is {@link org.apache.juneau.rest.logging.RestLogger}
-		and the default is {@link org.apache.juneau.rest.logging.BasicRestLogger} which produces the output above.  It
+		The interface responsible for generating the log entries is {@link org.apache.juneau.rest.logger.CallLogger}
+		and the default is {@link org.apache.juneau.rest.logger.BasicCallLogger} which produces the output above.  It
 		can be changed through any of the following:
 	</p>
 	<ul class='javatree'>
@@ -21318,13 +20688,13 @@
 		.beanStore(<jv>beanStore</jv>)  <jc>// Allow injected beans in constructor</jc>
 		.normalRules(  <jc>// Rules when debugging is not enabled</jc>
 			RestLoggerRule.<jsm>create</jsm>()  <jc>// Log 500+ errors with status-line and header information</jc>
-				.statusFilter(<jv>x</jv> -> <jv>x</jv> >= 500)
+				.statusFilter(<jv>x</jv> -&gt; <jv>x</jv> &gt;= 500)
 				.level(<jsf>SEVERE</jsf>)
 				.requestDetail(<jsf>HEADER</jsf>)
 				.responseDetail(<jsf>HEADER</jsf>)
 				.build(),
 			RestLoggerRule.<jsm>create</jsm>()  <jc>// Log 400-500 errors with just status-line information</jc>
-				.statusFilter(<jv>x</jv> -> <jv>x</jv> >= 400)
+				.statusFilter(<jv>x</jv> -&gt; <jv>x</jv> &gt;= 400)
 				.level(<jsf>WARNING</jsf>)
 				.requestDetail(<jsf>STATUS_LINE</jsf>)
 				.responseDetail(<jsf>STATUS_LINE</jsf>)
@@ -21358,10 +20728,10 @@
 		</li>
 	</ul>
 	<ul class='notes'>
-		<li class='note'>The {@link org.apache.juneau.rest.logging.BasicTestRestLogger} class is useful for testing and
+		<li class='note'>The {@link org.apache.juneau.rest.logger.BasicTestCallLogger} class is useful for testing and
 			allows you to suppress logging when testing error conditions by passing in a <c>noTrace=true</c> query parameter
 			or <c>No-Trace: true</c> header on requests.  
-		<li class='note'>{@link org.apache.juneau.rest.debug.DebugEnablement}, {@link org.apache.juneau.rest.logging.RestLogger}, and 
+		<li class='note'>{@link org.apache.juneau.rest.debug.DebugEnablement}, {@link org.apache.juneau.rest.logger.CallLogger}, and 
 			{@link org.apache.juneau.rest.stats.ThrownStore} can all be defined globally as Spring beans in a Spring Boot environment.
 	</ul>
 </div>
@@ -21417,7 +20787,7 @@
 			<td>Precondition Failed</td>
 			<td>
 				A path pattern matched but no Java methods were found that were not rejected by 
-				{@link org.apache.juneau.rest.RestMatcher matchers}
+				{@link org.apache.juneau.rest.matcher.RestMatcher matchers}
 			</td>
 		</tr>
 		<tr>
@@ -22610,8 +21980,8 @@
 		}
 	
 		<jc>// Our root REST bean.
-		// Note that this must extend from {@link SpringRestServlet} to allow use of injection.
-		// All REST objects are attached to this bean using the {@link Rest#children()} annotation.</jc>
+		// Note that this must extend from {@link org.apache.juneau.rest.springboot.SpringRestServlet} to allow use of injection.
+		// All REST objects are attached to this bean using the {@link org.apache.juneau.rest.annotation.Rest#children()} annotation.</jc>
 		<ja>@Bean</ja>
 		<jk>public</jk> RootResources getRootResources() {
 			<jk>return new</jk> RootResources();
@@ -23095,7 +22465,7 @@
 	<h5 class='figure'>Example:</h5>
 	<p class='bjava'>
 	<jc>// Create a client that adds a dynamic Authorization header to every request.</jc>
-	RestClient <jv>client</jv> = RestClient.<jsm>create</jsm>().header(<js>"Authorization"</js>, ()->getMyAuthToken()).build();
+	RestClient <jv>client</jv> = RestClient.<jsm>create</jsm>().header(<js>"Authorization"</js>, ()-&gt;getMyAuthToken()).build();
 	</p>
 	
 	<ul class='seealso'>
@@ -23189,7 +22559,7 @@
 			<li class='jm'><c>{@link org.apache.juneau.rest.client.RestResponse#getStatusLine() getStatusLine()} <jk>returns</jk> {@link org.apache.http.StatusLine}</c>
 			<li class='jm'><c>{@link org.apache.juneau.rest.client.RestResponse#getStatusCode() getStatusCode()} <jk>returns</jk> <jk>int</jk></c>
 			<li class='jm'><c>{@link org.apache.juneau.rest.client.RestResponse#getReasonPhrase() getReasonPhrase()} <jk>returns</jk> String</c>
-			<li class='jm'><c>{@link org.apache.juneau.rest.client.RestResponse#assertStatus() assertStatus()} <jk>returns</jk> {@link org.apache.juneau.rest.client.RestResponseStatusLineAssertion}</c>
+			<li class='jm'><c>{@link org.apache.juneau.rest.client.RestResponse#assertStatus() assertStatus()} <jk>returns</jk> {@link org.apache.juneau.rest.client.assertion.FluentResponseStatusLineAssertion}</c>
 		</ul>
 	</ul>
 	
@@ -23234,7 +22604,7 @@
 	<jc>// Status assertion using a predicate.</jc>
 	String <jv>content2</jv> = <jv>client</jv>.get(<jsf>URI</jsf>)
 		.run()
-		.assertStatus().asCode().is(<jv>x</jv> -> <jv>x</jv>&lt;400)
+		.assertStatus().asCode().is(<jv>x</jv> -&gt; <jv>x</jv>&lt;400)
 		.getContent().asString();
 	</p>
 </div>
@@ -23296,7 +22666,7 @@
 			<li class='jm'><c>{@link org.apache.juneau.rest.client.ResponseHeader#as(Class) as(Class&lt;T&gt;)} <jk>returns</jk> T</c>
 			<li class='jm'><c>{@link org.apache.juneau.rest.client.ResponseHeader#asMatcher(Pattern) asMatcher(Pattern)} <jk>returns</jk> {@link java.util.regex.Matcher}</c>
 			<li class='jm'><c>{@link org.apache.juneau.rest.client.ResponseHeader#asMatcher(String) asMatcher(String)} <jk>returns</jk> {@link java.util.regex.Matcher}</c>
-			<li class='jm'><c>{@link org.apache.juneau.rest.client.ResponseHeader#asHeader(Class) asHeader(Class&lt;T <jk>extends</jk> BasicHeader&gt; c)} <jk>returns</jk> {@link org.apache.juneau.http.BasicHeader}</c>
+			<li class='jm'><c>{@link org.apache.juneau.rest.client.ResponseHeader#asHeader(Class) asHeader(Class&lt;T <jk>extends</jk> BasicHeader&gt; c)} <jk>returns</jk> {@link org.apache.juneau.http.header.BasicHeader}</c>
 			<li class='jm'><c>{@link org.apache.juneau.rest.client.ResponseHeader#asStringHeader() asStringHeader()} <jk>returns</jk> {@link org.apache.juneau.http.header.BasicIntegerHeader}</c>
 			<li class='jm'><c>{@link org.apache.juneau.rest.client.ResponseHeader#asIntegerHeader() asIntegerHeader()} <jk>returns</jk> {@link org.apache.juneau.http.header.BasicStringHeader}</c>
 			<li class='jm'><c>{@link org.apache.juneau.rest.client.ResponseHeader#asLongHeader() asLongHeader()} <jk>returns</jk> {@link org.apache.juneau.http.header.BasicLongHeader}</c>
@@ -23554,7 +22924,7 @@
 <div class='topic'>
 	<p>
 		The {@link org.apache.juneau.rest.client.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.
+		the existing {@link org.apache.http.HttpRequestInterceptor} and {@link org.apache.http.HttpResponseInterceptor} APIs.
 	</p>
 	
 	<ul class='javatree'>
@@ -24810,7 +24180,7 @@
 	<jv>bean</jv> = RestClient
 		.<jsm>create</jsm>()
 		.simpleJson()
-		.logRequests(DetailLevel.<jsf>FULL</jsf>, Level.<jsf>SEVERE</jsf>, (<jv>req</jv>,<jv>res</jv>)-><jv>req</jv>.getUri().endsWith(<js>"/bean"</js>))
+		.logRequests(DetailLevel.<jsf>FULL</jsf>, Level.<jsf>SEVERE</jsf>, (<jv>req</jv>,<jv>res</jv>)-&gt;<jv>req</jv>.getUri().endsWith(<js>"/bean"</js>))
 		.logToConsole()
 		.build()
 		.post(<js>"http://localhost/bean"</js>, <jv>bean</jv>)
@@ -25380,7 +24750,7 @@
 	<hr>
 	<p>
 		The {@link org.apache.juneau.rest.mock.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
+		directly on the underlying {@link javax.servlet.http.HttpServletRequest} object.  The following example shows how
 		this can be used to directly set roles on the request object to perform security testing.
 	</p>
 	<h5 class='figure'>Example:</h5>
@@ -26040,7 +25410,7 @@
 		restart -- Restarts service
 		help -- Commands help
 	
-	> 			
+	&gt; 			
 	</p>
 	<p>
 		The builder methods for controlling the console are as follows:
@@ -26096,7 +25466,7 @@
 		</li>
 	</ul>
 	<p>
-		By default, the console input and output are taken from {@link java.lang.System.in} and {@link java.lang.System.out}.
+		By default, the console input and output are taken from {@link java.lang.System#in} and {@link java.lang.System#out}.
 		These can be overridden using the {@link org.apache.juneau.microservice.Microservice.Builder#console(Scanner,PrintWriter) console(Scanner,PrintWriter)} method.
 	</p>
 </div>
@@ -26527,7 +25897,7 @@
 	</p>	
 	<p>
 		The most common usage for the configuration file is to reference values using the {@link org.apache.juneau.config.vars.ConfigVar $C} variable in annotations.
-		For example, the {@link org.apache.juneau.rest.config.BasicRestConfig} interface that defines the annotations that control the look-and-feel of
+		For example, the {@link org.apache.juneau.rest.config.DefaultConfig} interface that defines the annotations that control the look-and-feel of
 		classes that extend from {@link org.apache.juneau.rest.servlet.BasicRestServlet} use several <c>$C</c> variables to externalize values:
 	</p>
 	<p class='bjava'>
@@ -26635,8 +26005,8 @@
 			</p>
 			<p>
 				Additional user-defined variables at the servlet level can be defined by adding a  
-				{@link org.apache.juneau.rest.annotation.HookEvent#INIT} hook method
-				and using the {@del org.apache.juneau.rest.RestContext.Builder#vars(Class...)} method.
+				{@link org.apache.juneau.rest.annotation.RestInit} hook method
+				and using the <del> org.apache.juneau.rest.RestContext.Builder.vars(Class...)</del> method.
 			</p>
 		</li>
 		<li class='jm'>
@@ -26685,7 +26055,7 @@
 			</p>
 			<p>
 				Additional user-defined variables can be defined at this level by overriding the 
-				{@del org.apache.juneau.rest.RestContext.Builder#vars(Class...)} method.
+				<del> org.apache.juneau.rest.RestContext.Builder.vars(Class...)</del> method.
 			</p>
 		</li>
 	</ul>
@@ -26862,7 +26232,7 @@
 		<cv>&lt;/a&gt;</cv>
 	</p>
 	<p>
-		The {@link org.apache.juneau.rest.config.BasicRestConfig} interface (which defines the default settings for {@link org.apache.juneau.rest.servlet.BasicRestServlet} 
+		The {@link org.apache.juneau.rest.config.DefaultConfig} interface (which defines the default settings for {@link org.apache.juneau.rest.servlet.BasicRestServlet} 
 		pulls in this information using {@link org.apache.juneau.config.vars.ConfigVar $C} and {@link org.apache.juneau.rest.vars.UrlVar $U} variables:
 	</p>
 	<p class='bjava'>
@@ -27238,11 +26608,11 @@
 	
 		<xt>&lt;New</xt> <xa>id</xa>=<xs>"context"</xs> <xa>class</xa>=<xs>"org.eclipse.jetty.servlet.ServletContextHandler"</xs><xt>&gt;</xt>
 			<xt>&lt;Set</xt> <xa>name</xa>=<xs>"contextPath"</xs><xt>&gt;/&lt;/Set&gt;</xt>
-			<xc>&lt;!-- Optionally specify your servlets here -->
+			<xc>&lt;!-- Optionally specify your servlets here --&gt;
 			&lt;!--Call name="addServlet"&gt;
 				&lt;Arg&gt;org.apache.juneau.microservice.sample.RootResources&lt;/Arg&gt;
 				&lt;Arg&gt;/*&lt;/Arg&gt;
-			&lt;/Call--></xc>
+			&lt;/Call--&gt;</xc>
 			<xt>&lt;Set</xt> <xa>name</xa>=<xs>"sessionHandler"</xs><xt>&gt;</xt>
 				<xt>&lt;New</xt> <xa>class</xa>=<xs>"org.eclipse.jetty.server.session.SessionHandler"</xs><xt>/&gt;</xt>
 			<xt>&lt;/Set&gt;</xt>
@@ -27267,8 +26637,8 @@
 			<xc>&lt;!-- Param 0: org.eclipse.jetty.server.RequestLogWriter --&gt;</xc>
 			<xt>&lt;Arg&gt;</xt>
 				<xt>&lt;New</xt> <xa>class</xa>=<xs>"org.eclipse.jetty.server.RequestLogWriter"</xs><xt>&gt;</xt>
-					<xt>&lt;Set</xt> <xa>name</xa>=<xs>"append"</xs><xt>&gt;</xt>false<xt>&lt;/Set&gt</xt>;
-					<xt>&lt;Set</xt> <xa>name</xa>=<xs>"filename"</xs><xt>&gt;&lt;Property</xt> <xa>name</xa>=<xs>"jetty.logs"</xs> <xa>default</xa>=<xs>"$C{Logging/logDir,logs}"</xs> <xt>/&gt;</xt>/jetty-requests.log<xt>&lt;/Set&gt</xt>;
+					<xt>&lt;Set</xt> <xa>name</xa>=<xs>"append"</xs><xt>&gt;</xt>false<xt>&lt;/Set&gt;</xt>;
+					<xt>&lt;Set</xt> <xa>name</xa>=<xs>"filename"</xs><xt>&gt;&lt;Property</xt> <xa>name</xa>=<xs>"jetty.logs"</xs> <xa>default</xa>=<xs>"$C{Logging/logDir,logs}"</xs> <xt>/&gt;</xt>/jetty-requests.log<xt>&lt;/Set&gt;</xt>;
 					<xt>&lt;Set</xt> <xa>name</xa>=<xs>"filenameDateFormat"</xs><xt>&gt;</xt>yyyy_MM_dd<xt>&lt;/Set&gt;</xt>
 					<xt>&lt;Set</xt> <xa>name</xa>=<xs>"retainDays"</xs><xt>&gt;</xt>90<xt>&lt;/Set&gt;</xt>
 					<xt>&lt;Set</xt> <xa>name</xa>=<xs>"timeZone"</xs><xt>&gt;</xt>GMT<xt>&lt;/Set&gt;</xt>
@@ -27305,7 +26675,7 @@
 		your new microservice.
 	</p>
 	<p>
-		Go to <b>Run -> Run Configurations -> Java Application -> my-jetty-microservice</b> and click <b>Run</b>.
+		Go to <b>Run -&gt; Run Configurations -&gt; Java Application -&gt; my-jetty-microservice</b> and click <b>Run</b>.
 		In your console view, you should see the following output:
 	</p>
 	<p class='bconsole'>
@@ -27317,7 +26687,7 @@
 		restart -- Restarts service
 		help -- Commands help
 	
-	> 			
+	&gt; 			
 	</p>
 	<p>
 		Now open your browser and point to <l>http://localhost:10000</l>.  
@@ -27373,7 +26743,7 @@
 		restart -- Restarts service
 		help -- Commands help
 	
-	> 			
+	&gt; 			
 	</p>
 	<p>
 		If you get this error message: <code class='snippet'>java.net.BindException: Address already in use</code>, 
@@ -27551,7 +26921,7 @@
 		your new microservice.
 	</p>
 	<p>
-		Go to <b>Run -> Run Configurations -> Java Application -> my-springboot-microservice</b> and click <b>Run</b>.
+		Go to <b>Run -&gt; Run Configurations -&gt; Java Application -&gt; my-springboot-microservice</b> and click <b>Run</b>.
 		In your console view, you should see the following output:
 	</p>
 	<p class='bconsole'>
@@ -27739,7 +27109,7 @@
 		 * Adds a pet to the database.
 		 *
 		 * @param pet The pet data to add to the database.
-		 * @return {@link Ok} if successful.
+		 * @return Ok if successful.
 		 * @throws IdConflict ID already in use.
 		 * @throws NotAcceptable Unsupported <c>Accept</c> header specified.
 		 * @throws UnsupportedMediaType Unsupported <c>Content-Type</c> header specified.
@@ -27756,7 +27126,7 @@
 		 * Updates a pet in the database.
 		 *
 		 * @param pet The pet data to add to the database.
-		 * @return {@link Ok} if successful.
+		 * @return Ok if successful.
 		 * @throws IdNotFound ID not found.
 		 * @throws NotAcceptable Unsupported <c>Accept</c> header specified.
 		 * @throws UnsupportedMediaType Unsupported <c>Content-Type</c> header specified.
@@ -27800,7 +27170,7 @@
 		 *
 		 * @param apiKey Security key.
 		 * @param petId ID of pet to delete.
-		 * @return {@link Ok} if successful.
+		 * @return Ok if successful.
 		 * @throws IdNotFound Pet not found.
 		 * @throws NotAcceptable Unsupported <c>Accept</c> header specified.
 		 */</jd>
@@ -27824,7 +27194,7 @@
 		<jd>/**
 		 * Deletes all pets in the database.
 		 *
-		 * @return {@link Ok} if successful.
+		 * @return Ok if successful.
 		 */</jd>
 		<ja>@RemoteDelete</ja>(<js>"/pet"</js>)
 		<jk>public</jk> Ok deleteAllPets();
@@ -27982,7 +27352,7 @@
 	
 		<ja>@Bean</ja>
 		<jk>public</jk> ServletRegistrationBean<Servlet> getRootServlet(RootResources <jv>rootResources</jv>) {
-			<jk>return new</jk> ServletRegistrationBean<>(<jv>rootResources</jv>, <js>"/*"</js>);
+			<jk>return new</jk> ServletRegistrationBean&lt;&gt;(<jv>rootResources</jv>, <js>"/*"</js>);
 		}
 	}
 	</p>
@@ -28739,8 +28109,8 @@
 		<li>
 			Various default filters provided:
 			<ul>
-				<li>byte[]&lt;-->Base64 encoded strings</li>
-				<li>Date/Calendar&lt;-->ISO8601/RFC822/Long</li>
+				<li>byte[]&lt;--&gt;Base64 encoded strings</li>
+				<li>Date/Calendar&lt;--&gt;ISO8601/RFC822/Long</li>
 			</ul>
 		</li>
 		<li>
@@ -29000,7 +28370,7 @@
 			Improvements to Javadocs.
 		</li>
 		<li>
-			Improved {@link org.apache.juneau.utils.PojoQuery} support.
+			Improved <del>PojoQuery</del> support.
 		</li>
 	</ul>
 	<h5 class='topic w800'>REST client updates</h5>
@@ -29042,7 +28412,7 @@
 			</ul>
 		</li>
 		<li>
-			HTTP response content POJOs can now simply be returned from methods instead of calling <del>RestResponse#setOutput(Object)</del>.		
+			HTTP response content POJOs can now simply be returned from methods instead of calling <del>RestResponse.setOutput(Object)</del>.		
 		</li>	
 	</ul>
 </div>
@@ -29099,7 +28469,7 @@
 		<li>New <del>RestMethod.serializers() @RestMethod(serializers)</del>and <del>RestMethod.parsers() @RestMethod(parsers)</del>annotations.</li>
 		<li>New <del>RestMethod.properties() @RestMethod(properties)</del> annotation.</li>
 		<li>New <del>@RestMethod(defaultRequestHeaders)</del>annotation.</li>
-		<li>New <del>RestMethod.matchers() @RestMethod(matchers)</del> annotation and {@link org.apache.juneau.rest.RestMatcher} class.</li>
+		<li>New <del>RestMethod.matchers() @RestMethod(matchers)</del> annotation and <del>RestMatcher</del> class.</li>
 		<li><c>Readers</c> and <c>InputStreams</c> can be specified on <del>@Content</del> annotated parameters.</li>
 		<li>New <del>@HasParam</del>annotation.</li>
 		<li>Full RFC2616 support for matching <c>Accept</c> headers to serializers.</li>		
@@ -29132,7 +28502,7 @@
 		<li>New <c>RestServletProperties.REST_useStackTraceHashes</c> property to prevent the same stack trace from being logged multiple times.</li>
 		<li>New <c>RestServletProperties.REST_renderResponseStackTraces</c> property for preventing stack traces in responses for security reasons.</li>
 		<li>New overridable <c>RestServlet.onError(HttpServletRequest,HttpServletResponse,RestException,boolean)</c> and <del>RestServlet.onSuccess(RestRequest,RestResponse,long)</del>methods for plugging in your own logging and peformance monitoring.</li>
-		<li>Eliminated <c>RestServlet.getInitParams()</c> method, since it's now redundant with <del>RestServlet#getProperties()</del>.</li>
+		<li>Eliminated <c>RestServlet.getInitParams()</c> method, since it's now redundant with <del>RestServlet.getProperties()</del>.</li>
 		<li>Header parameters passed as URL parameters are now case-insensitive.</li>			
 	</ul>
 </div>
@@ -29291,7 +28661,7 @@
 			<ul>
 				<li>Cleaner class structure.</li>
 				<li>Improved <del>BeanFilter</del> class for defining property filters on beans.</li>
-				<li>Improved {@link org.apache.juneau.utils.PojoQuery} class for defining filters on objects (previously called <c>ObjectFilter</c>).</li>
+				<li>Improved <del>PojoQuery</del> class for defining filters on objects (previously called <c>ObjectFilter</c>).</li>
 	       		</ul>
 	       	</li>
 	       	<li>
@@ -29331,7 +28701,7 @@
 			<c>JsonMap</c> and <c>JsonList</c> changed to <del>ObjectMap</del> and <del>ObjectList</del> to better reflect that they're not limited to just JSON support.
 	   		</li>
 	   		<li>
-			Renamed <c>PojoSwap</c> to {@link org.apache.juneau.utils.PojoQuery} to not confuse it with the new Filter API.
+			Renamed <c>PojoSwap</c> to <del>PojoQuery</del> to not confuse it with the new Filter API.
 		</li>
 	</ul>
 	<h5 class='topic w800'>REST server API changes</h5>
@@ -29425,7 +28795,7 @@
 		Juno 5.0.0.18 is a moderate update.
 	</p>
 	<p>
-		The biggest change is the introduction of the {@link org.apache.juneau.jena.RdfSerializer} class that uses Jena to generate RDF/XML, RDF/XML-ABBREV, N-Tuple, N3, and Turtle output.
+		The biggest change is the introduction of the <del>RdfSerializer</del> class that uses Jena to generate RDF/XML, RDF/XML-ABBREV, N-Tuple, N3, and Turtle output.
 	</p>
 	<p>
 		This code should be considered prototype-quality, and subject to change in the future.<br>  
@@ -29457,12 +28827,12 @@
 		<li>
 			New methods on <del>RestServlet</del>:
 			<ul>
-				<li><del>RestServlet#onPreCall(RestRequest)</del></li>
-				<li><del>RestServlet#onPostCall(RestRequest,RestResponse)</del></li>
+				<li><del>RestServlet.onPreCall(RestRequest)</del></li>
+				<li><del>RestServlet.onPostCall(RestRequest,RestResponse)</del></li>
 			</ul>
 		</li>
 		<li>
-			<jsf>TRIM_NULLS</jsf> setting changed to <del>SerializerContext#SERIALIZER_trimNullProperties</del>.<br>
+			<jsf>TRIM_NULLS</jsf> setting changed to <del>SerializerContext.SERIALIZER_trimNullProperties</del>.<br>
 			New property default is <jk>true</jk>. 
 			Only applies to bean properties, not map or collection entries.
 		</li>
@@ -29481,11 +28851,11 @@
 	<h5 class='topic w800'>Core API changes</h5>
 	<ul class='spaced-list'>
 		<li>
-			New Jena-based {@link org.apache.juneau.jena.RdfSerializer} for serializing POJOs to RDF/XML, RDF/XML-ABBREV, N-Triple, Turtle, and N3.<br>
+			New Jena-based <del>RdfSerializer</del> for serializing POJOs to RDF/XML, RDF/XML-ABBREV, N-Triple, Turtle, and N3.<br>
 			Serializes ANY POJOs to RDF, even simple objects and primitives.
 		</li>
 		<li>
-			New Jena-based {@link org.apache.juneau.jena.RdfParser} for parsing RDF/XML, RDF/XML-ABBREV, N3, Turtle, and N-Triple back into POJOs.
+			New Jena-based <del>RdfParser</del> for parsing RDF/XML, RDF/XML-ABBREV, N3, Turtle, and N-Triple back into POJOs.
 		</li>
 		<li>
 			<del>XmlSerializerContext.XML_autoDetectNamespaces</del>default changed to <jk>true</jk>.<br>
@@ -29671,7 +29041,7 @@
 	<ul>
 		<li>New {@link org.apache.juneau.json JSON Support Overview} document.</li>
 		<li>New {@link org.apache.juneau.xml XML Support Overview} document.</li>
-		<li>New {@link org.apache.juneau.jena RDF Languages Support Overview} document.</li>
+		<li>New <del>RDF Languages Support Overview</del> document.</li>
 		<li>New {@link org.apache.juneau.dto.atom ATOM Support Overview} document.</li>
 	</ul>
 </div>
@@ -29752,7 +29122,7 @@
 	  			<del>BasicRestServlet</del> now includes {@link org.apache.juneau.plaintext.PlainTextSerializer} and {@link org.apache.juneau.plaintext.PlainTextParser} for plain-text support.
 	  		</li>
 	  		<li>
-			Child resources now render on default <c>OPTIONS</c> pages through new method <del>ResourceOptions#getChildren()</del>.
+			Child resources now render on default <c>OPTIONS</c> pages through new method <del>ResourceOptions.getChildren()</del>.
 		</li>
 		<li>
 			Changes to {@link org.apache.juneau.urlencoding.UrlEncodingSerializer}/{@link org.apache.juneau.urlencoding.UrlEncodingParser} to reduce the need for quoted string values.<br>
@@ -30025,8 +29395,8 @@
 		<li>
 			New methods on {@link org.apache.juneau.rest.RestRequest}:
 			<ul>
-				<li><del>RestRequest#getVarResolver()</del></li>
-				<li><del>RestRequest#getServletURI()</del></li>
+				<li><del>RestRequest.getVarResolver()</del></li>
+				<li><del>RestRequest.getServletURI()</del></li>
 				<li><del>RestRequest.getRequestParentURI()</del></li>
 			</ul>
 		</li>
@@ -30039,20 +29409,20 @@
 		<li>
 			New methods on <del>RestServlet</del>that allow easier customization by subclasses:
 			<ul>
-				<li><del>RestServlet#createConfigFactory()</del></li>
-				<li><del>RestServlet#createConverters()</del></li>
-				<li><del>RestServlet#createDefaultRequestHeaders()</del></li>
-				<li><del>RestServlet#createDefaultResponseHeaders()</del></li>
-				<li><del>RestServlet#createEncoders()</del></li>
-				<li><del>RestServlet#createFilters()</del></li>
-				<li><del>RestServlet#createGuards()</del></li>
-				<li><del>RestServlet#createMimetypesFileTypeMap()</del></li>
-				<li><del>RestServlet#createParsers()</del></li>
-				<li><del>RestServlet#createProperties()</del></li>
-				<li><del>RestServlet#createRequestProperties(ObjectMap,RestRequest)</del></li>
-				<li><del>RestServlet#createRequestVarResolver(RestRequest)</del></li>
-				<li><del>RestServlet#createSerializers()</del></li>
-				<li><del>RestServlet#createUrlEncodingParser()</del></li>
+				<li><del>RestServlet.createConfigFactory()</del></li>
+				<li><del>RestServlet.createConverters()</del></li>
+				<li><del>RestServlet.createDefaultRequestHeaders()</del></li>
+				<li><del>RestServlet.createDefaultResponseHeaders()</del></li>
+				<li><del>RestServlet.createEncoders()</del></li>
+				<li><del>RestServlet.createFilters()</del></li>
+				<li><del>RestServlet.createGuards()</del></li>
+				<li><del>RestServlet.createMimetypesFileTypeMap()</del></li>
+				<li><del>RestServlet.createParsers()</del></li>
+				<li><del>RestServlet.createProperties()</del></li>
+				<li><del>RestServlet.createRequestProperties(ObjectMap,RestRequest)</del></li>
+				<li><del>RestServlet.createRequestVarResolver(RestRequest)</del></li>
+				<li><del>RestServlet.createSerializers()</del></li>
+				<li><del>RestServlet.createUrlEncodingParser()</del></li>
 			</ul>
 		</li>
 		<li>
@@ -30107,12 +29477,12 @@
 	</p>
 	<ul class='spaced-list'>
 		<li>Implemented <c>org.apache.juneau.urlencoding.UrlEncodingParser.parseArgs(Reader,int,ClassMeta[])</c>.
-		<li><c>name</c> parameter of <del>ResourceDescription#ResourceDescription(String,String,String)</del>. 
+		<li><c>name</c> parameter of <del>ResourceDescription.ResourceDescription(String,String,String)</del>. 
 			is now automatically URL-encoded so that the name can contain special characters (e.g. <js>"foo/bar(baz)"</js>).
 		<li>Support for URL-matching and path info containing encoded characters (e.g. <js>'/'</js>) now supported.	
 		<li>Removed some lazy-initialization of bean information in {@link org.apache.juneau.ClassMeta} that allowed the removal of
 			some synchronized blocks.
-		<li>Improved support of <del>BeanContext#getClassMetaFromString(String)</del>.
+		<li>Improved support of <del>BeanContext.getClassMetaFromString(String)</del>.
 			Now supports primitive arrays such as <js>"long[]"</js> in addition to the previous support for the equivalent <js>"[J"</js>.
 		<li>Various new convenience methods added to {@link org.apache.juneau.internal.StringUtils} and {@link org.apache.juneau.internal.ClassUtils}.
 	</ul>	
@@ -30164,12 +29534,12 @@
 		<li>Removed lazy-initialization that required locking in {@link org.apache.juneau.ClassMeta}.  
 		<li>New <c>BeanContext.setDefaultParser(ReaderParser)</c> method added for specifying 
 			a default parser to use in a bean context (used when converting beans to <c>Strings</c> using 
-			<del>BeanContext#convertToType(Object,Class)</del>.
+			<del>BeanContext.convertToType(Object,Class)</del>.
 			Old behavior simply used the default JSON serializer in these cases.
 		<li>More consistent handling of exceptions across all parsers.
 		<li>Minor changes to {@link org.apache.juneau.rest.RestRequest} class.
 		<ul>
-			<li>Changed the order of parameters on <del>RestRequest#getParameter(String,Class)</del>.
+			<li>Changed the order of parameters on <del>RestRequest.getParameter(String,Class)</del>.
 			<li>Added <c>RestRequest.getMapParameter(String,Class,Class,Class)</c> and 
 				<c>RestRequest.getCollectionParameter(String,Class,Class)}</c> methods.
 		</ul>
@@ -30263,7 +29633,7 @@
 	<h5 class='topic w800'>REST Server API updates</h5>
 	<ul class='spaced-list'>
 		<li>New <del>RestRequest.getJavaMethod()</del>method for getting access to the method used to handle a request.
-			Useful for accessing the method name or annotations during requests, such as in calls to <del>RestGuard#guard(RestRequest,RestResponse)</del>.
+			Useful for accessing the method name or annotations during requests, such as in calls to <del>RestGuard.guard(RestRequest,RestResponse)</del>.
 		<li>Fixed bug when using Jetty where you tried to read text input after a header was written.
 		<li>Added new string variables <dc>$A{...}</dc> (request attributes) and <dc>$P{...}</dc> (request parameters) to <c>RestServlet.createRequestVarResolver(RestRequest)</c>.
 	</ul>
@@ -30288,7 +29658,7 @@
 		<li>Better behavior on overriding of filters in <c>BeanContext.addTransforms(Class[])</c>.
 			Previously, adding multiple conflicting filters resulted in random behavior.  
 			Now filters are overridden when multiple matching filters are applied.
-		<li>Allow <del>HtmlDocSerializerContext</del>properties to be set via <del>Serializer#setProperty(String,Object)</del>.
+		<li>Allow <del>HtmlDocSerializerContext</del>properties to be set via <del>Serializer.setProperty(String,Object)</del>.
 			Previously, these could only be defined through override properties (e.g. through REST class and method annotations).
 		<li>Fixed memory leak in XML parser.	
 	</ul>
@@ -30305,13 +29675,13 @@
 	</p>
 	<ul class='spaced-list'>
 		<li>New <del>Redirect</del> class that simplifies performing redirections in REST methods.
-		<li>New pluggable {@link org.apache.juneau.rest.ResponseHandler} class and <del>@RestResource(responseHandlers)</del> annotation
+		<li>New pluggable <del>ResponseHandler</del> class and <del>@RestResource(responseHandlers)</del> annotation
 			for defining customer response handlers for special kinds of POJOs.
 		<li>New method <del>UrlEncodingSerializer.serializeUrlPart(Object)</del>method.
 		<li>New method <del>RestRequest.getServletURIBuilder()</del>for construcing servlet-based URLs more efficiently.
 		<li>New method {@link org.apache.juneau.rest.RestResponse#getNegotiatedOutputStream()} that uses encoders if a match is found, 
 			and {@link org.apache.juneau.rest.RestResponse#getOutputStream()} that just return the underlying output stream without any modifications.
-		<li>Fixed bug where some properties were not being propagated correctly when using <del>CoreObject#setProperties(ObjectMap)</del>
+		<li>Fixed bug where some properties were not being propagated correctly when using <del>CoreObject.setProperties(ObjectMap)</del>
 			on serializer and parser subclasses.
 		<li>Fixed bug in {@link org.apache.juneau.html.HtmlSerializer} where URL keys in Maps were not being serialized as hyperlinks.
 		<li>Fixed bug in {@link org.apache.juneau.json.JsonSerializer} where <js>"_class"</js> and <js>"items"</js> attributes were not quoted in strict mode when using SERIALIZER_addClassAttrs feature.	
@@ -30480,7 +29850,7 @@
 		<li>Fixed major issue that prevented parsing URL-Encoded form posts into POJOs.
 			Calling <del>HttpServlet.getParameter(String)</del>was forcing the underlying servlet code to process the HTTP body itself, preventing the <c>UrlEncodingSerializer</c>
 			class from being able to parse the content.  Updated code no longer inadvertantly calls this method.
-		<li>New <del>RestRequest#getQueryParameter(String)</del>, <del>RestRequest#hasQueryParameter(String)</del>, and <del>RestRequest.hasAnyQueryParameters(String[])</del>
+		<li>New <del>RestRequest.getQueryParameter(String)</del>, <del>RestRequest.hasQueryParameter(String)</del>, and <del>RestRequest.hasAnyQueryParameters(String[])</del>
 			methods that only look for parameters in the URL query string to prevent loading and parsing of URL-Encoded form posts.
 		<li>New <del>@QParam</del> and <del>@HasQParam</del>annotations for accessing query parameters from the URL query string.
 		<li><c>&amp;plainText</c> parameter can now specify a false value.
@@ -30497,11 +29867,11 @@
 		<li>Improved performance on URL-Encoded form posts by serializing directly to output stream instead of serialized to string first.
 		<li>New methods on {@link org.apache.juneau.rest.client.RestClient} class that makes it easier to associate serializer and parser attributes with registered serializer and parser:
 			<ul>
-				<li><del>RestClient#setProperty(String,Object)</del>			
-				<li><del>RestClient#setProperties(ObjectMap)</del>	
-				<li><del>RestClient#addNotBeanClasses(Class[])</del>		
-				<li><del>RestClient#addTransforms(Class[])</del>		
-				<li><del>RestClient#addImplClass(Class,Class)</del>	
+				<li><del>RestClient.setProperty(String,Object)</del>			
+				<li><del>RestClient.setProperties(ObjectMap)</del>	
+				<li><del>RestClient.addNotBeanClasses(Class[])</del>		
+				<li><del>RestClient.addTransforms(Class[])</del>		
+				<li><del>RestClient.addImplClass(Class,Class)</del>	
 			</ul>
 		<li>Renamed <c>RestClient.shutdown()</c> to {@link org.apache.juneau.rest.client.RestClient#close()} to mirror change in Apache API.		
 	</ul>
@@ -30572,8 +29942,8 @@
 		<li>Performance improvements around query parameters.
 		<li>New methods on {@link org.apache.juneau.rest.RestRequest} for handling multi-part parameters:
 			<ul>
-				<li><del>RestRequest#getParameters(String,Class)</del>
-				<li><del>RestRequest#getQueryParameters(String,Class)</del>
+				<li><del>RestRequest.getParameters(String,Class)</del>
+				<li><del>RestRequest.getQueryParameters(String,Class)</del>
 			</ul>
 		</li>
 		<li>Fixed Jetty issue in {@link org.apache.juneau.rest.RestResponse#setHeader(String,String)} where setting 
@@ -30586,7 +29956,7 @@
 			
 	<h5 class='topic w800'>Client</h5>		
 	<ul class='spaced-list'>
-		<li>New method <del>RestCall#allowRedirectsOnPosts(boolean)</del>.
+		<li>New method <del>RestCall.allowRedirectsOnPosts(boolean)</del>.
 		<li>New method <c>RestCall.peekInputStream()</c> allows you to read response bodies without interrupting execution flow.
 		<li>New method <del>RestCall.toString()</del> now useful for debugging purposes.  
 			Shows all request/response headers and bodies.
@@ -30653,7 +30023,7 @@
 	
 	<h5 class='topic w800'>Server</h5>		
 	<ul class='spaced-list'>
-		<li>{@link org.apache.juneau.rest.RestConverter} API fixed to handle the existence of POJO filters.
+		<li><del>RestConverter</del> API fixed to handle the existence of POJO filters.
 			<del>Introspectable</del>/<del>Queryable</del>/<del>Traversable</del> classes can now work with filtered POJOs.  
 		<li><del>@RestResource(messages)</del>annotation can now be defined on super and subclasses so that NLS messages can be defined in multiple resource bundles.
 		<li>Performance improvements in <c>RestServletNls</c> class. 
@@ -30692,7 +30062,7 @@
 	<ul class='spaced-list'>
 		<li>New methods in {@link org.apache.juneau.rest.client.RestClient} for working with remoteable services:
 		<ul>
-			<li><del>RestClient#setRemoteableServletUri(String)</del>
+			<li><del>RestClient.setRemoteableServletUri(String)</del>
 			<li><del>RestClient.getRemoteableProxy(Class)</del>
 		</ul>
 	</ul>
@@ -30704,8 +30074,8 @@
 			explicitly specify which HTTP methods can be used in the <c>&amp;method</c> parameter.
 		<li>New methods added to {@link org.apache.juneau.rest.RestRequest}:
 		<ul>
-			<li><del>RestRequest#getParser()</del>
-			<li><del>RestRequest#getReaderParser()</del>
+			<li><del>RestRequest.getParser()</del>
+			<li><del>RestRequest.getReaderParser()</del>
 		</ul>
 	</ul>
 </div>
@@ -30724,8 +30094,8 @@
 	<ul class='spaced-list'>
 		<li>New properties in <del>SerializerContext</del>:
 			<ol>
-				<li><del>SerializerContext#SERIALIZER_relativeUriBase</del>
-				<li><del>SerializerContext#SERIALIZER_absolutePathUriBase</del>
+				<li><del>SerializerContext.SERIALIZER_relativeUriBase</del>
+				<li><del>SerializerContext.SERIALIZER_absolutePathUriBase</del>
 			</ol>
 			These replace the <c>SERIALIZER_uriAuthority</c> and <c>SERIALIZER_uriContext</c> properties.
 		</li>
@@ -30747,24 +30117,24 @@
 	<ul class='spaced-list'>
 		<li>New methods in <del>RestCall</del>:
 			<ol>
-				<li><del>RestRequest#getHeader(String,Class)</del>
-				<li><del>RestRequest#getHeader(String,Object,Class)</del>
-				<li>{@del RestRequest#getHeader(String,Type,Type...)}
-				<li><del>RestRequest#getQueryParameter(String,Class)</del>
-				<li><del>RestRequest#getQueryParameter(String,Object,Class)</del>
-				<li>{@del RestRequest#getQueryParameter(String,Type,Type...)}
-				<li>{@del RestRequest#getQueryParameter(String,Object,Type,Type...)}
-				<li><del>RestRequest#getQueryParameters(String,Class)</del>
-				<li>{@del RestRequest#getQueryParameters(String,Type,Type...)}
-				<li><del>RestRequest#getFormDataParameter(String,Class)</del>
-				<li><del>RestRequest#getFormDataParameter(String,Object,Class)</del>
-				<li><del>RestRequest#getFormDataParameters(String,Class)</del>
-				<li>{@del RestRequest#getFormDataParameter(String,Type,Type...)}
-				<li>{@del RestRequest#getFormDataParameters(String,Type,Type...)}
-				<li><del>RestRequest#getPathParameter(String,Class)</del>
-				<li>{@del RestRequest#getPathParameter(String,Type,Type...)}
-				<li><del>RestRequest#getBody(Class)</del>
-				<li>{@del RestRequest#getBody(Type,Type...)}
+				<li><del>RestRequest.getHeader(String,Class)</del>
+				<li><del>RestRequest.getHeader(String,Object,Class)</del>
+				<li><del>RestRequest.getHeader(String,Type,Type...)</del>
+				<li><del>RestRequest.getQueryParameter(String,Class)</del>
+				<li><del>RestRequest.getQueryParameter(String,Object,Class)</del>
+				<li><del>RestRequest.getQueryParameter(String,Type,Type...)</del>
+				<li><del>RestRequest.getQueryParameter(String,Object,Type,Type...)</del>
+				<li><del>RestRequest.getQueryParameters(String,Class)</del>
+				<li><del>RestRequest.getQueryParameters(String,Type,Type...)</del>
+				<li><del>RestRequest.getFormDataParameter(String,Class)</del>
+				<li><del>RestRequest.getFormDataParameter(String,Object,Class)</del>
+				<li><del>RestRequest.getFormDataParameters(String,Class)</del>
+				<li><del>RestRequest.getFormDataParameter(String,Type,Type...)</del>
+				<li><del>RestRequest.getFormDataParameters(String,Type,Type...)</del>
+				<li><del>RestRequest.getPathParameter(String,Class)</del>
+				<li><del>RestRequest.getPathParameter(String,Type,Type...)</del>
+				<li><del>RestRequest.getBody(Class)</del>
+				<li><del> RestRequest.getBody(Type,Type...)</del>
 			</ol>
 		</li>
 	</ul>
@@ -30785,18 +30155,18 @@
 		<li>New methods on {@link org.apache.juneau.ClassMeta} that eliminates language-specific code in 
 			the general class metadata.
 			<ul>
-				<li><del>ClassMeta#getXmlMeta()</del>
-				<li><del>ClassMeta#getJsonMeta()</del>
-				<li><del>ClassMeta#getHtmlMeta()</del>
-				<li><del>ClassMeta#getUrlEncodingMeta()</del>
-				<li><del>ClassMeta#getRdfMeta()</del>
+				<li><del>ClassMeta.getXmlMeta()</del>
+				<li><del>ClassMeta.getJsonMeta()</del>
+				<li><del>ClassMeta.getHtmlMeta()</del>
+				<li><del>ClassMeta.getUrlEncodingMeta()</del>
+				<li><del>ClassMeta.getRdfMeta()</del>
 			</ul>
 		<li>New {@link org.apache.juneau.dto.jsonschema.JsonType#ANY} enum.
 		<li>New <del>@Html(asPlainText)</del> annotation.
 		<li>New <del>HtmlDocSerializerContext.HTMLDOC_cssImports</del>property.
 		<li>Significant changes to RDF support.
 			<ul>
-				<li>New {@link org.apache.juneau.jena.annotation.Rdf @Rdf} and {@link org.apache.juneau.jena.annotation.RdfSchema @RdfSchema}
+				<li>New <del>@Rdf</del> and <del>@RdfSchema</del>
 					annotations.  These replace the use of defining namespaced through the XML annotations, and allows XML and RDF to be
 					serialized using different namespaces.
 				<li>Support for serializing arrays/collections as RDF bags, RDF lists, and multi-valued properties.   
@@ -30873,15 +30243,15 @@
 			<ul>
 				<li>Added new methods:
 					<ul>
-						<li><del>RestRequest#getQueryParameterMap()</del>
-						<li><del>RestRequest#getQueryParameterNames()</del>
-						<li><del>RestRequest#getPathInfoUndecoded()</del>
-						<li><del>RestRequest#getPathRemainderUndecoded()</del>
-						<li><del>RestRequest#getTrimmedRequestURI()</del>
-						<li><del>RestRequest#getTrimmedRequestURL()</del>
-						<li><del>RestRequest#getServletTitle()</del>
-						<li><del>RestRequest#getServletDescription()</del>
-						<li><del>RestRequest#getMethodDescription()</del>
+						<li><del>RestRequest.getQueryParameterMap()</del>
+						<li><del>RestRequest.getQueryParameterNames()</del>
+						<li><del>RestRequest.getPathInfoUndecoded()</del>
+						<li><del>RestRequest.getPathRemainderUndecoded()</del>
+						<li><del>RestRequest.getTrimmedRequestURI()</del>
+						<li><del>RestRequest.getTrimmedRequestURL()</del>
+						<li><del>RestRequest.getServletTitle()</del>
+						<li><del>RestRequest.getServletDescription()</del>
+						<li><del>RestRequest.getMethodDescription()</del>
 					</ul>
 				<li>Behavior changes to {@link org.apache.juneau.rest.RestRequest#getPathInfo()} to follow Servlet specs.
 					Returns <jk>null</jk> instead of blank for no path info.
@@ -30893,10 +30263,10 @@
 		<li>New string replacement variables:
 			<ul>
 				<li><c>$R{contextPath}</c> - Returns value from {@link org.apache.juneau.rest.RestRequest#getContextPath()}
-				<li><c>$R{methodDescription}</c> - Returns value from <del>RestRequest#getMethodDescription()</del>
-				<li><c>$R{resourceTitle}</c> - Returns value from <del>RestRequest#getServletTitle()</del>
-				<li><c>$R{resourceDescription}</c> - Returns value from <del>RestRequest#getServletDescription()</del>
-				<li><c>$R{trimmedRequestURI}</c> - Returns value from <del>RestRequest#getTrimmedRequestURI()</del>
+				<li><c>$R{methodDescription}</c> - Returns value from <del>RestRequest.getMethodDescription()</del>
+				<li><c>$R{resourceTitle}</c> - Returns value from <del>RestRequest.getServletTitle()</del>
+				<li><c>$R{resourceDescription}</c> - Returns value from <del>RestRequest.getServletDescription()</del>
+				<li><c>$R{trimmedRequestURI}</c> - Returns value from <del>RestRequest.getTrimmedRequestURI()</del>
 				<li><c>$E{var}</c> - Environment variables.
 			</ul>
 		<li>Added methods <del>RestServlet.getDescription(RestRequest)</del>and <del>RestServlet.getLabel(RestRequest)</del>.
@@ -30917,17 +30287,17 @@
 		<li>New annotations for providing labels and descriptions.  Useful if you don't plan on having to support other languages, so you don't 
 			want to provide labels in resource bundles.
 			<ul>
-				<li><del>RestResource#label()</del>
+				<li><del>RestResource.label()</del>
 				<li><del>@RestResource(description)</del>
-				<li><del>RestMethod#description() @RestMethod(description)</del>
-				<li><del>RestMethod#responses()</del>
-				<li><del>Attr#description()</del>
-				<li><del>Content#description()</del>
-				<li><del>HasParam#description()</del>
-				<li><del>HasQParam#description()</del>
-				<li><del>Header#description()</del>
-				<li><del>Param#description()</del>
-				<li><del>QParam#description()</del>
+				<li><del>RestMethod.description() @RestMethod(description)</del>
+				<li><del>RestMethod.responses()</del>
+				<li><del>Attr.description()</del>
+				<li><del>Content.description()</del>
+				<li><del>HasParam.description()</del>
+				<li><del>HasQParam.description()</del>
+				<li><del>Header.description()</del>
+				<li><del>Param.description()</del>
+				<li><del>QParam.description()</del>
 			</ul>
 		<li>Support for sorting resources by name in <del>ChildResourceDescriptions</del>.
 	</ul>
@@ -30952,7 +30322,7 @@
 	<ul class='spaced-list'>
 		<li>Fixed bug where localized strings weren't resolving when using chained resource bundles.
 		<li>Servlet and method labels and descriptions can now contain embedded string variables.
-		<li>New <del>RestMethod.input()</del>and <del>RestMethod#responses()</del>
+		<li>New <del>RestMethod.input()</del>and <del>RestMethod.responses()</del>
 			annotations.
 			These replace the various <c>description</c> annotations added 2 days ago with a simpler design.
 		<li>New methods on <del>RestServlet</del>:
@@ -30985,7 +30355,7 @@
 			See <dc>Serializing to ObjectMaps</dc> for details.
 		<li>New <del>ObjectMap.include(String[])</del>and <del>ObjectMap.exclude(String[])</del>methods.
 		<li>{@link org.apache.juneau.html.annotation.Html @Html} annotations can now be applied to bean properties.
-		<li>New {@link org.apache.juneau.utils.IOPipe} utility class.
+		<li>New <del>IOPipe</del> utility class.
 		<li>Behavior change on <del>StringVarResolver</del>.  <jk>null</jk> input now results in blank strings instead of <jk>null</jk>.
 	</ul>
 	
@@ -31042,7 +30412,7 @@
 		<li>{@link org.apache.juneau.json.JsonParser} now handles parsing JSON boolean/numeric values as strings to bean properties of type boolean or number. 
 		<li>{@link org.apache.juneau.urlencoding.UrlEncodingSerializer} and {@link org.apache.juneau.urlencoding.UrlEncodingParser} now 
 			represent arrays and collections as key-value pairs where the keys are numbers (e.g. <js>"?0=foo&amp;1=bar"</js>).
-		<li>Various internal improvements to {@link org.apache.juneau.utils.IOPipe}.
+		<li>Various internal improvements to <del>IOPipe</del>.
 		<li>New <del>ReflectionUtils.getResource(Class,String)</del>method.
 		<li>{@link org.apache.juneau.internal.StringUtils#parseNumber(String,Class)} now returns zero for empty strings. 
 			This affects the way most parsers handle blank values.
@@ -31055,14 +30425,14 @@
 		<li>Changes to <del>RestServlet</del>:
 			<ul>
 				<li>New methods for accessing external INI config files:<br>  
-					<del>RestServlet#getConfig()</del><br>
-					<del>RestServlet#createConfigFile()</del>
+					<del>RestServlet.getConfig()</del><br>
+					<del>RestServlet.createConfigFile()</del>
 				<li>New <js>"$C{...}"</js> variable that resolve to INI config file values.
 				<li>New <js>"$UE{...}"</js> variable that  URL-encodes the value inside the variable.
 				<li>New convenience methods for retrieving classpath resource files:<br>  
-					<del>RestServlet#getResource(String)</del><br>
-					<del>RestServlet#getResourceAsString(String)</del><br>
-					<del>RestServlet#getResource(Class,String,String)</del>.
+					<del>RestServlet.getResource(String)</del><br>
+					<del>RestServlet.getResourceAsString(String)</del><br>
+					<del>RestServlet.getResource(Class,String,String)</del>.
 						Useful if you want to load predefined POJOs from JSON files in your classpath.
 				<li>New <del>RestServlet.handleNotFound(int,RestRequest,RestResponse)</del> method for customized handling
 					of when a resource or method was not found.  
@@ -31071,9 +30441,9 @@
 			overriding the new <del>RestServlet.handleNotFound(int,RestRequest,RestResponse)</del>method.
 		<li>New {@link org.apache.juneau.rest.RestRequest} methods: 
 			<ul>
-				<li><del>RestRequest#resolveVars(String)</del>
+				<li><del>RestRequest.resolveVars(String)</del>
 				<li><c>RestRequest.getVarResource(String)</c>
-				<li><del>RestRequest#getConfig()</del>
+				<li><del>RestRequest.getConfig()</del>
 			</ul>
 		<li>New {@link org.apache.juneau.rest.RestResponse} methods: 
 			<ul>
@@ -31087,10 +30457,10 @@
 			Allows encoders to be fine-tuned at the method level.
 		<li>New <del>@RestResource(config)</del> annotation for associating external <del>ConfigFile</del>config files with servlets.
 		<li><del>ResourceLink</del>.
-		<li>New <c>org.apache.juneau.rest.matcher</c> package for commonly-used {@link org.apache.juneau.rest.RestMatcher RestMatchers}:
+		<li>New <c>org.apache.juneau.rest.matcher</c> package for commonly-used <del>RestMatchers</del>:
 			<ul>
-				<li><del>matchers#MultipartFormDataMatcher</del>
-				<li><del>matchers#UrlEncodedFormMatcher</del>
+				<li><del>MultipartFormDataMatcher</del>
+				<li><del>UrlEncodedFormMatcher</del>
 			</ul>
 	</ul>
 			
@@ -31125,7 +30495,7 @@
 				<li>More consistent handling of comma-delimited lists of objects.
 				<li>New methods in <del>ConfigFile</del>:
 					<ul>
-						<li><del>ConfigFile#getStringArray(String)</del>,<del>ConfigFile#getStringArray(String,String[])</del>
+						<li><del>ConfigFile.getStringArray(String)</del>,<del>ConfigFile.getStringArray(String,String[])</del>
 						<li><del>ConfigFile.getSectionAsBean(String,Class)</del>- Instantiate a new bean with property values in the specified section..
 						<li><del>ConfigFile.writeProperties(String,Object,boolean,Class[])</del>- Copy the properties in a config file section into properties on an existing bean or POJO.
 						<li><del>ConfigFile.getSectionMap(String)</del>- Get all the resolved values in a section.
@@ -31133,15 +30503,15 @@
 						<li><del>ConfigFile.isEncoded(String)</del>
 						<li><del>ConfigFile.addListener(ConfigFileListener)</del>- Listen for modification events on the config file.
 						<li><del>ConfigFile.merge(ConfigFile)</del>- Merge the contents of another config file into this config file.
-						<li><del>ConfigFile#getResolving()</del>, <del>ConfigFile.getResolving(StringVarResolver)</del>- Return an instance of the config file that resolves string variables.
+						<li><del>ConfigFile.getResolving()</del>, <del>ConfigFile.getResolving(StringVarResolver)</del>- Return an instance of the config file that resolves string variables.
 							Much more efficient than the previous design since the same underlying config file object is shared.
 						<li><del>ConfigFile.toWritable()</del> - Wraps the config file in a <del>Writable</del>interface so that it can be serialized by the REST interface as a plain-text INI file instead of as a serialized POJO.
 						<li><del>ConfigFile.getInt(String)</del>- Now supports <js>"M"</js> and <js>"K"</js> to identify millions and thousands.
 					</ul>
 				<li>New methods in <del>ConfigMgr</del>:
 					<ul>
-						<li><del>ConfigMgr#create()</del>, <del>ConfigMgr#create(Reader)</del>, <del>ConfigMgr#create(File)</del>
-						<li><del>ConfigMgr#deleteAll()</del>	
+						<li><del>ConfigMgr.create()</del>, <del>ConfigMgr.create(Reader)</del>, <del>ConfigMgr.create(File)</del>
+						<li><del>ConfigMgr.deleteAll()</del>	
 					</ul>
 				<li>New methods in <del>Section</del>:
 					<ul>
@@ -31197,44 +30567,44 @@
 			</ul> 
 		<li>New fields on <del>ObjectList</del>:
 			<ul>
-				<li><del>ObjectList#EMPTY_LIST</del>
+				<li><del>ObjectList.EMPTY_LIST</del>
 			</ul>
 		<li>New fields and methods on <del>ObjectMap</del>:
 			<ul>
-				<li><del>ObjectMap#EMPTY_MAP</del>
-				<li><del>ObjectMap#getStringArray(String)</del>
-				<li><del>ObjectMap#getStringArray(String,String[])</del>
-				<li><del>ObjectMap#putIfNull(String,Object)</del>
-				<li><del>ObjectMap#putIfEmpty(String,Object)</del>
+				<li><del>ObjectMap.EMPTY_MAP</del>
+				<li><del>ObjectMap.getStringArray(String)</del>
+				<li><del>ObjectMap.getStringArray(String,String[])</del>
+				<li><del>ObjectMap.putIfNull(String,Object)</del>
+				<li><del>ObjectMap.putIfEmpty(String,Object)</del>
 			</ul>
 		<li>New methods in {@link org.apache.juneau.internal.ArrayUtils}:
 			<ul>
-				<li><del>ArrayUtils#contains(Object,Object[])</del>
-				<li><del>ArrayUtils#indexOf(Object,Object[])</del>
-				<li><del>ArrayUtils#toPrimitiveArray(Object)</del>
+				<li><del>ArrayUtils.contains(Object,Object[])</del>
+				<li><del>ArrayUtils.indexOf(Object,Object[])</del>
+				<li><del>ArrayUtils.toPrimitiveArray(Object)</del>
 			</ul>	
 		<li>New methods in {@link org.apache.juneau.internal.IOUtils}:
 			<ul>
-				<li><del>IOUtils#pipe(Reader,Writer)</del>
+				<li><del>IOUtils.pipe(Reader,Writer)</del>
 				<li>{@link org.apache.juneau.internal.IOUtils#read(File)}
-				<li><del>IOUtils#readFile(String)</del>
-				<li><del>IOUtils#write(File,Reader)</del>
+				<li><del>IOUtils.readFile(String)</del>
+				<li><del>IOUtils.write(File,Reader)</del>
 			</ul>
 		<li>New methods on <del>PojoRest</del>:
 			<ul>
-				<li><del>PojoRest#get(Class,String,Object)</del>
-				<li><del>PojoRest#getString(String)</del>
-				<li><del>PojoRest#getString(String,String)</del>
-				<li><del>PojoRest#getInt(String)</del>
-				<li><del>PojoRest#getInt(String,Integer)</del>
-				<li><del>PojoRest#getLong(String)</del>
-				<li><del>PojoRest#getLong(String,Long)</del>
-				<li><del>PojoRest#getBoolean(String)</del>
-				<li><del>PojoRest#getBoolean(String,Boolean)</del>
-				<li><del>PojoRest#getMap(String)</del>
-				<li><del>PojoRest#getMap(String,Map)</del>
-				<li><del>PojoRest#getList(String)</del>
-				<li><del>PojoRest#getList(String,List)</del>
+				<li><del>PojoRest.get(Class,String,Object)</del>
+				<li><del>PojoRest.getString(String)</del>
+				<li><del>PojoRest.getString(String,String)</del>
+				<li><del>PojoRest.getInt(String)</del>
+				<li><del>PojoRest.getInt(String,Integer)</del>
+				<li><del>PojoRest.getLong(String)</del>
+				<li><del>PojoRest.getLong(String,Long)</del>
+				<li><del>PojoRest.getBoolean(String)</del>
+				<li><del>PojoRest.getBoolean(String,Boolean)</del>
+				<li><del>PojoRest.getMap(String)</del>
+				<li><del>PojoRest.getMap(String,Map)</del>
+				<li><del>PojoRest.getList(String)</del>
+				<li><del>PojoRest.getList(String,List)</del>
 				<li><del>getObjectMap(String)</del>
 				<li><del>getObjectMap(String,ObjectMap)</del>
 				<li><del>getObjectList(String)</del>
@@ -31242,27 +30612,27 @@
 			</ul>
 		<li>New methods on <del>ProcBuilder</del>:
 			<ul>
-				<li><del>ProcBuilder#pipeTo(Writer,boolean)</del>
-				<li><del>ProcBuilder#pipeTo(Writer)</del>
-				<li><del>ProcBuilder#logTo(Writer,boolean)</del>
-				<li><del>ProcBuilder#logTo(Writer)</del>
-				<li><del>ProcBuilder#logTo(Level,Logger)</del>
-				<li><del>ProcBuilder#maxExitStatus(int)</del>
+				<li><del>ProcBuilder.pipeTo(Writer,boolean)</del>
+				<li><del>ProcBuilder.pipeTo(Writer)</del>
+				<li><del>ProcBuilder.logTo(Writer,boolean)</del>
+				<li><del>ProcBuilder.logTo(Writer)</del>
+				<li><del>ProcBuilder.logTo(Level,Logger)</del>
+				<li><del>ProcBuilder.maxExitStatus(int)</del>
 			</ul>
 		<li>New methods on {@link org.apache.juneau.internal.StringUtils}:
 			<ul>
-				<li><del>StringUtils#isEmpty(Object)</del>
+				<li><del>StringUtils.isEmpty(Object)</del>
 				<li>{@link org.apache.juneau.internal.StringUtils#nullIfEmpty(String)}
 				<li>{@link org.apache.juneau.internal.StringUtils#base64EncodeToString(String)}
 				<li>{@link org.apache.juneau.internal.StringUtils#base64Encode(byte[])}
 				<li>{@link org.apache.juneau.internal.StringUtils#base64DecodeToString(String)}
 				<li>{@link org.apache.juneau.internal.StringUtils#base64Decode(String)}
-				<li><del>StringUtils#generateUUID(int)</del>
+				<li><del>StringUtils.generateUUID(int)</del>
 				<li>{@link org.apache.juneau.internal.StringUtils#trim(String)}
-				<li><del>StringUtils#parseISO8601Date(String)</del>
+				<li><del>StringUtils.parseISO8601Date(String)</del>
 				<li>{@link org.apache.juneau.internal.StringUtils#replaceVars(String,Map)}
-				<li><del>StringUtils#pathStartsWith(String,String)</del>
-				<li><del>StringUtils#pathStartsWith(String,String[])</del>
+				<li><del>StringUtils.pathStartsWith(String,String)</del>
+				<li><del>StringUtils.pathStartsWith(String,String[])</del>
 			</ul>
 		<li>New <del>StringVar.doResolve(String)</del>method.
 		<li>New <del>StringVarResolver.DEFAULT</del>field.
@@ -31283,14 +30653,14 @@
 		<li>New <del>UrlEncodingSerializer.DEFAULT_SIMPLE_EXPANDED</del>serializer.
 		<li>Changes to <del>Args</del>:
 			<ul>
-				<li><c>getMainArg(int)</c> changed to <del>Args#getArg(int)</del>.  
+				<li><c>getMainArg(int)</c> changed to <del>Args.getArg(int)</del>.  
 					Non-existent arguments are returned as <jk>null</jk> instead of blank strings.  
 					This is more inline with the behavior of the rest of the library.
 				<li>New <del>Args.hasArg(int)</del> method.
 			</ul> 
 		<li>Removed <c>org.apache.juneau.utils.CharsetUtils</c> class.
 		<li>Removed <c>org.apache.juneau.utils.ConcurrentIdentityList</c> class.
-		<li>Fixed bug in {@link org.apache.juneau.internal.MultiIterable} class.
+		<li>Fixed bug in <del>MultiIterable</del> class.
 		<li><del>PojoIntrospector</del> must now be instantiated with a <c>ReaderParser</c>.
 			Simplifies the API on the class.
 		<li><del>PojoRest</del> must now be instantiated with a <c>ReaderParser</c>.
@@ -31302,7 +30672,7 @@
 		<li><del>SerializerGroup</del> and <del>ParserGroup</del>now ignores <c>NoClassDefFoundErrors</c>
 			so that resources that include Jena support can continue to operate even if the Jena libraries are not present.
 		<li>New {@link org.apache.juneau.internal.FileUtils#createTempFile(String)} method.
-		<li>New {@link org.apache.juneau.utils.PojoQuery} modified to handle bean getters that throw exceptions.
+		<li>New <del>PojoQuery</del> modified to handle bean getters that throw exceptions.
 	</ul>
 	
 	<h5 class='topic w800'>Client</h5>
@@ -31319,90 +30689,90 @@
 		<li>Removed <c>org.apache.juneau.rest.client.LaxRedirectStrategy</c>.  Use HTTP Client equivalent.
 		<li>New methods on <del>RestCall</del>:
 			<ul>
-				<li><del>RestCall#addInterceptor(RestCallInterceptor)</del>
-				<li><del>RestCall#pipeTo(Writer)</del>
-				<li><del>RestCall#pipeTo(Writer,boolean)</del>
-				<li><del>RestCall#pipeTo(String,Writer,boolean)</del>
-				<li><del>RestCall#getWriter(String)</del>
-				<li><del>RestCall#pipeTo(OutputStream)</del>
-				<li><del>RestCall#pipeTo(OutputStream,boolean)</del>
-				<li><del>RestCall#pipeTo(String,OutputStream,boolean)</del>
-				<li><del>RestCall#getOutputStream(String)</del>
-				<li><del>RestCall#byLines()</del>
-				<li><del>RestCall#captureResponse()</del>
-				<li><del>RestCall#successPattern(String)</del>
-				<li><del>RestCall#failurePattern(String)</del>
-				<li><del>RestCall#addResponsePattern(ResponsePattern)</del>
+				<li><del>RestCall.addInterceptor(RestCallInterceptor)</del>
+				<li><del>RestCall.pipeTo(Writer)</del>
+				<li><del>RestCall.pipeTo(Writer,boolean)</del>
+				<li><del>RestCall.pipeTo(String,Writer,boolean)</del>
+				<li><del>RestCall.getWriter(String)</del>
+				<li><del>RestCall.pipeTo(OutputStream)</del>
+				<li><del>RestCall.pipeTo(OutputStream,boolean)</del>
+				<li><del>RestCall.pipeTo(String,OutputStream,boolean)</del>
+				<li><del>RestCall.getOutputStream(String)</del>
+				<li><del>RestCall.byLines()</del>
+				<li><del>RestCall.captureResponse()</del>
+				<li><del>RestCall.successPattern(String)</del>
+				<li><del>RestCall.failurePattern(String)</del>
+				<li><del>RestCall.addResponsePattern(ResponsePattern)</del>
 				<li><del>RestCall.run()</del>- Renamed from <c>execute()</c>.
-				<li><del>RestCall#getCapturedResponse()</del>
-				<li><del>RestCall#getResponsePojoRest(Class)</del>
-				<li><del>RestCall#getResponsePojoRest()</del>
-				<li><del>RestCall#logTo(Level,Logger)</del>
-				<li><del>RestCall#setConfig(RequestConfig)</del>
+				<li><del>RestCall.getCapturedResponse()</del>
+				<li><del>RestCall.getResponsePojoRest(Class)</del>
+				<li><del>RestCall.getResponsePojoRest()</del>
+				<li><del>RestCall.logTo(Level,Logger)</del>
+				<li><del>RestCall.setConfig(RequestConfig)</del>
 			</ul>
 		<li>New lifecycle listener methods on <del>RestCallInterceptor</del>:
 			<ul>
-				<li><del>RestCallInterceptor#onInit(RestCall)</del>
-				<li><del>RestCallInterceptor#onClose(RestCall)</del>
+				<li><del>RestCallInterceptor.onInit(RestCall)</del>
+				<li><del>RestCallInterceptor.onClose(RestCall)</del>
 			</ul>
 		<li>New methods on {@link org.apache.juneau.rest.client.RestClient}:
 			<ul>
-				<li><del>RestClient#setBasicAuth(String,int,String,String)</del>
-				<li><del>RestClient#logTo(Level,Logger)</del>
-				<li><del>RestClient#setRootUrl(String)</del>
-				<li><del>RestClient#enableSSL(SSLOpts)</del>
-				<li><del>RestClient#enableLaxSSL()</del>
-				<li><del>RestClient#doCall(HttpMethod,Object,Object)</del>
-				<li><del>RestClient#createHttpClientBuilder()</del>
+				<li><del>RestClient.setBasicAuth(String,int,String,String)</del>
+				<li><del>RestClient.logTo(Level,Logger)</del>
+				<li><del>RestClient.setRootUrl(String)</del>
+				<li><del>RestClient.enableSSL(SSLOpts)</del>
+				<li><del>RestClient.enableLaxSSL()</del>
+				<li><del>RestClient.doCall(HttpMethod,Object,Object)</del>
+				<li><del>RestClient.createHttpClientBuilder()</del>
 			</ul>
 		<li>New passthrough methods on {@link org.apache.juneau.rest.client.RestClient} defined on <c>HttpClientBuilder</c>:
 			<ul>
-				<li><del>RestClient#setRedirectStrategy(RedirectStrategy)</del>
-				<li><del>RestClient#setDefaultCookieSpecRegistry(Lookup)</del>
-				<li><del>RestClient#setRequestExecutor(HttpRequestExecutor)</del>
-				<li><del>RestClient#setSSLHostnameVerifier(HostnameVerifier)</del>
-				<li><del>RestClient#setPublicSuffixMatcher(PublicSuffixMatcher)</del>
-				<li><del>RestClient#setSSLContext(SSLContext)</del>
-				<li><del>RestClient#setSSLSocketFactory(LayeredConnectionSocketFactory)</del>
-				<li><del>RestClient#setMaxConnTotal(int)</del>
-				<li><del>RestClient#setMaxConnPerRoute(int)</del>
-				<li><del>RestClient#setDefaultSocketConfig(SocketConfig)</del>
-				<li><del>RestClient#setDefaultConnectionConfig(ConnectionConfig)</del>
-				<li><del>RestClient#setConnectionTimeToLive(long,TimeUnit)</del>
-				<li><del>RestClient#setConnectionManager(HttpClientConnectionManager)</del>
-				<li><del>RestClient#setConnectionManagerShared(boolean)</del>
-				<li><del>RestClient#setConnectionReuseStrategy(ConnectionReuseStrategy)</del>
-				<li><del>RestClient#setKeepAliveStrategy(ConnectionKeepAliveStrategy)</del>
-				<li><del>RestClient#setTargetAuthenticationStrategy(AuthenticationStrategy)</del>
-				<li><del>RestClient#setProxyAuthenticationStrategy(AuthenticationStrategy)</del>
-				<li><del>RestClient#setUserTokenHandler(UserTokenHandler)</del>
-				<li><del>RestClient#disableConnectionState()</del>
-				<li><del>RestClient#setSchemePortResolver(SchemePortResolver)</del>
+				<li><del>RestClient.setRedirectStrategy(RedirectStrategy)</del>
+				<li><del>RestClient.setDefaultCookieSpecRegistry(Lookup)</del>
+				<li><del>RestClient.setRequestExecutor(HttpRequestExecutor)</del>
+				<li><del>RestClient.setSSLHostnameVerifier(HostnameVerifier)</del>
+				<li><del>RestClient.setPublicSuffixMatcher(PublicSuffixMatcher)</del>
+				<li><del>RestClient.setSSLContext(SSLContext)</del>
+				<li><del>RestClient.setSSLSocketFactory(LayeredConnectionSocketFactory)</del>
+				<li><del>RestClient.setMaxConnTotal(int)</del>
+				<li><del>RestClient.setMaxConnPerRoute(int)</del>
+				<li><del>RestClient.setDefaultSocketConfig(SocketConfig)</del>
+				<li><del>RestClient.setDefaultConnectionConfig(ConnectionConfig)</del>
+				<li><del>RestClient.setConnectionTimeToLive(long,TimeUnit)</del>
+				<li><del>RestClient.setConnectionManager(HttpClientConnectionManager)</del>
+				<li><del>RestClient.setConnectionManagerShared(boolean)</del>
+				<li><del>RestClient.setConnectionReuseStrategy(ConnectionReuseStrategy)</del>
+				<li><del>RestClient.setKeepAliveStrategy(ConnectionKeepAliveStrategy)</del>
+				<li><del>RestClient.setTargetAuthenticationStrategy(AuthenticationStrategy)</del>
+				<li><del>RestClient.setProxyAuthenticationStrategy(AuthenticationStrategy)</del>
+				<li><del>RestClient.setUserTokenHandler(UserTokenHandler)</del>
+				<li><del>RestClient.disableConnectionState()</del>
+				<li><del>RestClient.setSchemePortResolver(SchemePortResolver)</del>
 				<li><del>setUserAgent(String)</del>
-				<li><del>RestClient#setDefaultHeaders(Collection)</del>
-				<li><del>RestClient#addInterceptorFirst(HttpResponseInterceptor)</del>
-				<li><del>RestClient#addInterceptorLast(HttpResponseInterceptor)</del>
-				<li><del>RestClient#addInterceptorFirst(HttpRequestInterceptor)</del>
-				<li><del>RestClient#addInterceptorLast(HttpRequestInterceptor)</del>
-				<li><del>RestClient#disableCookieManagement()</del>
-				<li><del>RestClient#disableContentCompression()</del>
-				<li><del>RestClient#disableAuthCaching()</del>
-				<li><del>RestClient#setHttpProcessor(HttpProcessor)</del>
-				<li><del>RestClient#setRetryHandler(HttpRequestRetryHandler)</del>
-				<li><del>RestClient#disableAutomaticRetries()</del>
-				<li><del>RestClient#setProxy(HttpHost)</del>
-				<li><del>RestClient#setRoutePlanner(HttpRoutePlanner)</del>
-				<li><del>RestClient#disableRedirectHandling()</del>
-				<li><del>RestClient#setConnectionBackoffStrategy(ConnectionBackoffStrategy)</del>
-				<li><del>RestClient#setBackoffManager(BackoffManager)</del>
-				<li><del>RestClient#setServiceUnavailableRetryStrategy(ServiceUnavailableRetryStrategy)</del>
-				<li><del>RestClient#setDefaultCookieStore(CookieStore)</del>
-				<li><del>RestClient#setDefaultCredentialsProvider(CredentialsProvider)</del>
-				<li><del>RestClient#setDefaultAuthSchemeRegistry(Lookup)</del>
-				<li><del>RestClient#setContentDecoderRegistry(Map)</del>
-				<li><del>RestClient#setDefaultRequestConfig(RequestConfig)</del>
-				<li><del>RestClient#useSystemProperties()</del>
-				<li><del>RestClient#evictExpiredConnections()</del>
+				<li><del>RestClient.setDefaultHeaders(Collection)</del>
+				<li><del>RestClient.addInterceptorFirst(HttpResponseInterceptor)</del>
+				<li><del>RestClient.addInterceptorLast(HttpResponseInterceptor)</del>
+				<li><del>RestClient.addInterceptorFirst(HttpRequestInterceptor)</del>
+				<li><del>RestClient.addInterceptorLast(HttpRequestInterceptor)</del>
+				<li><del>RestClient.disableCookieManagement()</del>
+				<li><del>RestClient.disableContentCompression()</del>
+				<li><del>RestClient.disableAuthCaching()</del>
+				<li><del>RestClient.setHttpProcessor(HttpProcessor)</del>
+				<li><del>RestClient.setRetryHandler(HttpRequestRetryHandler)</del>
+				<li><del>RestClient.disableAutomaticRetries()</del>
+				<li><del>RestClient.setProxy(HttpHost)</del>
+				<li><del>RestClient.setRoutePlanner(HttpRoutePlanner)</del>
+				<li><del>RestClient.disableRedirectHandling()</del>
+				<li><del>RestClient.setConnectionBackoffStrategy(ConnectionBackoffStrategy)</del>
+				<li><del>RestClient.setBackoffManager(BackoffManager)</del>
+				<li><del>RestClient.setServiceUnavailableRetryStrategy(ServiceUnavailableRetryStrategy)</del>
+				<li><del>RestClient.setDefaultCookieStore(CookieStore)</del>
+				<li><del>RestClient.setDefaultCredentialsProvider(CredentialsProvider)</del>
+				<li><del>RestClient.setDefaultAuthSchemeRegistry(Lookup)</del>
+				<li><del>RestClient.setContentDecoderRegistry(Map)</del>
+				<li><del>RestClient.setDefaultRequestConfig(RequestConfig)</del>
+				<li><del>RestClient.useSystemProperties()</del>
+				<li><del>RestClient.evictExpiredConnections()</del>
 				<li><del>RestClient.evictIdleConnections(long,TimeUnit)</del>
 			</ul>
 		<li><c>JazzRestClient</c> now supports OIDC authentication.
@@ -31431,7 +30801,7 @@
 			<ul>
 				<li><del>RestRequest.getReaderResource(String)</del>- Replaces <c>getVarResource(String)</c>.
 				<li><del>RestRequest.getReaderResource(String,boolean)</del>
-				<li><del>RestRequest#getReaderResource(String,boolean,String)</del>
+				<li><del>RestRequest.getReaderResource(String,boolean,String)</del>
 			</ul>
 		<li>Changes in {@link org.apache.juneau.rest.RestResponse}:
 			<ul>
@@ -31456,8 +30826,8 @@
 		<li>Removed <c>RestServletProperties.REST_htDocsFolder</c>.  Replaced with <del>@RestResource(staticFiles)</del>}.
 		<li>New annotations on <del>@RestResource</del>.
 			<ul>
-				<li><del>RestResource#stylesheet()</del>
-				<li><del>RestResource#favicon()</del>
+				<li><del>RestResource.stylesheet()</del>
+				<li><del>RestResource.favicon()</del>
 				<li><del>@RestResource(staticFiles)</del>
 			</ul>
 		<li>Eliminated <c>org.apache.juneau.rest.jaxrs.JsonProvider</c> class.  
@@ -31552,16 +30922,16 @@
 		<li>Fixed issue in {@link org.apache.juneau.xml.XmlSerializer} where <js>'\r'</js> and <js>'\n'</js> characters were not being handled per XML specs.
 		<li>New methods on <del>ObjectList</del>:  
 			<ul>
-				<li><del>ObjectList#getAt(Class,String)</del>
-				<li><del>ObjectList#putAt(String,Object)</del>
-				<li><del>ObjectList#postAt(String,Object)</del>
-				<li><del>ObjectList#deleteAt(String)</del>
+				<li><del>ObjectList.getAt(Class,String)</del>
+				<li><del>ObjectList.putAt(String,Object)</del>
+				<li><del>ObjectList.postAt(String,Object)</del>
+				<li><del>ObjectList.deleteAt(String)</del>
 			</ul>
 		<li>New methods on <del>ObjectMap</del>:  
 			<ul>
-				<li><del>ObjectMap#getAt(Class,String)</del>
-				<li><del>ObjectMap#putAt(String,Object)</del>
-				<li><del>ObjectMap#postAt(String,Object)</del>
+				<li><del>ObjectMap.getAt(Class,String)</del>
+				<li><del>ObjectMap.putAt(String,Object)</del>
+				<li><del>ObjectMap.postAt(String,Object)</del>
 				<li><del>ObjectMap.deleteAt(String)</del>
 			</ul>
 		<li><del>@ThreadSafe</del>annotation.
@@ -31614,9 +30984,9 @@
 		<li>Major changes around how serializer and parser class properties are defined to improve performance
 			and concurrency.
 			<ul>
-				<li>New {@link org.apache.juneau.PropertyStore} class - Used for creating context objects.
+				<li>New <del>PropertyStore</del> class - Used for creating context objects.
 				<li>New {@link org.apache.juneau.Context} class - Read-only configurations for serializers and parsers.
-				<li>New {@link org.apache.juneau.Session} class - One-time use objects used by serializers and parsers.
+				<li>New <del>Session</del> class - One-time use objects used by serializers and parsers.
 				<li>All context context properties can now also be specified via system properties.
 			</ul>
 		</li>
@@ -31644,7 +31014,7 @@
 					during parsing. 
 				<li><del>BEAN_beanTypePropertyName</del> - The overridable type property name.  Default is <js>"_type"</js>.
 				<li><del>@BeanProperty(beanDictionary)</del>- Define a type dictionary
-					for a particular bean property value.  This overrides the value specified using <del>BeanContext#BEAN_beanDictionary</del>.
+					for a particular bean property value.  This overrides the value specified using <del>BeanContext.BEAN_beanDictionary</del>.
 				<li><del>SerializerContext.SERIALIZER_addBeanTypeProperties</del>- Controls whether type properties are serialized.
 			</ul>
 			In addition, the {@link org.apache.juneau.annotation.Bean#typeName() @Bean(typeName)} value replaces the <c>@Xml(name)</c> annotation, and the 
@@ -31663,13 +31033,13 @@
 		<li>New methods on {@link org.apache.juneau.parser.Parser}:
 			<ul>
 				<li><c>org.apache.juneau.parser.Parser.createSession(ObjectMap,Method,Object)</c>
-				<li><del>Parser#getMediaRanges()</del>
+				<li><del>Parser.getMediaRanges()</del>
 			</ul>
 		</li>
 		<li>New methods on {@link org.apache.juneau.serializer.Serializer}:
 			<ul>
 				<li><c>org.apache.juneau.serializer.Serializer.createSession(ObjectMap,Method)</c>
-				<li><del>Serializer#getMediaRanges()</del>
+				<li><del>Serializer.getMediaRanges()</del>
 			</ul>
 		</li>
 		<li>New {@link org.apache.juneau.annotation.Bean#sort() @Bean(sort)} annotation.
@@ -31679,7 +31049,7 @@
 		<li>Serializers and parsers now automatically convert {@link java.lang.Class} objects to readable names via <del>ClassUtils.getReadableClassName(Class)</del>.
 		<li>Eliminated the <c>ClassFilter</c> class since it's no longer needed.
 		<li>Code and concurrency improvements to <del>SerializerGroup</del>and <del>ParserGroup</del>.
-		<li>Various enhancements to <del>BeanContext#convertToType(Object,Class)</del>.
+		<li>Various enhancements to <del>BeanContext.convertToType(Object,Class)</del>.
 		<li>New properties on {@link org.apache.juneau.html.HtmlSerializer}:
 			<ul>
 				<li><del>HtmlSerializerContext.HTML_detectLinksInStrings</del>- Automatically detect hyperlinks in strings.
@@ -31705,7 +31075,7 @@
 		<li>OPTIONS pages replaced with Swagger documents.
 			Lots of changes related to supporting Swagger.
 			<ul>
-				<li>Annotation name changes to conform to Swagger specs:  <ja>@Attr</ja>-><ja>@Path</ja>, <ja>@QParam</ja>-><ja>@Query</ja>, <ja>@Param</ja>-><ja>@FormData</ja>, <ja>@Content</ja>-><ja>@Body</ja>
+				<li>Annotation name changes to conform to Swagger specs:  <ja>@Attr</ja>-&gt;<ja>@Path</ja>, <ja>@QParam</ja>-&gt;<ja>@Query</ja>, <ja>@Param</ja>-&gt;<ja>@FormData</ja>, <ja>@Content</ja>-&gt;<ja>@Body</ja>
 				<li>Eliminated <c>ResourceOptions</c> and related code.
 				<li>New annotations and related methods:
 					<ul>
@@ -31717,7 +31087,7 @@
 						<li><del>@RestResource(version)</del>/ <del>RestInfoProvider.getVersion(RestRequest)</del>
 						<li><del>@RestResource(tags)</del>/ <del>RestInfoProvider.getTags(RestRequest)</del>
 						<li><del>@RestResource(externalDocs)</del>/ <del>RestInfoProvidergetExternalDocs(RestRequest)</del>
-						<li><del>RestMethod.summary() @RestMethod(summary)</del>/ <del>RestInfoProvider#getMethodSummary(String,RestRequest)</del>
+						<li><del>RestMethod.summary() @RestMethod(summary)</del>/ <del>RestInfoProvider.getMethodSummary(String,RestRequest)</del>
 						<li><del>RestMethod.description() @RestMethod(description)</del>/<del>RestInfoProvider.getMethodDescription(String,RestRequest)</del>
 						<li><del>@RestMethod(externalDocs)</del>
 						<li><del>@RestMethod(tags)</del>
@@ -31730,20 +31100,20 @@
 		<li>New <del>RestServletContext.paramFormat</del>context property.
 		<li>New/updated methods on <del>RestServlet</del>:
 			<ul>
-				<li><del>RestServlet#createProperties()</del>
-				<li><del>RestServlet#createBeanContext(ObjectMap,Class[],Class[])</del>
-				<li><del>RestServlet#createBeanFilters()</del>
-				<li><del>RestServlet#createPojoSwaps()</del>
-				<li><del>RestServlet#createParsers(ObjectMap,Class[],Class[])</del>
-				<li><del>RestServlet#createUrlEncodingSerializer(ObjectMap,Class[],Class[])</del>
-				<li><del>RestServlet#createUrlEncodingParser(ObjectMap,Class[],Class[])</del>
-				<li><del>RestServlet#createConverters(ObjectMap)</del>
-				<li><del>RestServlet#createDefaultRequestHeaders(ObjectMap)</del>
-				<li><del>RestServlet#createDefaultResponseHeaders(ObjectMap)</del>
-				<li><del>RestServlet#createEncoders(ObjectMap)</del>
-				<li><del>RestServlet#createGuards(ObjectMap)</del>
-				<li><del>RestServlet#createMimetypesFileTypeMap(ObjectMap)</del>
-				<li><del>RestServlet#createResponseHandlers(ObjectMap)</del>
+				<li><del>RestServlet.createProperties()</del>
+				<li><del>RestServlet.createBeanContext(ObjectMap,Class[],Class[])</del>
+				<li><del>RestServlet.createBeanFilters()</del>
+				<li><del>RestServlet.createPojoSwaps()</del>
+				<li><del>RestServlet.createParsers(ObjectMap,Class[],Class[])</del>
+				<li><del>RestServlet.createUrlEncodingSerializer(ObjectMap,Class[],Class[])</del>
+				<li><del>RestServlet.createUrlEncodingParser(ObjectMap,Class[],Class[])</del>
+				<li><del>RestServlet.createConverters(ObjectMap)</del>
+				<li><del>RestServlet.createDefaultRequestHeaders(ObjectMap)</del>
+				<li><del>RestServlet.createDefaultResponseHeaders(ObjectMap)</del>
+				<li><del>RestServlet.createEncoders(ObjectMap)</del>
+				<li><del>RestServlet.createGuards(ObjectMap)</del>
+				<li><del>RestServlet.createMimetypesFileTypeMap(ObjectMap)</del>
+				<li><del>RestServlet.createResponseHandlers(ObjectMap)</del>
 			</ul>
 		</li>
 		<li>New client-version annotations:
@@ -31757,7 +31127,7 @@
 	<h5 class='topic w800'>org.apache.juneau.rest.client</h5>
 	<ul class='spaced-list'>
 		<li>Removed the <c>JazzRestClient</c> class.
-		<li>New method <del>RestClient#setClientVersion(String)</del>.
+		<li>New method <del>RestClient.setClientVersion(String)</del>.
 	</ul>		
 </div>
 </div><!-- END: 6.0.0 -->
@@ -31779,9 +31149,9 @@
 			</ul>
 		<li>New properties in <del>ParserContext</del>.
 			<ul>
-				<li><del>ParserContext#PARSER_strict</del>
-				<li><del>ParserContext#PARSER_inputStreamCharset</del>
-				<li><del>ParserContext#PARSER_fileCharset</del>
+				<li><del>ParserContext.PARSER_strict</del>
+				<li><del>ParserContext.PARSER_inputStreamCharset</del>
+				<li><del>ParserContext.PARSER_fileCharset</del>
 			</ul>
 		<li>Removed <c>JsonParserContext.JSON_strictMode</c>.  Replaced by <c>PARSER_strict</c>.		
 		<li><c><jk>byte[]</jk></c> arrays can now be passed to {@link org.apache.juneau.parser.Parser#parse(Object,Class)} for reader-based parsers.	
@@ -31799,7 +31169,7 @@
 	</p>
 	<p>
 		In particular, this release cleans up the {@link org.apache.juneau.BeanContext} API to match
-		the {@link org.apache.juneau.PropertyStore}/{@link org.apache.juneau.Context}/{@link org.apache.juneau.Session} paradigm
+		the <del>PropertyStore</del>/{@link org.apache.juneau.Context}/<del>Session</del> paradigm
 		previously used in the serializer and parser APIs.
 		It also makes several improvements to the HTML and XML serialization support and introduces HTML5 DTO beans.
 	</p>
@@ -31905,8 +31275,8 @@
 		</ul>
 		<li>Simplified <del>PojoSwap</del> class.  Now just two methods:
 		<ul>
-			<li><del>PojoSwap#swap(BeanSession,Object)</del>
-			<li><del>PojoSwap#unswap(BeanSession,Object,ClassMeta)</del>
+			<li><del>PojoSwap.swap(BeanSession,Object)</del>
+			<li><del>PojoSwap.unswap(BeanSession,Object,ClassMeta)</del>
 		</ul>
 		<li>General code improvements made to {@link org.apache.juneau.ClassMeta} class.
 		<ul>
@@ -31930,17 +31300,17 @@
 			<li><del>DateTimeSimple</del>,<del>DateTimeSimple</del> - To simple <js>"yyyy/MM/dd HH:mm:ss"</js> date-time strings.
 			<li><del>DateSimple</del>,<del>DateSimple</del> - To simple <js>"yyyy/MM/dd"</js> date strings.
 			<li><del>TimeSimple</del>,<del>TimeSimple</del> - To simple <js>"HH:mm:ss"</js> time strings.
-			<li><del>DateFull</del>,<del>DateFull</del> - To {@link java.text.DateFormat.FULL} date strings.
+			<li><del>DateFull</del>,<del>DateFull</del> - To {@link java.text.DateFormat#FULL} date strings.
 			<li><del>DateLong</del>,<del>DateLong</del>- To {@link java.text.DateFormat#LONG} date strings.
-			<li><del>DateMedium</del>,<del>DateMedium</del> - To {@link java.text.DateFormat.MEDIUM} date strings.
+			<li><del>DateMedium</del>,<del>DateMedium</del> - To {@link java.text.DateFormat#MEDIUM} date strings.
 			<li><del>DateShort</del>,<del>DateShort</del>- To {@link java.text.DateFormat#SHORT} date strings.
-			<li><del>TimeFull</del>,<del>TimeFull</del> - To {@link java.text.DateFormat.FULL} time strings.
+			<li><del>TimeFull</del>,<del>TimeFull</del> - To {@link java.text.DateFormat#FULL} time strings.
 			<li><del>TimeLong</del>,<del>TimeLong</del>- To {@link java.text.DateFormat#LONG} time strings.
-			<li><del>TimeMedium</del>,<del>TimeMedium</del> - To {@link java.text.DateFormat.MEDIUM} time strings.
+			<li><del>TimeMedium</del>,<del>TimeMedium</del> - To {@link java.text.DateFormat#MEDIUM} time strings.
 			<li><del>TimeShort</del>,<del>TimeShort</del>- To {@link java.text.DateFormat#SHORT} time strings.
-			<li><del>DateTimeFull</del>,<del>DateTimeFull</del> - To {@link java.text.DateFormat.FULL} date-time strings.
+			<li><del>DateTimeFull</del>,<del>DateTimeFull</del> - To {@link java.text.DateFormat#FULL} date-time strings.
 			<li><del>DateTimeLong</del>,<del>DateTimeLong</del>- To {@link java.text.DateFormat#LONG} date-time strings.
-			<li><del>DateTimeMedium</del>,<del>DateTimeMedium</del> - To {@link java.text.DateFormat.MEDIUM} date-time strings.
+			<li><del>DateTimeMedium</del>,<del>DateTimeMedium</del> - To {@link java.text.DateFormat#MEDIUM} date-time strings.
 			<li><del>DateTimeShort</del>,<del>DateTimeShort</del>- To {@link java.text.DateFormat#SHORT} date-time strings.
 		</ul>  
 		<li>New method <del>SerializerGroup.getSerializerMatch(String)</del>that returns the matched serializer and media type.
@@ -31999,24 +31369,24 @@
 		<li>Standardized the following methods in {@link org.apache.juneau.rest.RestRequest} to remove dependency on <c>ClassMeta</c>
 			objects and eliminate the need for casts:
 			<ul>
-				<li><del>RestRequest#getHeader(String,Class)</del>
-				<li><del>RestRequest#getHeader(String,Object,Class)</del>
-				<li>{@del RestRequest#getHeader(String,Type,Type...)}
-				<li><del>RestRequest#getQueryParameter(String,Class)</del>
-				<li><del>RestRequest#getQueryParameter(String,Object,Class)</del>
-				<li>{@del RestRequest#getQueryParameter(String,Type,Type...)}
-				<li>{@del RestRequest#getQueryParameter(String,Object,Type,Type...)}
-				<li><del>RestRequest#getQueryParameters(String,Class)</del>
-				<li>{@del RestRequest#getQueryParameters(String,Type,Type...)}
-				<li><del>RestRequest#getFormDataParameter(String,Class)</del>
-				<li><del>RestRequest#getFormDataParameter(String,Object,Class)</del>
-				<li><del>RestRequest#getFormDataParameters(String,Class)</del>
-				<li>{@del RestRequest#getFormDataParameter(String,Type,Type...)}
-				<li>{@del RestRequest#getFormDataParameters(String,Type,Type...)}
-				<li><del>RestRequest#getPathParameter(String,Class)</del>
-				<li>{@del RestRequest#getPathParameter(String,Type,Type...)}
-				<li><del>RestRequest#getBody(Class)</del>
-				<li>{@del RestRequest#getBody(Type,Type...)}
+				<li><del>RestRequest.getHeader(String,Class)</del>
+				<li><del>RestRequest.getHeader(String,Object,Class)</del>
+				<li><del> RestRequest.getHeader(String,Type,Type...)</del>
+				<li><del>RestRequest.getQueryParameter(String,Class)</del>
+				<li><del>RestRequest.getQueryParameter(String,Object,Class)</del>
+				<li><del> RestRequest.getQueryParameter(String,Type,Type...)</del>
+				<li><del> RestRequest.getQueryParameter(String,Object,Type,Type...)</del>
+				<li><del>RestRequest.getQueryParameters(String,Class)</del>
+				<li><del> RestRequest.getQueryParameters(String,Type,Type...)</del>
+				<li><del>RestRequest.getFormDataParameter(String,Class)</del>
+				<li><del>RestRequest.getFormDataParameter(String,Object,Class)</del>
+				<li><del>RestRequest.getFormDataParameters(String,Class)</del>
+				<li><del> RestRequest.getFormDataParameter(String,Type,Type...)</del>
+				<li><del> RestRequest.getFormDataParameters(String,Type,Type...)</del>
+				<li><del>RestRequest.getPathParameter(String,Class)</del>
+				<li><del> RestRequest.getPathParameter(String,Type,Type...)</del>
+				<li><del>RestRequest.getBody(Class)</del>
+				<li><del> RestRequest.getBody(Type,Type...)</del>
 			</ul>
 		<li>New methods on <del>NameValuePairs</del>
 		<li>Fixed issue where whitespace was not added to UON/URL-Encoding output when <c>&amp;plainText=true</c> specified.
@@ -32070,12 +31440,12 @@
 			<del>SerializerContext.SERIALIZER_addBeanTypeProperties</del>setting
 			for individual serializers in a serializer group:
 			<ul>
-				<li><del>HtmlSerializerContext#HTML_addBeanTypeProperties</del>
-				<li><del>JsonSerializerContext#JSON_addBeanTypeProperties</del>
-				<li><del>MsgPackSerializerContext#MSGPACK_addBeanTypeProperties</del>
-				<li><del>UonSerializerContext#UON_addBeanTypeProperties</del>
-				<li><del>XmlSerializerContext#XML_addBeanTypeProperties</del>
-				<li><del>RdfSerializerContext#RDF_addBeanTypeProperties</del>
+				<li><del>HtmlSerializerContext.HTML_addBeanTypeProperties</del>
+				<li><del>JsonSerializerContext.JSON_addBeanTypeProperties</del>
+				<li><del>MsgPackSerializerContext.MSGPACK_addBeanTypeProperties</del>
+				<li><del>UonSerializerContext.UON_addBeanTypeProperties</del>
+				<li><del>XmlSerializerContext.XML_addBeanTypeProperties</del>
+				<li><del>RdfSerializerContext.RDF_addBeanTypeProperties</del>
 			</ul>
 		<li>UON notation serializers and parsers moved into the new <c>org.apache.juneau.uon</c> package.
 		<li>New {@link org.apache.juneau.xml.annotation.XmlFormat#VOID} format to identify HTML void elements.
@@ -32117,10 +31487,10 @@
 			<br><ja>@Remoteable</ja> annotation has been moved to this package.
 		<li>Updated doc: <dc>6 - Remoteable Services</dc>
 		<li>New doc: <dc>6.1 -  Interface proxies against 3rd-party REST interfaces</dc>
-		<li>New URL-encoding serializer setting: <del>UrlEncodingSerializerContext#URLENC_paramFormat</del>.
+		<li>New URL-encoding serializer setting: <del>UrlEncodingSerializerContext.URLENC_paramFormat</del>.
 		<li>New methods on {@link org.apache.juneau.urlencoding.UrlEncodingSerializer.Builder}:
 		<ul>
-			<li><del>Builder#paramFormat(String)</del>	
+			<li><del>Builder.paramFormat(String)</del>	
 			<li><del>Builder.plainTextParams()</del>	
 		</ul> 		
 	</ul>
@@ -32238,40 +31608,40 @@
 		<ul>
 			<li><del>RestClient.getRemoteableProxy(Class,Object)</del>- For interface proxies defined using <c><ja>@RestMethod</ja>(name=<js>"PROXY"</js>)</c>.
 			<li><del>RestClient.getRemoteableProxy(Class,Object,Serializer,Parser)</del>- Same as above but overrides the serializer and parser defined on the client.
-			<li><del>RestClient#doPost(Object)</del>
+			<li><del>RestClient.doPost(Object)</del>
 			<li><del>RestClient.doCall(HttpMethod,Object,Object)</del> - Can now pass in instances of <del>NameValuePairs</del>for easy form posts.
 				<br>This extends to all methods that take in the input.
 		</ul>
 		<li>New methods on <del>RestCall</del>:
 			<ul>
-				<li><del>RestCall#uri(Object) uri(Object)</del>
+				<li><del>RestCall.uri(Object) uri(Object)</del>
 				<li><del>query(String,Object,boolean,PartSerializer)</del>
-				<li><del>RestCall#query(String,Object) query(String,Object)</del>
-				<li><del>RestCall#queryIfNE(String,Object) queryIfNE(String,Object)</del>
-				<li><del>RestCall#query(Map) query(Map)</del>
-				<li><del>RestCall#queryIfNE(Map) queryIfNE(Map)</del>
-				<li><del>RestCall#query(String) query(String)</del>
+				<li><del>RestCall.query(String,Object) query(String,Object)</del>
+				<li><del>RestCall.queryIfNE(String,Object) queryIfNE(String,Object)</del>
+				<li><del>RestCall.query(Map) query(Map)</del>
+				<li><del>RestCall.queryIfNE(Map) queryIfNE(Map)</del>
+				<li><del>RestCall.query(String) query(String)</del>
 				<li><del>formData(String,Object,boolean,PartSerializer)</del>
-				<li><del>RestCall#formData(String,Object) formData(String,Object)</del>
-				<li><del>RestCall#formDataIfNE(String,Object) formDataIfNE(String,Object)</del>
-				<li><del>RestCall#formData(Map) formData(Map)</del>
-				<li><del>RestCall#formDataIfNE(Map) formDataIfNE(Map)</del>
+				<li><del>RestCall.formData(String,Object) formData(String,Object)</del>
+				<li><del>RestCall.formDataIfNE(String,Object) formDataIfNE(String,Object)</del>
+				<li><del>RestCall.formData(Map) formData(Map)</del>
+				<li><del>RestCall.formDataIfNE(Map) formDataIfNE(Map)</del>
 				<li><del>header(String,Object,boolean,PartSerializer)</del>
-				<li><del>RestCall#header(String,Object) header(String,Object)</del>
-				<li><del>RestCall#headerIfNE(String,Object) headerIfNE(String,Object)</del>
-				<li><del>RestCall#headers(Map) headers(Map)</del>
-				<li><del>RestCall#headersIfNE(Map) headersIfNE(Map)</del>
-				<li><del>RestCall#host(String) host(String)</del>
-				<li><del>RestCall#port(int) port(int)</del>
-				<li><del>RestCall#userInfo(String,String) userInfo(String,String)</del>
-				<li><del>RestCall#userInfo(String) userInfo(String)</del>
-				<li><del>RestCall#scheme(String) scheme(String)</del>
+				<li><del>RestCall.header(String,Object) header(String,Object)</del>
+				<li><del>RestCall.headerIfNE(String,Object) headerIfNE(String,Object)</del>
+				<li><del>RestCall.headers(Map) headers(Map)</del>
+				<li><del>RestCall.headersIfNE(Map) headersIfNE(Map)</del>
+				<li><del>RestCall.host(String) host(String)</del>
+				<li><del>RestCall.port(int) port(int)</del>
+				<li><del>RestCall.userInfo(String,String) userInfo(String,String)</del>
+				<li><del>RestCall.userInfo(String) userInfo(String)</del>
+				<li><del>RestCall.scheme(String) scheme(String)</del>
 			</ul>
 		<li>New methods added to {@link org.apache.juneau.rest.client.RestClient.Builder}:
 			<ul>
 				<li>{@link org.apache.juneau.rest.client.RestClient.Builder#executorService(ExecutorService,boolean) executorService(ExecutorService,boolean)}
-				<li><del>Builder#paramFormat(String)</del>
-				<li><del>Builder#plainTextParams()</del>
+				<li><del>Builder.paramFormat(String)</del>
+				<li><del>Builder.plainTextParams()</del>
 				<li>{@link org.apache.juneau.rest.client.RestClient.Builder#noTrace() noTrace()} - Adds a <c>No-Trace: true</c> header on all requests to prevent
 					the servlet from logging errors.
 					<br>Useful for testing scenarios when you don't want the console to end up showing errors done on purpose.
@@ -32279,10 +31649,10 @@
 			</ul>
 		<li>New methods added/updated to <del>RestCall</del>:
 			<ul>
-				<li><del>RestCall#runFuture() runFuture()</del>
-				<li><del>RestCall#getResponseFuture(Class) getResponseFuture(Class)</del>
-				<li>{@del org.apache.juneau.rest.client.RestCall#getResponseFuture(Type,Type...) getResponseFuture(Type,Type...)}
-				<li><del>RestCall#getResponseAsStringFuture() getResponseAsStringFuture()</del>
+				<li><del>RestCall.runFuture() runFuture()</del>
+				<li><del>RestCall.getResponseFuture(Class) getResponseFuture(Class)</del>
+				<li><del> org.apache.juneau.rest.client.RestCall.getResponseFuture(Type,Type...) getResponseFuture(Type,Type...)</del>
+				<li><del>RestCall.getResponseAsStringFuture() getResponseAsStringFuture()</del>
 				<li><del>RestCall.serializer(Serializer) serializer(Serializer)</del>- Override the serializer defined on the client for a single call.
 				<li><del>RestCall.parser(Parser) parser(Parser)</del> - Override the parser defined on the client for a single call.
 				<li><del>input(Object)</del>- Now accepts instances of <del>NameValuePairs</del>.
@@ -32347,19 +31717,19 @@
 			</p>
 		<li>New/modified methods on <del>ConfigFile</del>:
 			<ul>
-				<li><del>ConfigFile#put(String,String,String,boolean)</del>
-				<li><del>ConfigFile#put(String,String,Object,Serializer,boolean,boolean)</del>
-				<li>{@del ConfigFile#getObject(String,Type,Type...)}
-				<li>{@del ConfigFile#getObject(String,Parser,Type,Type...)}
-				<li><del>ConfigFile#getObject(String,Class)</del>
-				<li><del>ConfigFile#getObject(String,Parser,Class)</del>
-				<li>{@del ConfigFile#getObject(String,String,Type,Type...)}
-				<li>{@del ConfigFile#getObject(String,String,Parser,Type,Type...)}
-				<li><del>ConfigFile#getObject(String,String,Class)</del>
-				<li><del>ConfigFile#getObject(String,String,Parser,Class)</del>
-				<li>{@del ConfigFile#getObjectWithDefault(String,Object,Type,Type...)}
-				<li>{@del ConfigFile#getObjectWithDefault(String,Parser,Object,Type,Type...)}
-				<li><del>ConfigFile#getObjectWithDefault(String,Object,Class)</del>
+				<li><del>ConfigFile.put(String,String,String,boolean)</del>
+				<li><del>ConfigFile.put(String,String,Object,Serializer,boolean,boolean)</del>
+				<li><del> ConfigFile.getObject(String,Type,Type...)</del>
+				<li><del> ConfigFile.getObject(String,Parser,Type,Type...)</del>
+				<li><del>ConfigFile.getObject(String,Class)</del>
+				<li><del>ConfigFile.getObject(String,Parser,Class)</del>
+				<li><del> ConfigFile.getObject(String,String,Type,Type...)</del>
+				<li><del> ConfigFile.getObject(String,String,Parser,Type,Type...)</del>
+				<li><del>ConfigFile.getObject(String,String,Class)</del>
+				<li><del>ConfigFile.getObject(String,String,Parser,Class)</del>
+				<li><del> ConfigFile.getObjectWithDefault(String,Object,Type,Type...)</del>
+				<li><del> ConfigFile.getObjectWithDefault(String,Parser,Object,Type,Type...)</del>
+				<li><del>ConfigFile.getObjectWithDefault(String,Object,Class)</del>
 				<li><del>ConfigFile.getObjectWithDefault(String,Parser,Object,Class)</del>
 			</ul>
 		<li>New ability to interact with config file sections with proxy interfaces with new method <del>ConfigFile.getSectionAsInterface(String,Class)</del>.
@@ -32368,9 +31738,9 @@
 		<li>New methods on {@link org.apache.juneau.serializer.SerializerSession} and {@link org.apache.juneau.parser.ParserSession}
 			for retrieving context and runtime-override properties:
 			<ul>
-				<li><del>Session#getProperty(String)</del>
-				<li><del>Session#getProperty(String,String)</del>
-				<li><del>Session#getProperty(Class,String)</del>
+				<li><del>Session.getProperty(String)</del>
+				<li><del>Session.getProperty(String,String)</del>
+				<li><del>Session.getProperty(Class,String)</del>
 				<li><del>Session.getProperty(Class,String,Object)</del>
 			</ul>	
 		<li>New <del>PartSerializer</del>interface particularly tailored to HTTP
@@ -32378,14 +31748,14 @@
 			<br>Allows easy user-defined serialization of these objects.
 			<br>The interface can be used in the following locations:
 			<ul>
-				<li><del>Builder#partSerializer(Class)</del>
-				<li><del>Path#serializer</del>
-				<li><del>Query#serializer</del>
-				<li><del>QueryIfNE#serializer</del>
-				<li><del>FormData#serializer</del>
-				<li><del>FormDataIfNE#serializer</del>
-				<li><del>Header#serializer</del>
-				<li><del>HeaderIfNE#serializer</del>
+				<li><del>Builder.partSerializer(Class)</del>
+				<li><del>Path.serializer</del>
+				<li><del>Query.serializer</del>
+				<li><del>QueryIfNE.serializer</del>
+				<li><del>FormData.serializer</del>
+				<li><del>FormDataIfNE.serializer</del>
+				<li><del>Header.serializer</del>
+				<li><del>HeaderIfNE.serializer</del>
 			</ul>
 		<li>Across-the-board improvements to the URI-resolution support (i.e. how URIs get serialized).
 			<ul>
@@ -32416,10 +31786,10 @@
 						<li>{@link org.apache.juneau.UriResolver}
 					</ul>
 				<li>New configuration properties:
-					<li><del>SerializerContext#SERIALIZER_uriContext</del>
-					<li><del>SerializerContext#SERIALIZER_uriRelativity</del>
-					<li><del>SerializerContext#SERIALIZER_uriResolution</del>
-					<li><del>SerializerContext#SERIALIZER_maxIndent</del>
+					<li><del>SerializerContext.SERIALIZER_uriContext</del>
+					<li><del>SerializerContext.SERIALIZER_uriRelativity</del>
+					<li><del>SerializerContext.SERIALIZER_uriResolution</del>
+					<li><del>SerializerContext.SERIALIZER_maxIndent</del>
 			</ul>
 		<li>New annotation property: <del>@BeanProperty(value)</del>.
 			<br>The following two annotations are considered equivalent:
@@ -32429,7 +31799,7 @@
 		<ja>@BeanProperty</ja>(<js>"foo"</js>)
 			</p>
 		<li>Fixed a race condition in ClassMeta.
-		<li><jsf>URLENC_paramFormat</jsf> has been moved to <del>UonSerializer#UON_paramFormat</del>, 
+		<li><jsf>URLENC_paramFormat</jsf> has been moved to <del>UonSerializer.UON_paramFormat</del>, 
 			and the UON/URL-Encoding serializers will now always serialize all values as plain text.
 			<br>This means that arrays and maps are converted to simple comma-delimited lists.
 		<li>Listener APIs added to serializers and parsers:
@@ -32437,11 +31807,11 @@
 				<li>{@link org.apache.juneau.serializer.SerializerListener}
 				<li>{@link org.apache.juneau.serializer.Serializer.Builder#listener(Class)}
 				<li><del>@RestResource(serializerListener)</del>
-				<li><del>RestConfig#serializerListener(Class)</del>
+				<li><del>RestConfig.serializerListener(Class)</del>
 				<li>{@link org.apache.juneau.parser.ParserListener}
 				<li>{@link org.apache.juneau.parser.Parser.Builder#listener(Class)}
 				<li><del>@RestResource(parserListener)</del>
-				<li><del>RestConfig#parserListener(Class)</del>
+				<li><del>RestConfig.parserListener(Class)</del>
 				<li><del>Builder.listeners(Class,Class)</del>
 			</ul>juneau-examples-core.import1.pngjuneau-examples-core.import1.png
 		<li>The <del>BEAN_debug</del>flag will now capture parser input and make it
@@ -32456,17 +31826,17 @@
 					<br>Annotation can be applied to POJO classes and bean properties.
 				<li>Several new properties for customizing parts of the HTML page:
 					<ul>
-						<li><del>HtmlDocSerializerContext#HTMLDOC_title</del>
-						<li><del>HtmlDocSerializerContext#HTMLDOC_description</del>
-						<li><del>HtmlDocSerializerContext#HTMLDOC_branding</del>
-						<li><del>HtmlDocSerializerContext#HTMLDOC_header</del>
-						<li><del>HtmlDocSerializerContext#HTMLDOC_nav</del>
-						<li><del>HtmlDocSerializerContext#HTMLDOC_aside</del>
-						<li><del>HtmlDocSerializerContext#HTMLDOC_footer</del>
-						<li><del>HtmlDocSerializerContext#HTMLDOC_noResultsMessage</del>
-						<li><del>HtmlDocSerializerContext#HTMLDOC_cssUrl</del>
-						<li><del>HtmlDocSerializerContext#HTMLDOC_css</del>
-						<li><del>HtmlDocSerializerContext#HTMLDOC_template</del>
+						<li><del>HtmlDocSerializerContext.HTMLDOC_title</del>
+						<li><del>HtmlDocSerializerContext.HTMLDOC_description</del>
+						<li><del>HtmlDocSerializerContext.HTMLDOC_branding</del>
+						<li><del>HtmlDocSerializerContext.HTMLDOC_header</del>
+						<li><del>HtmlDocSerializerContext.HTMLDOC_nav</del>
+						<li><del>HtmlDocSerializerContext.HTMLDOC_aside</del>
+						<li><del>HtmlDocSerializerContext.HTMLDOC_footer</del>
+						<li><del>HtmlDocSerializerContext.HTMLDOC_noResultsMessage</del>
+						<li><del>HtmlDocSerializerContext.HTMLDOC_cssUrl</del>
+						<li><del>HtmlDocSerializerContext.HTMLDOC_css</del>
+						<li><del>HtmlDocSerializerContext.HTMLDOC_template</del>
 					</ul>
 				<li>New interface {@link org.apache.juneau.html.HtmlDocTemplate} that allows full control over rendering
 					of HTML produced by {@link org.apache.juneau.html.HtmlDocSerializer}.
@@ -32601,7 +31971,7 @@
 		<li>
 			New annotations added to <del>RestMethod @RestMethod</del>:
 			<ul>
-				<li><del>RestMethod#defaultQuery() defaultQuery()</del>
+				<li><del>RestMethod.defaultQuery() defaultQuery()</del>
 				<li><del>RestMethod.defaultFormData() defaultFormData()</del>
 				<li><del>bpIncludes()</del>
 				<li><del>bpExcludes()</del>
@@ -32626,7 +31996,7 @@
 			New attributes on <del>RestMethod @RestMethod</del>:
 			<ul>
 				<li><del>widgets()</del>
-				<li><del>RestMethod#swagger() swagger()</del>
+				<li><del>RestMethod.swagger() swagger()</del>
 				<li><del>RestMethod.htmldoc() htmldoc()</del>
 			</ul>
 		<li>
@@ -32744,7 +32114,7 @@
 	<h5 class='topic w800'>org.apache.juneau</h5>
 	<ul class='spaced-list'>
 		<li>
-			{@link org.apache.juneau.utils.PojoQuery} improvements.
+			<del>PojoQuery</del> improvements.
 		<li>
 			New <del>RemoteMethod.returns()</del> annotation.
 			<br>Allows you to specify whether the remote method returns the HTTP body or status code.
@@ -32815,12 +32185,12 @@
 				<li>Several annotations are now arrays of strings instead of simple strings.
 					Values are simply concatenated with newlines which makes multi-line values cleaner.
 					<ul>
-						<li><del>HtmlDoc#header() header()</del>
-						<li><del>HtmlDoc#nav() nav()</del>
-						<li><del>HtmlDoc#aside() aside()</del>
-						<li><del>HtmlDoc#footer() footer()</del>
-						<li><del>HtmlDoc#script() script()</del>
-						<li><del>HtmlDoc#style() style()</del>
+						<li><del>HtmlDoc.header() header()</del>
+						<li><del>HtmlDoc.nav() nav()</del>
+						<li><del>HtmlDoc.aside() aside()</del>
+						<li><del>HtmlDoc.footer() footer()</del>
+						<li><del>HtmlDoc.script() script()</del>
+						<li><del>HtmlDoc.style() style()</del>
 					</ul>
 					Additionally, the <js>"INHERIT"</js> string literal can be used to combine the value with
 					the value defined on the servlet or parent class.  Links can also be inserted at specific
@@ -32832,9 +32202,9 @@
 				<li>
 					You can now add arbitrary CSS and Javascript along with your widgets through new methods:
 					<ul>
-						<li><del>Widget#getHtml(RestRequest)</del>
-						<li><del>Widget#getScript(RestRequest)</del>
-						<li><del>Widget#getStyle(RestRequest)</del>
+						<li><del>Widget.getHtml(RestRequest)</del>
+						<li><del>Widget.getScript(RestRequest)</del>
+						<li><del>Widget.getStyle(RestRequest)</del>
 					</ul>
 				</li>
 				<li>
@@ -32846,8 +32216,8 @@
 				<li>
 					Renamed widgets:
 					<ul>
-						<li><c>PoweredByApacheWidget</c> -> <c>PoweredByApache</c>  
-						<li><c>PoweredByJuneauWidget</c> -> <c>PoweredByJuneau</c>  
+						<li><c>PoweredByApacheWidget</c> -&gt; <c>PoweredByApache</c>  
+						<li><c>PoweredByJuneauWidget</c> -&gt; <c>PoweredByJuneau</c>  
 					</ul>
 				<li>
 					New {@link org.apache.juneau.rest.widget.MenuItemWidget} can be used as a starting point for creatint pull-down menu items.
@@ -32880,8 +32250,8 @@
 		<li>
 			Two convenience methods added to {@link org.apache.juneau.rest.RestRequest}:
 			<ul>
-				<li><del>RestRequest#attr(String,Object)</del>
-				<li><del>RestRequest#prop(String,Object)</del>
+				<li><del>RestRequest.attr(String,Object)</del>
+				<li><del>RestRequest.prop(String,Object)</del>
 			</ul>
 		</li>
 		<li>
@@ -33204,7 +32574,7 @@
 		<li>
 			New <del>Surrogate</del> interface for identifying surrogate classes.
 		<li>
-			Serializers can now serialize to {@link java.util.StringBuilder StringBuilders}.
+			Serializers can now serialize to {@link java.lang.StringBuilder StringBuilders}.
 		<li>
 			Serializers now serialize the contents of {@link java.io.Reader Readers} and {@link java.io.InputStream InputStreams}
 			directly to the output stream or writer.
@@ -33258,33 +32628,33 @@
 		<li>
 			New methods on <del>ObjectList</del>:
 			<ul>
-				<li><del>ObjectList#get(int,Class) get(int,Class)</del>
-				<li>{@del org.apache.juneau.ObjectList#get(int,Type,Type...) get(int,Type,Type...)}
-				<li><del>ObjectList#getMap(int,Class,Class) getMap(int,Class,Class)</del>
-				<li><del>ObjectList#getList(int,Class) getList(int,Class)</del>
+				<li><del>ObjectList.get(int,Class) get(int,Class)</del>
+				<li><del> org.apache.juneau.ObjectList.get(int,Type,Type...) get(int,Type,Type...)</del>
+				<li><del>ObjectList.getMap(int,Class,Class) getMap(int,Class,Class)</del>
+				<li><del>ObjectList.getList(int,Class) getList(int,Class)</del>
 			</ul>
 		<li>
 			New methods on <del>ObjectMap</del>:
 			<ul>
-				<li><del>ObjectMap#get(String,Class) get(String,Class)</del>
-				<li>{@del org.apache.juneau.ObjectMap#get(String,Type,Type...) get(String,Type,Type...)}
-				<li><del>ObjectMap#getWithDefault(String,Object) getWithDefault(String,Object)</del>
-				<li><del>ObjectMap#getWithDefault(String,Object,Class) getWithDefault(String,Object,Class)</del>
-				<li>{@del org.apache.juneau.ObjectMap#getWithDefault(String,Object,Type,Type...) getWithDefault(String,Object,Type,Type...)}
-				<li><del>ObjectMap#getSwapped(String,PojoSwap) getSwapped(String,PojoSwap)</del>
-				<li><del>ObjectMap#getAt(String,Class) getAt(String,Class)</del>
-				<li>{@del org.apache.juneau.ObjectMap#getAt(String,Type,Type...) getAt(String,Type,Type...)}
-				<li><del>ObjectMap#getMap(String,Class,Class,Map) getMap(String,Class,Class,Map)</del>
-				<li><del>ObjectMap#getList(String,Class,List) getList(String,Class,List)</del>
+				<li><del>ObjectMap.get(String,Class) get(String,Class)</del>
+				<li><del> org.apache.juneau.ObjectMap.get(String,Type,Type...) get(String,Type,Type...)</del>
+				<li><del>ObjectMap.getWithDefault(String,Object) getWithDefault(String,Object)</del>
+				<li><del>ObjectMap.getWithDefault(String,Object,Class) getWithDefault(String,Object,Class)</del>
+				<li><del> org.apache.juneau.ObjectMap.getWithDefault(String,Object,Type,Type...) getWithDefault(String,Object,Type,Type...)</del>
+				<li><del>ObjectMap.getSwapped(String,PojoSwap) getSwapped(String,PojoSwap)</del>
+				<li><del>ObjectMap.getAt(String,Class) getAt(String,Class)</del>
+				<li><del> org.apache.juneau.ObjectMap.getAt(String,Type,Type...) getAt(String,Type,Type...)</del>
+				<li><del>ObjectMap.getMap(String,Class,Class,Map) getMap(String,Class,Class,Map)</del>
+				<li><del>ObjectMap.getList(String,Class,List) getList(String,Class,List)</del>
 			</ul>
 		<li>
 			New methods on <del>PojoRest</del>:
 			<ul>
-				<li><del>PojoRest#get(String,Class) get(String,Class)</del>
-				<li>{@del org.apache.juneau.utils.PojoRest#get(String,Type,Type...) get(String,Type,Type...)}
-				<li><del>PojoRest#getWithDefault(String,Object) getWithDefault(String,Object)</del>
-				<li><del>PojoRest#getWithDefault(String,Object,Class) getWithDefault(String,Object,Class)</del>
-				<li>{@del org.apache.juneau.utils.PojoRest#getWithDefault(String,Object,Type,Type...) getWithDefault(String,Object,Type,Type...)}
+				<li><del>PojoRest.get(String,Class) get(String,Class)</del>
+				<li><del> org.apache.juneau.utils.PojoRest.get(String,Type,Type...) get(String,Type,Type...)</del>
+				<li><del>PojoRest.getWithDefault(String,Object) getWithDefault(String,Object)</del>
+				<li><del>PojoRest.getWithDefault(String,Object,Class) getWithDefault(String,Object,Class)</del>
+				<li><del> org.apache.juneau.utils.PojoRest.getWithDefault(String,Object,Type,Type...) getWithDefault(String,Object,Type,Type...)</del>
 			</ul>
 		<li>
 			Fixed bug where {@link org.apache.juneau.BeanSession#getMediaType()} wasn't returning a value.
@@ -33305,7 +32675,7 @@
 	<h5 class='topic w800'>juneau-dto</h5>
 	<ul class='spaced-list'>
 		<li>
-			{@link org.apache.juneau.dto.html5.HtmlElementMixed.children(Object...)} can now take in collections
+			{@link org.apache.juneau.dto.html5.HtmlElementMixed#children(Object...)} can now take in collections
 			of objects.
 		<li>
 			The DTO beans can now be serialized to strings of their typical language by calling the <c>toString()</c> method.
@@ -33322,25 +32692,25 @@
 			<ul>
 				<li>The <del>RestServlet.init(ServletConfig)</del>method is now final and can
 					no longer be extended.
-					<br>Instead, use {@link org.apache.juneau.rest.annotation.HookEvent#INIT} or 
-					{@link org.apache.juneau.rest.annotation.HookEvent#POST_INIT} for initialization.
+					<br>Instead, use <del>HookEvent.INIT</del> or 
+					<del>HookEvent.POST_INIT</del> for initialization.
 				<li>The following methods on <del>RestServlet</del> have been removed:
 					<ul>
 						<li><c>init(RestConfig)</c> 
-							- Use {@link org.apache.juneau.rest.annotation.HookEvent#INIT} instead.
+							- Use <del>HookEvent.INIT</del> instead.
 						<li><c>onSuccess(RestRequest, RestResponse, long)</c>
-							- Use {@link org.apache.juneau.rest.annotation.HookEvent#END_CALL} instead.
+							- Use <del>HookEvent.END_CALL</del> instead.
 						<li><c>onPreCall(RestRequest)</c>
-							- Use {@link org.apache.juneau.rest.annotation.HookEvent#PRE_CALL} instead.
+							- Use <del>HookEvent.PRE_CALL</del> instead.
 						<li><c>onPostCall(RestRequest, RestResponse)</c>
-							- Use {@link org.apache.juneau.rest.annotation.HookEvent#POST_CALL} instead.
+							- Use <del>HookEvent.POST_CALL</del> instead.
 					</ul> 	
 			</ul>
 		<li>
 			Simplified {@link org.apache.juneau.rest.widget.MenuItemWidget}.
 			<br>Exposes an abstract method <del>getContent(RestRequest)</del> that
 			can return raw HTML via readers or char-sequences, or any other object (such as HTML5 beans) that will
-			get converted to HTML using {@link org.apache.juneau.html.HtmlSerializer.DEFAULT}.
+			get converted to HTML using {@link org.apache.juneau.html.HtmlSerializer#DEFAULT}.
 		<li>
 			<del>RestResourceResolver</del> instances are now inherited from parent resources to child resources
 			unless explicitly overridden at the child level.
@@ -33378,9 +32748,9 @@
 			The following implementation classes can now be defined as non-static inner classes of servlets/resources:
 			<ul>
 				<li>{@link org.apache.juneau.rest.widget.Widget}
-				<li>{@link org.apache.juneau.rest.RestConverter}
+				<li><del>RestConverter</del>
 				<li><del>RestGuard</del>
-				<li>{@link org.apache.juneau.rest.ResponseHandler}
+				<li><del>ResponseHandler</del>
 				<li><del>RestCallHandler</del>
 				<li><del>RestInfoProvider</del>
 				<li><del>RestResourceResolver</del>
@@ -33424,7 +32794,7 @@
 		<li>
 			New methods on {@link org.apache.juneau.microservice.Microservice}:
 			<ul>
-				<li>{@link org.apache.juneau.microservice.Microservice.getInstance() getInstance()}
+				<li>{@link org.apache.juneau.microservice.Microservice#getInstance() getInstance()}
 			</ul>
 		<li>
 			New class <del>JettyLogger</del> for directing Jetty logging to the
@@ -33468,7 +32838,7 @@
 	<h5 class='topic w800'>juneau-rest-server</h5>
 	<ul class='spaced-list'>
 		<li>
-			Annotation <c><ja>@HtmlDoc</ja>(links)</c> renamed to <del>HtmlDoc#navlinks() navlinks</del>.
+			Annotation <c><ja>@HtmlDoc</ja>(links)</c> renamed to <del>HtmlDoc.navlinks() navlinks</del>.
 		<li>
 			New annotation <del>HtmlDoc.head() @HtmlDoc(head)</del>.
 			<br>Allows you to specify arbitrary HTML content in the <xt>&lt;head&gt;</xt> section of the page.
@@ -33515,11 +32885,11 @@
 			</p>
 			<br>The same static create methods have also been added to the following classes:
 			<ul>
-				<li><del>SerializerGroup#create()</del>
-				<li><del>ParserGroup#create()</del>
-				<li><del>EncoderGroup#create()</del>
+				<li><del>SerializerGroup.create()</del>
+				<li><del>ParserGroup.create()</del>
+				<li><del>EncoderGroup.create()</del>
 				<li>{@link org.apache.juneau.rest.client.RestClient#create()}
-				<li><del>ConfigFile#create()</del>
+				<li><del>ConfigFile.create()</del>
 			</ul>
 		<li>
 			The order of the parameters in {@link org.apache.juneau.serializer.SerializerSession#serialize(Object,Object)}
@@ -33669,7 +33039,7 @@
 					Session objects also now have a consistent class hierarchy.
 					<br>For example, the class hierarchy of <c>JsonSerializerSession</c> is now:
 					<ul class='doctree'>
-						<li class='jac'>{@link org.apache.juneau.Session}
+						<li class='jac'><del>Session</del>
 						<ul>
 							<li class='jc'>{@link org.apache.juneau.BeanSession}
 							<ul>
@@ -33701,8 +33071,8 @@
 					</ul>
 					Builder objects are used for building up and creating <c>Context</c> objects.
 				<li>
-					The {@link org.apache.juneau.PropertyStore} class has been completely rewritten.
-					It is now a read-only configuration store build using the {@link org.apache.juneau.PropertyStoreBuilder}
+					The <del>PropertyStore</del> class has been completely rewritten.
+					It is now a read-only configuration store build using the <del>PropertyStoreBuilder</del>
 					class.
 					<br>The previous <c>PropertyStore</c> class was overly-complicated with many read/write
 					locks to ensure thread-safety. 
@@ -33732,7 +33102,7 @@
 			</ul>
 			Code for marshalling of parts have been removed from the URL-Encoding serializers and parsers.
 		<li>	
-			<c>Context.Builder.property(String,Object)</c> renamed to <del>Builder#set(String,Object)</del>.
+			<c>Context.Builder.property(String,Object)</c> renamed to <del>Builder.set(String,Object)</del>.
 		<li>
 			<c>ResourceFinder</c> class has been replaced with the following:
 			<ul>
@@ -33835,41 +33205,41 @@
 			The <js>"$R{...}"</js> variable has been split into the following:
 			<ul>
 				<li><js>"$RA{key1[,key2...]}"</js> - {@link org.apache.juneau.rest.vars.RequestAttributeVar}, first non-null value returned by <c>HttpServletRequest.getAttribute(String)</c>.
-				<li><js>"$RF{key1[,key2...]}"</js> - {@link org.apache.juneau.rest.vars.RequestFormDataVar}, first non-null value returned by <del>RestRequest#getFormData(String)</del>.
+				<li><js>"$RF{key1[,key2...]}"</js> - {@link org.apache.juneau.rest.vars.RequestFormDataVar}, first non-null value returned by <del>RestRequest.getFormData(String)</del>.
 				<li><js>"$RH{key1[,key2...]}"</js> - {@link org.apache.juneau.rest.vars.RequestHeaderVar}, first non-null value returned by {@link org.apache.juneau.rest.RestRequest#getHeader(String)}.
-				<li><js>"$RI{key1[,key2...]}"</js> - <del>RestInfoVar</del>, first non-null value returned by <del>RestRequest#getInfoProvider()</del>.
+				<li><js>"$RI{key1[,key2...]}"</js> - <del>RestInfoVar</del>, first non-null value returned by <del>RestRequest.getInfoProvider()</del>.
 					<br>The possible values are:
 					<ul>
 						<li><js>"contact"</js> - Value returned by {@link org.apache.juneau.dto.swagger.Info#getContact()}
-						<li><js>"description"</js> - Value returned by <del>RestInfoProvider#getDescription(RestRequest)</del>
+						<li><js>"description"</js> - Value returned by <del>RestInfoProvider.getDescription(RestRequest)</del>
 						<li><js>"externalDocs"</js> - Value returned by {@link org.apache.juneau.dto.swagger.Swagger#getExternalDocs()}
 						<li><js>"license"</js> - Value returned by {@link org.apache.juneau.dto.swagger.Info#getLicense()}
-						<li><js>"methodDescription"</js> - Value returned by <del>RestInfoProvider#getMethodDescription(Method,RestRequest)</del>
-						<li><js>"methodSummary"</js> - Value returned by <del>RestInfoProvider#getMethodSummary(Method,RestRequest)</del>
-						<li><js>"siteName"</js> - Value returned by <del>RestInfoProvider#getSiteName(RestRequest)</del>
+						<li><js>"methodDescription"</js> - Value returned by <del>RestInfoProvider.getMethodDescription(Method,RestRequest)</del>
+						<li><js>"methodSummary"</js> - Value returned by <del>RestInfoProvider.getMethodSummary(Method,RestRequest)</del>
+						<li><js>"siteName"</js> - Value returned by <del>RestInfoProvider.getSiteName(RestRequest)</del>
 						<li><js>"tags"</js> - Value returned by {@link org.apache.juneau.dto.swagger.Swagger#getTags()}
 						<li><js>"termsOfService"</js> - Value returned by {@link org.apache.juneau.dto.swagger.Info#getTermsOfService()}
-						<li><js>"title"</js> - See <del>RestInfoProvider#getTitle(RestRequest)</del>
+						<li><js>"title"</js> - See <del>RestInfoProvider.getTitle(RestRequest)</del>
 						<li><js>"version"</js> - See {@link org.apache.juneau.dto.swagger.Info#getVersion()}
 					</ul>					
-				<li><js>"$RP{key1[,key2...]}"</js> - {@link org.apache.juneau.rest.vars.RequestPathVar}, first non-null value returned by <del>RestRequest#getPath(String)</del>.
-				<li><js>"$RQ{key1[,key2...]}"</js> - {@link org.apache.juneau.rest.vars.RequestQueryVar}, first non-null value returned by <del>RestRequest#getQuery(String)</del>.
+				<li><js>"$RP{key1[,key2...]}"</js> - {@link org.apache.juneau.rest.vars.RequestPathVar}, first non-null value returned by <del>RestRequest.getPath(String)</del>.
+				<li><js>"$RQ{key1[,key2...]}"</js> - {@link org.apache.juneau.rest.vars.RequestQueryVar}, first non-null value returned by <del>RestRequest.getQuery(String)</del>.
 				<li><js>"$R{key1[,key2...]}"</js> - {@link org.apache.juneau.rest.vars.RequestVar}, first non-null other request variable.
 					<br>The possible values are:
 					<ul>
 						<li><js>"contextPath"</js> - Value returned by {@link org.apache.juneau.rest.RestRequest#getContextPath()}
 						<li><js>"method"</js> - Value returned by {@link org.apache.juneau.rest.RestRequest#getMethod()}
-						<li><js>"methodDescription"</js> - Value returned by <del>RestRequest#getMethodDescription()</del>
-						<li><js>"methodSummary"</js> - Value returned by <del>RestRequest#getMethodSummary()</del>
+						<li><js>"methodDescription"</js> - Value returned by <del>RestRequest.getMethodDescription()</del>
+						<li><js>"methodSummary"</js> - Value returned by <del>RestRequest.getMethodSummary()</del>
 						<li><js>"pathInfo"</js> - Value returned by {@link org.apache.juneau.rest.RestRequest#getPathInfo()}
 						<li><js>"requestParentURI"</js> - Value returned by {@link org.apache.juneau.UriContext#getRootRelativePathInfoParent()}
 						<li><js>"requestURI"</js> - Value returned by {@link org.apache.juneau.rest.RestRequest#getRequestURI()}
-						<li><js>"resourceDescription"</js> - Value returned by <del>RestRequest#getResourceDescription()</del>
-						<li><js>"resourceTitle"</js> - See <del>RestRequest#getResourceTitle()</del>
+						<li><js>"resourceDescription"</js> - Value returned by <del>RestRequest.getResourceDescription()</del>
+						<li><js>"resourceTitle"</js> - See <del>RestRequest.getResourceTitle()</del>
 						<li><js>"servletParentURI"</js> - Value returned by {@link org.apache.juneau.UriContext#getRootRelativeServletPathParent()}
 						<li><js>"servletPath"</js> - See {@link org.apache.juneau.rest.RestRequest#getServletPath()}
 						<li><js>"servletURI"</js> - See {@link org.apache.juneau.UriContext#getRootRelativeServletPath()}
-						<li><js>"siteName"</js> - See <del>RestRequest#getSiteName()</del>
+						<li><js>"siteName"</js> - See <del>RestRequest.getSiteName()</del>
 					</ul>
 			</ul>
 		<li>
@@ -33877,33 +33247,33 @@
 			<br>Settings on {@link org.apache.juneau.rest.RestContext} objects can now be set declaratively through the 
 				following new properties:
 			<ul>
-				<li><del>RestContext#REST_allowHeaderParams</del>
-				<li><del>RestContext#REST_allowBodyParam</del>
-				<li><del>RestContext#REST_allowedMethodParams REST_allowedMethodParams</del>
-				<li><del>RestContext#REST_renderResponseStackTraces REST_renderResponseStackTraces</del>
-				<li><del>RestContext#REST_useStackTraceHashes</del>
-				<li><del>RestContext#REST_defaultCharset REST_defaultCharset</del>
-				<li><del>RestContext#REST_maxInput REST_maxInput</del>
-				<li><del>RestContext#REST_paramResolvers</del>
-				<li><del>RestContext#REST_converters REST_converters</del>
-				<li><del>RestContext#REST_guards REST_guards</del>
-				<li><del>RestContext#REST_responseHandlers</del>
-				<li><del>RestContext#REST_defaultRequestHeaders</del>
-				<li><del>RestContext#REST_defaultResponseHeaders</del>
-				<li><del>RestContext#REST_produces REST_produces</del>
-				<li><del>RestContext#REST_consumes REST_consumes</del>
-				<li><del>RestContext#REST_clientVersionHeader REST_clientVersionHeader</del>
-				<li><del>RestContext#REST_resourceResolver</del>
-				<li><del>RestContext#REST_logger</del>
-				<li><del>RestContext#REST_callHandler</del>
-				<li><del>RestContext#REST_infoProvider</del>
-				<li><del>RestContext#REST_path REST_path</del>
-				<li><del>RestContext#REST_contextPath</del>
-				<li><del>RestContext#REST_staticFiles REST_staticFiles</del>
-				<li><del>RestContext#REST_staticFileResponseHeaders</del>
-				<li><del>RestContext#REST_classpathResourceFinder</del>
-				<li><del>RestContext#REST_useClasspathResourceCaching</del>
-				<li><del>RestContext#REST_widgets</del>
+				<li><del>RestContext.REST_allowHeaderParams</del>
+				<li><del>RestContext.REST_allowBodyParam</del>
+				<li><del>RestContext.REST_allowedMethodParams REST_allowedMethodParams</del>
+				<li><del>RestContext.REST_renderResponseStackTraces REST_renderResponseStackTraces</del>
+				<li><del>RestContext.REST_useStackTraceHashes</del>
+				<li><del>RestContext.REST_defaultCharset REST_defaultCharset</del>
+				<li><del>RestContext.REST_maxInput REST_maxInput</del>
+				<li><del>RestContext.REST_paramResolvers</del>
+				<li><del>RestContext.REST_converters REST_converters</del>
+				<li><del>RestContext.REST_guards REST_guards</del>
+				<li><del>RestContext.REST_responseHandlers</del>
+				<li><del>RestContext.REST_defaultRequestHeaders</del>
+				<li><del>RestContext.REST_defaultResponseHeaders</del>
+				<li><del>RestContext.REST_produces REST_produces</del>
+				<li><del>RestContext.REST_consumes REST_consumes</del>
+				<li><del>RestContext.REST_clientVersionHeader REST_clientVersionHeader</del>
+				<li><del>RestContext.REST_resourceResolver</del>
+				<li><del>RestContext.REST_logger</del>
+				<li><del>RestContext.REST_callHandler</del>
+				<li><del>RestContext.REST_infoProvider</del>
+				<li><del>RestContext.REST_path REST_path</del>
+				<li><del>RestContext.REST_contextPath</del>
+				<li><del>RestContext.REST_staticFiles REST_staticFiles</del>
+				<li><del>RestContext.REST_staticFileResponseHeaders</del>
+				<li><del>RestContext.REST_classpathResourceFinder</del>
+				<li><del>RestContext.REST_useClasspathResourceCaching</del>
+				<li><del>RestContext.REST_widgets</del>
 				<li><del>RestContext.REST_mimeTypes</del>
 			</ul>
 		<li>
@@ -33912,18 +33282,18 @@
 				<li>Syntax on <del>@RestResource(staticFiles)</del>has been simplified, and
 					now allows you to specify response headers in the strings.
 				<li>Response headers for static files can also be configured through 
-					<del>RestContext#REST_staticFileResponseHeaders</del>
+					<del>RestContext.REST_staticFileResponseHeaders</del>
 				<li>Static file in-memory caching now configurable through 
-					<del>RestContext#REST_useClasspathResourceCaching</del>
+					<del>RestContext.REST_useClasspathResourceCaching</del>
 				<li>Static file retrieval can be customized through 
-					<del>RestContext#REST_classpathResourceFinder</del>
+					<del>RestContext.REST_classpathResourceFinder</del>
 			</ul>
 		<li>
 			Eliminated the <c>RestMatcherReflecting</c> class.
-			<br>You can now simply create a {@link org.apache.juneau.rest.RestMatcher} that has a public constructor that 
+			<br>You can now simply create a <del>RestMatcher</del> that has a public constructor that 
 			takes in the server and method arguments.
 		<li>
-			<del>@RestResource.allowMethodParam</del>renamed to <del>RestResource#allowedMethodParams</del>.
+			<del>@RestResource.allowMethodParam</del>renamed to <del>RestResource.allowedMethodParams</del>.
 		<li>
 			<c>@RestMethod.serializersInherit</c> and <c>@RestMethod.parsersInherit</c> replaced with
 			simplified <del>@RestMethod(inherit)</del>. 
@@ -34016,7 +33386,7 @@
 				<li><del>StreamResourceBuilder</del>
 			</ul>
 		<li>
-			{@link org.apache.juneau.rest.RestResponse.getNegotiatedOutputStream()} now returns a 
+			{@link org.apache.juneau.rest.RestResponse#getNegotiatedOutputStream()} now returns a 
 			<del>FinishableServletOutputStream</del>and {@link org.apache.juneau.rest.RestResponse#getNegotiatedWriter()}
 			now returns a <del>FinishablePrintWriter</del> that allows you to finish the output
 			without closing the stream.
@@ -34054,7 +33424,7 @@
 		<li>
 			New methods on <del>RestCall</del>class:
 			<ul>
-				<li><del>RestCall#getResponseHeader(String) getResponseHeader(String)</del>
+				<li><del>RestCall.getResponseHeader(String) getResponseHeader(String)</del>
 				<li><del>RestCall.getResponseCode() getResponseCode()</del>
 			</ul>
 		<li>
@@ -34100,7 +33470,7 @@
 			<br>This fixes a long-standing problem where it was easy to mix up using client-side annotations in server-side code, and vis-versa.
 			<br>Additionally, much work has been done on these annotations to add support for Swagger-style validations and documentation.
 			<ul class='doctree'>
-				<li class='ja'>{@link org.apache.juneau.http.annotation.Body}
+				<li class='ja'><del>Body</del>
 				<li class='ja'>{@link org.apache.juneau.http.annotation.FormData}
 				<li class='ja'>{@link org.apache.juneau.http.annotation.Header}
 				<li class='ja'>{@link org.apache.juneau.http.annotation.Path}
@@ -34160,19 +33530,19 @@
 		<li>
 			New settings for binary-based serializers and parsers:
 			<ul class='doctree'>
-				<li class='jf'><del>OutputStreamSerializer#OSSERIALIZER_binaryFormat</del>
-				<li class='jf'><del>InputStreamParser#ISPARSER_binaryFormat</del>
+				<li class='jf'><del>OutputStreamSerializer.OSSERIALIZER_binaryFormat</del>
+				<li class='jf'><del>InputStreamParser.ISPARSER_binaryFormat</del>
 			</ul>
 		<li>
 			Added support for auto-detection of fluent-style setters:
 			<ul class='doctree'>
-				<li class='jf'><del>BeanContext#BEAN_fluentSetters</del>
-				<li class='ja'><del>Bean#fluentSetters()</del>
+				<li class='jf'><del>BeanContext.BEAN_fluentSetters</del>
+				<li class='ja'><del>Bean.fluentSetters()</del>
 			</ul>
 		<li>
-			The <jsf>SERIALIZER_abridged</jsf> setting has been replaced with <del>Serializer#SERIALIZER_addRootType SERIALIZER_addRootType</del>
+			The <jsf>SERIALIZER_abridged</jsf> setting has been replaced with <del>Serializer.SERIALIZER_addRootType SERIALIZER_addRootType</del>
 		<li>
-			The <jsf>SERIALIZER_addBeanTypeProperties</jsf> setting has been replaced with <del>Serializer#SERIALIZER_addBeanTypes SERIALIZER_addBeanTypes</del>
+			The <jsf>SERIALIZER_addBeanTypeProperties</jsf> setting has been replaced with <del>Serializer.SERIALIZER_addBeanTypes SERIALIZER_addBeanTypes</del>
 			and is disabled by default.
 		<li>
 			Parse exception messages are now clearer and include code snippets of where a parse exception occurred:
@@ -34219,7 +33589,7 @@
 			which returns a <jk>null</jk> value.
 		<li>
 			New option for dyna-property (i.e. <c><ja>@Bean</ja>(<js>"*"</js>)</c>) using a method that returns a collection of extra keys.
-			<br>See new options #4 on <del>BeanProperty#name()</del>
+			<br>See new options #4 on <del>BeanProperty.name()</del>
 		<li>
 			New formats for the {@link org.apache.juneau.html.annotation.Html#format() @Html(format)} annotation:
 			<ul class='doctree'>
@@ -34235,15 +33605,15 @@
 			<ul class='doctree'>
 				<li class='jc'><del>ObjectMap</del>
 				<ul>
-					<li class='jm'><del>ObjectMap#isUnmodifiable() isUnmodifable()</del>
-					<li class='jm'><del>ObjectMap#unmodifiable() unmodifiable()</del>
-					<li class='jm'><del>ObjectMap#modifiable() modifiable()</del>
+					<li class='jm'><del>ObjectMap.isUnmodifiable() isUnmodifable()</del>
+					<li class='jm'><del>ObjectMap.unmodifiable() unmodifiable()</del>
+					<li class='jm'><del>ObjectMap.modifiable() modifiable()</del>
 				</ul>
 				<li class='jp'><del>ObjectList</del>
 				<ul>
-					<li class='jm'><del>ObjectList#isUnmodifiable() isUnmodifable()</del>
-					<li class='jm'><del>ObjectList#unmodifiable() unmodifiable()</del>
-					<li class='jm'><del>ObjectList#modifiable() modifiable()</del>
+					<li class='jm'><del>ObjectList.isUnmodifiable() isUnmodifable()</del>
+					<li class='jm'><del>ObjectList.unmodifiable() unmodifiable()</del>
+					<li class='jm'><del>ObjectList.modifiable() modifiable()</del>
 				</ul>
 			</ul>
 		<li>
@@ -34251,15 +33621,15 @@
 		<li>
 			RDF serializer subclasses have been moved into top-level classes:
 			<ul>
-				<li><c>RdfSerializer.Xml</c> -> {@link org.apache.juneau.jena.RdfXmlSerializer}
-				<li><c>RdfSerializer.XmlAbbrev</c> -> {@link org.apache.juneau.jena.RdfXmlAbbrevSerializer}
-				<li><c>RdfSerializer.N3</c> -> {@link org.apache.juneau.jena.N3Serializer}
-				<li><c>RdfSerializer.NTriple</c> -> {@link org.apache.juneau.jena.NTripleSerializer}
-				<li><c>RdfSerializer.Turtle</c> -> {@link org.apache.juneau.jena.TurtleSerializer}
-				<li><c>RdfParser.Xml</c> -> {@link org.apache.juneau.jena.RdfXmlParser}
-				<li><c>RdfParser.N3</c> -> {@link org.apache.juneau.jena.N3Parser}
-				<li><c>RdfParser.NTriple</c> -> {@link org.apache.juneau.jena.NTripleParser}
-				<li><c>RdfParser.Turtle</c> -> {@link org.apache.juneau.jena.TurtleParser}
+				<li><c>RdfSerializer.Xml</c> -&gt; <del>RdfXmlSerializer</del>
+				<li><c>RdfSerializer.XmlAbbrev</c> -&gt; <del>RdfXmlAbbrevSerializer</del>
+				<li><c>RdfSerializer.N3</c> -&gt; <del>N3Serializer</del>
+				<li><c>RdfSerializer.NTriple</c> -&gt; <del>NTripleSerializer</del>
+				<li><c>RdfSerializer.Turtle</c> -&gt; <del>TurtleSerializer</del>
+				<li><c>RdfParser.Xml</c> -&gt; <del>RdfXmlParser</del>
+				<li><c>RdfParser.N3</c> -&gt; <del>N3Parser</del>
+				<li><c>RdfParser.NTriple</c> -&gt; <del>NTripleParser</del>
+				<li><c>RdfParser.Turtle</c> -&gt; <del>TurtleParser</del>
 			</ul>
 		<li>
 			New API for pairing serializers and parsers for simplified syntax:
@@ -34310,7 +33680,7 @@
 	<h5 class='topic w800'>juneau-dto</h5>
 	<ul class='spaced-list'>
 		<li>
-			Fixed bug where Swagger {@del org.apache.juneau.dto.swagger.SchemaInfo#required(Object...)} was defined as a boolean
+			Fixed bug where Swagger <del> org.apache.juneau.dto.swagger.SchemaInfo.required(Object...)</del> was defined as a boolean
 			instead of a list of strings.
 		<li>
 			Boolean attributes are now handled correctly for HTML5.
@@ -34340,7 +33710,7 @@
 		<li>
 			Swagger fields added to the following annotations:
 			<ul class='doctree'>
-				<li class='ja'>{@link org.apache.juneau.http.annotation.Body}
+				<li class='ja'><del>Body</del>
 				<li class='ja'>{@link org.apache.juneau.http.annotation.FormData}
 				<li class='ja'>{@link org.apache.juneau.http.annotation.Header}
 				<li class='ja'>{@link org.apache.juneau.http.annotation.Path}
@@ -34435,7 +33805,7 @@
 				</ul>
 			</ul>	
 		<li>
-			The <del>HtmlDoc.nav() @HtmlDoc(nav)</del>and <del>HtmlDoc#navlinks() @HtmlDoc(navlinks)</del>
+			The <del>HtmlDoc.nav() @HtmlDoc(nav)</del>and <del>HtmlDoc.navlinks() @HtmlDoc(navlinks)</del>
 			can now both be used on the same annotation.
 			<br>The contents of <c>nav()</c> are free-form HTML that gets rendered immediately after the navigation links.
 		<li>
@@ -34477,14 +33847,14 @@
 			</ul>
 			<br>These can be used in the following locations:
 			<ul class='doctree'>
-				<li class='ja'><del>RestResource#serializers()</del>
-				<li class='ja'><del>RestResource#parsers()</del>
-				<li class='ja'><del>RestResource#beanFilters()</del>
-				<li class='ja'><del>RestResource#pojoSwaps()</del>
-				<li class='ja'><del>RestMethod#serializers()</del>
-				<li class='ja'><del>RestMethod#parsers()</del>
-				<li class='ja'><del>RestMethod#beanFilters()</del>
-				<li class='ja'><del>RestMethod#pojoSwaps()</del>
+				<li class='ja'><del>RestResource.serializers()</del>
+				<li class='ja'><del>RestResource.parsers()</del>
+				<li class='ja'><del>RestResource.beanFilters()</del>
+				<li class='ja'><del>RestResource.pojoSwaps()</del>
+				<li class='ja'><del>RestMethod.serializers()</del>
+				<li class='ja'><del>RestMethod.parsers()</del>
+				<li class='ja'><del>RestMethod.beanFilters()</del>
+				<li class='ja'><del>RestMethod.pojoSwaps()</del>
 			</ul>
 			<br>One advantage is that you now have control over the precedence of serializers and parsers by where you insert the <c>Inherit</c> class. 
 		<li>
@@ -34519,7 +33889,7 @@
 			New/updated documentation: 
 			<br><dc>juneau-rest-server.UnitTesting</dc>
 		<li>
-			The behavior of the default values for <del>RestMethod.name()</del>and <del>RestMethod#path()</del>
+			The behavior of the default values for <del>RestMethod.name()</del>and <del>RestMethod.path()</del>
 			have changed.
 			<br>If not specified, the values are inferred from the Java method name.
 			<br>See Also: <del>RestMethod</del>
@@ -34530,10 +33900,10 @@
 			<ul class='doctree'>
 				<li class='jc'>{@link org.apache.juneau.rest.RestContext}
 				<ul>
-					<li class='jf'><del>RestContext#REST_uriAuthority REST_uriAuthority</del>
-					<li class='jf'><del>RestContext#REST_uriContext REST_uriContext</del>
-					<li class='jf'><del>RestContext#REST_uriRelativity REST_uriRelativity</del>
-					<li class='jf'><del>RestContext#REST_uriResolution REST_uriResolution</del>
+					<li class='jf'><del>RestContext.REST_uriAuthority REST_uriAuthority</del>
+					<li class='jf'><del>RestContext.REST_uriContext REST_uriContext</del>
+					<li class='jf'><del>RestContext.REST_uriRelativity REST_uriRelativity</del>
+					<li class='jf'><del>RestContext.REST_uriResolution REST_uriResolution</del>
 				</ul>
 			</ul>
 		<li>
@@ -34546,8 +33916,8 @@
 				</ul>	
 				<li class='jc'><del>RestMethod</del>
 				<ul>
-					<li class='jf'><del>RestMethod#defaultAccept defaultAccept</del>
-					<li class='jf'><del>RestMethod#defaultContentType defaultContentType</del>
+					<li class='jf'><del>RestMethod.defaultAccept defaultAccept</del>
+					<li class='jf'><del>RestMethod.defaultContentType defaultContentType</del>
 				</ul>	
 			</ul>
 	</ul>
@@ -34562,13 +33932,13 @@
 			<ul class='doctree'>
 				<li class='jc'>{@link org.apache.juneau.rest.client.RestClient.Builder}
 				<ul>
-					<li class='jf'>{@del org.apache.juneau.rest.client.RestClient.Builder#sslProtocols(String...) sslProtocols(String...)}
-					<li class='jf'>{@del org.apache.juneau.rest.client.RestClient.Builder#cipherSuites(String...) cipherSuites(String...)}
-					<li class='jf'><del>Builder#hostnameVerifier(HostnameVerifier) hostnameVerifier(HostnameVerifier)</del>
-					<li class='jf'>{@del org.apache.juneau.rest.client.RestClient.Builder#keyManagers(KeyManager...) keyManagers(KeyManager...)}
-					<li class='jf'>{@del org.apache.juneau.rest.client.RestClient.Builder#trustManagers(TrustManager...)}
-					<li class='jf'><del>Builder#secureRandom(SecureRandom)</del>
-					<li class='jf'><del>Builder#httpClientConnectionManager(HttpClientConnectionManager)</del>
+					<li class='jf'><del> org.apache.juneau.rest.client.RestClient.Builder.sslProtocols(String...) sslProtocols(String...)</del>
+					<li class='jf'><del> org.apache.juneau.rest.client.RestClient.Builder.cipherSuites(String...) cipherSuites(String...)</del>
+					<li class='jf'><del>Builder.hostnameVerifier(HostnameVerifier) hostnameVerifier(HostnameVerifier)</del>
+					<li class='jf'><del> org.apache.juneau.rest.client.RestClient.Builder.keyManagers(KeyManager...) keyManagers(KeyManager...)</del>
+					<li class='jf'><del> org.apache.juneau.rest.client.RestClient.Builder.trustManagers(TrustManager...)</del>
+					<li class='jf'><del>Builder.secureRandom(SecureRandom)</del>
+					<li class='jf'><del>Builder.httpClientConnectionManager(HttpClientConnectionManager)</del>
 				</ul>
 			</ul>
 		<li>
@@ -34599,7 +33969,7 @@
 			</ul>
 		<li>
 			Removed the deprecated <c>RestCall.execute()</c> method.
-			<br>Use <del>RestCall#run()</del>.
+			<br>Use <del>RestCall.run()</del>.
 		<li>
 			<c>RestCall.input(Object)</c> method renamed to <del>RestCall.body(Object)</del>to match OpenAPI terminology.
 		<li>
@@ -34609,12 +33979,12 @@
 			<ul class='doctree'>
 				<li class='jc'>{@link org.apache.juneau.rest.client.RestClient}
 				<ul>
-					<li class='jm'><del>RestClient#getRemoteInterface(Class)</del>
-					<li class='jm'><del>RestClient#getRemoteInterface(Class,Object)</del>
-					<li class='jm'><del>RestClient#getRemoteInterface(Class,Object,Serializer,Parser)</del>
-					<li class='jm'><del>RestClient#getRemoteResource(Class)</del>
-					<li class='jm'><del>RestClient#getRemoteResource(Class,Object)</del>
-					<li class='jm'><del>RestClient#getRemoteResource(Class,Object,Serializer,Parser)</del>
+					<li class='jm'><del>RestClient.getRemoteInterface(Class)</del>
+					<li class='jm'><del>RestClient.getRemoteInterface(Class,Object)</del>
+					<li class='jm'><del>RestClient.getRemoteInterface(Class,Object,Serializer,Parser)</del>
+					<li class='jm'><del>RestClient.getRemoteResource(Class)</del>
+					<li class='jm'><del>RestClient.getRemoteResource(Class,Object)</del>
+					<li class='jm'><del>RestClient.getRemoteResource(Class,Object,Serializer,Parser)</del>
 				</ul>
 			</ul>
 	</ul>
@@ -34714,7 +34084,7 @@
 	<h5 class='topic w800'>juneau-marshall</h5>
 	<ul class='spaced-list'>
 		<li>
-			The <del>@JsonSchema</del> annotation has been merged with the {@link org.apache.juneau.jsonschema.annotation.Schema @Schema} annotation.
+			The <del>@JsonSchema</del> annotation has been merged with the <del>@Schema</del> 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.
@@ -34842,8 +34212,8 @@
 		<li>
 			New methods on <del>RestServlet</del>:
 			<ul class='javatree'>
-				<li class='jm'><del>RestServlet#setRestResourceResolver(RestResourceResolver) setRestResourceResolver(RestResourceResolver)</del>
-				<li class='jm'><del>RestServlet#getPath() getPath()</del>
+				<li class='jm'><del>RestServlet.setRestResourceResolver(RestResourceResolver) setRestResourceResolver(RestResourceResolver)</del>
+				<li class='jm'><del>RestServlet.getPath() getPath()</del>
 			</ul>
 		<li>
 			The registered resource resolver is now used to instantiate objects of classes defined via <del>@RestResource</del>.
@@ -34944,8 +34314,8 @@
 			<ul class='javatree'>
 				<li class='jc'>{@link org.apache.juneau.serializer.WriterSerializer}
 				<ul>
-					<li class='jf'><del>WriterSerializer#WSERIALIZER_fileCharset WSERIALIZER_fileCharset</del>
-					<li class='jf'><del>WriterSerializer#WSERIALIZER_streamCharset WSERIALIZER_streamCharset</del>
+					<li class='jf'><del>WriterSerializer.WSERIALIZER_fileCharset WSERIALIZER_fileCharset</del>
+					<li class='jf'><del>WriterSerializer.WSERIALIZER_streamCharset WSERIALIZER_streamCharset</del>
 				</ul>
 			</ul>
 		<li>
@@ -34966,9 +34336,9 @@
 			<ul class='javatree'>
 				<li class='jc'><del>Marshall</del>
 				<ul>
-					<li class='jm'>{@del org.apache.juneau.marshall.Marshall#format(String,Object...) format(String,Object...)} - <c>MessageFormat</c>-style formatter.
-					<li class='jm'>{@del org.apache.juneau.marshall.Marshall#out(String,Object...) out(String,Object...)} - Prints <c>MessageFormat</c>-style messages to STDOUT.
-					<li class='jm'>{@del org.apache.juneau.marshall.Marshall#err(String,Object...) err(String,Object...)} - Prints <c>MessageFormat</c>-style messages to STDERR.
+					<li class='jm'><del> org.apache.juneau.marshall.Marshall.format(String,Object...) format(String,Object...)</del> - <c>MessageFormat</c>-style formatter.
+					<li class='jm'><del> org.apache.juneau.marshall.Marshall.out(String,Object...) out(String,Object...)</del> - Prints <c>MessageFormat</c>-style messages to STDOUT.
+					<li class='jm'><del> org.apache.juneau.marshall.Marshall.err(String,Object...) err(String,Object...)</del> - Prints <c>MessageFormat</c>-style messages to STDERR.
 				</ul>
 			</ul>
 		<li>
@@ -34998,7 +34368,7 @@
 				<li class='jc'>{@link java.time.OffsetTime} - ISO offset time.
 				<li class='jc'>{@link java.time.Year} - ISO year.
 				<li class='jc'>{@link java.time.YearMonth} - ISO year-month.
-				<li class='jc'>{@link java.time.Temporal} - ISO instant.
+				<li class='jc'>{@link java.time.temporal.Temporal} - ISO instant.
 				<li class='jc'>{@link java.util.TimeZone}
 				<li class='jc'>{@link javax.xml.datatype.XMLGregorianCalendar}
 				<li class='jc'>{@link java.time.ZoneId}
@@ -35020,10 +34390,10 @@
 			The <del>ConfigFileStore</del>now automatically resolves file extensions.
 			<br>New configuration property for specifying search paths for file extensions:
 			<ul class='javatree'>
-				<li class='jf'><del>ConfigFileStore#FILESTORE_extensions</del>
+				<li class='jf'><del>ConfigFileStore.FILESTORE_extensions</del>
 			</ul>
 		<li>
-			Fixed a bug where instances of {@link org.apache.juneau.config.store.ConfigMemoryStore} ended up resolving to the same object.
+			Fixed a bug where instances of <del>ConfigMemoryStore</del> ended up resolving to the same object.
 		<li>
 			Uses <js>"application.properties"</js> file as a system default if present.
 			<br>Useful when being used in a Spring Boot application.
@@ -35086,7 +34456,7 @@
 				<li class='ja'>{@link org.apache.juneau.oapi.annotation.OpenApiConfig OpenApiConfig}
 				<li class='ja'>{@link org.apache.juneau.parser.annotation.ParserConfig ParserConfig}
 				<li class='ja'>{@link org.apache.juneau.plaintext.annotation.PlainTextConfig PlainTextConfig}
-				<li class='ja'>{@link org.apache.juneau.jena.annotation.RdfConfig RdfConfig}
+				<li class='ja'><del>RdfConfig</del>
 				<li class='ja'>{@link org.apache.juneau.serializer.annotation.SerializerConfig SerializerConfig}
 				<li class='ja'>{@link org.apache.juneau.soap.annotation.SoapXmlConfig SoapXmlConfig}
 				<li class='ja'>{@link org.apache.juneau.uon.annotation.UonConfig UonConfig}
@@ -35103,12 +34473,12 @@
 				</ul>
 				<li class='jc'>{@link org.apache.juneau.rest.RestContext.Builder}
 				<ul>
-					<li class='jm'>{@del attrs(String...)}
+					<li class='jm'><del> attrs(String...)</del>
 					<li class='jm'><del>attr(String,Object)</del>
 				</ul>
 				<li class='jc'><del>RestMethodContext</del>
 				<ul>
-					<li class='jf'><del>RestMethodContext#RESTMETHOD_attrs RESTMETHOD_attrs</del>
+					<li class='jf'><del>RestMethodContext.RESTMETHOD_attrs RESTMETHOD_attrs</del>
 				</ul>
 				<li class='jc'>{@link org.apache.juneau.rest.RestRequest}
 				<ul>
@@ -35117,11 +34487,11 @@
 				<li class='jc'>{@link org.apache.juneau.rest.RestResponse}
 				<ul>
 					<li class='jm'>{@link org.apache.juneau.rest.RestResponse#getAttributes() getAttributes()}
-					<li class='jm'><del>RestResponse#attr(String,Object) attr(String,Object)</del>
+					<li class='jm'><del>RestResponse.attr(String,Object) attr(String,Object)</del>
 				</ul>
 				<li class='ja'>{@link org.apache.juneau.rest.annotation.Attr}
-				<li class='ja'><del>RestMethod#attrs()</del>
-				<li class='ja'><del>RestResource#attrs()</del>
+				<li class='ja'><del>RestMethod.attrs()</del>
+				<li class='ja'><del>RestResource.attrs()</del>
 			</ul>
 			<br>This deprecates the following APIs:
 			<ul class='javatree'>
@@ -35129,7 +34499,7 @@
 				<li class='jc'><del>RestMethodProperties</del>
 				<li class='jc'>{@link org.apache.juneau.rest.RestRequest}
 				<ul>
-					<li class='jm'><del>RestRequest#getProperties() getProperties()</del>
+					<li class='jm'><del>RestRequest.getProperties() getProperties()</del>
 					<li class='jm'><del>RestRequest.prop(String,Object) prop(String,Object)</del>
 				</ul>
 			</ul>
@@ -35155,7 +34525,7 @@
 				</ul>
 				<li class='ja'><del>RestMethod</del>
 				<ul>
-					<li class='jm'><del>RestMethod#roleGuard roleGuard()</del>
+					<li class='jm'><del>RestMethod.roleGuard roleGuard()</del>
 					<li class='jm'><del>RestMethod.rolesDeclared rolesDeclared()</del>
 				</ul>
 			</ul>
@@ -35282,7 +34652,7 @@
 			Support for {@link java.util.Optional} on method parameters annotated with {@link org.apache.juneau.http.annotation.Header}, {@link org.apache.juneau.http.annotation.FormData},  
 			{@link org.apache.juneau.http.annotation.Query}, {@link org.apache.juneau.http.annotation.Path}.
 		<li>
-			Fixed issue where {@del org.apache.juneau.rest.annotation.RestMethod.debug() RestMethod.debug()} annotation wasn't resulting
+			Fixed issue where <del> org.apache.juneau.rest.annotation.RestMethod.debug() RestMethod.debug()</del> annotation wasn't resulting
 			in the HTTP request being logged.
 		<li>
 			<del>RestException</del> has been deprecated and replaced by <del>HttpException</del>.
@@ -35303,13 +34673,13 @@
 			<ul class='javatree'>
 				<li class='jc'><del>BasicRest</del>
 					<ul class='javatreec'>
-						<li class='jm'><del>BasicRest#getContext() getContext()</del>
-						<li class='jm'><del>BasicRest#getRequest() getRequest()</del>
-						<li class='jm'><del>BasicRest#getResponse() getResponse()</del>
-						<li class='jm'><del>BasicRest#log(String) log(String)</del>
-						<li class='jm'><del>BasicRest#log(String,Throwable) log(String,Throwable)</del>
-						<li class='jm'><del>BasicRest#log(Level,String,Object[]) log(Level,String,Object[])</del>
-						<li class='jm'><del>BasicRest#logObjects(Level,String,Object[])</del>
+						<li class='jm'><del>BasicRest.getContext() getContext()</del>
+						<li class='jm'><del>BasicRest.getRequest() getRequest()</del>
+						<li class='jm'><del>BasicRest.getResponse() getResponse()</del>
+						<li class='jm'><del>BasicRest.log(String) log(String)</del>
+						<li class='jm'><del>BasicRest.log(String,Throwable) log(String,Throwable)</del>
+						<li class='jm'><del>BasicRest.log(Level,String,Object[]) log(Level,String,Object[])</del>
+						<li class='jm'><del>BasicRest.logObjects(Level,String,Object[])</del>
 						<li class='jm'><del>BasicRest.log(Level,Throwable,String,Object[]) log(Level,Throwable,String,Object[])</del>
 					</ul>
 				</li>
@@ -35358,23 +34728,23 @@
 		<li>
 			Support for read-only and write-only properties.
 			<ul>
-				<li class='ja'><del>Bean#bpro()</del>
-				<li class='ja'><del>Bean#bpwo()</del>
+				<li class='ja'><del>Bean.bpro()</del>
+				<li class='ja'><del>Bean.bpwo()</del>
 				<li class='ja'>{@link org.apache.juneau.annotation.Beanp#ro()}
 				<li class='ja'>{@link org.apache.juneau.annotation.Beanp#wo()}
 				<li class='jf'><del>BEAN_bpro</del>
 				<li class='jf'><del>BEAN_bpwo</del>
-				<li class='jm'><del>Builder#bpro(Map)</del>
-				<li class='jm'><del>Builder#bpwo(Map)</del>
+				<li class='jm'><del>Builder.bpro(Map)</del>
+				<li class='jm'><del>Builder.bpwo(Map)</del>
 			</ul>
 		<li>
 			New convenience methods:
 			<ul>	
-				<li class='jm'><del>ObjectMap#parse(CharSequence)</del>
+				<li class='jm'><del>ObjectMap.parse(CharSequence)</del>
 				<li class='jm'><del>ObjectList.parse(CharSequence)</del>
 			</ul>
 		<li>
-			<del>CharMarshall</del>and {@link org.apache.juneau.marshall.StreamMarshall} now have public constructors.
+			<del>CharMarshall</del>and <del>StreamMarshall</del> now have public constructors.
 		<li>
 			{@link org.apache.juneau.annotation.Beanp @Beanp} replaces <del>BeanProperty @BeanProperty</del>.
 		<li>
@@ -35399,7 +34769,7 @@
 	<ul class='spaced-list'>
 		<li>
 			{@link org.apache.juneau.rest.client.RestClient} is now extendible.  The constructor has been made public and simplified to:
-			{@del org.apache.juneau.rest.client.RestClient#RestClient(RestClient.Builder)}.
+			<del> org.apache.juneau.rest.client.RestClient.RestClient(RestClient.Builder)</del>.
 		<li>
 			Duplicate methods between {@link org.apache.juneau.rest.client.RestClient.Builder} 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
@@ -35462,11 +34832,11 @@
 		<li>
 			Renamed the following annotations:
 			<ul>
-				<li><ja>@Rest(attrs)</ja> --> <del>Rest#reqAttrs() @Rest(reqAttrs)</del>
-				<li><ja>@Rest(defaultRequestHeaders)</ja> --> <del>Rest#reqHeaders() @Rest(reqHeaders)</del>
-				<li><ja>@Rest(defaultResponseHeaders)</ja> --> <del>Rest#resHeaders() @Rest(resHeaders)</del>
-				<li><ja>@RestMethod(attrs)</ja> --> <del>RestMethod#reqAttrs() @RestMethod(reqAttrs)</del>
-				<li><ja>@RestMethod(defaultRequestHeaders)</ja> --> <del>RestMethod#reqHeaders() @RestMethod(reqHeaders)</del>
+				<li><ja>@Rest(attrs)</ja> --&gt; <del>Rest.reqAttrs() @Rest(reqAttrs)</del>
+				<li><ja>@Rest(defaultRequestHeaders)</ja> --&gt; <del>Rest.reqHeaders() @Rest(reqHeaders)</del>
+				<li><ja>@Rest(defaultResponseHeaders)</ja> --&gt; <del>Rest.resHeaders() @Rest(resHeaders)</del>
+				<li><ja>@RestMethod(attrs)</ja> --&gt; <del>RestMethod.reqAttrs() @RestMethod(reqAttrs)</del>
+				<li><ja>@RestMethod(defaultRequestHeaders)</ja> --&gt; <del>RestMethod.reqHeaders() @RestMethod(reqHeaders)</del>
 			</ul>
 		<li>
 			New auto-generated REST method execution statistics: <del>RestExecutionStatistics</del>
@@ -35536,14 +34906,14 @@
 			<ul class='javatree'>
 				<li class='jc'>{@link org.apache.juneau.BeanContext.Builder}
 					<ul class='javatreec'>
-						<li class='jm'><del>Builder#bpi(Class,String) bpi(Class,String)</del>
-						<li class='jm'><del>Builder#bpi(String,String) bpi(String,String)</del>
-						<li class='jm'><del>Builder#bpx(Class,String) bpx(Class,String)</del>
-						<li class='jm'><del>Builder#bpx(String,String) bpx(String,String)</del>
-						<li class='jm'><del>Builder#bpro(Class,String) bpro(Class,String)</del>
-						<li class='jm'><del>Builder#bpro(String,String) bpro(String,String)</del>
-						<li class='jm'><del>Builder#bpwo(Class,String) bpwo(Class,String</del>
-						<li class='jm'><del>Builder#bpwo(String,String) bpwo(String,String</del>
+						<li class='jm'><del>Builder.bpi(Class,String) bpi(Class,String)</del>
+						<li class='jm'><del>Builder.bpi(String,String) bpi(String,String)</del>
+						<li class='jm'><del>Builder.bpx(Class,String) bpx(Class,String)</del>
+						<li class='jm'><del>Builder.bpx(String,String) bpx(String,String)</del>
+						<li class='jm'><del>Builder.bpro(Class,String) bpro(Class,String)</del>
+						<li class='jm'><del>Builder.bpro(String,String) bpro(String,String)</del>
+						<li class='jm'><del>Builder.bpwo(Class,String) bpwo(Class,String</del>
+						<li class='jm'><del>Builder.bpwo(String,String) bpwo(String,String</del>
 					</ul>
 				</li>
 			</ul>
@@ -35577,7 +34947,7 @@
 				<li class='jc'>{@link org.apache.juneau.html.annotation.HtmlAnnotation} <jk>implements</jk> {@link org.apache.juneau.html.annotation.Html}
 				<li class='jc'><del>JsoAnnotation</del> <jk>implements</jk> <del>Jso</del>
 				<li class='jc'>{@link org.apache.juneau.json.annotation.JsonAnnotation} <jk>implements</jk> {@link org.apache.juneau.json.annotation.Json}
-				<li class='jc'>{@link org.apache.juneau.jsonschema.annotation.SchemaAnnotation} <jk>implements</jk> {@link org.apache.juneau.jsonschema.annotation.Schema}
+				<li class='jc'><del>SchemaAnnotation</del> <jk>implements</jk> <del>Schema</del>
 				<li class='jc'>{@link org.apache.juneau.msgpack.annotation.MsgPackAnnotation} <jk>implements</jk> {@link org.apache.juneau.msgpack.annotation.MsgPack}
 				<li class='jc'>{@link org.apache.juneau.oapi.annotation.OpenApiAnnotation} <jk>implements</jk> {@link org.apache.juneau.oapi.annotation.OpenApi}
 				<li class='jc'>{@link org.apache.juneau.plaintext.annotation.PlainTextAnnotation} <jk>implements</jk> {@link org.apache.juneau.plaintext.annotation.PlainText}
@@ -35597,7 +34967,7 @@
 			</p>
 		<li>
 			Bean maps now have the concept of "hidden" properties (properties that aren't serialized but otherwise accessible).
-			<br>For example, the {@link org.apache.juneau.html.annotation.Html.link()} can now reference hidden properties:
+			<br>For example, the {@link org.apache.juneau.html.annotation.Html#link()} can now reference hidden properties:
 			<p class='bcode'>
 		<ja>@Bean</ja>(bpi=<js>"a"</js>) <jc>// Will be overridden</jc>
 		<jk>public class</jk> MyBean {
@@ -35664,15 +35034,15 @@
 		<li>
 			New annotations for multi-part support:
 			<ul>
-				<li class='jm'><del>Header#multi()</del>
-				<li class='jm'><del>Query#multi()</del>
-				<li class='jm'><del>FormData#multi()</del>
+				<li class='jm'><del>Header.multi()</del>
+				<li class='jm'><del>Query.multi()</del>
+				<li class='jm'><del>FormData.multi()</del>
 			</ul>
 		<li>
 			<del>BeanTraverseContext.BEANTRAVERSE_ignoreRecursions</del>setting no longer requires <del>BeanTraverseContext.BEANTRAVERSE_detectRecursions</del>
 			to be enabled.
 		<li>
-			Fixed bug in JSON/UON/URL-Encoding serializers where indentation was not correct of first line when <del>BeanTraverseContext#BEANTRAVERSE_initialDepth</del>
+			Fixed bug in JSON/UON/URL-Encoding serializers where indentation was not correct of first line when <del>BeanTraverseContext.BEANTRAVERSE_initialDepth</del>
 			used.
 		<li>
 			Fixed bug in JSON/UON/URL-Encoding serializers where properties past the max depth were being serialized as null instead
@@ -35680,7 +35050,7 @@
 		<li>
 			Fixed bug in HTML serializer where tables of maps were not sorted if <jsf>SERIALIZER_sortMaps</jsf> was specified.
 		<li>
-			<jsf>SERIALIZER_trimNullProperties</jsf> has been replaced with <del>Serializer#SERIALIZER_keepNullProperties SERIALIZER_keepNullProperties</del>.
+			<jsf>SERIALIZER_trimNullProperties</jsf> has been replaced with <del>Serializer.SERIALIZER_keepNullProperties SERIALIZER_keepNullProperties</del>.
 		<li>
 			Improvements to OpenAPI serializer and parser:
 			<ul>
@@ -35747,16 +35117,16 @@
 	<h5 class='topic w800'>juneau-rest-server</h5>
 	<ul class='spaced-list'>
 		<li>
-			New <del>RestContext#REST_context REST_context</del>/<del>Rest.context() @Rest(context)</del> setting to allow you to extend the {@link org.apache.juneau.rest.RestContext}
+			New <del>RestContext.REST_context REST_context</del>/<del>Rest.context() @Rest(context)</del> setting to allow you to extend the {@link org.apache.juneau.rest.RestContext}
 			class.
 		<li>
 			{@link org.apache.juneau.rest.annotation.Rest}-annotated classes can now implement the following interfaces directly instead of having
 			to define secondary classes and hook them up through annotations:
 			<ul>
-				<li class='jic'><del>RestCallHandler</del>- Normally defined through {@del org.apache.juneau.rest.annotation.Rest#callHandler() @Rest.callHandler()}.
-				<li class='jic'><del>RestInfoProvider</del> - Normally defined through {@del org.apache.juneau.rest.annotation.Rest.infoProvider() @Rest.infoProvider()}.
-				<li class='jic'><del>RestCallLogger</del>- Normally defined through {@del org.apache.juneau.rest.annotation.Rest#callLogger() @Rest.callLogger()}.
-				<li class='jic'><del>ClasspathResourceFinder</del> - Normally defined through {@del org.apache.juneau.rest.annotation.Rest.classpathResourceFinder() @Rest.classpathResourceFinder()}.
+				<li class='jic'><del>RestCallHandler</del>- Normally defined through <del> org.apache.juneau.rest.annotation.Rest.callHandler() @Rest.callHandler()</del>.
+				<li class='jic'><del>RestInfoProvider</del> - Normally defined through <del> org.apache.juneau.rest.annotation.Rest.infoProvider() @Rest.infoProvider()</del>.
+				<li class='jic'><del>RestCallLogger</del>- Normally defined through <del> org.apache.juneau.rest.annotation.Rest.callLogger() @Rest.callLogger()</del>.
+				<li class='jic'><del>ClasspathResourceFinder</del> - Normally defined through <del> org.apache.juneau.rest.annotation.Rest.classpathResourceFinder() @Rest.classpathResourceFinder()</del>.
 			</ul>
 			<br>The methods added for <del>RestInfoProvider</del> are:
 			<ul>
@@ -35783,7 +35153,7 @@
 			<ul>
 				<li class='jac'><del>RestServlet</del>
 				<ul>
-					<li class='jm'><del>RestServlet#log(RestCallLoggerConfig,HttpServletRequest,HttpServletResponse) log(RestCallLoggerConfig,HttpServletRequest,HttpServletResponse)</del>
+					<li class='jm'><del>RestServlet.log(RestCallLoggerConfig,HttpServletRequest,HttpServletResponse) log(RestCallLoggerConfig,HttpServletRequest,HttpServletResponse)</del>
 				</ul>
 				<li class='jac'><del>BasicRest</del>
 				<ul>
@@ -35794,7 +35164,7 @@
 			<ul>
 				<li class='jac'><del>RestServlet</del>
 				<ul>
-					<li class='jm'><del>RestServlet#findResource(Class,String,Locale) findResource(Class,String,Locale)</del>
+					<li class='jm'><del>RestServlet.findResource(Class,String,Locale) findResource(Class,String,Locale)</del>
 				</ul>
 				<li class='jac'><del>BasicRest</del>
 				<ul>
@@ -35805,11 +35175,11 @@
 			<ul>
 				<li class='jac'><del>RestServlet</del>
 				<ul>
-					<li class='jm'>{@del org.apache.juneau.rest.RestServlet#resolve(Object,Class,RestContext.Builder,Object...) resolve(Object,Class&lt;T&gt;,RestContext.Builder,Object...)}
+					<li class='jm'><del> org.apache.juneau.rest.RestServlet.resolve(Object,Class,RestContext.Builder,Object...) resolve(Object,Class&lt;T&gt;,RestContext.Builder,Object...)</del>
 				</ul>
 				<li class='jac'><del>BasicRest</del>
 				<ul>
-					<li class='jm'>{@del org.apache.juneau.rest.BasicRest.resolve(Object,Class,RestContext.Builder,Object...) resolve(Object,Class&lt;T&gt;,RestContext.Builder,Object...)}
+					<li class='jm'><del> org.apache.juneau.rest.BasicRest.resolve(Object,Class,RestContext.Builder,Object...) resolve(Object,Class&lt;T&gt;,RestContext.Builder,Object...)</del>
 				</ul>
 			</ul>
 		<li>
@@ -35817,25 +35187,25 @@
 			<ul>
 				<li class='jac'><del>RestServlet</del>
 				<ul>
-					<li class='jm'>{@del org.apache.juneau.rest.RestServlet#onInit(RestContext.Builder) onInit(RestContext.Builder)}
-					<li class='jm'><del>RestServlet#onPostInit(RestContext) onPostInit(RestContext)</del>
-					<li class='jm'><del>RestServlet#onPostInitChildFirst(RestContext) onPostInitChildFirst(RestContext)</del>
-					<li class='jm'><del>RestServlet#onDestroy(RestContext) onDestroy(RestContext)</del>
-					<li class='jm'><del>RestServlet#onStartCall(HttpServletRequest,HttpServletResponse) onStartCall(HttpServletRequest,HttpServletResponse)</del>
-					<li class='jm'><del>RestServlet#onPreCall(RestRequest,RestResponse) onPreCall(RestRequest,RestResponse)</del>
-					<li class='jm'><del>RestServlet#onPostCall(RestRequest,RestResponse) onPostCall(RestRequest,RestResponse)</del>
-					<li class='jm'><del>RestServlet#onEndCall(HttpServletRequest,HttpServletResponse) onEndCall(HttpServletRequest,HttpServletResponse)</del>
+					<li class='jm'><del> org.apache.juneau.rest.RestServlet.onInit(RestContext.Builder) onInit(RestContext.Builder)</del>
+					<li class='jm'><del>RestServlet.onPostInit(RestContext) onPostInit(RestContext)</del>
+					<li class='jm'><del>RestServlet.onPostInitChildFirst(RestContext) onPostInitChildFirst(RestContext)</del>
+					<li class='jm'><del>RestServlet.onDestroy(RestContext) onDestroy(RestContext)</del>
+					<li class='jm'><del>RestServlet.onStartCall(HttpServletRequest,HttpServletResponse) onStartCall(HttpServletRequest,HttpServletResponse)</del>
+					<li class='jm'><del>RestServlet.onPreCall(RestRequest,RestResponse) onPreCall(RestRequest,RestResponse)</del>
+					<li class='jm'><del>RestServlet.onPostCall(RestRequest,RestResponse) onPostCall(RestRequest,RestResponse)</del>
+					<li class='jm'><del>RestServlet.onEndCall(HttpServletRequest,HttpServletResponse) onEndCall(HttpServletRequest,HttpServletResponse)</del>
 				</ul>
 				<li class='jac'><del>BasicRest</del>
 				<ul>
-					<li class='jm'>{@del org.apache.juneau.rest.BasicRest#onInit(RestContext.Builder) onInit(RestContext.Builder)}
-					<li class='jm'><del>BasicRest#onPostInit(RestContext) onPostInit(RestContext)</del>
-					<li class='jm'><del>BasicRest#onPostInitChildFirst(RestContext) onPostInitChildFirst(RestContext)</del>
-					<li class='jm'><del>BasicRest#onDestroy(RestContext) onDestroy(RestContext)</del>
-					<li class='jm'><del>BasicRest#onStartCall(HttpServletRequest,HttpServletResponse) onStartCall(HttpServletRequest,HttpServletResponse)</del>
-					<li class='jm'><del>BasicRest#onPreCall(RestRequest,RestResponse) onPreCall(RestRequest,RestResponse)</del>
-					<li class='jm'><del>BasicRest#onPostCall(RestRequest,RestResponse) onPostCall(RestRequest,RestResponse)</del>
-					<li class='jm'><del>BasicRest#onEndCall(HttpServletRequest,HttpServletResponse) onEndCall(HttpServletRequest,HttpServletResponse)</del>
+					<li class='jm'><del> org.apache.juneau.rest.BasicRest.onInit(RestContext.Builder) onInit(RestContext.Builder)</del>
+					<li class='jm'><del>BasicRest.onPostInit(RestContext) onPostInit(RestContext)</del>
+					<li class='jm'><del>BasicRest.onPostInitChildFirst(RestContext) onPostInitChildFirst(RestContext)</del>
+					<li class='jm'><del>BasicRest.onDestroy(RestContext) onDestroy(RestContext)</del>
+					<li class='jm'><del>BasicRest.onStartCall(HttpServletRequest,HttpServletResponse) onStartCall(HttpServletRequest,HttpServletResponse)</del>
+					<li class='jm'><del>BasicRest.onPreCall(RestRequest,RestResponse) onPreCall(RestRequest,RestResponse)</del>
+					<li class='jm'><del>BasicRest.onPostCall(RestRequest,RestResponse) onPostCall(RestRequest,RestResponse)</del>
+					<li class='jm'><del>BasicRest.onEndCall(HttpServletRequest,HttpServletResponse) onEndCall(HttpServletRequest,HttpServletResponse)</del>
 				</ul>
 			</ul>
 		<li>
@@ -35867,7 +35237,7 @@
 				<li class='jc'><del>ClasspathResourceFinder</del>
 				<li class='jc'><del>RestResourceResolver</del>
 				<li class='jc'><del>RestGuard</del>
-				<li class='jc'>{@link org.apache.juneau.rest.ResponseHandler}
+				<li class='jc'><del>ResponseHandler</del>
 			</ul>
 		<li>
 			New <del>Path.required() @Path(required)</del>annotation support.
diff --git a/juneau-doc/src/main/javadoc/resources/docs.txt b/juneau-doc/src/main/javadoc/resources/docs.txt
index ad82248ac..795a885b7 100644
--- a/juneau-doc/src/main/javadoc/resources/docs.txt
+++ b/juneau-doc/src/main/javadoc/resources/docs.txt
@@ -185,14 +185,6 @@ jmj.Overview = #juneau-microservice-jetty.jmj.Overview, Overview > juneau-micros
 jmj.PredefinedResourceClasses = #juneau-microservice-jetty.jmj.PredefinedResourceClasses, Overview > juneau-microservice-jetty > Predefined Resource Classes
 jmj.ResourceClasses = #juneau-microservice-jetty.jmj.ResourceClasses, Overview > juneau-microservice-jetty > Resource Classes
 jmj.UiCustomization = #juneau-microservice-jetty.jmj.UiCustomization, Overview > juneau-microservice-jetty > UI Customization
-jmr.Namespaces = #juneau-marshall-rdf.jmr.RdfDetails.jmr.Namespaces, Overview > juneau-marshall-rdf > RDF Details > Namespaces
-jmr.Parsers = #juneau-marshall-rdf.jmr.RdfDetails.jmr.Parsers, Overview > juneau-marshall-rdf > RDF Details > RDF Parsers
-jmr.RdfAnnotation = #juneau-marshall-rdf.jmr.RdfDetails.jmr.RdfAnnotation, Overview > juneau-marshall-rdf > RDF Details > @Rdf Annotation
-jmr.RdfDetails = #juneau-marshall-rdf.jmr.RdfDetails, Overview > juneau-marshall-rdf > RDF Details
-jmr.RootProperty = #juneau-marshall-rdf.jmr.RdfDetails.jmr.RootProperty, Overview > juneau-marshall-rdf > RDF Details > Root Property
-jmr.Serializers = #juneau-marshall-rdf.jmr.RdfDetails.jmr.Serializers, Overview > juneau-marshall-rdf > RDF Details > RDF Serializers
-jmr.TypedLiterals = #juneau-marshall-rdf.jmr.RdfDetails.jmr.TypedLiterals, Overview > juneau-marshall-rdf > RDF Details > Typed Literals
-jmr.UriProperties = #juneau-marshall-rdf.jmr.RdfDetails.jmr.UriProperties, Overview > juneau-marshall-rdf > RDF Details > URI Properties
 jp.RunningTheApp = #juneau-petstore.jp.RunningTheApp, Overview > juneau-petstore > Running the Pet Store App
 jp.juneau-petstore-api = #juneau-petstore.jp.juneau-petstore-api, Overview > juneau-petstore > juneau-petstore-api
 jp.juneau-petstore-client = #juneau-petstore.jp.juneau-petstore-client, Overview > juneau-petstore > juneau-petstore-client
diff --git a/juneau-doc/src/main/javadoc/resources/fragments/toc.html b/juneau-doc/src/main/javadoc/resources/fragments/toc.html
index 25d64cebd..5f70be8db 100644
--- a/juneau-doc/src/main/javadoc/resources/fragments/toc.html
+++ b/juneau-doc/src/main/javadoc/resources/fragments/toc.html
@@ -135,18 +135,6 @@
 		<li><p><a class='doclink' href='{OVERVIEW_URL}#juneau-marshall.jm.BestPractices'>Best Practices</a></p>
 	</ol>
 	<li><p class='toc2'><a class='doclink' href='{OVERVIEW_URL}#juneau-marshall-rdf'>juneau-marshall-rdf</a></p>
-	<ol>
-		<li><p><a class='doclink' href='{OVERVIEW_URL}#juneau-marshall-rdf.jmr.RdfDetails'>RDF Details</a></p>
-		<ol>
-			<li><p><a class='doclink' href='{OVERVIEW_URL}#juneau-marshall-rdf.jmr.RdfDetails.jmr.Serializers'>RDF Serializers</a><span class='update'>updated: <b>9.0.0</b></span></p>
-			<li><p><a class='doclink' href='{OVERVIEW_URL}#juneau-marshall-rdf.jmr.RdfDetails.jmr.Parsers'>RDF Parsers</a><span class='update'>updated: <b>9.0.0</b></span></p>
-			<li><p><a class='doclink' href='{OVERVIEW_URL}#juneau-marshall-rdf.jmr.RdfDetails.jmr.RdfAnnotation'>@Rdf Annotation</a></p>
-			<li><p><a class='doclink' href='{OVERVIEW_URL}#juneau-marshall-rdf.jmr.RdfDetails.jmr.Namespaces'>Namespaces</a><span class='update'>updated: <b>9.0.0</b></span></p>
-			<li><p><a class='doclink' href='{OVERVIEW_URL}#juneau-marshall-rdf.jmr.RdfDetails.jmr.UriProperties'>URI Properties</a><span class='update'>updated: <b>9.0.0</b></span></p>
-			<li><p><a class='doclink' href='{OVERVIEW_URL}#juneau-marshall-rdf.jmr.RdfDetails.jmr.RootProperty'>Root Property</a><span class='update'>updated: <b>9.0.0</b></span></p>
-			<li><p><a class='doclink' href='{OVERVIEW_URL}#juneau-marshall-rdf.jmr.RdfDetails.jmr.TypedLiterals'>Typed Literals</a><span class='update'>updated: <b>9.0.0</b></span></p>
-		</ol>
-	</ol>
 	<li><p class='toc2'><a class='doclink' href='{OVERVIEW_URL}#juneau-dto'>juneau-dto</a></p>
 	<ol>
 		<li><p><a class='doclink' href='{OVERVIEW_URL}#juneau-dto.jd.Html5'>HTML5</a></p>
diff --git a/juneau-env.sh b/juneau-env.sh
index 1c0a83492..9def82841 100755
--- a/juneau-env.sh
+++ b/juneau-env.sh
@@ -14,7 +14,7 @@
 . ~/.profile
 set -e
 export JUNEAU_VERSION=9.0.0
-export JAVA_HOME=/Library/Java/JavaVirtualMachines/jdk1.8.0_162.jdk/Contents/Home
+export JAVA_HOME=/Library/Java/JavaVirtualMachines/jdk-14.jdk/Contents/Home
 export PATH=$JAVA_HOME/bin:$PATH
 export PATH=/opt/homebrew/bin:$PATH
 export GPG_TTY=$(tty)
diff --git a/juneau-examples/juneau-examples-rest-jetty-ftest/src/test/java/org/apache/juneau/examples/rest/TestUtils.java b/juneau-examples/juneau-examples-rest-jetty-ftest/src/test/java/org/apache/juneau/examples/rest/TestUtils.java
index 2f74cd506..2fb7cdd4d 100644
--- a/juneau-examples/juneau-examples-rest-jetty-ftest/src/test/java/org/apache/juneau/examples/rest/TestUtils.java
+++ b/juneau-examples/juneau-examples-rest-jetty-ftest/src/test/java/org/apache/juneau/examples/rest/TestUtils.java
@@ -12,25 +12,17 @@
 // ***************************************************************************************************************************
 package org.apache.juneau.examples.rest;
 
-import static org.junit.Assert.*;
 import static org.apache.juneau.internal.StringUtils.*;
 import static org.apache.juneau.internal.IOUtils.*;
 
 import java.io.*;
 import java.util.regex.*;
 
-import javax.xml.parsers.*;
-import javax.xml.transform.*;
-import javax.xml.transform.dom.*;
-import javax.xml.transform.stream.*;
-
 import org.apache.juneau.json.*;
 import org.apache.juneau.serializer.*;
 import org.apache.juneau.swaps.*;
 import org.apache.juneau.xml.*;
 import org.junit.*;
-import org.w3c.dom.*;
-import org.xml.sax.*;
 
 public class TestUtils {
 
@@ -202,65 +194,6 @@ public class TestUtils {
 		}
 	}
 
-	/**
-	 * Sort an XML document by element and attribute names.
-	 * This method is primarily meant for debugging purposes.
-	 */
-	private static final String sortXml(String xml) throws Exception {
-
-		xml = xml.replaceAll("\\w+\\:", "");  // Strip out all namespaces.
-
-		DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
-		dbf.setIgnoringElementContentWhitespace(true);
-		dbf.setNamespaceAware(false);
-		DocumentBuilder db = dbf.newDocumentBuilder();
-		Document doc = db.parse(new InputSource(new StringReader(xml)));
-
-		DOMSource s = new DOMSource(doc);
-
-		StringWriter sw = new StringWriter();
-		StreamResult sr = new StreamResult(sw);
-		XML_SORT_TRANSFORMER.transform(s, sr);
-		return sw.toString().replace('"', '\'').replace("\r", "");
-	}
-
-	/**
-	 * Compares two XML documents for equality.
-	 * Namespaces are stripped from each and elements/servletAttributes are ordered in alphabetical order,
-	 * 	then a simple string comparison is performed.
-	 */
-	public static final void assertXmlEquals(String expected, String actual) throws Exception {
-		assertEquals(sortXml(expected), sortXml(actual));
-	}
-
-	private static Transformer XML_SORT_TRANSFORMER;
-	static {
-		try {
-			String xsl = ""
-				+ "	<xsl:stylesheet version='1.0'"
-				+ "	 xmlns:xsl='http://www.w3.org/1999/XSL/Transform'>"
-				+ "	 <xsl:output omit-xml-declaration='yes' indent='yes'/>"
-				+ "	 <xsl:strip-space elements='*'/>"
-				+ "	 <xsl:template match='node()|@*'>"
-				+ "	  <xsl:copy>"
-				+ "	   <xsl:apply-templates select='@*'>"
-				+ "	    <xsl:sort select='name()'/>"
-				+ "	   </xsl:apply-templates>"
-				+ "	   <xsl:apply-templates select='node()'>"
-				+ "	    <xsl:sort select='name()'/>"
-				+ "	    <xsl:sort select='text()'/>"
-				+ "	   </xsl:apply-templates>"
-				+ "	  </xsl:copy>"
-				+ "	 </xsl:template>"
-				+ "	</xsl:stylesheet>";
-			TransformerFactory tf = TransformerFactory.newInstance();
-			StreamSource ss = new StreamSource(new StringReader(xsl));
-			XML_SORT_TRANSFORMER = tf.newTransformer(ss);
-		} catch (Exception e) {
-			throw new RuntimeException(e);
-		}
-	}
-
 	/**
 	 * Assert that the object equals the specified string after running it through SimpleJsonSerializer.DEFAULT.toString().
 	 */
diff --git a/pom.xml b/pom.xml
index bcffb207f..145dd64ef 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,8 +32,8 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<maven.compiler.source>1.8</maven.compiler.source>
-		<maven.compiler.target>1.8</maven.compiler.target>
+		<maven.compiler.source>11</maven.compiler.source>
+		<maven.compiler.target>11</maven.compiler.target>
 
 		<jaxb.version>2.3.1</jaxb.version>
 		<junit.version>4.13.2</junit.version>