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

[juneau] branch master updated: Javadocs

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

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


The following commit(s) were added to refs/heads/master by this push:
     new b61d286  Javadocs
b61d286 is described below

commit b61d286b165f1e617145e606b1f04679e9450404
Author: JamesBognar <ja...@salesforce.com>
AuthorDate: Fri Oct 15 21:25:21 2021 -0400

    Javadocs
---
 .../java/org/apache/juneau/jena/Constants.java     |   6 +-
 .../main/java/org/apache/juneau/jena/N3Parser.java |   2 +-
 .../java/org/apache/juneau/jena/N3Serializer.java  |   2 +-
 .../org/apache/juneau/jena/NTripleSerializer.java  |   2 +-
 .../java/org/apache/juneau/jena/RdfParser.java     | 180 ++++++++-----
 .../org/apache/juneau/jena/RdfParserSession.java   |  12 +-
 .../java/org/apache/juneau/jena/RdfSerializer.java | 281 ++++++++++++++++-----
 .../apache/juneau/jena/RdfSerializerSession.java   |  22 +-
 .../org/apache/juneau/jena/RdfXmlSerializer.java   |   2 +-
 .../org/apache/juneau/jena/TurtleSerializer.java   |   2 +-
 .../org/apache/juneau/jena/annotation/Rdf.java     |   2 +-
 .../juneau/jena/annotation/RdfAnnotation.java      |   8 +-
 .../apache/juneau/jena/annotation/RdfConfig.java   |  94 ++++---
 .../jena/annotation/RdfConfigAnnotation.java       |   6 +-
 .../main/java/org/apache/juneau/BeanContext.java   |   6 +-
 .../java/org/apache/juneau/BeanContextable.java    |   1 -
 .../org/apache/juneau/annotation/BeanConfig.java   |   2 +-
 .../org/apache/juneau/http/header/HeaderList.java  |   2 +-
 .../java/org/apache/juneau/http/part/PartList.java |   2 +-
 .../org/apache/juneau/httppart/HttpPartSchema.java |  56 ++--
 .../juneau/jsonschema/JsonSchemaGenerator.java     |   2 +-
 .../main/java/org/apache/juneau/parser/Parser.java |  12 +-
 .../org/apache/juneau/serializer/Serializer.java   |  24 +-
 .../serializer/annotation/SerializerConfig.java    |   2 +-
 .../org/apache/juneau/microservice/LogConfig.java  |   2 +-
 .../apache/juneau/microservice/Microservice.java   |   4 +-
 .../microservice/console/ConsoleCommand.java       |   2 +-
 .../org/apache/juneau/rest/client/RestClient.java  |   2 +-
 .../java/org/apache/juneau/rest/RestContext.java   | 100 ++++----
 .../java/org/apache/juneau/rest/RestOpContext.java |   8 +-
 .../org/apache/juneau/rest/annotation/Rest.java    |   2 +-
 31 files changed, 537 insertions(+), 313 deletions(-)

diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/Constants.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/Constants.java
index 55b0cd5..2cc57fd 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/Constants.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/Constants.java
@@ -12,8 +12,6 @@
 // ***************************************************************************************************************************
 package org.apache.juneau.jena;
 
-import org.apache.juneau.serializer.*;
-
 /**
  * Constants used by the {@link RdfSerializer} and {@link RdfParser} classes.
  */
@@ -59,7 +57,7 @@ public final class Constants {
 	 * Property added to root nodes to help identify them as root elements during parsing.
 	 *
 	 * <p>
-	 * Added if {@link RdfSerializer#RDF_addRootProperty} setting is enabled.
+	 * Added if {@link RdfSerializer.Builder#addRootProperty()} setting is enabled.
 	 */
 	public static final String RDF_juneauNs_ROOT = "root";
 
@@ -70,7 +68,7 @@ public final class Constants {
 	 * Property added to bean resources to identify the class type.
 	 *
 	 * <p>
-	 * Added if {@link Serializer#SERIALIZER_addBeanTypes} setting is enabled.
+	 * Added if {@link org.apache.juneau.serializer.Serializer.Builder#addBeanTypes()} setting is enabled.
 	 */
 	public static final String RDF_juneauNs_TYPE = "_type";
 
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/N3Parser.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/N3Parser.java
index 169fa33..2f13fab 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/N3Parser.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/N3Parser.java
@@ -40,7 +40,7 @@ public class N3Parser extends RdfParser {
 	/**
 	 * Constructor.
 	 *
-	 * @param cp The property store containing all the settings for this object.
+	 * @param builder The builder for this object.
 	 */
 	protected N3Parser(RdfParser.Builder builder) {
 		super(builder.n3().consumes("text/n3"));
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/N3Serializer.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/N3Serializer.java
index 3580d77..56a8eef 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/N3Serializer.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/N3Serializer.java
@@ -40,7 +40,7 @@ public class N3Serializer extends RdfSerializer {
 	/**
 	 * Constructor.
 	 *
-	 * @param cp The property store containing all the settings for this object.
+	 * @param builder The builder for this object.
 	 */
 	protected N3Serializer(RdfSerializer.Builder builder) {
 		super(builder.n3());
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/NTripleSerializer.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/NTripleSerializer.java
index 83a6147..34d0717 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/NTripleSerializer.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/NTripleSerializer.java
@@ -40,7 +40,7 @@ public class NTripleSerializer extends RdfSerializer {
 	/**
 	 * Constructor.
 	 *
-	 * @param cp The property store containing all the settings for this object.
+	 * @param builder The builder for this object.
 	 */
 	protected NTripleSerializer(RdfSerializer.Builder builder) {
 		super(builder.ntriple());
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfParser.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfParser.java
index 6719e15..7cfedb3 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfParser.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfParser.java
@@ -251,8 +251,6 @@ public class RdfParser extends ReaderParser implements RdfMetaProvider {
 		 * 		{@doc ExtARP/ARPOptions.html#setEmbedding(boolean) ARPOptions.setEmbedding(boolean)}
 		 * </ul>
 		 *
-		 * @param value
-		 * 	The new value for this property.
 		 * @return This object (for method chaining).
 		 */
 		@FluentSetter
@@ -260,6 +258,21 @@ public class RdfParser extends ReaderParser implements RdfMetaProvider {
 			return rdfxml_embedding(true);
 		}
 
+		/**
+		 * RDF/XML ARP property: <c>embedding</c>.
+		 *
+		 * <p>
+		 * Sets ARP to look for RDF embedded within an enclosing XML document.
+		 *
+		 * <ul class='seealso'>
+		 * 	<li>
+		 * 		{@doc ExtARP/ARPOptions.html#setEmbedding(boolean) ARPOptions.setEmbedding(boolean)}
+		 * </ul>
+		 *
+		 * @param value
+		 * 	The new value for this property.
+		 * @return This object (for method chaining).
+		 */
 		@FluentSetter
 		public Builder rdfxml_embedding(boolean value) {
 			return jena("rdfXml.embedding", value);
@@ -294,6 +307,17 @@ public class RdfParser extends ReaderParser implements RdfMetaProvider {
 			return rdfxml_longId(true);
 		}
 
+		/**
+		 * RDF/XML property: <c>longId</c>.
+		 *
+		 * <p>
+		 * Whether to use long ID's for anon resources.
+		 * Short ID's are easier to read, but can run out of memory on very large models.
+		 *
+		 * @param value
+		 * 	The new value for this property.
+		 * @return This object (for method chaining).
+		 */
 		@FluentSetter
 		public Builder rdfxml_longId(boolean value) {
 			return jena("rdfXml.longId", value);
@@ -305,8 +329,6 @@ public class RdfParser extends ReaderParser implements RdfMetaProvider {
 		 * <p>
 		 * URIs in the graph are, by default, checked prior to serialization.
 		 *
-		 * @param value
-		 * 	The new value for this property.
 		 * @return This object (for method chaining).
 		 */
 		@FluentSetter
@@ -314,6 +336,16 @@ public class RdfParser extends ReaderParser implements RdfMetaProvider {
 			return rdfxml_allowBadUris(true);
 		}
 
+		/**
+		 * RDF/XML property: <c>allowBadURIs</c>.
+		 *
+		 * <p>
+		 * URIs in the graph are, by default, checked prior to serialization.
+		 *
+		 * @param value
+		 * 	The new value for this property.
+		 * @return This object (for method chaining).
+		 */
 		@FluentSetter
 		public Builder rdfxml_allowBadUris(boolean value) {
 			return jena("rdfXml.allowBadURIs", value);
@@ -397,6 +429,19 @@ public class RdfParser extends ReaderParser implements RdfMetaProvider {
 			return rdfxml_disableShowDoctypeDeclaration(true);
 		}
 
+		/**
+		 * RDF/XML property: <c>disableShowDoctypeDeclaration</c>.
+		 *
+		 * <p>
+		 * If disabled, an XML doctype declaration isn't included in the output.
+		 * This declaration includes a <c>!ENTITY</c> declaration for each prefix mapping in the model, and any
+		 * attribute value that starts with the URI of that mapping is written as starting with the corresponding entity
+		 * invocation.
+		 *
+		 * @param value
+		 * 	The new value for this property.
+		 * @return This object (for method chaining).
+		 */
 		@FluentSetter
 		public Builder rdfxml_disableShowDoctypeDeclaration(boolean value) {
 			return jena("rdfXml.disableShowDoctypeDeclaration", value);
@@ -477,6 +522,16 @@ public class RdfParser extends ReaderParser implements RdfMetaProvider {
 			return n3_disableObjectLists(true);
 		}
 
+		/**
+		 * N3/Turtle property: <c>disableObjectLists</c>.
+		 *
+		 * <p>
+		 * Don't print object lists as comma separated lists.
+		 *
+		 * @param value
+		 * 	The new value for this property.
+		 * @return This object (for method chaining).
+		 */
 		@FluentSetter
 		public Builder n3_disableObjectLists(boolean value) {
 			return jena("n3.disableObjectLists", value);
@@ -556,6 +611,16 @@ public class RdfParser extends ReaderParser implements RdfMetaProvider {
 			return n3_disableAbbrevBaseUri(true);
 		}
 
+		/**
+		 * N3/Turtle property: <c>disableAbbrevBaseURI</c>.
+		 *
+		 * <p>
+		 * Controls whether to use abbreviations <c>&lt;&gt;</c> or <c>&lt;#&gt;</c>.
+		 *
+		 * @param value
+		 * 	The new value for this setting.
+		 * @return This object (for method chaining).
+		 */
 		@FluentSetter
 		public Builder n3_disableAbbrevBaseUri(boolean value) {
 			return jena("n3.disableAbbrevBaseUri", value);
@@ -574,6 +639,16 @@ public class RdfParser extends ReaderParser implements RdfMetaProvider {
 			return n3_disableUsePropertySymbols(true);
 		}
 
+		/**
+		 * N3/Turtle property: <c>disableUsePropertySymbols</c>.
+		 *
+		 * <p>
+		 * Controls whether to use <c>a</c>, <c>=</c> and <c>=&gt;</c> in output
+		 *
+		 * @param value
+		 * 	The new value for this setting.
+		 * @return This object (for method chaining).
+		 */
 		@FluentSetter
 		public Builder n3_disableUsePropertySymbols(boolean value) {
 			return jena("n3.disableUsePropertySymbols", value);
@@ -592,6 +667,16 @@ public class RdfParser extends ReaderParser implements RdfMetaProvider {
 			return n3_disableUseTripleQuotedStrings(true);
 		}
 
+		/**
+		 * N3/Turtle property: <c>disableUseTripleQuotedStrings</c>.
+		 *
+		 * <p>
+		 * Disallow the use of <c>"""</c> to delimit long strings.
+		 *
+		 * @param value
+		 * 	The new value for this setting.
+		 * @return This object (for method chaining).
+		 */
 		@FluentSetter
 		public Builder n3_disableUseTripleQuotedStrings(boolean value) {
 			return jena("n3.disableUseTripleQuotedStrings", value);
@@ -610,6 +695,16 @@ public class RdfParser extends ReaderParser implements RdfMetaProvider {
 			return n3_disableUseDoubles(true);
 		}
 
+		/**
+		 * N3/Turtle property: <c>disableUseDoubles</c>.
+		 *
+		 * <p>
+		 * Disallow the use of doubles as <c>123.456</c>.
+		 *
+		 * @param value
+		 * 	The new value for this setting.
+		 * @return This object (for method chaining).
+		 */
 		@FluentSetter
 		public Builder n3_disableUseDoubles(boolean value) {
 			return jena("n3.disableUseDoubles", value);
@@ -633,10 +728,6 @@ public class RdfParser extends ReaderParser implements RdfMetaProvider {
 		 * 		<js>"MULTI_VALUED"</js> - Multi-valued properties.
 		 * </ul>
 		 *
-		 * <ul class='seealso'>
-		 * 	<li class='jf'>{@link RdfParser#RDF_collectionFormat}
-		 * </ul>
-		 *
 		 * @param value The new value for this property.
 		 * @return This object (for method chaining).
 		 */
@@ -649,10 +740,6 @@ public class RdfParser extends ReaderParser implements RdfMetaProvider {
 		/**
 		 * Default XML namespace for bean properties.
 		 *
-		 * <ul class='seealso'>
-		 * 	<li class='jf'>{@link RdfParser#RDF_juneauBpNs}
-		 * </ul>
-		 *
 		 * @param value
 		 * 	The new value for this property.
 		 * 	<br>The default is <code>{j:<js>'http://www.apache.org/juneaubp/'</js>}</code>.
@@ -667,10 +754,6 @@ public class RdfParser extends ReaderParser implements RdfMetaProvider {
 		/**
 		 * XML namespace for Juneau properties.
 		 *
-		 * <ul class='seealso'>
-		 * 	<li class='jf'>{@link RdfParser#RDF_juneauNs}
-		 * </ul>
-		 *
 		 * @param value
 		 * 	The new value for this property.
 		 * 	<br>The default is <code>{j:<js>'http://www.apache.org/juneau/'</js>}</code>.
@@ -716,11 +799,10 @@ public class RdfParser extends ReaderParser implements RdfMetaProvider {
 		 * </ul>
 		 *
 		 * <ul class='seealso'>
-		 * 	<li class='jf'>{@link RdfParser#RDF_language}
-		 * 	<li class='jm'>{@link org.apache.juneau.jena.Builder#n3()}
-		 * 	<li class='jm'>{@link org.apache.juneau.jena.Builder#ntriple()}
-		 * 	<li class='jm'>{@link org.apache.juneau.jena.Builder#turtle()}
-		 * 	<li class='jm'>{@link org.apache.juneau.jena.Builder#xml()}
+		 * 	<li class='jm'>{@link org.apache.juneau.jena.RdfParser.Builder#n3()}
+		 * 	<li class='jm'>{@link org.apache.juneau.jena.RdfParser.Builder#ntriple()}
+		 * 	<li class='jm'>{@link org.apache.juneau.jena.RdfParser.Builder#turtle()}
+		 * 	<li class='jm'>{@link org.apache.juneau.jena.RdfParser.Builder#xml()}
 		 * </ul>
 		 *
 		 * @param value The new value for this property.
@@ -779,10 +861,6 @@ public class RdfParser extends ReaderParser implements RdfMetaProvider {
 		 * 	<jv>myBeans</jv> = <jv>parser</jv>.parse(<jv>rdfXml</jv>, MyBean[].<jk>class</jk>);
 		 * </p>
 		 *
-		 * <ul class='seealso'>
-		 * 	<li class='jf'>{@link RdfParser#RDF_looseCollections}
-		 * </ul>
-		 *
 		 * @return This object (for method chaining).
 		 */
 		@FluentSetter
@@ -790,6 +868,12 @@ public class RdfParser extends ReaderParser implements RdfMetaProvider {
 			return looseCollections(true);
 		}
 
+		/**
+		 * Same as {@link #looseCollections()} but explicitly specifies the setting value.
+		 *
+		 * @param value
+		 * @return This object.
+		 */
 		@FluentSetter
 		public Builder looseCollections(boolean value) {
 			looseCollections = value;
@@ -802,10 +886,6 @@ public class RdfParser extends ReaderParser implements RdfMetaProvider {
 		 * <p>
 		 * Shortcut for calling <code>language(<jsf>LANG_N3</jsf>)</code>.
 		 *
-		 * <ul class='seealso'>
-		 * 	<li class='jf'>{@link RdfParser#RDF_language}
-		 * </ul>
-		 *
 		 * @return This object (for method chaining).
 		 */
 		@FluentSetter
@@ -819,10 +899,6 @@ public class RdfParser extends ReaderParser implements RdfMetaProvider {
 		 * <p>
 		 * Shortcut for calling <code>language(<jsf>LANG_NTRIPLE</jsf>)</code>.
 		 *
-		 * <ul class='seealso'>
-		 * 	<li class='jf'>{@link RdfParser#RDF_language}
-		 * </ul>
-		 *
 		 * @return This object (for method chaining).
 		 */
 		@FluentSetter
@@ -846,10 +922,6 @@ public class RdfParser extends ReaderParser implements RdfMetaProvider {
 		 * 		.build();
 		 * </p>
 		 *
-		 * <ul class='seealso'>
-		 * 	<li class='jf'>{@link RdfParser#RDF_trimWhitespace}
-		 * </ul>
-		 *
 		 * @return This object (for method chaining).
 		 */
 		@FluentSetter
@@ -857,6 +929,13 @@ public class RdfParser extends ReaderParser implements RdfMetaProvider {
 			return trimWhitespace(true);
 		}
 
+		/**
+		 * Same as {@link #trimWhitespace()} but allows you to explicitly specify the value.
+		 *
+		 * @param value
+		 * 	The new value for this setting.
+		 * @return This object.
+		 */
 		@FluentSetter
 		public Builder trimWhitespace(boolean value) {
 			trimWhitespace = value;
@@ -866,10 +945,6 @@ public class RdfParser extends ReaderParser implements RdfMetaProvider {
 		/**
 		 * Shortcut for calling <code>language(<jsf>LANG_TURTLE</jsf>)</code>.
 		 *
-		 * <ul class='seealso'>
-		 * 	<li class='jf'>{@link RdfParser#RDF_language}
-		 * </ul>
-		 *
 		 * @return This object (for method chaining).
 		 */
 		@FluentSetter
@@ -880,10 +955,6 @@ public class RdfParser extends ReaderParser implements RdfMetaProvider {
 		/**
 		 * Shortcut for calling <code>language(<jsf>LANG_RDF_XML</jsf>)</code>.
 		 *
-		 * <ul class='seealso'>
-		 * 	<li class='jf'>{@link RdfParser#RDF_language}
-		 * </ul>
-		 *
 		 * @return This object (for method chaining).
 		 */
 		@FluentSetter
@@ -894,10 +965,6 @@ public class RdfParser extends ReaderParser implements RdfMetaProvider {
 		/**
 		 * Shortcut for calling <code>language(<jsf>LANG_RDF_XML_ABBREV</jsf>)</code>.
 		 *
-		 * <ul class='seealso'>
-		 * 	<li class='jf'>{@link RdfParser#RDF_language}
-		 * </ul>
-		 *
 		 * @return This object (for method chaining).
 		 */
 		@FluentSetter
@@ -1399,8 +1466,7 @@ public class RdfParser extends ReaderParser implements RdfMetaProvider {
 	/**
 	 * Constructor.
 	 *
-	 * @param cp The property store containing all the settings for this object.
-	 * @param consumes The list of media types that this parser consumes (e.g. <js>"application/json"</js>).
+	 * @param builder The builder for this object.
 	 */
 	protected RdfParser(Builder builder) {
 		super((Builder) builder.consumes(getConsumes(builder)));
@@ -1516,7 +1582,7 @@ public class RdfParser extends ReaderParser implements RdfMetaProvider {
 	/**
 	 * RDF format for representing collections and arrays.
 	 *
-	 * @see #RDF_collectionFormat
+	 * @see RdfParser.Builder#collectionFormat(RdfCollectionFormat)
 	 * @return
 	 * 	RDF format for representing collections and arrays.
 	 */
@@ -1527,7 +1593,7 @@ public class RdfParser extends ReaderParser implements RdfMetaProvider {
 	/**
 	 * Default XML namespace for bean properties.
 	 *
-	 * @see #RDF_juneauBpNs
+	 * @see RdfParser.Builder#juneauBpNs(Namespace)
 	 * @return
 	 * 	Default XML namespace for bean properties.
 	 */
@@ -1538,7 +1604,7 @@ public class RdfParser extends ReaderParser implements RdfMetaProvider {
 	/**
 	 * XML namespace for Juneau properties.
 	 *
-	 * @see #RDF_juneauNs
+	 * @see RdfParser.Builder#juneauNs(Namespace)
 	 * @return
 	 * 	XML namespace for Juneau properties.
 	 */
@@ -1549,7 +1615,7 @@ public class RdfParser extends ReaderParser implements RdfMetaProvider {
 	/**
 	 * RDF language.
 	 *
-	 * @see #RDF_language
+	 * @see RdfParser.Builder#language(String)
 	 * @return
 	 * 	The RDF language to use.
 	 */
@@ -1560,7 +1626,7 @@ public class RdfParser extends ReaderParser implements RdfMetaProvider {
 	/**
 	 * Collections should be serialized and parsed as loose collections.
 	 *
-	 * @see #RDF_looseCollections
+	 * @see RdfParser.Builder#looseCollections()
 	 * @return
 	 * 	<jk>true</jk> if collections of resources are handled as loose collections of resources in RDF instead of
 	 * 	resources that are children of an RDF collection (e.g. Sequence, Bag).
@@ -1590,7 +1656,7 @@ public class RdfParser extends ReaderParser implements RdfMetaProvider {
 	/**
 	 * Trim whitespace from text elements.
 	 *
-	 * @see #RDF_trimWhitespace
+	 * @see RdfParser.Builder#trimWhitespace()
 	 * @return
 	 * 	<jk>true</jk> if whitespace in text elements will be automatically trimmed.
 	 */
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfParserSession.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfParserSession.java
index a62e904..4bf61d0 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfParserSession.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfParserSession.java
@@ -602,7 +602,7 @@ public class RdfParserSession extends ReaderParserSession {
 	/**
 	 * Configuration property:  RDF format for representing collections and arrays.
 	 *
-	 * @see RdfParser#RDF_collectionFormat
+	 * @see RdfParser.Builder#collectionFormat(RdfCollectionFormat)
 	 * @return
 	 * 	RDF format for representing collections and arrays.
 	 */
@@ -613,7 +613,7 @@ public class RdfParserSession extends ReaderParserSession {
 	/**
 	 * Configuration property:  Default XML namespace for bean properties.
 	 *
-	 * @see RdfParser#RDF_juneauBpNs
+	 * @see RdfParser.Builder#juneauBpNs(Namespace)
 	 * @return
 	 * 	Default XML namespace for bean properties.
 	 */
@@ -624,7 +624,7 @@ public class RdfParserSession extends ReaderParserSession {
 	/**
 	 * Configuration property:  XML namespace for Juneau properties.
 	 *
-	 * @see RdfParser#RDF_juneauNs
+	 * @see RdfParser.Builder#juneauNs(Namespace)
 	 * @return
 	 * 	XML namespace for Juneau properties.
 	 */
@@ -635,7 +635,7 @@ public class RdfParserSession extends ReaderParserSession {
 	/**
 	 * Configuration property:  RDF language.
 	 *
-	 * @see RdfParser#RDF_language
+	 * @see RdfParser.Builder#language(String)
 	 * @return
 	 * 	The RDF language to use.
 	 */
@@ -646,7 +646,7 @@ public class RdfParserSession extends ReaderParserSession {
 	/**
 	 * Configuration property:  Collections should be serialized and parsed as loose collections.
 	 *
-	 * @see RdfParser#RDF_looseCollections
+	 * @see RdfParser.Builder#looseCollections()
 	 * @return
 	 * 	<jk>true</jk> if collections of resources are handled as loose collections of resources in RDF instead of
 	 * 	resources that are children of an RDF collection (e.g. Sequence, Bag).
@@ -676,7 +676,7 @@ public class RdfParserSession extends ReaderParserSession {
 	/**
 	 * Configuration property:  Trim whitespace from text elements.
 	 *
-	 * @see RdfParser#RDF_trimWhitespace
+	 * @see RdfParser.Builder#trimWhitespace()
 	 * @return
 	 * 	<jk>true</jk> if whitespace in text elements will be automatically trimmed.
 	 */
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializer.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializer.java
index e8d61ee..6d53300 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializer.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializer.java
@@ -199,7 +199,7 @@ public class RdfSerializer extends WriterSerializer implements RdfMetaProvider {
 		 * through reflection.
 		 *
 		 * <p>
-		 * When present, this value overrides the {@link Serializer.Builder#addBeanTypes()} setting and is
+		 * When present, this value overrides the {@link org.apache.juneau.serializer.Serializer.Builder#addBeanTypes()} setting and is
 		 * provided to customize the behavior of specific serializers in a {@link SerializerGroup}.
 		 *
 		 * @return This object.
@@ -300,8 +300,6 @@ public class RdfSerializer extends WriterSerializer implements RdfMetaProvider {
 		 * 		{@doc ExtARP/ARPOptions.html#setEmbedding(boolean) ARPOptions.setEmbedding(boolean)}
 		 * </ul>
 		 *
-		 * @param value
-		 * 	The new value for this setting.
 		 * @return This object (for method chaining).
 		 */
 		@FluentSetter
@@ -309,6 +307,21 @@ public class RdfSerializer extends WriterSerializer implements RdfMetaProvider {
 			return rdfxml_embedding(true);
 		}
 
+		/**
+		 * RDF/XML ARP property: <c>error-mode</c>.
+		 *
+		 * <p>
+		 * Sets ARP to look for RDF embedded within an enclosing XML document.
+		 *
+		 * <ul class='seealso'>
+		 * 	<li>
+		 * 		{@doc ExtARP/ARPOptions.html#setEmbedding(boolean) ARPOptions.setEmbedding(boolean)}
+		 * </ul>
+		 *
+		 * @param value
+		 * 	The new value for this setting.
+		 * @return This object (for method chaining).
+		 */
 		@FluentSetter
 		public Builder rdfxml_embedding(boolean value) {
 			return jena("rdfXml.embedding", value);
@@ -343,6 +356,17 @@ public class RdfSerializer extends WriterSerializer implements RdfMetaProvider {
 			return rdfxml_longId(true);
 		}
 
+		/**
+		 * RDF/XML property: <c>longId</c>.
+		 *
+		 * <p>
+		 * Whether to use long ID's for anon resources.
+		 * Short ID's are easier to read, but can run out of memory on very large models.
+		 *
+		 * @param value
+		 * 	The new value for this setting.
+		 * @return This object (for method chaining).
+		 */
 		@FluentSetter
 		public Builder rdfxml_longId(boolean value) {
 			return jena("rdfXml.longId", value);
@@ -361,6 +385,16 @@ public class RdfSerializer extends WriterSerializer implements RdfMetaProvider {
 			return rdfxml_allowBadUris(true);
 		}
 
+		/**
+		 * RDF/XML property: <c>allowBadURIs</c>.
+		 *
+		 * <p>
+		 * URIs in the graph are, by default, checked prior to serialization.
+		 *
+		 * @param value
+		 * 	The new value for this setting.
+		 * @return This object (for method chaining).
+		 */
 		@FluentSetter
 		public Builder rdfxml_allowBadUris(boolean value) {
 			return jena("rdfXml.allowBadURIs", value);
@@ -444,6 +478,19 @@ public class RdfSerializer extends WriterSerializer implements RdfMetaProvider {
 			return rdfxml_disableShowDoctypeDeclaration(true);
 		}
 
+		/**
+		 * RDF/XML property: <c>disableShowDoctypeDeclaration</c>.
+		 *
+		 * <p>
+		 * If disabled, an XML doctype declaration isn't included in the output.
+		 * This declaration includes a <c>!ENTITY</c> declaration for each prefix mapping in the model, and any
+		 * attribute value that starts with the URI of that mapping is written as starting with the corresponding entity
+		 * invocation.
+		 *
+		 * @param value
+		 * 	The new value for this setting.
+		 * @return This object (for method chaining).
+		 */
 		@FluentSetter
 		public Builder rdfxml_disableShowDoctypeDeclaration(boolean value) {
 			return jena("rdfXml.disableShowDoctypeDeclaration", value);
@@ -524,6 +571,16 @@ public class RdfSerializer extends WriterSerializer implements RdfMetaProvider {
 			return n3_disableObjectLists(true);
 		}
 
+		/**
+		 * N3/Turtle property: <c>disableObjectLists</c>.
+		 *
+		 * <p>
+		 * Don't print object lists as comma separated lists.
+		 *
+		 * @param value
+		 * 	The new value for this setting.
+		 * @return This object (for method chaining).
+		 */
 		@FluentSetter
 		public Builder n3_disableObjectLists(boolean value) {
 			return jena("n3.disableObjectLists", value);
@@ -603,6 +660,16 @@ public class RdfSerializer extends WriterSerializer implements RdfMetaProvider {
 			return n3_disableAbbrevBaseUri(true);
 		}
 
+		/**
+		 * N3/Turtle property: <c>disableAbbrevBaseURI</c>.
+		 *
+		 * <p>
+		 * Controls whether to use abbreviations <c>&lt;&gt;</c> or <c>&lt;#&gt;</c>.
+		 *
+		 * @param value
+		 * 	The new value for this setting.
+		 * @return This object (for method chaining).
+		 */
 		@FluentSetter
 		public Builder n3_disableAbbrevBaseUri(boolean value) {
 			return jena("n3.disableAbbrevBaseUri", value);
@@ -621,6 +688,16 @@ public class RdfSerializer extends WriterSerializer implements RdfMetaProvider {
 			return n3_disableUsePropertySymbols(true);
 		}
 
+		/**
+		 * N3/Turtle property: <c>disableUsePropertySymbols</c>.
+		 *
+		 * <p>
+		 * Controls whether to use <c>a</c>, <c>=</c> and <c>=&gt;</c> in output
+		 *
+		 * @param value
+		 * 	The new value for this setting.
+		 * @return This object (for method chaining).
+		 */
 		@FluentSetter
 		public Builder n3_disableUsePropertySymbols(boolean value) {
 			return jena("n3.disableUsePropertySymbols", value);
@@ -639,6 +716,16 @@ public class RdfSerializer extends WriterSerializer implements RdfMetaProvider {
 			return n3_disableUseTripleQuotedStrings(true);
 		}
 
+		/**
+		 * N3/Turtle property: <c>disableUseTripleQuotedStrings</c>.
+		 *
+		 * <p>
+		 * Disallow the use of <c>"""</c> to delimit long strings.
+		 *
+		 * @param value
+		 * 	The new value for this setting.
+		 * @return This object (for method chaining).
+		 */
 		@FluentSetter
 		public Builder n3_disableUseTripleQuotedStrings(boolean value) {
 			return jena("n3.disableUseTripleQuotedStrings", value);
@@ -657,6 +744,16 @@ public class RdfSerializer extends WriterSerializer implements RdfMetaProvider {
 			return n3_disableUseDoubles(true);
 		}
 
+		/**
+		 * N3/Turtle property: <c>disableUseDoubles</c>.
+		 *
+		 * <p>
+		 * Disallow the use of doubles as <c>123.456</c>.
+		 *
+		 * @param value
+		 * 	The new value for this setting.
+		 * @return This object (for method chaining).
+		 */
 		@FluentSetter
 		public Builder n3_disableUseDoubles(boolean value) {
 			return jena("n3.disableUseDoubles", value);
@@ -675,6 +772,16 @@ public class RdfSerializer extends WriterSerializer implements RdfMetaProvider {
 			return addLiteralTypes(true);
 		}
 
+		/**
+		 * Add XSI data types to non-<c>String</c> literals.
+		 *
+		 * <p>
+		 * Shortcut for calling <code>addLiteralTypes(<jk>true</jk>)</code>.
+		 *
+		 * @param value
+		 * 	The new value for this setting.
+		 * @return This object (for method chaining).
+		 */
 		@FluentSetter
 		public Builder addLiteralTypes(boolean value) {
 			addLiteralTypes = value;
@@ -693,10 +800,6 @@ public class RdfSerializer extends WriterSerializer implements RdfMetaProvider {
 		 * If disabled, the parser has to search through the model to find any resources without incoming predicates to
 		 * identify root notes, which can introduce a considerable performance degradation.
 		 *
-		 * <ul class='seealso'>
-		 * 	<li class='jf'>{@link RdfSerializer#RDF_addRootProperty}
-		 * </ul>
-		 *
 		 * @return This object (for method chaining).
 		 */
 		@FluentSetter
@@ -704,6 +807,22 @@ public class RdfSerializer extends WriterSerializer implements RdfMetaProvider {
 			return addRootProperty(true);
 		}
 
+		/**
+		 * Add RDF root identifier property to root node.
+		 *
+		 * <p>
+		 * When enabled an RDF property <c>http://www.apache.org/juneau/root</c> is added with a value of <js>"true"</js>
+		 * to identify the root node in the graph.
+		 * <br>This helps locate the root node during parsing.
+		 *
+		 * <p>
+		 * If disabled, the parser has to search through the model to find any resources without incoming predicates to
+		 * identify root notes, which can introduce a considerable performance degradation.
+		 *
+		 * @param value
+		 * 	The new value for this setting.
+		 * @return This object (for method chaining).
+		 */
 		@FluentSetter
 		public Builder addRootProperty(boolean value) {
 			addRootProperty = value;
@@ -720,10 +839,6 @@ public class RdfSerializer extends WriterSerializer implements RdfMetaProvider {
 		 * If enabled, then the data structure will first be crawled looking for namespaces that will be encountered before
 		 * the root element is serialized.
 		 *
-		 * <ul class='seealso'>
-		 * 	<li class='jf'>{@link RdfSerializer#RDF_disableAutoDetectNamespaces}
-		 * </ul>
-		 *
 		 * @return This object (for method chaining).
 		 */
 		@FluentSetter
@@ -731,6 +846,20 @@ public class RdfSerializer extends WriterSerializer implements RdfMetaProvider {
 			return disableAutoDetectNamespaces(true);
 		}
 
+		/**
+		 * Disable auto-detect namespace usage.
+		 *
+		 * <p>
+		 * Don't detect namespace usage before serialization.
+		 *
+		 * <p>
+		 * If enabled, then the data structure will first be crawled looking for namespaces that will be encountered before
+		 * the root element is serialized.
+		 *
+		 * @param value
+		 * 	The new value for this setting.
+		 * @return This object (for method chaining).
+		 */
 		@FluentSetter
 		public Builder disableAutoDetectNamespaces(boolean value) {
 			disableAutoDetectNamespaces = value;
@@ -748,10 +877,6 @@ public class RdfSerializer extends WriterSerializer implements RdfMetaProvider {
 		 * 		lost.
 		 * </ul>
 		 *
-		 * <ul class='seealso'>
-		 * 	<li class='jf'>{@link RdfSerializer#RDF_collectionFormat}
-		 * </ul>
-		 *
 		 * @param value
 		 * 	The new value for this setting.
 		 * 	<br>Possible values:
@@ -773,10 +898,6 @@ public class RdfSerializer extends WriterSerializer implements RdfMetaProvider {
 		/**
 		 * Default XML namespace for bean properties.
 		 *
-		 * <ul class='seealso'>
-		 * 	<li class='jf'>{@link RdfSerializer#RDF_juneauBpNs}
-		 * </ul>
-		 *
 		 * @param value
 		 * 	The new value for this setting.
 		 * 	<br>The default is <code>{j:<js>'http://www.apache.org/juneaubp/'</js>}</code>.
@@ -791,10 +912,6 @@ public class RdfSerializer extends WriterSerializer implements RdfMetaProvider {
 		/**
 		 * XML namespace for Juneau properties.
 		 *
-		 * <ul class='seealso'>
-		 * 	<li class='jf'>{@link RdfSerializer#RDF_juneauNs}
-		 * </ul>
-		 *
 		 * @param value
 		 * 	The new value for this setting.
 		 * 	<br>The default is <code>{j:<js>'http://www.apache.org/juneau/'</js>}</code>.
@@ -840,7 +957,6 @@ public class RdfSerializer extends WriterSerializer implements RdfMetaProvider {
 		 * </ul>
 		 *
 		 * <ul class='seealso'>
-		 * 	<li class='jf'>{@link RdfSerializer#RDF_language}
 		 * 	<li class='jm'>{@link #n3()}
 		 * 	<li class='jm'>{@link #ntriple()}
 		 * 	<li class='jm'>{@link #turtle()}
@@ -905,10 +1021,6 @@ public class RdfSerializer extends WriterSerializer implements RdfMetaProvider {
 		 * 	<jv>myBeans</jv> = <jv>parser</jv>.parse(<jv>rdfXml</jv>, MyBean[].<jk>class</jk>);
 		 * </p>
 		 *
-		 * <ul class='seealso'>
-		 * 	<li class='jf'>{@link RdfSerializer#RDF_looseCollections}
-		 * </ul>
-		 *
 		 * @return This object (for method chaining).
 		 */
 		@FluentSetter
@@ -916,6 +1028,57 @@ public class RdfSerializer extends WriterSerializer implements RdfMetaProvider {
 			return looseCollections(true);
 		}
 
+		/**
+		 * Collections should be serialized and parsed as loose collections.
+		 *
+		 * <p>
+		 * When specified, collections of resources are handled as loose collections of resources in RDF instead of
+		 * resources that are children of an RDF collection (e.g. Sequence, Bag).
+		 *
+		 * <p>
+		 * Note that this setting is specialized for RDF syntax, and is incompatible with the concept of
+		 * losslessly representing POJO models, since the tree structure of these POJO models are lost
+		 * when serialized as loose collections.
+		 *
+		 * <p>
+		 * This setting is typically only useful if the beans being parsed into do not have a bean property
+		 * annotated with {@link Rdf#beanUri @Rdf(beanUri=true)}.
+		 *
+		 * <h5 class='section'>Example:</h5>
+		 * <p class='bcode w800'>
+		 * 	WriterSerializer <jv>serializer</jv> = RdfSerializer
+		 * 		.<jsm>create</jsm>()
+		 * 		.xmlabbrev()
+		 * 		.looseCollections()
+		 * 		.build();
+		 *
+		 * 	ReaderParser <jv>parser</jv> = RdfParser
+		 * 		.<jsm>create</jsm>()
+		 * 		.xml()
+		 * 		.looseCollections()
+		 * 		.build();
+		 *
+		 * 	List&lt;MyBean&gt; <jv>myList</jv> = createListOfMyBeans();
+		 *
+		 * 	<jc>// Serialize to RDF/XML as loose resources</jc>
+		 * 	String <jv>rdfXml</jv> = <jv>serializer</jv>.serialize(<jv>myList</jv>);
+		 *
+		 * 	<jc>// Parse back into a Java collection</jc>
+		 * 	<jv>myList</jv> = <jv>parser</jv>.parse(<jv>rdfXml</jv>, LinkedList.<jk>class</jk>, MyBean.<jk>class</jk>);
+		 *
+		 * 	MyBean[] <jv>myBeans</jv> = createArrayOfMyBeans();
+		 *
+		 * 	<jc>// Serialize to RDF/XML as loose resources</jc>
+		 * 	<jv>rdfXml</jv> = <jv>serializer</jv>.serialize(<jv>myBeans</jv>);
+		 *
+		 * 	<jc>// Parse back into a bean array</jc>
+		 * 	<jv>myBeans</jv> = <jv>parser</jv>.parse(<jv>rdfXml</jv>, MyBean[].<jk>class</jk>);
+		 * </p>
+		 *
+		 * @param value
+		 * 	The new value for this setting.
+		 * @return This object (for method chaining).
+		 */
 		@FluentSetter
 		public Builder looseCollections(boolean value) {
 			looseCollections = value;
@@ -928,10 +1091,6 @@ public class RdfSerializer extends WriterSerializer implements RdfMetaProvider {
 		 * <p>
 		 * Shortcut for calling <code>language(<jsf>LANG_N3</jsf>)</code>
 		 *
-		 * <ul class='seealso'>
-		 * 	<li class='jf'>{@link RdfSerializer#RDF_language}
-		 * </ul>
-		 *
 		 * @return This object (for method chaining).
 		 */
 		@FluentSetter
@@ -945,10 +1104,6 @@ public class RdfSerializer extends WriterSerializer implements RdfMetaProvider {
 		 * <p>
 		 * The default list of namespaces associated with this serializer.
 		 *
-		 * <ul class='seealso'>
-		 * 	<li class='jf'>{@link RdfSerializer#RDF_namespaces}
-		 * </ul>
-		 *
 		 * @param values The new value for this setting.
 		 * @return This object (for method chaining).
 		 */
@@ -966,10 +1121,6 @@ public class RdfSerializer extends WriterSerializer implements RdfMetaProvider {
 		 * <p>
 		 * Shortcut for calling <code>language(<jsf>LANG_NTRIPLE</jsf>)</code>
 		 *
-		 * <ul class='seealso'>
-		 * 	<li class='jf'>{@link RdfSerializer#RDF_language}
-		 * </ul>
-		 *
 		 * @return This object (for method chaining).
 		 */
 		@FluentSetter
@@ -983,10 +1134,6 @@ public class RdfSerializer extends WriterSerializer implements RdfMetaProvider {
 		 * <p>
 		 * Shortcut for calling <code>language(<jsf>LANG_TURTLE</jsf>)</code>
 		 *
-		 * <ul class='seealso'>
-		 * 	<li class='jf'>{@link RdfSerializer#RDF_language}
-		 * </ul>
-		 *
 		 * @return This object (for method chaining).
 		 */
 		@FluentSetter
@@ -1002,10 +1149,6 @@ public class RdfSerializer extends WriterSerializer implements RdfMetaProvider {
 		 * inherited by the RDF serializers.
 		 * Otherwise, namespaces will be defined using {@link RdfNs @RdfNs} and {@link Rdf @Rdf}.
 		 *
-		 * <ul class='seealso'>
-		 * 	<li class='jf'>{@link RdfSerializer#RDF_disableUseXmlNamespaces}
-		 * </ul>
-		 *
 		 * @return This object (for method chaining).
 		 */
 		@FluentSetter
@@ -1013,6 +1156,18 @@ public class RdfSerializer extends WriterSerializer implements RdfMetaProvider {
 			return disableUseXmlNamespaces(true);
 		}
 
+		/**
+		 * Disable reuse of XML namespaces when RDF namespaces not specified.
+		 *
+		 * <p>
+		 * When enabled, namespaces defined using {@link XmlNs @XmlNs} and {@link org.apache.juneau.xml.annotation.Xml Xml} will not be
+		 * inherited by the RDF serializers.
+		 * Otherwise, namespaces will be defined using {@link RdfNs @RdfNs} and {@link Rdf @Rdf}.
+		 *
+		 * @param value
+		 * 	The new value for this setting.
+		 * @return This object (for method chaining).
+		 */
 		@FluentSetter
 		public Builder disableUseXmlNamespaces(boolean value) {
 			disableUseXmlNamespaces = value;
@@ -1025,10 +1180,6 @@ public class RdfSerializer extends WriterSerializer implements RdfMetaProvider {
 		 * <p>
 		 * Shortcut for calling <code>language(<jsf>LANG_RDF_XML</jsf>)</code>
 		 *
-		 * <ul class='seealso'>
-		 * 	<li class='jf'>{@link RdfSerializer#RDF_language}
-		 * </ul>
-		 *
 		 * @return This object (for method chaining).
 		 */
 		@FluentSetter
@@ -1042,10 +1193,6 @@ public class RdfSerializer extends WriterSerializer implements RdfMetaProvider {
 		 * <p>
 		 * Shortcut for calling <code>language(<jsf>LANG_RDF_XML_ABBREV</jsf>)</code>
 		 *
-		 * <ul class='seealso'>
-		 * 	<li class='jf'>{@link RdfSerializer#RDF_language}
-		 * </ul>
-		 *
 		 * @return This object (for method chaining).
 		 */
 		@FluentSetter
@@ -1807,7 +1954,7 @@ public class RdfSerializer extends WriterSerializer implements RdfMetaProvider {
 	/**
 	 * RDF format for representing collections and arrays.
 	 *
-	 * @see #RDF_collectionFormat
+	 * @see RdfSerializer.Builder#collectionFormat(RdfCollectionFormat)
 	 * @return
 	 * 	RDF format for representing collections and arrays.
 	 */
@@ -1818,7 +1965,7 @@ public class RdfSerializer extends WriterSerializer implements RdfMetaProvider {
 	/**
 	 * Default XML namespace for bean properties.
 	 *
-	 * @see #RDF_juneauBpNs
+	 * @see RdfSerializer.Builder#juneauBpNs(Namespace)
 	 * @return
 	 * 	The XML namespace to use for bean properties.
 	 */
@@ -1829,7 +1976,7 @@ public class RdfSerializer extends WriterSerializer implements RdfMetaProvider {
 	/**
 	 * XML namespace for Juneau properties.
 	 *
-	 * @see #RDF_juneauNs
+	 * @see RdfSerializer.Builder#juneauNs(Namespace)
 	 * @return
 	 * 	The XML namespace to use for Juneau properties.
 	 */
@@ -1840,7 +1987,7 @@ public class RdfSerializer extends WriterSerializer implements RdfMetaProvider {
 	/**
 	 * RDF language.
 	 *
-	 * @see #RDF_language
+	 * @see RdfSerializer.Builder#language(String)
 	 * @return
 	 * 	The RDF language to use.
 	 */
@@ -1851,7 +1998,7 @@ public class RdfSerializer extends WriterSerializer implements RdfMetaProvider {
 	/**
 	 * Collections should be serialized and parsed as loose collections.
 	 *
-	 * @see #RDF_looseCollections
+	 * @see RdfSerializer.Builder#looseCollections()
 	 * @return
 	 * 	<jk>true</jk> if collections of resources are handled as loose collections of resources in RDF instead of
 	 * 	resources that are children of an RDF collection (e.g. Sequence, Bag).
@@ -1881,7 +2028,7 @@ public class RdfSerializer extends WriterSerializer implements RdfMetaProvider {
 	/**
 	 * Add <js>"_type"</js> properties when needed.
 	 *
-	 * @see #RDF_addBeanTypes
+	 * @see RdfSerializer.Builder#addBeanTypes()
 	 * @return
 	 * 	<jk>true</jk> if <js>"_type"</js> properties will be added to beans if their type cannot be inferred
 	 * 	through reflection.
@@ -1894,7 +2041,7 @@ public class RdfSerializer extends WriterSerializer implements RdfMetaProvider {
 	/**
 	 * Add XSI data types to non-<c>String</c> literals.
 	 *
-	 * @see #RDF_addLiteralTypes
+	 * @see RdfSerializer.Builder#addLiteralTypes()
 	 * @return
 	 * 	<jk>true</jk> if XSI data types should be added to string literals.
 	 */
@@ -1905,7 +2052,7 @@ public class RdfSerializer extends WriterSerializer implements RdfMetaProvider {
 	/**
 	 * Add RDF root identifier property to root node.
 	 *
-	 * @see RdfSerializer#RDF_addRootProperty
+	 * @see RdfSerializer.Builder#addRootProperty()
 	 * @return
 	 * 	<jk>true</jk> if RDF property <c>http://www.apache.org/juneau/root</c> is added with a value of <js>"true"</js>
 	 * 	to identify the root node in the graph.
@@ -1917,7 +2064,7 @@ public class RdfSerializer extends WriterSerializer implements RdfMetaProvider {
 	/**
 	 * Auto-detect namespace usage.
 	 *
-	 * @see #RDF_disableAutoDetectNamespaces
+	 * @see RdfSerializer.Builder#disableAutoDetectNamespaces()
 	 * @return
 	 * 	<jk>true</jk> if namespaces usage should be detected before serialization.
 	 */
@@ -1928,7 +2075,7 @@ public class RdfSerializer extends WriterSerializer implements RdfMetaProvider {
 	/**
 	 * Default namespaces.
 	 *
-	 * @see #RDF_namespaces
+	 * @see RdfSerializer.Builder#namespaces(Namespace...)
 	 * @return
 	 * 	The default list of namespaces associated with this serializer.
 	 */
@@ -1939,7 +2086,7 @@ public class RdfSerializer extends WriterSerializer implements RdfMetaProvider {
 	/**
 	 * Reuse XML namespaces when RDF namespaces not specified.
 	 *
-	 * @see #RDF_disableUseXmlNamespaces
+	 * @see RdfSerializer.Builder#disableUseXmlNamespaces()
 	 * @return
 	 * 	<jk>true</jk> if namespaces defined using {@link XmlNs @XmlNs} and {@link Xml @Xml} will be inherited by the RDF serializers.
 	 * 	<br>Otherwise, namespaces will be defined using {@link RdfNs @RdfNs} and {@link Rdf @Rdf}.
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerSession.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerSession.java
index 3fd3138..66c0d5e 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerSession.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerSession.java
@@ -562,7 +562,7 @@ public final class RdfSerializerSession extends WriterSerializerSession {
 	/**
 	 * Configuration property:  RDF format for representing collections and arrays.
 	 *
-	 * @see RdfSerializer#RDF_collectionFormat
+	 * @see RdfSerializer.Builder#collectionFormat(RdfCollectionFormat)
 	 * @return
 	 * 	RDF format for representing collections and arrays.
 	 */
@@ -573,7 +573,7 @@ public final class RdfSerializerSession extends WriterSerializerSession {
 	/**
 	 * Configuration property:  Default XML namespace for bean properties.
 	 *
-	 * @see RdfSerializer#RDF_juneauBpNs
+	 * @see RdfSerializer.Builder#juneauBpNs(Namespace)
 	 * @return
 	 * 	The XML namespace to use for bean properties.
 	 */
@@ -584,7 +584,7 @@ public final class RdfSerializerSession extends WriterSerializerSession {
 	/**
 	 * Configuration property:  XML namespace for Juneau properties.
 	 *
-	 * @see RdfSerializer#RDF_juneauNs
+	 * @see RdfSerializer.Builder#juneauNs(Namespace)
 	 * @return
 	 * 	The XML namespace to use for Juneau properties.
 	 */
@@ -595,7 +595,7 @@ public final class RdfSerializerSession extends WriterSerializerSession {
 	/**
 	 * Configuration property:  RDF language.
 	 *
-	 * @see RdfSerializer#RDF_language
+	 * @see RdfSerializer.Builder#language(String)
 	 * @return
 	 * 	The RDF language to use.
 	 */
@@ -606,7 +606,7 @@ public final class RdfSerializerSession extends WriterSerializerSession {
 	/**
 	 * Configuration property:  Collections should be serialized and parsed as loose collections.
 	 *
-	 * @see RdfSerializer#RDF_looseCollections
+	 * @see RdfSerializer.Builder#looseCollections()
 	 * @return
 	 * 	<jk>true</jk> if collections of resources are handled as loose collections of resources in RDF instead of
 	 * 	resources that are children of an RDF collection (e.g. Sequence, Bag).
@@ -636,7 +636,7 @@ public final class RdfSerializerSession extends WriterSerializerSession {
 	/**
 	 * Configuration property:  Add <js>"_type"</js> properties when needed.
 	 *
-	 * @see RdfSerializer#RDF_addBeanTypes
+	 * @see RdfSerializer.Builder#addBeanTypes()
 	 * @return
 	 * 	<jk>true</jk> if <js>"_type"</js> properties will be added to beans if their type cannot be inferred
 	 * 	through reflection.
@@ -649,7 +649,7 @@ public final class RdfSerializerSession extends WriterSerializerSession {
 	/**
 	 * Configuration property:  Add XSI data types to non-<c>String</c> literals.
 	 *
-	 * @see RdfSerializer#RDF_addLiteralTypes
+	 * @see RdfSerializer.Builder#addLiteralTypes()
 	 * @return
 	 * 	<jk>true</jk> if XSI data types should be added to string literals.
 	 */
@@ -660,7 +660,7 @@ public final class RdfSerializerSession extends WriterSerializerSession {
 	/**
 	 * Configuration property:  Add RDF root identifier property to root node.
 	 *
-	 * @see RdfSerializer#RDF_addRootProperty
+	 * @see RdfSerializer.Builder#addRootProperty()
 	 * @return
 	 * 	<jk>true</jk> if RDF property <c>http://www.apache.org/juneau/root</c> is added with a value of <js>"true"</js>
 	 * 	to identify the root node in the graph.
@@ -672,7 +672,7 @@ public final class RdfSerializerSession extends WriterSerializerSession {
 	/**
 	 * Configuration property:  Auto-detect namespace usage.
 	 *
-	 * @see RdfSerializer#RDF_disableAutoDetectNamespaces
+	 * @see RdfSerializer.Builder#disableAutoDetectNamespaces()
 	 * @return
 	 * 	<jk>true</jk> if namespaces usage should be detected before serialization.
 	 */
@@ -683,7 +683,7 @@ public final class RdfSerializerSession extends WriterSerializerSession {
 	/**
 	 * Configuration property:  Default namespaces.
 	 *
-	 * @see RdfSerializer#RDF_namespaces
+	 * @see RdfSerializer.Builder#namespaces(Namespace...)
 	 * @return
 	 * 	The default list of namespaces associated with this serializer.
 	 */
@@ -694,7 +694,7 @@ public final class RdfSerializerSession extends WriterSerializerSession {
 	/**
 	 * Configuration property:  Reuse XML namespaces when RDF namespaces not specified.
 	 *
-	 * @see RdfSerializer#RDF_disableUseXmlNamespaces
+	 * @see RdfSerializer.Builder#disableUseXmlNamespaces()
 	 * @return
 	 * 	<jk>true</jk> if namespaces defined using {@link XmlNs @XmlNs} and {@link org.apache.juneau.xml.annotation.Xml @Xml} will be inherited by the RDF serializers.
 	 * 	<br>Otherwise, namespaces will be defined using {@link RdfNs @RdfNs} and {@link Rdf @Rdf}.
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfXmlSerializer.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfXmlSerializer.java
index 147d815..5f75ee7 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfXmlSerializer.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfXmlSerializer.java
@@ -40,7 +40,7 @@ public class RdfXmlSerializer extends RdfSerializer {
 	/**
 	 * Constructor.
 	 *
-	 * @param cp The property store containing all the settings for this object.
+	 * @param builder The builder for this object.
 	 */
 	protected RdfXmlSerializer(RdfSerializer.Builder builder) {
 		super(builder.xml());
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/TurtleSerializer.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/TurtleSerializer.java
index ca96bb2..3beea1e 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/TurtleSerializer.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/TurtleSerializer.java
@@ -40,7 +40,7 @@ public class TurtleSerializer extends RdfSerializer {
 	/**
 	 * Constructor.
 	 *
-	 * @param cp The property store containing all the settings for this object.
+	 * @param builder The builder for this object.
 	 */
 	protected TurtleSerializer(RdfSerializer.Builder builder) {
 		super(builder.turtle());
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/annotation/Rdf.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/annotation/Rdf.java
index 84338e7..939e2c7 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/annotation/Rdf.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/annotation/Rdf.java
@@ -77,7 +77,7 @@ public @interface Rdf {
 	 * Dynamically apply this annotation to the specified classes/methods/fields.
 	 *
 	 * <p>
-	 * Used in conjunction with {@link BeanContext.Builder#applyAnnotations(Class...)} to dynamically apply an annotation to an existing class/method/field.
+	 * Used in conjunction with {@link org.apache.juneau.BeanContext.Builder#applyAnnotations(Class...)} to dynamically apply an annotation to an existing class/method/field.
 	 * It is ignored when the annotation is applied directly to classes/methods/fields.
 	 *
 	 * <h5 class='section'>Valid patterns:</h5>
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/annotation/RdfAnnotation.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/annotation/RdfAnnotation.java
index 8c2a1a4..4ca5d3c 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/annotation/RdfAnnotation.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/annotation/RdfAnnotation.java
@@ -92,7 +92,7 @@ public class RdfAnnotation {
 	 * Builder class.
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='jm'>{@link BeanContext.Builder#annotations(Annotation...)}
+	 * 	<li class='jm'>{@link org.apache.juneau.BeanContext.Builder#annotations(Annotation...)}
 	 * </ul>
 	 */
 	public static class Builder extends TargetedAnnotationTMFBuilder {
@@ -241,14 +241,13 @@ public class RdfAnnotation {
 	//-----------------------------------------------------------------------------------------------------------------
 
 	/**
-	 * Applies targeted {@link Rdf} annotations to a {@link RdfSerializer.Builder}.
+	 * Applies targeted {@link Rdf} annotations to a {@link org.apache.juneau.jena.RdfSerializer.Builder}.
 	 */
 	public static class SerializerApplier extends AnnotationApplier<Rdf,RdfSerializer.Builder> {
 
 		/**
 		 * Constructor.
 		 *
-		 * @param c The annotation class.
 		 * @param vr The resolver for resolving values in annotations.
 		 */
 		public SerializerApplier(VarResolverSession vr) {
@@ -267,14 +266,13 @@ public class RdfAnnotation {
 	}
 
 	/**
-	 * Applies targeted {@link Rdf} annotations to a {@link RdfParser.Builder}.
+	 * Applies targeted {@link Rdf} annotations to a {@link org.apache.juneau.jena.RdfParser.Builder}.
 	 */
 	public static class ParserApplier extends AnnotationApplier<Rdf,RdfParser.Builder> {
 
 		/**
 		 * Constructor.
 		 *
-		 * @param c The annotation class.
 		 * @param vr The resolver for resolving values in annotations.
 		 */
 		public ParserApplier(VarResolverSession vr) {
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/annotation/RdfConfig.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/annotation/RdfConfig.java
index 9d91e0b..adbed29 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/annotation/RdfConfig.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/annotation/RdfConfig.java
@@ -89,7 +89,8 @@ public @interface RdfConfig {
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='jf'>{@link RdfCommon#RDF_language}
+	 * 	<li class='jm'>{@link org.apache.juneau.jena.RdfSerializer.Builder#language(String)}
+	 * 	<li class='jm'>{@link org.apache.juneau.jena.RdfParser.Builder#language(String)}
 	 * </ul>
 	 */
 	String language() default "";
@@ -103,7 +104,8 @@ public @interface RdfConfig {
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='jf'>{@link RdfCommon#RDF_juneauNs}
+	 * 	<li class='jm'>{@link org.apache.juneau.jena.RdfSerializer.Builder#juneauNs(Namespace)}
+	 * 	<li class='jm'>{@link org.apache.juneau.jena.RdfParser.Builder#juneauNs(Namespace)}
 	 * </ul>
 	 */
 	String juneauNs() default "";
@@ -117,7 +119,8 @@ public @interface RdfConfig {
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='jf'>{@link RdfCommon#RDF_juneauBpNs}
+	 * 	<li class='jm'>{@link org.apache.juneau.jena.RdfSerializer.Builder#juneauBpNs(Namespace)}
+	 * 	<li class='jm'>{@link org.apache.juneau.jena.RdfParser.Builder#juneauBpNs(Namespace)}
 	 * </ul>
 	 */
 	String juneauBpNs() default "";
@@ -146,10 +149,6 @@ public @interface RdfConfig {
 	 * 	<li>
 	 * 		Supports {@doc DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
-	 *
-	 * <ul class='seealso'>
-	 * 	<li class='jf'>{@link RdfCommon#RDF_arp_iriRules}
-	 * </ul>
 	 */
 	String rdfxml_iriRules() default "";
 
@@ -176,7 +175,6 @@ public @interface RdfConfig {
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='jf'>{@link RdfCommon#RDF_arp_errorMode}
 	 * 	<li>
 	 * 		{@doc ExtARP/ARPOptions.html#setDefaultErrorMode() ARPOptions.setDefaultErrorMode()}
 	 * 	<li>
@@ -201,7 +199,6 @@ public @interface RdfConfig {
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='jf'>{@link RdfCommon#RDF_arp_embedding}
 	 * 	<li>
 	 * 		{@doc ExtARP/ARPOptions.html#setEmbedding(boolean) ARPOptions.setEmbedding(boolean)}
 	 * </ul>
@@ -220,7 +217,8 @@ public @interface RdfConfig {
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='jf'>{@link RdfCommon#RDF_rdfxml_xmlBase}
+	 * 	<li class='jm'>{@link org.apache.juneau.jena.RdfSerializer.Builder#rdfxml_xmlbase(String)}
+	 * 	<li class='jm'>{@link org.apache.juneau.jena.RdfParser.Builder#rdfxml_xmlbase(String)}
 	 * </ul>
 	 */
 	String rdfxml_xmlBase() default "";
@@ -238,7 +236,8 @@ public @interface RdfConfig {
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='jf'>{@link RdfCommon#RDF_rdfxml_longId}
+	 * 	<li class='jm'>{@link org.apache.juneau.jena.RdfSerializer.Builder#rdfxml_longId()}
+	 * 	<li class='jm'>{@link org.apache.juneau.jena.RdfParser.Builder#rdfxml_longId()}
 	 * </ul>
 	 */
 	String rdfxml_longId() default "";
@@ -255,7 +254,8 @@ public @interface RdfConfig {
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='jf'>{@link RdfCommon#RDF_rdfxml_allowBadUris}
+	 * 	<li class='jm'>{@link org.apache.juneau.jena.RdfSerializer.Builder#rdfxml_allowBadUris()}
+	 * 	<li class='jm'>{@link org.apache.juneau.jena.RdfParser.Builder#rdfxml_allowBadUris()}
 	 * </ul>
 	 */
 	String rdfxml_allowBadUris() default "";
@@ -294,7 +294,8 @@ public @interface RdfConfig {
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='jf'>{@link RdfCommon#RDF_rdfxml_relativeUris}
+	 * 	<li class='jm'>{@link org.apache.juneau.jena.RdfSerializer.Builder#rdfxml_relativeUris(String)}
+	 * 	<li class='jm'>{@link org.apache.juneau.jena.RdfParser.Builder#rdfxml_relativeUris(String)}
 	 * </ul>
 	 */
 	String rdfxml_relativeUris() default "";
@@ -320,7 +321,8 @@ public @interface RdfConfig {
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='jf'>{@link RdfCommon#RDF_rdfxml_showXmlDeclaration}
+	 * 	<li class='jm'>{@link org.apache.juneau.jena.RdfSerializer.Builder#rdfxml_showXmlDeclaration(String)}
+	 * 	<li class='jm'>{@link org.apache.juneau.jena.RdfParser.Builder#rdfxml_showXmlDeclaration(String)}
 	 * </ul>
 	 */
 	String rdfxml_showXmlDeclaration() default "";
@@ -340,7 +342,8 @@ public @interface RdfConfig {
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='jf'>{@link RdfCommon#RDF_rdfxml_disableShowDoctypeDeclaration}
+	 * 	<li class='jm'>{@link org.apache.juneau.jena.RdfSerializer.Builder#rdfxml_disableShowDoctypeDeclaration()}
+	 * 	<li class='jm'>{@link org.apache.juneau.jena.RdfParser.Builder#rdfxml_disableShowDoctypeDeclaration()}
 	 * </ul>
 	 */
 	String rdfxml_disableShowDoctypeDeclaration() default "";
@@ -357,7 +360,8 @@ public @interface RdfConfig {
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='jf'>{@link RdfCommon#RDF_rdfxml_tab}
+	 * 	<li class='jm'>{@link org.apache.juneau.jena.RdfSerializer.Builder#rdfxml_tab(int)}
+	 * 	<li class='jm'>{@link org.apache.juneau.jena.RdfParser.Builder#rdfxml_tab(int)}
 	 * </ul>
 	 */
 	String rdfxml_tab() default "";
@@ -374,7 +378,8 @@ public @interface RdfConfig {
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='jf'>{@link RdfCommon#RDF_rdfxml_attributeQuoteChar}
+	 * 	<li class='jm'>{@link org.apache.juneau.jena.RdfSerializer.Builder#rdfxml_attributeQuoteChar(char)}
+	 * 	<li class='jm'>{@link org.apache.juneau.jena.RdfParser.Builder#rdfxml_attributeQuoteChar(char)}
 	 * </ul>
 	 */
 	String rdfxml_attributeQuoteChar() default "";
@@ -393,7 +398,8 @@ public @interface RdfConfig {
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='jf'>{@link RdfCommon#RDF_rdfxml_blockRules}
+	 * 	<li class='jm'>{@link org.apache.juneau.jena.RdfSerializer.Builder#rdfxml_blockRules(String)}
+	 * 	<li class='jm'>{@link org.apache.juneau.jena.RdfParser.Builder#rdfxml_blockRules(String)}
 	 * </ul>
 	 */
 	String rdfxml_blockRules() default "";
@@ -410,7 +416,8 @@ public @interface RdfConfig {
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='jf'>{@link RdfCommon#RDF_n3_minGap}
+	 * 	<li class='jm'>{@link org.apache.juneau.jena.RdfSerializer.Builder#n3_minGap(int)}
+	 * 	<li class='jm'>{@link org.apache.juneau.jena.RdfParser.Builder#n3_minGap(int)}
 	 * </ul>
 	 */
 	String n3_minGap() default "";
@@ -427,7 +434,8 @@ public @interface RdfConfig {
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='jf'>{@link RdfCommon#RDF_n3_disableObjectLists}
+	 * 	<li class='jm'>{@link org.apache.juneau.jena.RdfSerializer.Builder#n3_disableObjectLists()}
+	 * 	<li class='jm'>{@link org.apache.juneau.jena.RdfParser.Builder#n3_disableObjectLists()}
 	 * </ul>
 	 */
 	String n3_disableObjectLists() default "";
@@ -444,7 +452,8 @@ public @interface RdfConfig {
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='jf'>{@link RdfCommon#RDF_n3_subjectColumn}
+	 * 	<li class='jm'>{@link org.apache.juneau.jena.RdfSerializer.Builder#n3_subjectColumn(int)}
+	 * 	<li class='jm'>{@link org.apache.juneau.jena.RdfParser.Builder#n3_subjectColumn(int)}
 	 * </ul>
 	 */
 	String n3_subjectColumn() default "";
@@ -461,7 +470,8 @@ public @interface RdfConfig {
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='jf'>{@link RdfCommon#RDF_n3_propertyColumn}
+	 * 	<li class='jm'>{@link org.apache.juneau.jena.RdfSerializer.Builder#n3_propertyColumn(int)}
+	 * 	<li class='jm'>{@link org.apache.juneau.jena.RdfParser.Builder#n3_propertyColumn(int)}
 	 * </ul>
 	 */
 	String n3_propertyColumn() default "";
@@ -478,7 +488,8 @@ public @interface RdfConfig {
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='jf'>{@link RdfCommon#RDF_n3_indentProperty}
+	 * 	<li class='jm'>{@link org.apache.juneau.jena.RdfSerializer.Builder#n3_indentProperty(int)}
+	 * 	<li class='jm'>{@link org.apache.juneau.jena.RdfParser.Builder#n3_indentProperty(int)}
 	 * </ul>
 	 */
 	String n3_indentProperty() default "";
@@ -496,7 +507,8 @@ public @interface RdfConfig {
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='jf'>{@link RdfCommon#RDF_n3_widePropertyLen}
+	 * 	<li class='jm'>{@link org.apache.juneau.jena.RdfSerializer.Builder#n3_widePropertyLen(int)}
+	 * 	<li class='jm'>{@link org.apache.juneau.jena.RdfParser.Builder#n3_widePropertyLen(int)}
 	 * </ul>
 	 */
 	String n3_widePropertyLen() default "";
@@ -513,7 +525,8 @@ public @interface RdfConfig {
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='jf'>{@link RdfCommon#RDF_n3_disableAbbrevBaseUri}
+	 * 	<li class='jm'>{@link org.apache.juneau.jena.RdfSerializer.Builder#n3_disableAbbrevBaseUri()}
+	 * 	<li class='jm'>{@link org.apache.juneau.jena.RdfParser.Builder#n3_disableAbbrevBaseUri()}
 	 * </ul>
 	 */
 	String n3_disableAbbrevBaseUri() default "";
@@ -530,7 +543,8 @@ public @interface RdfConfig {
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='jf'>{@link RdfCommon#RDF_n3_disableUsePropertySymbols}
+	 * 	<li class='jm'>{@link org.apache.juneau.jena.RdfSerializer.Builder#n3_disableUsePropertySymbols()}
+	 * 	<li class='jm'>{@link org.apache.juneau.jena.RdfParser.Builder#n3_disableUsePropertySymbols()}
 	 * </ul>
 	 */
 	String n3_disableUsePropertySymbols() default "";
@@ -547,7 +561,8 @@ public @interface RdfConfig {
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='jf'>{@link RdfCommon#RDF_n3_disableUseTripleQuotedStrings}
+	 * 	<li class='jm'>{@link org.apache.juneau.jena.RdfSerializer.Builder#n3_disableUseTripleQuotedStrings()}
+	 * 	<li class='jm'>{@link org.apache.juneau.jena.RdfParser.Builder#n3_disableUseTripleQuotedStrings()}
 	 * </ul>
 	 */
 	String n3_disableUseTripleQuotedStrings() default "";
@@ -564,7 +579,8 @@ public @interface RdfConfig {
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='jf'>{@link RdfCommon#RDF_n3_disableUseDoubles}
+	 * 	<li class='jm'>{@link org.apache.juneau.jena.RdfSerializer.Builder#n3_disableUseDoubles()}
+	 * 	<li class='jm'>{@link org.apache.juneau.jena.RdfParser.Builder#n3_disableUseDoubles()}
 	 * </ul>
 	 */
 	String n3_disableUseDoubles() default "";
@@ -595,7 +611,8 @@ public @interface RdfConfig {
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='jf'>{@link RdfCommon#RDF_collectionFormat}
+	 * 	<li class='jm'>{@link org.apache.juneau.jena.RdfSerializer.Builder#collectionFormat(RdfCollectionFormat)}
+	 * 	<li class='jm'>{@link org.apache.juneau.jena.RdfParser.Builder#collectionFormat(RdfCollectionFormat)}
 	 * </ul>
 	 */
 	String collectionFormat() default "";
@@ -622,7 +639,8 @@ public @interface RdfConfig {
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='jf'>{@link RdfCommon#RDF_looseCollections}
+	 * 	<li class='jm'>{@link org.apache.juneau.jena.RdfSerializer.Builder#looseCollections()}
+	 * 	<li class='jm'>{@link org.apache.juneau.jena.RdfParser.Builder#looseCollections()}
 	 * </ul>
 	 */
 	String looseCollections() default "";
@@ -643,7 +661,7 @@ public @interface RdfConfig {
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='jf'>{@link RdfParser#RDF_trimWhitespace}
+	 * 	<li class='jm'>{@link org.apache.juneau.jena.RdfParser.Builder#trimWhitespace()}
 	 * </ul>
 	 */
 	String trimWhitespace() default "";
@@ -659,7 +677,7 @@ public @interface RdfConfig {
 	 * through reflection.
 	 *
 	 * <p>
-	 * When present, this value overrides the {@link Serializer#SERIALIZER_addBeanTypes} setting and is
+	 * When present, this value overrides the {@link org.apache.juneau.serializer.Serializer.Builder#addBeanTypes()} setting and is
 	 * provided to customize the behavior of specific serializers in a {@link SerializerGroup}.
 	 *
 	 * <ul class='notes'>
@@ -668,7 +686,7 @@ public @interface RdfConfig {
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='jf'>{@link RdfSerializer#RDF_addBeanTypes}
+	 * 	<li class='jm'>{@link org.apache.juneau.jena.RdfSerializer.Builder#addBeanTypes()}
 	 * </ul>
 	 */
 	String addBeanTypes() default "";
@@ -682,7 +700,7 @@ public @interface RdfConfig {
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='jf'>{@link RdfSerializer#RDF_addLiteralTypes}
+	 * 	<li class='jm'>{@link org.apache.juneau.jena.RdfSerializer.Builder#addLiteralTypes()}
 	 * </ul>
 	 */
 	String addLiteralTypes() default "";
@@ -705,7 +723,7 @@ public @interface RdfConfig {
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='jf'>{@link RdfSerializer#RDF_addRootProperty}
+	 * 	<li class='jm'>{@link org.apache.juneau.jena.RdfSerializer.Builder#addRootProperty()}
 	 * </ul>
 	 */
 	String addRootProperty() default "";
@@ -726,7 +744,7 @@ public @interface RdfConfig {
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='jf'>{@link RdfSerializer#RDF_disableAutoDetectNamespaces}
+	 * 	<li class='jm'>{@link org.apache.juneau.jena.RdfSerializer.Builder#disableAutoDetectNamespaces()}
 	 * </ul>
 	 */
 	String disableAutoDetectNamespaces() default "";
@@ -743,7 +761,7 @@ public @interface RdfConfig {
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='jf'>{@link RdfSerializer#RDF_namespaces}
+	 * 	<li class='jm'>{@link org.apache.juneau.jena.RdfSerializer.Builder#namespaces(Namespace...)}
 	 * </ul>
 	 */
 	String[] namespaces() default {};
@@ -767,7 +785,7 @@ public @interface RdfConfig {
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='jf'>{@link RdfSerializer#RDF_disableUseXmlNamespaces}
+	 * 	<li class='jm'>{@link org.apache.juneau.jena.RdfSerializer.Builder#disableUseXmlNamespaces()}
 	 * </ul>
 	 */
 	String disableUseXmlNamespaces() default "";
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/annotation/RdfConfigAnnotation.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/annotation/RdfConfigAnnotation.java
index 993553f..a8acc42 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/annotation/RdfConfigAnnotation.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/annotation/RdfConfigAnnotation.java
@@ -26,14 +26,13 @@ import org.apache.juneau.xml.Namespace;
 public class RdfConfigAnnotation {
 
 	/**
-	 * Applies {@link RdfConfig} annotations to a {@link RdfSerializer.Builder}.
+	 * Applies {@link RdfConfig} annotations to a {@link org.apache.juneau.jena.RdfSerializer.Builder}.
 	 */
 	public static class SerializerApply extends AnnotationApplier<RdfConfig,RdfSerializer.Builder> {
 
 		/**
 		 * Constructor.
 		 *
-		 * @param c The annotation class.
 		 * @param vr The resolver for resolving values in annotations.
 		 */
 		public SerializerApply(VarResolverSession vr) {
@@ -81,14 +80,13 @@ public class RdfConfigAnnotation {
 	}
 
 	/**
-	 * Applies {@link RdfConfig} annotations to a {@link RdfParser.Builder}.
+	 * Applies {@link RdfConfig} annotations to a {@link org.apache.juneau.jena.RdfParser.Builder}.
 	 */
 	public static class ParserApply extends AnnotationApplier<RdfConfig,RdfParser.Builder> {
 
 		/**
 		 * Constructor.
 		 *
-		 * @param c The annotation class.
 		 * @param vr The resolver for resolving values in annotations.
 		 */
 		public ParserApply(VarResolverSession vr) {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContext.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContext.java
index 1dffafa..3c9d25d 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContext.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContext.java
@@ -151,7 +151,7 @@ import org.apache.juneau.utils.*;
  * </p>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc BeanContext}
+ * 	<li class='link'>{@doc BeanContexts}
  * </ul>
  */
 @SuppressWarnings({"unchecked","rawtypes"})
@@ -1787,7 +1787,7 @@ public class BeanContext extends Context {
 		 *
 		 * <ul class='seealso'>
 		 * 	<li class='ja'>{@link Bean#dictionary()}
-		 * 	<li class='jm'>{@link Builder#beanDictionary(Class...)}
+		 * 	<li class='jm'>{@link #beanDictionary(Class...)}
 		 * </ul>
 		 *
 		 * @param on The class that the dictionary values apply to.
@@ -2794,7 +2794,7 @@ public class BeanContext extends Context {
 		 *
 		 * <ul class='seealso'>
 		 * 	<li class='ja'>{@link Bean#propertyNamer() Bean(propertyNamer)}
-		 * 	<li class='jm'>{@link Builder#propertyNamer(Class)}
+		 * 	<li class='jm'>{@link #propertyNamer(Class)}
 		 * </ul>
 		 *
 		 * @param on The class that the namer applies to.
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContextable.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContextable.java
index 17e6143..1cacdae 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContextable.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContextable.java
@@ -1419,7 +1419,6 @@ public abstract class BeanContextable extends Context {
 		 * 	<li class='ja'>{@link Beanp#dictionary()}
 		 * 	<li class='ja'>{@link BeanConfig#dictionary()}
 		 * 	<li class='ja'>{@link BeanConfig#dictionary_replace()}
-		 * 	<li class='jm'>{@link Builder#beanDictionary(Class...)}
 		 * </ul>
 		 *
 		 * @param values
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanConfig.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanConfig.java
index 35071b9..d009e2f 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanConfig.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanConfig.java
@@ -788,7 +788,7 @@ public @interface BeanConfig {
 	 * {@link PojoSwap#forMediaTypes()} or {@link Swap#mediaTypes() @Swap(mediaTypes)} are used to come up with the best match.
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='jm'>{@link BeanContext.Builder#swaps}
+	 * 	<li class='jm'>{@link org.apache.juneau.BeanContext.Builder#swaps(Class...)}
 	 * 	<li class='link'>{@doc PojoSwaps}
 	 * 	<li class='link'>{@doc PerMediaTypePojoSwaps}
 	 * 	<li class='link'>{@doc OneWayPojoSwaps}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/HeaderList.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/HeaderList.java
index 1a7362b..91f340c 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/HeaderList.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/HeaderList.java
@@ -111,7 +111,7 @@ import org.apache.juneau.svl.*;
  * </p>
  *
  * <p>
- * By default, header names are treated as case-insensitive.  This can be changed using the {@link Builder#caseSensitive()}
+ * By default, header names are treated as case-insensitive.  This can be changed using the {@link HeaderList.Builder#caseSensitive()}
  * method.
  *
  * <p>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/part/PartList.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/part/PartList.java
index 90e8bf3..6a4785a 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/part/PartList.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/part/PartList.java
@@ -112,7 +112,7 @@ import org.apache.juneau.svl.*;
  * </p>
  *
  * <p>
- * By default, part names are treated as case-sensitive.  This can be changed using the {@link Builder#caseInsensitive()}
+ * By default, part names are treated as case-sensitive.  This can be changed using the {@link PartList.Builder#caseInsensitive()}
  * method.
  *
  * <p>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartSchema.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartSchema.java
index f430c47..55afb9f 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartSchema.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartSchema.java
@@ -1788,7 +1788,7 @@ public class HttpPartSchema {
 		}
 
 		/**
-		 * Synonym for {@link #items(Builder)}.
+		 * Synonym for {@link #items(HttpPartSchema.Builder)}.
 		 *
 		 * @param value
 		 * 	The new value for this property.
@@ -3539,7 +3539,7 @@ public class HttpPartSchema {
 	 * Returns the name of the object described by this schema, for example the query or form parameter name.
 	 *
 	 * @return The name, or <jk>null</jk> if not specified.
-	 * @see Builder#name(String)
+	 * @see HttpPartSchema.Builder#name(String)
 	 */
 	public String getName() {
 		return name;
@@ -3549,7 +3549,7 @@ public class HttpPartSchema {
 	 * Returns the <c>type</c> field of this schema.
 	 *
 	 * @return The <c>type</c> field of this schema, or <jk>null</jk> if not specified.
-	 * @see Builder#type(String)
+	 * @see HttpPartSchema.Builder#type(String)
 	 */
 	public HttpPartDataType getType() {
 		return type;
@@ -3562,7 +3562,7 @@ public class HttpPartSchema {
 	 * 	The class meta of the object.
 	 * 	<br>Used to auto-detect the type if the type was not specified.
 	 * @return The format field of this schema, or <jk>null</jk> if not specified.
-	 * @see Builder#format(String)
+	 * @see HttpPartSchema.Builder#format(String)
 	 */
 	public HttpPartDataType getType(ClassMeta<?> cm) {
 		if (type != HttpPartDataType.NO_TYPE)
@@ -3587,7 +3587,7 @@ public class HttpPartSchema {
 	 * Returns the <c>default</c> field of this schema.
 	 *
 	 * @return The default value for this schema, or <jk>null</jk> if not specified.
-	 * @see Builder#_default(String)
+	 * @see HttpPartSchema.Builder#_default(String)
 	 */
 	public String getDefault() {
 		return _default;
@@ -3597,7 +3597,7 @@ public class HttpPartSchema {
 	 * Returns the <c>collectionFormat</c> field of this schema.
 	 *
 	 * @return The <c>collectionFormat</c> field of this schema, or <jk>null</jk> if not specified.
-	 * @see Builder#collectionFormat(String)
+	 * @see HttpPartSchema.Builder#collectionFormat(String)
 	 */
 	public HttpPartCollectionFormat getCollectionFormat() {
 		return collectionFormat;
@@ -3606,7 +3606,7 @@ public class HttpPartSchema {
 	/**
 	 * Returns the <c>format</c> field of this schema.
 	 *
-	 * @see Builder#format(String)
+	 * @see HttpPartSchema.Builder#format(String)
 	 * @return The <c>format</c> field of this schema, or <jk>null</jk> if not specified.
 	 */
 	public HttpPartFormat getFormat() {
@@ -3620,7 +3620,7 @@ public class HttpPartSchema {
 	 * 	The class meta of the object.
 	 * 	<br>Used to auto-detect the format if the format was not specified.
 	 * @return The <c>format</c> field of this schema, or <jk>null</jk> if not specified.
-	 * @see Builder#format(String)
+	 * @see HttpPartSchema.Builder#format(String)
 	 */
 	public HttpPartFormat getFormat(ClassMeta<?> cm) {
 		if (format != HttpPartFormat.NO_FORMAT)
@@ -3642,7 +3642,7 @@ public class HttpPartSchema {
 	 * Returns the <c>maximum</c> field of this schema.
 	 *
 	 * @return The schema for child items of the object represented by this schema, or <jk>null</jk> if not defined.
-	 * @see Builder#items(Builder)
+	 * @see HttpPartSchema.Builder#items(HttpPartSchema.Builder)
 	 */
 	public HttpPartSchema getItems() {
 		return items;
@@ -3652,7 +3652,7 @@ public class HttpPartSchema {
 	 * Returns the <c>maximum</c> field of this schema.
 	 *
 	 * @return The <c>maximum</c> field of this schema, or <jk>null</jk> if not specified.
-	 * @see Builder#maximum(Number)
+	 * @see HttpPartSchema.Builder#maximum(Number)
 	 */
 	public Number getMaximum() {
 		return maximum;
@@ -3662,7 +3662,7 @@ public class HttpPartSchema {
 	 * Returns the <c>minimum</c> field of this schema.
 	 *
 	 * @return The <c>minimum</c> field of this schema, or <jk>null</jk> if not specified.
-	 * @see Builder#minimum(Number)
+	 * @see HttpPartSchema.Builder#minimum(Number)
 	 */
 	public Number getMinimum() {
 		return minimum;
@@ -3672,7 +3672,7 @@ public class HttpPartSchema {
 	 * Returns the <c>xxx</c> field of this schema.
 	 *
 	 * @return The <c>xxx</c> field of this schema, or <jk>null</jk> if not specified.
-	 * @see Builder#multipleOf(Number)
+	 * @see HttpPartSchema.Builder#multipleOf(Number)
 	 */
 	public Number getMultipleOf() {
 		return multipleOf;
@@ -3682,7 +3682,7 @@ public class HttpPartSchema {
 	 * Returns the <c>xxx</c> field of this schema.
 	 *
 	 * @return The <c>xxx</c> field of this schema, or <jk>null</jk> if not specified.
-	 * @see Builder#pattern(String)
+	 * @see HttpPartSchema.Builder#pattern(String)
 	 */
 	public Pattern getPattern() {
 		return pattern;
@@ -3692,7 +3692,7 @@ public class HttpPartSchema {
 	 * Returns the <c>xxx</c> field of this schema.
 	 *
 	 * @return The <c>xxx</c> field of this schema, or <jk>null</jk> if not specified.
-	 * @see Builder#maxLength(Long)
+	 * @see HttpPartSchema.Builder#maxLength(Long)
 	 */
 	public Long getMaxLength() {
 		return maxLength;
@@ -3702,7 +3702,7 @@ public class HttpPartSchema {
 	 * Returns the <c>xxx</c> field of this schema.
 	 *
 	 * @return The <c>xxx</c> field of this schema, or <jk>null</jk> if not specified.
-	 * @see Builder#minLength(Long)
+	 * @see HttpPartSchema.Builder#minLength(Long)
 	 */
 	public Long getMinLength() {
 		return minLength;
@@ -3712,7 +3712,7 @@ public class HttpPartSchema {
 	 * Returns the <c>xxx</c> field of this schema.
 	 *
 	 * @return The <c>xxx</c> field of this schema, or <jk>null</jk> if not specified.
-	 * @see Builder#maxItems(Long)
+	 * @see HttpPartSchema.Builder#maxItems(Long)
 	 */
 	public Long getMaxItems() {
 		return maxItems;
@@ -3722,7 +3722,7 @@ public class HttpPartSchema {
 	 * Returns the <c>xxx</c> field of this schema.
 	 *
 	 * @return The <c>xxx</c> field of this schema, or <jk>null</jk> if not specified.
-	 * @see Builder#minItems(Long)
+	 * @see HttpPartSchema.Builder#minItems(Long)
 	 */
 	public Long getMinItems() {
 		return minItems;
@@ -3732,7 +3732,7 @@ public class HttpPartSchema {
 	 * Returns the <c>xxx</c> field of this schema.
 	 *
 	 * @return The <c>xxx</c> field of this schema, or <jk>null</jk> if not specified.
-	 * @see Builder#maxProperties(Long)
+	 * @see HttpPartSchema.Builder#maxProperties(Long)
 	 */
 	public Long getMaxProperties() {
 		return maxProperties;
@@ -3742,7 +3742,7 @@ public class HttpPartSchema {
 	 * Returns the <c>xxx</c> field of this schema.
 	 *
 	 * @return The <c>xxx</c> field of this schema, or <jk>null</jk> if not specified.
-	 * @see Builder#minProperties(Long)
+	 * @see HttpPartSchema.Builder#minProperties(Long)
 	 */
 	public Long getMinProperties() {
 		return minProperties;
@@ -3752,7 +3752,7 @@ public class HttpPartSchema {
 	 * Returns the <c>exclusiveMaximum</c> field of this schema.
 	 *
 	 * @return The <c>exclusiveMaximum</c> field of this schema.
-	 * @see Builder#exclusiveMaximum(Boolean)
+	 * @see HttpPartSchema.Builder#exclusiveMaximum(Boolean)
 	 */
 	public boolean isExclusiveMaximum() {
 		return exclusiveMaximum;
@@ -3762,7 +3762,7 @@ public class HttpPartSchema {
 	 * Returns the <c>exclusiveMinimum</c> field of this schema.
 	 *
 	 * @return The <c>exclusiveMinimum</c> field of this schema.
-	 * @see Builder#exclusiveMinimum(Boolean)
+	 * @see HttpPartSchema.Builder#exclusiveMinimum(Boolean)
 	 */
 	public boolean isExclusiveMinimum() {
 		return exclusiveMinimum;
@@ -3772,7 +3772,7 @@ public class HttpPartSchema {
 	 * Returns the <c>uniqueItems</c> field of this schema.
 	 *
 	 * @return The <c>uniqueItems</c> field of this schema.
-	 * @see Builder#uniqueItems(Boolean)
+	 * @see HttpPartSchema.Builder#uniqueItems(Boolean)
 	 */
 	public boolean isUniqueItems() {
 		return uniqueItems;
@@ -3782,7 +3782,7 @@ public class HttpPartSchema {
 	 * Returns the <c>required</c> field of this schema.
 	 *
 	 * @return The <c>required</c> field of this schema.
-	 * @see Builder#required(Boolean)
+	 * @see HttpPartSchema.Builder#required(Boolean)
 	 */
 	public boolean isRequired() {
 		return required;
@@ -3792,7 +3792,7 @@ public class HttpPartSchema {
 	 * Returns the <c>skipIfEmpty</c> field of this schema.
 	 *
 	 * @return The <c>skipIfEmpty</c> field of this schema.
-	 * @see Builder#skipIfEmpty(Boolean)
+	 * @see HttpPartSchema.Builder#skipIfEmpty(Boolean)
 	 */
 	public boolean isSkipIfEmpty() {
 		return skipIfEmpty;
@@ -3802,7 +3802,7 @@ public class HttpPartSchema {
 	 * Returns the <c>allowEmptyValue</c> field of this schema.
 	 *
 	 * @return The <c>skipIfEmpty</c> field of this schema.
-	 * @see Builder#skipIfEmpty(Boolean)
+	 * @see HttpPartSchema.Builder#skipIfEmpty(Boolean)
 	 */
 	public boolean isAllowEmptyValue() {
 		return allowEmptyValue;
@@ -3812,7 +3812,7 @@ public class HttpPartSchema {
 	 * Returns the <c>enum</c> field of this schema.
 	 *
 	 * @return The <c>enum</c> field of this schema, or <jk>null</jk> if not specified.
-	 * @see Builder#_enum(Set)
+	 * @see HttpPartSchema.Builder#_enum(Set)
 	 */
 	public Set<String> getEnum() {
 		return _enum;
@@ -3822,7 +3822,7 @@ public class HttpPartSchema {
 	 * Returns the <c>parser</c> field of this schema.
 	 *
 	 * @return The <c>parser</c> field of this schema, or <jk>null</jk> if not specified.
-	 * @see Builder#parser(Class)
+	 * @see HttpPartSchema.Builder#parser(Class)
 	 */
 	public Class<? extends HttpPartParser> getParser() {
 		return parser;
@@ -3832,7 +3832,7 @@ public class HttpPartSchema {
 	 * Returns the <c>serializer</c> field of this schema.
 	 *
 	 * @return The <c>serializer</c> field of this schema, or <jk>null</jk> if not specified.
-	 * @see Builder#serializer(Class)
+	 * @see HttpPartSchema.Builder#serializer(Class)
 	 */
 	public Class<? extends HttpPartSerializer> getSerializer() {
 		return serializer;
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGenerator.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGenerator.java
index ab89aee..5707e03 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGenerator.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGenerator.java
@@ -296,7 +296,7 @@ public class JsonSchemaGenerator extends BeanTraverseContext implements JsonSche
 		 * <p>
 		 * Used primarily for defining common definition sections for beans in Swagger JSON.
 		 * <p>
-		 * This setting is ignored if {@link Builder#useBeanDefs()} is not enabled.
+		 * This setting is ignored if {@link JsonSchemaGenerator.Builder#useBeanDefs()} is not enabled.
 		 *
 		 * @param value
 		 * 	The new value for this setting.
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/Parser.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/Parser.java
index 36100e2..f6363bf 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/Parser.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/Parser.java
@@ -1331,7 +1331,7 @@ public abstract class Parser extends BeanContextable {
 	/**
 	 * Auto-close streams.
 	 *
-	 * @see Builder#autoCloseStreams()
+	 * @see Parser.Builder#autoCloseStreams()
 	 * @return
 	 * 	<jk>true</jk> if <l>InputStreams</l> and <l>Readers</l> passed into parsers will be closed
 	 * 	after parsing is complete.
@@ -1343,7 +1343,7 @@ public abstract class Parser extends BeanContextable {
 	/**
 	 * Debug output lines.
 	 *
-	 * @see Builder#debugOutputLines(int)
+	 * @see Parser.Builder#debugOutputLines(int)
 	 * @return
 	 * 	The number of lines of input before and after the error location to be printed as part of the exception message.
 	 */
@@ -1354,7 +1354,7 @@ public abstract class Parser extends BeanContextable {
 	/**
 	 * Parser listener.
 	 *
-	 * @see Builder#listener(Class)
+	 * @see Parser.Builder#listener(Class)
 	 * @return
 	 * 	Class used to listen for errors and warnings that occur during parsing.
 	 */
@@ -1365,7 +1365,7 @@ public abstract class Parser extends BeanContextable {
 	/**
 	 * Strict mode.
 	 *
-	 * @see Builder#strict()
+	 * @see Parser.Builder#strict()
 	 * @return
 	 * 	<jk>true</jk> if strict mode for the parser is enabled.
 	 */
@@ -1376,7 +1376,7 @@ public abstract class Parser extends BeanContextable {
 	/**
 	 * Trim parsed strings.
 	 *
-	 * @see Builder#trimStrings()
+	 * @see Parser.Builder#trimStrings()
 	 * @return
 	 * 	<jk>true</jk> if string values will be trimmed of whitespace using {@link String#trim()} before being added to
 	 * 	the POJO.
@@ -1388,7 +1388,7 @@ public abstract class Parser extends BeanContextable {
 	/**
 	 * Unbuffered.
 	 *
-	 * @see Builder#unbuffered()
+	 * @see Parser.Builder#unbuffered()
 	 * @return
 	 * 	<jk>true</jk> if parsers don't use internal buffering during parsing.
 	 */
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/Serializer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/Serializer.java
index a85e5a1..ce7a879 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/Serializer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/Serializer.java
@@ -1448,7 +1448,7 @@ public abstract class Serializer extends BeanTraverseContext {
 	/**
 	 * Add <js>"_type"</js> properties when needed.
 	 *
-	 * @see Builder#addBeanTypes()
+	 * @see Serializer.Builder#addBeanTypes()
 	 * @return
 	 * 	<jk>true</jk> if <js>"_type"</js> properties added to beans if their type cannot be inferred
 	 * 	through reflection.
@@ -1460,7 +1460,7 @@ public abstract class Serializer extends BeanTraverseContext {
 	/**
 	 * Add type attribute to root nodes.
 	 *
-	 * @see Builder#addRootType()
+	 * @see Serializer.Builder#addRootType()
 	 * @return
 	 * 	<jk>true</jk> if type property should be added to root node.
 	 */
@@ -1471,7 +1471,7 @@ public abstract class Serializer extends BeanTraverseContext {
 	/**
 	 * Serializer listener.
 	 *
-	 * @see Builder#listener(Class)
+	 * @see Serializer.Builder#listener(Class)
 	 * @return
 	 * 	Class used to listen for errors and warnings that occur during serialization.
 	 */
@@ -1482,7 +1482,7 @@ public abstract class Serializer extends BeanTraverseContext {
 	/**
 	 * Sort arrays and collections alphabetically.
 	 *
-	 * @see Builder#sortCollections()
+	 * @see Serializer.Builder#sortCollections()
 	 * @return
 	 * 	<jk>true</jk> if arrays and collections are copied and sorted before serialization.
 	 */
@@ -1493,7 +1493,7 @@ public abstract class Serializer extends BeanTraverseContext {
 	/**
 	 * Sort maps alphabetically.
 	 *
-	 * @see Builder#sortMaps()
+	 * @see Serializer.Builder#sortMaps()
 	 * @return
 	 * 	<jk>true</jk> if maps are copied and sorted before serialization.
 	 */
@@ -1504,7 +1504,7 @@ public abstract class Serializer extends BeanTraverseContext {
 	/**
 	 * Trim empty lists and arrays.
 	 *
-	 * @see Builder#trimEmptyCollections()
+	 * @see Serializer.Builder#trimEmptyCollections()
 	 * @return
 	 * 	<jk>true</jk> if empty lists and arrays are not serialized to the output.
 	 */
@@ -1515,7 +1515,7 @@ public abstract class Serializer extends BeanTraverseContext {
 	/**
 	 * Trim empty maps.
 	 *
-	 * @see Builder#trimEmptyMaps()
+	 * @see Serializer.Builder#trimEmptyMaps()
 	 * @return
 	 * 	<jk>true</jk> if empty map values are not serialized to the output.
 	 */
@@ -1526,7 +1526,7 @@ public abstract class Serializer extends BeanTraverseContext {
 	/**
 	 * Don't trim null bean property values.
 	 *
-	 * @see Builder#keepNullProperties()
+	 * @see Serializer.Builder#keepNullProperties()
 	 * @return
 	 * 	<jk>true</jk> if null bean values are serialized to the output.
 	 */
@@ -1537,7 +1537,7 @@ public abstract class Serializer extends BeanTraverseContext {
 	/**
 	 * Trim strings.
 	 *
-	 * @see Builder#trimStrings()
+	 * @see Serializer.Builder#trimStrings()
 	 * @return
 	 * 	<jk>true</jk> if string values will be trimmed of whitespace using {@link String#trim()} before being serialized.
 	 */
@@ -1548,7 +1548,7 @@ public abstract class Serializer extends BeanTraverseContext {
 	/**
 	 * URI context bean.
 	 *
-	 * @see Builder#uriContext(UriContext)
+	 * @see Serializer.Builder#uriContext(UriContext)
 	 * @return
 	 * 	Bean used for resolution of URIs to absolute or root-relative form.
 	 */
@@ -1559,7 +1559,7 @@ public abstract class Serializer extends BeanTraverseContext {
 	/**
 	 * URI relativity.
 	 *
-	 * @see Builder#uriRelativity(UriRelativity)
+	 * @see Serializer.Builder#uriRelativity(UriRelativity)
 	 * @return
 	 * 	Defines what relative URIs are relative to when serializing any of the following:
 	 */
@@ -1570,7 +1570,7 @@ public abstract class Serializer extends BeanTraverseContext {
 	/**
 	 * URI resolution.
 	 *
-	 * @see Builder#uriResolution(UriResolution)
+	 * @see Serializer.Builder#uriResolution(UriResolution)
 	 * @return
 	 * 	Defines the resolution level for URIs when serializing URIs.
 	 */
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/annotation/SerializerConfig.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/annotation/SerializerConfig.java
index c8ac0cc..14dc0d0 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/annotation/SerializerConfig.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/annotation/SerializerConfig.java
@@ -643,7 +643,7 @@ public @interface SerializerConfig {
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='jm'>{@link BeanTraverseContext.Builder#maxDepth}
+	 * 	<li class='jm'>{@link org.apache.juneau.BeanTraverseContext.Builder#maxDepth(int)}
 	 * </ul>
 	 */
 	String maxDepth() default "";
diff --git a/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/LogConfig.java b/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/LogConfig.java
index 1b59791..e558bc1 100644
--- a/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/LogConfig.java
+++ b/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/LogConfig.java
@@ -23,7 +23,7 @@ import org.apache.juneau.microservice.resources.*;
  *
  * <p>
  * Instances of this class can be created using {@link #create()} and passing the result to
- * {@link MicroserviceBuilder#logConfig(LogConfig)}.
+ * {@link Microservice.Builder#logConfig(LogConfig)}.
  *
  * <p>
  * These values override values specified in the <js>"Logging"</js> configuration section.
diff --git a/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/Microservice.java b/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/Microservice.java
index b8c458a..e6d8269 100755
--- a/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/Microservice.java
+++ b/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/Microservice.java
@@ -456,7 +456,7 @@ public class Microservice implements ConfigEventListener {
 		 * Augments the set of variables defined in the configuration and var resolver.
 		 *
 		 * <p>
-		 * This calls {@link VarResolverBuilder#vars(Class[])} on the var resolver used to construct the configuration
+		 * This calls {@link org.apache.juneau.svl.VarResolver.Builder#vars(Class[])} on the var resolver used to construct the configuration
 		 * object returned by {@link Microservice#getConfig()} and the var resolver returned by {@link Microservice#getVarResolver()}.
 		 *
 		 * @param vars The set of variables to append to the var resolver builder.
@@ -472,7 +472,7 @@ public class Microservice implements ConfigEventListener {
 		 * Adds a bean for vars defined in the var resolver.
 		 *
 		 * <p>
-		 * This calls {@link VarResolverBuilder#bean(Class,Object)} on the var resolver used to construct the configuration
+		 * This calls {@link org.apache.juneau.svl.VarResolver.Builder#bean(Class,Object)} on the var resolver used to construct the configuration
 		 * object returned by {@link Microservice#getConfig()} and the var resolver returned by {@link Microservice#getVarResolver()}.
 		 *
 		 * @param c The bean type.
diff --git a/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/console/ConsoleCommand.java b/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/console/ConsoleCommand.java
index dceaa36..bb0060f 100644
--- a/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/console/ConsoleCommand.java
+++ b/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/console/ConsoleCommand.java
@@ -29,7 +29,7 @@ import org.apache.juneau.collections.*;
  * 	<li>The <js>"Console/commands"</js> configuration value.
  * 		<br>This is a comma-delimited list of fully-qualified names of classes implementing this interface.
  * 		<br>When associated this way, the implementation class must have a no-arg constructor.
- * 	<li>Specifying commands via the {@link MicroserviceBuilder#consoleCommands(Class...)} method.
+ * 	<li>Specifying commands via the {@link org.apache.juneau.microservice.Microservice.Builder#consoleCommands(Class...)} method.
  * 		<br>This allows you to override the default implementation above and augment or replace the list
  * 			with your own implementation objects.
  * </ul>
diff --git a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClient.java b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClient.java
index 5da7386..a86428a 100644
--- a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClient.java
+++ b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClient.java
@@ -4611,7 +4611,7 @@ public class RestClient extends BeanContextable implements HttpClient, Closeable
 		 * </p>
 		 *
 		 * <ul class='seealso'>
-		 * 	<li class='jm'>{@link BeanTraverseContext.Builder#maxDepth}
+		 * 	<li class='jm'>{@link org.apache.juneau.BeanTraverseContext.Builder#maxDepth(int)}
 		 * </ul>
 		 *
 		 * @param value
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java
index d892b37..3a3b649 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java
@@ -145,7 +145,7 @@ public class RestContext extends Context {
 	 * <p>
 	 * The builder class can be subclassed by using the {@link Rest#builder()} annotation.
 	 * This can be useful when you want to perform any customizations on the builder class, typically by overriding protected methods that create
-	 * 	the various builders used in the created {@link RestContext} object (which itself can be overridden via {@link Builder#type(Class)}).
+	 * 	the various builders used in the created {@link RestContext} object (which itself can be overridden via {@link RestContext.Builder#type(Class)}).
 	 * The subclass must contain a public constructor that takes in the same arguments passed in to this method.
 	 *
 	 * @param resourceClass
@@ -424,7 +424,7 @@ public class RestContext extends Context {
 		 *
 		 * <p>
 		 * Default classes are inherited from the parent REST object.
-		 * Typically used on the top-level {@link Builder} to affect class types for that REST object and all children.
+		 * Typically used on the top-level {@link RestContext.Builder} to affect class types for that REST object and all children.
 		 *
 		 * <p>
 		 * Modifying the default class list on this builder does not affect the default class list on the parent builder, but changes made
@@ -464,7 +464,7 @@ public class RestContext extends Context {
 		 *
 		 * <p>
 		 * Default settings are inherited from the parent REST object.
-		 * Typically used on the top-level {@link Builder} to affect settings for that REST object and all children.
+		 * Typically used on the top-level {@link RestContext.Builder} to affect settings for that REST object and all children.
 		 *
 		 * <p>
 		 * Modifying the default settings map on this builder does not affect the default settings on the parent builder, but changes made
@@ -509,7 +509,7 @@ public class RestContext extends Context {
 		 * <p>
 		 * The bean store is created by the constructor using the {@link #createBeanStore(Class,Supplier)} method and is initialized with the following beans:
 		 * <ul>
-		 * 	<li>{@link Builder}
+		 * 	<li>{@link RestContext.Builder}
 		 * 	<li>{@link ServletConfig}
 		 * 	<li>{@link ServletContext}
 		 * 	<li>{@link VarResolver}
@@ -986,7 +986,7 @@ public class RestContext extends Context {
 		 * 	The REST servlet/bean class that this context is defined against.
 		 * @param beanStore
 		 * 	The factory used for creating beans and retrieving injected beans.
-		 * 	<br>Created by {@link Builder#beanStore()}.
+		 * 	<br>Created by {@link RestContext.Builder#beanStore()}.
 		 * @return A new logger.
 		 */
 		protected Logger createLogger(BeanStore beanStore, Class<?> resourceClass) {
@@ -1072,7 +1072,7 @@ public class RestContext extends Context {
 		 * 	<br>Will be <jk>null</jk> if the bean is a top-level resource.
 		 * @param beanStore
 		 * 	The factory used for creating beans and retrieving injected beans.
-		 * 	<br>Created by {@link Builder#beanStore()}.
+		 * 	<br>Created by {@link RestContext.Builder#beanStore()}.
 		 * @return A new thrown-store sub-builder.
 		 */
 		protected ThrownStore.Builder createThrownStore(BeanStore beanStore, Supplier<?> resource, RestContext parent) {
@@ -1183,7 +1183,7 @@ public class RestContext extends Context {
 		 * 	The REST servlet/bean instance that this context is defined against.
 		 * @param beanStore
 		 * 	The factory used for creating beans and retrieving injected beans.
-		 * 	<br>Created by {@link Builder#beanStore()}.
+		 * 	<br>Created by {@link RestContext.Builder#beanStore()}.
 		 * @return A new encoder group sub-builder.
 		 */
 		protected EncoderGroup.Builder createEncoders(BeanStore beanStore, Supplier<?> resource) {
@@ -1273,7 +1273,7 @@ public class RestContext extends Context {
 		 * 	The REST servlet/bean instance that this context is defined against.
 		 * @param beanStore
 		 * 	The factory used for creating beans and retrieving injected beans.
-		 * 	<br>Created by {@link Builder#beanStore()}.
+		 * 	<br>Created by {@link RestContext.Builder#beanStore()}.
 		 * @return A new serializer group sub-builder.
 		 */
 		protected SerializerGroup.Builder createSerializers(BeanStore beanStore, Supplier<?> resource) {
@@ -1362,7 +1362,7 @@ public class RestContext extends Context {
 		 * 	The REST servlet/bean instance that this context is defined against.
 		 * @param beanStore
 		 * 	The factory used for creating beans and retrieving injected beans.
-		 * 	<br>Created by {@link Builder#beanStore()}.
+		 * 	<br>Created by {@link RestContext.Builder#beanStore()}.
 		 * @return A new parser group sub-builder.
 		 */
 		protected ParserGroup.Builder createParsers(BeanStore beanStore, Supplier<?> resource) {
@@ -1775,7 +1775,7 @@ public class RestContext extends Context {
 		 * <ul>
 		 * 	<li>Looks for response processors set via any of the following:
 		 * 		<ul>
-		 * 			<li>{@link Builder#responseProcessors()}
+		 * 			<li>{@link RestContext.Builder#responseProcessors()}
 		 * 			<li>{@link Rest#responseProcessors()}.
 		 * 		</ul>
 		 * 	<li>Looks for a static or non-static <c>createResponseProcessors()</> method that returns <c>{@link ResponseProcessor}[]</c> on the
@@ -1946,7 +1946,7 @@ public class RestContext extends Context {
 		 * 	<li>Returns the resource class itself is an instance of RestLogger.
 		 * 	<li>Looks for REST call logger set via any of the following:
 		 * 		<ul>
-		 * 			<li>{@link Builder#callLogger()}
+		 * 			<li>{@link RestContext.Builder#callLogger()}
 		 * 			<li>{@link Rest#callLogger()}.
 		 * 		</ul>
 		 * 	<li>Looks for a static or non-static <c>createCallLogger()</> method that returns {@link RestLogger} on the
@@ -1962,7 +1962,7 @@ public class RestContext extends Context {
 		 * </ul>
 		 *
 		 * <ul class='seealso'>
-		 * 	<li class='jm'>{@link Builder#callLogger()}
+		 * 	<li class='jm'>{@link RestContext.Builder#callLogger()}
 		 * </ul>
 		 *
 		 * @param beanStore
@@ -2084,7 +2084,7 @@ public class RestContext extends Context {
 		 * 	<li>Returns the resource class itself is an instance of {@link HttpPartSerializer}.
 		 * 	<li>Looks for part serializer set via any of the following:
 		 * 		<ul>
-		 * 			<li>{@link Builder#partSerializer()}
+		 * 			<li>{@link RestContext.Builder#partSerializer()}
 		 * 			<li>{@link Rest#partSerializer()}.
 		 * 		</ul>
 		 * 	<li>Looks for a static or non-static <c>createPartSerializer()</> method that returns <c>{@link HttpPartSerializer}</c> on the
@@ -2185,7 +2185,7 @@ public class RestContext extends Context {
 		 * 	<li>Returns the resource class itself is an instance of {@link HttpPartSerializer}.
 		 * 	<li>Looks for part serializer set via any of the following:
 		 * 		<ul>
-		 * 			<li>{@link Builder#partSerializer()}
+		 * 			<li>{@link RestContext.Builder#partSerializer()}
 		 * 			<li>{@link Rest#partSerializer()}.
 		 * 		</ul>
 		 * 	<li>Looks for a static or non-static <c>createPartSerializer()</> method that returns <c>{@link HttpPartSerializer}</c> on the
@@ -2297,7 +2297,7 @@ public class RestContext extends Context {
 		 * 	<li>Returns the resource class itself is an instance of {@link HttpPartParser}.
 		 * 	<li>Looks for part parser set via any of the following:
 		 * 		<ul>
-		 * 			<li>{@link Builder#partParser()}
+		 * 			<li>{@link RestContext.Builder#partParser()}
 		 * 			<li>{@link Rest#partParser()}.
 		 * 		</ul>
 		 * 	<li>Looks for a static or non-static <c>createPartParser()</> method that returns <c>{@link HttpPartParser}</c> on the
@@ -2515,7 +2515,7 @@ public class RestContext extends Context {
 		 * </ul>
 		 *
 		 * <p>
-		 * The file finder is instantiated via the {@link Builder#createFileFinder(BeanStore,Supplier)} method which in turn instantiates
+		 * The file finder is instantiated via the {@link RestContext.Builder#createFileFinder(BeanStore,Supplier)} method which in turn instantiates
 		 * based on the following logic:
 		 * <ul>
 		 * 	<li>Returns the resource class itself if it's an instance of {@link FileFinder}.
@@ -2585,10 +2585,10 @@ public class RestContext extends Context {
 		 * 	<li>Returns the resource class itself is an instance of {@link FileFinder}.
 		 * 	<li>Looks for file finder value set via any of the following:
 		 * 		<ul>
-		 * 			<li>{@link Builder#fileFinder()}
+		 * 			<li>{@link RestContext.Builder#fileFinder()}
 		 * 			<li>{@link Rest#fileFinder()}.
 		 * 		</ul>
-		 * 	<li>Resolves it via the {@link Builder#beanStore() bean store} registered in this context (including Spring beans if using SpringRestServlet).
+		 * 	<li>Resolves it via the {@link RestContext.Builder#beanStore() bean store} registered in this context (including Spring beans if using SpringRestServlet).
 		 * 	<li>Looks for file finder default setting.
 		 * </ul>
 		 *
@@ -2730,7 +2730,7 @@ public class RestContext extends Context {
 		 * </ul>
 		 *
 		 * <p>
-		 * The static file finder is instantiated via the {@link Builder#createStaticFiles(BeanStore,Supplier)} method which in turn instantiates
+		 * The static file finder is instantiated via the {@link RestContext.Builder#createStaticFiles(BeanStore,Supplier)} method which in turn instantiates
 		 * based on the following logic:
 		 * <ul>
 		 * 	<li>Returns the resource class itself is an instance of {@link StaticFiles}.
@@ -2806,7 +2806,7 @@ public class RestContext extends Context {
 		 * 	<li>Returns the resource class itself is an instance of FileFinder.
 		 * 	<li>Looks for static files set via any of the following:
 		 * 		<ul>
-		 * 			<li>{@link Builder#staticFiles()}
+		 * 			<li>{@link RestContext.Builder#staticFiles()}
 		 * 			<li>{@link Rest#staticFiles()}.
 		 * 		</ul>
 		 * 	<li>Looks for a static or non-static <c>createStaticFiles()</> method that returns {@link StaticFiles} on the
@@ -3445,7 +3445,7 @@ public class RestContext extends Context {
 		 * <ul>
 		 * 	<li>Looks for REST op args set via any of the following:
 		 * 		<ul>
-		 * 			<li>{@link Builder#restOpArgs(Class...)}/{@link Builder#restOpArgs(Class...)}
+		 * 			<li>{@link RestContext.Builder#restOpArgs(Class...)}/{@link RestContext.Builder#restOpArgs(Class...)}
 		 * 			<li>{@link Rest#restOpArgs()}.
 		 * 		</ul>
 		 * 	<li>Looks for a static or non-static <c>createRestParams()</> method that returns <c>{@link Class}[]</c>.
@@ -4507,7 +4507,7 @@ public class RestContext extends Context {
 		 * 	<li>Returns the resource class itself is an instance of {@link SwaggerProvider}.
 		 * 	<li>Looks for swagger provider set via any of the following:
 		 * 		<ul>
-		 * 			<li>{@link Builder#swaggerProvider(Class)}/{@link Builder#swaggerProvider(SwaggerProvider)}
+		 * 			<li>{@link RestContext.Builder#swaggerProvider(Class)}/{@link RestContext.Builder#swaggerProvider(SwaggerProvider)}
 		 * 			<li>{@link Rest#swaggerProvider()}.
 		 * 		</ul>
 		 * 	<li>Looks for a static or non-static <c>createSwaggerProvider()</> method that returns {@link SwaggerProvider} on the
@@ -4522,8 +4522,8 @@ public class RestContext extends Context {
 		 * </ul>
 		 *
 		 * <ul class='seealso'>
-		 * 	<li class='jm'>{@link Builder#swaggerProvider(Class)}
-		 * 	<li class='jm'>{@link Builder#swaggerProvider(SwaggerProvider)}
+		 * 	<li class='jm'>{@link RestContext.Builder#swaggerProvider(Class)}
+		 * 	<li class='jm'>{@link RestContext.Builder#swaggerProvider(SwaggerProvider)}
 		 * </ul>
 		 *
 		 * @param beanStore
@@ -5389,7 +5389,7 @@ public class RestContext extends Context {
 		 *
 		 * <p>
 		 * Child resources must specify a value for {@link Rest#path() @Rest(path)} that identifies the subpath of the child resource
-		 * relative to the ascendant path UNLESS you use the {@link Builder#child(String, Object)} method to register it.
+		 * relative to the ascendant path UNLESS you use the {@link RestContext.Builder#child(String, Object)} method to register it.
 		 *
 		 * <p>
 		 * Child resources can be nested arbitrarily deep using this technique (i.e. children can also have children).
@@ -5468,7 +5468,7 @@ public class RestContext extends Context {
 		 * 	<ul>
 		 * 		<li>A class that has a constructor described above.
 		 * 		<li>An instantiated resource object (such as a servlet object instantiated by a servlet container).
-		 * 		<li>An instance of {@link RestChild} containing an instantied resource object and a subpath.
+		 * 		<li>An instance of {@link RestChild} containing an instantiated resource object and a subpath.
 		 * 	</ul>
 		 * @return This object (for method chaining).
 		 */
@@ -6376,7 +6376,7 @@ public class RestContext extends Context {
 	 * The config file is identified via one of the following:
 	 * <ul class='javatree'>
 	 * 	<li class='ja'>{@link Rest#config()}
-	 * 	<li class='jm'>{@link Builder#config(Config)}
+	 * 	<li class='jm'>{@link RestContext.Builder#config(Config)}
 	 * </ul>
 	 *
 	 * @return
@@ -6390,13 +6390,13 @@ public class RestContext extends Context {
 
 	/**
 	 * Returns the path for this resource as defined by the {@link Rest#path() @Rest(path)} annotation or
-	 * {@link Builder#path(String)} method.
+	 * {@link RestContext.Builder#path(String)} method.
 	 *
 	 * <p>
 	 * If path is not specified, returns <js>""</js>.
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='jf'>{@link Builder#path(String)}
+	 * 	<li class='jm'>{@link RestContext.Builder#path(String)}
 	 * </ul>
 	 *
 	 * @return The servlet path.
@@ -6407,13 +6407,13 @@ public class RestContext extends Context {
 
 	/**
 	 * Returns the path for this resource as defined by the {@link Rest#path() @Rest(path)} annotation or
-	 * {@link Builder#path(String)} method concatenated with those on all parent classes.
+	 * {@link RestContext.Builder#path(String)} method concatenated with those on all parent classes.
 	 *
 	 * <p>
 	 * If path is not specified, returns <js>""</js>.
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='jm'>{@link Builder#path(String)}
+	 * 	<li class='jm'>{@link RestContext.Builder#path(String)}
 	 * </ul>
 	 *
 	 * @return The full path.
@@ -6426,7 +6426,7 @@ public class RestContext extends Context {
 	 * Returns the call logger to use for this resource.
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='jm'>{@link Builder#callLogger()}
+	 * 	<li class='jm'>{@link RestContext.Builder#callLogger()}
 	 * </ul>
 	 *
 	 * @return
@@ -6452,8 +6452,8 @@ public class RestContext extends Context {
 	 * Returns the Swagger provider used by this resource.
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='jm'>{@link Builder#swaggerProvider(Class)}
-	 * 	<li class='jm'>{@link Builder#swaggerProvider(SwaggerProvider)}
+	 * 	<li class='jm'>{@link RestContext.Builder#swaggerProvider(Class)}
+	 * 	<li class='jm'>{@link RestContext.Builder#swaggerProvider(SwaggerProvider)}
 	 * </ul>
 	 *
 	 * @return
@@ -6513,7 +6513,7 @@ public class RestContext extends Context {
 	 * Returns whether it's safe to pass the HTTP body as a <js>"body"</js> GET parameter.
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='jf'>{@link Builder#disableBodyParam()}
+	 * 	<li class='jm'>{@link RestContext.Builder#disableBodyParam()}
 	 * </ul>
 	 *
 	 * @return <jk>true</jk> if setting is enabled.
@@ -6527,7 +6527,7 @@ public class RestContext extends Context {
 	 *
 	 * <ul class='seealso'>
 	 * 	<li class='ja'>{@link Rest#allowedHeaderParams}
-	 * 	<li class='jm'>{@link Builder#allowedHeaderParams(String)}
+	 * 	<li class='jm'>{@link RestContext.Builder#allowedHeaderParams(String)}
 	 * </ul>
 	 *
 	 * @return
@@ -6543,7 +6543,7 @@ public class RestContext extends Context {
 	 *
 	 * <ul class='seealso'>
 	 * 	<li class='ja'>{@link Rest#allowedMethodHeaders}
-	 * 	<li class='jm'>{@link Builder#allowedMethodHeaders(String)}
+	 * 	<li class='jm'>{@link RestContext.Builder#allowedMethodHeaders(String)}
 	 * </ul>
 	 *
 	 * @return
@@ -6559,7 +6559,7 @@ public class RestContext extends Context {
 	 *
 	 * <ul class='seealso'>
 	 * 	<li class='ja'>{@link Rest#allowedMethodParams}
-	 * 	<li class='jm'>{@link Builder#allowedMethodParams(String)}
+	 * 	<li class='jm'>{@link RestContext.Builder#allowedMethodParams(String)}
 	 * </ul>
 	 *
 	 * @return
@@ -6575,7 +6575,7 @@ public class RestContext extends Context {
 	 *
 	 * <ul class='seealso'>
 	 * 	<li class='ja'>{@link Rest#clientVersionHeader}
-	 * 	<li class='jm'>{@link Builder#clientVersionHeader(String)}
+	 * 	<li class='jm'>{@link RestContext.Builder#clientVersionHeader(String)}
 	 * </ul>
 	 *
 	 * @return
@@ -6670,7 +6670,7 @@ public class RestContext extends Context {
 	 * Consists of the media types for production common to all operations on this class.
 	 *
 	 * <p>
-	 * Can be overridden by {@link Builder#produces(MediaType...)}.
+	 * Can be overridden by {@link RestContext.Builder#produces(MediaType...)}.
 	 *
 	 * @return
 	 * 	An unmodifiable list of supported <c>Accept</c> header values for this resource.
@@ -6687,7 +6687,7 @@ public class RestContext extends Context {
 	 * Consists of the media types for consumption common to all operations on this class.
 	 *
 	 * <p>
-	 * Can be overridden by {@link Builder#consumes(MediaType...)}.
+	 * Can be overridden by {@link RestContext.Builder#consumes(MediaType...)}.
 	 *
 	 * @return
 	 * 	An unmodifiable list of supported <c>Content-Type</c> header values for this resource.
@@ -6701,7 +6701,7 @@ public class RestContext extends Context {
 	 * Returns the default request headers for this resource.
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='jm'>{@link Builder#defaultRequestHeaders(org.apache.http.Header...)}
+	 * 	<li class='jm'>{@link RestContext.Builder#defaultRequestHeaders(org.apache.http.Header...)}
 	 * </ul>
 	 *
 	 * @return
@@ -6716,7 +6716,7 @@ public class RestContext extends Context {
 	 * Returns the default request attributes for this resource.
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='jm'>{@link Builder#defaultRequestAttributes(NamedAttribute...)}
+	 * 	<li class='jm'>{@link RestContext.Builder#defaultRequestAttributes(NamedAttribute...)}
 	 * </ul>
 	 *
 	 * @return
@@ -6731,7 +6731,7 @@ public class RestContext extends Context {
 	 * Returns the default response headers for this resource.
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='jm'>{@link Builder#defaultResponseHeaders(org.apache.http.Header...)}
+	 * 	<li class='jm'>{@link RestContext.Builder#defaultResponseHeaders(org.apache.http.Header...)}
 	 * </ul>
 	 *
 	 * @return
@@ -6746,7 +6746,7 @@ public class RestContext extends Context {
 	 * Returns the authority path of the resource.
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='jm'>{@link Builder#uriAuthority(String)}
+	 * 	<li class='jm'>{@link RestContext.Builder#uriAuthority(String)}
 	 * </ul>
 	 *
 	 * @return
@@ -6765,7 +6765,7 @@ public class RestContext extends Context {
 	 * Returns the context path of the resource.
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='jm'>{@link Builder#uriContext(String)}
+	 * 	<li class='jm'>{@link RestContext.Builder#uriContext(String)}
 	 * </ul>
 	 *
 	 * @return
@@ -6784,7 +6784,7 @@ public class RestContext extends Context {
 	 * Returns the setting on how relative URIs should be interpreted as relative to.
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='jm'>{@link Builder#uriRelativity(UriRelativity)}
+	 * 	<li class='jm'>{@link RestContext.Builder#uriRelativity(UriRelativity)}
 	 * </ul>
 	 *
 	 * @return
@@ -6799,7 +6799,7 @@ public class RestContext extends Context {
 	 * Returns the setting on how relative URIs should be resolved.
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='jm'>{@link Builder#uriResolution(UriResolution)}
+	 * 	<li class='jm'>{@link RestContext.Builder#uriResolution(UriResolution)}
 	 * </ul>
 	 *
 	 * @return
@@ -6922,7 +6922,7 @@ public class RestContext extends Context {
 	 * @param m The Java method being called.
 	 * @param beanStore
 	 * 	The factory used for creating beans and retrieving injected beans.
-	 * 	<br>Created by {@link Builder#beanStore()}.
+	 * 	<br>Created by {@link RestContext.Builder#beanStore()}.
 	 * @return The array of resolvers.
 	 */
 	protected RestOpArg[] findRestOperationArgs(Method m, BeanStore beanStore) {
@@ -6958,7 +6958,7 @@ public class RestContext extends Context {
 	 * @param m The Java method being called.
 	 * @param beanStore
 	 * 	The factory used for creating beans and retrieving injected beans.
-	 * 	<br>Created by {@link Builder#beanStore()}.
+	 * 	<br>Created by {@link RestContext.Builder#beanStore()}.
 	 * @return The array of resolvers.
 	 */
 	protected RestOpArg[] findHookMethodArgs(Method m, BeanStore beanStore) {
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOpContext.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOpContext.java
index 10f6f1d..1411d8c 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOpContext.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOpContext.java
@@ -975,7 +975,7 @@ public class RestOpContext extends Context implements Comparable<RestOpContext>
 		 * <ul>
 		 * 	<li>Looks for guards set via any of the following:
 		 * 		<ul>
-		 * 			<li>{@link Builder#guards()}}
+		 * 			<li>{@link RestOpContext.Builder#guards()}}
 		 * 			<li>{@link RestOp#guards()}.
 		 * 			<li>{@link Rest#guards()}.
 		 * 		</ul>
@@ -1923,7 +1923,7 @@ public class RestOpContext extends Context implements Comparable<RestOpContext>
 		 * <ul class='seealso'>
 		 * 	<li class='ja'>{@link Rest#maxInput}
 		 * 	<li class='ja'>{@link RestOp#maxInput}
-		 * 	<li class='jm'>{@link Builder#maxInput(String)}
+		 * 	<li class='jm'>{@link RestOpContext.Builder#maxInput(String)}
 		 * </ul>
 		 *
 		 * @param value
@@ -2012,7 +2012,7 @@ public class RestOpContext extends Context implements Comparable<RestOpContext>
 		 * A comma-delimited list of all possible user roles.
 		 *
 		 * <p>
-		 * Used in conjunction with {@link Builder#roleGuard(String)} is used with patterns.
+		 * Used in conjunction with {@link RestOpContext.Builder#roleGuard(String)} is used with patterns.
 		 *
 		 * <h5 class='section'>Example:</h5>
 		 * <p class='bcode w800'>
@@ -2078,7 +2078,7 @@ public class RestOpContext extends Context implements Comparable<RestOpContext>
 		 * 	<li>
 		 * 		<jk>null</jk> or empty expressions always match as <jk>false</jk>.
 		 * 	<li>
-		 * 		If patterns are used, you must specify the list of declared roles using {@link Rest#rolesDeclared()} or {@link Builder#rolesDeclared(String...)}.
+		 * 		If patterns are used, you must specify the list of declared roles using {@link Rest#rolesDeclared()} or {@link RestOpContext.Builder#rolesDeclared(String...)}.
 		 * 	<li>
 		 * 		Supports {@doc RestSvlVariables}
 		 * 		(e.g. <js>"$L{my.localized.variable}"</js>).
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Rest.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Rest.java
index a745272..376677b 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Rest.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Rest.java
@@ -230,7 +230,7 @@ public @interface Rest {
 	 * Defines children of this resource.
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='jm'>{@link RestContext.Builder#children}
+	 * 	<li class='jm'>{@link org.apache.juneau.rest.RestContext.Builder#children(Object...)}
 	 * </ul>
 	 */
 	Class<?>[] children() default {};