JUNEAU-120 Add <c> as a shortcut for <code> in the javadoc CSS.
diff --git a/juneau-core/juneau-config/.settings/org.eclipse.wst.html.core.prefs b/juneau-core/juneau-config/.settings/org.eclipse.wst.html.core.prefs
index f70192e..7de0d38 100644
--- a/juneau-core/juneau-config/.settings/org.eclipse.wst.html.core.prefs
+++ b/juneau-core/juneau-config/.settings/org.eclipse.wst.html.core.prefs
@@ -32,7 +32,7 @@
 elemUnclosedStartTag=1
 elemUnknownName=2
 elemUnnecessaryEnd=2
-elementNamesToIgnore=jc,jd,jt,jk,js,jf,jsf,jsm,ja,xt,xa,xc,xs,xv,ua,uk,un,us,mk,mv,cc,cs,ck,cv,l,property
+elementNamesToIgnore=bc,c,cc,ci,ck,cs,cv,dc,del,ja,jc,jd,jf,jk,joc,jok,jov,js,jsf,jsm,jt,l,mk,mv,ua,uk,un,us,xa,xc,xs,xt,xv
 ignoreAttrNames=false
 ignoreElementNames=true
 piInvalidContent=2
diff --git a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/Config.java b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/Config.java
index da920ca..d7da807 100644
--- a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/Config.java
+++ b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/Config.java
@@ -160,7 +160,7 @@
 	 * <h5 class='section'>Property:</h5>
 	 * <ul>
 	 * 	<li><b>Name:</b>  <js>"Config.name.s"</js>
-	 * 	<li><b>Data type:</b>  <code>String</code>
+	 * 	<li><b>Data type:</b>  <c>String</c>
 	 * 	<li><b>Default:</b>  <js>"Configuration.cfg"</js>
 	 * 	<li><b>Methods:</b>
 	 * 		<ul>
@@ -286,8 +286,8 @@
 	 * <h5 class='section'>Property:</h5>
 	 * <ul>
 	 * 	<li><b>Name:</b>  <js>"Config.binaryLineLength.i"</js>
-	 * 	<li><b>Data type:</b>  <code>Integer</code>
-	 * 	<li><b>Default:</b>  <code>-1</code>
+	 * 	<li><b>Data type:</b>  <c>Integer</c>
+	 * 	<li><b>Default:</b>  <c>-1</c>
 	 * 	<li><b>Methods:</b>
 	 * 		<ul>
 	 * 			<li class='jm'>{@link ConfigBuilder#binaryLineLength(int)}
@@ -297,7 +297,7 @@
 	 * <h5 class='section'>Description:</h5>
 	 * <p>
 	 * When serializing binary values, lines will be split after this many characters.
-	 * <br>Use <code>-1</code> to represent no line splitting.
+	 * <br>Use <c>-1</c> to represent no line splitting.
 	 */
 	public static final String CONFIG_binaryLineLength = PREFIX + ".binaryLineLength.i";
 
@@ -335,7 +335,7 @@
 	 * <h5 class='section'>Property:</h5>
 	 * <ul>
 	 * 	<li><b>Name:</b>  <js>"Config.multiLineValuesOnSeparateLines.b"</js>
-	 * 	<li><b>Data type:</b>  <code>Boolean</code>
+	 * 	<li><b>Data type:</b>  <c>Boolean</c>
 	 * 	<li><b>Default:</b>  <jk>false</jk>
 	 * 	<li><b>Methods:</b>
 	 * 		<ul>
@@ -355,7 +355,7 @@
 	 * <h5 class='section'>Property:</h5>
 	 * <ul>
 	 * 	<li><b>Name:</b>  <js>"Config.readOnly.b"</js>
-	 * 	<li><b>Data type:</b>  <code>Boolean</code>
+	 * 	<li><b>Data type:</b>  <c>Boolean</c>
 	 * 	<li><b>Default:</b>  <jk>false</jk>
 	 * 	<li><b>Methods:</b>
 	 * 		<ul>
@@ -579,7 +579,7 @@
 	 * serializer.
 	 *
 	 * <p>
-	 * Equivalent to calling <code>put(key, value, isEncoded(key))</code>.
+	 * Equivalent to calling <c>put(key, value, isEncoded(key))</c>.
 	 *
 	 * @param key The key.
 	 * @param value The new value POJO.
@@ -727,7 +727,7 @@
 	 * The key can be in one of the following formats...
 	 * <ul class='spaced-list'>
 	 * 	<li>
-	 * 		<js>"key"</js> - A value in the default section (i.e. defined above any <code>[section]</code> header).
+	 * 		<js>"key"</js> - A value in the default section (i.e. defined above any <c>[section]</c> header).
 	 * 	<li>
 	 * 		<js>"section/key"</js> - A value from the specified section.
 	 * </ul>
@@ -751,7 +751,7 @@
 	 * The key can be in one of the following formats...
 	 * <ul class='spaced-list'>
 	 * 	<li>
-	 * 		<js>"key"</js> - A value in the default section (i.e. defined above any <code>[section]</code> header).
+	 * 		<js>"key"</js> - A value in the default section (i.e. defined above any <c>[section]</c> header).
 	 * 	<li>
 	 * 		<js>"section/key"</js> - A value from the specified section.
 	 * </ul>
@@ -818,7 +818,7 @@
 	 * </ul>
 	 *
 	 * @param key The key.
-	 * @return The value, or <code>0</code> if the value does not exist or the value is empty.
+	 * @return The value, or <c>0</c> if the value does not exist or the value is empty.
 	 */
 	public int getInt(String key) {
 		return getInt(key, 0);
@@ -884,7 +884,7 @@
 	 * </ul>
 	 *
 	 * @param key The key.
-	 * @return The value, or <code>0</code> if the value does not exist or the value is empty.
+	 * @return The value, or <c>0</c> if the value does not exist or the value is empty.
 	 */
 	public long getLong(String key) {
 		return getLong(key, 0);
@@ -917,7 +917,7 @@
 	 * </ul>
 	 *
 	 * @param key The key.
-	 * @return The value, or <code>0</code> if the value does not exist or the value is empty.
+	 * @return The value, or <c>0</c> if the value does not exist or the value is empty.
 	 */
 	public double getDouble(String key) {
 		return getDouble(key, 0);
@@ -950,7 +950,7 @@
 	 * </ul>
 	 *
 	 * @param key The key.
-	 * @return The value, or <code>0</code> if the value does not exist or the value is empty.
+	 * @return The value, or <c>0</c> if the value does not exist or the value is empty.
 	 */
 	public float getFloat(String key) {
 		return getFloat(key, 0);
@@ -1018,7 +1018,7 @@
 	 * The key can be in one of the following formats...
 	 * <ul class='spaced-list'>
 	 * 	<li>
-	 * 		<js>"key"</js> - A value in the default section (i.e. defined above any <code>[section]</code> header).
+	 * 		<js>"key"</js> - A value in the default section (i.e. defined above any <c>[section]</c> header).
 	 * 	<li>
 	 * 		<js>"section/key"</js> - A value from the specified section.
 	 * </ul>
@@ -1050,10 +1050,10 @@
 	 * </p>
 	 *
 	 * <p>
-	 * <code>Collection</code> classes are assumed to be followed by zero or one objects indicating the element type.
+	 * <c>Collection</c> classes are assumed to be followed by zero or one objects indicating the element type.
 	 *
 	 * <p>
-	 * <code>Map</code> classes are assumed to be followed by zero or two meta objects indicating the key and value
+	 * <c>Map</c> classes are assumed to be followed by zero or two meta objects indicating the key and value
 	 * types.
 	 *
 	 * <p>
diff --git a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/ConfigBuilder.java b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/ConfigBuilder.java
index b67e16e..4d61ca6 100644
--- a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/ConfigBuilder.java
+++ b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/ConfigBuilder.java
@@ -235,11 +235,11 @@
 	 *

 	 * <p>

 	 * When serializing binary values, lines will be split after this many characters.

-	 * <br>Use <code>-1</code> to represent no line splitting.

+	 * <br>Use <c>-1</c> to represent no line splitting.

 	 *

 	 * @param value

 	 * 	The new value for this property.

-	 * 	<br>The default is <code>-1</code>.

+	 * 	<br>The default is <c>-1</c>.

 	 * @return This object (for method chaining).

 	 */

 	public ConfigBuilder binaryLineLength(int value) {

diff --git a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/ConfigFileStore.java b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/ConfigFileStore.java
index c9240b9..ece6933 100644
--- a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/ConfigFileStore.java
+++ b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/ConfigFileStore.java
@@ -48,7 +48,7 @@
 	 * <h5 class='section'>Property:</h5>
 	 * <ul>
 	 * 	<li><b>Name:</b>  <js>"ConfigFileStore.directory.s"</js>
-	 * 	<li><b>Data type:</b>  <code>String</code>
+	 * 	<li><b>Data type:</b>  <c>String</c>
 	 * 	<li><b>Default:</b>  <js>"."</js>
 	 * 	<li><b>Methods:</b>
 	 * 		<ul>
@@ -90,7 +90,7 @@
 	 * <h5 class='section'>Property:</h5>
 	 * <ul>
 	 * 	<li><b>Name:</b>  <js>"ConfigFileStore.useWatcher.b"</js>
-	 * 	<li><b>Data type:</b>  <code>Boolean</code>
+	 * 	<li><b>Data type:</b>  <c>Boolean</c>
 	 * 	<li><b>Default:</b>  <jk>false</jk>
 	 * 	<li><b>Methods:</b>
 	 * 		<ul>
@@ -141,7 +141,7 @@
 	 * <h5 class='section'>Property:</h5>
 	 * <ul>
 	 * 	<li><b>Name:</b>  <js>"ConfigFileStore.updateOnWrite.b"</js>
-	 * 	<li><b>Data type:</b>  <code>Boolean</code>
+	 * 	<li><b>Data type:</b>  <c>Boolean</c>
 	 * 	<li><b>Default:</b>  <jk>false</jk>
 	 * 	<li><b>Methods:</b>
 	 * 		<ul>
@@ -165,7 +165,7 @@
 	 * <h5 class='section'>Property:</h5>
 	 * <ul>
 	 * 	<li><b>Name:</b>  <js>"ConfigFileStore.extensions.ls"</js>
-	 * 	<li><b>Data type:</b>  <code>String[]</code>
+	 * 	<li><b>Data type:</b>  <c>String[]</c>
 	 * 	<li><b>Default:</b>  <jk>"cfg"</jk>
 	 * 	<li><b>Methods:</b>
 	 * 		<ul>
diff --git a/juneau-core/juneau-dto/.settings/org.eclipse.wst.html.core.prefs b/juneau-core/juneau-dto/.settings/org.eclipse.wst.html.core.prefs
index f70192e..7de0d38 100644
--- a/juneau-core/juneau-dto/.settings/org.eclipse.wst.html.core.prefs
+++ b/juneau-core/juneau-dto/.settings/org.eclipse.wst.html.core.prefs
@@ -32,7 +32,7 @@
 elemUnclosedStartTag=1
 elemUnknownName=2
 elemUnnecessaryEnd=2
-elementNamesToIgnore=jc,jd,jt,jk,js,jf,jsf,jsm,ja,xt,xa,xc,xs,xv,ua,uk,un,us,mk,mv,cc,cs,ck,cv,l,property
+elementNamesToIgnore=bc,c,cc,ci,ck,cs,cv,dc,del,ja,jc,jd,jf,jk,joc,jok,jov,js,jsf,jsm,jt,l,mk,mv,ua,uk,un,us,xa,xc,xs,xt,xv
 ignoreAttrNames=false
 ignoreElementNames=true
 piInvalidContent=2
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Category.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Category.java
index 2e66fb2..a4e7704 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Category.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Category.java
@@ -23,7 +23,7 @@
 import org.apache.juneau.xml.annotation.*;

 

 /**

- * Represents an <code>atomCategory</code> construct in the RFC4287 specification.

+ * Represents an <c>atomCategory</c> construct in the RFC4287 specification.

  *

  * <h5 class='figure'>Schema</h5>

  * <p class='bcode w800'>

diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Common.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Common.java
index 61e8e19..5d6c934 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Common.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Common.java
@@ -24,7 +24,7 @@
 import org.apache.juneau.xml.annotation.*;

 

 /**

- * Represents an <code>atomCommonAttributes</code> construct in the RFC4287 specification.

+ * Represents an <c>atomCommonAttributes</c> construct in the RFC4287 specification.

  *

  * <h5 class='figure'>Schema</h5>

  * <p class='bcode w800'>

diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Content.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Content.java
index c5e97b4..81b5eb2 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Content.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Content.java
@@ -23,7 +23,7 @@
 import org.apache.juneau.xml.annotation.*;

 

 /**

- * Represents an <code>atomContent</code> construct in the RFC4287 specification.

+ * Represents an <c>atomContent</c> construct in the RFC4287 specification.

  *

  * <h5 class='figure'>Schema</h5>

  * <p class='bcode w800'>

diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Entry.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Entry.java
index 6a632f5..d539bfe 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Entry.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Entry.java
@@ -20,7 +20,7 @@
 import org.apache.juneau.transforms.*;

 

 /**

- * Represents an <code>atomEntry</code> construct in the RFC4287 specification.

+ * Represents an <c>atomEntry</c> construct in the RFC4287 specification.

  *

  * <h5 class='figure'>Schema</h5>

  * <p class='bcode w800'>

diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Feed.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Feed.java
index 0663651..ae60b65 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Feed.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Feed.java
@@ -23,7 +23,7 @@
  * Top-level ATOM feed object.

  *

  * <p>

- * Represents an <code>atomFeed</code> construct in the RFC4287 specification.

+ * Represents an <c>atomFeed</c> construct in the RFC4287 specification.

  *

  * <h5 class='figure'>Schema</h5>

  * <p class='bcode w800'>

diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Generator.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Generator.java
index 9d91a64..2e96424 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Generator.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Generator.java
@@ -23,7 +23,7 @@
 import org.apache.juneau.xml.annotation.*;

 

 /**

- * Represents an <code>atomGenerator</code> construct in the RFC4287 specification.

+ * Represents an <c>atomGenerator</c> construct in the RFC4287 specification.

  *

  * <h5 class='figure'>Schema</h5>

  * <p class='bcode w800'>

diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Icon.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Icon.java
index 4cf0823..5eae7ba 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Icon.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Icon.java
@@ -23,7 +23,7 @@
 import org.apache.juneau.xml.annotation.*;

 

 /**

- * Represents an <code>atomIcon</code> construct in the RFC4287 specification.

+ * Represents an <c>atomIcon</c> construct in the RFC4287 specification.

  *

  * <h5 class='figure'>Schema</h5>

  * <p class='bcode w800'>

diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Id.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Id.java
index 518522d..32b2447 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Id.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Id.java
@@ -18,7 +18,7 @@
 import org.apache.juneau.xml.annotation.*;

 

 /**

- * Represents an <code>atomId</code> construct in the RFC4287 specification.

+ * Represents an <c>atomId</c> construct in the RFC4287 specification.

  *

  * <h5 class='figure'>Schema</h5>

  * <p class='bcode w800'>

diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Link.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Link.java
index 3fe0775..5490a76 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Link.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Link.java
@@ -18,7 +18,7 @@
 import org.apache.juneau.xml.annotation.*;

 

 /**

- * Represents an <code>atomLink</code> construct in the RFC4287 specification.

+ * Represents an <c>atomLink</c> construct in the RFC4287 specification.

  *

  * <h5 class='figure'>Schema</h5>

  * <p class='bcode w800'>

diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Logo.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Logo.java
index fadfe76..4e3d1e1 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Logo.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Logo.java
@@ -23,7 +23,7 @@
 import org.apache.juneau.xml.annotation.*;

 

 /**

- * Represents an <code>atomLogo</code> construct in the RFC4287 specification.

+ * Represents an <c>atomLogo</c> construct in the RFC4287 specification.

  *

  * <h5 class='figure'>Schema</h5>

  * <p class='bcode w800'>

diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Person.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Person.java
index e6cab29..755dde0 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Person.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Person.java
@@ -22,7 +22,7 @@
 import org.apache.juneau.annotation.*;

 

 /**

- * Represents an <code>atomPersonConstruct</code> construct in the RFC4287 specification.

+ * Represents an <c>atomPersonConstruct</c> construct in the RFC4287 specification.

  *

  * <h5 class='figure'>Schema</h5>

  * <p class='bcode w800'>

diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Source.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Source.java
index 4892fff..d903f25 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Source.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Source.java
@@ -17,7 +17,7 @@
 import org.apache.juneau.annotation.*;

 

 /**

- * Represents an <code>atomSource</code> construct in the RFC4287 specification.

+ * Represents an <c>atomSource</c> construct in the RFC4287 specification.

  *

  * <h5 class='figure'>Schema</h5>

  * <p class='bcode w800'>

diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Text.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Text.java
index aae95c5..b87f35a 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Text.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Text.java
@@ -18,7 +18,7 @@
 import org.apache.juneau.xml.annotation.*;

 

 /**

- * Represents an <code>atomTextConstruct</code> construct in the RFC4287 specification.

+ * Represents an <c>atomTextConstruct</c> construct in the RFC4287 specification.

  *

  * <h5 class='figure'>Schema</h5>

  * <p class='bcode w800'>

diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/cognos/Column.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/cognos/Column.java
index 9c590be..3afc9ae 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/cognos/Column.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/cognos/Column.java
@@ -51,7 +51,7 @@
 	 *

 	 * @param name The column name.

 	 * @param type The column type (e.g. <js>"xs:String"</js>).

-	 * @param length The column length (e.g. <code>255</code>).

+	 * @param length The column length (e.g. <c>255</c>).

 	 */

 	public Column(String name, String type, Integer length) {

 		this.name = name;

@@ -66,7 +66,7 @@
 	 * Typically used to define columns that don't exist on the underlying beans being serialized.

 	 *

 	 * <p>

-	 * For example, the <code>AddressBookResource</code> sample defined the following POJO swap to define an additional

+	 * For example, the <c>AddressBookResource</c> sample defined the following POJO swap to define an additional

 	 * <js>"numAddresses"</js> column even though no such property exists on the serialized beans.

 	 * <p class='bcode w800'>

 	 * 	Column c = <jk>new</jk> Column(<js>"numAddresses"</js>, <js>"xs:int"</js>)

diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/cognos/DataSet.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/cognos/DataSet.java
index ad0a12a..c59a23a 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/cognos/DataSet.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/cognos/DataSet.java
@@ -22,7 +22,7 @@
  * Represents a Cognos dataset.

  *

  * <p>

- * When serialized to XML, creates the following construct (example pulled from <code>AddressBookResource</code>):

+ * When serialized to XML, creates the following construct (example pulled from <c>AddressBookResource</c>):

  * <p class='bcode w800'>

  * 	<xt>&lt;?xml</xt> <xa>version</xa>=<xs>'1.0'</xs> <xa>encoding</xa>=<xs>'UTF-8'</xs><xt>?&gt;</xt>

  * 	<xt>&lt;c:dataset <xa>xmlns:c</xa>=<xs>'http://developer.cognos.com/schemas/xmldata/1/'</xs>&gt;</xt>

@@ -52,8 +52,8 @@
  *

  * <h5 class='section'>Example:</h5>

  *

- * The construct shown above is a serialized <code>AddressBook</code> object which is a subclass of

- * <code>LinkedList&lt;Person&gt;</code>.

+ * The construct shown above is a serialized <c>AddressBook</c> object which is a subclass of

+ * <c>LinkedList&lt;Person&gt;</c>.

  * The code for generating the XML is as follows...

  * <p class='bcode w800'>

  * 	Column[] items = {

@@ -128,7 +128,7 @@
 	 * Represents a row of data.

 	 *

 	 * <p>

-	 * When serialized to XML, creates the following construct (example pulled from <code>AddressBookResource</code>):

+	 * When serialized to XML, creates the following construct (example pulled from <c>AddressBookResource</c>):

 	 * <p class='bcode w800'>

 	 * 	<xt>&lt;row&gt;</xt>

 	 * 		<xt>&lt;value&gt;</xt>Barack Obama<xt>&lt;/value&gt;</xt>

diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlElementContainer.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlElementContainer.java
index 659a46e..cecfa1e 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlElementContainer.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlElementContainer.java
@@ -73,7 +73,7 @@
 	 * Indexes are zero-indexed.
 	 *
 	 * <p>
-	 * For example, calling <code>getChild(1,2,3);</code> will return the 4th child of the 3rd child of the 2nd child.
+	 * For example, calling <c>getChild(1,2,3);</c> will return the 4th child of the 3rd child of the 2nd child.
 	 *
 	 * @param index The child indexes.
 	 * @return The child node, or <jk>null</jk> if it doesn't point to a valid child.
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlElementMixed.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlElementMixed.java
index ecc2a79..ddde8a0 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlElementMixed.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlElementMixed.java
@@ -73,7 +73,7 @@
 	 * Indexes are zero-indexed.
 	 *
 	 * <p>
-	 * For example, calling <code>getChild(1,2,3);</code> will return the 4th child of the 3rd child of the 2nd child.
+	 * For example, calling <c>getChild(1,2,3);</c> will return the 4th child of the 3rd child of the 2nd child.
 	 *
 	 * @param index The child indexes.
 	 * @return The child node, or <jk>null</jk> if it doesn't point to a valid child.
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Input.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Input.java
index c786905..faee193 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Input.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Input.java
@@ -401,7 +401,7 @@
 	 * <p>
 	 * Whether to allow the value to be edited by the user.
 	 *
-	 * @param readonly If <jk>true</jk>, adds <code>readonly="readonly"</code>.
+	 * @param readonly If <jk>true</jk>, adds <c>readonly="readonly"</c>.
 	 * @return This object (for method chaining).
 	 */
 	public final Input readonly(boolean readonly) {
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/JsonType.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/JsonType.java
index 44a5cd8..16ec549 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/JsonType.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/JsonType.java
@@ -16,8 +16,8 @@
  * Represents possible JSON types in the JSON-Schema core specification.

  *

  * <p>

- * Implements custom <code>toString()</code> and <code>fromString(String)</code> methods that override the default

- * serialization/parsing behavior of <code>Enum</code> types so that they are represented in lowercase form (as per the

+ * Implements custom <c>toString()</c> and <c>fromString(String)</c> methods that override the default

+ * serialization/parsing behavior of <c>Enum</c> types so that they are represented in lowercase form (as per the

  * specification).

  *

  * <h5 class='section'>Example:</h5>

@@ -72,10 +72,10 @@
 	}

 

 	/**

-	 * Converts the specified lowercase form of the enum back into an <code>Enum</code>.

+	 * Converts the specified lowercase form of the enum back into an <c>Enum</c>.

 	 *

 	 * @param value The lowercase form of the enum (e.g. <js>"array"</js>).

-	 * @return The matching <code>Enum</code>, or <jk>null</jk> if no match found.

+	 * @return The matching <c>Enum</c>, or <jk>null</jk> if no match found.

 	 */

 	public static JsonType fromString(String value) {

 		if (value == null || value.length() < 4)

diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Contact.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Contact.java
index b4f9457..3a7f137 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Contact.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Contact.java
@@ -119,7 +119,7 @@
 	 *
 	 * @param value
 	 * 	The new value for this property.
-	 * 	<br>Non-String values will be converted to String using <code>toString()</code>.
+	 * 	<br>Non-String values will be converted to String using <c>toString()</c>.
 	 * 	<br>Can be <jk>null</jk> to unset the property.
 	 * @return This object (for method chaining).
 	 */
@@ -206,7 +206,7 @@
 	 *
 	 * @param value
 	 * 	The new value for this property.
-	 * 	<br>Non-String values will be converted to String using <code>toString()</code>.
+	 * 	<br>Non-String values will be converted to String using <c>toString()</c>.
 	 * 	<br>MUST be in the format of an email address.
 	 * 	<br>Can be <jk>null</jk> to unset the property.
 	 * @return This object (for method chaining).
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/ExternalDocumentation.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/ExternalDocumentation.java
index ab3873b..b7919ee 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/ExternalDocumentation.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/ExternalDocumentation.java
@@ -117,7 +117,7 @@
 	 *
 	 * @param value
 	 * 	The new value for this property.
-	 * 	<br>Non-String values will be converted to String using <code>toString()</code>.
+	 * 	<br>Non-String values will be converted to String using <c>toString()</c>.
 	 * 	<br>Can be <jk>null</jk> to unset the property.
 	 * @return This object (for method chaining).
 	 */
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/HeaderInfo.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/HeaderInfo.java
index 5122ebf..c3d9f30 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/HeaderInfo.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/HeaderInfo.java
@@ -165,7 +165,7 @@
 	 *
 	 * @param value
 	 * 	The new value for this property.
-	 * 	<br>Non-String values will be converted to String using <code>toString()</code>.
+	 * 	<br>Non-String values will be converted to String using <c>toString()</c>.
 	 * 	<br>Can be <jk>null</jk> to unset the property.
 	 * @return This object (for method chaining).
 	 */
@@ -224,7 +224,7 @@
 	 *
 	 * @param value
 	 * 	The new value for this property.
-	 * 	<br>Non-String values will be converted to String using <code>toString()</code>.
+	 * 	<br>Non-String values will be converted to String using <c>toString()</c>.
 	 * 	<br>Can be <jk>null</jk> to unset the property.
 	 * @return This object (for method chaining).
 	 */
@@ -236,7 +236,7 @@
 	 * Bean property getter:  <property>format</property>.
 	 *
 	 * <p>
-	 * The extending format for the previously mentioned <code>type</code>.
+	 * The extending format for the previously mentioned <c>type</c>.
 	 *
 	 * <h5 class='section'>See Also:</h5>
 	 * <ul>
@@ -253,7 +253,7 @@
 	 * Bean property setter:  <property>format</property>.
 	 *
 	 * <p>
-	 * The extending format for the previously mentioned <code>type</code>.
+	 * The extending format for the previously mentioned <c>type</c>.
 	 *
 	 * <h5 class='section'>See Also:</h5>
 	 * <ul class='doctree'>
@@ -275,7 +275,7 @@
 	 *
 	 * @param value
 	 * 	The new value for this property.
-	 * 	<br>Non-String values will be converted to String using <code>toString()</code>.
+	 * 	<br>Non-String values will be converted to String using <c>toString()</c>.
 	 * 	<br>Can be <jk>null</jk> to unset the property.
 	 * @return This object (for method chaining).
 	 */
@@ -303,7 +303,7 @@
 	 *
 	 * @param value
 	 * 	The new value for this property.
-	 * 	<br>Property value is required if <code>type</code> is <js>"array"</js>.
+	 * 	<br>Property value is required if <c>type</c> is <js>"array"</js>.
 	 * 	<br>Can be <jk>null</jk> to unset the property.
 	 * @return This object (for method chaining).
 	 */
@@ -320,7 +320,7 @@
 	 * 	<br>Valid types:
 	 * 	<ul>
 	 * 		<li>{@link Items}
-	 * 		<li><code>String</code> - JSON object representation of {@link Items}
+	 * 		<li><c>String</c> - JSON object representation of {@link Items}
 	 * 			<h5 class='figure'>Example:</h5>
 	 * 			<p class='bcode w800'>
 	 * 	items(<js>"{type:'type',format:'format',...}"</js>);
@@ -355,10 +355,10 @@
 	 * 	The new value for this property.
 	 * 	<br>Valid values:
 	 * 	<ul>
-	 * 		<li><js>"csv"</js> (default) - comma separated values <code>foo,bar</code>.
-	 * 		<li><js>"ssv"</js> - space separated values <code>foo bar</code>.
-	 * 		<li><js>"tsv"</js> - tab separated values <code>foo\tbar</code>.
-	 * 		<li><js>"pipes"</js> - pipe separated values <code>foo|bar</code>.
+	 * 		<li><js>"csv"</js> (default) - comma separated values <c>foo,bar</c>.
+	 * 		<li><js>"ssv"</js> - space separated values <c>foo bar</c>.
+	 * 		<li><js>"tsv"</js> - tab separated values <c>foo\tbar</c>.
+	 * 		<li><js>"pipes"</js> - pipe separated values <c>foo|bar</c>.
 	 * 	</ul>
 	 * @return This object (for method chaining).
 	 */
@@ -377,7 +377,7 @@
 	 *
 	 * @param value
 	 * 	The new value for this property.
-	 * 	<br>Non-String values will be converted to String using <code>toString()</code>.
+	 * 	<br>Non-String values will be converted to String using <c>toString()</c>.
 	 * 	<br>Can be <jk>null</jk> to unset the property.
 	 * @return This object (for method chaining).
 	 */
@@ -396,7 +396,7 @@
 	 * 	<li>
 	 * 		<js>"default"</js> has no meaning for required items.
 	 * 	<li>
-	 * 		Unlike JSON Schema this value MUST conform to the defined <code>type</code> for the header.
+	 * 		Unlike JSON Schema this value MUST conform to the defined <c>type</c> for the header.
 	 * </ul>
 	 *
 	 * <h5 class='section'>See Also:</h5>
@@ -421,7 +421,7 @@
 	 * 	<li>
 	 * 		<js>"default"</js> has no meaning for required items.
 	 * 	<li>
-	 * 		Unlike JSON Schema this value MUST conform to the defined <code>type</code> for the header.
+	 * 		Unlike JSON Schema this value MUST conform to the defined <c>type</c> for the header.
 	 * </ul>
 	 *
 	 * <h5 class='section'>See Also:</h5>
@@ -486,7 +486,7 @@
 	 *
 	 * @param value
 	 * 	The new value for this property.
-	 * 	<br>Non-Number values will be converted to Number using <code>toString()</code> then best number match.
+	 * 	<br>Non-Number values will be converted to Number using <c>toString()</c> then best number match.
 	 * 	<br>Can be <jk>null</jk> to unset the property.
 	 * @return This object (for method chaining).
 	 */
@@ -576,7 +576,7 @@
 	 *
 	 * @param value
 	 * 	The new value for this property.
-	 * 	<br>Non-Number values will be converted to Number using <code>toString()</code> then best number match.
+	 * 	<br>Non-Number values will be converted to Number using <c>toString()</c> then best number match.
 	 * 	<br>Can be <jk>null</jk> to unset the property.
 	 * @return This object (for method chaining).
 	 */
@@ -759,7 +759,7 @@
 	 *
 	 * @param value
 	 * 	The new value for this property.
-	 * 	<br>Non-String values will be converted to String using <code>toString()</code>.
+	 * 	<br>Non-String values will be converted to String using <c>toString()</c>.
 	 * 	<br>Can be <jk>null</jk> to unset the property.
 	 * @return This object (for method chaining).
 	 */
@@ -954,14 +954,14 @@
 	 * 	The values to add to this property.
 	 * 	<br>Valid types:
 	 * 	<ul>
-	 * 		<li><code>Object</code>
-	 * 		<li><code>Collection&lt;Object&gt;</code>
-	 * 		<li><code>String</code> - JSON array representation of <code>Collection&lt;Object&gt;</code>.
+	 * 		<li><c>Object</c>
+	 * 		<li><c>Collection&lt;Object&gt;</c>
+	 * 		<li><c>String</c> - JSON array representation of <c>Collection&lt;Object&gt;</c>.
 	 * 			<h5 class='figure'>Example:</h5>
 	 * 			<p class='bcode w800'>
 	 * 	_enum(<js>"['foo','bar']"</js>);
 	 * 			</p>
-	 * 		<li><code>String</code> - Individual values.
+	 * 		<li><c>String</c> - Individual values.
 	 * 			<h5 class='figure'>Example:</h5>
 	 * 			<p class='bcode w800'>
 	 * 	_enum(<js>"foo"</js>, <js>"bar"</js>);
@@ -1012,7 +1012,7 @@
 	 *
 	 * @param value
 	 * 	The new value for this property.
-	 * 	<br>Non-Number values will be converted to Number using <code>toString()</code> then best number match.
+	 * 	<br>Non-Number values will be converted to Number using <c>toString()</c> then best number match.
 	 * 	<br>Can be <jk>null</jk> to unset the property.
 	 * @return This object (for method chaining).
 	 */
@@ -1196,7 +1196,7 @@
 	 * @param refStack Keeps track of previously-visited references so that we don't cause recursive loops.
 	 * @param maxDepth
 	 * 	The maximum depth to resolve references.
-	 * 	<br>After that level is reached, <code>$ref</code> references will be left alone.
+	 * 	<br>After that level is reached, <c>$ref</c> references will be left alone.
 	 * 	<br>Useful if you have very complex models and you don't want your swagger page to be overly-complex.
 	 * @return
 	 * 	This object with references resolved.
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Info.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Info.java
index 3979280..eab23a6 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Info.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Info.java
@@ -145,7 +145,7 @@
 	 *
 	 * @param value
 	 * 	The new value for this property.
-	 * 	<br>Non-String values will be converted to String using <code>toString()</code>.
+	 * 	<br>Non-String values will be converted to String using <c>toString()</c>.
 	 * 	<br>Can be <jk>null</jk> to unset the property.
 	 * @return This object (for method chaining).
 	 */
@@ -187,7 +187,7 @@
 	 *
 	 * @param value
 	 * 	The new value for this property.
-	 * 	<br>Non-String values will be converted to String using <code>toString()</code>.
+	 * 	<br>Non-String values will be converted to String using <c>toString()</c>.
 	 * 	<br>{@doc GFM} can be used for rich text representation.
 	 * 	<br>Can be <jk>null</jk> to unset the property.
 	 * @return This object (for method chaining).
@@ -229,7 +229,7 @@
 	 *
 	 * @param value
 	 * 	The new value for this property.
-	 * 	<br>Non-String values will be converted to String using <code>toString()</code>.
+	 * 	<br>Non-String values will be converted to String using <c>toString()</c>.
 	 * 	<br>Can be <jk>null</jk> to unset the property.
 	 * @return This object (for method chaining).
 	 */
@@ -273,7 +273,7 @@
 	 * 	<br>Valid types:
 	 * 	<ul>
 	 * 		<li>{@link Contact}
-	 * 		<li><code>String</code> - JSON object representation of {@link Contact}
+	 * 		<li><c>String</c> - JSON object representation of {@link Contact}
 	 * 			<h5 class='figure'>Example:</h5>
 	 * 			<p class='bcode w800'>
 	 * 	contact(<js>"{name:'name',url:'url',...}"</js>);
@@ -322,7 +322,7 @@
 	 * 	<br>Valid types:
 	 * 	<ul>
 	 * 		<li>{@link License}
-	 * 		<li><code>String</code> - JSON object representation of {@link License}
+	 * 		<li><c>String</c> - JSON object representation of {@link License}
 	 * 			<h5 class='figure'>Example:</h5>
 	 * 			<p class='bcode w800'>
 	 * 	license(<js>"{name:'name',url:'url',...}"</js>);
@@ -368,7 +368,7 @@
 	 *
 	 * @param value
 	 * 	The new value for this property.
-	 * 	<br>Non-String values will be converted to String using <code>toString()</code>.
+	 * 	<br>Non-String values will be converted to String using <c>toString()</c>.
 	 * 	<br>Can be <jk>null</jk> to unset the property.
 	 * @return This object (for method chaining).
 	 */
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Items.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Items.java
index 115dd98..c7cf07b 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Items.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Items.java
@@ -183,7 +183,7 @@
 	 *
 	 * @param value
 	 * 	The new value for this property.
-	 * 	<br>Non-String values will be converted to String using <code>toString()</code>.
+	 * 	<br>Non-String values will be converted to String using <c>toString()</c>.
 	 * 	<br>Valid values:
 	 * 	<ul>
 	 * 		<li><js>"string"</js>
@@ -203,7 +203,7 @@
 	 * Bean property getter:  <property>format</property>.
 	 *
 	 * <p>
-	 * The extending format for the previously mentioned <code>type</code>.
+	 * The extending format for the previously mentioned <c>type</c>.
 	 *
 	 * <h5 class='section'>See Also:</h5>
 	 * <ul>
@@ -220,7 +220,7 @@
 	 * Bean property setter:  <property>format</property>.
 	 *
 	 * <p>
-	 * The extending format for the previously mentioned <code>type</code>.
+	 * The extending format for the previously mentioned <c>type</c>.
 	 *
 	 * <h5 class='section'>See Also:</h5>
 	 * <ul>
@@ -242,7 +242,7 @@
 	 *
 	 * @param value
 	 * 	The new value for this property.
-	 * 	<br>Non-String values will be converted to String using <code>toString()</code>.
+	 * 	<br>Non-String values will be converted to String using <c>toString()</c>.
 	 * 	<br>Can be <jk>null</jk> to unset the property.
 	 * @return This object (for method chaining).
 	 */
@@ -270,7 +270,7 @@
 	 *
 	 * @param value
 	 * 	The new value for this property.
-	 * 	<br>Property value is required if <code>type</code> is <js>"array"</js>.
+	 * 	<br>Property value is required if <c>type</c> is <js>"array"</js>.
 	 * 	<br>Can be <jk>null</jk> to unset the property.
 	 * @return This object (for method chaining).
 	 */
@@ -284,11 +284,11 @@
 	 *
 	 * @param value
 	 * 	The new value for this property.
-	 * 	<br>Property value is required if <code>type</code> is <js>"array"</js>.
+	 * 	<br>Property value is required if <c>type</c> is <js>"array"</js>.
 	 * 	<br>Valid types:
 	 * 	<ul>
 	 * 		<li>{@link Items}
-	 * 		<li><code>String</code> - JSON object representation of {@link Items}
+	 * 		<li><c>String</c> - JSON object representation of {@link Items}
 	 * 			<h5 class='figure'>Example:</h5>
 	 * 			<p class='bcode w800'>
 	 * 	items(<js>"{type:'type',format:'format',...}"</js>);
@@ -323,10 +323,10 @@
 	 * 	The new value for this property.
 	 * 	<br>Valid values:
 	 * 	<ul>
-	 * 		<li><js>"csv"</js> (default) - comma separated values <code>foo,bar</code>.
-	 * 		<li><js>"ssv"</js> - space separated values <code>foo bar</code>.
-	 * 		<li><js>"tsv"</js> - tab separated values <code>foo\tbar</code>.
-	 * 		<li><js>"pipes"</js> - pipe separated values <code>foo|bar</code>.
+	 * 		<li><js>"csv"</js> (default) - comma separated values <c>foo,bar</c>.
+	 * 		<li><js>"ssv"</js> - space separated values <c>foo bar</c>.
+	 * 		<li><js>"tsv"</js> - tab separated values <c>foo\tbar</c>.
+	 * 		<li><js>"pipes"</js> - pipe separated values <c>foo|bar</c>.
 	 * 	</ul>
 	 * 	<br>Can be <jk>null</jk> to unset the property.
 	 * @return This object (for method chaining).
@@ -346,13 +346,13 @@
 	 *
 	 * @param value
 	 * 	The new value for this property.
-	 * 	<br>Non-String values will be converted to String using <code>toString()</code>.
+	 * 	<br>Non-String values will be converted to String using <c>toString()</c>.
 	 * 	<br>Valid values:
 	 * 	<ul>
-	 * 		<li><js>"csv"</js> (default) - comma separated values <code>foo,bar</code>.
-	 * 		<li><js>"ssv"</js> - space separated values <code>foo bar</code>.
-	 * 		<li><js>"tsv"</js> - tab separated values <code>foo\tbar</code>.
-	 * 		<li><js>"pipes"</js> - pipe separated values <code>foo|bar</code>.
+	 * 		<li><js>"csv"</js> (default) - comma separated values <c>foo,bar</c>.
+	 * 		<li><js>"ssv"</js> - space separated values <c>foo bar</c>.
+	 * 		<li><js>"tsv"</js> - tab separated values <c>foo\tbar</c>.
+	 * 		<li><js>"pipes"</js> - pipe separated values <c>foo|bar</c>.
 	 * 	</ul>
 	 * 	<br>Can be <jk>null</jk> to unset the property.
 	 * @return This object (for method chaining).
@@ -372,7 +372,7 @@
 	 * 	<li>
 	 * 		<js>"default"</js> has no meaning for required items.
 	 * 	<li>
-	 * 		Unlike JSON Schema this value MUST conform to the defined <code>type</code> for the data type.
+	 * 		Unlike JSON Schema this value MUST conform to the defined <c>type</c> for the data type.
 	 * </ul>
 	 *
 	 * <h5 class='section'>See Also:</h5>
@@ -397,7 +397,7 @@
 	 * 	<li>
 	 * 		<js>"default"</js> has no meaning for required items.
 	 * 	<li>
-	 * 		Unlike JSON Schema this value MUST conform to the defined <code>type</code> for the data type.
+	 * 		Unlike JSON Schema this value MUST conform to the defined <c>type</c> for the data type.
 	 * </ul>
 	 *
 	 * <h5 class='section'>See Also:</h5>
@@ -464,7 +464,7 @@
 	 *
 	 * @param value
 	 * 	The new value for this property.
-	 * 	<br>Non-Number values will be converted to Number using <code>toString()</code> then best number match.
+	 * 	<br>Non-Number values will be converted to Number using <c>toString()</c> then best number match.
 	 * 	<br>Can be <jk>null</jk> to unset the property.
 	 * @return This object (for method chaining).
 	 */
@@ -554,7 +554,7 @@
 	 *
 	 * @param value
 	 * 	The new value for this property.
-	 * 	<br>Non-Number values will be converted to Number using <code>toString()</code> then best number match.
+	 * 	<br>Non-Number values will be converted to Number using <c>toString()</c> then best number match.
 	 * 	<br>Can be <jk>null</jk> to unset the property.
 	 * @return This object (for method chaining).
 	 */
@@ -737,7 +737,7 @@
 	 *
 	 * @param value
 	 * 	The new value for this property.
-	 * 	<br>Non-String values will be converted to String using <code>toString()</code>.
+	 * 	<br>Non-String values will be converted to String using <c>toString()</c>.
 	 * 	<br>Can be <jk>null</jk> to unset the property.
 	 * @return This object (for method chaining).
 	 */
@@ -932,14 +932,14 @@
 	 * 	The values to add to this property.
 	 * 	<br>Valid types:
 	 * 	<ul>
-	 * 		<li><code>Object</code>
-	 * 		<li><code>Collection&lt;Object&gt;</code>
-	 * 		<li><code>String</code> - JSON array representation of <code>Collection&lt;Object&gt;</code>
+	 * 		<li><c>Object</c>
+	 * 		<li><c>Collection&lt;Object&gt;</c>
+	 * 		<li><c>String</c> - JSON array representation of <c>Collection&lt;Object&gt;</c>
 	 * 			<h5 class='figure'>Example:</h5>
 	 * 			<p class='bcode w800'>
 	 * 	_enum(<js>"['foo','bar']"</js>);
 	 * 			</p>
-	 * 		<li><code>String</code> - Individual values
+	 * 		<li><c>String</c> - Individual values
 	 * 			<h5 class='figure'>Example:</h5>
 	 * 			<p class='bcode w800'>
 	 * 	_enum(<js>"foo"</js>, <js>"bar"</js>);
@@ -990,7 +990,7 @@
 	 *
 	 * @param value
 	 * 	The new value for this property.
-	 * 	<br>Non-Number values will be converted to Number using <code>toString()</code> then best number match.
+	 * 	<br>Non-Number values will be converted to Number using <c>toString()</c> then best number match.
 	 * 	<br>Can be <jk>null</jk> to unset the property.
 	 * @return This object (for method chaining).
 	 */
@@ -1130,7 +1130,7 @@
 	 * @param refStack Keeps track of previously-visited references so that we don't cause recursive loops.
 	 * @param maxDepth
 	 * 	The maximum depth to resolve references.
-	 * 	<br>After that level is reached, <code>$ref</code> references will be left alone.
+	 * 	<br>After that level is reached, <c>$ref</c> references will be left alone.
 	 * 	<br>Useful if you have very complex models and you don't want your swagger page to be overly-complex.
 	 * @return
 	 * 	This object with references resolved.
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/License.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/License.java
index 53b8118..eb7de8f 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/License.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/License.java
@@ -116,7 +116,7 @@
 	 *
 	 * @param value
 	 * 	The new value for this property.
-	 * 	<br>Non-String values will be converted to String using <code>toString()</code>.
+	 * 	<br>Non-String values will be converted to String using <c>toString()</c>.
 	 * 	<br>Can be <jk>null</jk> to unset the property.
 	 * @return This object (for method chaining).
 	 */
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Operation.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Operation.java
index 59028e5..e35b3be 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Operation.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Operation.java
@@ -263,13 +263,13 @@
 	 * 	The values to add to this property.
 	 * 	<br>Valid types:
 	 * 	<ul>
-	 * 		<li><code>Collection&lt;String&gt;</code>
-	 * 		<li><code>String</code> - JSON array representation of <code>Collection&lt;String&gt;</code>
+	 * 		<li><c>Collection&lt;String&gt;</c>
+	 * 		<li><c>String</c> - JSON array representation of <c>Collection&lt;String&gt;</c>
 	 * 			<h5 class='figure'>Example:</h5>
 	 * 			<p class='bcode w800'>
 	 * 	tags(<js>"['foo','bar']"</js>);
 	 * 			</p>
-	 * 		<li><code>String</code> - Individual values
+	 * 		<li><c>String</c> - Individual values
 	 * 			<h5 class='figure'>Example:</h5>
 	 * 			<p class='bcode w800'>
 	 * 	tags(<js>"foo"</js>, <js>"bar"</js>);
@@ -315,7 +315,7 @@
 	 *
 	 * @param value
 	 * 	The new value for this property.
-	 * 	<br>Non-String values will be converted to String using <code>toString()</code>.
+	 * 	<br>Non-String values will be converted to String using <c>toString()</c>.
 	 * 	<br>Can be <jk>null</jk> to unset the property.
 	 * @return This object (for method chaining).
 	 */
@@ -357,7 +357,7 @@
 	 *
 	 * @param value
 	 * 	The new value for this property.
-	 * 	<br>Non-String values will be converted to String using <code>toString()</code>.
+	 * 	<br>Non-String values will be converted to String using <c>toString()</c>.
 	 * 	<br>{@doc GFM} can be used for rich text representation.
 	 * 	<br>Can be <jk>null</jk> to unset the property.
 	 * @return This object (for method chaining).
@@ -402,7 +402,7 @@
 	 * 	<br>Valid types:
 	 * 	<ul>
 	 * 		<li>{@link ExternalDocumentation}
-	 * 		<li><code>String</code> - JSON object representation of {@link ExternalDocumentation}
+	 * 		<li><c>String</c> - JSON object representation of {@link ExternalDocumentation}
 	 * 			<h5 class='figure'>Example:</h5>
 	 * 			<p class='bcode w800'>
 	 * 	externalDocs(<js>"{description:'description',url:'url'}"</js>);
@@ -454,7 +454,7 @@
 	 * 	<br>The id MUST be unique among all operations described in the API.
 	 * 	<br>Tools and libraries MAY use the operationId to uniquely identify an operation, therefore, it is recommended to
 	 * 	follow common programming naming conventions.
-	 * 	<br>Non-String values will be converted to String using <code>toString()</code>.
+	 * 	<br>Non-String values will be converted to String using <c>toString()</c>.
 	 * 	<br>Can be <jk>null</jk> to unset the property.
 	 * @return This object (for method chaining).
 	 */
@@ -469,7 +469,7 @@
 	 * A list of MIME types the operation can consume.
 	 *
 	 * <p>
-	 * This overrides the <code>consumes</code> definition at the Swagger Object.
+	 * This overrides the <c>consumes</c> definition at the Swagger Object.
 	 * <br>An empty value MAY be used to clear the global definition.
 	 *
 	 * @return The property value, or <jk>null</jk> if it is not set.
@@ -485,7 +485,7 @@
 	 * A list of MIME types the operation can consume.
 	 *
 	 * <p>
-	 * This overrides the <code>consumes</code> definition at the Swagger Object.
+	 * This overrides the <c>consumes</c> definition at the Swagger Object.
 	 * <br>An empty value MAY be used to clear the global definition.
 	 *
 	 * @param value
@@ -506,7 +506,7 @@
 	 * A list of MIME types the operation can consume.
 	 *
 	 * <p>
-	 * This overrides the <code>consumes</code> definition at the Swagger Object.
+	 * This overrides the <c>consumes</c> definition at the Swagger Object.
 	 * <br>An empty value MAY be used to clear the global definition.
 	 *
 	 * @param value
@@ -528,14 +528,14 @@
 	 * 	<br>Valid types:
 	 * 	<ul>
 	 * 		<li>{@link MediaType}
-	 * 		<li><code>Collection&lt;{@link MediaType}|String&gt;</code>
-	 * 		<li><code>{@link MediaType}[]</code>
-	 * 		<li><code>String</code> - JSON array representation of <code>Collection&lt;{@link MediaType}&gt;</code>
+	 * 		<li><c>Collection&lt;{@link MediaType}|String&gt;</c>
+	 * 		<li><c>{@link MediaType}[]</c>
+	 * 		<li><c>String</c> - JSON array representation of <c>Collection&lt;{@link MediaType}&gt;</c>
 	 * 			<h5 class='figure'>Example:</h5>
 	 * 			<p class='bcode w800'>
 	 * 	consumes(<js>"['text/json']"</js>);
 	 * 			</p>
-	 * 		<li><code>String</code> - Individual values
+	 * 		<li><c>String</c> - Individual values
 	 * 			<h5 class='figure'>Example:</h5>
 	 * 			<p class='bcode w800'>
 	 * 	consumes(<js>"text/json"</js>);
@@ -556,7 +556,7 @@
 	 * A list of MIME types the operation can produce.
 	 *
 	 * <p>
-	 * This overrides the <code>produces</code> definition at the Swagger Object.
+	 * This overrides the <c>produces</c> definition at the Swagger Object.
 	 * <br>An empty value MAY be used to clear the global definition.
 	 *
 	 * @return The property value, or <jk>null</jk> if it is not set.
@@ -572,7 +572,7 @@
 	 * A list of MIME types the operation can produce.
 	 *
 	 * <p>
-	 * This overrides the <code>produces</code> definition at the Swagger Object.
+	 * This overrides the <c>produces</c> definition at the Swagger Object.
 	 * <br>An empty value MAY be used to clear the global definition.
 	 *
 	 * @param value
@@ -593,7 +593,7 @@
 	 * A list of MIME types the operation can produces.
 	 *
 	 * <p>
-	 * This overrides the <code>produces</code> definition at the Swagger Object.
+	 * This overrides the <c>produces</c> definition at the Swagger Object.
 	 * <br>An empty value MAY be used to clear the global definition.
 	 *
 	 * @param value
@@ -614,14 +614,14 @@
 	 * 	<br>Valid types:
 	 * 	<ul>
 	 * 		<li>{@link MediaType}
-	 * 		<li><code>Collection&lt;{@link MediaType}|String&gt;</code>
-	 * 		<li><code>{@link MediaType}[]</code>
-	 * 		<li><code>String</code> - JSON array representation of <code>Collection&lt;{@link MediaType}&gt;</code>
+	 * 		<li><c>Collection&lt;{@link MediaType}|String&gt;</c>
+	 * 		<li><c>{@link MediaType}[]</c>
+	 * 		<li><c>String</c> - JSON array representation of <c>Collection&lt;{@link MediaType}&gt;</c>
 	 * 			<h5 class='figure'>Example:</h5>
 	 * 			<p class='bcode w800'>
 	 * 	produces(<js>"['text/json']"</js>);
 	 * 			</p>
-	 * 		<li><code>String</code> - Individual values
+	 * 		<li><c>String</c> - Individual values
 	 * 			<h5 class='figure'>Example:</h5>
 	 * 			<p class='bcode w800'>
 	 * 	produces(<js>"text/json"</js>);
@@ -649,7 +649,7 @@
 	 * 	<li>
 	 * 		The list MUST NOT include duplicated parameters.
 	 * 	<li>
-	 * 		A unique parameter is defined by a combination of a <code>name</code> and <code>location</code>.
+	 * 		A unique parameter is defined by a combination of a <c>name</c> and <c>location</c>.
 	 * 	<li>
 	 * 		The list can use the {@doc SwaggerReferenceObject}
 	 * 		to link to parameters that are defined at the {@doc SwaggerParameterObject Swagger Object's parameters}.
@@ -667,7 +667,7 @@
 	 * Returns the parameter with the specified type and name.
 	 *
 	 * @param in The parameter in.
-	 * @param name The parameter name.  Can be <jk>null</jk> for parameter type <code>body</code>.
+	 * @param name The parameter name.  Can be <jk>null</jk> for parameter type <c>body</c>.
 	 * @return The matching parameter info, or <jk>null</jk> if not found.
 	 */
 	public ParameterInfo getParameter(String in, String name) {
@@ -693,7 +693,7 @@
 	 * 	<li>
 	 * 		The list MUST NOT include duplicated parameters.
 	 * 	<li>
-	 * 		A unique parameter is defined by a combination of a <code>name</code> and <code>location</code>.
+	 * 		A unique parameter is defined by a combination of a <c>name</c> and <c>location</c>.
 	 * 	<li>
 	 * 		The list can use the {@doc SwaggerReferenceObject}
 	 * 		to link to parameters that are defined at the {@doc SwaggerParameterObject Swagger Object's parameters}.
@@ -725,7 +725,7 @@
 	 * 	<li>
 	 * 		The list MUST NOT include duplicated parameters.
 	 * 	<li>
-	 * 		A unique parameter is defined by a combination of a <code>name</code> and <code>location</code>.
+	 * 		A unique parameter is defined by a combination of a <c>name</c> and <c>location</c>.
 	 * 	<li>
 	 * 		The list can use the {@doc SwaggerReferenceObject}
 	 * 		to link to parameters that are defined at the {@doc SwaggerParameterObject Swagger Object's parameters}.
@@ -751,13 +751,13 @@
 	 * 	<br>Valid types:
 	 * 	<ul>
 	 * 		<li>{@link ParameterInfo}
-	 * 		<li><code>Collection&lt;{@link ParameterInfo}|String&gt;</code>
-	 * 		<li><code>String</code> - JSON array representation of <code>Collection&lt;{@link ParameterInfo}&gt;</code>
+	 * 		<li><c>Collection&lt;{@link ParameterInfo}|String&gt;</c>
+	 * 		<li><c>String</c> - JSON array representation of <c>Collection&lt;{@link ParameterInfo}&gt;</c>
 	 * 			<h5 class='figure'>Example:</h5>
 	 * 			<p class='bcode w800'>
 	 * 	parameters(<js>"[{path:'path',id:'id'}]"</js>);
 	 * 			</p>
-	 * 		<li><code>String</code> - JSON object representation of {@link ParameterInfo}
+	 * 		<li><c>String</c> - JSON object representation of {@link ParameterInfo}
 	 * 			<h5 class='figure'>Example:</h5>
 	 * 			<p class='bcode w800'>
 	 * 	parameters(<js>"{path:'path',id:'id'}"</js>);
@@ -846,8 +846,8 @@
 	 * 	The new value for this property.
 	 * 	<br>Valid types:
 	 * 	<ul>
-	 * 		<li><code>Map&lt;Integer,{@link ResponseInfo}|String&gt;</code>
-	 * 		<li><code>String</code> - JSON object representation of <code>Map&lt;Integer,{@link ResponseInfo}&gt;</code>
+	 * 		<li><c>Map&lt;Integer,{@link ResponseInfo}|String&gt;</c>
+	 * 		<li><c>String</c> - JSON object representation of <c>Map&lt;Integer,{@link ResponseInfo}&gt;</c>
 	 * 			<h5 class='figure'>Example:</h5>
 	 * 			<p class='bcode w800'>
 	 * 	responses(<js>"{'404':{description:'description',...}}"</js>);
@@ -865,7 +865,7 @@
 	 *
 	 * <p>
 	 * The transfer protocol for the operation.
-	 * <br>The value overrides the Swagger Object <code>schemes</code> definition.
+	 * <br>The value overrides the Swagger Object <c>schemes</c> definition.
 	 *
 	 * @return The property value, or <jk>null</jk> if it is not set.
 	 */
@@ -878,7 +878,7 @@
 	 *
 	 * <p>
 	 * The transfer protocol for the operation.
-	 * <br>The value overrides the Swagger Object <code>schemes</code> definition.
+	 * <br>The value overrides the Swagger Object <c>schemes</c> definition.
 	 *
 	 * @param value
 	 * 	The new value for this property.
@@ -902,7 +902,7 @@
 	 *
 	 * <p>
 	 * The transfer protocol for the operation.
-	 * <br>The value overrides the Swagger Object <code>schemes</code> definition.
+	 * <br>The value overrides the Swagger Object <c>schemes</c> definition.
 	 *
 	 * @param value
 	 * 	The values to add to this property.
@@ -921,13 +921,13 @@
 	 * 	The new value for this property.
 	 * 	<br>Valid types:
 	 * 	<ul>
-	 * 		<li><code>Collection&lt;String&gt;</code>
-	 * 		<li><code>String</code> - JSON array representation of <code>Collection&lt;String&gt;</code>
+	 * 		<li><c>Collection&lt;String&gt;</c>
+	 * 		<li><c>String</c> - JSON array representation of <c>Collection&lt;String&gt;</c>
 	 * 			<h5 class='figure'>Example:</h5>
 	 * 			<p class='bcode w800'>
 	 * 	schemes(<js>"['scheme1','scheme2']"</js>);
 	 * 			</p>
-	 * 		<li><code>String</code> - Individual values
+	 * 		<li><c>String</c> - Individual values
 	 * 			<h5 class='figure'>Example:</h5>
 	 * 			<p class='bcode w800'>
 	 * 	schemes(<js>"scheme1</js>, <js>"scheme2"</js>);
@@ -1002,7 +1002,7 @@
 	 *
 	 * <p>
 	 * This definition overrides any declared top-level security.
-	 * <br>To remove a top-level <code>security</code> declaration, an empty array can be used.
+	 * <br>To remove a top-level <c>security</c> declaration, an empty array can be used.
 	 *
 	 * @return The property value, or <jk>null</jk> if it is not set.
 	 */
@@ -1020,7 +1020,7 @@
 	 *
 	 * <p>
 	 * This definition overrides any declared top-level security.
-	 * <br>To remove a top-level <code>security</code> declaration, an empty array can be used.
+	 * <br>To remove a top-level <c>security</c> declaration, an empty array can be used.
 	 *
 	 * @param value
 	 * 	The new value for this property.
@@ -1042,7 +1042,7 @@
 	 *
 	 * <p>
 	 * This definition overrides any declared top-level security.
-	 * <br>To remove a top-level <code>security</code> declaration, an empty array can be used.
+	 * <br>To remove a top-level <c>security</c> declaration, an empty array can be used.
 	 *
 	 * @param values
 	 * 	The values to add to this property.
@@ -1078,8 +1078,8 @@
 	 * 	The new value for this property.
 	 * 	<br>Valid types:
 	 * 	<ul>
-	 * 		<li><code>Map&lt;String,List&lt;String&gt;&gt;</code>
-	 * 		<li><code>String</code> - JSON object representation of a <code>Map&lt;String,List&lt;String&gt;&gt;</code>
+	 * 		<li><c>Map&lt;String,List&lt;String&gt;&gt;</c>
+	 * 		<li><c>String</c> - JSON object representation of a <c>Map&lt;String,List&lt;String&gt;&gt;</c>
 	 * 		<h5 class='figure'>Example:</h5>
 	 * 		<p class='bcode w800'>
 	 * 	securities(<js>"{key:['val1','val2']}"</js>);
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/OperationMap.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/OperationMap.java
index e4b7901..b240b4b 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/OperationMap.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/OperationMap.java
@@ -25,13 +25,13 @@
  * <p>
  * Forces entries to be sorted in the following order:
  * <ul>
- * 	<li><code>GET</code>
- * 	<li><code>PUT</code>
- * 	<li><code>POST</code>
- * 	<li><code>DELETE</code>
- * 	<li><code>OPTIONS</code>
- * 	<li><code>HEAD</code>
- * 	<li><code>PATCH</code>
+ * 	<li><c>GET</c>
+ * 	<li><c>PUT</c>
+ * 	<li><c>POST</c>
+ * 	<li><c>DELETE</c>
+ * 	<li><c>OPTIONS</c>
+ * 	<li><c>HEAD</c>
+ * 	<li><c>PATCH</c>
  * 	<li>Everything else.
  * </ul>
  */
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/ParameterInfo.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/ParameterInfo.java
index 55c7ed1..23e99d6 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/ParameterInfo.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/ParameterInfo.java
@@ -36,9 +36,9 @@
  * 	<li><js>"path"</js> - Used together with Path Templating, where the parameter value is actually part of the
  * 		operation's URL.
  * 		This does not include the host or base path of the API.
- * 		For example, in <code>/items/{itemId}</code>, the path parameter is <code>itemId</code>.
+ * 		For example, in <c>/items/{itemId}</c>, the path parameter is <c>itemId</c>.
  * 	<li><js>"query"</js> - Parameters that are appended to the URL.
- * 		For example, in <code>/items?id=###</code>, the query parameter is <code>id</code>.
+ * 		For example, in <c>/items?id=###</c>, the query parameter is <c>id</c>.
  * 	<li><js>"header"</js> - Custom headers that are expected as part of the request.
  * 	<li><js>"body"</js> - The payload that's appended to the HTTP request.
  * 		Since there can only be one payload, there can only be one body parameter.
@@ -47,22 +47,22 @@
  * 		Since Form parameters are also in the payload, body and form parameters cannot exist together for the same
  * 		operation.
  * 	<li><js>"formData"</js> - Used to describe the payload of an HTTP request when either
- * 		<code>application/x-www-form-urlencoded</code>, <code>multipart/form-data</code> or both are used as the
+ * 		<c>application/x-www-form-urlencoded</c>, <c>multipart/form-data</c> or both are used as the
  * 		content type of the request (in Swagger's definition, the consumes property of an operation).
  * 		This is the only parameter type that can be used to send files, thus supporting the file type.
  * 		Since form parameters are sent in the payload, they cannot be declared together with a body parameter for the
  * 		same operation.
  * 		Form parameters have a different format based on the content-type used (for further details, consult
- * 		<code>http://www.w3.org/TR/html401/interact/forms.html#h-17.13.4</code>):
+ * 		<c>http://www.w3.org/TR/html401/interact/forms.html#h-17.13.4</c>):
  * 		<ul>
  * 			<li><js>"application/x-www-form-urlencoded"</js> - Similar to the format of Query parameters but as a
  * 				payload.
- * 				For example, <code>foo=1&amp;bar=swagger</code> - both <code>foo</code> and <code>bar</code> are form
+ * 				For example, <c>foo=1&amp;bar=swagger</c> - both <c>foo</c> and <c>bar</c> are form
  * 				parameters.
  * 				This is normally used for simple parameters that are being transferred.
  * 			<li><js>"multipart/form-data"</js> - each parameter takes a section in the payload with an internal header.
- * 				For example, for the header <code>Content-Disposition: form-data; name="submit-name"</code> the name of
- * 				the parameter is <code>submit-name</code>.
+ * 				For example, for the header <c>Content-Disposition: form-data; name="submit-name"</c> the name of
+ * 				the parameter is <c>submit-name</c>.
  * 				This type of form parameters is more commonly used for file transfers.
  * 		</ul>
  * 	</li>
@@ -263,10 +263,10 @@
 	 * 	<li>
 	 * 		Parameter names are case sensitive.
 	 * 	<li>
-	 * 		If <code>in</code> is <js>"path"</js>, the <code>name</code> field MUST correspond to the associated path segment
-	 * 		from the <code>path</code> field in the {@doc SwaggerPathsObject Paths Object}.
+	 * 		If <c>in</c> is <js>"path"</js>, the <c>name</c> field MUST correspond to the associated path segment
+	 * 		from the <c>path</c> field in the {@doc SwaggerPathsObject Paths Object}.
 	 * 	<li>
-	 * 		For all other cases, the name corresponds to the parameter name used based on the <code>in</code> property.
+	 * 		For all other cases, the name corresponds to the parameter name used based on the <c>in</c> property.
 	 * </ul>
 	 *
 	 * <h5 class='section'>See Also:</h5>
@@ -291,10 +291,10 @@
 	 * 	<li>
 	 * 		Parameter names are case sensitive.
 	 * 	<li>
-	 * 		If <code>in</code> is <js>"path"</js>, the <code>name</code> field MUST correspond to the associated path segment
-	 * 		from the <code>path</code> field in the {@doc SwaggerPathsObject Paths Object}.
+	 * 		If <c>in</c> is <js>"path"</js>, the <c>name</c> field MUST correspond to the associated path segment
+	 * 		from the <c>path</c> field in the {@doc SwaggerPathsObject Paths Object}.
 	 * 	<li>
-	 * 		For all other cases, the name corresponds to the parameter name used based on the <code>in</code> property.
+	 * 		For all other cases, the name corresponds to the parameter name used based on the <c>in</c> property.
 	 * </ul>
 	 *
 	 * <h5 class='section'>See Also:</h5>
@@ -318,7 +318,7 @@
 	 *
 	 * @param value
 	 * 	The new value for this property.
-	 * 	<br>Non-String values will be converted to String using <code>toString()</code>.
+	 * 	<br>Non-String values will be converted to String using <c>toString()</c>.
 	 * 	<br>Can be <jk>null</jk> to unset the property.
 	 * @return This object (for method chaining).
 	 */
@@ -374,7 +374,7 @@
 	 *
 	 * @param value
 	 * 	The new value for this property.
-	 * 	<br>Non-String values will be converted to String using <code>toString()</code>.
+	 * 	<br>Non-String values will be converted to String using <c>toString()</c>.
 	 * 	<br>Valid values:
 	 * 	<ul>
 	 * 		<li><js>"query"</js>
@@ -427,7 +427,7 @@
 	 * @param value
 	 * 	The new value for this property.
 	 * 	<br>{@doc GFM} can be used for rich text representation.
-	 * 	<br>Non-String values will be converted to String using <code>toString()</code>.
+	 * 	<br>Non-String values will be converted to String using <c>toString()</c>.
 	 * 	<br>Can be <jk>null</jk> to unset the property.
 	 * @return This object (for method chaining).
 	 */
@@ -457,7 +457,7 @@
 	 *
 	 * @param value
 	 * 	The new value for this property.
-	 * 	<br>If the parameter is <code>in</code> <js>"path"</js>, this property is required and its value MUST be <jk>true</jk>.
+	 * 	<br>If the parameter is <c>in</c> <js>"path"</js>, this property is required and its value MUST be <jk>true</jk>.
 	 * 	<br>Otherwise, the property MAY be included and its default value is <jk>false</jk>.
 	 * 	<br>Can be <jk>null</jk> to unset the property.
 	 * @return This object (for method chaining).
@@ -473,7 +473,7 @@
 	 * @param value
 	 * 	The new value for this property.
 	 * 	<br>Non-boolean values will be converted to boolean using <code>Boolean.<jsm>valueOf</jsm>(value.toString())</code>.
-	 * 	<br>If the parameter is <code>in</code> <js>"path"</js>, this property is required and its value MUST be <jk>true</jk>.
+	 * 	<br>If the parameter is <c>in</c> <js>"path"</js>, this property is required and its value MUST be <jk>true</jk>.
 	 * 	<br>Otherwise, the property MAY be included and its default value is <jk>false</jk>.
 	 * 	<br>Can be <jk>null</jk> to unset the property.
 	 * @return This object (for method chaining).
@@ -518,7 +518,7 @@
 	 * 	<br>Valid types:
 	 * 	<ul>
 	 * 		<li>{@link SchemaInfo}
-	 * 		<li><code>String</code> - JSON object representation of {@link SchemaInfo}
+	 * 		<li><c>String</c> - JSON object representation of {@link SchemaInfo}
 	 * 			<h5 class='figure'>Example:</h5>
 	 * 			<p class='bcode w800'>
 	 * 	schema(<js>"{type:'type',description:'description',...}"</js>);
@@ -565,8 +565,8 @@
 	 * 		<li><js>"array"</js>
 	 * 		<li><js>"file"</js>
 	 * 	</ul>
-	 * 	<br>If type is <js>"file"</js>, the <code>consumes</code> MUST be either <js>"multipart/form-data"</js>, <js>"application/x-www-form-urlencoded"</js>
-	 * 		or both and the parameter MUST be <code>in</code> <js>"formData"</js>.
+	 * 	<br>If type is <js>"file"</js>, the <c>consumes</c> MUST be either <js>"multipart/form-data"</js>, <js>"application/x-www-form-urlencoded"</js>
+	 * 		or both and the parameter MUST be <c>in</c> <js>"formData"</js>.
 	 * 	<br>Property value is required.
 	 * @return This object (for method chaining).
 	 */
@@ -585,7 +585,7 @@
 	 *
 	 * @param value
 	 * 	The new value for this property.
-	 * 	<br>Non-String values will be converted to String using <code>toString()</code>.
+	 * 	<br>Non-String values will be converted to String using <c>toString()</c>.
 	 * 	<br>Valid values:
 	 * 	<ul>
 	 * 		<li><js>"string"</js>
@@ -595,8 +595,8 @@
 	 * 		<li><js>"array"</js>
 	 * 		<li><js>"file"</js>
 	 * 	</ul>
-	 * 	<br>If type is <js>"file"</js>, the <code>consumes</code> MUST be either <js>"multipart/form-data"</js>, <js>"application/x-www-form-urlencoded"</js>
-	 * 		or both and the parameter MUST be <code>in</code> <js>"formData"</js>.
+	 * 	<br>If type is <js>"file"</js>, the <c>consumes</c> MUST be either <js>"multipart/form-data"</js>, <js>"application/x-www-form-urlencoded"</js>
+	 * 		or both and the parameter MUST be <c>in</c> <js>"formData"</js>.
 	 * 	<br>Property value is required.
 	 * @return This object (for method chaining).
 	 */
@@ -645,7 +645,7 @@
 	 *
 	 * @param value
 	 * 	The new value for this property.
-	 * 	<br>Non-String values will be converted to String using <code>toString()</code>.
+	 * 	<br>Non-String values will be converted to String using <c>toString()</c>.
 	 * 	<br>Can be <jk>null</jk> to unset the property.
 	 * @return This object (for method chaining).
 	 */
@@ -660,7 +660,7 @@
 	 * Sets the ability to pass empty-valued parameters.
 	 *
 	 * <p>
-	 * This is valid only for either <code>query</code> or <code>formData</code> parameters and allows you to send a
+	 * This is valid only for either <c>query</c> or <c>formData</c> parameters and allows you to send a
 	 * parameter with a name only or an empty value.
 	 *
 	 * @return The property value, or <jk>null</jk> if it is not set.
@@ -676,7 +676,7 @@
 	 * Sets the ability to pass empty-valued parameters.
 	 *
 	 * <p>
-	 * This is valid only for either <code>query</code> or <code>formData</code> parameters and allows you to send a
+	 * This is valid only for either <c>query</c> or <c>formData</c> parameters and allows you to send a
 	 * parameter with a name only or an empty value.
 	 *
 	 * @param value
@@ -724,7 +724,7 @@
 	 *
 	 * @param value
 	 * 	The new value for this property.
-	 * 	<br>Property value is required if <code>type</code> is <js>"array"</js>.
+	 * 	<br>Property value is required if <c>type</c> is <js>"array"</js>.
 	 * 	<br>Can be <jk>null</jk> to unset the property.
 	 * @return This object (for method chaining).
 	 */
@@ -738,11 +738,11 @@
 	 *
 	 * @param value
 	 * 	The new value for this property.
-	 * 	<br>Property value is required if <code>type</code> is <js>"array"</js>.
+	 * 	<br>Property value is required if <c>type</c> is <js>"array"</js>.
 	 * 	<br>Valid types:
 	 * 	<ul>
 	 * 		<li>{@link Items}
-	 * 		<li><code>String</code> - JSON object representation of {@link Items}
+	 * 		<li><c>String</c> - JSON object representation of {@link Items}
 	 * 			<h5 class='figure'>Example:</h5>
 	 * 			<p class='bcode w800'>
 	 * 	items(<js>"{type:'type',format:'format',...}"</js>);
@@ -777,13 +777,13 @@
 	 * 	The new value for this property.
 	 * 	<br>Valid values:
 	 * 	<ul>
-	 * 		<li><js>"csv"</js> (default) - comma separated values <code>foo,bar</code>.
-	 * 		<li><js>"ssv"</js> - space separated values <code>foo bar</code>.
-	 * 		<li><js>"tsv"</js> - tab separated values <code>foo\tbar</code>.
-	 * 		<li><js>"pipes"</js> - pipe separated values <code>foo|bar</code>.
+	 * 		<li><js>"csv"</js> (default) - comma separated values <c>foo,bar</c>.
+	 * 		<li><js>"ssv"</js> - space separated values <c>foo bar</c>.
+	 * 		<li><js>"tsv"</js> - tab separated values <c>foo\tbar</c>.
+	 * 		<li><js>"pipes"</js> - pipe separated values <c>foo|bar</c>.
 	 * 		<li><js>"multi"</js> - corresponds to multiple parameter instances instead of multiple values for a single
-	 * 			instance <code>foo=bar&amp;foo=baz</code>.
-	 * 			<br>This is valid only for parameters <code>in</code> <js>"query"</js> or <js>"formData"</js>.
+	 * 			instance <c>foo=bar&amp;foo=baz</c>.
+	 * 			<br>This is valid only for parameters <c>in</c> <js>"query"</js> or <js>"formData"</js>.
 	 * 	</ul>
 	 * 	<br>Can be <jk>null</jk> to unset the property.
 	 * @return This object (for method chaining).
@@ -803,16 +803,16 @@
 	 *
 	 * @param value
 	 * 	The new value for this property.
-	 * 	<br>Non-String values will be converted to String using <code>toString()</code>.
+	 * 	<br>Non-String values will be converted to String using <c>toString()</c>.
 	 * 	<br>Valid values:
 	 * 	<ul>
-	 * 		<li><js>"csv"</js> (default) - comma separated values <code>foo,bar</code>.
-	 * 		<li><js>"ssv"</js> - space separated values <code>foo bar</code>.
-	 * 		<li><js>"tsv"</js> - tab separated values <code>foo\tbar</code>.
-	 * 		<li><js>"pipes"</js> - pipe separated values <code>foo|bar</code>.
+	 * 		<li><js>"csv"</js> (default) - comma separated values <c>foo,bar</c>.
+	 * 		<li><js>"ssv"</js> - space separated values <c>foo bar</c>.
+	 * 		<li><js>"tsv"</js> - tab separated values <c>foo\tbar</c>.
+	 * 		<li><js>"pipes"</js> - pipe separated values <c>foo|bar</c>.
 	 * 		<li><js>"multi"</js> - corresponds to multiple parameter instances instead of multiple values for a single
-	 * 			instance <code>foo=bar&amp;foo=baz</code>.
-	 * 			<br>This is valid only for parameters <code>in</code> <js>"query"</js> or <js>"formData"</js>.
+	 * 			instance <c>foo=bar&amp;foo=baz</c>.
+	 * 			<br>This is valid only for parameters <c>in</c> <js>"query"</js> or <js>"formData"</js>.
 	 * 	</ul>
 	 * 	<br>Can be <jk>null</jk> to unset the property.
 	 * @return This object (for method chaining).
@@ -829,7 +829,7 @@
 	 * to control the number of results per page might default to 100 if not supplied by the client in the request.
 	 *
 	 * (Note: <js>"default"</js> has no meaning for required parameters.)
-	 * Unlike JSON Schema this value MUST conform to the defined <code>type</code> for this parameter.
+	 * Unlike JSON Schema this value MUST conform to the defined <c>type</c> for this parameter.
 	 *
 	 * <h5 class='section'>See Also:</h5>
 	 * <ul>
@@ -849,7 +849,7 @@
 	 * Declares the value of the parameter that the server will use if none is provided, for example a <js>"count"</js>
 	 * to control the number of results per page might default to 100 if not supplied by the client in the request.
 	 * (Note: <js>"default"</js> has no meaning for required parameters.)
-	 * Unlike JSON Schema this value MUST conform to the defined <code>type</code> for this parameter.
+	 * Unlike JSON Schema this value MUST conform to the defined <c>type</c> for this parameter.
 	 *
 	 * <h5 class='section'>See Also:</h5>
 	 * <ul>
@@ -909,7 +909,7 @@
 	 *
 	 * @param value
 	 * 	The new value for this property.
-	 * 	<br>Non-Number values will be converted to Number using <code>toString()</code> then best number match.
+	 * 	<br>Non-Number values will be converted to Number using <c>toString()</c> then best number match.
 	 * 	<br>Can be <jk>null</jk> to unset the property.
 	 * @return This object (for method chaining).
 	 */
@@ -995,7 +995,7 @@
 	 *
 	 * @param value
 	 * 	The new value for this property.
-	 * 	<br>Non-Number values will be converted to Number using <code>toString()</code> then best number match.
+	 * 	<br>Non-Number values will be converted to Number using <c>toString()</c> then best number match.
 	 * 	<br>Can be <jk>null</jk> to unset the property.
 	 * @return This object (for method chaining).
 	 */
@@ -1170,7 +1170,7 @@
 	 *
 	 * @param value
 	 * 	The new value for this property.
-	 * 	<br>Non-String values will be converted to String using <code>toString()</code>.
+	 * 	<br>Non-String values will be converted to String using <c>toString()</c>.
 	 * 	<br>Can be <jk>null</jk> to unset the property.
 	 * @return This object (for method chaining).
 	 */
@@ -1359,14 +1359,14 @@
 	 * 	The values to add to this property.
 	 * 	<br>Valid types:
 	 * 	<ul>
-	 * 		<li><code>Object</code>
-	 * 		<li><code>Collection&lt;Object&gt;</code>
-	 * 		<li><code>String</code> - JSON array representation of <code>Collection&lt;Object&gt;</code>
+	 * 		<li><c>Object</c>
+	 * 		<li><c>Collection&lt;Object&gt;</c>
+	 * 		<li><c>String</c> - JSON array representation of <c>Collection&lt;Object&gt;</c>
 	 * 			<h5 class='figure'>Example:</h5>
 	 * 			<p class='bcode w800'>
 	 * 	_enum(<js>"['foo','bar']"</js>);
 	 * 			</p>
-	 * 		<li><code>String</code> - Individual values
+	 * 		<li><c>String</c> - Individual values
 	 * 			<h5 class='figure'>Example:</h5>
 	 * 			<p class='bcode w800'>
 	 * 	_enum(<js>"foo"</js>, <js>"bar"</js>);
@@ -1417,7 +1417,7 @@
 	 *
 	 * @param value
 	 * 	The new value for this property.
-	 * 	<br>Non-Number values will be converted to Number using <code>toString()</code> then best number match.
+	 * 	<br>Non-Number values will be converted to Number using <c>toString()</c> then best number match.
 	 * 	<br>Can be <jk>null</jk> to unset the property.
 	 * @return This object (for method chaining).
 	 */
@@ -1516,8 +1516,8 @@
 	 * 	The values to add to this property.
 	 * 	<br>Valid types:
 	 * 	<ul>
-	 * 		<li><code>Map&lt;String,String&gt;</code>
-	 * 		<li><code>String</code> - JSON object representation of <code>Map&lt;String,Object&gt;</code>
+	 * 		<li><c>Map&lt;String,String&gt;</c>
+	 * 		<li><c>String</c> - JSON object representation of <c>Map&lt;String,Object&gt;</c>
 	 * 			<h5 class='figure'>Example:</h5>
 	 * 			<p class='bcode w800'>
 	 * 	examples(<js>"{'text/json':'{foo:\\'bar\\'}'}"</js>);
@@ -1639,7 +1639,7 @@
 	 * @param refStack Keeps track of previously-visited references so that we don't cause recursive loops.
 	 * @param maxDepth
 	 * 	The maximum depth to resolve references.
-	 * 	<br>After that level is reached, <code>$ref</code> references will be left alone.
+	 * 	<br>After that level is reached, <c>$ref</c> references will be left alone.
 	 * 	<br>Useful if you have very complex models and you don't want your swagger page to be overly-complex.
 	 * @return
 	 * 	This object with references resolved.
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/ResponseInfo.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/ResponseInfo.java
index 84891e1..ff7b445 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/ResponseInfo.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/ResponseInfo.java
@@ -170,7 +170,7 @@
 	 *
 	 * @param value
 	 * 	The new value for this property.
-	 * 	<br>Non-String values will be converted to String using <code>toString()</code>.
+	 * 	<br>Non-String values will be converted to String using <c>toString()</c>.
 	 * 	<br>Can be <jk>null</jk> to unset the property.
 	 * @return This object (for method chaining).
 	 */
@@ -237,7 +237,7 @@
 	 * 	<br>Valid types:
 	 * 	<ul>
 	 * 		<li>{@link SchemaInfo}
-	 * 		<li><code>String</code> - JSON object representation of {@link SchemaInfo}
+	 * 		<li><c>String</c> - JSON object representation of {@link SchemaInfo}
 	 * 			<h5 class='figure'>Example:</h5>
 	 * 			<p class='bcode w800'>
 	 * 	schema(<js>"{type:'type',description:'description',...}"</js>);
@@ -310,8 +310,8 @@
 	 * 	The values to add to this property.
 	 * 	<br>Valid types:
 	 * 	<ul>
-	 * 		<li><code>Map&lt;String,{@link HeaderInfo}|String&gt;</code>
-	 * 		<li><code>String</code> - JSON object representation of <code>Map&lt;String,{@link HeaderInfo}&gt;</code>
+	 * 		<li><c>Map&lt;String,{@link HeaderInfo}|String&gt;</c>
+	 * 		<li><c>String</c> - JSON object representation of <c>Map&lt;String,{@link HeaderInfo}&gt;</c>
 	 * 			<h5 class='figure'>Example:</h5>
 	 * 			<p class='bcode w800'>
 	 * 	headers(<js>"{headerName:{description:'description',...}}"</js>);
@@ -431,8 +431,8 @@
 	 * 	The values to add to this property.
 	 * 	<br>Valid types:
 	 * 	<ul>
-	 * 		<li><code>Map&lt;String,Object&gt;</code>
-	 * 		<li><code>String</code> - JSON object representation of <code>Map&lt;String,Object&gt;</code>
+	 * 		<li><c>Map&lt;String,Object&gt;</c>
+	 * 		<li><c>String</c> - JSON object representation of <c>Map&lt;String,Object&gt;</c>
 	 * 			<h5 class='figure'>Example:</h5>
 	 * 			<p class='bcode w800'>
 	 * 	examples(<js>"{'text/json':{foo:'bar'}}"</js>);
@@ -503,7 +503,7 @@
 	 * @param refStack Keeps track of previously-visited references so that we don't cause recursive loops.
 	 * @param maxDepth
 	 * 	The maximum depth to resolve references.
-	 * 	<br>After that level is reached, <code>$ref</code> references will be left alone.
+	 * 	<br>After that level is reached, <c>$ref</c> references will be left alone.
 	 * 	<br>Useful if you have very complex models and you don't want your swagger page to be overly-complex.
 	 * @return
 	 * 	This object with references resolved.
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/SchemaInfo.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/SchemaInfo.java
index 00160e5..9168812 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/SchemaInfo.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/SchemaInfo.java
@@ -212,7 +212,7 @@
 	 *
 	 * @param value
 	 * 	The new value for this property.
-	 * 	<br>Non-String values will be converted to String using <code>toString()</code>.
+	 * 	<br>Non-String values will be converted to String using <c>toString()</c>.
 	 * 	<br>Can be <jk>null</jk> to unset the property.
 	 * @return This object (for method chaining).
 	 */
@@ -247,7 +247,7 @@
 	 *
 	 * @param value
 	 * 	The new value for this property.
-	 * 	<br>Non-String values will be converted to String using <code>toString()</code>.
+	 * 	<br>Non-String values will be converted to String using <c>toString()</c>.
 	 * 	<br>Can be <jk>null</jk> to unset the property.
 	 * @return This object (for method chaining).
 	 */
@@ -283,7 +283,7 @@
 	 *
 	 * @param value
 	 * 	The new value for this property.
-	 * 	<br>Non-String values will be converted to String using <code>toString()</code>.
+	 * 	<br>Non-String values will be converted to String using <c>toString()</c>.
 	 * 	<br>Can be <jk>null</jk> to unset the property.
 	 * @return This object (for method chaining).
 	 */
@@ -356,7 +356,7 @@
 	 *
 	 * @param value
 	 * 	The new value for this property.
-	 * 	<br>Non-Number values will be converted to Number using <code>toString()</code> then best number match.
+	 * 	<br>Non-Number values will be converted to Number using <c>toString()</c> then best number match.
 	 * 	<br>Can be <jk>null</jk> to unset the property.
 	 * @return This object (for method chaining).
 	 */
@@ -391,7 +391,7 @@
 	 *
 	 * @param value
 	 * 	The new value for this property.
-	 * 	<br>Non-Number values will be converted to Number using <code>toString()</code> then best number match.
+	 * 	<br>Non-Number values will be converted to Number using <c>toString()</c> then best number match.
 	 * 	<br>Can be <jk>null</jk> to unset the property.
 	 * @return This object (for method chaining).
 	 */
@@ -461,7 +461,7 @@
 	 *
 	 * @param value
 	 * 	The new value for this property.
-	 * 	<br>Non-Number values will be converted to Number using <code>toString()</code> then best number match.
+	 * 	<br>Non-Number values will be converted to Number using <c>toString()</c> then best number match.
 	 * 	<br>Can be <jk>null</jk> to unset the property.
 	 * @return This object (for method chaining).
 	 */
@@ -604,7 +604,7 @@
 	 *
 	 * @param value
 	 * 	The new value for this property.
-	 * 	<br>Non-String values will be converted to String using <code>toString()</code>.
+	 * 	<br>Non-String values will be converted to String using <c>toString()</c>.
 	 * 	<br>Can be <jk>null</jk> to unset the property.
 	 * @return This object (for method chaining).
 	 */
@@ -844,13 +844,13 @@
 	 * 	The new value for this property.
 	 * 	<br>Valid types:
 	 * 	<ul>
-	 * 		<li><code>Collection&lt;String&gt;</code>
-	 * 		<li><code>String</code> - JSON array representation of <code>Collection&lt;String&gt;</code>
+	 * 		<li><c>Collection&lt;String&gt;</c>
+	 * 		<li><c>String</c> - JSON array representation of <c>Collection&lt;String&gt;</c>
 	 * 			<h5 class='figure'>Example:</h5>
 	 * 			<p class='bcode w800'>
 	 * 	schemes(<js>"['scheme1','scheme2']"</js>);
 	 * 			</p>
-	 * 		<li><code>String</code> - Individual values
+	 * 		<li><c>String</c> - Individual values
 	 * 			<h5 class='figure'>Example:</h5>
 	 * 			<p class='bcode w800'>
 	 * 	schemes(<js>"scheme1</js>, <js>"scheme2"</js>);
@@ -910,14 +910,14 @@
 	 * 	The values to add to this property.
 	 * 	<br>Valid types:
 	 * 	<ul>
-	 * 		<li><code>Object</code>
-	 * 		<li><code>Collection&lt;Object&gt;</code>
-	 * 		<li><code>String</code> - JSON array representation of <code>Collection&lt;Object&gt;</code>
+	 * 		<li><c>Object</c>
+	 * 		<li><c>Collection&lt;Object&gt;</c>
+	 * 		<li><c>String</c> - JSON array representation of <c>Collection&lt;Object&gt;</c>
 	 * 			<h5 class='figure'>Example:</h5>
 	 * 			<p class='bcode w800'>
 	 * 	_enum(<js>"['foo','bar']"</js>);
 	 * 			</p>
-	 * 		<li><code>String</code> - Individual values
+	 * 		<li><c>String</c> - Individual values
 	 * 			<h5 class='figure'>Example:</h5>
 	 * 			<p class='bcode w800'>
 	 * 	_enum(<js>"foo"</js>, <js>"bar"</js>);
@@ -973,7 +973,7 @@
 	 *
 	 * @param value
 	 * 	The new value for this property.
-	 * 	<br>Non-String values will be converted to String using <code>toString()</code>.
+	 * 	<br>Non-String values will be converted to String using <c>toString()</c>.
 	 * 	<br>Can be <jk>null</jk> to unset the property.
 	 * @return This object (for method chaining).
 	 */
@@ -1011,7 +1011,7 @@
 	 * 	<br>Valid types:
 	 * 	<ul>
 	 * 		<li>{@link Items}
-	 * 		<li><code>String</code> - JSON object representation of {@link Items}
+	 * 		<li><c>String</c> - JSON object representation of {@link Items}
 	 * 			<h5 class='figure'>Example:</h5>
 	 * 			<p class='bcode w800'>
 	 * 	items(<js>"{type:'type',format:'format',...}"</js>);
@@ -1066,14 +1066,14 @@
 	 * 	The values to add to this property.
 	 * 	<br>Valid types:
 	 * 	<ul>
-	 * 		<li><code>Object</code>
-	 * 		<li><code>Collection&lt;Object&gt;</code>
-	 * 		<li><code>String</code> - JSON array representation of <code>Collection&lt;Object&gt;</code>
+	 * 		<li><c>Object</c>
+	 * 		<li><c>Collection&lt;Object&gt;</c>
+	 * 		<li><c>String</c> - JSON array representation of <c>Collection&lt;Object&gt;</c>
 	 * 			<h5 class='figure'>Example:</h5>
 	 * 			<p class='bcode w800'>
 	 * 	allOf(<js>"['foo','bar']"</js>);
 	 * 			</p>
-	 * 		<li><code>String</code> - Individual values
+	 * 		<li><c>String</c> - Individual values
 	 * 			<h5 class='figure'>Example:</h5>
 	 * 			<p class='bcode w800'>
 	 * 	allOf(<js>"foo"</js>, <js>"bar"</js>);
@@ -1129,8 +1129,8 @@
 	 * 	The values to add to this property.
 	 * 	<br>Valid types:
 	 * 	<ul>
-	 * 		<li><code>Map&lt;String,Map&lt;String,Object&gt;&gt;</code>
-	 * 		<li><code>String</code> - JSON object representation of <code>Map&lt;String,Map&lt;String,Object&gt;&gt;</code>
+	 * 		<li><c>Map&lt;String,Map&lt;String,Object&gt;&gt;</c>
+	 * 		<li><c>String</c> - JSON object representation of <c>Map&lt;String,Map&lt;String,Object&gt;&gt;</c>
 	 * 			<h5 class='figure'>Example:</h5>
 	 * 			<p class='bcode w800'>
 	 * 	properties(<js>"{name:{foo:'bar'}}"</js>);
@@ -1206,7 +1206,7 @@
 	 *
 	 * @param value
 	 * 	The new value for this property.
-	 * 	<br>Non-String values will be converted to String using <code>toString()</code>.
+	 * 	<br>Non-String values will be converted to String using <c>toString()</c>.
 	 * 	<br>Can be <jk>null</jk> to unset the property.
 	 * @return This object (for method chaining).
 	 */
@@ -1279,7 +1279,7 @@
 	 * 	<br>Valid types:
 	 * 	<ul>
 	 * 		<li>{@link Xml}
-	 * 		<li><code>String</code> - JSON object representation of {@link Xml}
+	 * 		<li><c>String</c> - JSON object representation of {@link Xml}
 	 * 			<h5 class='figure'>Example:</h5>
 	 * 			<p class='bcode w800'>
 	 * 	xml(<js>"{name:'name',namespace:'namespace',...}"</js>);
@@ -1322,7 +1322,7 @@
 	 * 	<br>Valid types:
 	 * 	<ul>
 	 * 		<li>{@link ExternalDocumentation}
-	 * 		<li><code>String</code> - JSON object representation of {@link ExternalDocumentation}
+	 * 		<li><c>String</c> - JSON object representation of {@link ExternalDocumentation}
 	 * 			<h5 class='figure'>Example:</h5>
 	 * 			<p class='bcode w800'>
 	 * 	externalDocs(<js>"{description:'description',url:'url'}"</js>);
@@ -1548,7 +1548,7 @@
 	 * @param refStack Keeps track of previously-visited references so that we don't cause recursive loops.
 	 * @param maxDepth
 	 * 	The maximum depth to resolve references.
-	 * 	<br>After that level is reached, <code>$ref</code> references will be left alone.
+	 * 	<br>After that level is reached, <c>$ref</c> references will be left alone.
 	 * 	<br>Useful if you have very complex models and you don't want your swagger page to be overly-complex.
 	 * @return
 	 * 	This object with references resolved.
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/SecurityScheme.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/SecurityScheme.java
index 41cde37..bd3559c 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/SecurityScheme.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/SecurityScheme.java
@@ -164,7 +164,7 @@
 	 *
 	 * @param value
 	 * 	The new value for this property.
-	 * 	<br>Non-String values will be converted to String using <code>toString()</code>.
+	 * 	<br>Non-String values will be converted to String using <c>toString()</c>.
 	 * 	<br>Valid values:
 	 * 	<ul>
 	 * 		<li><js>"basic"</js>
@@ -211,7 +211,7 @@
 	 *
 	 * @param value
 	 * 	The new value for this property.
-	 * 	<br>Non-String values will be converted to String using <code>toString()</code>.
+	 * 	<br>Non-String values will be converted to String using <c>toString()</c>.
 	 * 	<br>Can be <jk>null</jk> to unset the property.
 	 * @return This object (for method chaining).
 	 */
@@ -252,7 +252,7 @@
 	 *
 	 * @param value
 	 * 	The new value for this property.
-	 * 	<br>Non-String values will be converted to String using <code>toString()</code>.
+	 * 	<br>Non-String values will be converted to String using <c>toString()</c>.
 	 * 	<br>Can be <jk>null</jk> to unset the property.
 	 * @return This object (for method chaining).
 	 */
@@ -298,7 +298,7 @@
 	 *
 	 * @param value
 	 * 	The new value for this property.
-	 * 	<br>Non-String values will be converted to String using <code>toString()</code>.
+	 * 	<br>Non-String values will be converted to String using <c>toString()</c>.
 	 * 	<br>Valid values:
 	 * 	<ul>
 	 * 		<li><js>"query"</js>
@@ -351,7 +351,7 @@
 	 *
 	 * @param value
 	 * 	The new value for this property.
-	 * 	<br>Non-String values will be converted to String using <code>toString()</code>.
+	 * 	<br>Non-String values will be converted to String using <c>toString()</c>.
 	 * 	<br>Valid values:
 	 * 	<ul>
 	 * 		<li><js>"implicit"</js>
@@ -400,7 +400,7 @@
 	 *
 	 * @param value
 	 * 	The new value for this property.
-	 * 	<br>Non-String values will be converted to String using <code>toString()</code>.
+	 * 	<br>Non-String values will be converted to String using <c>toString()</c>.
 	 * 	<br>This SHOULD be in the form of a URL.
 	 * 	<br>Can be <jk>null</jk> to unset the property.
 	 * @return This object (for method chaining).
@@ -443,7 +443,7 @@
 	 *
 	 * @param value
 	 * 	The new value for this property.
-	 * 	<br>Non-String values will be converted to String using <code>toString()</code>.
+	 * 	<br>Non-String values will be converted to String using <c>toString()</c>.
 	 * 	<br>This SHOULD be in the form of a URL.
 	 * 	<br>Can be <jk>null</jk> to unset the property.
 	 * @return This object (for method chaining).
@@ -500,8 +500,8 @@
 	 * 	The values to add to this property.
 	 * 	<br>Valid types:
 	 * 	<ul>
-	 * 		<li><code>Map&lt;String,{@link HeaderInfo}|String&gt;</code>
-	 * 		<li><code>String</code> - JSON object representation of <code>Map&lt;String,{@link HeaderInfo}&gt;</code>
+	 * 		<li><c>Map&lt;String,{@link HeaderInfo}|String&gt;</c>
+	 * 		<li><c>String</c> - JSON object representation of <c>Map&lt;String,{@link HeaderInfo}&gt;</c>
 	 * 			<h5 class='figure'>Example:</h5>
 	 * 			<p class='bcode w800'>
 	 * 	scopes(<js>"{name:'value'}"</js>);
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Swagger.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Swagger.java
index d5c50d5..0e05287 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Swagger.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Swagger.java
@@ -200,7 +200,7 @@
 	 *
 	 * @param value
 	 * 	The new value for this property.
-	 * 	<br>Non-String values will be converted to String using <code>toString()</code>.
+	 * 	<br>Non-String values will be converted to String using <c>toString()</c>.
 	 * 	<br>Can be <jk>null</jk> to unset the property.
 	 * @return This object (for method chaining).
 	 */
@@ -250,7 +250,7 @@
 	 * 	<br>Valid types:
 	 * 	<ul>
 	 * 		<li>{@link Info}
-	 * 		<li><code>String</code> - JSON object representation of {@link Info}
+	 * 		<li><c>String</c> - JSON object representation of {@link Info}
 	 * 			<h5 class='figure'>Example:</h5>
 	 * 			<p class='bcode w800'>
 	 * 	info(<js>"{title:'title',description:'description',...}"</js>);
@@ -300,7 +300,7 @@
 	 *
 	 * @param value
 	 * 	The new value for this property.
-	 * 	<br>Non-String values will be converted to String using <code>toString()</code>.
+	 * 	<br>Non-String values will be converted to String using <c>toString()</c>.
 	 * 	<br>This MUST be the host only and does not include the scheme nor sub-paths.
 	 * 	<br>It MAY include a port.
 	 * 	<br>If the host is not included, the host serving the documentation is to be used (including the port).
@@ -316,7 +316,7 @@
 	 * Bean property getter:  <property>basePath</property>.
 	 *
 	 * <p>
-	 * The base path on which the API is served, which is relative to the <code>host</code>.
+	 * The base path on which the API is served, which is relative to the <c>host</c>.
 	 *
 	 * @return The property value, or <jk>null</jk> if it is not set.
 	 */
@@ -328,13 +328,13 @@
 	 * Bean property setter:  <property>basePath</property>.
 	 *
 	 * <p>
-	 * The base path on which the API is served, which is relative to the <code>host</code>.
+	 * The base path on which the API is served, which is relative to the <c>host</c>.
 	 *
 	 * @param value
 	 * 	The new value for this property.
-	 * 	<br>If it is not included, the API is served directly under the <code>host</code>.
+	 * 	<br>If it is not included, the API is served directly under the <c>host</c>.
 	 * 	<br>The value MUST start with a leading slash (/).
-	 * 	<br>The <code>basePath</code> does not support {@doc SwaggerPathTemplating path templating}.
+	 * 	<br>The <c>basePath</c> does not support {@doc SwaggerPathTemplating path templating}.
 	 * 	<br>Can be <jk>null</jk> to unset the property.
 	 * @return This object (for method chaining).
 	 */
@@ -348,10 +348,10 @@
 	 *
 	 * @param value
 	 * 	The new value for this property.
-	 * 	<br>Non-String values will be converted to String using <code>toString()</code>.
-	 * 	<br>If it is not included, the API is served directly under the <code>host</code>.
+	 * 	<br>Non-String values will be converted to String using <c>toString()</c>.
+	 * 	<br>If it is not included, the API is served directly under the <c>host</c>.
 	 * 	<br>The value MUST start with a leading slash (/).
-	 * 	<br>The <code>basePath</code> does not support {@doc SwaggerPathTemplating path templating}.
+	 * 	<br>The <c>basePath</c> does not support {@doc SwaggerPathTemplating path templating}.
 	 * 	<br>Can be <jk>null</jk> to unset the property.
 	 * @return This object (for method chaining).
 	 */
@@ -366,7 +366,7 @@
 	 * The transfer protocol of the API.
 	 *
 	 * <p>
-	 * If the <code>schemes</code> is not included, the default scheme to be used is the one used to access the Swagger
+	 * If the <c>schemes</c> is not included, the default scheme to be used is the one used to access the Swagger
 	 * definition itself.
 	 *
 	 * @return The property value, or <jk>null</jk> if it is not set.
@@ -382,7 +382,7 @@
 	 * The transfer protocol of the API.
 	 *
 	 * <p>
-	 * If the <code>schemes</code> is not included, the default scheme to be used is the one used to access the Swagger
+	 * If the <c>schemes</c> is not included, the default scheme to be used is the one used to access the Swagger
 	 * definition itself.
 	 *
 	 * @param value
@@ -410,7 +410,7 @@
 	 *
 	 * <p>
 	 * Values MUST be from the list:  <js>"http"</js>, <js>"https"</js>, <js>"ws"</js>, <js>"wss"</js>.
-	 * If the <code>schemes</code> is not included, the default scheme to be used is the one used to access the Swagger
+	 * If the <c>schemes</c> is not included, the default scheme to be used is the one used to access the Swagger
 	 * definition itself.
 	 *
 	 * @param values
@@ -437,13 +437,13 @@
 	 * 	The values to add to this property.
 	 * 	<br>Valid types:
 	 * 	<ul>
-	 * 		<li><code>Collection&lt;String&gt;</code>
-	 * 		<li><code>String</code> - JSON array representation of <code>Collection&lt;String&gt;</code>
+	 * 		<li><c>Collection&lt;String&gt;</c>
+	 * 		<li><c>String</c> - JSON array representation of <c>Collection&lt;String&gt;</c>
 	 * 		<h5 class='figure'>Example:</h5>
 	 * 		<p class='bcode w800'>
 	 * 	schemes(<js>"['scheme1','scheme2']"</js>);
 	 * 		</p>
-	 * 		<li><code>String</code> - Individual values
+	 * 		<li><c>String</c> - Individual values
 	 * 		<h5 class='figure'>Example:</h5>
 	 * 		<p class='bcode w800'>
 	 * 	schemes(<js>"scheme1"</js>, <js>"scheme2"</js>);
@@ -496,7 +496,7 @@
 	 *
 	 * <p>
 	 * A list of MIME types the operation can consume.
-	 * This overrides the <code>consumes</code> definition at the Swagger Object.
+	 * This overrides the <c>consumes</c> definition at the Swagger Object.
 	 * An empty value MAY be used to clear the global definition.
 	 * Value MUST be as described under {@doc SwaggerMimeTypes}.
 	 *
@@ -519,13 +519,13 @@
 	 * 	<br>Valid types:
 	 * 	<ul>
 	 * 		<li>{@link MediaType}
-	 * 		<li><code>Collection&lt;{@link MediaType}|String&gt;</code>
-	 * 		<li><code>String</code> - JSON array representation of <code>Collection&lt;{@link MediaType}&gt;</code>
+	 * 		<li><c>Collection&lt;{@link MediaType}|String&gt;</c>
+	 * 		<li><c>String</c> - JSON array representation of <c>Collection&lt;{@link MediaType}&gt;</c>
 	 * 			<h5 class='figure'>Example:</h5>
 	 * 			<p class='bcode w800'>
 	 * 	consumes(<js>"['text/json']"</js>);
 	 * 			</p>
-	 * 		<li><code>String</code> - Individual values
+	 * 		<li><c>String</c> - Individual values
 	 * 			<h5 class='figure'>Example:</h5>
 	 * 			<p class='bcode w800'>
 	 * 	consumes(<js>"text/json"</js>);
@@ -602,13 +602,13 @@
 	 * 	<br>Valid types:
 	 * 	<ul>
 	 * 		<li>{@link MediaType}
-	 * 		<li><code>Collection&lt;{@link MediaType}|String&gt;</code>
-	 * 		<li><code>String</code> - JSON array representation of <code>Collection&lt;{@link MediaType}&gt;</code>
+	 * 		<li><c>Collection&lt;{@link MediaType}|String&gt;</c>
+	 * 		<li><c>String</c> - JSON array representation of <c>Collection&lt;{@link MediaType}&gt;</c>
 	 * 			<h5 class='figure'>Example:</h5>
 	 * 			<p class='bcode w800'>
 	 * 	consumes(<js>"['text/json']"</js>);
 	 * 			</p>
-	 * 		<li><code>String</code> - Individual values
+	 * 		<li><c>String</c> - Individual values
 	 * 			<h5 class='figure'>Example:</h5>
 	 * 			<p class='bcode w800'>
 	 * 	consumes(<js>"text/json"</js>);
@@ -635,7 +635,7 @@
 	}
 
 	/**
-	 * Shortcut for calling <code>getPaths().get(path);</code>
+	 * Shortcut for calling <c>getPaths().get(path);</c>
 	 *
 	 * @param path The path (e.g. <js>"/foo"</js>).
 	 * @return The operation map for the specified path, or <jk>null</jk> if it doesn't exist.
@@ -645,7 +645,7 @@
 	}
 
 	/**
-	 * Shortcut for calling <code>getPaths().get(path).get(operation);</code>
+	 * Shortcut for calling <c>getPaths().get(path).get(operation);</c>
 	 *
 	 * @param path The path (e.g. <js>"/foo"</js>).
 	 * @param operation The HTTP operation (e.g. <js>"get"</js>).
@@ -659,7 +659,7 @@
 	}
 
 	/**
-	 * Shortcut for calling <code>getPaths().get(path).get(operation).getResponse(status);</code>
+	 * Shortcut for calling <c>getPaths().get(path).get(operation).getResponse(status);</c>
 	 *
 	 * @param path The path (e.g. <js>"/foo"</js>).
 	 * @param operation The HTTP operation (e.g. <js>"get"</js>).
@@ -738,8 +738,8 @@
 	 * 	The values to add to this property.
 	 * 	<br>Valid types:
 	 * 	<ul>
-	 * 		<li><code>Map&lt;String,Map&lt;String,{@link Operation}&gt;|String&gt;</code>
-	 * 		<li><code>String</code> - JSON object representation of <code>Map&lt;String,Map&lt;String,{@link Operation}&gt;&gt;</code>
+	 * 		<li><c>Map&lt;String,Map&lt;String,{@link Operation}&gt;|String&gt;</c>
+	 * 		<li><c>String</c> - JSON object representation of <c>Map&lt;String,Map&lt;String,{@link Operation}&gt;&gt;</c>
 	 * 			<h5 class='figure'>Example:</h5>
 	 * 			<p class='bcode w800'>
 	 * 	paths(<js>"{'foo':{'get':{operationId:'operationId',...}}}"</js>);
@@ -819,8 +819,8 @@
 	 * 	The values to add to this property.
 	 * 	<br>Valid types:
 	 * 	<ul>
-	 * 		<li><code>Map&lt;String,Map&lt;String,{@link SchemaInfo}&gt;|String&gt;</code>
-	 * 		<li><code>String</code> - JSON object representation of <code>Map&lt;String,Map&lt;String,{@link SchemaInfo}&gt;&gt;</code>
+	 * 		<li><c>Map&lt;String,Map&lt;String,{@link SchemaInfo}&gt;|String&gt;</c>
+	 * 		<li><c>String</c> - JSON object representation of <c>Map&lt;String,Map&lt;String,{@link SchemaInfo}&gt;&gt;</c>
 	 * 			<h5 class='figure'>Example:</h5>
 	 * 			<p class='bcode w800'>
 	 * 	definitions(<js>"{'foo':{'bar':{format:'format',...}}}"</js>);
@@ -915,8 +915,8 @@
 	 * 	The values to add to this property.
 	 * 	<br>Valid types:
 	 * 	<ul>
-	 * 		<li><code>Map&lt;String,{@link ParameterInfo}|String&gt;</code>
-	 * 		<li><code>String</code> - JSON object representation of <code>Map&lt;String,{@link ParameterInfo}&gt;</code>
+	 * 		<li><c>Map&lt;String,{@link ParameterInfo}|String&gt;</c>
+	 * 		<li><c>String</c> - JSON object representation of <c>Map&lt;String,{@link ParameterInfo}&gt;</c>
 	 * 			<h5 class='figure'>Example:</h5>
 	 * 			<p class='bcode w800'>
 	 * 	parameters(<js>"{'foo':{name:'name',...}}"</js>);
@@ -931,7 +931,7 @@
 	}
 
 	/**
-	 * Convenience method for calling <code>getPath(path).get(method).getParameter(in,name);</code>
+	 * Convenience method for calling <c>getPath(path).get(method).getParameter(in,name);</c>
 	 *
 	 * @param path The HTTP path.
 	 * @param method The HTTP method.
@@ -1022,8 +1022,8 @@
 	 * 	The values to add to this property.
 	 * 	<br>Valid types:
 	 * 	<ul>
-	 * 		<li><code>Map&lt;String,{@link ResponseInfo}|String&gt;</code>
-	 * 		<li><code>String</code> - JSON object representation of <code>Map&lt;String,{@link ResponseInfo}&gt;</code>
+	 * 		<li><c>Map&lt;String,{@link ResponseInfo}|String&gt;</c>
+	 * 		<li><c>String</c> - JSON object representation of <c>Map&lt;String,{@link ResponseInfo}&gt;</c>
 	 * 			<h5 class='figure'>Example:</h5>
 	 * 			<p class='bcode w800'>
 	 * 	responses(<js>"{'foo':{description:'description',...}}"</js>);
@@ -1100,8 +1100,8 @@
 	 * 	The values to add to this property.
 	 * 	<br>Valid types:
 	 * 	<ul>
-	 * 		<li><code>Map&lt;String,{@link SecurityScheme}|String&gt;</code>
-	 * 		<li><code>String</code> - JSON object representation of <code>Map&lt;String,{@link SecurityScheme}&gt;</code>
+	 * 		<li><c>Map&lt;String,{@link SecurityScheme}|String&gt;</c>
+	 * 		<li><c>String</c> - JSON object representation of <c>Map&lt;String,{@link SecurityScheme}&gt;</c>
 	 * 			<h5 class='figure'>Example:</h5>
 	 * 			<p class='bcode w800'>
 	 * 	securityDefinitions(<js>"{'foo':{name:'name',...}}"</js>);
@@ -1196,13 +1196,13 @@
 	 * 	The values to add to this property.
 	 * 	<br>Valid types:
 	 * 	<ul>
-	 * 		<li><code>Collection&lt;Map&lt;String,List&lt;String&gt;&gt;&gt;</code>
-	 * 		<li><code>String</code> - JSON array representation of <code>Collection&lt;Map&lt;String,List&lt;String&gt;&gt;&gt;</code>
+	 * 		<li><c>Collection&lt;Map&lt;String,List&lt;String&gt;&gt;&gt;</c>
+	 * 		<li><c>String</c> - JSON array representation of <c>Collection&lt;Map&lt;String,List&lt;String&gt;&gt;&gt;</c>
 	 * 			<h5 class='figure'>Example:</h5>
 	 * 			<p class='bcode w800'>
 	 * 	securities(<js>"[{...}]"</js>);
 	 * 			</p>
-	 * 		<li><code>String</code> - JSON object representation of <code>Map&lt;String,List&lt;String&gt;&gt;</code>
+	 * 		<li><c>String</c> - JSON object representation of <c>Map&lt;String,List&lt;String&gt;&gt;</c>
 	 * 			<h5 class='figure'>Example:</h5>
 	 * 			<p class='bcode w800'>
 	 * 	securities(<js>"{...}"</js>);
@@ -1278,14 +1278,14 @@
 	 * 	<br>Valid types:
 	 * 	<ul>
 	 * 		<li>{@link Tag}
-	 * 		<li><code>Collection&lt;{@link Tag}|String&gt;</code>
-	 * 		<li><code>{@link Tag}[]</code>
-	 * 		<li><code>String</code> - JSON array representation of <code>Collection&lt;{@link Tag}&gt;</code>
+	 * 		<li><c>Collection&lt;{@link Tag}|String&gt;</c>
+	 * 		<li><c>{@link Tag}[]</c>
+	 * 		<li><c>String</c> - JSON array representation of <c>Collection&lt;{@link Tag}&gt;</c>
 	 * 			<h5 class='figure'>Example:</h5>
 	 * 			<p class='bcode w800'>
 	 * 	tags(<js>"[{name:'name',description:'description',...}]"</js>);
 	 * 			</p>
-	 * 		<li><code>String</code> - JSON object representation of <code>{@link Tag}</code>
+	 * 		<li><c>String</c> - JSON object representation of <c>{@link Tag}</c>
 	 * 			<h5 class='figure'>Example:</h5>
 	 * 			<p class='bcode w800'>
 	 * 	tags(<js>"{name:'name',description:'description',...}"</js>);
@@ -1344,7 +1344,7 @@
 	 * 	<br>Valid types:
 	 * 	<ul>
 	 * 		<li>{@link ExternalDocumentation}
-	 * 		<li><code>String</code> - JSON object representation of {@link ExternalDocumentation}
+	 * 		<li><c>String</c> - JSON object representation of {@link ExternalDocumentation}
 	 * 			<h5 class='figure'>Example:</h5>
 	 * 			<p class='bcode w800'>
 	 * 	externalDocs(<js>"{description:'description',url:'url'}"</js>);
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Tag.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Tag.java
index 446130f..7cee3ea 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Tag.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Tag.java
@@ -121,7 +121,7 @@
 	 *
 	 * @param value
 	 * 	The new value for this property.
-	 * 	<br>Non-String values will be converted to String using <code>toString()</code>.
+	 * 	<br>Non-String values will be converted to String using <c>toString()</c>.
 	 * 	<br>Can be <jk>null</jk> to unset the property.
 	 * @return This object (for method chaining).
 	 */
@@ -163,7 +163,7 @@
 	 *
 	 * @param value
 	 * 	The new value for this property.
-	 * 	<br>Non-String values will be converted to String using <code>toString()</code>.
+	 * 	<br>Non-String values will be converted to String using <c>toString()</c>.
 	 * 	<br>Can be <jk>null</jk> to unset the property.
 	 * @return This object (for method chaining).
 	 */
@@ -207,7 +207,7 @@
 	 * 	<br>Valid types:
 	 * 	<ul>
 	 * 		<li>{@link ExternalDocumentation}
-	 * 		<li><code>String</code> - JSON object representation of {@link ExternalDocumentation}
+	 * 		<li><c>String</c> - JSON object representation of {@link ExternalDocumentation}
 	 * 			<h5 class='figure'>Example:</h5>
 	 * 			<p class='bcode w800'>
 	 * 	externalDocs(<js>"{description:'description',url:'url'}"</js>);
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Xml.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Xml.java
index d459013..901599c 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Xml.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Xml.java
@@ -101,9 +101,9 @@
 	 * Replaces the name of the element/attribute used for the described schema property.
 	 *
 	 * <p>
-	 * When defined within the Items Object (<code>items</code>), it will affect the name of the individual XML elements
+	 * When defined within the Items Object (<c>items</c>), it will affect the name of the individual XML elements
 	 * within the list.
-	 * <br>When defined alongside <code>type</code> being array (outside the <code>items</code>), it will affect the
+	 * <br>When defined alongside <c>type</c> being array (outside the <c>items</c>), it will affect the
 	 * wrapping element and only if wrapped is <jk>true</jk>.
 	 * <br>If wrapped is <jk>false</jk>, it will be ignored.
 	 *
@@ -120,9 +120,9 @@
 	 * Replaces the name of the element/attribute used for the described schema property.
 	 *
 	 * <p>
-	 * When defined within the Items Object (<code>items</code>), it will affect the name of the individual XML elements
+	 * When defined within the Items Object (<c>items</c>), it will affect the name of the individual XML elements
 	 * within the list.
-	 * <br>When defined alongside <code>type</code> being array (outside the <code>items</code>), it will affect the
+	 * <br>When defined alongside <c>type</c> being array (outside the <c>items</c>), it will affect the
 	 * wrapping element and only if wrapped is <jk>true</jk>.
 	 * <br>If wrapped is <jk>false</jk>, it will be ignored.
 	 *
@@ -141,7 +141,7 @@
 	 *
 	 * @param value
 	 * 	The new value for this property.
-	 * 	<br>Non-String values will be converted to String using <code>toString()</code>.
+	 * 	<br>Non-String values will be converted to String using <c>toString()</c>.
 	 * 	<br>Can be <jk>null</jk> to unset the property.
 	 * @return This object (for method chaining).
 	 */
@@ -182,7 +182,7 @@
 	 *
 	 * @param value
 	 * 	The new value for this property.
-	 * 	<br>Non-String values will be converted to String using <code>toString()</code>.
+	 * 	<br>Non-String values will be converted to String using <c>toString()</c>.
 	 * 	<br>Can be <jk>null</jk> to unset the property.
 	 * @return This object (for method chaining).
 	 */
@@ -223,7 +223,7 @@
 	 *
 	 * @param value
 	 * 	The new value for this property.
-	 * 	<br>Non-String values will be converted to String using <code>toString()</code>.
+	 * 	<br>Non-String values will be converted to String using <c>toString()</c>.
 	 * 	<br>Can be <jk>null</jk> to unset the property.
 	 * @return This object (for method chaining).
 	 */
@@ -282,10 +282,10 @@
 	 *
 	 * <p>
 	 * Signifies whether the array is wrapped (for example,
-	 * <code>&lt;books&gt;&lt;book/&gt;&lt;book/&gt;&lt;books&gt;</code>) or unwrapped
-	 * (<code>&lt;book/&gt;&lt;book/&gt;</code>).
-	 * <br>The definition takes effect only when defined alongside <code>type</code> being <code>array</code>
-	 * (outside the <code>items</code>).
+	 * <c>&lt;books&gt;&lt;book/&gt;&lt;book/&gt;&lt;books&gt;</c>) or unwrapped
+	 * (<c>&lt;book/&gt;&lt;book/&gt;</c>).
+	 * <br>The definition takes effect only when defined alongside <c>type</c> being <c>array</c>
+	 * (outside the <c>items</c>).
 	 *
 	 * @return The property value, or <jk>null</jk> if it is not set.
 	 */
@@ -301,10 +301,10 @@
 	 *
 	 * <p>
 	 * Signifies whether the array is wrapped (for example,
-	 * <code>&lt;books&gt;&lt;book/&gt;&lt;book/&gt;&lt;books&gt;</code>) or unwrapped
-	 * (<code>&lt;book/&gt;&lt;book/&gt;</code>).
-	 * <br>The definition takes effect only when defined alongside <code>type</code> being <code>array</code>
-	 * (outside the <code>items</code>).
+	 * <c>&lt;books&gt;&lt;book/&gt;&lt;book/&gt;&lt;books&gt;</c>) or unwrapped
+	 * (<c>&lt;book/&gt;&lt;book/&gt;</c>).
+	 * <br>The definition takes effect only when defined alongside <c>type</c> being <c>array</c>
+	 * (outside the <c>items</c>).
 	 *
 	 * @param value
 	 * 	The new value for this property.
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/ui/SwaggerUI.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/ui/SwaggerUI.java
index 7889e8b..6c5a25f 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/ui/SwaggerUI.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/ui/SwaggerUI.java
@@ -37,21 +37,21 @@
 	private static final String PREFIX = "SwaggerUI.";
 
 	/**
-	 * Configuration property:  Resolve <code>$ref</code> references in schema up to the specified depth.
+	 * Configuration property:  Resolve <c>$ref</c> references in schema up to the specified depth.
 	 *
 	 * <h5 class='section'>Property:</h5>
 	 * <ul>
 	 * 	<li><b>Name:</b>  <js>"SwaggerUI.resolveRefsMaxDepth.i"</js>
-	 * 	<li><b>Data type:</b>  <code>Integer</code>
-	 * 	<li><b>Default:</b>  <code>1</code>
+	 * 	<li><b>Data type:</b>  <c>Integer</c>
+	 * 	<li><b>Default:</b>  <c>1</c>
 	 * 	<li><b>Session property:</b>  <jk>true</jk>
 	 * </ul>
 	 *
 	 * <h5 class='section'>Description:</h5>
 	 * <p>
-	 * Defines the maximum recursive depth to resolve <code>$ref</code> variables in schema infos.
-	 * <br>The default <code>1</code> means only resolve the first reference encountered.
-	 * <br>A value of <code>0</code> disables reference resolution altogether.
+	 * Defines the maximum recursive depth to resolve <c>$ref</c> variables in schema infos.
+	 * <br>The default <c>1</c> means only resolve the first reference encountered.
+	 * <br>A value of <c>0</c> disables reference resolution altogether.
 	 *
 	 * <h5 class='section'>Example:</h5>
 	 * <p class='bcode w800'>
diff --git a/juneau-core/juneau-marshall-rdf/.settings/org.eclipse.wst.html.core.prefs b/juneau-core/juneau-marshall-rdf/.settings/org.eclipse.wst.html.core.prefs
index f70192e..7de0d38 100644
--- a/juneau-core/juneau-marshall-rdf/.settings/org.eclipse.wst.html.core.prefs
+++ b/juneau-core/juneau-marshall-rdf/.settings/org.eclipse.wst.html.core.prefs
@@ -32,7 +32,7 @@
 elemUnclosedStartTag=1
 elemUnknownName=2
 elemUnnecessaryEnd=2
-elementNamesToIgnore=jc,jd,jt,jk,js,jf,jsf,jsm,ja,xt,xa,xc,xs,xv,ua,uk,un,us,mk,mv,cc,cs,ck,cv,l,property
+elementNamesToIgnore=bc,c,cc,ci,ck,cs,cv,dc,del,ja,jc,jd,jf,jk,joc,jok,jov,js,jsf,jsm,jt,l,mk,mv,ua,uk,un,us,xa,xc,xs,xt,xv
 ignoreAttrNames=false
 ignoreElementNames=true
 piInvalidContent=2
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 0a55ad5..55b0cd5 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
@@ -88,12 +88,12 @@
 	public static final String RDF_NIL = "http://www.w3.org/1999/02/22-rdf-syntax-ns#nil";

 

 	/**

-	 * RDF resource that identifies a <code>Seq</code> value.

+	 * RDF resource that identifies a <c>Seq</c> value.

 	 */

 	public static final String RDF_SEQ = "http://www.w3.org/1999/02/22-rdf-syntax-ns#Seq";

 

 	/**

-	 * RDF resource that identifies a <code>Bag</code> value.

+	 * RDF resource that identifies a <c>Bag</c> value.

 	 */

 	public static final String RDF_BAG = "http://www.w3.org/1999/02/22-rdf-syntax-ns#Bag";

 }

diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfCommon.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfCommon.java
index e51dcdf..1cd174d 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfCommon.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfCommon.java
@@ -47,7 +47,7 @@
 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"Rdf.language.s"</js>

-	 * 	<li><b>Data type:</b>  <code>String</code>

+	 * 	<li><b>Data type:</b>  <c>String</c>

 	 * 	<li><b>Default:</b>  <js>"RDF/XML-ABBREV"</js>

 	 * 	<li><b>Methods:</b>

 	 * 		<ul>

@@ -82,7 +82,7 @@
 	 * 		Will make a decision on exactly which writer to use (pretty writer, plain writer or simple writer) when

 	 * 		created.

 	 * 		Default is the pretty writer but can be overridden with system property

-	 * 		<code>org.apache.jena.n3.N3JenaWriter.writer</code>.

+	 * 		<c>org.apache.jena.n3.N3JenaWriter.writer</c>.

 	 * 	<li>

 	 * 		<js>"N3-PP"</js> - Name of the N3 pretty writer.

 	 * 		The pretty writer uses a frame-like layout, with prefixing, clustering like properties and embedding

@@ -135,12 +135,12 @@
 	public static final String RDF_juneauBpNs = PREFIX + ".juneauBpNs.s";

 

 	/**

-	 * Configuration property:  RDF/XML property: <code>iri_rules</code>.

+	 * Configuration property:  RDF/XML property: <c>iri_rules</c>.

 	 *

 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"Rdf.jena.rdfXml.iri-rules.s"</js>

-	 * 	<li><b>Data type:</b>  <code>String</code>

+	 * 	<li><b>Data type:</b>  <c>String</c>

 	 * 	<li><b>Default:</b>  <js>"lax"</js>

 	 * </ul>

 	 *

@@ -166,12 +166,12 @@
 	public static final String RDF_arp_iriRules = PREFIX + ".jena.rdfXml.iri-rules.s";

 

 	/**

-	 * Configuration property:  RDF/XML ARP property: <code>error-mode</code>.

+	 * Configuration property:  RDF/XML ARP property: <c>error-mode</c>.

 	 *

 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"Rdf.jena.rdfXml.error-mode.s"</js>

-	 * 	<li><b>Data type:</b>  <code>String</code>

+	 * 	<li><b>Data type:</b>  <c>String</c>

 	 * 	<li><b>Default:</b>  <js>"lax"</js>

 	 * </ul>

 	 *

@@ -207,12 +207,12 @@
 	public static final String RDF_arp_errorMode = PREFIX + ".jena.rdfXml.error-mode.s";

 

 	/**

-	 * Configuration property:  RDF/XML ARP property: <code>embedding</code>.

+	 * Configuration property:  RDF/XML ARP property: <c>embedding</c>.

 	 *

 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"Rdf.jena.rdfXml.embedding.b"</js>

-	 * 	<li><b>Data type:</b>  <code>Boolean</code>

+	 * 	<li><b>Data type:</b>  <c>Boolean</c>

 	 * 	<li><b>Default:</b>  <jk>false</jk>

 	 * </ul>

 	 *

@@ -230,12 +230,12 @@
 	public static final String RDF_arp_embedding = PREFIX + ".jena.rdfXml.embedding.b";

 

 	/**

-	 * Configuration property:  RDF/XML ARP property: <code>ERR_xxx</code>.

+	 * Configuration property:  RDF/XML ARP property: <c>ERR_xxx</c>.

 	 *

 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"Rdf.jena.rdfXml.ERR_"</js>

-	 * 	<li><b>Data type:</b>  <code>String</code>

+	 * 	<li><b>Data type:</b>  <c>String</c>

 	 * </ul>

 	 *

 	 * <h5 class='section'>Description:</h5>

@@ -263,12 +263,12 @@
 	public static final String RDF_arp_err_ = PREFIX + ".jena.rdfXml.ERR_";

 

 	/**

-	 * Configuration property:  RDF/XML ARP property: <code>WARN_xxx</code>.

+	 * Configuration property:  RDF/XML ARP property: <c>WARN_xxx</c>.

 	 *

 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"Rdf.jena.rdfXml.WARN_"</js>

-	 * 	<li><b>Data type:</b>  <code>String</code>

+	 * 	<li><b>Data type:</b>  <c>String</c>

 	 * </ul>

 	 *

 	 * <h5 class='section'>Description:</h5>

@@ -278,12 +278,12 @@
 	public static final String RDF_arp_warn_ = PREFIX + ".jena.rdfXml.WARN_";

 

 	/**

-	 * RDF/XML ARP property: <code>IGN_xxx</code>.

+	 * RDF/XML ARP property: <c>IGN_xxx</c>.

 	 *

 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"Rdf.jena.rdfXml.IGN_"</js>

-	 * 	<li><b>Data type:</b>  <code>String</code>

+	 * 	<li><b>Data type:</b>  <c>String</c>

 	 * </ul>

 	 *

 	 * <h5 class='section'>Description:</h5>

@@ -293,12 +293,12 @@
 	public static final String RDF_arp_ign_ = PREFIX + ".jena.rdfXml.IGN_";

 

 	/**

-	 * Configuration property:  RDF/XML property: <code>xmlbase</code>.

+	 * Configuration property:  RDF/XML property: <c>xmlbase</c>.

 	 *

 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"Rdf.jena.rdfXml.xmlbase.s"</js>

-	 * 	<li><b>Data type:</b>  <code>String</code>

+	 * 	<li><b>Data type:</b>  <c>String</c>

 	 * 	<li><b>Default:</b>  <jk>null</jk>

 	 * </ul>

 	 *

@@ -309,12 +309,12 @@
 	public static final String RDF_rdfxml_xmlBase = PREFIX + ".jena.rdfXml.xmlbase.s";

 

 	/**

-	 * Configuration property:  RDF/XML property: <code>longId</code>.

+	 * Configuration property:  RDF/XML property: <c>longId</c>.

 	 *

 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"Rdf.jena.rdfXml.longId.b"</js>

-	 * 	<li><b>Data type:</b>  <code>Boolean</code>

+	 * 	<li><b>Data type:</b>  <c>Boolean</c>

 	 * 	<li><b>Default:</b>  <jk>false</jk>

 	 * </ul>

 	 *

@@ -326,12 +326,12 @@
 	public static final String RDF_rdfxml_longId = PREFIX + ".jena.rdfXml.longId.b";

 

 	/**

-	 * Configuration property:  RDF/XML property: <code>allowBadURIs</code>.

+	 * Configuration property:  RDF/XML property: <c>allowBadURIs</c>.

 	 *

 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"Rdf.jena.rdfXml.allowBadURIs.b"</js>

-	 * 	<li><b>Data type:</b>  <code>Boolean</code>

+	 * 	<li><b>Data type:</b>  <c>Boolean</c>

 	 * 	<li><b>Default:</b>  <jk>false</jk>

 	 * </ul>

 	 *

@@ -342,12 +342,12 @@
 	public static final String RDF_rdfxml_allowBadUris = PREFIX + ".jena.rdfXml.allowBadURIs.b";

 

 	/**

-	 * Configuration property:  RDF/XML property: <code>relativeURIs</code>.

+	 * Configuration property:  RDF/XML property: <c>relativeURIs</c>.

 	 *

 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"Rdf.jena.rdfXml.relativeURIs.s"</js>

-	 * 	<li><b>Data type:</b>  <code>String</code>

+	 * 	<li><b>Data type:</b>  <c>String</c>

 	 * 	<li><b>Default:</b>  <js>"same-document, absolute, relative, parent"</js>

 	 * </ul>

 	 *

@@ -380,12 +380,12 @@
 	public static final String RDF_rdfxml_relativeUris = PREFIX + ".jena.rdfXml.relativeURIs.s";

 

 	/**

-	 * Configuration property:  RDF/XML property: <code>showXmlDeclaration</code>.

+	 * Configuration property:  RDF/XML property: <c>showXmlDeclaration</c>.

 	 *

 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"Rdf.jena.rdfXml.showXmlDeclaration.s"</js>

-	 * 	<li><b>Data type:</b>  <code>String</code>

+	 * 	<li><b>Data type:</b>  <c>String</c>

 	 * 	<li><b>Default:</b>  <js>"default"</js>

 	 * </ul>

 	 *

@@ -398,40 +398,40 @@
 	 * 	<li>

 	 * 		<js>"false"</js> - Don't add XML Declaration to the output.

 	 * 	<li>

-	 * 		<js>"default"</js> - Only add an XML Declaration when asked to write to an <code>OutputStreamWriter</code>

-	 * 		that uses some encoding other than <code>UTF-8</code> or <code>UTF-16</code>.

+	 * 		<js>"default"</js> - Only add an XML Declaration when asked to write to an <c>OutputStreamWriter</c>

+	 * 		that uses some encoding other than <c>UTF-8</c> or <c>UTF-16</c>.

 	 * 		In this case the encoding is shown in the XML declaration.

 	 * </ul>

 	 */

 	public static final String RDF_rdfxml_showXmlDeclaration = PREFIX + ".jena.rdfXml.showXmlDeclaration.s";

 

 	/**

-	 * Configuration property:  RDF/XML property: <code>showDoctypeDeclaration</code>.

+	 * Configuration property:  RDF/XML property: <c>showDoctypeDeclaration</c>.

 	 *

 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"Rdf.jena.rdfXml.showDoctypeDeclaration.b"</js>

-	 * 	<li><b>Data type:</b>  <code>Boolean</code>

+	 * 	<li><b>Data type:</b>  <c>Boolean</c>

 	 * 	<li><b>Default:</b>  <jk>true</jk>

 	 * </ul>

 	 *

 	 * <h5 class='section'>Description:</h5>

 	 * <p>

 	 * If true, an XML doctype declaration is included in the output.

-	 * This declaration includes a <code>!ENTITY</code> declaration for each prefix mapping in the model, and any

+	 * 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.

 	 */

 	public static final String RDF_rdfxml_showDoctypeDeclaration = PREFIX + ".jena.rdfXml.showDoctypeDeclaration.b";

 

 	/**

-	 * Configuration property:  RDF/XML property: <code>tab</code>.

+	 * Configuration property:  RDF/XML property: <c>tab</c>.

 	 *

 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"Rdf.jena.rdfXml.tab.i"</js>

-	 * 	<li><b>Data type:</b>  <code>Integer</code>

-	 * 	<li><b>Default:</b>  <code>2</code>

+	 * 	<li><b>Data type:</b>  <c>Integer</c>

+	 * 	<li><b>Default:</b>  <c>2</c>

 	 * </ul>

 	 *

 	 * <h5 class='section'>Description:</h5>

@@ -441,12 +441,12 @@
 	public static final String RDF_rdfxml_tab = PREFIX + ".jena.rdfXml.tab.i";

 

 	/**

-	 * Configuration property:  RDF/XML property: <code>attributeQuoteChar</code>.

+	 * Configuration property:  RDF/XML property: <c>attributeQuoteChar</c>.

 	 *

 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"Rdf.jena.rdfXml.attributeQuoteChar.s"</js>

-	 * 	<li><b>Data type:</b>  <code>Character</code>

+	 * 	<li><b>Data type:</b>  <c>Character</c>

 	 * 	<li><b>Default:</b>  <js>'"'</js>

 	 * </ul>

 	 *

@@ -457,31 +457,31 @@
 	public static final String RDF_rdfxml_attributeQuoteChar = PREFIX + ".jena.rdfXml.attributeQuoteChar.s";

 

 	/**

-	 * Configuration property:  RDF/XML property: <code>blockRules</code>.

+	 * Configuration property:  RDF/XML property: <c>blockRules</c>.

 	 *

 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"Rdf.jena.rdfXml.blockRules.s"</js>

-	 * 	<li><b>Data type:</b>  <code>String</code>

+	 * 	<li><b>Data type:</b>  <c>String</c>

 	 * 	<li><b>Default:</b>  <js>""</js>

 	 * </ul>

 	 *

 	 * <h5 class='section'>Description:</h5>

 	 * <p>

-	 * A list of <code>Resource</code> or a <code>String</code> being a comma separated list of fragment IDs from

+	 * A list of <c>Resource</c> or a <c>String</c> being a comma separated list of fragment IDs from

 	 * {@doc http://www.w3.org/TR/rdf-syntax-grammar RDF Syntax Grammar} indicating grammar

 	 * rules that will not be used.

 	 */

 	public static final String RDF_rdfxml_blockRules = PREFIX + ".jena.rdfXml.blockRules.s";

 

 	/**

-	 * Configuration property:  N3/Turtle property: <code>minGap</code>.

+	 * Configuration property:  N3/Turtle property: <c>minGap</c>.

 	 *

 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"Rdf.jena.n3.minGap.i"</js>

-	 * 	<li><b>Data type:</b>  <code>Integer</code>

-	 * 	<li><b>Default:</b>  <code>1</code>

+	 * 	<li><b>Data type:</b>  <c>Integer</c>

+	 * 	<li><b>Default:</b>  <c>1</c>

 	 * </ul>

 	 *

 	 * <h5 class='section'>Description:</h5>

@@ -491,12 +491,12 @@
 	public static final String RDF_n3_minGap = PREFIX + ".jena.n3.minGap.i";

 

 	/**

-	 * Configuration property:  N3/Turtle property: <code>objectLists</code>.

+	 * Configuration property:  N3/Turtle property: <c>objectLists</c>.

 	 *

 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"Rdf.jena.n3.objectLists.b"</js>

-	 * 	<li><b>Data type:</b>  <code>Boolean</code>

+	 * 	<li><b>Data type:</b>  <c>Boolean</c>

 	 * 	<li><b>Default:</b>  <jk>true</jk>

 	 * </ul>

 	 *

@@ -507,12 +507,12 @@
 	public static final String RDF_n3_objectLists = PREFIX + ".jena.n3.objectLists.b";

 

 	/**

-	 * Configuration property:  N3/Turtle property: <code>subjectColumn</code>.

+	 * Configuration property:  N3/Turtle property: <c>subjectColumn</c>.

 	 *

 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"Rdf.jena.n3.subjectColumn.i"</js>

-	 * 	<li><b>Data type:</b>  <code>Integer</code>

+	 * 	<li><b>Data type:</b>  <c>Integer</c>

 	 * 	<li><b>Default:</b>  indentProperty

 	 * </ul>

 	 *

@@ -523,13 +523,13 @@
 	public static final String RDF_n3_subjectColumn = PREFIX + ".jena.n3.subjectColumn.i";

 

 	/**

-	 * Configuration property:  N3/Turtle property: <code>propertyColumn</code>.

+	 * Configuration property:  N3/Turtle property: <c>propertyColumn</c>.

 	 *

 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"Rdf.jena.n3.propertyColumn.i"</js>

-	 * 	<li><b>Data type:</b>  <code>Integer</code>

-	 * 	<li><b>Default:</b>  <code>8</code>

+	 * 	<li><b>Data type:</b>  <c>Integer</c>

+	 * 	<li><b>Default:</b>  <c>8</c>

 	 * </ul>

 	 *

 	 * <h5 class='section'>Description:</h5>

@@ -539,13 +539,13 @@
 	public static final String RDF_n3_propertyColumn = PREFIX + ".jena.n3.propertyColumn.i";

 

 	/**

-	 * Configuration property:  N3/Turtle property: <code>indentProperty</code>.

+	 * Configuration property:  N3/Turtle property: <c>indentProperty</c>.

 	 *

 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"Rdf.jena.n3.indentProperty.i"</js>

-	 * 	<li><b>Data type:</b>  <code>Integer</code>

-	 * 	<li><b>Default:</b>  <code>6</code>

+	 * 	<li><b>Data type:</b>  <c>Integer</c>

+	 * 	<li><b>Default:</b>  <c>6</c>

 	 * </ul>

 	 *

 	 * <h5 class='section'>Description:</h5>

@@ -555,83 +555,83 @@
 	public static final String RDF_n3_indentProperty = PREFIX + ".jena.n3.indentProperty.i";

 

 	/**

-	 * Configuration property:  N3/Turtle property: <code>widePropertyLen</code>.

+	 * Configuration property:  N3/Turtle property: <c>widePropertyLen</c>.

 	 *

 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"Rdf.jena.n3.widePropertyLen.i"</js>

-	 * 	<li><b>Data type:</b>  <code>Integer</code>

-	 * 	<li><b>Default:</b>  <code>20</code>

+	 * 	<li><b>Data type:</b>  <c>Integer</c>

+	 * 	<li><b>Default:</b>  <c>20</c>

 	 * </ul>

 	 *

 	 * <h5 class='section'>Description:</h5>

 	 * <p>

 	 * Width of the property column.

-	 * Must be longer than <code>propertyColumn</code>.

+	 * Must be longer than <c>propertyColumn</c>.

 	 */

 	public static final String RDF_n3_widePropertyLen = PREFIX + ".jena.n3.widePropertyLen.i";

 

 	/**

-	 * Configuration property:  N3/Turtle property: <code>abbrevBaseURI</code>.

+	 * Configuration property:  N3/Turtle property: <c>abbrevBaseURI</c>.

 	 *

 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"Rdf.jena.n3.abbrevBaseURI.b"</js>

-	 * 	<li><b>Data type:</b>  <code>Boolean</code>

+	 * 	<li><b>Data type:</b>  <c>Boolean</c>

 	 * 	<li><b>Default:</b>  <jk>true</jk>

 	 * </ul>

 	 *

 	 * <h5 class='section'>Description:</h5>

 	 * <p>

-	 * Control whether to use abbreviations <code>&lt;&gt;</code> or <code>&lt;#&gt;</code>.

+	 * Control whether to use abbreviations <c>&lt;&gt;</c> or <c>&lt;#&gt;</c>.

 	 */

 	public static final String RDF_n3_abbrevBaseUri = PREFIX + ".jena.n3.abbrevBaseURI.b";

 

 	/**

-	 * Configuration property:  N3/Turtle property: <code>usePropertySymbols</code>.

+	 * Configuration property:  N3/Turtle property: <c>usePropertySymbols</c>.

 	 *

 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"Rdf.jena.n3.usePropertySymbols.b"</js>

-	 * 	<li><b>Data type:</b>  <code>Boolean</code>

+	 * 	<li><b>Data type:</b>  <c>Boolean</c>

 	 * 	<li><b>Default:</b>  <jk>true</jk>

 	 * </ul>

 	 *

 	 * <h5 class='section'>Description:</h5>

 	 * <p>

-	 * Control whether to use <code>a</code>, <code>=</code> and <code>=&gt;</code> in output

+	 * Control whether to use <c>a</c>, <c>=</c> and <c>=&gt;</c> in output

 	 */

 	public static final String RDF_n3_usePropertySymbols = PREFIX + ".jena.n3.usePropertySymbols.b";

 

 	/**

-	 * Configuration property:  N3/Turtle property: <code>useTripleQuotedStrings</code>.

+	 * Configuration property:  N3/Turtle property: <c>useTripleQuotedStrings</c>.

 	 *

 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"Rdf.jena.n3.useTripleQuotedStrings.b"</js>

-	 * 	<li><b>Data type:</b>  <code>Boolean</code>

+	 * 	<li><b>Data type:</b>  <c>Boolean</c>

 	 * 	<li><b>Default:</b>  <jk>true</jk>

 	 * </ul>

 	 *

 	 * <h5 class='section'>Description:</h5>

 	 * <p>

-	 * Allow the use of <code>"""</code> to delimit long strings.

+	 * Allow the use of <c>"""</c> to delimit long strings.

 	 */

 	public static final String RDF_n3_useTripleQuotedStrings = PREFIX + ".jena.n3.useTripleQuotedStrings.b";

 

 	/**

-	 * Configuration property:  N3/Turtle property: <code>useDoubles</code>.

+	 * Configuration property:  N3/Turtle property: <c>useDoubles</c>.

 	 *

 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"Rdf.jena.n3.useDoubles.b"</js>

-	 * 	<li><b>Data type:</b>  <code>Boolean</code>

+	 * 	<li><b>Data type:</b>  <c>Boolean</c>

 	 * 	<li><b>Default:</b>  <jk>true</jk>

 	 * </ul>

 	 *

 	 * <h5 class='section'>Description:</h5>

 	 * <p>

-	 * Allow the use doubles as <code>123.456</code>.

+	 * Allow the use doubles as <c>123.456</c>.

 	 */

 	public static final String RDF_n3_useDoubles = PREFIX + ".jena.n3.useDoubles.b";

 

@@ -641,7 +641,7 @@
 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"Rdf.collectionFormat.s"</js>

-	 * 	<li><b>Data type:</b>  <code>String</code>

+	 * 	<li><b>Data type:</b>  <c>String</c>

 	 * 	<li><b>Default:</b>  <js>"DEFAULT"</js>

 	 * 	<li><b>Methods:</b>

 	 * 		<ul>

@@ -681,7 +681,7 @@
 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"Rdf.looseCollections.b"</js>

-	 * 	<li><b>Data type:</b>  <code>Boolean</code>

+	 * 	<li><b>Data type:</b>  <c>Boolean</c>

 	 * 	<li><b>Default:</b>  <jk>false</jk>

 	 * 	<li><b>Methods:</b>

 	 * 		<ul>

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 7dc427c..ac3d0a4 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
@@ -62,7 +62,7 @@
 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"RdfParser.trimWhitespace.b"</js>

-	 * 	<li><b>Data type:</b>  <code>Boolean</code>

+	 * 	<li><b>Data type:</b>  <c>Boolean</c>

 	 * 	<li><b>Default:</b>  <jk>false</jk>

 	 * 	<li><b>Session property:</b>  <jk>false</jk>

 	 * 	<li><b>Methods:</b>

diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfParserBuilder.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfParserBuilder.java
index 3af36f3..e33e85a 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfParserBuilder.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfParserBuilder.java
@@ -78,7 +78,7 @@
 	}
 
 	/**
-	 * Configuration property:  RDF/XML property: <code>iri_rules</code>.
+	 * Configuration property:  RDF/XML property: <c>iri_rules</c>.
 	 *
 	 * <p>
 	 * Set the engine for checking and resolving.
@@ -108,7 +108,7 @@
 	}
 
 	/**
-	 * Configuration property:  RDF/XML ARP property: <code>error-mode</code>.
+	 * Configuration property:  RDF/XML ARP property: <c>error-mode</c>.
 	 *
 	 * <p>
 	 * This allows a coarse-grained approach to control of error handling.
@@ -134,7 +134,7 @@
 	}
 
 	/**
-	 * Configuration property:  RDF/XML ARP property: <code>error-mode</code>.
+	 * Configuration property:  RDF/XML ARP property: <c>error-mode</c>.
 	 *
 	 * <p>
 	 * Sets ARP to look for RDF embedded within an enclosing XML document.
@@ -148,7 +148,7 @@
 	}
 
 	/**
-	 * Configuration property:  RDF/XML property: <code>xmlbase</code>.
+	 * Configuration property:  RDF/XML property: <c>xmlbase</c>.
 	 *
 	 * <p>
 	 * The value to be included for an <xa>xml:base</xa> attribute on the root element in the file.
@@ -162,7 +162,7 @@
 	}
 
 	/**
-	 * Configuration property:  RDF/XML property: <code>longId</code>.
+	 * Configuration property:  RDF/XML property: <c>longId</c>.
 	 *
 	 * <p>
 	 * Whether to use long ID's for anon resources.
@@ -177,7 +177,7 @@
 	}
 
 	/**
-	 * Configuration property:  RDF/XML property: <code>allowBadURIs</code>.
+	 * Configuration property:  RDF/XML property: <c>allowBadURIs</c>.
 	 *
 	 * <p>
 	 * URIs in the graph are, by default, checked prior to serialization.
@@ -191,7 +191,7 @@
 	}
 
 	/**
-	 * Configuration property:  RDF/XML property: <code>relativeURIs</code>.
+	 * Configuration property:  RDF/XML property: <c>relativeURIs</c>.
 	 *
 	 * <p>
 	 * What sort of relative URIs should be used.
@@ -227,7 +227,7 @@
 	}
 
 	/**
-	 * Configuration property:  RDF/XML property: <code>showXmlDeclaration</code>.
+	 * Configuration property:  RDF/XML property: <c>showXmlDeclaration</c>.
 	 *
 	 * <p>
 	 * Possible values:
@@ -237,8 +237,8 @@
 	 * 	<li>
 	 * 		<js>"false"</js> - Don't add XML Declaration to the output.
 	 * 	<li>
-	 * 		<js>"default"</js> - Only add an XML Declaration when asked to write to an <code>OutputStreamWriter</code>
-	 * 		that uses some encoding other than <code>UTF-8</code> or <code>UTF-16</code>.
+	 * 		<js>"default"</js> - Only add an XML Declaration when asked to write to an <c>OutputStreamWriter</c>
+	 * 		that uses some encoding other than <c>UTF-8</c> or <c>UTF-16</c>.
 	 * 		In this case the encoding is shown in the XML declaration.
 	 * </ul>
 	 *
@@ -251,11 +251,11 @@
 	}
 
 	/**
-	 * Configuration property:  RDF/XML property: <code>showDoctypeDeclaration</code>.
+	 * Configuration property:  RDF/XML property: <c>showDoctypeDeclaration</c>.
 	 *
 	 * <p>
 	 * If true, an XML doctype declaration is included in the output.
-	 * This declaration includes a <code>!ENTITY</code> declaration for each prefix mapping in the model, and any
+	 * 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.
 	 *
@@ -268,7 +268,7 @@
 	}
 
 	/**
-	 * Configuration property:  RDF/XML property: <code>tab</code>.
+	 * Configuration property:  RDF/XML property: <c>tab</c>.
 	 *
 	 * <p>
 	 * The number of spaces with which to indent XML child elements.
@@ -282,7 +282,7 @@
 	}
 
 	/**
-	 * Configuration property:  RDF/XML property: <code>attributeQuoteChar</code>.
+	 * Configuration property:  RDF/XML property: <c>attributeQuoteChar</c>.
 	 *
 	 * <p>
 	 * The XML attribute quote character.
@@ -296,10 +296,10 @@
 	}
 
 	/**
-	 * Configuration property:  RDF/XML property: <code>blockRules</code>.
+	 * Configuration property:  RDF/XML property: <c>blockRules</c>.
 	 *
 	 * <p>
-	 * A list of <code>Resource</code> or a <code>String</code> being a comma separated list of fragment IDs from
+	 * A list of <c>Resource</c> or a <c>String</c> being a comma separated list of fragment IDs from
 	 * {@doc http://www.w3.org/TR/rdf-syntax-grammar RDF Syntax Grammar} indicating grammar
 	 * rules that will not be used.
 	 *
@@ -312,7 +312,7 @@
 	}
 
 	/**
-	 * Configuration property:  N3/Turtle property: <code>minGap</code>.
+	 * Configuration property:  N3/Turtle property: <c>minGap</c>.
 	 *
 	 * <p>
 	 * Minimum gap between items on a line.
@@ -326,7 +326,7 @@
 	}
 
 	/**
-	 * Configuration property:  N3/Turtle property: <code>objectLists</code>.
+	 * Configuration property:  N3/Turtle property: <c>objectLists</c>.
 	 *
 	 * <p>
 	 * Print object lists as comma separated lists.
@@ -340,7 +340,7 @@
 	}
 
 	/**
-	 * Configuration property:  N3/Turtle property: <code>subjectColumn</code>.
+	 * Configuration property:  N3/Turtle property: <c>subjectColumn</c>.
 	 *
 	 * <p>
 	 * If the subject is shorter than this value, the first property may go on the same line.
@@ -354,7 +354,7 @@
 	}
 
 	/**
-	 * Configuration property:  N3/Turtle property: <code>propertyColumn</code>.
+	 * Configuration property:  N3/Turtle property: <c>propertyColumn</c>.
 	 *
 	 * <p>
 	 * Width of the property column.
@@ -368,7 +368,7 @@
 	}
 
 	/**
-	 * Configuration property:  N3/Turtle property: <code>indentProperty</code>.
+	 * Configuration property:  N3/Turtle property: <c>indentProperty</c>.
 	 *
 	 * <p>
 	 * Width to indent properties.
@@ -382,11 +382,11 @@
 	}
 
 	/**
-	 * Configuration property:  N3/Turtle property: <code>widePropertyLen</code>.
+	 * Configuration property:  N3/Turtle property: <c>widePropertyLen</c>.
 	 *
 	 * <p>
 	 * Width of the property column.
-	 * Must be longer than <code>propertyColumn</code>.
+	 * Must be longer than <c>propertyColumn</c>.
 	 *
 	 * @param value
 	 * 	The new value for this property.
@@ -397,10 +397,10 @@
 	}
 
 	/**
-	 * Configuration property:  N3/Turtle property: <code>abbrevBaseURI</code>.
+	 * Configuration property:  N3/Turtle property: <c>abbrevBaseURI</c>.
 	 *
 	 * <p>
-	 * Control whether to use abbreviations <code>&lt;&gt;</code> or <code>&lt;#&gt;</code>.
+	 * Control whether to use abbreviations <c>&lt;&gt;</c> or <c>&lt;#&gt;</c>.
 	 *
 	 * @param value
 	 * 	The new value for this property.
@@ -411,10 +411,10 @@
 	}
 
 	/**
-	 * Configuration property:  N3/Turtle property: <code>usePropertySymbols</code>.
+	 * Configuration property:  N3/Turtle property: <c>usePropertySymbols</c>.
 	 *
 	 * <p>
-	 * Control whether to use <code>a</code>, <code>=</code> and <code>=&gt;</code> in output
+	 * Control whether to use <c>a</c>, <c>=</c> and <c>=&gt;</c> in output
 	 *
 	 * @param value
 	 * 	The new value for this property.
@@ -425,10 +425,10 @@
 	}
 
 	/**
-	 * Configuration property:  N3/Turtle property: <code>useTripleQuotedStrings</code>.
+	 * Configuration property:  N3/Turtle property: <c>useTripleQuotedStrings</c>.
 	 *
 	 * <p>
-	 * Allow the use of <code>"""</code> to delimit long strings.
+	 * Allow the use of <c>"""</c> to delimit long strings.
 	 *
 	 * @param value
 	 * 	The new value for this property.
@@ -439,10 +439,10 @@
 	}
 
 	/**
-	 * Configuration property:  N3/Turtle property: <code>useDoubles</code>.
+	 * Configuration property:  N3/Turtle property: <c>useDoubles</c>.
 	 *
 	 * <p>
-	 * Allow the use doubles as <code>123.456</code>.
+	 * Allow the use doubles as <c>123.456</c>.
 	 *
 	 * @param value
 	 * 	The new value for this property.
@@ -566,7 +566,7 @@
 	 * 		Will make a decision on exactly which writer to use (pretty writer, plain writer or simple writer) when
 	 * 		created.
 	 * 		Default is the pretty writer but can be overridden with system property
-	 * 		<code>org.apache.jena.n3.N3JenaWriter.writer</code>.
+	 * 		<c>org.apache.jena.n3.N3JenaWriter.writer</c>.
 	 * 	<li>
 	 * 		<js>"N3-PP"</js> - Name of the N3 pretty writer.
 	 * 		The pretty writer uses a frame-like layout, with prefixing, clustering like properties and embedding
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 c8408a3..88aa945 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
@@ -61,7 +61,7 @@
 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"RdfSerializer.addBeanTypes.b"</js>

-	 * 	<li><b>Data type:</b>  <code>Boolean</code>

+	 * 	<li><b>Data type:</b>  <c>Boolean</c>

 	 * 	<li><b>Default:</b>  <jk>false</jk>

 	 * 	<li><b>Session property:</b>  <jk>false</jk>

 	 * 	<li><b>Methods:</b>

@@ -82,12 +82,12 @@
 	public static final String RDF_addBeanTypes = PREFIX + ".addBeanTypes.b";

 

 	/**

-	 * Configuration property:  Add XSI data types to non-<code>String</code> literals.

+	 * Configuration property:  Add XSI data types to non-<c>String</c> literals.

 	 *

 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"RdfSerializer.addLiteralTypes.b"</js>

-	 * 	<li><b>Data type:</b>  <code>Boolean</code>

+	 * 	<li><b>Data type:</b>  <c>Boolean</c>

 	 * 	<li><b>Default:</b>  <jk>false</jk>

 	 * 	<li><b>Session property:</b>  <jk>false</jk>

 	 * 	<li><b>Methods:</b>

@@ -105,7 +105,7 @@
 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"RdfSerializer.addRootProperty.b"</js>

-	 * 	<li><b>Data type:</b>  <code>Boolean</code>

+	 * 	<li><b>Data type:</b>  <c>Boolean</c>

 	 * 	<li><b>Default:</b>  <jk>false</jk>

 	 * 	<li><b>Session property:</b>  <jk>false</jk>

 	 * 	<li><b>Methods:</b>

@@ -117,7 +117,7 @@
 	 *

 	 * <h5 class='section'>Description:</h5>

 	 * <p>

-	 * When enabled an RDF property <code>http://www.apache.org/juneau/root</code> is added with a value of <js>"true"</js>

+	 * 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.

 	 *

@@ -133,7 +133,7 @@
 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"RdfSerializer.autoDetectNamespaces.b"</js>

-	 * 	<li><b>Data type:</b>  <code>Boolean</code>

+	 * 	<li><b>Data type:</b>  <c>Boolean</c>

 	 * 	<li><b>Default:</b>  <jk>true</jk>

 	 * 	<li><b>Session property:</b>  <jk>false</jk>

 	 * 	<li><b>Methods:</b>

@@ -158,7 +158,7 @@
 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"RdfSerializer.namespaces.ls"</js>

-	 * 	<li><b>Data type:</b>  <code>List&lt;String&gt;</code> (serialized {@link Namespace} objects)

+	 * 	<li><b>Data type:</b>  <c>List&lt;String&gt;</c> (serialized {@link Namespace} objects)

 	 * 	<li><b>Default:</b>  empty list

 	 * 	<li><b>Session property:</b>  <jk>false</jk>

 	 * 	<li><b>Annotations:</b>

@@ -183,7 +183,7 @@
 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"Rdf.useXmlNamespaces.b"</js>

-	 * 	<li><b>Data type:</b>  <code>Boolean</code>

+	 * 	<li><b>Data type:</b>  <c>Boolean</c>

 	 * 	<li><b>Default:</b>  <jk>true</jk>

 	 * 	<li><b>Methods:</b>

 	 * 		<ul>

@@ -226,9 +226,9 @@
 	 * @param accept

 	 * 	The accept media types that the serializer can handle.

 	 * 	<p>

-	 * 	Can contain meta-characters per the <code>media-type</code> specification of {@doc RFC2616.section14.1}

+	 * 	Can contain meta-characters per the <c>media-type</c> specification of {@doc RFC2616.section14.1}

 	 * 	<p>

-	 * 	If empty, then assumes the only media type supported is <code>produces</code>.

+	 * 	If empty, then assumes the only media type supported is <c>produces</c>.

 	 * 	<p>

 	 * 	For example, if this serializer produces <js>"application/json"</js> but should handle media types of

 	 * 	<js>"application/json"</js> and <js>"text/json"</js>, then the arguments should be:

@@ -397,7 +397,7 @@
 	}

 

 	/**

-	 * Configuration property:  Add XSI data types to non-<code>String</code> literals.

+	 * Configuration property:  Add XSI data types to non-<c>String</c> literals.

 	 *

 	 * @see #RDF_addLiteralTypes

 	 * @return

@@ -412,7 +412,7 @@
 	 *

 	 * @see RdfSerializer#RDF_addRootProperty

 	 * @return

-	 * 	<jk>true</jk> if RDF property <code>http://www.apache.org/juneau/root</code> is added with a value of <js>"true"</js>

+	 * 	<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.

 	 */

 	protected final boolean isAddRootProp() {

diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerBuilder.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerBuilder.java
index 286f766..3d4109f 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerBuilder.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerBuilder.java
@@ -81,7 +81,7 @@
 	}
 
 	/**
-	 * Configuration property:  RDF/XML property: <code>iri_rules</code>.
+	 * Configuration property:  RDF/XML property: <c>iri_rules</c>.
 	 *
 	 * <p>
 	 * Set the engine for checking and resolving.
@@ -110,7 +110,7 @@
 	}
 
 	/**
-	 * Configuration property:  RDF/XML ARP property: <code>error-mode</code>.
+	 * Configuration property:  RDF/XML ARP property: <c>error-mode</c>.
 	 *
 	 * <p>
 	 * This allows a coarse-grained approach to control of error handling.
@@ -136,7 +136,7 @@
 	}
 
 	/**
-	 * Configuration property:  RDF/XML ARP property: <code>error-mode</code>.
+	 * Configuration property:  RDF/XML ARP property: <c>error-mode</c>.
 	 *
 	 * <p>
 	 * Sets ARP to look for RDF embedded within an enclosing XML document.
@@ -150,7 +150,7 @@
 	}
 
 	/**
-	 * Configuration property:  RDF/XML property: <code>xmlbase</code>.
+	 * Configuration property:  RDF/XML property: <c>xmlbase</c>.
 	 *
 	 * <p>
 	 * The value to be included for an <xa>xml:base</xa> attribute on the root element in the file.
@@ -164,7 +164,7 @@
 	}
 
 	/**
-	 * Configuration property:  RDF/XML property: <code>longId</code>.
+	 * Configuration property:  RDF/XML property: <c>longId</c>.
 	 *
 	 * <p>
 	 * Whether to use long ID's for anon resources.
@@ -179,7 +179,7 @@
 	}
 
 	/**
-	 * Configuration property:  RDF/XML property: <code>allowBadURIs</code>.
+	 * Configuration property:  RDF/XML property: <c>allowBadURIs</c>.
 	 *
 	 * <p>
 	 * URIs in the graph are, by default, checked prior to serialization.
@@ -193,7 +193,7 @@
 	}
 
 	/**
-	 * Configuration property:  RDF/XML property: <code>relativeURIs</code>.
+	 * Configuration property:  RDF/XML property: <c>relativeURIs</c>.
 	 *
 	 * <p>
 	 * What sort of relative URIs should be used.
@@ -229,7 +229,7 @@
 	}
 
 	/**
-	 * Configuration property:  RDF/XML property: <code>showXmlDeclaration</code>.
+	 * Configuration property:  RDF/XML property: <c>showXmlDeclaration</c>.
 	 *
 	 * <p>
 	 * Possible values:
@@ -239,8 +239,8 @@
 	 * 	<li>
 	 * 		<js>"false"</js> - Don't add XML Declaration to the output.
 	 * 	<li>
-	 * 		<js>"default"</js> - Only add an XML Declaration when asked to write to an <code>OutputStreamWriter</code>
-	 * 		that uses some encoding other than <code>UTF-8</code> or <code>UTF-16</code>.
+	 * 		<js>"default"</js> - Only add an XML Declaration when asked to write to an <c>OutputStreamWriter</c>
+	 * 		that uses some encoding other than <c>UTF-8</c> or <c>UTF-16</c>.
 	 * 		In this case the encoding is shown in the XML declaration.
 	 * </ul>
 	 *
@@ -253,11 +253,11 @@
 	}
 
 	/**
-	 * Configuration property:  RDF/XML property: <code>showDoctypeDeclaration</code>.
+	 * Configuration property:  RDF/XML property: <c>showDoctypeDeclaration</c>.
 	 *
 	 * <p>
 	 * If true, an XML doctype declaration is included in the output.
-	 * This declaration includes a <code>!ENTITY</code> declaration for each prefix mapping in the model, and any
+	 * 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.
 	 *
@@ -270,7 +270,7 @@
 	}
 
 	/**
-	 * Configuration property:  RDF/XML property: <code>tab</code>.
+	 * Configuration property:  RDF/XML property: <c>tab</c>.
 	 *
 	 * <p>
 	 * The number of spaces with which to indent XML child elements.
@@ -284,7 +284,7 @@
 	}
 
 	/**
-	 * Configuration property:  RDF/XML property: <code>attributeQuoteChar</code>.
+	 * Configuration property:  RDF/XML property: <c>attributeQuoteChar</c>.
 	 *
 	 * <p>
 	 * The XML attribute quote character.
@@ -298,10 +298,10 @@
 	}
 
 	/**
- 	 * Configuration property:  RDF/XML property: <code>blockRules</code>.
+ 	 * Configuration property:  RDF/XML property: <c>blockRules</c>.
 	 *
 	 * <p>
-	 * A list of <code>Resource</code> or a <code>String</code> being a comma separated list of fragment IDs from
+	 * A list of <c>Resource</c> or a <c>String</c> being a comma separated list of fragment IDs from
 	 * {@doc http://www.w3.org/TR/rdf-syntax-grammar RDF Syntax Grammar} indicating grammar
 	 * rules that will not be used.
 	 *
@@ -314,7 +314,7 @@
 	}
 
 	/**
-	 * Configuration property:  N3/Turtle property: <code>minGap</code>.
+	 * Configuration property:  N3/Turtle property: <c>minGap</c>.
 	 *
 	 * <p>
 	 * Minimum gap between items on a line.
@@ -328,7 +328,7 @@
 	}
 
 	/**
-	 * Configuration property:  N3/Turtle property: <code>objectLists</code>.
+	 * Configuration property:  N3/Turtle property: <c>objectLists</c>.
 	 *
 	 * <p>
 	 * Print object lists as comma separated lists.
@@ -342,7 +342,7 @@
 	}
 
 	/**
-	 * Configuration property:  N3/Turtle property: <code>subjectColumn</code>.
+	 * Configuration property:  N3/Turtle property: <c>subjectColumn</c>.
 	 *
 	 * <p>
 	 * If the subject is shorter than this value, the first property may go on the same line.
@@ -356,7 +356,7 @@
 	}
 
 	/**
-	 * Configuration property:  N3/Turtle property: <code>propertyColumn</code>.
+	 * Configuration property:  N3/Turtle property: <c>propertyColumn</c>.
 	 *
 	 * <p>
 	 * Width of the property column.
@@ -370,7 +370,7 @@
 	}
 
 	/**
-	 * Configuration property:  N3/Turtle property: <code>indentProperty</code>.
+	 * Configuration property:  N3/Turtle property: <c>indentProperty</c>.
 	 *
 	 * <p>
 	 * Width to indent properties.
@@ -384,11 +384,11 @@
 	}
 
 	/**
-	 * Configuration property:  N3/Turtle property: <code>widePropertyLen</code>.
+	 * Configuration property:  N3/Turtle property: <c>widePropertyLen</c>.
 	 *
 	 * <p>
 	 * Width of the property column.
-	 * Must be longer than <code>propertyColumn</code>.
+	 * Must be longer than <c>propertyColumn</c>.
 	 *
 	 * @param value
 	 * 	The new value for this property.
@@ -399,10 +399,10 @@
 	}
 
 	/**
-	 * Configuration property:  N3/Turtle property: <code>abbrevBaseURI</code>.
+	 * Configuration property:  N3/Turtle property: <c>abbrevBaseURI</c>.
 	 *
 	 * <p>
-	 * Control whether to use abbreviations <code>&lt;&gt;</code> or <code>&lt;#&gt;</code>.
+	 * Control whether to use abbreviations <c>&lt;&gt;</c> or <c>&lt;#&gt;</c>.
 	 *
 	 * @param value
 	 * 	The new value for this property.
@@ -413,10 +413,10 @@
 	}
 
 	/**
-	 * Configuration property:  N3/Turtle property: <code>usePropertySymbols</code>.
+	 * Configuration property:  N3/Turtle property: <c>usePropertySymbols</c>.
 	 *
 	 * <p>
-	 * Control whether to use <code>a</code>, <code>=</code> and <code>=&gt;</code> in output
+	 * Control whether to use <c>a</c>, <c>=</c> and <c>=&gt;</c> in output
 	 *
 	 * @param value
 	 * 	The new value for this property.
@@ -427,10 +427,10 @@
 	}
 
 	/**
-	 * Configuration property:  N3/Turtle property: <code>useTripleQuotedStrings</code>.
+	 * Configuration property:  N3/Turtle property: <c>useTripleQuotedStrings</c>.
 	 *
 	 * <p>
-	 * Allow the use of <code>"""</code> to delimit long strings.
+	 * Allow the use of <c>"""</c> to delimit long strings.
 	 *
 	 * @param value
 	 * 	The new value for this property.
@@ -441,10 +441,10 @@
 	}
 
 	/**
-	 * Configuration property:  N3/Turtle property: <code>useDoubles</code>.
+	 * Configuration property:  N3/Turtle property: <c>useDoubles</c>.
 	 *
 	 * <p>
-	 * Allow the use doubles as <code>123.456</code>.
+	 * Allow the use doubles as <c>123.456</c>.
 	 *
 	 * @param value
 	 * 	The new value for this property.
@@ -502,7 +502,7 @@
 	}
 
 	/**
-	 * Configuration property:  Add XSI data types to non-<code>String</code> literals.
+	 * Configuration property:  Add XSI data types to non-<c>String</c> literals.
 	 *
 	 * <h5 class='section'>See Also:</h5>
 	 * <ul>
@@ -519,7 +519,7 @@
 	}
 
 	/**
-	 * Configuration property:  Add XSI data types to non-<code>String</code> literals.
+	 * Configuration property:  Add XSI data types to non-<c>String</c> literals.
 	 *
 	 * <p>
 	 * Shortcut for calling <code>addLiteralTypes(<jk>true</jk>)</code>.
@@ -534,7 +534,7 @@
 	 * Configuration property:  Add RDF root identifier property to root node.
 	 *
 	 * <p>
-	 * When enabled an RDF property <code>http://www.apache.org/juneau/root</code> is added with a value of <js>"true"</js>
+	 * 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.
 	 * This helps locate the root node during parsing.
 	 *
@@ -677,7 +677,7 @@
 	 * 		Will make a decision on exactly which writer to use (pretty writer, plain writer or simple writer) when
 	 * 		created.
 	 * 		Default is the pretty writer but can be overridden with system property
-	 * 		<code>org.apache.jena.n3.N3JenaWriter.writer</code>.
+	 * 		<c>org.apache.jena.n3.N3JenaWriter.writer</c>.
 	 * 	<li>
 	 * 		<js>"N3-PP"</js> - Name of the N3 pretty writer.
 	 * 		The pretty writer uses a frame-like layout, with prefixing, clustering like properties and embedding
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 c501a81..a22f4f4 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
@@ -486,7 +486,7 @@
 	}

 

 	/**

-	 * Configuration property:  Add XSI data types to non-<code>String</code> literals.

+	 * Configuration property:  Add XSI data types to non-<c>String</c> literals.

 	 *

 	 * @see RdfSerializer#RDF_addLiteralTypes

 	 * @return

@@ -501,7 +501,7 @@
 	 *

 	 * @see RdfSerializer#RDF_addRootProperty

 	 * @return

-	 * 	<jk>true</jk> if RDF property <code>http://www.apache.org/juneau/root</code> is added with a value of <js>"true"</js>

+	 * 	<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.

 	 */

 	protected final boolean isAddRootProp() {

diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfUtils.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfUtils.java
index c98481c..cd59930 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfUtils.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfUtils.java
@@ -29,7 +29,7 @@
 	 * <p>

 	 * The annotations should be a child-to-parent ordering of annotations found on a class or method.

 	 *

-	 * @param rdfs The <code>@Rdf</code> annotations to search.

+	 * @param rdfs The <c>@Rdf</c> annotations to search.

 	 * @param schemas The list of known RDF schemas.

 	 * @return The resolved namespace, or <jk>null</jk> if the namespace could not be resolved.

 	 */

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 8b86eee..907f14e 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
@@ -62,7 +62,7 @@
 	 * 				Will make a decision on exactly which writer to use (pretty writer, plain writer or simple writer) when
 	 * 				created.
 	 * 				Default is the pretty writer but can be overridden with system property
-	 * 				<code>org.apache.jena.n3.N3JenaWriter.writer</code>.
+	 * 				<c>org.apache.jena.n3.N3JenaWriter.writer</c>.
 	 * 			<li>
 	 * 				<js>"N3-PP"</js> - Name of the N3 pretty writer.
 	 * 				The pretty writer uses a frame-like layout, with prefixing, clustering like properties and embedding
@@ -127,7 +127,7 @@
 	String juneauBpNs() default "";
 
 	/**
-	 * Configuration property:  RDF/XML property: <code>iri_rules</code>.
+	 * Configuration property:  RDF/XML property: <c>iri_rules</c>.
 	 *
 	 * <p>
 	 * Set the engine for checking and resolving.
@@ -162,7 +162,7 @@
 	String arp_iriRules() default "";
 
 	/**
-	 * Configuration property:  RDF/XML ARP property: <code>error-mode</code>.
+	 * Configuration property:  RDF/XML ARP property: <c>error-mode</c>.
 	 *
 	 * <p>
 	 * This allows a coarse-grained approach to control of error handling.
@@ -202,7 +202,7 @@
 	String arp_errorMode() default "";
 
 	/**
-	 * Configuration property:  RDF/XML ARP property: <code>embedding</code>.
+	 * Configuration property:  RDF/XML ARP property: <c>embedding</c>.
 	 *
 	 * <p>
 	 * Sets ARP to look for RDF embedded within an enclosing XML document.
@@ -225,7 +225,7 @@
 	String arp_embedding() default "";
 
 	/**
-	 * Configuration property:  RDF/XML property: <code>xmlbase</code>.
+	 * Configuration property:  RDF/XML property: <c>xmlbase</c>.
 	 *
 	 * <p>
 	 * The value to be included for an <xa>xml:base</xa> attribute on the root element in the file.
@@ -246,7 +246,7 @@
 	String rdfxml_xmlBase() default "";
 
 	/**
-	 * Configuration property:  RDF/XML property: <code>longId</code>.
+	 * Configuration property:  RDF/XML property: <c>longId</c>.
 	 *
 	 * <p>
 	 * Whether to use long ID's for anon resources.
@@ -268,7 +268,7 @@
 	String rdfxml_longId() default "";
 
 	/**
-	 * Configuration property:  RDF/XML property: <code>allowBadURIs</code>.
+	 * Configuration property:  RDF/XML property: <c>allowBadURIs</c>.
 	 *
 	 * <p>
 	 * URIs in the graph are, by default, checked prior to serialization.
@@ -289,7 +289,7 @@
 	String rdfxml_allowBadUris() default "";
 
 	/**
-	 * Configuration property:  RDF/XML property: <code>relativeURIs</code>.
+	 * Configuration property:  RDF/XML property: <c>relativeURIs</c>.
 	 *
 	 * <p>
 	 * What sort of relative URIs should be used.
@@ -332,7 +332,7 @@
 	String rdfxml_relativeUris() default "";
 
 	/**
-	 * Configuration property:  RDF/XML property: <code>showXmlDeclaration</code>.
+	 * Configuration property:  RDF/XML property: <c>showXmlDeclaration</c>.
 	 *
 	 * <h5 class='section'>Notes:</h5>
 	 * <ul class='spaced-list'>
@@ -344,8 +344,8 @@
 	 * 			<li>
 	 * 				<js>"false"</js> - Don't add XML Declaration to the output.
 	 * 			<li>
-	 * 				<js>"default"</js> - Only add an XML Declaration when asked to write to an <code>OutputStreamWriter</code>
-	 * 				that uses some encoding other than <code>UTF-8</code> or <code>UTF-16</code>.
+	 * 				<js>"default"</js> - Only add an XML Declaration when asked to write to an <c>OutputStreamWriter</c>
+	 * 				that uses some encoding other than <c>UTF-8</c> or <c>UTF-16</c>.
 	 * 				In this case the encoding is shown in the XML declaration.
 	 * 		</ul>
 	 * 	<li>
@@ -362,11 +362,11 @@
 	String rdfxml_showXmlDeclaration() default "";
 
 	/**
-	 * Configuration property:  RDF/XML property: <code>showDoctypeDeclaration</code>.
+	 * Configuration property:  RDF/XML property: <c>showDoctypeDeclaration</c>.
 	 *
 	 * <p>
 	 * If true, an XML doctype declaration is included in the output.
-	 * <br>This declaration includes a <code>!ENTITY</code> declaration for each prefix mapping in the model, and any
+	 * <br>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.
 	 *
@@ -386,7 +386,7 @@
 	String rdfxml_showDoctypeDeclaration() default "";
 
 	/**
-	 * Configuration property:  RDF/XML property: <code>tab</code>.
+	 * Configuration property:  RDF/XML property: <c>tab</c>.
 	 *
 	 * <p>
 	 * The number of spaces with which to indent XML child elements.
@@ -407,7 +407,7 @@
 	String rdfxml_tab() default "";
 
 	/**
-	 * Configuration property:  RDF/XML property: <code>attributeQuoteChar</code>.
+	 * Configuration property:  RDF/XML property: <c>attributeQuoteChar</c>.
 	 *
 	 * <p>
 	 * The XML attribute quote character.
@@ -428,10 +428,10 @@
 	String rdfxml_attributeQuoteChar() default "";
 
 	/**
-	 * Configuration property:  RDF/XML property: <code>blockRules</code>.
+	 * Configuration property:  RDF/XML property: <c>blockRules</c>.
 	 *
 	 * <p>
-	 * A list of <code>Resource</code> or a <code>String</code> being a comma separated list of fragment IDs from
+	 * A list of <c>Resource</c> or a <c>String</c> being a comma separated list of fragment IDs from
 	 * {@doc http://www.w3.org/TR/rdf-syntax-grammar RDF Syntax Grammar} indicating grammar
 	 * rules that will not be used.
 	 *
@@ -451,7 +451,7 @@
 	String rdfxml_blockRules() default "";
 
 	/**
-	 * Configuration property:  N3/Turtle property: <code>minGap</code>.
+	 * Configuration property:  N3/Turtle property: <c>minGap</c>.
 	 *
 	 * <p>
 	 * Minimum gap between items on a line.
@@ -472,7 +472,7 @@
 	String n3_minGap() default "";
 
 	/**
-	 * Configuration property:  N3/Turtle property: <code>objectLists</code>.
+	 * Configuration property:  N3/Turtle property: <c>objectLists</c>.
 	 *
 	 * <p>
 	 * Print object lists as comma separated lists.
@@ -493,7 +493,7 @@
 	String n3_objectLists() default "";
 
 	/**
-	 * Configuration property:  N3/Turtle property: <code>subjectColumn</code>.
+	 * Configuration property:  N3/Turtle property: <c>subjectColumn</c>.
 	 *
 	 * <p>
 	 * If the subject is shorter than this value, the first property may go on the same line.
@@ -514,7 +514,7 @@
 	String n3_subjectColumn() default "";
 
 	/**
-	 * Configuration property:  N3/Turtle property: <code>propertyColumn</code>.
+	 * Configuration property:  N3/Turtle property: <c>propertyColumn</c>.
 	 *
 	 * <p>
 	 * Width of the property column.
@@ -535,7 +535,7 @@
 	String n3_propertyColumn() default "";
 
 	/**
-	 * Configuration property:  N3/Turtle property: <code>indentProperty</code>.
+	 * Configuration property:  N3/Turtle property: <c>indentProperty</c>.
 	 *
 	 * <p>
 	 * Width to indent properties.
@@ -556,11 +556,11 @@
 	String n3_indentProperty() default "";
 
 	/**
-	 * Configuration property:  N3/Turtle property: <code>widePropertyLen</code>.
+	 * Configuration property:  N3/Turtle property: <c>widePropertyLen</c>.
 	 *
 	 * <p>
 	 * Width of the property column.
-	 * <br>Must be longer than <code>propertyColumn</code>.
+	 * <br>Must be longer than <c>propertyColumn</c>.
 	 *
 	 * <h5 class='section'>Notes:</h5>
 	 * <ul class='spaced-list'>
@@ -578,10 +578,10 @@
 	String n3_widePropertyLen() default "";
 
 	/**
-	 * Configuration property:  N3/Turtle property: <code>abbrevBaseURI</code>.
+	 * Configuration property:  N3/Turtle property: <c>abbrevBaseURI</c>.
 	 *
 	 * <p>
-	 * Control whether to use abbreviations <code>&lt;&gt;</code> or <code>&lt;#&gt;</code>.
+	 * Control whether to use abbreviations <c>&lt;&gt;</c> or <c>&lt;#&gt;</c>.
 	 *
 	 * <h5 class='section'>Notes:</h5>
 	 * <ul class='spaced-list'>
@@ -599,10 +599,10 @@
 	String n3_abbrevBaseUri() default "";
 
 	/**
-	 * Configuration property:  N3/Turtle property: <code>usePropertySymbols</code>.
+	 * Configuration property:  N3/Turtle property: <c>usePropertySymbols</c>.
 	 *
 	 * <p>
-	 * Control whether to use <code>a</code>, <code>=</code> and <code>=&gt;</code> in output
+	 * Control whether to use <c>a</c>, <c>=</c> and <c>=&gt;</c> in output
 	 *
 	 * <h5 class='section'>Notes:</h5>
 	 * <ul class='spaced-list'>
@@ -620,10 +620,10 @@
 	String n3_usePropertySymbols() default "";
 
 	/**
-	 * Configuration property:  N3/Turtle property: <code>useTripleQuotedStrings</code>.
+	 * Configuration property:  N3/Turtle property: <c>useTripleQuotedStrings</c>.
 	 *
 	 * <p>
-	 * Allow the use of <code>"""</code> to delimit long strings.
+	 * Allow the use of <c>"""</c> to delimit long strings.
 	 *
 	 * <h5 class='section'>Notes:</h5>
 	 * <ul class='spaced-list'>
@@ -641,10 +641,10 @@
 	String n3_useTripleQuotedStrings() default "";
 
 	/**
-	 * Configuration property:  N3/Turtle property: <code>useDoubles</code>.
+	 * Configuration property:  N3/Turtle property: <c>useDoubles</c>.
 	 *
 	 * <p>
-	 * Allow the use doubles as <code>123.456</code>.
+	 * Allow the use doubles as <c>123.456</c>.
 	 *
 	 * <h5 class='section'>Notes:</h5>
 	 * <ul class='spaced-list'>
@@ -782,7 +782,7 @@
 	String addBeanTypes() default "";
 
 	/**
-	 * Configuration property:  Add XSI data types to non-<code>String</code> literals.
+	 * Configuration property:  Add XSI data types to non-<c>String</c> literals.
 	 *
 	 * <h5 class='section'>Notes:</h5>
 	 * <ul class='spaced-list'>
@@ -803,7 +803,7 @@
 	 * Configuration property:  Add RDF root identifier property to root node.
 	 *
 	 * <p>
-	 * When enabled an RDF property <code>http://www.apache.org/juneau/root</code> is added with a value of <js>"true"</js>
+	 * 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.
 	 *
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/annotation/RdfSchema.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/annotation/RdfSchema.java
index e9337d5..f563d58 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/annotation/RdfSchema.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/annotation/RdfSchema.java
@@ -56,7 +56,7 @@
 	 *

 	 * <h5 class='section'>Example:</h5>

 	 *

-	 * Contents of <code>package-info.java</code>...

+	 * Contents of <c>package-info.java</c>...

 	 * <p class='bcode w800'>

 	 * 	<jc>// XML namespaces used within this package.</jc>

 	 * 	<ja>@RdfSchema</ja>(prefix=<js>"ab"</js>,

diff --git a/juneau-core/juneau-marshall/.settings/org.eclipse.wst.html.core.prefs b/juneau-core/juneau-marshall/.settings/org.eclipse.wst.html.core.prefs
index f70192e..7de0d38 100644
--- a/juneau-core/juneau-marshall/.settings/org.eclipse.wst.html.core.prefs
+++ b/juneau-core/juneau-marshall/.settings/org.eclipse.wst.html.core.prefs
@@ -32,7 +32,7 @@
 elemUnclosedStartTag=1
 elemUnknownName=2
 elemUnnecessaryEnd=2
-elementNamesToIgnore=jc,jd,jt,jk,js,jf,jsf,jsm,ja,xt,xa,xc,xs,xv,ua,uk,un,us,mk,mv,cc,cs,ck,cv,l,property
+elementNamesToIgnore=bc,c,cc,ci,ck,cs,cv,dc,del,ja,jc,jd,jf,jk,joc,jok,jov,js,jsf,jsm,jt,l,mk,mv,ua,uk,un,us,xa,xc,xs,xt,xv
 ignoreAttrNames=false
 ignoreElementNames=true
 piInvalidContent=2
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 c25d84c..81454ce 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
@@ -53,22 +53,22 @@
  *
  * <p>
  * Each bean context maintains a cache of {@link ClassMeta} objects that describe information about classes encountered.
- * These <code>ClassMeta</code> objects are time-consuming to construct.
+ * These <c>ClassMeta</c> objects are time-consuming to construct.
  * Therefore, instances of {@link BeanContext} that share the same <js>"BeanContext.*"</js> property values share
- * the same cache.  This allows for efficient reuse of <code>ClassMeta</code> objects so that the information about
+ * the same cache.  This allows for efficient reuse of <c>ClassMeta</c> objects so that the information about
  * classes only needs to be calculated once.
  * Because of this, many of the properties defined on the {@link BeanContext} class cannot be overridden on the session.
  *
  * <h5 class='topic'>Bean Sessions</h5>
  *
- * Whereas <code>BeanContext</code> objects are permanent, unchangeable, cached, and thread-safe,
+ * Whereas <c>BeanContext</c> objects are permanent, unchangeable, cached, and thread-safe,
  * {@link BeanSession} objects are ephemeral and not thread-safe.
  * They are meant to be used as quickly-constructed scratchpads for creating bean maps.
  * {@link BeanMap} objects can only be created through the session.
  *
  * <h5 class='topic'>BeanContext configuration properties</h5>
  *
- * <code>BeanContexts</code> have several configuration properties that can be used to tweak behavior on how beans are
+ * <c>BeanContexts</c> have several configuration properties that can be used to tweak behavior on how beans are
  * handled.  These are denoted as the static <jsf>BEAN_*</jsf> fields on this class.
  *
  * <p>
@@ -157,7 +157,7 @@
 	 * <h5 class='section'>Property:</h5>
 	 * <ul>
 	 * 	<li><b>Name:</b>  <js>"BeanContext.beanClassVisibility.s"</js>
-	 * 	<li><b>Data type:</b>  <code>String</code> ({@link Visibility})
+	 * 	<li><b>Data type:</b>  <c>String</c> ({@link Visibility})
 	 * 	<li><b>Default:</b>  <js>"PUBLIC"</js>
 	 * 	<li><b>Session property:</b>  <jk>false</jk>
 	 * 	<li><b>Methods:</b>
@@ -171,7 +171,7 @@
 	 * Classes are not considered beans unless they meet the minimum visibility requirements.
 	 *
 	 * <p>
-	 * For example, if the visibility is <code>PUBLIC</code> and the bean class is <jk>protected</jk>, then the class
+	 * For example, if the visibility is <c>PUBLIC</c> and the bean class is <jk>protected</jk>, then the class
 	 * will not be interpreted as a bean class and be serialized as a string.
 	 * <br>Use this setting to reduce the visibility requirement.
 	 *
@@ -198,7 +198,7 @@
 	 * <h5 class='section'>Property:</h5>
 	 * <ul>
 	 * 	<li><b>Name:</b>  <js>"BeanContext.beanConstructorVisibility.s"</js>
-	 * 	<li><b>Data type:</b>  <code>String</code> ({@link Visibility})
+	 * 	<li><b>Data type:</b>  <c>String</c> ({@link Visibility})
 	 * 	<li><b>Default:</b>  <js>"PUBLIC"</js>
 	 * 	<li><b>Session property:</b>  <jk>false</jk>
 	 * 	<li><b>Methods:</b>
@@ -239,7 +239,7 @@
 	 * <h5 class='section'>Property:</h5>
 	 * <ul>
 	 * 	<li><b>Name:</b>  <js>"BeanContext.beanDictionary.lc"</js>
-	 * 	<li><b>Data type:</b>  <code>List&lt;Class&gt;</code>
+	 * 	<li><b>Data type:</b>  <c>List&lt;Class&gt;</c>
 	 * 	<li><b>Default:</b>  empty list
 	 * 	<li><b>Session property:</b>  <jk>false</jk>
 	 * 	<li><b>Annotations:</b>
@@ -267,7 +267,7 @@
 	 * A dictionary is a name/class mapping used to find class types during parsing when they cannot be inferred
 	 * through reflection.
 	 * <br>The names are defined through the {@link Bean#typeName() @Bean(typeName)} annotation defined on the bean class.
-	 * <br>For example, if a class <code>Foo</code> has a type-name of <js>"myfoo"</js>, then it would end up serialized
+	 * <br>For example, if a class <c>Foo</c> has a type-name of <js>"myfoo"</js>, then it would end up serialized
 	 * as <js>"{_type:'myfoo',...}"</js>.
 	 *
 	 * <p>
@@ -332,7 +332,7 @@
 	 * <h5 class='section'>Property:</h5>
 	 * <ul>
 	 * 	<li><b>Name:</b>  <js>"BeanContext.beanFieldVisibility.s"</js>
-	 * 	<li><b>Data type:</b>  <code>String</code> ({@link Visibility})
+	 * 	<li><b>Data type:</b>  <c>String</c> ({@link Visibility})
 	 * 	<li><b>Default:</b>  <js>"PUBLIC"</js>
 	 * 	<li><b>Session property:</b>  <jk>false</jk>
 	 * 	<li><b>Methods:</b>
@@ -379,7 +379,7 @@
 	 * <h5 class='section'>Property:</h5>
 	 * <ul>
 	 * 	<li><b>Name:</b>  <js>"BeanContext.beanFilters.lc"</js>
-	 * 	<li><b>Data type:</b>  <code>List&lt;Class&gt;</code>
+	 * 	<li><b>Data type:</b>  <c>List&lt;Class&gt;</c>
 	 * 	<li><b>Default:</b>  empty list
 	 * 	<li><b>Session property:</b>  <jk>false</jk>
 	 * 	<li><b>Methods:</b>
@@ -396,7 +396,7 @@
 	 * <h5 class='section'>Description:</h5>
 	 * <p>
 	 * This is a programmatic equivalent to the {@link Bean @Bean} annotation.
-	 * <br>It's useful when you want to use the <code>@Bean</code> annotation functionality, but you don't have the ability to alter
+	 * <br>It's useful when you want to use the <c>@Bean</c> annotation functionality, but you don't have the ability to alter
 	 * the bean classes.
 	 *
 	 * <p>
@@ -459,7 +459,7 @@
 	 * <h5 class='section'>Property:</h5>
 	 * <ul>
 	 * 	<li><b>Name:</b>  <js>"BeanContext.beanMapPutReturnsOldValue.b"</js>
-	 * 	<li><b>Data type:</b>  <code>Boolean</code>
+	 * 	<li><b>Data type:</b>  <c>Boolean</c>
 	 * 	<li><b>Default:</b>  <jk>false</jk>
 	 * 	<li><b>Session property:</b>  <jk>false</jk>
 	 * 	<li><b>Methods:</b>
@@ -505,7 +505,7 @@
 	 * <h5 class='section'>Property:</h5>
 	 * <ul>
 	 * 	<li><b>Name:</b>  <js>"BeanContext.beanMethodVisibility.s"</js>
-	 * 	<li><b>Data type:</b>  <code>String</code> ({@link Visibility})
+	 * 	<li><b>Data type:</b>  <c>String</c> ({@link Visibility})
 	 * 	<li><b>Default:</b>  <js>"PUBLIC"</js>
 	 * 	<li><b>Session property:</b>  <jk>false</jk>
 	 * 	<li><b>Methods:</b>
@@ -546,7 +546,7 @@
 	 * <h5 class='section'>Property:</h5>
 	 * <ul>
 	 * 	<li><b>Name:</b>  <js>"BeanContext.beansRequireDefaultConstructor.b"</js>
-	 * 	<li><b>Data type:</b>  <code>Boolean</code>
+	 * 	<li><b>Data type:</b>  <c>Boolean</c>
 	 * 	<li><b>Default:</b>  <jk>false</jk>
 	 * 	<li><b>Session property:</b>  <jk>false</jk>
 	 * 	<li><b>Methods:</b>
@@ -587,7 +587,7 @@
 	 * <h5 class='section'>Property:</h5>
 	 * <ul>
 	 * 	<li><b>Name:</b>  <js>"BeanContext.beansRequireSerializable.b"</js>
-	 * 	<li><b>Data type:</b>  <code>Boolean</code>
+	 * 	<li><b>Data type:</b>  <c>Boolean</c>
 	 * 	<li><b>Default:</b>  <jk>false</jk>
 	 * 	<li><b>Session property:</b>  <jk>false</jk>
 	 * 	<li><b>Methods:</b>
@@ -628,7 +628,7 @@
 	 * <h5 class='section'>Property:</h5>
 	 * <ul>
 	 * 	<li><b>Name:</b>  <js>"BeanContext.beansRequireSettersForGetters.b"</js>
-	 * 	<li><b>Data type:</b>  <code>Boolean</code>
+	 * 	<li><b>Data type:</b>  <c>Boolean</c>
 	 * 	<li><b>Default:</b>  <jk>false</jk>
 	 * 	<li><b>Session property:</b>  <jk>false</jk>
 	 * 	<li><b>Methods:</b>
@@ -666,7 +666,7 @@
 	 * <h5 class='section'>Property:</h5>
 	 * <ul>
 	 * 	<li><b>Name:</b>  <js>"BeanContext.beansRequireSomeProperties.b"</js>
-	 * 	<li><b>Data type:</b>  <code>Boolean</code>
+	 * 	<li><b>Data type:</b>  <c>Boolean</c>
 	 * 	<li><b>Default:</b>  <jk>true</jk>
 	 * 	<li><b>Session property:</b>  <jk>false</jk>
 	 * 	<li><b>Methods:</b>
@@ -706,7 +706,7 @@
 	 * <h5 class='section'>Property:</h5>
 	 * <ul>
 	 * 	<li><b>Name:</b>  <js>"BeanContext.beanTypePropertyName.s"</js>
-	 * 	<li><b>Data type:</b>  <code>String</code>
+	 * 	<li><b>Data type:</b>  <c>String</c>
 	 * 	<li><b>Default:</b>  <js>"_type"</js>
 	 * 	<li><b>Session property:</b>  <jk>false</jk>
 	 * 	<li><b>Annotations:</b>
@@ -751,7 +751,7 @@
 	 * <h5 class='section'>Property:</h5>
 	 * <ul>
 	 * 	<li><b>Name:</b>  <js>"BeanContext.debug.b"</js>
-	 * 	<li><b>Data type:</b>  <code>Boolean</code>
+	 * 	<li><b>Data type:</b>  <c>Boolean</c>
 	 * 	<li><b>Default:</b>  <jk>false</jk>
 	 * 	<li><b>Session property:</b>  <jk>true</jk>
 	 * 	<li><b>Methods:</b>
@@ -804,8 +804,8 @@
 	 * <h5 class='section'>Property:</h5>
 	 * <ul>
 	 * 	<li><b>Name:</b>  <js>"BeanContext.examples.smo"</js>
-	 * 	<li><b>Data type:</b>  <code>Map&lt;String,Object&gt;</code>
-	 * 	<li><b>Default:</b>  <code>{}</code>
+	 * 	<li><b>Data type:</b>  <c>Map&lt;String,Object&gt;</c>
+	 * 	<li><b>Default:</b>  <c>{}</c>
 	 * 	<li><b>Session property:</b>  <jk>false</jk>
 	 * 	<li><b>Annotations:</b>
 	 * 		<ul>
@@ -847,7 +847,7 @@
 	 * <ul class='spaced-list'>
 	 * 	<li>A static field annotated with {@link Example @Example}.
 	 * 	<li>A static method annotated with {@link Example @Example} with zero arguments or one {@link BeanSession} argument.
-	 * 	<li>A static method with name <code>example</code> with no arguments or one {@link BeanSession} argument.
+	 * 	<li>A static method with name <c>example</c> with no arguments or one {@link BeanSession} argument.
 	 * </ul>
 	 */
 	public static final String BEAN_examples = PREFIX + ".examples.smo";
@@ -858,8 +858,8 @@
 	 * <h5 class='section'>Property:</h5>
 	 * <ul>
 	 * 	<li><b>Name:</b>  <js>"BeanContext.excludeProperties.sms"</js>
-	 * 	<li><b>Data type:</b>  <code>Map&lt;String,String&gt;</code>
-	 * 	<li><b>Default:</b>  <code>{}</code>
+	 * 	<li><b>Data type:</b>  <c>Map&lt;String,String&gt;</c>
+	 * 	<li><b>Default:</b>  <c>{}</c>
 	 * 	<li><b>Session property:</b>  <jk>false</jk>
 	 * 	<li><b>Annotations:</b>
 	 * 		<ul>
@@ -884,8 +884,8 @@
 	 * The key <js>"*"</js> means all bean classes.
 	 *
 	 * <p>
-	 * For example, <code>{Bean1:<js>'foo,bar'</js>}</code> means don't serialize the <code>foo</code> and
-	 * <code>bar</code> properties on any beans whose simple class name is <code>Bean1</code>.
+	 * For example, <code>{Bean1:<js>'foo,bar'</js>}</code> means don't serialize the <c>foo</c> and
+	 * <c>bar</c> properties on any beans whose simple class name is <c>Bean1</c>.
 	 *
 	 * <p>
 	 * Setting applies to specified class and all subclasses.
@@ -919,7 +919,7 @@
 	 * <h5 class='section'>Property:</h5>
 	 * <ul>
 	 * 	<li><b>Name:</b>  <js>"BeanContext.fluentSetters.b"</js>
-	 * 	<li><b>Data type:</b>  <code>Boolean</code>
+	 * 	<li><b>Data type:</b>  <c>Boolean</c>
 	 * 	<li><b>Default:</b>  <jk>false</jk>
 	 * 	<li><b>Session property:</b>  <jk>false</jk>
 	 * 	<li><b>Annotations:</b>
@@ -971,7 +971,7 @@
 	 * <h5 class='section'>Property:</h5>
 	 * <ul>
 	 * 	<li><b>Name:</b>  <js>"BeanContext.ignoreInvocationExceptionsOnGetters.b"</js>
-	 * 	<li><b>Data type:</b>  <code>Boolean</code>
+	 * 	<li><b>Data type:</b>  <c>Boolean</c>
 	 * 	<li><b>Default:</b>  <jk>false</jk>
 	 * 	<li><b>Session property:</b>  <jk>false</jk>
 	 * 	<li><b>Methods:</b>
@@ -1009,7 +1009,7 @@
 	 * <h5 class='section'>Property:</h5>
 	 * <ul>
 	 * 	<li><b>Name:</b>  <js>"BeanContext.ignoreInvocationExceptionsOnSetters.b"</js>
-	 * 	<li><b>Data type:</b>  <code>Boolean</code>
+	 * 	<li><b>Data type:</b>  <c>Boolean</c>
 	 * 	<li><b>Default:</b>  <jk>false</jk>
 	 * 	<li><b>Session property:</b>  <jk>false</jk>
 	 * 	<li><b>Methods:</b>
@@ -1047,7 +1047,7 @@
 	 * <h5 class='section'>Property:</h5>
 	 * <ul>
 	 * 	<li><b>Name:</b>  <js>"BeanContext.ignorePropertiesWithoutSetters.b"</js>
-	 * 	<li><b>Data type:</b>  <code>Boolean</code>
+	 * 	<li><b>Data type:</b>  <c>Boolean</c>
 	 * 	<li><b>Default:</b>  <jk>true</jk>
 	 * 	<li><b>Session property:</b>  <jk>false</jk>
 	 * 	<li><b>Methods:</b>
@@ -1084,7 +1084,7 @@
 	 * <h5 class='section'>Property:</h5>
 	 * <ul>
 	 * 	<li><b>Name:</b>  <js>"BeanContext.ignoreUnknownBeanProperties.b"</js>
-	 * 	<li><b>Data type:</b>  <code>Boolean</code>
+	 * 	<li><b>Data type:</b>  <c>Boolean</c>
 	 * 	<li><b>Default:</b>  <jk>false</jk>
 	 * 	<li><b>Session property:</b>  <jk>false</jk>
 	 * 	<li><b>Methods:</b>
@@ -1122,7 +1122,7 @@
 	 * <h5 class='section'>Property:</h5>
 	 * <ul>
 	 * 	<li><b>Name:</b>  <js>"BeanContext.ignoreUnknownNullBeanProperties.b"</js>
-	 * 	<li><b>Data type:</b>  <code>Boolean</code>
+	 * 	<li><b>Data type:</b>  <c>Boolean</c>
 	 * 	<li><b>Default:</b>  <jk>true</jk>
 	 * 	<li><b>Session property:</b>  <jk>false</jk>
 	 * 	<li><b>Methods:</b>
@@ -1159,7 +1159,7 @@
 	 * <h5 class='section'>Property:</h5>
 	 * <ul>
 	 * 	<li><b>Name:</b>  <js>"BeanContext.implClasses.smc"</js>
-	 * 	<li><b>Data type:</b>  <code>Map&lt;String,Class&gt;</code>
+	 * 	<li><b>Data type:</b>  <c>Map&lt;String,Class&gt;</c>
 	 * 	<li><b>Default:</b>  empty map
 	 * 	<li><b>Session property:</b>  <jk>false</jk>
 	 * 	<li><b>Methods:</b>
@@ -1198,8 +1198,8 @@
 	 * <h5 class='section'>Property:</h5>
 	 * <ul>
 	 * 	<li><b>Name:</b>  <js>"BeanContext.properties.sms"</js>
-	 * 	<li><b>Data type:</b>  <code>Map&lt;String,String&gt;</code>
-	 * 	<li><b>Default:</b>  <code>{}</code>
+	 * 	<li><b>Data type:</b>  <c>Map&lt;String,String&gt;</c>
+	 * 	<li><b>Default:</b>  <c>{}</c>
 	 * 	<li><b>Session property:</b>  <jk>false</jk>
 	 * 	<li><b>Annotations:</b>
 	 * 		<ul>
@@ -1225,8 +1225,8 @@
 	 * The key <js>"*"</js> means all bean classes.
 	 *
 	 * <p>
-	 * For example, <code>{Bean1:<js>'foo,bar'</js>}</code> means only serialize the <code>foo</code> and
-	 * <code>bar</code> properties on the specified bean.
+	 * For example, <code>{Bean1:<js>'foo,bar'</js>}</code> means only serialize the <c>foo</c> and
+	 * <c>bar</c> properties on the specified bean.
 	 *
 	 * <p>
 	 * Setting applies to specified class and all subclasses.
@@ -1260,7 +1260,7 @@
 	 * <h5 class='section'>Property:</h5>
 	 * <ul>
 	 * 	<li><b>Name:</b>  <js>"BeanContext.locale.s"</js>
-	 * 	<li><b>Data type:</b>  <code>String</code> ({@link Locale})
+	 * 	<li><b>Data type:</b>  <c>String</c> ({@link Locale})
 	 * 	<li><b>Default:</b>  <jk>null</jk> (defaults to {@link Locale#getDefault()})
 	 * 	<li><b>Session property:</b>  <jk>true</jk>
 	 * 	<li><b>Methods:</b>
@@ -1303,7 +1303,7 @@
 	 * <h5 class='section'>Property:</h5>
 	 * <ul>
 	 * 	<li><b>Name:</b>  <js>"BeanContext.mediaType.s"</js>
-	 * 	<li><b>Data type:</b>  <code>String</code> ({@link MediaType})
+	 * 	<li><b>Data type:</b>  <c>String</c> ({@link MediaType})
 	 * 	<li><b>Default:</b>  <jk>null</jk>
 	 * 	<li><b>Session property:</b>  <jk>true</jk>
 	 * 	<li><b>Methods:</b>
@@ -1346,7 +1346,7 @@
 	 * <h5 class='section'>Property:</h5>
 	 * <ul>
 	 * 	<li><b>Name:</b>  <js>"BeanContext.notBeanClasses.sc"</js>
-	 * 	<li><b>Data type:</b>  <code>Set&lt;Class&gt;</code>
+	 * 	<li><b>Data type:</b>  <c>Set&lt;Class&gt;</c>
 	 * 	<li><b>Default:</b>  empty set
 	 * 	<li><b>Session property:</b>  <jk>false</jk>
 	 * 	<li><b>Annotations:</b>
@@ -1367,7 +1367,7 @@
 	 * <h5 class='section'>Description:</h5>
 	 * <p>
 	 * List of classes that should not be treated as beans even if they appear to be bean-like.
-	 * <br>Not-bean classes are converted to <code>Strings</code> during serialization.
+	 * <br>Not-bean classes are converted to <c>Strings</c> during serialization.
 	 *
 	 * <p>
 	 * Values can consist of any of the following types:
@@ -1409,17 +1409,17 @@
 	 * <h5 class='section'>Property:</h5>
 	 * <ul>
 	 * 	<li><b>Name:</b>  <js>"BeanContext.notBeanPackages.ss"</js>
-	 * 	<li><b>Data type:</b>  <code>Set&lt;String&gt;</code>
+	 * 	<li><b>Data type:</b>  <c>Set&lt;String&gt;</c>
 	 * 	<li><b>Default:</b>
 	 * 	<ul>
-	 * 		<li><code>java.lang</code>
-	 * 		<li><code>java.lang.annotation</code>
-	 * 		<li><code>java.lang.ref</code>
-	 * 		<li><code>java.lang.reflect</code>
-	 * 		<li><code>java.io</code>
-	 * 		<li><code>java.net</code>
-	 * 		<li><code>java.nio.*</code>
-	 * 		<li><code>java.util.*</code>
+	 * 		<li><c>java.lang</c>
+	 * 		<li><c>java.lang.annotation</c>
+	 * 		<li><c>java.lang.ref</c>
+	 * 		<li><c>java.lang.reflect</c>
+	 * 		<li><c>java.io</c>
+	 * 		<li><c>java.net</c>
+	 * 		<li><c>java.nio.*</c>
+	 * 		<li><c>java.util.*</c>
 	 * 	</ul>
 	 * 	<li><b>Session property:</b>  <jk>false</jk>
 	 * 	<li><b>Methods:</b>
@@ -1484,7 +1484,7 @@
 	 * <h5 class='section'>Property:</h5>
 	 * <ul>
 	 * 	<li><b>Name:</b>  <js>"BeanContext.pojoSwaps.lo"</js>
-	 * 	<li><b>Data type:</b>  <code>List&lt;Object&gt;</code>
+	 * 	<li><b>Data type:</b>  <c>List&lt;Object&gt;</c>
 	 * 	<li><b>Default:</b>  empty list
 	 * 	<li><b>Session property:</b>  <jk>false</jk>
 	 * 	<li><b>Annotations:</b>
@@ -1509,7 +1509,7 @@
 	 * and "swap in" the non-serializable class during parsing.
 	 *
 	 * <p>
-	 * An example of a POJO swap would be a <code>Calendar</code> object that gets swapped out for an ISO8601 string.
+	 * An example of a POJO swap would be a <c>Calendar</c> object that gets swapped out for an ISO8601 string.
 	 *
 	 * <p>
 	 * Multiple POJO swaps can be associated with a single class.
@@ -1651,7 +1651,7 @@
 	 * <h5 class='section'>Property:</h5>
 	 * <ul>
 	 * 	<li><b>Name:</b>  <js>"BeanContext.sortProperties.b"</js>
-	 * 	<li><b>Data type:</b>  <code>Boolean</code>
+	 * 	<li><b>Data type:</b>  <c>Boolean</c>
 	 * 	<li><b>Default:</b>  <jk>false</jk>
 	 * 	<li><b>Session property:</b>  <jk>false</jk>
 	 * 	<li><b>Annotations:</b>
@@ -1702,7 +1702,7 @@
 	 * <h5 class='section'>Property:</h5>
 	 * <ul>
 	 * 	<li><b>Name:</b>  <js>"BeanContext.timeZone.s"</js>
-	 * 	<li><b>Data type:</b>  <code>String</code> ({@link TimeZone})
+	 * 	<li><b>Data type:</b>  <c>String</c> ({@link TimeZone})
 	 * 	<li><b>Default:</b>  <jk>null</jk>
 	 * 	<li><b>Session property:</b>  <jk>true</jk>
 	 * 	<li><b>Methods:</b>
@@ -1745,7 +1745,7 @@
 	 * <h5 class='section'>Property:</h5>
 	 * <ul>
 	 * 	<li><b>Name:</b>  <js>"BeanContext.useEnumNames.b"</js>
-	 * 	<li><b>Data type:</b>  <code>Boolean</code>
+	 * 	<li><b>Data type:</b>  <c>Boolean</c>
 	 * 	<li><b>Default:</b>  <jk>false</jk>
 	 * 	<li><b>Session property:</b>  <jk>false</jk>
 	 * 	<li><b>Methods:</b>
@@ -1799,7 +1799,7 @@
 	 * <h5 class='section'>Property:</h5>
 	 * <ul>
 	 * 	<li><b>Name:</b>  <js>"BeanContext.useInterfaceProxies.b"</js>
-	 * 	<li><b>Data type:</b>  <code>Boolean</code>
+	 * 	<li><b>Data type:</b>  <c>Boolean</c>
 	 * 	<li><b>Default:</b>  <jk>true</jk>
 	 * 	<li><b>Session property:</b>  <jk>false</jk>
 	 * 	<li><b>Methods:</b>
@@ -1837,7 +1837,7 @@
 	 * <h5 class='section'>Property:</h5>
 	 * <ul>
 	 * 	<li><b>Name:</b>  <js>"BeanContext.useJavaBeanIntrospector.b"</js>
-	 * 	<li><b>Data type:</b>  <code>Boolean</code>
+	 * 	<li><b>Data type:</b>  <c>Boolean</c>
 	 * 	<li><b>Default:</b>  <jk>false</jk>
 	 * 	<li><b>Session property:</b>  <jk>false</jk>
 	 * 	<li><b>Methods:</b>
@@ -2217,7 +2217,7 @@
 	}
 
 	/**
-	 * Prints meta cache statistics to <code>System.out</code>.
+	 * Prints meta cache statistics to <c>System.out</c>.
 	 */
 	protected static void dumpCacheStats() {
 		try {
@@ -2297,14 +2297,14 @@
 	}
 
 	/**
-	 * Used to resolve <code>ClassMetas</code> of type <code>Collection</code> and <code>Map</code> that have
-	 * <code>ClassMeta</code> values that themselves could be collections or maps.
+	 * Used to resolve <c>ClassMetas</c> of type <c>Collection</c> and <c>Map</c> that have
+	 * <c>ClassMeta</c> values that themselves could be collections or maps.
 	 *
 	 * <p>
-	 * <code>Collection</code> meta objects are assumed to be followed by zero or one meta objects indicating the element type.
+	 * <c>Collection</c> meta objects are assumed to be followed by zero or one meta objects indicating the element type.
 	 *
 	 * <p>
-	 * <code>Map</code> meta objects are assumed to be followed by zero or two meta objects indicating the key and value types.
+	 * <c>Map</c> meta objects are assumed to be followed by zero or two meta objects indicating the key and value types.
 	 *
 	 * <p>
 	 * The array can be arbitrarily long to indicate arbitrarily complex data structures.
@@ -2748,48 +2748,48 @@
 	}
 
 	/**
-	 * Returns a reusable {@link ClassMeta} representation for the class <code>Object</code>.
+	 * Returns a reusable {@link ClassMeta} representation for the class <c>Object</c>.
 	 *
 	 * <p>
-	 * This <code>ClassMeta</code> is often used to represent "any object type" when an object type is not known.
+	 * This <c>ClassMeta</c> is often used to represent "any object type" when an object type is not known.
 	 *
 	 * <p>
 	 * This method is identical to calling <code>getClassMeta(Object.<jk>class</jk>)</code> but uses a cached copy to
 	 * avoid a hashmap lookup.
 	 *
-	 * @return The {@link ClassMeta} object associated with the <code>Object</code> class.
+	 * @return The {@link ClassMeta} object associated with the <c>Object</c> class.
 	 */
 	protected final ClassMeta<Object> object() {
 		return cmObject;
 	}
 
 	/**
-	 * Returns a reusable {@link ClassMeta} representation for the class <code>String</code>.
+	 * Returns a reusable {@link ClassMeta} representation for the class <c>String</c>.
 	 *
 	 * <p>
-	 * This <code>ClassMeta</code> is often used to represent key types in maps.
+	 * This <c>ClassMeta</c> is often used to represent key types in maps.
 	 *
 	 * <p>
 	 * This method is identical to calling <code>getClassMeta(String.<jk>class</jk>)</code> but uses a cached copy to
 	 * avoid a hashmap lookup.
 	 *
-	 * @return The {@link ClassMeta} object associated with the <code>String</code> class.
+	 * @return The {@link ClassMeta} object associated with the <c>String</c> class.
 	 */
 	protected final ClassMeta<String> string() {
 		return cmString;
 	}
 
 	/**
-	 * Returns a reusable {@link ClassMeta} representation for the class <code>Class</code>.
+	 * Returns a reusable {@link ClassMeta} representation for the class <c>Class</c>.
 	 *
 	 * <p>
-	 * This <code>ClassMeta</code> is often used to represent key types in maps.
+	 * This <c>ClassMeta</c> is often used to represent key types in maps.
 	 *
 	 * <p>
 	 * This method is identical to calling <code>getClassMeta(Class.<jk>class</jk>)</code> but uses a cached copy to
 	 * avoid a hashmap lookup.
 	 *
-	 * @return The {@link ClassMeta} object associated with the <code>String</code> class.
+	 * @return The {@link ClassMeta} object associated with the <c>String</c> class.
 	 */
 	protected final ClassMeta<Class> _class() {
 		return cmClass;
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContextBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContextBuilder.java
index 7d8affb..a8a81fe 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContextBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContextBuilder.java
@@ -99,7 +99,7 @@
 	 * Classes are not considered beans unless they meet the minimum visibility requirements.
 	 *
 	 * <p>
-	 * For example, if the visibility is <code>PUBLIC</code> and the bean class is <jk>protected</jk>, then the class
+	 * For example, if the visibility is <c>PUBLIC</c> and the bean class is <jk>protected</jk>, then the class
 	 * will not be interpreted as a bean class and will be treated as a string.
 	 *
 	 * <h5 class='section'>See Also:</h5>
@@ -1138,7 +1138,7 @@
 	 *
 	 * <p>
 	 * List of classes that should not be treated as beans even if they appear to be bean-like.
-	 * <br>Not-bean classes are converted to <code>Strings</code> during serialization.
+	 * <br>Not-bean classes are converted to <c>Strings</c> during serialization.
 	 *
 	 * <h5 class='section'>See Also:</h5>
 	 * <ul>
@@ -1157,7 +1157,7 @@
 	 *
 	 * <p>
 	 * List of classes that should not be treated as beans even if they appear to be bean-like.
-	 * <br>Not-bean classes are converted to <code>Strings</code> during serialization.
+	 * <br>Not-bean classes are converted to <c>Strings</c> during serialization.
 	 *
 	 * <h5 class='section'>See Also:</h5>
 	 * <ul>
@@ -1181,7 +1181,7 @@
 	 * Configuration property:  Bean class exclusions.
 	 *
 	 * <p>
-	 * Not-bean classes are converted to <code>Strings</code> during serialization even if they appear to be
+	 * Not-bean classes are converted to <c>Strings</c> during serialization even if they appear to be
 	 * bean-like.
 	 *
 	 * <h5 class='section'>See Also:</h5>
@@ -1201,7 +1201,7 @@
 	 * Configuration property:  Bean class exclusions.
 	 *
 	 * <p>
-	 * Not-bean classes are converted to <code>Strings</code> during serialization even if they appear to be
+	 * Not-bean classes are converted to <c>Strings</c> during serialization even if they appear to be
 	 * bean-like.
 	 *
 	 * <h5 class='section'>See Also:</h5>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanDictionaryList.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanDictionaryList.java
index 8c156e2..6ea0d2b 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanDictionaryList.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanDictionaryList.java
@@ -57,7 +57,7 @@
 	 * @param c
 	 * 	The list of bean classes to add to this dictionary.
 	 * 	Classes must either specify a {@link Bean#typeName() @Bean(typeName)} value or be another subclass of
-	 * 	<code>BeanDictionaryList</code>.
+	 * 	<c>BeanDictionaryList</c>.
 	 */
 	protected BeanDictionaryList(Class<?>...c) {
 		append(c);
@@ -69,7 +69,7 @@
 	 * @param c
 	 * 	The list of bean classes to add to this dictionary.
 	 * 	Classes must either specify a {@link Bean#typeName() @Bean(typeName)} value or be another subclass of
-	 * 	<code>BeanDictionaryList</code>.
+	 * 	<c>BeanDictionaryList</c>.
 	 * @return This object (for method chaining).
 	 */
 	protected BeanDictionaryList append(Class<?>...c) {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMap.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMap.java
index 17fb7f7..90ec491 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMap.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMap.java
@@ -155,7 +155,7 @@
 	 * Returns the wrapped bean object.

 	 *

 	 * <p>

-	 * If <code>create</code> is <jk>false</jk>, then this method may return <jk>null</jk> if the bean has read-only

+	 * If <c>create</c> is <jk>false</jk>, then this method may return <jk>null</jk> if the bean has read-only

 	 * properties set through a constructor defined by the {@link BeanConstructor @BeanConstructor} annotation.

 	 *

 	 * <p>

@@ -353,7 +353,7 @@
 	 * @param p The parser to use to parse the text.

 	 * @return This object (for method chaining).

 	 * @throws ParseException If the input contains a syntax error or is malformed.

-	 * @throws IOException Thrown by <code>Reader</code>.

+	 * @throws IOException Thrown by <c>Reader</c>.

 	 */

 	public BeanMap<T> load(Reader r, ReaderParser p) throws ParseException, IOException {

 		putAll(new ObjectMap(r, p));

@@ -491,7 +491,7 @@
 	}

 

 	/**

-	 * Given a string containing variables of the form <code>"{property}"</code>, replaces those variables with property

+	 * Given a string containing variables of the form <c>"{property}"</c>, replaces those variables with property

 	 * values in this bean.

 	 *

 	 * @param s The string containing variables.

diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanPropertyMeta.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanPropertyMeta.java
index e20d12d..e8b366b 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanPropertyMeta.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanPropertyMeta.java
@@ -883,7 +883,7 @@
 	 * Sets an array field on this bean.

 	 *

 	 * <p>

-	 * Works on both <code>Object</code> and primitive arrays.

+	 * Works on both <c>Object</c> and primitive arrays.

 	 *

 	 * @param bean The bean of the field.

 	 * @param l The collection to use to set the array field.

diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanSession.java
index cdb31e9..15513d4 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanSession.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanSession.java
@@ -224,7 +224,7 @@
 	 * 			<br><code><jk>public</jk> T(String)</code>

 	 * 		</td>

 	 * 		<td>

-	 * 			<code>String</code>

+	 * 			<c>String</c>

 	 * 		</td>

 	 * 		<td>

 	 * 			<br>

@@ -945,15 +945,15 @@
 	}

 

 	/**

-	 * Used to resolve <code>ClassMetas</code> of type <code>Collection</code> and <code>Map</code> that have

-	 * <code>ClassMeta</code> values that themselves could be collections or maps.

+	 * Used to resolve <c>ClassMetas</c> of type <c>Collection</c> and <c>Map</c> that have

+	 * <c>ClassMeta</c> values that themselves could be collections or maps.

 	 *

 	 * <p>

-	 * <code>Collection</code> meta objects are assumed to be followed by zero or one meta objects indicating the

+	 * <c>Collection</c> meta objects are assumed to be followed by zero or one meta objects indicating the

 	 * element type.

 	 *

 	 * <p>

-	 * <code>Map</code> meta objects are assumed to be followed by zero or two meta objects indicating the key and value

+	 * <c>Map</c> meta objects are assumed to be followed by zero or two meta objects indicating the key and value

 	 * types.

 	 *

 	 * <p>

@@ -1067,48 +1067,48 @@
 	}

 

 	/**

-	 * Returns a reusable {@link ClassMeta} representation for the class <code>Object</code>.

+	 * Returns a reusable {@link ClassMeta} representation for the class <c>Object</c>.

 	 *

 	 * <p>

-	 * This <code>ClassMeta</code> is often used to represent "any object type" when an object type is not known.

+	 * This <c>ClassMeta</c> is often used to represent "any object type" when an object type is not known.

 	 *

 	 * <p>

 	 * This method is identical to calling <code>getClassMeta(Object.<jk>class</jk>)</code> but uses a cached copy to

 	 * avoid a hashmap lookup.

 	 *

-	 * @return The {@link ClassMeta} object associated with the <code>Object</code> class.

+	 * @return The {@link ClassMeta} object associated with the <c>Object</c> class.

 	 */

 	public final ClassMeta<Object> object() {

 		return ctx.object();

 	}

 

 	/**

-	 * Returns a reusable {@link ClassMeta} representation for the class <code>String</code>.

+	 * Returns a reusable {@link ClassMeta} representation for the class <c>String</c>.

 	 *

 	 * <p>

-	 * This <code>ClassMeta</code> is often used to represent key types in maps.

+	 * This <c>ClassMeta</c> is often used to represent key types in maps.

 	 *

 	 * <p>

 	 * This method is identical to calling <code>getClassMeta(String.<jk>class</jk>)</code> but uses a cached copy to

 	 * avoid a hashmap lookup.

 	 *

-	 * @return The {@link ClassMeta} object associated with the <code>String</code> class.

+	 * @return The {@link ClassMeta} object associated with the <c>String</c> class.

 	 */

 	public final ClassMeta<String> string() {

 		return ctx.string();

 	}

 

 	/**

-	 * Returns a reusable {@link ClassMeta} representation for the class <code>Class</code>.

+	 * Returns a reusable {@link ClassMeta} representation for the class <c>Class</c>.

 	 *

 	 * <p>

-	 * This <code>ClassMeta</code> is often used to represent key types in maps.

+	 * This <c>ClassMeta</c> is often used to represent key types in maps.

 	 *

 	 * <p>

 	 * This method is identical to calling <code>getClassMeta(Class.<jk>class</jk>)</code> but uses a cached copy to

 	 * avoid a hashmap lookup.

 	 *

-	 * @return The {@link ClassMeta} object associated with the <code>String</code> class.

+	 * @return The {@link ClassMeta} object associated with the <c>String</c> class.

 	 */

 	public final ClassMeta<Class> _class() {

 		return ctx._class();

@@ -1393,7 +1393,7 @@
 	 * <p>

 	 * The locale is determined in the following order:

 	 * <ol>

-	 * 	<li><code>locale</code> parameter passed in through constructor.

+	 * 	<li><c>locale</c> parameter passed in through constructor.

 	 * 	<li>{@link BeanContext#BEAN_locale} entry in parameter passed in through constructor.

 	 * 	<li>{@link BeanContext#BEAN_locale} setting on bean context.

 	 * 	<li>Locale returned by {@link Locale#getDefault()}.

@@ -1490,7 +1490,7 @@
 	 * <p>

 	 * The timezone is determined in the following order:

 	 * <ol>

-	 * 	<li><code>timeZone</code> parameter passed in through constructor.

+	 * 	<li><c>timeZone</c> parameter passed in through constructor.

 	 * 	<li>{@link BeanContext#BEAN_timeZone} entry in parameter passed in through constructor.

 	 * 	<li>{@link BeanContext#BEAN_timeZone} setting on bean context.

 	 * </ol>

diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanTraverseBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanTraverseBuilder.java
index 5169c1b..1b29d7d 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanTraverseBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanTraverseBuilder.java
@@ -146,7 +146,7 @@
 	 *
 	 * @param value
 	 * 	The new value for this property.
-	 * 	<br>The default is <code>0</code>.
+	 * 	<br>The default is <c>0</c>.
 	 * @return This object (for method chaining).
 	 */
 	public BeanTraverseBuilder initialDepth(int value) {
@@ -168,7 +168,7 @@
 	 *
 	 * @param value
 	 * 	The new value for this property.
-	 * 	<br>The default is <code>100</code>.
+	 * 	<br>The default is <c>100</c>.
 	 * @return This object (for method chaining).
 	 */
 	public BeanTraverseBuilder maxDepth(int value) {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanTraverseContext.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanTraverseContext.java
index e05aec6..9244107 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanTraverseContext.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanTraverseContext.java
@@ -38,7 +38,7 @@
 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"BeanTraverseContext.detectRecursions.b"</js>

-	 * 	<li><b>Data type:</b>  <code>Boolean</code>

+	 * 	<li><b>Data type:</b>  <c>Boolean</c>

 	 * 	<li><b>Default:</b>  <jk>false</jk>

 	 * 	<li><b>Session property:</b>  <jk>false</jk>

 	 * 	<li><b>Methods:</b>

@@ -109,7 +109,7 @@
 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"BeanTraverseContext.ignoreRecursions.b"</js>

-	 * 	<li><b>Data type:</b>  <code>Boolean</code>

+	 * 	<li><b>Data type:</b>  <c>Boolean</c>

 	 * 	<li><b>Default:</b>  <jk>false</jk>

 	 * 	<li><b>Session property:</b>  <jk>false</jk>

 	 * 	<li><b>Methods:</b>

@@ -136,8 +136,8 @@
 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"BeanTraverseContext.initialDepth.i"</js>

-	 * 	<li><b>Data type:</b>  <code>Integer</code>

-	 * 	<li><b>Default:</b>  <code>0</code>

+	 * 	<li><b>Data type:</b>  <c>Integer</c>

+	 * 	<li><b>Default:</b>  <c>0</c>

 	 * 	<li><b>Session property:</b>  <jk>false</jk>

 	 * 	<li><b>Methods:</b>

 	 * 		<ul>

@@ -178,8 +178,8 @@
 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"BeanTraverseContext.maxDepth.i"</js>

-	 * 	<li><b>Data type:</b>  <code>Integer</code>

-	 * 	<li><b>Default:</b>  <code>100</code>

+	 * 	<li><b>Data type:</b>  <c>Integer</c>

+	 * 	<li><b>Default:</b>  <c>100</c>

 	 * 	<li><b>Session property:</b>  <jk>false</jk>

 	 * 	<li><b>Methods:</b>

 	 * 		<ul>

diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanTraverseSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanTraverseSession.java
index 40a740a..ab1c48d 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanTraverseSession.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanTraverseSession.java
@@ -100,7 +100,7 @@
 	 * @param o The current object being traversed.
 	 * @param eType The expected class type.
 	 * @return
-	 * 	The {@link ClassMeta} of the object so that <code>instanceof</code> operations only need to be performed
+	 * 	The {@link ClassMeta} of the object so that <c>instanceof</c> operations only need to be performed
 	 * 	once (since they can be expensive).
 	 * @throws BeanRecursionException If recursion occurred.
 	 */
@@ -225,7 +225,7 @@
 	/**
 	 * Returns information used to determine at what location in the parse a failure occurred.
 	 *
-	 * @return A map, typically containing something like <code>{line:123,column:456,currentProperty:"foobar"}</code>
+	 * @return A map, typically containing something like <c>{line:123,column:456,currentProperty:"foobar"}</c>
 	 */
 	public final ObjectMap getLastLocation() {
 		ObjectMap m = new ObjectMap();
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ClassMeta.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ClassMeta.java
index 527b514..c76a779 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ClassMeta.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ClassMeta.java
@@ -144,7 +144,7 @@
 	 * 	Can be <jk>null</jk>.

 	 * @param childPojoSwap

 	 * 	The child {@link PojoSwap PojoSwaps} programmatically associated with this class.

-	 * 	These are the <code>PojoSwaps</code> that have normal classes that are subclasses of this class.

+	 * 	These are the <c>PojoSwaps</c> that have normal classes that are subclasses of this class.

 	 * 	Can be <jk>null</jk>.

 	 * @param delayedInit

 	 * 	Don't call init() in constructor.

@@ -1736,7 +1736,7 @@
 	}

 

 	/**

-	 * Returns any exception that was throw in the <code>init()</code> method.

+	 * Returns any exception that was throw in the <c>init()</c> method.

 	 *

 	 * @return The cached exception.

 	 */

@@ -1778,7 +1778,7 @@
 	}

 

 	/**

-	 * Create a new instance of the main class of this declared type from a <code>String</code> input.

+	 * Create a new instance of the main class of this declared type from a <c>String</c> input.

 	 *

 	 * <p>

 	 * In order to use this method, the class must have one of the following methods:

@@ -1793,7 +1793,7 @@
 	 * @param arg The input argument value.

 	 * @return A new instance of the object, or <jk>null</jk> if there is no string constructor on the object.

 	 * @throws IllegalAccessException

-	 * 	If the <code>Constructor</code> object enforces Java language access control and the underlying constructor is

+	 * 	If the <c>Constructor</c> object enforces Java language access control and the underlying constructor is

 	 * 	inaccessible.

 	 * @throws IllegalArgumentException If the parameter type on the method was invalid.

 	 * @throws InstantiationException

@@ -1820,7 +1820,7 @@
 	}

 

 	/**

-	 * Create a new instance of the main class of this declared type from a <code>Number</code> input.

+	 * Create a new instance of the main class of this declared type from a <c>Number</c> input.

 	 *

 	 * <p>

 	 * In order to use this method, the class must have one of the following methods:

@@ -1835,7 +1835,7 @@
 	 * @param arg The input argument value.

 	 * @return A new instance of the object, or <jk>null</jk> if there is no numeric constructor on the object.

 	 * @throws IllegalAccessException

-	 * 	If the <code>Constructor</code> object enforces Java language access control and the underlying constructor is

+	 * 	If the <c>Constructor</c> object enforces Java language access control and the underlying constructor is

 	 * 	inaccessible.

 	 * @throws IllegalArgumentException If the parameter type on the method was invalid.

 	 * @throws InstantiationException

@@ -1859,7 +1859,7 @@
 	 *

 	 * @return A new instance of the object, or <jk>null</jk> if there is no no-arg constructor on the object.

 	 * @throws IllegalAccessException

-	 * 	If the <code>Constructor</code> object enforces Java language access control and the underlying constructor is

+	 * 	If the <c>Constructor</c> object enforces Java language access control and the underlying constructor is

 	 * 	inaccessible.

 	 * @throws IllegalArgumentException

 	 * 	If one of the following occurs:

@@ -1900,7 +1900,7 @@
 	 * 	Can be <jk>null</jk> if instantiating a non-member or static class.

 	 * @return A new instance of the object, or <jk>null</jk> if there is no no-arg constructor on the object.

 	 * @throws IllegalAccessException

-	 * 	If the <code>Constructor</code> object enforces Java language access control and the underlying constructor is

+	 * 	If the <c>Constructor</c> object enforces Java language access control and the underlying constructor is

 	 * 	inaccessible.

 	 * @throws IllegalArgumentException

 	 * 	If one of the following occurs:

@@ -1940,7 +1940,7 @@
 

 	/**

 	 * Similar to {@link #equals(Object)} except primitive and Object types that are similar are considered the same.

-	 * (e.g. <jk>boolean</jk> == <code>Boolean</code>).

+	 * (e.g. <jk>boolean</jk> == <c>Boolean</c>).

 	 *

 	 * @param cm The class meta to compare to.

 	 * @return <jk>true</jk> if the specified class-meta is equivalent to this one.

@@ -2248,7 +2248,7 @@
 	}

 

 	/**

-	 * Shortcut for calling <code>getInnerClass().getAnnotation(a)</code>.

+	 * Shortcut for calling <c>getInnerClass().getAnnotation(a)</c>.

 	 *

 	 * @param a The annotation to retrieve.

 	 * @return The specified annotation, or <jk>null</jk> if the class does not have the specified annotation.

diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ConfigApply.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ConfigApply.java
index a180522..8b79e52 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ConfigApply.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ConfigApply.java
@@ -25,7 +25,7 @@
 /**
  * Class used to add properties to a {@link PropertyStore} from an annotation (e.g. {@link BeanConfig}).
  *
- * @param <T> The annotation that this <code>ConfigApply</code> reads from.
+ * @param <T> The annotation that this <c>ConfigApply</c> reads from.
  */
 public abstract class ConfigApply<T extends Annotation> {
 
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/Context.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/Context.java
index d726513..5a0bf9d 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/Context.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/Context.java
@@ -208,7 +208,7 @@
 	 *
 	 * @param key The property name.
 	 * @param eType The class type of the elements in the property.
-	 * @return The property value as an unmodifiable <code>LinkedHashSet</code>, or an empty set if it doesn't exist.
+	 * @return The property value as an unmodifiable <c>LinkedHashSet</c>, or an empty set if it doesn't exist.
 	 */
 	public final <T> Set<T> getSetProperty(String key, Class<T> eType) {
 		return propertyStore.getSetProperty(key, eType);
@@ -220,7 +220,7 @@
 	 * @param key The property name.
 	 * @param eType The class type of the elements in the property.
 	 * @param def The default value if the property doesn't exist or is empty.
-	 * @return The property value as an unmodifiable <code>LinkedHashSet</code>, or the default value if it doesn't exist or is empty.
+	 * @return The property value as an unmodifiable <c>LinkedHashSet</c>, or the default value if it doesn't exist or is empty.
 	 */
 	public final <T> Set<T> getSetProperty(String key, Class<T> eType, Set<T> def) {
 		return propertyStore.getSetProperty(key, eType, def);
@@ -230,7 +230,7 @@
 	 * Returns the class set property with the specified name.
 	 *
 	 * @param key The property name.
-	 * @return The property value as an unmodifiable <code>LinkedHashSet</code>, or an empty set if it doesn't exist.
+	 * @return The property value as an unmodifiable <c>LinkedHashSet</c>, or an empty set if it doesn't exist.
 	 */
 	public final Set<Class<?>> getClassSetProperty(String key) {
 		return propertyStore.getClassSetProperty(key);
@@ -241,7 +241,7 @@
 	 *
 	 * @param key The property name.
 	 * @param eType The class type of the elements in the property.
-	 * @return The property value as an unmodifiable <code>LinkedHashSet</code>, or an empty set if it doesn't exist.
+	 * @return The property value as an unmodifiable <c>LinkedHashSet</c>, or an empty set if it doesn't exist.
 	 */
 	public final <T> Set<Class<T>> getClassSetProperty(String key, Class<T> eType) {
 		return propertyStore.getClassSetProperty(key, eType);
@@ -252,7 +252,7 @@
 	 *
 	 * @param key The property name.
 	 * @param eType The class type of the elements in the property.
-	 * @return The property value as an unmodifiable <code>ArrayList</code>, or an empty list if it doesn't exist.
+	 * @return The property value as an unmodifiable <c>ArrayList</c>, or an empty list if it doesn't exist.
 	 */
 	public final <T> List<T> getListProperty(String key, Class<T> eType) {
 		return propertyStore.getListProperty(key, eType);
@@ -264,7 +264,7 @@
 	 * @param key The property name.
 	 * @param eType The class type of the elements in the property.
 	 * @param def The default value if the property doesn't exist or is empty.
-	 * @return The property value as an unmodifiable <code>ArrayList</code>, or the default value if it doesn't exist or is empty.
+	 * @return The property value as an unmodifiable <c>ArrayList</c>, or the default value if it doesn't exist or is empty.
 	 */
 	public final <T> List<T> getListProperty(String key, Class<T> eType, List<T> def) {
 		return propertyStore.getListProperty(key, eType, def);
@@ -274,7 +274,7 @@
 	 * Returns the class list property with the specified name.
 	 *
 	 * @param key The property name.
-	 * @return The property value as an unmodifiable <code>ArrayList</code>, or an empty list if it doesn't exist.
+	 * @return The property value as an unmodifiable <c>ArrayList</c>, or an empty list if it doesn't exist.
 	 */
 	public final List<Class<?>> getClassListProperty(String key) {
 		return propertyStore.getClassListProperty(key);
@@ -285,7 +285,7 @@
 	 *
 	 * @param key The property name.
 	 * @param eType The class type of the elements in the property.
-	 * @return The property value as an unmodifiable <code>ArrayList</code>, or an empty list if it doesn't exist.
+	 * @return The property value as an unmodifiable <c>ArrayList</c>, or an empty list if it doesn't exist.
 	 */
 	public final <T> List<Class<T>> getClassListProperty(String key, Class<T> eType) {
 		return propertyStore.getClassListProperty(key, eType);
@@ -296,7 +296,7 @@
 	 *
 	 * @param key The property name.
 	 * @param eType The class type of the elements in the property.
-	 * @return The property value as an unmodifiable <code>LinkedHashMap</code>, or an empty map if it doesn't exist.
+	 * @return The property value as an unmodifiable <c>LinkedHashMap</c>, or an empty map if it doesn't exist.
 	 */
 	public final <T> Map<String,T> getMapProperty(String key, Class<T> eType) {
 		return propertyStore.getMapProperty(key, eType);
@@ -306,7 +306,7 @@
 	 * Returns the class map property with the specified name.
 	 *
 	 * @param key The property name.
-	 * @return The property value as an unmodifiable <code>LinkedHashMap</code>, or an empty map if it doesn't exist.
+	 * @return The property value as an unmodifiable <c>LinkedHashMap</c>, or an empty map if it doesn't exist.
 	 */
 	public final Map<String,Class<?>> getClassMapProperty(String key) {
 		return propertyStore.getClassMapProperty(key);
@@ -317,7 +317,7 @@
 	 *
 	 * @param key The property name.
 	 * @param eType The class type of the elements in the property.
-	 * @return The property value as an unmodifiable <code>LinkedHashMap</code>, or an empty map if it doesn't exist.
+	 * @return The property value as an unmodifiable <c>LinkedHashMap</c>, or an empty map if it doesn't exist.
 	 */
 	public final <T> Map<String,Class<T>> getClassMapProperty(String key, Class<T> eType) {
 		return propertyStore.getClassMapProperty(key, eType);
@@ -334,7 +334,7 @@
 	 * @param type The class type of the property.
 	 * @param def
 	 * 	The default value if the property doesn't exist.
-	 * 	<br>Can either be an instance of <code>T</code>, or a <code>Class&lt;? <jk>extends</jk> T&gt;</code>, or <jk>null</jk>.
+	 * 	<br>Can either be an instance of <c>T</c>, or a <code>Class&lt;? <jk>extends</jk> T&gt;</code>, or <jk>null</jk>.
 	 * @return A new property instance.
 	 */
 	public <T> T getInstanceProperty(String key, Class<T> type, Object def) {
@@ -348,7 +348,7 @@
 	 * @param type The class type of the property.
 	 * @param def
 	 * 	The default value if the property doesn't exist.
-	 * 	<br>Can either be an instance of <code>T</code>, or a <code>Class&lt;? <jk>extends</jk> T&gt;</code>.
+	 * 	<br>Can either be an instance of <c>T</c>, or a <code>Class&lt;? <jk>extends</jk> T&gt;</code>.
 	 * @param resolver
 	 * 	The resolver to use for instantiating objects.
 	 * @param args
@@ -368,7 +368,7 @@
 	 * @param type The class type of the property.
 	 * @param def
 	 * 	The default value if the property doesn't exist.
-	 * 	<br>Can either be an instance of <code>T</code>, or a <code>Class&lt;? <jk>extends</jk> T&gt;</code>.
+	 * 	<br>Can either be an instance of <c>T</c>, or a <code>Class&lt;? <jk>extends</jk> T&gt;</code>.
 	 * @param resolver
 	 * 	The resolver to use for instantiating objects.
 	 * @param args
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ContextBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ContextBuilder.java
index 4177e36..9bcbae4 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ContextBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ContextBuilder.java
@@ -65,7 +65,7 @@
 	 *
 	 * <p>
 	 * Used in cases where multiple context builder are sharing the same property store builder.
-	 * <br>(e.g. <code>HtlmlDocBuilder</code>)
+	 * <br>(e.g. <c>HtlmlDocBuilder</c>)
 	 *
 	 * @param psb The property store builder to use.
 	 */
@@ -138,7 +138,7 @@
 	 * 	<li class ='ja'>{@link UonConfig}
 	 * 	<li class ='ja'>{@link UrlEncodingConfig}
 	 * 	<li class ='ja'>{@link XmlConfig}
-	 * 	<li class ='ja'><code>RdfConfig</code>
+	 * 	<li class ='ja'><c>RdfConfig</c>
 	 * </ul>
 	 *
 	 * <p>
@@ -180,7 +180,7 @@
 	 * 	<li class ='ja'>{@link UonConfig}
 	 * 	<li class ='ja'>{@link UrlEncodingConfig}
 	 * 	<li class ='ja'>{@link XmlConfig}
-	 * 	<li class ='ja'><code>RdfConfig</code>
+	 * 	<li class ='ja'><c>RdfConfig</c>
 	 * </ul>
 	 *
 	 * <p>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/InvalidDataConversionException.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/InvalidDataConversionException.java
index a895994..f335eb5 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/InvalidDataConversionException.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/InvalidDataConversionException.java
@@ -24,7 +24,7 @@
  *

  * <p>

  * Exception that gets thrown if you try to perform an invalid conversion, such as when calling

- * {@code ObjectMap.getInt(...)} on a non-numeric <code>String</code>.

+ * {@code ObjectMap.getInt(...)} on a non-numeric <c>String</c>.

  */

 public final class InvalidDataConversionException extends FormattedRuntimeException {

 

diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ObjectList.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ObjectList.java
index a5e9f00..f6710bb 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ObjectList.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ObjectList.java
@@ -362,10 +362,10 @@
 	 * </p>

 	 *

 	 * <p>

-	 * <code>Collection</code> classes are assumed to be followed by zero or one objects indicating the element type.

+	 * <c>Collection</c> classes are assumed to be followed by zero or one objects indicating the element type.

 	 *

 	 * <p>

-	 * <code>Map</code> classes are assumed to be followed by zero or two meta objects indicating the key and value types.

+	 * <c>Map</c> classes are assumed to be followed by zero or two meta objects indicating the key and value types.

 	 *

 	 * <p>

 	 * The array can be arbitrarily long to indicate arbitrarily complex data structures.

@@ -632,7 +632,7 @@
 	 * Attempts to convert the child objects to the correct type if they aren't already the correct type.

 	 *

 	 * <p>

-	 * The <code>next()</code> method on the returned iterator may throw a {@link InvalidDataConversionException} if

+	 * The <c>next()</c> method on the returned iterator may throw a {@link InvalidDataConversionException} if

 	 * the next element cannot be converted to the specified type.

 	 *

 	 * <p>

@@ -662,7 +662,7 @@
 	 *

 	 * @param <E> The child object type.

 	 * @param childType The child object type.

-	 * @return A new <code>Iterable</code> object over this list.

+	 * @return A new <c>Iterable</c> object over this list.

 	 */

 	public <E> Iterable<E> elements(final Class<E> childType) {

 		final Iterator<?> i = iterator();

diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ObjectMap.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ObjectMap.java
index 7f47ebb..c941b13 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ObjectMap.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ObjectMap.java
@@ -374,7 +374,7 @@
 	 * Convenience method for adding an entry to this map.

 	 *

 	 * <p>

-	 * A no-op if the value is <code>-1</code>.

+	 * A no-op if the value is <c>-1</c>.

 	 *

 	 * @param key The key.

 	 * @param value The value.

@@ -493,10 +493,10 @@
 	 * </p>

 	 *

 	 * <p>

-	 * <code>Collection</code> classes are assumed to be followed by zero or one objects indicating the element type.

+	 * <c>Collection</c> classes are assumed to be followed by zero or one objects indicating the element type.

 	 *

 	 * <p>

-	 * <code>Map</code> classes are assumed to be followed by zero or two meta objects indicating the key and value types.

+	 * <c>Map</c> classes are assumed to be followed by zero or two meta objects indicating the key and value types.

 	 *

 	 * <p>

 	 * The array can be arbitrarily long to indicate arbitrarily complex data structures.

@@ -674,7 +674,7 @@
 	}

 

 	/**

-	 * Same as <code>put(String,Object)</code>, but the key is a slash-delimited path used to traverse entries in this

+	 * Same as <c>put(String,Object)</c>, but the key is a slash-delimited path used to traverse entries in this

 	 * POJO.

 	 *

 	 * <p>

@@ -1254,7 +1254,7 @@
 	}

 

 	/**

-	 * Equivalent to calling <code>get(class,key,def)</code> followed by <code>remove(key);</code>

+	 * Equivalent to calling <c>get(class,key,def)</c> followed by <c>remove(key);</c>

 	 * @param key The key.

 	 * @param defVal The default value if the map doesn't contain the specified mapping.

 	 * @param type The class type.

@@ -1421,7 +1421,7 @@
 	}

 

 	/**

-	 * Returns a copy of this <code>ObjectMap</code> with only the specified keys.

+	 * Returns a copy of this <c>ObjectMap</c> with only the specified keys.

 	 *

 	 * @param keys The keys of the entries to copy.

 	 * @return A new map with just the keys and values from this map.

@@ -1436,7 +1436,7 @@
 	}

 

 	/**

-	 * Returns a copy of this <code>ObjectMap</code> without the specified keys.

+	 * Returns a copy of this <c>ObjectMap</c> without the specified keys.

 	 *

 	 * @param keys The keys of the entries not to copy.

 	 * @return A new map without the keys and values from this map.

@@ -1499,13 +1499,13 @@
 	 * Converts this map into an object of the specified type.

 	 *

 	 * <p>

-	 * If this map contains a <js>"_type"</js> entry, it must be the same as or a subclass of the <code>type</code>.

+	 * If this map contains a <js>"_type"</js> entry, it must be the same as or a subclass of the <c>type</c>.

 	 *

 	 * @param <T> The class type to convert this map object to.

 	 * @param type The class type to convert this map object to.

 	 * @return The new object.

 	 * @throws ClassCastException

-	 * 	If the <js>"_type"</js> entry is present and not assignable from <code>type</code>

+	 * 	If the <js>"_type"</js> entry is present and not assignable from <c>type</c>

 	 */

 	@SuppressWarnings("unchecked")

 	public <T> T cast(Class<T> type) {

@@ -1526,7 +1526,7 @@
 	 * @param cm The class type to convert this map object to.

 	 * @return The new object.

 	 * @throws ClassCastException

-	 * 	If the <js>"_type"</js> entry is present and not assignable from <code>type</code>

+	 * 	If the <js>"_type"</js> entry is present and not assignable from <c>type</c>

 	 */

 	@SuppressWarnings({"unchecked"})

 	public <T> T cast(ClassMeta<T> cm) {

@@ -1665,7 +1665,7 @@
 	}

 

 	/**

-	 * Convenience method for serializing this map to the specified <code>Writer</code> using the

+	 * Convenience method for serializing this map to the specified <c>Writer</c> using the

 	 * {@link JsonSerializer#DEFAULT} serializer.

 	 *

 	 * @param w The writer to serialize this object to.

diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/PropertyStore.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/PropertyStore.java
index 479a5af..416f77b 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/PropertyStore.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/PropertyStore.java
@@ -50,7 +50,7 @@
  * <h5 class='topic'>PropertyStoreBuilder</h5>
  *
  * <p>
- * The {@link PropertyStoreBuilder} class is used to build up and instantiate immutable <code>PropertyStore</code>
+ * The {@link PropertyStoreBuilder} class is used to build up and instantiate immutable <c>PropertyStore</c>
  * objects.
  *
  * <p>
@@ -85,32 +85,32 @@
  * 		<br>A 1 or 2 character string that identifies the data type of the property.
  * 		<br>Valid values are:
  * 		<ul>
- * 			<li><js>"s"</js>:  <code>String</code>
- * 			<li><js>"b"</js>:  <code>Boolean</code>
- * 			<li><js>"i"</js>:  <code>Integer</code>
- * 			<li><js>"c"</js>:  <code>Class</code>
- * 			<li><js>"o"</js>:  <code>Object</code>
- * 			<li><js>"ss"</js>:  <code>TreeSet&lt;String&gt;</code>
- * 			<li><js>"si"</js>:  <code>TreeSet&lt;Integer&gt;</code>
- * 			<li><js>"sc"</js>:  <code>TreeSet&lt;Class&gt;</code>
- * 			<li><js>"ls"</js>:  <code>Linkedlist&lt;String&gt;</code>
- * 			<li><js>"li"</js>:  <code>Linkedlist&lt;Integer&gt;</code>
- * 			<li><js>"lc"</js>:  <code>Linkedlist&lt;Class&gt;</code>
- * 			<li><js>"lo"</js>:  <code>Linkedlist&lt;Object&gt;</code>
- * 			<li><js>"sms"</js>:  <code>TreeMap&lt;String,String&gt;</code>
- * 			<li><js>"smi"</js>:  <code>TreeMap&lt;String,Integer&gt;</code>
- * 			<li><js>"smc"</js>:  <code>TreeMap&lt;String,Class&gt;</code>
- * 			<li><js>"smo"</js>:  <code>TreeMap&lt;String,Object&gt;</code>
- * 			<li><js>"oms"</js>:  <code>LinkedHashMap&lt;String,String&gt;</code>
- * 			<li><js>"omi"</js>:  <code>LinkedHashMap&lt;String,Integer&gt;</code>
- * 			<li><js>"omc"</js>:  <code>LinkedHashMap&lt;String,Class&gt;</code>
- * 			<li><js>"omo"</js>:  <code>LinkedHashMap&lt;String,Object&gt;</code>
+ * 			<li><js>"s"</js>:  <c>String</c>
+ * 			<li><js>"b"</js>:  <c>Boolean</c>
+ * 			<li><js>"i"</js>:  <c>Integer</c>
+ * 			<li><js>"c"</js>:  <c>Class</c>
+ * 			<li><js>"o"</js>:  <c>Object</c>
+ * 			<li><js>"ss"</js>:  <c>TreeSet&lt;String&gt;</c>
+ * 			<li><js>"si"</js>:  <c>TreeSet&lt;Integer&gt;</c>
+ * 			<li><js>"sc"</js>:  <c>TreeSet&lt;Class&gt;</c>
+ * 			<li><js>"ls"</js>:  <c>Linkedlist&lt;String&gt;</c>
+ * 			<li><js>"li"</js>:  <c>Linkedlist&lt;Integer&gt;</c>
+ * 			<li><js>"lc"</js>:  <c>Linkedlist&lt;Class&gt;</c>
+ * 			<li><js>"lo"</js>:  <c>Linkedlist&lt;Object&gt;</c>
+ * 			<li><js>"sms"</js>:  <c>TreeMap&lt;String,String&gt;</c>
+ * 			<li><js>"smi"</js>:  <c>TreeMap&lt;String,Integer&gt;</c>
+ * 			<li><js>"smc"</js>:  <c>TreeMap&lt;String,Class&gt;</c>
+ * 			<li><js>"smo"</js>:  <c>TreeMap&lt;String,Object&gt;</c>
+ * 			<li><js>"oms"</js>:  <c>LinkedHashMap&lt;String,String&gt;</c>
+ * 			<li><js>"omi"</js>:  <c>LinkedHashMap&lt;String,Integer&gt;</c>
+ * 			<li><js>"omc"</js>:  <c>LinkedHashMap&lt;String,Class&gt;</c>
+ * 			<li><js>"omo"</js>:  <c>LinkedHashMap&lt;String,Object&gt;</c>
  * 		</ul>
  * </ul>
  *
  * <p>
- * For example, <js>"BeanContext.pojoSwaps.lc"</js> refers to a property on the <code>BeanContext</code> class
- * called <code>pojoSwaps</code> that has a data type of <code>List&lt;Class&gt;</code>.
+ * For example, <js>"BeanContext.pojoSwaps.lc"</js> refers to a property on the <c>BeanContext</c> class
+ * called <c>pojoSwaps</c> that has a data type of <c>List&lt;Class&gt;</c>.
  *
  * <h5 class='topic'>Property value normalization</h5>
  *
@@ -124,7 +124,7 @@
  * <p>
  * The <js>"sX"</js> property types are sorted sets.
  * <br>Use these for collections of objects where the order is not important.
- * <br>Internally, a <code>TreeSet</code> is used so that the order in which you add elements does not affect the
+ * <br>Internally, a <c>TreeSet</c> is used so that the order in which you add elements does not affect the
  * resulting order of the property.
  *
  * <h5 class='topic'>List types</h5>
@@ -138,7 +138,7 @@
  * <br>This ensures that the resulting order of the list is in most-to-least importance.
  *
  * <p>
- * For example, multiple calls to <code>pojoSwaps()</code> causes new entries to be added to the beginning of the list
+ * For example, multiple calls to <c>pojoSwaps()</c> causes new entries to be added to the beginning of the list
  * so that previous values can be 'overridden':
  * <p class='bcode w800'>
  * 	<jc>// Swap order:  [MySwap2.class, MySwap1.class]</jc>
@@ -146,7 +146,7 @@
  * </p>
  *
  * <p>
- * Note that the order is different when passing multiple values into the <code>pojoSwaps()</code> method, in which
+ * Note that the order is different when passing multiple values into the <c>pojoSwaps()</c> method, in which
  * case the order should be first-match-wins:
  * <p class='bcode w800'>
  * 	<jc>// Swap order:  [MySwap1.class, MySwap2.class]</jc>
@@ -343,7 +343,7 @@
 	 *
 	 * @param key The property name.
 	 * @param eType The class type of the elements in the property.
-	 * @return The property value as an unmodifiable <code>LinkedHashSet</code>, or an empty set if it doesn't exist.
+	 * @return The property value as an unmodifiable <c>LinkedHashSet</c>, or an empty set if it doesn't exist.
 	 */
 	public <T> Set<T> getSetProperty(String key, Class<T> eType) {
 		Property p = findProperty(key);
@@ -356,7 +356,7 @@
 	 * @param key The property name.
 	 * @param eType The class type of the elements in the property.
 	 * @param def The default value if the property doesn't exist or is empty.
-	 * @return The property value as an unmodifiable <code>LinkedHashSet</code>, or the default value if it doesn't exist or is empty.
+	 * @return The property value as an unmodifiable <c>LinkedHashSet</c>, or the default value if it doesn't exist or is empty.
 	 */
 	public <T> Set<T> getSetProperty(String key, Class<T> eType, Set<T> def) {
 		Set<T> l = getSetProperty(key, eType);
@@ -367,7 +367,7 @@
 	 * Returns the class set property with the specified name.
 	 *
 	 * @param key The property name.
-	 * @return The property value as an unmodifiable <code>LinkedHashSet</code>, or an empty set if it doesn't exist.
+	 * @return The property value as an unmodifiable <c>LinkedHashSet</c>, or an empty set if it doesn't exist.
 	 */
 	@SuppressWarnings("rawtypes")
 	public Set<Class<?>> getClassSetProperty(String key) {
@@ -380,7 +380,7 @@
 	 *
 	 * @param key The property name.
 	 * @param eType The class type of the elements in the property.
-	 * @return The property value as an unmodifiable <code>LinkedHashSet</code>, or an empty set if it doesn't exist.
+	 * @return The property value as an unmodifiable <c>LinkedHashSet</c>, or an empty set if it doesn't exist.
 	 */
 	@SuppressWarnings("rawtypes")
 	public <T> Set<Class<T>> getClassSetProperty(String key, Class<T> eType) {
@@ -393,7 +393,7 @@
 	 *
 	 * @param key The property name.
 	 * @param eType The class type of the elements in the property.
-	 * @return The property value as an unmodifiable <code>ArrayList</code>, or an empty list if it doesn't exist.
+	 * @return The property value as an unmodifiable <c>ArrayList</c>, or an empty list if it doesn't exist.
 	 */
 	public <T> List<T> getListProperty(String key, Class<T> eType) {
 		Property p = findProperty(key);
@@ -406,7 +406,7 @@
 	 * @param key The property name.
 	 * @param eType The class type of the elements in the property.
 	 * @param def The default value if the property doesn't exist or is empty.
-	 * @return The property value as an unmodifiable <code>ArrayList</code>, or the default value if it doesn't exist or is empty.
+	 * @return The property value as an unmodifiable <c>ArrayList</c>, or the default value if it doesn't exist or is empty.
 	 */
 	public <T> List<T> getListProperty(String key, Class<T> eType, List<T> def) {
 		List<T> l = getListProperty(key, eType);
@@ -417,7 +417,7 @@
 	 * Returns the class list property with the specified name.
 	 *
 	 * @param key The property name.
-	 * @return The property value as an unmodifiable <code>ArrayList</code>, or an empty list if it doesn't exist.
+	 * @return The property value as an unmodifiable <c>ArrayList</c>, or an empty list if it doesn't exist.
 	 */
 	@SuppressWarnings("rawtypes")
 	public List<Class<?>> getClassListProperty(String key) {
@@ -430,7 +430,7 @@
 	 *
 	 * @param key The property name.
 	 * @param eType The class type of the elements in the property.
-	 * @return The property value as an unmodifiable <code>ArrayList</code>, or an empty list if it doesn't exist.
+	 * @return The property value as an unmodifiable <c>ArrayList</c>, or an empty list if it doesn't exist.
 	 */
 	@SuppressWarnings("rawtypes")
 	public <T> List<Class<T>> getClassListProperty(String key, Class<T> eType) {
@@ -443,7 +443,7 @@
 	 *
 	 * @param key The property name.
 	 * @param eType The class type of the elements in the property.
-	 * @return The property value as an unmodifiable <code>LinkedHashMap</code>, or an empty map if it doesn't exist.
+	 * @return The property value as an unmodifiable <c>LinkedHashMap</c>, or an empty map if it doesn't exist.
 	 */
 	public <T> Map<String,T> getMapProperty(String key, Class<T> eType) {
 		Property p = findProperty(key);
@@ -454,7 +454,7 @@
 	 * Returns the class map property with the specified name.
 	 *
 	 * @param key The property name.
-	 * @return The property value as an unmodifiable <code>LinkedHashMap</code>, or an empty map if it doesn't exist.
+	 * @return The property value as an unmodifiable <c>LinkedHashMap</c>, or an empty map if it doesn't exist.
 	 */
 	@SuppressWarnings("rawtypes")
 	public Map<String,Class<?>> getClassMapProperty(String key) {
@@ -467,7 +467,7 @@
 	 *
 	 * @param key The property name.
 	 * @param eType The class type of the elements in the property.
-	 * @return The property value as an unmodifiable <code>LinkedHashMap</code>, or an empty map if it doesn't exist.
+	 * @return The property value as an unmodifiable <c>LinkedHashMap</c>, or an empty map if it doesn't exist.
 	 */
 	@SuppressWarnings("rawtypes")
 	public <T> Map<String,Class<T>> getClassMapProperty(String key, Class<T> eType) {
@@ -486,7 +486,7 @@
 	 * @param type The class type of the property.
 	 * @param def
 	 * 	The default value if the property doesn't exist.
-	 * 	<br>Can either be an instance of <code>T</code>, or a <code>Class&lt;? <jk>extends</jk> T&gt;</code>, or <jk>null</jk>.
+	 * 	<br>Can either be an instance of <c>T</c>, or a <code>Class&lt;? <jk>extends</jk> T&gt;</code>, or <jk>null</jk>.
 	 * @return A new property instance.
 	 */
 	public <T> T getInstanceProperty(String key, Class<T> type, Object def) {
@@ -500,7 +500,7 @@
 	 * @param type The class type of the property.
 	 * @param def
 	 * 	The default value if the property doesn't exist.
-	 * 	<br>Can either be an instance of <code>T</code>, or a <code>Class&lt;? <jk>extends</jk> T&gt;</code>.
+	 * 	<br>Can either be an instance of <c>T</c>, or a <code>Class&lt;? <jk>extends</jk> T&gt;</code>.
 	 * @param resolver
 	 * 	The resolver to use for instantiating objects.
 	 * @param args
@@ -520,7 +520,7 @@
 	 * @param type The class type of the property.
 	 * @param def
 	 * 	The default value if the property doesn't exist.
-	 * 	<br>Can either be an instance of <code>T</code>, or a <code>Class&lt;? <jk>extends</jk> T&gt;</code>.
+	 * 	<br>Can either be an instance of <c>T</c>, or a <code>Class&lt;? <jk>extends</jk> T&gt;</code>.
 	 * @param resolver
 	 * 	The resolver to use for instantiating objects.
 	 * @param args
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/PropertyStoreBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/PropertyStoreBuilder.java
index 22e8f08..03dc005 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/PropertyStoreBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/PropertyStoreBuilder.java
@@ -158,7 +158,7 @@
 	 * 	<li class ='ja'>{@link UonConfig}
 	 * 	<li class ='ja'>{@link UrlEncodingConfig}
 	 * 	<li class ='ja'>{@link XmlConfig}
-	 * 	<li class ='ja'><code>RdfConfig</code>
+	 * 	<li class ='ja'><c>RdfConfig</c>
 	 * </ul>
 	 *
 	 * <p>
@@ -200,7 +200,7 @@
 	 * 	<li class ='ja'>{@link UonConfig}
 	 * 	<li class ='ja'>{@link UrlEncodingConfig}
 	 * 	<li class ='ja'>{@link XmlConfig}
-	 * 	<li class ='ja'><code>RdfConfig</code>
+	 * 	<li class ='ja'><c>RdfConfig</c>
 	 * </ul>
 	 *
 	 * <p>
@@ -548,7 +548,7 @@
 		}
 
 		/**
-		 * Used by the <code>toString()</code> method for debugging.
+		 * Used by the <c>toString()</c> method for debugging.
 		 *
 		 * @param bs The bean session.
 		 * @return This object converted to a map.
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/UriResolver.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/UriResolver.java
index bcc2205..3a5a4c2 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/UriResolver.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/UriResolver.java
@@ -118,7 +118,7 @@
 	 *
 	 * <p>
 	 * Similar to {@link URI#relativize(URI)}, except supports special protocols (e.g. <js>"servlet:/"</js>) for both
-	 * the <code>relativeTo</code> and <code>uri</code> parameters.
+	 * the <c>relativeTo</c> and <c>uri</c> parameters.
 	 *
 	 * <p>
 	 * For example, to relativize a URI to its servlet-relative form:
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/Value.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/Value.java
index b75f9f8..2e8b43b 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/Value.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/Value.java
@@ -42,7 +42,7 @@
 	 *
 	 * @param m The method containing the parameter.
 	 * @param i The index of the parameter.
-	 * @return The parameter type of the value, or <jk>null</jk> if the method parameter is not of type <code>Value</code>.
+	 * @return The parameter type of the value, or <jk>null</jk> if the method parameter is not of type <c>Value</c>.
 	 */
 	public static Type getParameterType(Method m, int i) {
 		return getParameterType(m.getGenericParameterTypes()[i]);
@@ -52,7 +52,7 @@
 	 * Returns the generic parameter type of the Value type.
 	 *
 	 * @param t The type to find the parameter type of.
-	 * @return The parameter type of the value, or <jk>null</jk> if the type is not a subclass of <code>Value</code>.
+	 * @return The parameter type of the value, or <jk>null</jk> if the type is not a subclass of <c>Value</c>.
 	 */
 	public static Type getParameterType(Type t) {
 		if (t instanceof ParameterizedType) {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/Visibility.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/Visibility.java
index 6a4d75a..f5fa12c 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/Visibility.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/Visibility.java
@@ -73,7 +73,7 @@
 	}

 

 	/**

-	 * Shortcut for <code>isVisible(x.getModifiers());</code>

+	 * Shortcut for <c>isVisible(x.getModifiers());</c>

 	 *

 	 * @param x The class to check.

 	 * @return <jk>true</jk> if the class is at least as visible as this object.

@@ -83,7 +83,7 @@
 	}

 

 	/**

-	 * Shortcut for <code>isVisible(x.getModifiers());</code>

+	 * Shortcut for <c>isVisible(x.getModifiers());</c>

 	 *

 	 * @param x The constructor to check.

 	 * @return <jk>true</jk> if the constructor is at least as visible as this object.

@@ -93,7 +93,7 @@
 	}

 

 	/**

-	 * Shortcut for <code>isVisible(x.getModifiers());</code>

+	 * Shortcut for <c>isVisible(x.getModifiers());</c>

 	 *

 	 * @param x The field to check.

 	 * @return <jk>true</jk> if the field is at least as visible as this object.

diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Bean.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Bean.java
index 7bde06a..b6d3172 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Bean.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Bean.java
@@ -227,8 +227,8 @@
 	 * Any properties in the stop class or in its base classes will be ignored during analysis.

 	 *

 	 * <p>

-	 * For example, in the following class hierarchy, instances of <code>C3</code> will include property <code>p3</code>,

-	 * but not <code>p1</code> or <code>p2</code>.

+	 * For example, in the following class hierarchy, instances of <c>C3</c> will include property <c>p3</c>,

+	 * but not <c>p1</c> or <c>p2</c>.

 	 * <p class='bcode w800'>

 	 * 	<jk>public class</jk> C1 {

 	 * 		<jk>public int</jk> getP1();

@@ -251,7 +251,7 @@
 	 *

 	 * <p>

 	 * The name is used to identify the class type during parsing when it cannot be inferred through reflection.

-	 * <br>For example, if a bean property is of type <code>Object</code>, then the serializer will add the name to the

+	 * <br>For example, if a bean property is of type <c>Object</c>, then the serializer will add the name to the

 	 * output so that the class can be determined during parsing.

 	 *

 	 * <p>

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 b3970b2..22fbc5f 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
@@ -48,7 +48,7 @@
 	 * Classes are not considered beans unless they meet the minimum visibility requirements.
 	 *
 	 * <p>
-	 * For example, if the visibility is <code>PUBLIC</code> and the bean class is <jk>protected</jk>, then the class
+	 * For example, if the visibility is <c>PUBLIC</c> and the bean class is <jk>protected</jk>, then the class
 	 * will not be interpreted as a bean class and be serialized as a string.
 	 * <br>Use this setting to reduce the visibility requirement.
 	 *
@@ -119,7 +119,7 @@
 	 * A dictionary is a name/class mapping used to find class types during parsing when they cannot be inferred
 	 * through reflection.
 	 * <br>The names are defined through the {@link Bean#typeName() @Bean(typeName)} annotation defined on the bean class.
-	 * <br>For example, if a class <code>Foo</code> has a type-name of <js>"myfoo"</js>, then it would end up serialized
+	 * <br>For example, if a class <c>Foo</c> has a type-name of <js>"myfoo"</js>, then it would end up serialized
 	 * as <js>"{_type:'myfoo',...}"</js>.
 	 *
 	 * <p>
@@ -192,7 +192,7 @@
 	 *
 	 * <p>
 	 * This is a programmatic equivalent to the {@link Bean @Bean} annotation.
-	 * <br>It's useful when you want to use the <code>@Bean</code> annotation functionality, but you don't have the ability to alter
+	 * <br>It's useful when you want to use the <c>@Bean</c> annotation functionality, but you don't have the ability to alter
 	 * the bean classes.
 	 *
 	 * <h5 class='section'>Notes:</h5>
@@ -641,7 +641,7 @@
 	 * 		<ul class='spaced-list'>
 	 * 			<li>A static field annotated with {@link Example @Example}.
 	 * 			<li>A static method annotated with {@link Example @Example} with zero arguments or one {@link BeanSession} argument.
-	 * 			<li>A static method with name <code>example</code> with no arguments or one {@link BeanSession} argument.
+	 * 			<li>A static method with name <c>example</c> with no arguments or one {@link BeanSession} argument.
 	 * 		</ul>
 	 * 	<li>
 	 * 		Supports {@doc DefaultSvlVariables} (e.g. <js>"$C{myConfigVar}"</js>).
@@ -1009,7 +1009,7 @@
 	 *
 	 * <p>
 	 * List of classes that should not be treated as beans even if they appear to be bean-like.
-	 * <br>Not-bean classes are converted to <code>Strings</code> during serialization.
+	 * <br>Not-bean classes are converted to <c>Strings</c> during serialization.
 	 *
 	 * <h5 class='section'>Notes:</h5>
 	 * <ul class='spaced-list'>
@@ -1063,14 +1063,14 @@
 	 * 	<li>
 	 * 		The default value excludes the following packages:
 	 * 		<ul>
-	 * 			<li><code>java.lang</code>
-	 * 			<li><code>java.lang.annotation</code>
-	 * 			<li><code>java.lang.ref</code>
-	 * 			<li><code>java.lang.reflect</code>
-	 * 			<li><code>java.io</code>
-	 * 			<li><code>java.net</code>
-	 * 			<li><code>java.nio.*</code>
-	 * 			<li><code>java.util.*</code>
+	 * 			<li><c>java.lang</c>
+	 * 			<li><c>java.lang.annotation</c>
+	 * 			<li><c>java.lang.ref</c>
+	 * 			<li><c>java.lang.reflect</c>
+	 * 			<li><c>java.io</c>
+	 * 			<li><c>java.net</c>
+	 * 			<li><c>java.nio.*</c>
+	 * 			<li><c>java.util.*</c>
 	 * 		</ul>
 	 * 	<li>
 	 * 		Supports {@doc DefaultSvlVariables} (e.g. <js>"$C{myConfigVar}"</js>).
@@ -1113,7 +1113,7 @@
 	 * and "swap in" the non-serializable class during parsing.
 	 *
 	 * <p>
-	 * An example of a POJO swap would be a <code>Calendar</code> object that gets swapped out for an ISO8601 string.
+	 * An example of a POJO swap would be a <c>Calendar</c> object that gets swapped out for an ISO8601 string.
 	 *
 	 * <p>
 	 * Multiple POJO swaps can be associated with a single class.
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanConstructor.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanConstructor.java
index 60ad50d..67705d2 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanConstructor.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanConstructor.java
@@ -33,7 +33,7 @@
  *

  * <p>

  * When present, bean instantiation is delayed until the call to {@link BeanMap#getBean()}.

- * Until then, bean property values are stored in a local cache until <code>getBean()</code> is called.

+ * Until then, bean property values are stored in a local cache until <c>getBean()</c> is called.

  * Because of this additional caching step, parsing into read-only beans tends to be slower and use more memory than

  * parsing into beans with writable properties.

  *

diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanIgnore.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanIgnore.java
index adbcfcb..e90583a 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanIgnore.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanIgnore.java
@@ -22,7 +22,7 @@
  *

  * <p>

  * Applied to classes that may look like beans, but you want to be treated as non-beans.

- * For example, if you want to force a bean to be converted to a string using the <code>toString()</code> method, use

+ * For example, if you want to force a bean to be converted to a string using the <c>toString()</c> method, use

  * this annotation on the class.

  *

  * <p>

diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/URI.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/URI.java
index b23df0d..71eba2b 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/URI.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/URI.java
@@ -21,7 +21,7 @@
  * Used to identify a class or bean property as a URI.

  *

  * <p>

- * This annotation allows you to identify other classes that return URIs via <code>toString()</code> as URI objects.

+ * This annotation allows you to identify other classes that return URIs via <c>toString()</c> as URI objects.

  *

  * <h5 class='section'>See Also:</h5>

  * <ul>

diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/encoders/Encoder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/encoders/Encoder.java
index 6e8d05c..256f620 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/encoders/Encoder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/encoders/Encoder.java
@@ -22,7 +22,7 @@
  * Used to wrap input and output streams within compression/decompression streams.

  *

  * <p>

- * Encoders are registered with <code>RestServlets</code> through the <ja>@RestResource(encoders)</ja> annotation.

+ * Encoders are registered with <c>RestServlets</c> through the <ja>@RestResource(encoders)</ja> annotation.

  */

 public abstract class Encoder {

 

@@ -45,7 +45,7 @@
 	public abstract OutputStream getOutputStream(OutputStream os) throws IOException;

 

 	/**

-	 * Returns the codings in <code>Content-Encoding</code> and <code>Accept-Encoding</code> headers that this encoder

+	 * Returns the codings in <c>Content-Encoding</c> and <c>Accept-Encoding</c> headers that this encoder

 	 * handles (e.g. <js>"gzip"</js>).

 	 *

 	 * @return The codings that this encoder handles.

diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/encoders/EncoderGroup.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/encoders/EncoderGroup.java
index 6030c1b..2b4bca7 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/encoders/EncoderGroup.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/encoders/EncoderGroup.java
@@ -28,11 +28,11 @@
  *

  * <p>

  * The {@link #getEncoderMatch(String)} and {@link #getEncoder(String)} methods are then used to find appropriate

- * encoders for specific <code>Accept-Encoding</code> and <code>Content-Encoding</code> header values.

+ * encoders for specific <c>Accept-Encoding</c> and <c>Content-Encoding</c> header values.

  *

  * <h5 class='topic'>Match ordering</h5>

  *

- * Encoders are matched against <code>Accept-Encoding</code> strings in the order they exist in this group.

+ * Encoders are matched against <c>Accept-Encoding</c> strings in the order they exist in this group.

  *

  * <p>

  * Adding new entries will cause the entries to be prepended to the group.

@@ -40,7 +40,7 @@
  *

  * <p>

  * For example, calling <code>groupBuilder.append(E1.<jk>class</jk>,E2.<jk>class</jk>).append(E3.<jk>class</jk>,

- * E4.<jk>class</jk>)</code> will result in the order <code>E3, E4, E1, E2</code>.

+ * E4.<jk>class</jk>)</code> will result in the order <c>E3, E4, E1, E2</c>.

  *

  * <h5 class='section'>Example:</h5>

  * <p class='bcode w800'>

@@ -113,8 +113,8 @@
 	}

 

 	/**

-	 * Returns the coding string for the matching encoder that can handle the specified <code>Accept-Encoding</code>

-	 * or <code>Content-Encoding</code> header value.

+	 * Returns the coding string for the matching encoder that can handle the specified <c>Accept-Encoding</c>

+	 * or <c>Content-Encoding</c> header value.

 	 *

 	 * <p>

 	 * Returns <jk>null</jk> if no encoders can handle it.

@@ -122,7 +122,7 @@
 	 * <p>

 	 * This method is fully compliant with the RFC2616/14.3 and 14.11 specifications.

 	 *

-	 * @param acceptEncoding The <code>Accept-Encoding</code> or <code>Content-Encoding</code> value.

+	 * @param acceptEncoding The <c>Accept-Encoding</c> or <c>Content-Encoding</c> value.

 	 * @return The coding value (e.g. <js>"gzip"</js>).

 	 */

 	public EncoderMatch getEncoderMatch(String acceptEncoding) {

diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/encoders/EncoderMatch.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/encoders/EncoderMatch.java
index f5ecb3d..3d4d01f 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/encoders/EncoderMatch.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/encoders/EncoderMatch.java
@@ -13,7 +13,7 @@
 package org.apache.juneau.encoders;
 
 /**
- * Represents a encoder and encoding that matches an HTTP <code>Accept-Encoding</code> header value.
+ * Represents a encoder and encoding that matches an HTTP <c>Accept-Encoding</c> header value.
  */
 public final class EncoderMatch {
 
@@ -26,7 +26,7 @@
 	}
 
 	/**
-	 * Returns the encoding of the encoder that matched the HTTP <code>Accept-Encoding</code> header value.
+	 * Returns the encoding of the encoder that matched the HTTP <c>Accept-Encoding</c> header value.
 	 *
 	 * @return The encoding of the match.
 	 */
@@ -35,7 +35,7 @@
 	}
 
 	/**
-	 * Returns the encoder that matched the HTTP <code>Accept-Encoding</code> header value.
+	 * Returns the encoder that matched the HTTP <c>Accept-Encoding</c> header value.
 	 *
 	 * @return The encoder of the match.
 	 */
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/encoders/Finishable.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/encoders/Finishable.java
index c8a3c8a..4ee2819 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/encoders/Finishable.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/encoders/Finishable.java
@@ -15,7 +15,7 @@
 import java.io.*;
 
 /**
- * Interface that identifies an output stream has having a <code>finish()</code> method.
+ * Interface that identifies an output stream has having a <c>finish()</c> method.
  */
 public interface Finishable {
 
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializer.java
index f9a6066..fd7d0c5 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializer.java
@@ -25,9 +25,9 @@
  *

  * <h5 class='topic'>Media types</h5>

  *

- * Handles <code>Accept</code> types:  <code><b>text/html</b></code>

+ * Handles <c>Accept</c> types:  <bc>text/html</bc>

  * <p>

- * Produces <code>Content-Type</code> types:  <code><b>text/html</b></code>

+ * Produces <c>Content-Type</c> types:  <bc>text/html</bc>

  *

  * <h5 class='topic'>Description</h5>

  *

@@ -36,7 +36,7 @@
  *

  * <p>

  * Configurable properties are typically specified via <ja>@RestResource(properties)</ja> and <ja>@RestMethod(properties)</ja>

- * annotations, although they can also be set programmatically via the <code>RestResponse.setProperty()</code> method.

+ * annotations, although they can also be set programmatically via the <c>RestResponse.setProperty()</c> method.

  *

  * <h5 class='section'>Example:</h5>

  * <p class='bcode w800'>

@@ -68,8 +68,8 @@
  * </p>

  *

  * <p>

- * The <code>$L{...}</code> variable represent localized strings pulled from the resource bundle identified by the

- * <code>messages</code> annotation.

+ * The <c>$L{...}</c> variable represent localized strings pulled from the resource bundle identified by the

+ * <c>messages</c> annotation.

  * <br>These variables are replaced at runtime based on the HTTP request locale.

  * <br>Several built-in runtime variable types are defined, and the API can be extended to include user-defined variables.

  */

@@ -88,7 +88,7 @@
 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"HtmlDocSerializer.aside.ls"</js>

-	 * 	<li><b>Data type:</b>  <code>List&lt;String&gt;</code>

+	 * 	<li><b>Data type:</b>  <c>List&lt;String&gt;</c>

 	 * 	<li><b>Default:</b>  empty list

 	 * 	<li><b>Session property:</b>  <jk>true</jk>

 	 * </ul>

@@ -125,7 +125,7 @@
 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"HtmlDocSerializer.footer.ls"</js>

-	 * 	<li><b>Data type:</b>  <code>List&lt;String&gt;</code>

+	 * 	<li><b>Data type:</b>  <c>List&lt;String&gt;</c>

 	 * 	<li><b>Default:</b>  empty list

 	 * 	<li><b>Session property:</b>  <jk>true</jk>

 	 * </ul>

@@ -156,7 +156,7 @@
 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"HtmlDocSerializer.head.ls"</js>

-	 * 	<li><b>Data type:</b>  <code>List&lt;String&gt;</code>

+	 * 	<li><b>Data type:</b>  <c>List&lt;String&gt;</c>

 	 * 	<li><b>Default:</b>  empty list

 	 * 	<li><b>Session property:</b>  <jk>true</jk>

 	 * </ul>

@@ -195,7 +195,7 @@
 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"HtmlDocSerializer.header.ls"</js>

-	 * 	<li><b>Data type:</b>  <code>List&lt;String&gt;</code>

+	 * 	<li><b>Data type:</b>  <c>List&lt;String&gt;</c>

 	 * 	<li><b>Default:</b>  empty list

 	 * 	<li><b>Session property:</b>  <jk>true</jk>

 	 * </ul>

@@ -224,7 +224,7 @@
 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"HtmlDocSerializer.nav.ls"</js>

-	 * 	<li><b>Data type:</b>  <code>List&lt;String&gt;</code>

+	 * 	<li><b>Data type:</b>  <c>List&lt;String&gt;</c>

 	 * 	<li><b>Default:</b>  empty list

 	 * 	<li><b>Session property:</b>  <jk>true</jk>

 	 * </ul>

@@ -256,7 +256,7 @@
 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"HtmlDocSerializer.navlinks.ls"</js>

-	 * 	<li><b>Data type:</b>  <code>List&lt;String&gt;</code>

+	 * 	<li><b>Data type:</b>  <c>List&lt;String&gt;</c>

 	 * 	<li><b>Default:</b>  empty list

 	 * 	<li><b>Session property:</b>  <jk>true</jk>

 	 * </ul>

@@ -286,7 +286,7 @@
 	 *

 	 * <h5 class='section'>Example:</h5>

 	 * <p>

-	 * The <code>AddressBookResource</code> sample class uses this property...

+	 * The <c>AddressBookResource</c> sample class uses this property...

 	 * <p class='bcode w800'>

 	 * 	<ja>@RestResource</ja>(

 	 * 		properties={

@@ -324,7 +324,7 @@
 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"HtmlDocSerializer.noResultsMessage.s"</js>

-	 * 	<li><b>Data type:</b>  <code>String</code>

+	 * 	<li><b>Data type:</b>  <c>String</c>

 	 * 	<li><b>Default:</b>  <js>"&lt;p&gt;no results&lt;/p&gt;"</js>

 	 * 	<li><b>Session property:</b>  <jk>false</jk>

 	 * </ul>

@@ -353,7 +353,7 @@
 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"HtmlDocSerializer.nowrap.b"</js>

-	 * 	<li><b>Data type:</b>  <code>Boolean</code>

+	 * 	<li><b>Data type:</b>  <c>Boolean</c>

 	 * 	<li><b>Default:</b>  <jk>false</jk>

 	 * 	<li><b>Session property:</b>  <jk>false</jk>

 	 * </ul>

@@ -370,7 +370,7 @@
 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"HtmlDocSerializer.script.ls"</js>

-	 * 	<li><b>Data type:</b>  <code>List&lt;String&gt;</code>

+	 * 	<li><b>Data type:</b>  <c>List&lt;String&gt;</c>

 	 * 	<li><b>Default:</b>  empty list

 	 * 	<li><b>Session property:</b>  <jk>true</jk>

 	 * </ul>

@@ -414,7 +414,7 @@
 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"HtmlDocSerializer.style.ls"</js>

-	 * 	<li><b>Data type:</b>  <code>List&lt;String&gt;</code>

+	 * 	<li><b>Data type:</b>  <c>List&lt;String&gt;</c>

 	 * 	<li><b>Default:</b>  empty list

 	 * 	<li><b>Session property:</b>  <jk>true</jk>

 	 * </ul>

@@ -459,7 +459,7 @@
 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"HtmlDocSerializer.stylesheet.ls"</js>

-	 * 	<li><b>Data type:</b>  <code>List&lt;String&gt;</code>

+	 * 	<li><b>Data type:</b>  <c>List&lt;String&gt;</c>

 	 * 	<li><b>Default:</b>  empty list

 	 * 	<li><b>Session property:</b>  <jk>true</jk>

 	 * </ul>

@@ -616,10 +616,10 @@
 	 * @param accept

 	 * 	The accept media types that the serializer can handle.

 	 * 	<p>

-	 * 	Can contain meta-characters per the <code>media-type</code> specification of

+	 * 	Can contain meta-characters per the <c>media-type</c> specification of

 	 * 	{@doc RFC2616.section14.1}

 	 * 	<p>

-	 * 	If empty, then assumes the only media type supported is <code>produces</code>.

+	 * 	If empty, then assumes the only media type supported is <c>produces</c>.

 	 * 	<p>

 	 * 	For example, if this serializer produces <js>"application/json"</js> but should handle media types of

 	 * 	<js>"application/json"</js> and <js>"text/json"</js>, then the arguments should be:

diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlParser.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlParser.java
index c494179..d8220b3 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlParser.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlParser.java
@@ -22,7 +22,7 @@
  *

  * <h5 class='topic'>Media types</h5>

  *

- * Handles <code>Content-Type</code> types:  <code><b>text/html</b></code>

+ * Handles <c>Content-Type</c> types:  <bc>text/html</bc>

  *

  * <h5 class='topic'>Description</h5>

  *

diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSchemaDocSerializer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSchemaDocSerializer.java
index b698200..2fb9f87 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSchemaDocSerializer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSchemaDocSerializer.java
@@ -21,9 +21,9 @@
  *

  * <h5 class='topic'>Media types</h5>

  *

- * Handles <code>Accept</code> types:  <code><b>text/html+schema</b></code>

+ * Handles <c>Accept</c> types:  <bc>text/html+schema</bc>

  * <p>

- * Produces <code>Content-Type</code> types:  <code><b>text/html</b></code>

+ * Produces <c>Content-Type</c> types:  <bc>text/html</bc>

  *

  * <h5 class='topic'>Description</h5>

  *

@@ -60,10 +60,10 @@
 	 * @param accept

 	 * 	The accept media types that the serializer can handle.

 	 * 	<p>

-	 * 	Can contain meta-characters per the <code>media-type</code> specification of

+	 * 	Can contain meta-characters per the <c>media-type</c> specification of

 	 * 	{@doc RFC2616.section14.1}

 	 * 	<p>

-	 * 	If empty, then assumes the only media type supported is <code>produces</code>.

+	 * 	If empty, then assumes the only media type supported is <c>produces</c>.

 	 * 	<p>

 	 * 	For example, if this serializer produces <js>"application/json"</js> but should handle media types of

 	 * 	<js>"application/json"</js> and <js>"text/json"</js>, then the arguments should be:

diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSchemaSerializer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSchemaSerializer.java
index b7a309b..23d82ac 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSchemaSerializer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSchemaSerializer.java
@@ -22,9 +22,9 @@
  *

  * <h5 class='topic'>Media types</h5>

  *

- * Handles <code>Accept</code> types:  <code><b>text/html+schema</b></code>

+ * Handles <c>Accept</c> types:  <bc>text/html+schema</bc>

  * <p>

- * Produces <code>Content-Type</code> types:  <code><b>text/html</b></code>

+ * Produces <c>Content-Type</c> types:  <bc>text/html</bc>

  *

  * <h5 class='topic'>Description</h5>

  *

diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializer.java
index 6dc3015..a852493 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializer.java
@@ -25,9 +25,9 @@
  *

  * <h5 class='topic'>Media types</h5>

  *

- * Handles <code>Accept</code> types:  <code><b>text/html</b></code>

+ * Handles <c>Accept</c> types:  <bc>text/html</bc>

  * <p>

- * Produces <code>Content-Type</code> types:  <code><b>text/html</b></code>

+ * Produces <c>Content-Type</c> types:  <bc>text/html</bc>

  *

  * <h5 class='topic'>Description</h5>

  *

@@ -138,7 +138,7 @@
 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"HtmlSerializer.addBeanTypes.b"</js>

-	 * 	<li><b>Data type:</b>  <code>Boolean</code>

+	 * 	<li><b>Data type:</b>  <c>Boolean</c>

 	 * 	<li><b>Default:</b>  <jk>false</jk>

 	 * 	<li><b>Session property:</b>  <jk>false</jk>

 	 * 	<li><b>Methods:</b>

@@ -164,7 +164,7 @@
 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"HtmlSerializer.addKeyValueTableHeaders.b"</js>

-	 * 	<li><b>Data type:</b>  <code>Boolean</code>

+	 * 	<li><b>Data type:</b>  <c>Boolean</c>

 	 * 	<li><b>Default:</b>  <jk>false</jk>

 	 * 	<li><b>Session property:</b>  <jk>false</jk>

 	 * 	<li><b>Annotations:</b>

@@ -179,7 +179,7 @@
 	 * </ul>

 	 *

 	 * <p>

-	 * When enabled, <code><b>key</b></code> and <code><b>value</b></code> column headers are added to tables.

+	 * When enabled, <bc>key</bc> and <bc>value</bc> column headers are added to tables.

 	 *

 	 * <h5 class='section'>Example:</h5>

 	 * <p class='bcode w800'>

@@ -207,8 +207,8 @@
 	 *

 	 * <table class='styled'>

 	 * 	<tr>

-	 * 		<th><code>withoutHeaders</code></th>

-	 * 		<th><code>withHeaders</code></th>

+	 * 		<th><c>withoutHeaders</c></th>

+	 * 		<th><c>withHeaders</c></th>

 	 * 	</tr>

 	 * 	<tr>

 	 * 		<td>

@@ -235,7 +235,7 @@
 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"HtmlSerializer.detectLinksInStrings.b"</js>

-	 * 	<li><b>Data type:</b>  <code>Boolean</code>

+	 * 	<li><b>Data type:</b>  <c>Boolean</c>

 	 * 	<li><b>Default:</b>  <jk>true</jk>

 	 * 	<li><b>Session property:</b>  <jk>false</jk>

 	 * 	<li><b>Methods:</b>

@@ -278,8 +278,8 @@
 	 *

 	 * <table class='styled'>

 	 * 	<tr>

-	 * 		<th><code>withLinks</code></th>

-	 * 		<th><code>withoutLinks</code></th>

+	 * 		<th><c>withLinks</c></th>

+	 * 		<th><c>withoutLinks</c></th>

 	 * 	</tr>

 	 * 	<tr>

 	 * 		<td>

@@ -305,7 +305,7 @@
 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"HtmlSerializer.labelParameter.s"</js>

-	 * 	<li><b>Data type:</b>  <code>String</code>

+	 * 	<li><b>Data type:</b>  <c>String</c>

 	 * 	<li><b>Default:</b>  <js>"label"</js>

 	 * 	<li><b>Session property:</b>  <jk>false</jk>

 	 * 	<li><b>Methods:</b>

@@ -330,7 +330,7 @@
 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"HtmlSerializer.detectLabelParameters.b"</js>

-	 * 	<li><b>Data type:</b>  <code>Boolean</code>

+	 * 	<li><b>Data type:</b>  <c>Boolean</c>

 	 * 	<li><b>Default:</b>  <jk>true</jk>

 	 * 	<li><b>Session property:</b>  <jk>false</jk>

 	 * 	<li><b>Methods:</b>

@@ -376,8 +376,8 @@
 	 *

 	 * <table class='styled'>

 	 * 	<tr>

-	 * 		<th><code>withLabels</code></th>

-	 * 		<th><code>withoutLabels</code></th>

+	 * 		<th><c>withLabels</c></th>

+	 * 		<th><c>withoutLabels</c></th>

 	 * 	</tr>

 	 * 	<tr>

 	 * 		<td>

@@ -403,7 +403,7 @@
 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"HtmlSerializer.uriAnchorText.s"</js>

-	 * 	<li><b>Data type:</b>  <code>String</code> ({@link AnchorText})

+	 * 	<li><b>Data type:</b>  <c>String</c> ({@link AnchorText})

 	 * 	<li><b>Default:</b>  <js>"TO_STRING"</js>

 	 * 	<li><b>Session property:</b>  <jk>false</jk>

 	 * 	<li><b>Annotations:</b>

@@ -659,10 +659,10 @@
 	 * @param accept

 	 * 	The accept media types that the serializer can handle.

 	 * 	<p>

-	 * 	Can contain meta-characters per the <code>media-type</code> specification of

+	 * 	Can contain meta-characters per the <c>media-type</c> specification of

 	 * 	{@doc RFC2616.section14.1}

 	 * 	<p>

-	 * 	If empty, then assumes the only media type supported is <code>produces</code>.

+	 * 	If empty, then assumes the only media type supported is <c>produces</c>.

 	 * 	<p>

 	 * 	For example, if this serializer produces <js>"application/json"</js> but should handle media types of

 	 * 	<js>"application/json"</js> and <js>"text/json"</js>, then the arguments should be:

@@ -746,7 +746,7 @@
 	 *

 	 * @see #HTML_addKeyValueTableHeaders

 	 * @return

-	 * 	<jk>true</jk> if <code><b>key</b></code> and <code><b>value</b></code> column headers are added to tables.

+	 * 	<jk>true</jk> if <bc>key</bc> and <bc>value</bc> column headers are added to tables.

 	 */

 	protected final boolean isAddKeyValueTableHeaders() {

 		return addKeyValueTableHeaders;

diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializerSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializerSession.java
index d7c96b7..8ffa083 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializerSession.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializerSession.java
@@ -834,7 +834,7 @@
 	 *

 	 * @see HtmlSerializer#HTML_addKeyValueTableHeaders

 	 * @return

-	 * 	<jk>true</jk> if <code><b>key</b></code> and <code><b>value</b></code> column headers are added to tables.

+	 * 	<jk>true</jk> if <bc>key</bc> and <bc>value</bc> column headers are added to tables.

 	 */

 	protected final boolean isAddKeyValueTableHeaders() {

 		return ctx.isAddKeyValueTableHeaders();

diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlStrippedDocSerializer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlStrippedDocSerializer.java
index 01cb16b..3f469a6 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlStrippedDocSerializer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlStrippedDocSerializer.java
@@ -21,9 +21,9 @@
  *

  * <h5 class='topic'>Media types</h5>

  *

- * Handles <code>Accept</code> types:  <code><b>text/html+stripped</b></code>

+ * Handles <c>Accept</c> types:  <bc>text/html+stripped</bc>

  * <p>

- * Produces <code>Content-Type</code> types:  <code><b>text/html</b></code>

+ * Produces <c>Content-Type</c> types:  <bc>text/html</bc>

  *

  * <h5 class='topic'>Description</h5>

  *

@@ -59,10 +59,10 @@
 	 * @param accept

 	 * 	The accept media types that the serializer can handle.

 	 * 	<p>

-	 * 	Can contain meta-characters per the <code>media-type</code> specification of

+	 * 	Can contain meta-characters per the <c>media-type</c> specification of

 	 * 	{@doc RFC2616.section14.1}

 	 * 	<p>

-	 * 	If empty, then assumes the only media type supported is <code>produces</code>.

+	 * 	If empty, then assumes the only media type supported is <c>produces</c>.

 	 * 	<p>

 	 * 	For example, if this serializer produces <js>"application/json"</js> but should handle media types of

 	 * 	<js>"application/json"</js> and <js>"text/json"</js>, then the arguments should be:

diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlConfig.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlConfig.java
index 0d7181c..3925639 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlConfig.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlConfig.java
@@ -74,15 +74,15 @@
 	 * Configuration property:  Add key/value headers on bean/map tables.
 	 *
 	 * <p>
-	 * When enabled, <code><b>key</b></code> and <code><b>value</b></code> column headers are added to tables.
+	 * When enabled, <bc>key</bc> and <bc>value</bc> column headers are added to tables.
 	 *
 	 * <p>
 	 * The following shows the difference between the two generated outputs:
 	 *
 	 * <table class='styled'>
 	 * 	<tr>
-	 * 		<th><code>withoutHeaders</code></th>
-	 * 		<th><code>withHeaders</code></th>
+	 * 		<th><c>withoutHeaders</c></th>
+	 * 		<th><c>withHeaders</c></th>
 	 * 	</tr>
 	 * 	<tr>
 	 * 		<td>
@@ -134,8 +134,8 @@
 	 *
 	 * <table class='styled'>
 	 * 	<tr>
-	 * 		<th><code>withLinks</code></th>
-	 * 		<th><code>withoutLinks</code></th>
+	 * 		<th><c>withLinks</c></th>
+	 * 		<th><c>withoutLinks</c></th>
 	 * 	</tr>
 	 * 	<tr>
 	 * 		<td>
@@ -212,8 +212,8 @@
 	 *
 	 * <table class='styled'>
 	 * 	<tr>
-	 * 		<th><code>withLabels</code></th>
-	 * 		<th><code>withoutLabels</code></th>
+	 * 		<th><c>withLabels</c></th>
+	 * 		<th><c>withoutLabels</c></th>
 	 * 	</tr>
 	 * 	<tr>
 	 * 		<td>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlFormat.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlFormat.java
index f638089..684e57c 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlFormat.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlFormat.java
@@ -18,7 +18,7 @@
 public enum HtmlFormat {
 
 	/**
-	 * Object is serialized to a String using the <code>toString()</code> method and written directly to output.
+	 * Object is serialized to a String using the <c>toString()</c> method and written directly to output.
 	 * <br>Useful when you want to serialize custom HTML.
 	 */
 	PLAIN_TEXT,
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Accept.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Accept.java
index 2a1c8a5..b572b43 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Accept.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Accept.java
@@ -150,10 +150,10 @@
 	private static final Cache<String,Accept> cache = new Cache<>(NOCACHE, CACHE_MAX_SIZE);
 
 	/**
-	 * Returns a parsed <code>Accept</code> header.
+	 * Returns a parsed <c>Accept</c> header.
 	 *
-	 * @param value The <code>Accept</code> header string.
-	 * @return The parsed <code>Accept</code> header, or <jk>null</jk> if the string was null.
+	 * @param value The <c>Accept</c> header string.
+	 * @return The parsed <c>Accept</c> header, or <jk>null</jk> if the string was null.
 	 */
 	public static Accept forString(String value) {
 		if (value == null)
@@ -186,22 +186,22 @@
 	}
 
 	/**
-	 * Given a list of media types, returns the best match for this <code>Accept</code> header.
+	 * Given a list of media types, returns the best match for this <c>Accept</c> header.
 	 *
 	 * <p>
-	 * Note that fuzzy matching is allowed on the media types where the <code>Accept</code> header may
+	 * Note that fuzzy matching is allowed on the media types where the <c>Accept</c> header may
 	 * contain additional subtype parts.
-	 * <br>For example, given identical q-values and an <code>Accept</code> value of <js>"text/json+activity"</js>,
+	 * <br>For example, given identical q-values and an <c>Accept</c> value of <js>"text/json+activity"</js>,
 	 * the media type <js>"text/json"</js> will match if <js>"text/json+activity"</js> or <js>"text/activity+json"</js>
 	 * isn't found.
-	 * <br>The purpose for this is to allow serializers to match when artifacts such as <code>id</code> properties are
+	 * <br>The purpose for this is to allow serializers to match when artifacts such as <c>id</c> properties are
 	 * present in the header.
 	 *
 	 * <p>
 	 * See {@doc https://www.w3.org/TR/activitypub/#retrieving-objects ActivityPub / Retrieving Objects}
 	 *
 	 * @param mediaTypes The media types to match against.
-	 * @return The index into the array of the best match, or <code>-1</code> if no suitable matches could be found.
+	 * @return The index into the array of the best match, or <c>-1</c> if no suitable matches could be found.
 	 */
 	public int findMatch(MediaType[] mediaTypes) {
 		int matchQuant = 0, matchIndex = -1;
@@ -234,13 +234,13 @@
 	 * Same as {@link #findMatch(MediaType[])} but matching against media type ranges.
 	 *
 	 * <p>
-	 * Note that the q-types on both the <code>mediaTypeRanges</code> parameter and this header
+	 * Note that the q-types on both the <c>mediaTypeRanges</c> parameter and this header
 	 * are taken into account when trying to find the best match.
 	 * <br>When both this header and the matching range have q-values, the q-value for the match is the result of multiplying them.
-	 * <br>(e.g. Accept=<js>"text/html;q=0.9"</js> and mediaTypeRange=<js>"text/html;q=0.9"</js> ==>, q-value=<code>0.81</code>).
+	 * <br>(e.g. Accept=<js>"text/html;q=0.9"</js> and mediaTypeRange=<js>"text/html;q=0.9"</js> ==>, q-value=<c>0.81</c>).
 	 *
 	 * @param mediaTypeRanges The media type ranges to match against.
-	 * @return The index into the array of the best match, or <code>-1</code> if no suitable matches could be found.
+	 * @return The index into the array of the best match, or <c>-1</c> if no suitable matches could be found.
 	 */
 	public int findMatch(MediaTypeRange[] mediaTypeRanges) {
 		float matchQuant = 0;
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/AcceptCharset.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/AcceptCharset.java
index 547cb8c..9742335 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/AcceptCharset.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/AcceptCharset.java
@@ -77,10 +77,10 @@
 	private static final Cache<String,AcceptCharset> cache = new Cache<>(NOCACHE, CACHE_MAX_SIZE);
 
 	/**
-	 * Returns a parsed <code>Accept-Charset</code> header.
+	 * Returns a parsed <c>Accept-Charset</c> header.
 	 *
-	 * @param value The <code>Accept-Charset</code> header string.
-	 * @return The parsed <code>Accept-Charset</code> header, or <jk>null</jk> if the string was null.
+	 * @param value The <c>Accept-Charset</c> header string.
+	 * @return The parsed <c>Accept-Charset</c> header, or <jk>null</jk> if the string was null.
 	 */
 	public static AcceptCharset forString(String value) {
 		if (value == null)
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/AcceptEncoding.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/AcceptEncoding.java
index 2dcfda6..76b851e 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/AcceptEncoding.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/AcceptEncoding.java
@@ -97,10 +97,10 @@
 	private static final Cache<String,AcceptEncoding> cache = new Cache<>(NOCACHE, CACHE_MAX_SIZE);
 
 	/**
-	 * Returns a parsed <code>Accept-Encoding</code> header.
+	 * Returns a parsed <c>Accept-Encoding</c> header.
 	 *
-	 * @param value The <code>Accept-Encoding</code> header string.
-	 * @return The parsed <code>Accept-Encoding</code> header, or <jk>null</jk> if the string was null.
+	 * @param value The <c>Accept-Encoding</c> header string.
+	 * @return The parsed <c>Accept-Encoding</c> header, or <jk>null</jk> if the string was null.
 	 */
 	public static AcceptEncoding forString(String value) {
 		if (value == null)
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/AcceptLanguage.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/AcceptLanguage.java
index f414afa..a67ec04 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/AcceptLanguage.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/AcceptLanguage.java
@@ -109,10 +109,10 @@
 	private static final Cache<String,AcceptLanguage> cache = new Cache<>(NOCACHE, CACHE_MAX_SIZE);
 
 	/**
-	 * Returns a parsed <code>Accept-Language</code> header.
+	 * Returns a parsed <c>Accept-Language</c> header.
 	 *
-	 * @param value The <code>Accept-Language</code> header string.
-	 * @return The parsed <code>Accept-Language</code> header, or <jk>null</jk> if the string was null.
+	 * @param value The <c>Accept-Language</c> header string.
+	 * @return The parsed <c>Accept-Language</c> header, or <jk>null</jk> if the string was null.
 	 */
 	public static AcceptLanguage forString(String value) {
 		if (value == null)
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/AcceptRanges.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/AcceptRanges.java
index 49be769..4f20779 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/AcceptRanges.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/AcceptRanges.java
@@ -65,10 +65,10 @@
 public final class AcceptRanges extends HeaderString {
 
 	/**
-	 * Returns a parsed <code>Accept-Ranges</code> header.
+	 * Returns a parsed <c>Accept-Ranges</c> header.
 	 *
-	 * @param value The <code>Accept-Ranges</code> header string.
-	 * @return The parsed <code>Accept-Ranges</code> header, or <jk>null</jk> if the string was null.
+	 * @param value The <c>Accept-Ranges</c> header string.
+	 * @return The parsed <c>Accept-Ranges</c> header, or <jk>null</jk> if the string was null.
 	 */
 	public static AcceptRanges forString(String value) {
 		if (value == null)
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Age.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Age.java
index 38b9a85..0a4c504 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Age.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Age.java
@@ -69,10 +69,10 @@
 	}
 
 	/**
-	 * Returns a parsed <code>Age</code> header.
+	 * Returns a parsed <c>Age</c> header.
 	 *
-	 * @param value The <code>Age</code> header string.
-	 * @return The parsed <code>Age</code> header, or <jk>null</jk> if the string was null.
+	 * @param value The <c>Age</c> header string.
+	 * @return The parsed <c>Age</c> header, or <jk>null</jk> if the string was null.
 	 */
 	public static Age forString(String value) {
 		if (value == null)
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Allow.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Allow.java
index 6da8c55..cb10b95 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Allow.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Allow.java
@@ -79,10 +79,10 @@
 	}
 
 	/**
-	 * Returns a parsed <code>Allow</code> header.
+	 * Returns a parsed <c>Allow</c> header.
 	 *
-	 * @param value The <code>Allow</code> header string.
-	 * @return The parsed <code>Allow</code> header, or <jk>null</jk> if the string was null.
+	 * @param value The <c>Allow</c> header string.
+	 * @return The parsed <c>Allow</c> header, or <jk>null</jk> if the string was null.
 	 */
 	public static Allow forString(String value) {
 		if (value == null)
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Authorization.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Authorization.java
index 99c726e..801d7b4 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Authorization.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Authorization.java
@@ -74,10 +74,10 @@
 public final class Authorization extends HeaderString {
 
 	/**
-	 * Returns a parsed <code>Authorization</code> header.
+	 * Returns a parsed <c>Authorization</c> header.
 	 *
-	 * @param value The <code>Authorization</code> header string.
-	 * @return The parsed <code>Authorization</code> header, or <jk>null</jk> if the string was null.
+	 * @param value The <c>Authorization</c> header string.
+	 * @return The parsed <c>Authorization</c> header, or <jk>null</jk> if the string was null.
 	 */
 	public static Authorization forString(String value) {
 		if (value == null)
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/CacheControl.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/CacheControl.java
index 174b5af..7010b5f 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/CacheControl.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/CacheControl.java
@@ -98,10 +98,10 @@
 public final class CacheControl extends HeaderString {
 
 	/**
-	 * Returns a parsed <code>Cache-Control</code> header.
+	 * Returns a parsed <c>Cache-Control</c> header.
 	 *
-	 * @param value The <code>Cache-Control</code> header string.
-	 * @return The parsed <code>Cache-Control</code> header, or <jk>null</jk> if the string was null.
+	 * @param value The <c>Cache-Control</c> header string.
+	 * @return The parsed <c>Cache-Control</c> header, or <jk>null</jk> if the string was null.
 	 */
 	public static CacheControl forString(String value) {
 		if (value == null)
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Connection.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Connection.java
index 46584fc..912b9a1 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Connection.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Connection.java
@@ -81,10 +81,10 @@
 public final class Connection extends HeaderString {
 
 	/**
-	 * Returns a parsed <code>Connection</code> header.
+	 * Returns a parsed <c>Connection</c> header.
 	 *
-	 * @param value The <code>Connection</code> header string.
-	 * @return The parsed <code>Connection</code> header, or <jk>null</jk> if the string was null.
+	 * @param value The <c>Connection</c> header string.
+	 * @return The parsed <c>Connection</c> header, or <jk>null</jk> if the string was null.
 	 */
 	public static Connection forString(String value) {
 		if (value == null)
@@ -98,27 +98,27 @@
 	}
 
 	/**
-	 * Returns <jk>true</jk> if the header value is <code>close</code>.
+	 * Returns <jk>true</jk> if the header value is <c>close</c>.
 	 *
-	 * @return <jk>true</jk> if the header value is <code>close</code>.
+	 * @return <jk>true</jk> if the header value is <c>close</c>.
 	 */
 	public boolean isClose() {
 		return eqIC("close");
 	}
 
 	/**
-	 * Returns <jk>true</jk> if the header value is <code>keep-alive</code>.
+	 * Returns <jk>true</jk> if the header value is <c>keep-alive</c>.
 	 *
-	 * @return <jk>true</jk> if the header value is <code>keep-alive</code>.
+	 * @return <jk>true</jk> if the header value is <c>keep-alive</c>.
 	 */
 	public boolean isKeepAlive() {
 		return eqIC("keep-alive");
 	}
 
 	/**
-	 * Returns <jk>true</jk> if the header value is <code>upgrade</code>.
+	 * Returns <jk>true</jk> if the header value is <c>upgrade</c>.
 	 *
-	 * @return <jk>true</jk> if the header value is <code>upgrade</code>.
+	 * @return <jk>true</jk> if the header value is <c>upgrade</c>.
 	 */
 	public boolean isUpgrade() {
 		return eqIC("upgrade");
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/ContentEncoding.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/ContentEncoding.java
index 3b0f806..85542a5 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/ContentEncoding.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/ContentEncoding.java
@@ -71,10 +71,10 @@
 public final class ContentEncoding extends HeaderEnum<ContentEncodingEnum> {
 
 	/**
-	 * Returns a parsed <code>Content-Encoding</code> header.
+	 * Returns a parsed <c>Content-Encoding</c> header.
 	 *
-	 * @param value The <code>Content-Encoding</code> header string.
-	 * @return The parsed <code>Content-Encoding</code> header, or <jk>null</jk> if the string was null.
+	 * @param value The <c>Content-Encoding</c> header string.
+	 * @return The parsed <c>Content-Encoding</c> header, or <jk>null</jk> if the string was null.
 	 */
 	public static ContentEncoding forString(String value) {
 		if (value == null)
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/ContentEncodingEnum.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/ContentEncodingEnum.java
index a90a925..b1c5eaa 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/ContentEncodingEnum.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/ContentEncodingEnum.java
@@ -13,7 +13,7 @@
 package org.apache.juneau.http;
 
 /**
- * Represents the possible values for a <code>Content-Encoding</code> header.
+ * Represents the possible values for a <c>Content-Encoding</c> header.
  *
  * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/ContentLanguage.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/ContentLanguage.java
index 43adf2a..6bfd6cf 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/ContentLanguage.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/ContentLanguage.java
@@ -84,10 +84,10 @@
 	}
 
 	/**
-	 * Returns a parsed <code>Content-Language</code> header.
+	 * Returns a parsed <c>Content-Language</c> header.
 	 *
-	 * @param value The <code>Content-Language</code> header string.
-	 * @return The parsed <code>Content-Language</code> header, or <jk>null</jk> if the string was null.
+	 * @param value The <c>Content-Language</c> header string.
+	 * @return The parsed <c>Content-Language</c> header, or <jk>null</jk> if the string was null.
 	 */
 	public static ContentLanguage forString(String value) {
 		if (value == null)
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/ContentLength.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/ContentLength.java
index f49ede9..0caebc4 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/ContentLength.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/ContentLength.java
@@ -72,10 +72,10 @@
 	}
 
 	/**
-	 * Returns a parsed <code>Content-Length</code> header.
+	 * Returns a parsed <c>Content-Length</c> header.
 	 *
-	 * @param value The <code>Content-Length</code> header string.
-	 * @return The parsed <code>Content-Length</code> header, or <jk>null</jk> if the string was null.
+	 * @param value The <c>Content-Length</c> header string.
+	 * @return The parsed <c>Content-Length</c> header, or <jk>null</jk> if the string was null.
 	 */
 	public static ContentLength forString(String value) {
 		if (value == null)
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/ContentLocation.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/ContentLocation.java
index d62e3fb..1000b25 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/ContentLocation.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/ContentLocation.java
@@ -69,10 +69,10 @@
 public final class ContentLocation extends HeaderUri {
 
 	/**
-	 * Returns a parsed <code>Content-Location</code> header.
+	 * Returns a parsed <c>Content-Location</c> header.
 	 *
-	 * @param value The <code>Content-Location</code> header string.
-	 * @return The parsed <code>Content-Location</code> header, or <jk>null</jk> if the string was null.
+	 * @param value The <c>Content-Location</c> header string.
+	 * @return The parsed <c>Content-Location</c> header, or <jk>null</jk> if the string was null.
 	 */
 	public static ContentLocation forString(String value) {
 		if (value == null)
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/ContentRange.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/ContentRange.java
index 07f48e0..64b685c 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/ContentRange.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/ContentRange.java
@@ -131,10 +131,10 @@
 public final class ContentRange extends HeaderString {
 
 	/**
-	 * Returns a parsed <code>Content-Range</code> header.
+	 * Returns a parsed <c>Content-Range</c> header.
 	 *
-	 * @param value The <code>Content-Range</code> header string.
-	 * @return The parsed <code>Content-Range</code> header, or <jk>null</jk> if the string was null.
+	 * @param value The <c>Content-Range</c> header string.
+	 * @return The parsed <c>Content-Range</c> header, or <jk>null</jk> if the string was null.
 	 */
 	public static ContentRange forString(String value) {
 		if (value == null)
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/ContentType.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/ContentType.java
index ddc94a2..0aa5ad9 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/ContentType.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/ContentType.java
@@ -54,10 +54,10 @@
 	private static Cache<String,ContentType> cache = new Cache<>(NOCACHE, CACHE_MAX_SIZE);
 
 	/**
-	 * Returns a parsed <code>Content-Type</code> header.
+	 * Returns a parsed <c>Content-Type</c> header.
 	 *
-	 * @param value The <code>Content-Type</code> header string.
-	 * @return The parsed <code>Content-Type</code> header, or <jk>null</jk> if the string was null.
+	 * @param value The <c>Content-Type</c> header string.
+	 * @return The parsed <c>Content-Type</c> header, or <jk>null</jk> if the string was null.
 	 */
 	public static ContentType forString(String value) {
 		if (value == null)
@@ -74,19 +74,19 @@
 	}
 
 	/**
-	 * Given a list of media types, returns the best match for this <code>Content-Type</code> header.
+	 * Given a list of media types, returns the best match for this <c>Content-Type</c> header.
 	 *
 	 * <p>
-	 * Note that fuzzy matching is allowed on the media types where the <code>Content-Types</code> header may
+	 * Note that fuzzy matching is allowed on the media types where the <c>Content-Types</c> header may
 	 * contain additional subtype parts.
-	 * <br>For example, given a <code>Content-Type</code> value of <js>"text/json+activity"</js>,
+	 * <br>For example, given a <c>Content-Type</c> value of <js>"text/json+activity"</js>,
 	 * the media type <js>"text/json"</js> will match if <js>"text/json+activity"</js> or <js>"text/activity+json"</js>
 	 * isn't found.
-	 * <br>The purpose for this is to allow parsers to match when artifacts such as <code>id</code> properties are
+	 * <br>The purpose for this is to allow parsers to match when artifacts such as <c>id</c> properties are
 	 * present in the header.
 	 *
 	 * @param mediaTypes The media types to match against.
-	 * @return The index into the array of the best match, or <code>-1</code> if no suitable matches could be found.
+	 * @return The index into the array of the best match, or <c>-1</c> if no suitable matches could be found.
 	 */
 	public int findMatch(MediaType[] mediaTypes) {
 		int matchQuant = 0, matchIndex = -1;
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Date.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Date.java
index 581dc59..780fd7a 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Date.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Date.java
@@ -81,10 +81,10 @@
 public final class Date extends HeaderDate {
 
 	/**
-	 * Returns a parsed <code>Date</code> header.
+	 * Returns a parsed <c>Date</c> header.
 	 *
-	 * @param value The <code>Date</code> header string.
-	 * @return The parsed <code>Date</code> header, or <jk>null</jk> if the string was null.
+	 * @param value The <c>Date</c> header string.
+	 * @return The parsed <c>Date</c> header, or <jk>null</jk> if the string was null.
 	 */
 	public static Date forString(String value) {
 		if (value == null)
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/ETag.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/ETag.java
index b0b09f9..0f85f5c 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/ETag.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/ETag.java
@@ -52,10 +52,10 @@
 public final class ETag extends HeaderString {
 
 	/**
-	 * Returns a parsed <code>ETag</code> header.
+	 * Returns a parsed <c>ETag</c> header.
 	 *
-	 * @param value The <code>ETag</code> header string.
-	 * @return The parsed <code>ETag</code> header, or <jk>null</jk> if the string was null.
+	 * @param value The <c>ETag</c> header string.
+	 * @return The parsed <c>ETag</c> header, or <jk>null</jk> if the string was null.
 	 */
 	public static ETag forString(String value) {
 		if (value == null)
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/EntityValidator.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/EntityValidator.java
index f143446..78a1b6a 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/EntityValidator.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/EntityValidator.java
@@ -66,9 +66,9 @@
 	}
 
 	/**
-	 * Returns <jk>true</jk> if the validator string value is <code>*</code>.
+	 * Returns <jk>true</jk> if the validator string value is <c>*</c>.
 	 *
-	 * @return <jk>true</jk> if the validator string value is <code>*</code>.
+	 * @return <jk>true</jk> if the validator string value is <c>*</c>.
 	 */
 	public boolean isAny() {
 		return "*".equals(value);
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Expect.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Expect.java
index 7cf0228..070ee93 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Expect.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Expect.java
@@ -71,10 +71,10 @@
 public final class Expect extends HeaderString {
 
 	/**
-	 * Returns a parsed <code>Expect</code> header.
+	 * Returns a parsed <c>Expect</c> header.
 	 *
-	 * @param value The <code>Expect</code> header string.
-	 * @return The parsed <code>Expect</code> header, or <jk>null</jk> if the string was null.
+	 * @param value The <c>Expect</c> header string.
+	 * @return The parsed <c>Expect</c> header, or <jk>null</jk> if the string was null.
 	 */
 	public static Expect forString(String value) {
 		if (value == null)
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Expires.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Expires.java
index ce53e63..9e753f4 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Expires.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Expires.java
@@ -82,10 +82,10 @@
 public final class Expires extends HeaderDate {
 
 	/**
-	 * Returns a parsed <code>Expires</code> header.
+	 * Returns a parsed <c>Expires</c> header.
 	 *
-	 * @param value The <code>Expires</code> header string.
-	 * @return The parsed <code>Expires</code> header, or <jk>null</jk> if the string was null.
+	 * @param value The <c>Expires</c> header string.
+	 * @return The parsed <c>Expires</c> header, or <jk>null</jk> if the string was null.
 	 */
 	public static Expires forString(String value) {
 		if (value == null)
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/From.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/From.java
index eb0b4ff..5604846 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/From.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/From.java
@@ -69,10 +69,10 @@
 public final class From extends HeaderString {
 
 	/**
-	 * Returns a parsed <code>From</code> header.
+	 * Returns a parsed <c>From</c> header.
 	 *
-	 * @param value The <code>From</code> header string.
-	 * @return The parsed <code>From</code> header, or <jk>null</jk> if the string was null.
+	 * @param value The <c>From</c> header string.
+	 * @return The parsed <c>From</c> header, or <jk>null</jk> if the string was null.
 	 */
 	public static From forString(String value) {
 		if (value == null)
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/HeaderRangeArray.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/HeaderRangeArray.java
index d4ff1e3..0acfb6a 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/HeaderRangeArray.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/HeaderRangeArray.java
@@ -51,7 +51,7 @@
 	 * Given a list of type values, returns the best match for this header.
 	 *
 	 * @param types The types to match against.
-	 * @return The index into the array of the best match, or <code>-1</code> if no suitable matches could be found.
+	 * @return The index into the array of the best match, or <c>-1</c> if no suitable matches could be found.
 	 */
 	public int findMatch(String[] types) {
 
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Host.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Host.java
index 33eb562..e712c90 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Host.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Host.java
@@ -71,10 +71,10 @@
 public final class Host extends HeaderString {
 
 	/**
-	 * Returns a parsed <code>Host</code> header.
+	 * Returns a parsed <c>Host</c> header.
 	 *
-	 * @param value The <code>Host</code> header string.
-	 * @return The parsed <code>Host</code> header, or <jk>null</jk> if the string was null.
+	 * @param value The <c>Host</c> header string.
+	 * @return The parsed <c>Host</c> header, or <jk>null</jk> if the string was null.
 	 */
 	public static Host forString(String value) {
 		if (value == null)
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/IfMatch.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/IfMatch.java
index f10e0ed..369b9b8 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/IfMatch.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/IfMatch.java
@@ -93,10 +93,10 @@
 public final class IfMatch extends HeaderEntityValidatorArray {
 
 	/**
-	 * Returns a parsed <code>If-Match</code> header.
+	 * Returns a parsed <c>If-Match</c> header.
 	 *
-	 * @param value The <code>If-Match</code> header string.
-	 * @return The parsed <code>If-Match</code> header, or <jk>null</jk> if the string was null.
+	 * @param value The <c>If-Match</c> header string.
+	 * @return The parsed <c>If-Match</c> header, or <jk>null</jk> if the string was null.
 	 */
 	public static IfMatch forString(String value) {
 		if (value == null)
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/IfModifiedSince.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/IfModifiedSince.java
index 8bfe5c5..7b87796 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/IfModifiedSince.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/IfModifiedSince.java
@@ -93,10 +93,10 @@
 public final class IfModifiedSince extends HeaderDate {
 
 	/**
-	 * Returns a parsed <code>If-Modified-Since</code> header.
+	 * Returns a parsed <c>If-Modified-Since</c> header.
 	 *
-	 * @param value The <code>If-Modified-Since</code> header string.
-	 * @return The parsed <code>If-Modified-Since</code> header, or <jk>null</jk> if the string was null.
+	 * @param value The <c>If-Modified-Since</c> header string.
+	 * @return The parsed <c>If-Modified-Since</c> header, or <jk>null</jk> if the string was null.
 	 */
 	public static IfModifiedSince forString(String value) {
 		if (value == null)
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/IfNoneMatch.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/IfNoneMatch.java
index 43de3ee..8120ea9 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/IfNoneMatch.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/IfNoneMatch.java
@@ -96,10 +96,10 @@
 public final class IfNoneMatch extends HeaderEntityValidatorArray {
 
 	/**
-	 * Returns a parsed <code>If-None-Match</code> header.
+	 * Returns a parsed <c>If-None-Match</c> header.
 	 *
-	 * @param value The <code>If-None-Match</code> header string.
-	 * @return The parsed <code>If-None-Match</code> header, or <jk>null</jk> if the string was null.
+	 * @param value The <c>If-None-Match</c> header string.
+	 * @return The parsed <c>If-None-Match</c> header, or <jk>null</jk> if the string was null.
 	 */
 	public static IfNoneMatch forString(String value) {
 		if (value == null)
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/IfRange.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/IfRange.java
index c18c4e3..4df1cbf 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/IfRange.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/IfRange.java
@@ -66,10 +66,10 @@
 public final class IfRange extends HeaderString {
 
 	/**
-	 * Returns a parsed <code>If-Range</code> header.
+	 * Returns a parsed <c>If-Range</c> header.
 	 *
-	 * @param value The <code>If-Range</code> header string.
-	 * @return The parsed <code>If-Range</code> header, or <jk>null</jk> if the string was null.
+	 * @param value The <c>If-Range</c> header string.
+	 * @return The parsed <c>If-Range</c> header, or <jk>null</jk> if the string was null.
 	 */
 	public static IfRange forString(String value) {
 		if (value == null)
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/IfUnmodifiedSince.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/IfUnmodifiedSince.java
index 81327fe..175a3ac 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/IfUnmodifiedSince.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/IfUnmodifiedSince.java
@@ -65,10 +65,10 @@
 public final class IfUnmodifiedSince extends HeaderDate {
 
 	/**
-	 * Returns a parsed <code>If-Unmodified-Since</code> header.
+	 * Returns a parsed <c>If-Unmodified-Since</c> header.
 	 *
-	 * @param value The <code>If-Unmodified-Since</code> header string.
-	 * @return The parsed <code>If-Unmodified-Since</code> header, or <jk>null</jk> if the string was null.
+	 * @param value The <c>If-Unmodified-Since</c> header string.
+	 * @return The parsed <c>If-Unmodified-Since</c> header, or <jk>null</jk> if the string was null.
 	 */
 	public static IfUnmodifiedSince forString(String value) {
 		if (value == null)
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/LastModified.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/LastModified.java
index bcd0f82..5531f36 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/LastModified.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/LastModified.java
@@ -72,10 +72,10 @@
 public final class LastModified extends HeaderDate {
 
 	/**
-	 * Returns a parsed <code>Last-Modified</code> header.
+	 * Returns a parsed <c>Last-Modified</c> header.
 	 *
-	 * @param value The <code>Last-Modified</code> header string.
-	 * @return The parsed <code>Last-Modified</code> header, or <jk>null</jk> if the string was null.
+	 * @param value The <c>Last-Modified</c> header string.
+	 * @return The parsed <c>Last-Modified</c> header, or <jk>null</jk> if the string was null.
 	 */
 	public static LastModified forString(String value) {
 		if (value == null)
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Location.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Location.java
index ac9235d..0c69bc3 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Location.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Location.java
@@ -58,10 +58,10 @@
 public final class Location extends HeaderUri {
 
 	/**
-	 * Returns a parsed <code>Location</code> header.
+	 * Returns a parsed <c>Location</c> header.
 	 *
-	 * @param value The <code>Location</code> header string.
-	 * @return The parsed <code>Location</code> header, or <jk>null</jk> if the string was null.
+	 * @param value The <c>Location</c> header string.
+	 * @return The parsed <c>Location</c> header, or <jk>null</jk> if the string was null.
 	 */
 	public static Location forString(String value) {
 		if (value == null)
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/MaxForwards.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/MaxForwards.java
index f7480e1..68781ec 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/MaxForwards.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/MaxForwards.java
@@ -70,10 +70,10 @@
 	}
 
 	/**
-	 * Returns a parsed <code>Max-Forwards</code> header.
+	 * Returns a parsed <c>Max-Forwards</c> header.
 	 *
-	 * @param value The <code>Max-Forwards</code> header string.
-	 * @return The parsed <code>Max-Forwards</code> header, or <jk>null</jk> if the string was null.
+	 * @param value The <c>Max-Forwards</c> header string.
+	 * @return The parsed <c>Max-Forwards</c> header, or <jk>null</jk> if the string was null.
 	 */
 	public static MaxForwards forString(String value) {
 		if (value == null)
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/MediaType.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/MediaType.java
index d24e7af..7a3d4ea 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/MediaType.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/MediaType.java
@@ -103,13 +103,13 @@
 	}
 
 	/**
-	 * Same as {@link #forString(String)} but allows you to construct an array of <code>MediaTypes</code> from an
+	 * Same as {@link #forString(String)} but allows you to construct an array of <c>MediaTypes</c> from an
 	 * array of strings.
 	 *
 	 * @param s
 	 * 	The media type strings.
 	 * @return
-	 * 	An array of <code>MediaType</code> objects.
+	 * 	An array of <c>MediaType</c> objects.
 	 * 	<br>Always the same length as the input string array.
 	 */
 	public static MediaType[] forStrings(String...s) {
@@ -244,7 +244,7 @@
 	 * 	<li>Exact matches (e.g. <js>"text/json"<js>/</js>"text/json"</js>) should match
 	 * 		better than meta-character matches (e.g. <js>"text/*"<js>/</js>"text/json"</js>)
 	 * 	<li>The comparison media type can have additional subtype tokens (e.g. <js>"text/json+foo"</js>)
-	 * 		that will not prevent a match if the <code>allowExtraSubTypes</code> flag is set.
+	 * 		that will not prevent a match if the <c>allowExtraSubTypes</c> flag is set.
 	 * 		The reverse is not true, e.g. the comparison media type must contain all subtype tokens found in the
 	 * 		comparing media type.
 	 * 		<ul>
@@ -255,18 +255,18 @@
 	 * 		More token matches should result in a higher match number.
 	 * </ul>
 	 *
-	 * The formula is as follows for <code>type/subTypes</code>:
+	 * The formula is as follows for <c>type/subTypes</c>:
 	 * <ul>
-	 * 	<li>An exact match is <code>100,000</code>.
+	 * 	<li>An exact match is <c>100,000</c>.
 	 * 	<li>Add the following for type (assuming subtype match is &lt;0):
 	 * 	<ul>
-	 * 		<li><code>10,000</code> for an exact match (e.g. <js>"text"</js>==<js>"text"</js>).
-	 * 		<li><code>5,000</code> for a meta match (e.g. <js>"*"</js>==<js>"text"</js>).
+	 * 		<li><c>10,000</c> for an exact match (e.g. <js>"text"</js>==<js>"text"</js>).
+	 * 		<li><c>5,000</c> for a meta match (e.g. <js>"*"</js>==<js>"text"</js>).
 	 * 	</ul>
 	 * 	<li>Add the following for subtype (assuming type match is &lt;0):
 	 * 	<ul>
-	 * 		<li><code>7,500</code> for an exact match (e.g. <js>"json+foo"</js>==<js>"json+foo"</js> or <js>"json+foo"</js>==<js>"foo+json"</js>)
-	 * 		<li><code>100</code> for every subtype entry match (e.g. <js>"json"</js>/<js>"json+foo"</js>)
+	 * 		<li><c>7,500</c> for an exact match (e.g. <js>"json+foo"</js>==<js>"json+foo"</js> or <js>"json+foo"</js>==<js>"foo+json"</js>)
+	 * 		<li><c>100</c> for every subtype entry match (e.g. <js>"json"</js>/<js>"json+foo"</js>)
 	 * 	</ul>
 	 * </ul>
 	 *
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/MediaTypeRange.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/MediaTypeRange.java
index 69e3e22..738c048 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/MediaTypeRange.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/MediaTypeRange.java
@@ -42,14 +42,14 @@
 	private final Map<String,Set<String>> extensions;

 

 	/**

-	 * Parses an <code>Accept</code> header value into an array of media ranges.

+	 * Parses an <c>Accept</c> header value into an array of media ranges.

 	 *

 	 * <p>

 	 * The returned media ranges are sorted such that the most acceptable media is available at ordinal position

 	 * <js>'0'</js>, and the least acceptable at position n-1.

 	 *

 	 * <p>

-	 * The syntax expected to be found in the referenced <code>value</code> complies with the syntax described in

+	 * The syntax expected to be found in the referenced <c>value</c> complies with the syntax described in

 	 * RFC2616, Section 14.1, as described below:

 	 * <p class='bcode w800'>

 	 * 	Accept         = "Accept" ":"

@@ -65,7 +65,7 @@
 	 *

 	 * @param value

 	 * 	The value to parse.

-	 * 	If <jk>null</jk> or empty, returns a single <code>MediaTypeRange</code> is returned that represents all types.

+	 * 	If <jk>null</jk> or empty, returns a single <c>MediaTypeRange</c> is returned that represents all types.

 	 * @return

 	 * 	The media ranges described by the string.

 	 * 	The ranges are sorted such that the most acceptable media is available at ordinal position <js>'0'</js>, and

@@ -168,7 +168,7 @@
 	 * Returns the <js>'q'</js> (quality) value for this type, as described in Section 3.9 of RFC2616.

 	 *

 	 * <p>

-	 * The quality value is a float between <code>0.0</code> (unacceptable) and <code>1.0</code> (most acceptable).

+	 * The quality value is a float between <c>0.0</c> (unacceptable) and <c>1.0</c> (most acceptable).

 	 *

 	 * <p>

 	 * If 'q' value doesn't make sense for the context (e.g. this range was extracted from a <js>"content-*"</js>

@@ -193,12 +193,12 @@
 	}

 

 	/**

-	 * Provides a string representation of this media range, suitable for use as an <code>Accept</code> header value.

+	 * Provides a string representation of this media range, suitable for use as an <c>Accept</c> header value.

 	 *

 	 * <p>

 	 * The literal text generated will be all lowercase.

 	 *

-	 * @return A media range suitable for use as an Accept header value, never <code>null</code>.

+	 * @return A media range suitable for use as an Accept header value, never <c>null</c>.

 	 */

 	@Override /* Object */

 	public String toString() {

@@ -226,7 +226,7 @@
 	}

 

 	/**

-	 * Returns <jk>true</jk> if the specified object is also a <code>MediaType</code>, and has the same qValue, type,

+	 * Returns <jk>true</jk> if the specified object is also a <c>MediaType</c>, and has the same qValue, type,

 	 * parameters, and extensions.

 	 *

 	 * @return <jk>true</jk> if object is equivalent.

@@ -247,9 +247,9 @@
 	}

 

 	/**

-	 * Returns a hash based on this instance's <code>media-type</code>.

+	 * Returns a hash based on this instance's <c>media-type</c>.

 	 *

-	 * @return A hash based on this instance's <code>media-type</code>.

+	 * @return A hash based on this instance's <c>media-type</c>.

 	 */

 	@Override /* Object */

 	public int hashCode() {

@@ -260,12 +260,12 @@
 	 * Compares two MediaRanges for equality.

 	 *

 	 * <p>

-	 * The values are first compared according to <code>qValue</code> values.

-	 * Should those values be equal, the <code>type</code> is then lexicographically compared (case-insensitive) in

+	 * The values are first compared according to <c>qValue</c> values.

+	 * Should those values be equal, the <c>type</c> is then lexicographically compared (case-insensitive) in

 	 * ascending order, with the <js>"*"</js> type demoted last in that order.

-	 * <code>MediaRanges</code> with the same type but different sub-types are compared - a more specific subtype is

+	 * <c>MediaRanges</c> with the same type but different sub-types are compared - a more specific subtype is

 	 * promoted over the 'wildcard' subtype.

-	 * <code>MediaRanges</code> with the same types but with extensions are promoted over those same types with no

+	 * <c>MediaRanges</c> with the same types but with extensions are promoted over those same types with no

 	 * extensions.

 	 *

 	 * @param o The range to compare to.  Never <jk>null</jk>.

diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Pragma.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Pragma.java
index 0fc8d1e..27baf7c 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Pragma.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Pragma.java
@@ -69,10 +69,10 @@
 public final class Pragma extends HeaderString {
 
 	/**
-	 * Returns a parsed <code>Pragma</code> header.
+	 * Returns a parsed <c>Pragma</c> header.
 	 *
-	 * @param value The <code>Pragma</code> header string.
-	 * @return The parsed <code>Pragma</code> header, or <jk>null</jk> if the string was null.
+	 * @param value The <c>Pragma</c> header string.
+	 * @return The parsed <c>Pragma</c> header, or <jk>null</jk> if the string was null.
 	 */
 	public static Pragma forString(String value) {
 		if (value == null)
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/ProxyAuthenticate.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/ProxyAuthenticate.java
index 42c43cf..17b1df0 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/ProxyAuthenticate.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/ProxyAuthenticate.java
@@ -52,10 +52,10 @@
 public final class ProxyAuthenticate extends HeaderString {
 
 	/**
-	 * Returns a parsed <code>Proxy-Authenticate</code> header.
+	 * Returns a parsed <c>Proxy-Authenticate</c> header.
 	 *
-	 * @param value The <code>Proxy-Authenticate</code> header string.
-	 * @return The parsed <code>Proxy-Authenticate</code> header, or <jk>null</jk> if the string was null.
+	 * @param value The <c>Proxy-Authenticate</c> header string.
+	 * @return The parsed <c>Proxy-Authenticate</c> header, or <jk>null</jk> if the string was null.
 	 */
 	public static ProxyAuthenticate forString(String value) {
 		if (value == null)
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/ProxyAuthorization.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/ProxyAuthorization.java
index 4b74304..0c0a631 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/ProxyAuthorization.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/ProxyAuthorization.java
@@ -54,10 +54,10 @@
 public final class ProxyAuthorization extends HeaderString {
 
 	/**
-	 * Returns a parsed <code>Proxy-Authorization</code> header.
+	 * Returns a parsed <c>Proxy-Authorization</c> header.
 	 *
-	 * @param value The <code>Proxy-Authorization</code> header string.
-	 * @return The parsed <code>Proxy-Authorization</code> header, or <jk>null</jk> if the string was null.
+	 * @param value The <c>Proxy-Authorization</c> header string.
+	 * @return The parsed <c>Proxy-Authorization</c> header, or <jk>null</jk> if the string was null.
 	 */
 	public static ProxyAuthorization forString(String value) {
 		if (value == null)
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Range.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Range.java
index 0af0874..927d4ca 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Range.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Range.java
@@ -144,10 +144,10 @@
 public final class Range extends HeaderString {
 
 	/**
-	 * Returns a parsed <code>Range</code> header.
+	 * Returns a parsed <c>Range</c> header.
 	 *
-	 * @param value The <code>Range</code> header string.
-	 * @return The parsed <code>Range</code> header, or <jk>null</jk> if the string was null.
+	 * @param value The <c>Range</c> header string.
+	 * @return The parsed <c>Range</c> header, or <jk>null</jk> if the string was null.
 	 */
 	public static Range forString(String value) {
 		if (value == null)
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/ReaderResource.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/ReaderResource.java
index 8b9fe17..219e6f2 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/ReaderResource.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/ReaderResource.java
@@ -72,10 +72,10 @@
 	 * 	<br>If multiple contents are specified, the results will be concatenated.

 	 * 	<br>Contents can be any of the following:

 	 * 	<ul>

-	 * 		<li><code>InputStream</code>

-	 * 		<li><code>Reader</code> - Converted to UTF-8 bytes.

-	 * 		<li><code>File</code>

-	 * 		<li><code>CharSequence</code> - Converted to UTF-8 bytes.

+	 * 		<li><c>InputStream</c>

+	 * 		<li><c>Reader</c> - Converted to UTF-8 bytes.

+	 * 		<li><c>File</c>

+	 * 		<li><c>CharSequence</c> - Converted to UTF-8 bytes.

 	 * 	</ul>

 	 * @throws IOException

 	 */

@@ -147,10 +147,10 @@
 		 * 	<br>If multiple contents are specified, the results will be concatenated.

 		 * 	<br>Contents can be any of the following:

 		 * 	<ul>

-		 * 		<li><code>InputStream</code>

-		 * 		<li><code>Reader</code> - Converted to UTF-8 bytes.

-		 * 		<li><code>File</code>

-		 * 		<li><code>CharSequence</code> - Converted to UTF-8 bytes.

+		 * 		<li><c>InputStream</c>

+		 * 		<li><c>Reader</c> - Converted to UTF-8 bytes.

+		 * 		<li><c>File</c>

+		 * 		<li><c>CharSequence</c> - Converted to UTF-8 bytes.

 		 * 	</ul>

 		 * @return This object (for method chaining).

 		 */

@@ -165,7 +165,7 @@
 		 * @param name The HTTP header name.

 		 * @param value

 		 * 	The HTTP header value.

-		 * 	<br>Will be converted to a <code>String</code> using {@link Object#toString()}.

+		 * 	<br>Will be converted to a <c>String</c> using {@link Object#toString()}.

 		 * @return This object (for method chaining).

 		 */

 		public Builder header(String name, Object value) {

@@ -178,7 +178,7 @@
 		 *

 		 * @param headers

 		 * 	The HTTP headers.

-		 * 	<br>Values will be converted to <code>Strings</code> using {@link Object#toString()}.

+		 * 	<br>Values will be converted to <c>Strings</c> using {@link Object#toString()}.

 		 * @return This object (for method chaining).

 		 */

 		public Builder headers(Map<String,Object> headers) {

diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Referer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Referer.java
index 6a0ac0b..777e6ca 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Referer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Referer.java
@@ -60,10 +60,10 @@
 public final class Referer extends HeaderUri {
 
 	/**
-	 * Returns a parsed <code>Referer</code> header.
+	 * Returns a parsed <c>Referer</c> header.
 	 *
-	 * @param value The <code>Referer</code> header string.
-	 * @return The parsed <code>Referer</code> header, or <jk>null</jk> if the string was null.
+	 * @param value The <c>Referer</c> header string.
+	 * @return The parsed <c>Referer</c> header, or <jk>null</jk> if the string was null.
 	 */
 	public static Referer forString(String value) {
 		if (value == null)
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/RetryAfter.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/RetryAfter.java
index df8a777..0304508 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/RetryAfter.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/RetryAfter.java
@@ -62,10 +62,10 @@
 public final class RetryAfter extends HeaderString {
 
 	/**
-	 * Returns a parsed <code>Retry-After</code> header.
+	 * Returns a parsed <c>Retry-After</c> header.
 	 *
-	 * @param value The <code>Retry-After</code> header string.
-	 * @return The parsed <code>Retry-After</code> header, or <jk>null</jk> if the string was null.
+	 * @param value The <c>Retry-After</c> header string.
+	 * @return The parsed <c>Retry-After</c> header, or <jk>null</jk> if the string was null.
 	 */
 	public static RetryAfter forString(String value) {
 		if (value == null)
@@ -92,7 +92,7 @@
 	/**
 	 * Returns this header value as an integer.
 	 *
-	 * @return This header value as a integer, or <code>-1</code> if the value is not an integer.
+	 * @return This header value as a integer, or <c>-1</c> if the value is not an integer.
 	 */
 	public int asInt() {
 		char c0 = charAt(value, 0);
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Server.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Server.java
index f846002..506a294 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Server.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Server.java
@@ -61,10 +61,10 @@
 public final class Server extends HeaderString {
 
 	/**
-	 * Returns a parsed <code>Server</code> header.
+	 * Returns a parsed <c>Server</c> header.
 	 *
-	 * @param value The <code>Server</code> header string.
-	 * @return The parsed <code>Server</code> header, or <jk>null</jk> if the string was null.
+	 * @param value The <c>Server</c> header string.
+	 * @return The parsed <c>Server</c> header, or <jk>null</jk> if the string was null.
 	 */
 	public static Server forString(String value) {
 		if (value == null)
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/StreamResource.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/StreamResource.java
index 480a067..84f111a 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/StreamResource.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/StreamResource.java
@@ -65,10 +65,10 @@
 	 * 	<br>Contents can be any of the following:

 	 * 	<ul>

 	 * 		<li><code><jk>byte</jk>[]</code>

-	 * 		<li><code>InputStream</code>

-	 * 		<li><code>Reader</code> - Converted to UTF-8 bytes.

-	 * 		<li><code>File</code>

-	 * 		<li><code>CharSequence</code> - Converted to UTF-8 bytes.

+	 * 		<li><c>InputStream</c>

+	 * 		<li><c>Reader</c> - Converted to UTF-8 bytes.

+	 * 		<li><c>File</c>

+	 * 		<li><c>CharSequence</c> - Converted to UTF-8 bytes.

 	 * 	</ul>

 	 * @throws IOException

 	 */

@@ -139,10 +139,10 @@
 		 * 	<br>Contents can be any of the following:

 		 * 	<ul>

 		 * 		<li><code><jk>byte</jk>[]</code>

-		 * 		<li><code>InputStream</code>

-		 * 		<li><code>Reader</code> - Converted to UTF-8 bytes.

-		 * 		<li><code>File</code>

-		 * 		<li><code>CharSequence</code> - Converted to UTF-8 bytes.

+		 * 		<li><c>InputStream</c>

+		 * 		<li><c>Reader</c> - Converted to UTF-8 bytes.

+		 * 		<li><c>File</c>

+		 * 		<li><c>CharSequence</c> - Converted to UTF-8 bytes.

 		 * 	</ul>

 		 * @return This object (for method chaining).

 		 */

@@ -157,7 +157,7 @@
 		 * @param name The HTTP header name.

 		 * @param value

 		 * 	The HTTP header value.

-		 * 	<br>Will be converted to a <code>String</code> using {@link Object#toString()}.

+		 * 	<br>Will be converted to a <c>String</c> using {@link Object#toString()}.

 		 * @return This object (for method chaining).

 		 */

 		public Builder header(String name, Object value) {

@@ -170,7 +170,7 @@
 		 *

 		 * @param headers

 		 * 	The HTTP headers.

-		 * 	<br>Values will be converted to <code>Strings</code> using {@link Object#toString()}.

+		 * 	<br>Values will be converted to <c>Strings</c> using {@link Object#toString()}.

 		 * @return This object (for method chaining).

 		 */

 		public Builder headers(Map<String,Object> headers) {

diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/StringRange.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/StringRange.java
index cd9902d..d9b9924 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/StringRange.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/StringRange.java
@@ -29,7 +29,7 @@
  * it's a simple type (e.g. <js>"iso-8601"</js>).

  *

  * <p>

- * An example of a type range is a value in an <code>Accept-Encoding</code> header.

+ * An example of a type range is a value in an <c>Accept-Encoding</c> header.

  *

  * <h5 class='section'>See Also:</h5>

  * <ul class='doctree'>

@@ -46,10 +46,10 @@
 	private final Map<String,Set<String>> extensions;

 

 	/**

-	 * Parses a header such as an <code>Accept-Encoding</code> header value into an array of type ranges.

+	 * Parses a header such as an <c>Accept-Encoding</c> header value into an array of type ranges.

 	 *

 	 * <p>

-	 * The syntax expected to be found in the referenced <code>value</code> complies with the syntax described in

+	 * The syntax expected to be found in the referenced <c>value</c> complies with the syntax described in

 	 * RFC2616, Section 14.1, as described below:

 	 * <p class='bcode w800'>

 	 * 	Accept-Encoding  = "Accept-Encoding" ":"

@@ -69,7 +69,7 @@
 	 *

 	 * @param value

 	 * 	The value to parse.

-	 * 	If <jk>null</jk> or empty, returns a single <code>TypeRange</code> is returned that represents all types.

+	 * 	If <jk>null</jk> or empty, returns a single <c>TypeRange</c> is returned that represents all types.

 	 * @return

 	 * 	The type ranges described by the string.

 	 * 	<br>The ranges are sorted such that the most acceptable type is available at ordinal position <js>'0'</js>, and

@@ -167,7 +167,7 @@
 	 * Returns the <js>'q'</js> (quality) value for this type, as described in Section 3.9 of RFC2616.

 	 *

 	 * <p>

-	 * The quality value is a float between <code>0.0</code> (unacceptable) and <code>1.0</code> (most acceptable).

+	 * The quality value is a float between <c>0.0</c> (unacceptable) and <c>1.0</c> (most acceptable).

 	 *

 	 * <p>

 	 * If 'q' value doesn't make sense for the context (e.g. this range was extracted from a <js>"content-*"</js>

@@ -192,12 +192,12 @@
 	}

 

 	/**

-	 * Provides a string representation of this media range, suitable for use as an <code>Accept</code> header value.

+	 * Provides a string representation of this media range, suitable for use as an <c>Accept</c> header value.

 	 *

 	 * <p>

 	 * The literal text generated will be all lowercase.

 	 *

-	 * @return A media range suitable for use as an Accept header value, never <code>null</code>.

+	 * @return A media range suitable for use as an Accept header value, never <c>null</c>.

 	 */

 	@Override /* Object */

 	public String toString() {

@@ -225,7 +225,7 @@
 	}

 

 	/**

-	 * Returns <jk>true</jk> if the specified object is also a <code>MediaType</code>, and has the same qValue, type,

+	 * Returns <jk>true</jk> if the specified object is also a <c>MediaType</c>, and has the same qValue, type,

 	 * parameters, and extensions.

 	 *

 	 * @return <jk>true</jk> if object is equivalent.

@@ -246,9 +246,9 @@
 	}

 

 	/**

-	 * Returns a hash based on this instance's <code>media-type</code>.

+	 * Returns a hash based on this instance's <c>media-type</c>.

 	 *

-	 * @return A hash based on this instance's <code>media-type</code>.

+	 * @return A hash based on this instance's <c>media-type</c>.

 	 */

 	@Override /* Object */

 	public int hashCode() {

@@ -259,10 +259,10 @@
 	 * Compares two MediaRanges for equality.

 	 *

 	 * <p>

-	 * The values are first compared according to <code>qValue</code> values.

-	 * Should those values be equal, the <code>type</code> is then lexicographically compared (case-insensitive) in

+	 * The values are first compared according to <c>qValue</c> values.

+	 * Should those values be equal, the <c>type</c> is then lexicographically compared (case-insensitive) in

 	 * ascending order, with the <js>"*"</js> type demoted last in that order.

-	 * <code>TypeRanges</code> with the same types but with extensions are promoted over those same types with no

+	 * <c>TypeRanges</c> with the same types but with extensions are promoted over those same types with no

 	 * extensions.

 	 *

 	 * @param o The range to compare to.  Never <jk>null</jk>.

diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/TE.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/TE.java
index 8281a37..774f969 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/TE.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/TE.java
@@ -94,10 +94,10 @@
 	private static final Cache<String,TE> cache = new Cache<>(NOCACHE, CACHE_MAX_SIZE);
 
 	/**
-	 * Returns a parsed <code>TE</code> header.
+	 * Returns a parsed <c>TE</c> header.
 	 *
-	 * @param value The <code>TE</code> header string.
-	 * @return The parsed <code>TE</code> header, or <jk>null</jk> if the string was null.
+	 * @param value The <c>TE</c> header string.
+	 * @return The parsed <c>TE</c> header, or <jk>null</jk> if the string was null.
 	 */
 	public static TE forString(String value) {
 		if (value == null)
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Trailer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Trailer.java
index 1242041..e140689 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Trailer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Trailer.java
@@ -61,10 +61,10 @@
 public final class Trailer extends HeaderString {
 
 	/**
-	 * Returns a parsed <code>Trailer</code> header.
+	 * Returns a parsed <c>Trailer</c> header.
 	 *
-	 * @param value The <code>Trailer</code> header string.
-	 * @return The parsed <code>Trailer</code> header, or <jk>null</jk> if the string was null.
+	 * @param value The <c>Trailer</c> header string.
+	 * @return The parsed <c>Trailer</c> header, or <jk>null</jk> if the string was null.
 	 */
 	public static Trailer forString(String value) {
 		if (value == null)
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/TransferEncoding.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/TransferEncoding.java
index a86ffa9..fe1632f 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/TransferEncoding.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/TransferEncoding.java
@@ -61,10 +61,10 @@
 public final class TransferEncoding extends HeaderString {
 
 	/**
-	 * Returns a parsed <code>Transfer-Encoding</code> header.
+	 * Returns a parsed <c>Transfer-Encoding</c> header.
 	 *
-	 * @param value The <code>Transfer-Encoding</code> header string.
-	 * @return The parsed <code>Transfer-Encoding</code> header, or <jk>null</jk> if the string was null.
+	 * @param value The <c>Transfer-Encoding</c> header string.
+	 * @return The parsed <c>Transfer-Encoding</c> header, or <jk>null</jk> if the string was null.
 	 */
 	public static TransferEncoding forString(String value) {
 		if (value == null)
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Upgrade.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Upgrade.java
index 8632080..f693524 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Upgrade.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Upgrade.java
@@ -93,10 +93,10 @@
 	}
 
 	/**
-	 * Returns a parsed <code>Upgrade</code> header.
+	 * Returns a parsed <c>Upgrade</c> header.
 	 *
-	 * @param value The <code>Upgrade</code> header string.
-	 * @return The parsed <code>Upgrade</code> header, or <jk>null</jk> if the string was null.
+	 * @param value The <c>Upgrade</c> header string.
+	 * @return The parsed <c>Upgrade</c> header, or <jk>null</jk> if the string was null.
 	 */
 	public static Upgrade forString(String value) {
 		if (value == null)
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/UserAgent.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/UserAgent.java
index bdce433..2e066d1 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/UserAgent.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/UserAgent.java
@@ -54,10 +54,10 @@
 public final class UserAgent extends HeaderString {
 
 	/**
-	 * Returns a parsed <code>User-Agent</code> header.
+	 * Returns a parsed <c>User-Agent</c> header.
 	 *
-	 * @param value The <code>User-Agent</code> header string.
-	 * @return The parsed <code>User-Agent</code> header, or <jk>null</jk> if the string was null.
+	 * @param value The <c>User-Agent</c> header string.
+	 * @return The parsed <c>User-Agent</c> header, or <jk>null</jk> if the string was null.
 	 */
 	public static UserAgent forString(String value) {
 		if (value == null)
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Vary.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Vary.java
index b9f76bd..f274b98 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Vary.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Vary.java
@@ -74,10 +74,10 @@
 public final class Vary extends HeaderString {
 
 	/**
-	 * Returns a parsed <code>Vary</code> header.
+	 * Returns a parsed <c>Vary</c> header.
 	 *
-	 * @param value The <code>Vary</code> header string.
-	 * @return The parsed <code>Vary</code> header, or <jk>null</jk> if the string was null.
+	 * @param value The <c>Vary</c> header string.
+	 * @return The parsed <c>Vary</c> header, or <jk>null</jk> if the string was null.
 	 */
 	public static Vary forString(String value) {
 		if (value == null)
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Via.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Via.java
index e210769..f1ad6ee 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Via.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Via.java
@@ -129,10 +129,10 @@
 	}
 
 	/**
-	 * Returns a parsed <code>Via</code> header.
+	 * Returns a parsed <c>Via</c> header.
 	 *
-	 * @param value The <code>Via</code> header string.
-	 * @return The parsed <code>Via</code> header, or <jk>null</jk> if the string was null.
+	 * @param value The <c>Via</c> header string.
+	 * @return The parsed <c>Via</c> header, or <jk>null</jk> if the string was null.
 	 */
 	public static Via forString(String value) {
 		if (value == null)
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Warning.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Warning.java
index 9f7c2cc..655ba0b 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Warning.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Warning.java
@@ -128,10 +128,10 @@
 public final class Warning extends HeaderString {
 
 	/**
-	 * Returns a parsed <code>Warning</code> header.
+	 * Returns a parsed <c>Warning</c> header.
 	 *
-	 * @param value The <code>Warning</code> header string.
-	 * @return The parsed <code>Warning</code> header, or <jk>null</jk> if the string was null.
+	 * @param value The <c>Warning</c> header string.
+	 * @return The parsed <c>Warning</c> header, or <jk>null</jk> if the string was null.
 	 */
 	public static Warning forString(String value) {
 		if (value == null)
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/WwwAuthenticate.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/WwwAuthenticate.java
index 7d1a43d..49b0681 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/WwwAuthenticate.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/WwwAuthenticate.java
@@ -50,10 +50,10 @@
 public final class WwwAuthenticate extends HeaderString {
 
 	/**
-	 * Returns a parsed <code>WWW-Authenticate</code> header.
+	 * Returns a parsed <c>WWW-Authenticate</c> header.
 	 *
-	 * @param value The <code>WWW-Authenticate</code> header string.
-	 * @return The parsed <code>WWW-Authenticate</code> header, or <jk>null</jk> if the string was null.
+	 * @param value The <c>WWW-Authenticate</c> header string.
+	 * @return The parsed <c>WWW-Authenticate</c> header, or <jk>null</jk> if the string was null.
 	 */
 	public static WwwAuthenticate forString(String value) {
 		if (value == null)
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Body.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Body.java
index dd2d831..56b0c8a 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Body.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Body.java
@@ -180,8 +180,8 @@
 	 *

 	 * <p>

 	 * If validation fails during serialization or parsing, the part serializer/parser will throw a {@link SchemaValidationException}.

-	 * <br>On the client-side, this gets converted to a <code>RestCallException</code> which is thrown before the connection is made.

-	 * <br>On the server-side, this gets converted to a <code>BadRequest</code> (400).

+	 * <br>On the client-side, this gets converted to a <c>RestCallException</c> which is thrown before the connection is made.

+	 * <br>On the server-side, this gets converted to a <c>BadRequest</c> (400).

 	 *

 	 * <h5 class='section'>Examples:</h5>

 	 * <p class='bcode w800'>

@@ -410,7 +410,7 @@
 	 * 	<li>

 	 * 		The format is a {@doc juneau-marshall.JsonDetails.SimplifiedJson} object with string keys (media type) and string values (example for that media type) .

 	 * 	<li>

-	 * 		The leading/trailing <code>{ }</code> characters are optional.

+	 * 		The leading/trailing <c>{ }</c> characters are optional.

 	 * 	<li>

 	 * 		Multiple lines are concatenated with newlines so that you can format the value to be readable:

 	 * 	<li>

@@ -486,7 +486,7 @@
 	 * 		Schema-based serialization is NOT affected by values defined in this annotation.

 	 * 		<br>It only affects the generated Swagger documentation.

 	 * 	<li>

-	 * 		The leading/trailing <code>{ }</code> characters are optional.

+	 * 		The leading/trailing <c>{ }</c> characters are optional.

 	 * 		<br>The following two example are considered equivalent:

 	 * 		<p class='bcode w800'>

 	 * 	<ja>@Body</ja>(<js>"{description: 'Pet object to add to the store'}"</js>)

diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Contact.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Contact.java
index 5b9de4c..3a24cbd 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Contact.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Contact.java
@@ -169,7 +169,7 @@
 	 * 	<li>

 	 * 		The format is a {@doc juneau-marshall.JsonDetails.SimplifiedJson} object.

 	 * 	<li>

-	 * 		The leading/trailing <code>{ }</code> characters are optional.

+	 * 		The leading/trailing <c>{ }</c> characters are optional.

 	 * 		<br>The following two example are considered equivalent:

 	 * 		<p class='bcode w800'>

 	 * 	<ja>@Contact</ja>(<js>"{name: 'Juneau Development Team'}"</js>)

diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/FormData.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/FormData.java
index 506ec6f..0e854cc 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/FormData.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/FormData.java
@@ -75,8 +75,8 @@
  *

  * <h5 class='topic'>Important note concerning FORM posts</h5>

  *

- * This annotation should not be combined with the {@link Body @Body} annotation or <code>RestRequest.getBody()</code> method

- * for <code>application/x-www-form-urlencoded POST</code> posts, since it will trigger the underlying servlet

+ * This annotation should not be combined with the {@link Body @Body} annotation or <c>RestRequest.getBody()</c> method

+ * for <c>application/x-www-form-urlencoded POST</c> posts, since it will trigger the underlying servlet

  * API to parse the body content as key-value pairs resulting in empty content.

  *

  * <p>

@@ -155,7 +155,7 @@
 	 * A blank value (the default) has the following behavior:

 	 * <ul class='spaced-list'>

 	 * 	<li>

-	 * 		If the data type is <code>NameValuePairs</code>, <code>Map</code>, or a bean,

+	 * 		If the data type is <c>NameValuePairs</c>, <c>Map</c>, or a bean,

 	 * 		then it's the equivalent to <js>"*"</js> which will cause the value to be serialized as name/value pairs.

 	 *

 	 * 		<h5 class='figure'>Examples:</h5>

@@ -256,8 +256,8 @@
 	 *

 	 * <p>

 	 * If validation fails during serialization or parsing, the part serializer/parser will throw a {@link SchemaValidationException}.

-	 * <br>On the client-side, this gets converted to a <code>RestCallException</code> which is thrown before the connection is made.

-	 * <br>On the server-side, this gets converted to a <code>BadRequest</code> (400).

+	 * <br>On the client-side, this gets converted to a <c>RestCallException</c> which is thrown before the connection is made.

+	 * <br>On the server-side, this gets converted to a <c>BadRequest</c> (400).

 	 *

 	 * <h5 class='section'>Used for:</h5>

 	 * <ul class='spaced-list'>

@@ -290,11 +290,11 @@
 	 * 	<li>

 	 * 		<js>"number"</js>

 	 * 		<br>Parameter must be a number primitive or number object.

-	 * 		<br>If parameter is <code>Object</code>, creates either a <code>Float</code> or <code>Double</code> depending on the size of the number.

+	 * 		<br>If parameter is <c>Object</c>, creates either a <c>Float</c> or <c>Double</c> depending on the size of the number.

 	 * 	<li>

 	 * 		<js>"integer"</js>

 	 * 		<br>Parameter must be a integer/long primitive or integer/long object.

-	 * 		<br>If parameter is <code>Object</code>, creates either a <code>Short</code>, <code>Integer</code>, or <code>Long</code> depending on the size of the number.

+	 * 		<br>If parameter is <c>Object</c>, creates either a <c>Short</c>, <c>Integer</c>, or <c>Long</c> depending on the size of the number.

 	 * 	<li>

 	 * 		<js>"boolean"</js>

 	 * 		<br>Parameter must be a boolean primitive or object.

@@ -302,11 +302,11 @@
 	 * 		<js>"array"</js>

 	 * 		<br>Parameter must be an array or collection.

 	 * 		<br>Elements must be strings or POJOs convertible from strings.

-	 * 		<br>If parameter is <code>Object</code>, creates an {@link ObjectList}.

+	 * 		<br>If parameter is <c>Object</c>, creates an {@link ObjectList}.

 	 * 	<li>

 	 * 		<js>"object"</js>

 	 * 		<br>Parameter must be a map or bean.

-	 * 		<br>If parameter is <code>Object</code>, creates an {@link ObjectMap}.

+	 * 		<br>If parameter is <c>Object</c>, creates an {@link ObjectMap}.

 	 * 		<br>Note that this is an extension of the OpenAPI schema as Juneau allows for arbitrarily-complex POJOs to be serialized as HTTP parts.

 	 * 	<li>

 	 * 		<js>"file"</js>

@@ -427,8 +427,8 @@
 	 * Describes the type of items in the array.

 	 *

 	 * <p>

-	 * Required if <code>type</code> is <js>"array"</js>.

-	 * <br>Can only be used if <code>type</code> is <js>"array"</js>.

+	 * Required if <c>type</c> is <js>"array"</js>.

+	 * <br>Can only be used if <c>type</c> is <js>"array"</js>.

 	 *

 	 * <h5 class='section'>Used for:</h5>

 	 * <ul class='spaced-list'>

@@ -446,8 +446,8 @@
 	 * <mk>collectionFormat</mk> field of the {@doc SwaggerParameterObject}.

 	 *

 	 * <p>

-	 * Determines the format of the array if <code>type</code> <js>"array"</js> is used.

-	 * <br>Can only be used if <code>type</code> is <js>"array"</js>.

+	 * Determines the format of the array if <c>type</c> <js>"array"</js> is used.

+	 * <br>Can only be used if <c>type</c> is <js>"array"</js>.

 	 *

 	 * <br>Possible values are:

 	 * <ul class='spaced-list'>

@@ -529,8 +529,8 @@
 	 *

 	 * <p>

 	 * If validation fails during serialization or parsing, the part serializer/parser will throw a {@link SchemaValidationException}.

-	 * <br>On the client-side, this gets converted to a <code>RestCallException</code> which is thrown before the connection is made.

-	 * <br>On the server-side, this gets converted to a <code>BadRequest</code> (400).

+	 * <br>On the client-side, this gets converted to a <c>RestCallException</c> which is thrown before the connection is made.

+	 * <br>On the server-side, this gets converted to a <c>BadRequest</c> (400).

 	 *

 	 * <p>

 	 * Only allowed for the following types: <js>"integer"</js>, <js>"number"</js>.

@@ -555,12 +555,12 @@
 	 *

 	 * <p>

 	 * If validation fails during serialization or parsing, the part serializer/parser will throw a {@link SchemaValidationException}.

-	 * <br>On the client-side, this gets converted to a <code>RestCallException</code> which is thrown before the connection is made.

-	 * <br>On the server-side, this gets converted to a <code>BadRequest</code> (400).

+	 * <br>On the client-side, this gets converted to a <c>RestCallException</c> which is thrown before the connection is made.

+	 * <br>On the server-side, this gets converted to a <c>BadRequest</c> (400).

 	 *

 	 * <p>

 	 * Only allowed for the following types: <js>"integer"</js>, <js>"number"</js>.

-	 * <br>If <jk>true</jk>, must be accompanied with <code>maximum</code>.

+	 * <br>If <jk>true</jk>, must be accompanied with <c>maximum</c>.

 	 *

 	 * <h5 class='section'>Used for:</h5>

 	 * <ul class='spaced-list'>

@@ -583,8 +583,8 @@
 	 *

 	 * <p>

 	 * If validation fails during serialization or parsing, the part serializer/parser will throw a {@link SchemaValidationException}.

-	 * <br>On the client-side, this gets converted to a <code>RestCallException</code> which is thrown before the connection is made.

-	 * <br>On the server-side, this gets converted to a <code>BadRequest</code> (400).

+	 * <br>On the client-side, this gets converted to a <c>RestCallException</c> which is thrown before the connection is made.

+	 * <br>On the server-side, this gets converted to a <c>BadRequest</c> (400).

 	 *

 	 * <p>

 	 * Only allowed for the following types: <js>"integer"</js>, <js>"number"</js>.

@@ -609,12 +609,12 @@
 	 *

 	 * <p>

 	 * If validation fails during serialization or parsing, the part serializer/parser will throw a {@link SchemaValidationException}.

-	 * <br>On the client-side, this gets converted to a <code>RestCallException</code> which is thrown before the connection is made.

-	 * <br>On the server-side, this gets converted to a <code>BadRequest</code> (400).

+	 * <br>On the client-side, this gets converted to a <c>RestCallException</c> which is thrown before the connection is made.

+	 * <br>On the server-side, this gets converted to a <c>BadRequest</c> (400).

 	 *

 	 * <p>

 	 * Only allowed for the following types: <js>"integer"</js>, <js>"number"</js>.

-	 * <br>If <jk>true</jk>, must be accompanied with <code>minimum</code>.

+	 * <br>If <jk>true</jk>, must be accompanied with <c>minimum</c>.

 	 *

 	 * <h5 class='section'>Used for:</h5>

 	 * <ul class='spaced-list'>

@@ -634,12 +634,12 @@
 	 * <p>

 	 * A string instance is valid against this keyword if its length is less than, or equal to, the value of this keyword.

 	 * <br>The length of a string instance is defined as the number of its characters as defined by <a href='https://tools.ietf.org/html/rfc4627'>RFC 4627</a>.

-	 * <br>The value <code>-1</code> is always ignored.

+	 * <br>The value <c>-1</c> is always ignored.

 	 *

 	 * <p>

 	 * If validation fails during serialization or parsing, the part serializer/parser will throw a {@link SchemaValidationException}.

-	 * <br>On the client-side, this gets converted to a <code>RestCallException</code> which is thrown before the connection is made.

-	 * <br>On the server-side, this gets converted to a <code>BadRequest</code> (400).

+	 * <br>On the client-side, this gets converted to a <c>RestCallException</c> which is thrown before the connection is made.

+	 * <br>On the server-side, this gets converted to a <c>BadRequest</c> (400).

 	 *

 	 * <p>

 	 * Only allowed for the following types: <js>"string"</js>.

@@ -662,12 +662,12 @@
 	 * <p>

 	 * A string instance is valid against this keyword if its length is greater than, or equal to, the value of this keyword.

 	 * <br>The length of a string instance is defined as the number of its characters as defined by <a href='https://tools.ietf.org/html/rfc4627'>RFC 4627</a>.

-	 * <br>The value <code>-1</code> is always ignored.

+	 * <br>The value <c>-1</c> is always ignored.

 	 *

 	 * <p>

 	 * If validation fails during serialization or parsing, the part serializer/parser will throw a {@link SchemaValidationException}.

-	 * <br>On the client-side, this gets converted to a <code>RestCallException</code> which is thrown before the connection is made.

-	 * <br>On the server-side, this gets converted to a <code>BadRequest</code> (400).

+	 * <br>On the client-side, this gets converted to a <c>RestCallException</c> which is thrown before the connection is made.

+	 * <br>On the server-side, this gets converted to a <c>BadRequest</c> (400).

 	 *

 	 * <p>

 	 * Only allowed for the following types: <js>"string"</js>.

@@ -692,8 +692,8 @@
 	 *

 	 * <p>

 	 * If validation fails during serialization or parsing, the part serializer/parser will throw a {@link SchemaValidationException}.

-	 * <br>On the client-side, this gets converted to a <code>RestCallException</code> which is thrown before the connection is made.

-	 * <br>On the server-side, this gets converted to a <code>BadRequest</code> (400).

+	 * <br>On the client-side, this gets converted to a <c>RestCallException</c> which is thrown before the connection is made.

+	 * <br>On the server-side, this gets converted to a <c>BadRequest</c> (400).

 	 *

 	 * <p>

 	 * Only allowed for the following types: <js>"string"</js>.

@@ -718,8 +718,8 @@
 	 *

 	 * <p>

 	 * If validation fails during serialization or parsing, the part serializer/parser will throw a {@link SchemaValidationException}.

-	 * <br>On the client-side, this gets converted to a <code>RestCallException</code> which is thrown before the connection is made.

-	 * <br>On the server-side, this gets converted to a <code>BadRequest</code> (400).

+	 * <br>On the client-side, this gets converted to a <c>RestCallException</c> which is thrown before the connection is made.

+	 * <br>On the server-side, this gets converted to a <c>BadRequest</c> (400).

 	 *

 	 * <p>

 	 * Only allowed for the following types: <js>"array"</js>.

@@ -744,8 +744,8 @@
 	 *

 	 * <p>

 	 * If validation fails during serialization or parsing, the part serializer/parser will throw a {@link SchemaValidationException}.

-	 * <br>On the client-side, this gets converted to a <code>RestCallException</code> which is thrown before the connection is made.

-	 * <br>On the server-side, this gets converted to a <code>BadRequest</code> (400).

+	 * <br>On the client-side, this gets converted to a <c>RestCallException</c> which is thrown before the connection is made.

+	 * <br>On the server-side, this gets converted to a <c>BadRequest</c> (400).

 	 *

 	 * <p>

 	 * Only allowed for the following types: <js>"array"</js>.

@@ -770,8 +770,8 @@
 	 *

 	 * <p>

 	 * If validation fails during serialization or parsing, the part serializer/parser will throw a {@link SchemaValidationException}.

-	 * <br>On the client-side, this gets converted to a <code>RestCallException</code> which is thrown before the connection is made.

-	 * <br>On the server-side, this gets converted to a <code>BadRequest</code> (400).

+	 * <br>On the client-side, this gets converted to a <c>RestCallException</c> which is thrown before the connection is made.

+	 * <br>On the server-side, this gets converted to a <c>BadRequest</c> (400).

 	 *

 	 * <p>

 	 * If the parameter type is a subclass of {@link Set}, this validation is skipped (since a set can only contain unique items anyway).

@@ -800,8 +800,8 @@
 	 *

 	 * <p>

 	 * If validation fails during serialization or parsing, the part serializer/parser will throw a {@link SchemaValidationException}.

-	 * <br>On the client-side, this gets converted to a <code>RestCallException</code> which is thrown before the connection is made.

-	 * <br>On the server-side, this gets converted to a <code>BadRequest</code> (400).

+	 * <br>On the client-side, this gets converted to a <c>RestCallException</c> which is thrown before the connection is made.

+	 * <br>On the server-side, this gets converted to a <c>BadRequest</c> (400).

 	 *

 	 * <p>

 	 * The format is a {@doc juneau-marshall.JsonDetails.SimplifiedJson} array or comma-delimited list.

@@ -848,8 +848,8 @@
 	 *

 	 * <p>

 	 * If validation fails during serialization or parsing, the part serializer/parser will throw a {@link SchemaValidationException}.

-	 * <br>On the client-side, this gets converted to a <code>RestCallException</code> which is thrown before the connection is made.

-	 * <br>On the server-side, this gets converted to a <code>BadRequest</code> (400).

+	 * <br>On the client-side, this gets converted to a <c>RestCallException</c> which is thrown before the connection is made.

+	 * <br>On the server-side, this gets converted to a <c>BadRequest</c> (400).

 	 *

 	 * Only allowed for the following types: <js>"integer"</js>, <js>"number"</js>.

 	 *

@@ -873,7 +873,7 @@
 	 * A serialized example of the parameter.

 	 *

 	 * <p>

-	 * This attribute defines a representation of the value that is used by <code>BasicRestInfoProvider</code> to construct

+	 * This attribute defines a representation of the value that is used by <c>BasicRestInfoProvider</c> to construct

 	 * an example of parameter.

 	 *

 	 * <h5 class='section'>Example:</h5>

@@ -984,7 +984,7 @@
 	 * 	<li>

 	 * 		The format is a {@doc juneau-marshall.JsonDetails.SimplifiedJson} object.

 	 * 	<li>

-	 * 		The leading/trailing <code>{ }</code> characters are optional.

+	 * 		The leading/trailing <c>{ }</c> characters are optional.

 	 * 		<br>The following two example are considered equivalent:

 	 * 		<p class='bcode w800'>

 	 * 	<ja>@FormData</ja>(api=<js>"{example: 'Foobar'}"</js>)

diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Header.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Header.java
index fec98b8..4cbe394 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Header.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Header.java
@@ -138,7 +138,7 @@
 	 * A blank value (the default) has the following behavior:

 	 * <ul class='spaced-list'>

 	 * 	<li>

-	 * 		If the data type is <code>NameValuePairs</code>, <code>Map</code>, or a bean,

+	 * 		If the data type is <c>NameValuePairs</c>, <c>Map</c>, or a bean,

 	 * 		then it's the equivalent to <js>"*"</js> which will cause the value to be serialized as name/value pairs.

 	 *

 	 * 		<h5 class='figure'>Examples:</h5>

@@ -234,8 +234,8 @@
 	 *

 	 * <p>

 	 * If validation fails during serialization or parsing, the part serializer/parser will throw a {@link SchemaValidationException}.

-	 * <br>On the client-side, this gets converted to a <code>RestCallException</code> which is thrown before the connection is made.

-	 * <br>On the server-side, this gets converted to a <code>BadRequest</code> (400).

+	 * <br>On the client-side, this gets converted to a <c>RestCallException</c> which is thrown before the connection is made.

+	 * <br>On the server-side, this gets converted to a <c>BadRequest</c> (400).

 	 *

 	 * <h5 class='section'>Used for:</h5>

 	 * <ul class='spaced-list'>

@@ -268,11 +268,11 @@
 	 * 	<li>

 	 * 		<js>"number"</js>

 	 * 		<br>Parameter must be a number primitive or number object.

-	 * 		<br>If parameter is <code>Object</code>, creates either a <code>Float</code> or <code>Double</code> depending on the size of the number.

+	 * 		<br>If parameter is <c>Object</c>, creates either a <c>Float</c> or <c>Double</c> depending on the size of the number.

 	 * 	<li>

 	 * 		<js>"integer"</js>

 	 * 		<br>Parameter must be a integer/long primitive or integer/long object.

-	 * 		<br>If parameter is <code>Object</code>, creates either a <code>Short</code>, <code>Integer</code>, or <code>Long</code> depending on the size of the number.

+	 * 		<br>If parameter is <c>Object</c>, creates either a <c>Short</c>, <c>Integer</c>, or <c>Long</c> depending on the size of the number.

 	 * 	<li>

 	 * 		<js>"boolean"</js>

 	 * 		<br>Parameter must be a boolean primitive or object.

@@ -280,11 +280,11 @@
 	 * 		<js>"array"</js>

 	 * 		<br>Parameter must be an array or collection.

 	 * 		<br>Elements must be strings or POJOs convertible from strings.

-	 * 		<br>If parameter is <code>Object</code>, creates an {@link ObjectList}.

+	 * 		<br>If parameter is <c>Object</c>, creates an {@link ObjectList}.

 	 * 	<li>

 	 * 		<js>"object"</js>

 	 * 		<br>Parameter must be a map or bean.

-	 * 		<br>If parameter is <code>Object</code>, creates an {@link ObjectMap}.

+	 * 		<br>If parameter is <c>Object</c>, creates an {@link ObjectMap}.

 	 * 		<br>Note that this is an extension of the OpenAPI schema as Juneau allows for arbitrarily-complex POJOs to be serialized as HTTP parts.

 	 * 	<li>

 	 * 		<js>"file"</js>

@@ -404,8 +404,8 @@
 	 * Describes the type of items in the array.

 	 *

 	 * <p>

-	 * Required if <code>type</code> is <js>"array"</js>.

-	 * <br>Can only be used if <code>type</code> is <js>"array"</js>.

+	 * Required if <c>type</c> is <js>"array"</js>.

+	 * <br>Can only be used if <c>type</c> is <js>"array"</js>.

 	 *

 	 * <h5 class='section'>Used for:</h5>

 	 * <ul class='spaced-list'>

@@ -423,8 +423,8 @@
 	 * <mk>collectionFormat</mk> field of the {@doc SwaggerParameterObject}.

 	 *

 	 * <p>

-	 * Determines the format of the array if <code>type</code> <js>"array"</js> is used.

-	 * <br>Can only be used if <code>type</code> is <js>"array"</js>.

+	 * Determines the format of the array if <c>type</c> <js>"array"</js> is used.

+	 * <br>Can only be used if <c>type</c> is <js>"array"</js>.

 	 *

 	 * <br>Possible values are:

 	 * <ul class='spaced-list'>

@@ -504,8 +504,8 @@
 	 *

 	 * <p>

 	 * If validation fails during serialization or parsing, the part serializer/parser will throw a {@link SchemaValidationException}.

-	 * <br>On the client-side, this gets converted to a <code>RestCallException</code> which is thrown before the connection is made.

-	 * <br>On the server-side, this gets converted to a <code>BadRequest</code> (400).

+	 * <br>On the client-side, this gets converted to a <c>RestCallException</c> which is thrown before the connection is made.

+	 * <br>On the server-side, this gets converted to a <c>BadRequest</c> (400).

 	 *

 	 * <p>

 	 * Only allowed for the following types: <js>"integer"</js>, <js>"number"</js>.

@@ -530,12 +530,12 @@
 	 *

 	 * <p>

 	 * If validation fails during serialization or parsing, the part serializer/parser will throw a {@link SchemaValidationException}.

-	 * <br>On the client-side, this gets converted to a <code>RestCallException</code> which is thrown before the connection is made.

-	 * <br>On the server-side, this gets converted to a <code>BadRequest</code> (400).

+	 * <br>On the client-side, this gets converted to a <c>RestCallException</c> which is thrown before the connection is made.

+	 * <br>On the server-side, this gets converted to a <c>BadRequest</c> (400).

 	 *

 	 * <p>

 	 * Only allowed for the following types: <js>"integer"</js>, <js>"number"</js>.

-	 * <br>If <jk>true</jk>, must be accompanied with <code>maximum</code>.

+	 * <br>If <jk>true</jk>, must be accompanied with <c>maximum</c>.

 	 *

 	 * <h5 class='section'>Used for:</h5>

 	 * <ul class='spaced-list'>

@@ -558,8 +558,8 @@
 	 *

 	 * <p>

 	 * If validation fails during serialization or parsing, the part serializer/parser will throw a {@link SchemaValidationException}.

-	 * <br>On the client-side, this gets converted to a <code>RestCallException</code> which is thrown before the connection is made.

-	 * <br>On the server-side, this gets converted to a <code>BadRequest</code> (400).

+	 * <br>On the client-side, this gets converted to a <c>RestCallException</c> which is thrown before the connection is made.

+	 * <br>On the server-side, this gets converted to a <c>BadRequest</c> (400).

 	 *

 	 * <p>

 	 * Only allowed for the following types: <js>"integer"</js>, <js>"number"</js>.

@@ -584,12 +584,12 @@
 	 *

 	 * <p>

 	 * If validation fails during serialization or parsing, the part serializer/parser will throw a {@link SchemaValidationException}.

-	 * <br>On the client-side, this gets converted to a <code>RestCallException</code> which is thrown before the connection is made.

-	 * <br>On the server-side, this gets converted to a <code>BadRequest</code> (400).

+	 * <br>On the client-side, this gets converted to a <c>RestCallException</c> which is thrown before the connection is made.

+	 * <br>On the server-side, this gets converted to a <c>BadRequest</c> (400).

 	 *

 	 * <p>

 	 * Only allowed for the following types: <js>"integer"</js>, <js>"number"</js>.

-	 * <br>If <jk>true</jk>, must be accompanied with <code>minimum</code>.

+	 * <br>If <jk>true</jk>, must be accompanied with <c>minimum</c>.

 	 *

 	 * <h5 class='section'>Used for:</h5>

 	 * <ul class='spaced-list'>

@@ -609,12 +609,12 @@
 	 * <p>

 	 * A string instance is valid against this keyword if its length is less than, or equal to, the value of this keyword.

 	 * <br>The length of a string instance is defined as the number of its characters as defined by <a href='https://tools.ietf.org/html/rfc4627'>RFC 4627</a>.

-	 * <br>The value <code>-1</code> is always ignored.

+	 * <br>The value <c>-1</c> is always ignored.

 	 *

 	 * <p>

 	 * If validation fails during serialization or parsing, the part serializer/parser will throw a {@link SchemaValidationException}.

-	 * <br>On the client-side, this gets converted to a <code>RestCallException</code> which is thrown before the connection is made.

-	 * <br>On the server-side, this gets converted to a <code>BadRequest</code> (400).

+	 * <br>On the client-side, this gets converted to a <c>RestCallException</c> which is thrown before the connection is made.

+	 * <br>On the server-side, this gets converted to a <c>BadRequest</c> (400).

 	 *

 	 * <p>

 	 * Only allowed for the following types: <js>"string"</js>.

@@ -637,12 +637,12 @@
 	 * <p>

 	 * A string instance is valid against this keyword if its length is greater than, or equal to, the value of this keyword.

 	 * <br>The length of a string instance is defined as the number of its characters as defined by <a href='https://tools.ietf.org/html/rfc4627'>RFC 4627</a>.

-	 * <br>The value <code>-1</code> is always ignored.

+	 * <br>The value <c>-1</c> is always ignored.

 	 *

 	 * <p>

 	 * If validation fails during serialization or parsing, the part serializer/parser will throw a {@link SchemaValidationException}.

-	 * <br>On the client-side, this gets converted to a <code>RestCallException</code> which is thrown before the connection is made.

-	 * <br>On the server-side, this gets converted to a <code>BadRequest</code> (400).

+	 * <br>On the client-side, this gets converted to a <c>RestCallException</c> which is thrown before the connection is made.

+	 * <br>On the server-side, this gets converted to a <c>BadRequest</c> (400).

 	 *

 	 * <p>

 	 * Only allowed for the following types: <js>"string"</js>.

@@ -667,8 +667,8 @@
 	 *

 	 * <p>

 	 * If validation fails during serialization or parsing, the part serializer/parser will throw a {@link SchemaValidationException}.

-	 * <br>On the client-side, this gets converted to a <code>RestCallException</code> which is thrown before the connection is made.

-	 * <br>On the server-side, this gets converted to a <code>BadRequest</code> (400).

+	 * <br>On the client-side, this gets converted to a <c>RestCallException</c> which is thrown before the connection is made.

+	 * <br>On the server-side, this gets converted to a <c>BadRequest</c> (400).

 	 *

 	 * <p>

 	 * Only allowed for the following types: <js>"string"</js>.

@@ -693,8 +693,8 @@
 	 *

 	 * <p>

 	 * If validation fails during serialization or parsing, the part serializer/parser will throw a {@link SchemaValidationException}.

-	 * <br>On the client-side, this gets converted to a <code>RestCallException</code> which is thrown before the connection is made.

-	 * <br>On the server-side, this gets converted to a <code>BadRequest</code> (400).

+	 * <br>On the client-side, this gets converted to a <c>RestCallException</c> which is thrown before the connection is made.

+	 * <br>On the server-side, this gets converted to a <c>BadRequest</c> (400).

 	 *

 	 * <p>

 	 * Only allowed for the following types: <js>"array"</js>.

@@ -719,8 +719,8 @@
 	 *

 	 * <p>

 	 * If validation fails during serialization or parsing, the part serializer/parser will throw a {@link SchemaValidationException}.

-	 * <br>On the client-side, this gets converted to a <code>RestCallException</code> which is thrown before the connection is made.

-	 * <br>On the server-side, this gets converted to a <code>BadRequest</code> (400).

+	 * <br>On the client-side, this gets converted to a <c>RestCallException</c> which is thrown before the connection is made.

+	 * <br>On the server-side, this gets converted to a <c>BadRequest</c> (400).

 	 *

 	 * <p>

 	 * Only allowed for the following types: <js>"array"</js>.

@@ -745,8 +745,8 @@
 	 *

 	 * <p>

 	 * If validation fails during serialization or parsing, the part serializer/parser will throw a {@link SchemaValidationException}.

-	 * <br>On the client-side, this gets converted to a <code>RestCallException</code> which is thrown before the connection is made.

-	 * <br>On the server-side, this gets converted to a <code>BadRequest</code> (400).

+	 * <br>On the client-side, this gets converted to a <c>RestCallException</c> which is thrown before the connection is made.

+	 * <br>On the server-side, this gets converted to a <c>BadRequest</c> (400).

 	 *

 	 * <p>

 	 * If the parameter type is a subclass of {@link Set}, this validation is skipped (since a set can only contain unique items anyway).

@@ -775,8 +775,8 @@
 	 *

 	 * <p>

 	 * If validation fails during serialization or parsing, the part serializer/parser will throw a {@link SchemaValidationException}.

-	 * <br>On the client-side, this gets converted to a <code>RestCallException</code> which is thrown before the connection is made.

-	 * <br>On the server-side, this gets converted to a <code>BadRequest</code> (400).

+	 * <br>On the client-side, this gets converted to a <c>RestCallException</c> which is thrown before the connection is made.

+	 * <br>On the server-side, this gets converted to a <c>BadRequest</c> (400).

 	 *

 	 * <p>

 	 * The format is a {@doc juneau-marshall.JsonDetails.SimplifiedJson} array or comma-delimited list.

@@ -823,8 +823,8 @@
 	 *

 	 * <p>

 	 * If validation fails during serialization or parsing, the part serializer/parser will throw a {@link SchemaValidationException}.

-	 * <br>On the client-side, this gets converted to a <code>RestCallException</code> which is thrown before the connection is made.

-	 * <br>On the server-side, this gets converted to a <code>BadRequest</code> (400).

+	 * <br>On the client-side, this gets converted to a <c>RestCallException</c> which is thrown before the connection is made.

+	 * <br>On the server-side, this gets converted to a <c>BadRequest</c> (400).

 	 *

 	 * <p>

 	 * Only allowed for the following types: <js>"integer"</js>, <js>"number"</js>.

@@ -849,7 +849,7 @@
 	 * A serialized example of the parameter.

 	 *

 	 * <p>

-	 * This attribute defines a representation of the value that is used by <code>BasicRestInfoProvider</code> to construct

+	 * This attribute defines a representation of the value that is used by <c>BasicRestInfoProvider</c> to construct

 	 * an example of parameter.

 	 *

 	 * <h5 class='section'>Example:</h5>

@@ -962,7 +962,7 @@
 	 * 	<li>

 	 * 		Automatic validation is NOT performed on input based on attributes in this value.

 	 * 	<li>

-	 * 		The leading/trailing <code>{ }</code> characters are optional.

+	 * 		The leading/trailing <c>{ }</c> characters are optional.

 	 * 		<br>The following two example are considered equivalent:

 	 * 		<p class='bcode w800'>

 	 * 	<ja>@Header</ja>(api=<js>"{required: true}"</js>)

diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/License.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/License.java
index af4d794..e5c841b 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/License.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/License.java
@@ -140,7 +140,7 @@
 	 * 	<li>

 	 * 		The format is a {@doc juneau-marshall.JsonDetails.SimplifiedJson} object.

 	 * 	<li>

-	 * 		The leading/trailing <code>{ }</code> characters are optional.

+	 * 		The leading/trailing <c>{ }</c> characters are optional.

 	 * 		<br>The following two example are considered equivalent:

 	 * 		<p class='bcode w800'>

 	 * 	<ja>@License</ja>(<js>"{name: 'Apache 2.0'}"</js>)

diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Path.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Path.java
index b258095..522ac74 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Path.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Path.java
@@ -123,7 +123,7 @@
 	 * A blank value (the default) has the following behavior:

 	 * <ul class='spaced-list'>

 	 * 	<li>

-	 * 		If the data type is <code>NameValuePairs</code>, <code>Map</code>, or a bean,

+	 * 		If the data type is <c>NameValuePairs</c>, <c>Map</c>, or a bean,

 	 * 		then it's the equivalent to <js>"*"</js> which will cause the value to be treated as name/value pairs.

 	 *

 	 * 		<h5 class='figure'>Examples:</h5>

@@ -245,11 +245,11 @@
 	 * 	<li>

 	 * 		<js>"number"</js>

 	 * 		<br>Parameter must be a number primitive or number object.

-	 * 		<br>If parameter is <code>Object</code>, creates either a <code>Float</code> or <code>Double</code> depending on the size of the number.

+	 * 		<br>If parameter is <c>Object</c>, creates either a <c>Float</c> or <c>Double</c> depending on the size of the number.

 	 * 	<li>

 	 * 		<js>"integer"</js>

 	 * 		<br>Parameter must be a integer/long primitive or integer/long object.

-	 * 		<br>If parameter is <code>Object</code>, creates either a <code>Short</code>, <code>Integer</code>, or <code>Long</code> depending on the size of the number.

+	 * 		<br>If parameter is <c>Object</c>, creates either a <c>Short</c>, <c>Integer</c>, or <c>Long</c> depending on the size of the number.

 	 * 	<li>

 	 * 		<js>"boolean"</js>

 	 * 		<br>Parameter must be a boolean primitive or object.

@@ -257,11 +257,11 @@
 	 * 		<js>"array"</js>

 	 * 		<br>Parameter must be an array or collection.

 	 * 		<br>Elements must be strings or POJOs convertible from strings.

-	 * 		<br>If parameter is <code>Object</code>, creates an {@link ObjectList}.

+	 * 		<br>If parameter is <c>Object</c>, creates an {@link ObjectList}.

 	 * 	<li>

 	 * 		<js>"object"</js>

 	 * 		<br>Parameter must be a map or bean.

-	 * 		<br>If parameter is <code>Object</code>, creates an {@link ObjectMap}.

+	 * 		<br>If parameter is <c>Object</c>, creates an {@link ObjectMap}.

 	 * 		<br>Note that this is an extension of the OpenAPI schema as Juneau allows for arbitrarily-complex POJOs to be serialized as HTTP parts.

 	 * 	<li>

 	 * 		<js>"file"</js>

@@ -379,8 +379,8 @@
 	 * <p>

 	 * Describes the type of items in the array.

 	 * <p>

-	 * Required if <code>type</code> is <js>"array"</js>.

-	 * <br>Can only be used if <code>type</code> is <js>"array"</js>.

+	 * Required if <c>type</c> is <js>"array"</js>.

+	 * <br>Can only be used if <c>type</c> is <js>"array"</js>.

 	 *

 	 * <h5 class='section'>Used for:</h5>

 	 * <ul class='spaced-list'>

@@ -398,8 +398,8 @@
 	 * <mk>collectionFormat</mk> field of the {@doc SwaggerParameterObject}.

 	 *

 	 * <p>

-	 * Determines the format of the array if <code>type</code> <js>"array"</js> is used.

-	 * <br>Can only be used if <code>type</code> is <js>"array"</js>.

+	 * Determines the format of the array if <c>type</c> <js>"array"</js> is used.

+	 * <br>Can only be used if <c>type</c> is <js>"array"</js>.

 	 *

 	 * <br>Possible values are:

 	 * <ul class='spaced-list'>

@@ -443,8 +443,8 @@
 	 *

 	 * <p>

 	 * If validation fails during serialization or parsing, the part serializer/parser will throw a {@link SchemaValidationException}.

-	 * <br>On the client-side, this gets converted to a <code>RestCallException</code> which is thrown before the connection is made.

-	 * <br>On the server-side, this gets converted to a <code>BadRequest</code> (400).

+	 * <br>On the client-side, this gets converted to a <c>RestCallException</c> which is thrown before the connection is made.

+	 * <br>On the server-side, this gets converted to a <c>BadRequest</c> (400).

 	 *

 	 * <p>

 	 * Only allowed for the following types: <js>"integer"</js>, <js>"number"</js>.

@@ -469,12 +469,12 @@
 	 *

 	 * <p>

 	 * If validation fails during serialization or parsing, the part serializer/parser will throw a {@link SchemaValidationException}.

-	 * <br>On the client-side, this gets converted to a <code>RestCallException</code> which is thrown before the connection is made.

-	 * <br>On the server-side, this gets converted to a <code>BadRequest</code> (400).

+	 * <br>On the client-side, this gets converted to a <c>RestCallException</c> which is thrown before the connection is made.

+	 * <br>On the server-side, this gets converted to a <c>BadRequest</c> (400).

 	 *

 	 * <p>

 	 * Only allowed for the following types: <js>"integer"</js>, <js>"number"</js>.

-	 * <br>If <jk>true</jk>, must be accompanied with <code>maximum</code>.

+	 * <br>If <jk>true</jk>, must be accompanied with <c>maximum</c>.

 	 *

 	 * <h5 class='section'>Used for:</h5>

 	 * <ul class='spaced-list'>

@@ -497,8 +497,8 @@
 	 *

 	 * <p>

 	 * If validation fails during serialization or parsing, the part serializer/parser will throw a {@link SchemaValidationException}.

-	 * <br>On the client-side, this gets converted to a <code>RestCallException</code> which is thrown before the connection is made.

-	 * <br>On the server-side, this gets converted to a <code>BadRequest</code> (400).

+	 * <br>On the client-side, this gets converted to a <c>RestCallException</c> which is thrown before the connection is made.

+	 * <br>On the server-side, this gets converted to a <c>BadRequest</c> (400).

 	 *

 	 * <p>

 	 * Only allowed for the following types: <js>"integer"</js>, <js>"number"</js>.

@@ -523,12 +523,12 @@
 	 *

 	 * <p>

 	 * If validation fails during serialization or parsing, the part serializer/parser will throw a {@link SchemaValidationException}.

-	 * <br>On the client-side, this gets converted to a <code>RestCallException</code> which is thrown before the connection is made.

-	 * <br>On the server-side, this gets converted to a <code>BadRequest</code> (400).

+	 * <br>On the client-side, this gets converted to a <c>RestCallException</c> which is thrown before the connection is made.

+	 * <br>On the server-side, this gets converted to a <c>BadRequest</c> (400).

 	 *

 	 * <p>

 	 * Only allowed for the following types: <js>"integer"</js>, <js>"number"</js>.

-	 * <br>If <jk>true</jk>, Must be accompanied with <code>minimum</code>.

+	 * <br>If <jk>true</jk>, Must be accompanied with <c>minimum</c>.

 	 *

 	 * <h5 class='section'>Used for:</h5>

 	 * <ul class='spaced-list'>

@@ -548,12 +548,12 @@
 	 * <p>

 	 * A string instance is valid against this keyword if its length is less than, or equal to, the value of this keyword.

 	 * <br>The length of a string instance is defined as the number of its characters as defined by <a href='https://tools.ietf.org/html/rfc4627'>RFC 4627</a>.

-	 * <br>The value <code>-1</code> is always ignored.

+	 * <br>The value <c>-1</c> is always ignored.

 	 *

 	 * <p>

 	 * If validation fails during serialization or parsing, the part serializer/parser will throw a {@link SchemaValidationException}.

-	 * <br>On the client-side, this gets converted to a <code>RestCallException</code> which is thrown before the connection is made.

-	 * <br>On the server-side, this gets converted to a <code>BadRequest</code> (400).

+	 * <br>On the client-side, this gets converted to a <c>RestCallException</c> which is thrown before the connection is made.

+	 * <br>On the server-side, this gets converted to a <c>BadRequest</c> (400).

 	 *

 	 * <p>

 	 * Only allowed for the following types: <js>"string"</js>.

@@ -576,12 +576,12 @@
 	 * <p>

 	 * A string instance is valid against this keyword if its length is greater than, or equal to, the value of this keyword.

 	 * <br>The length of a string instance is defined as the number of its characters as defined by <a href='https://tools.ietf.org/html/rfc4627'>RFC 4627</a>.

-	 * <br>The value <code>-1</code> is always ignored.

+	 * <br>The value <c>-1</c> is always ignored.

 	 *

 	 * <p>

 	 * If validation fails during serialization or parsing, the part serializer/parser will throw a {@link SchemaValidationException}.

-	 * <br>On the client-side, this gets converted to a <code>RestCallException</code> which is thrown before the connection is made.

-	 * <br>On the server-side, this gets converted to a <code>BadRequest</code> (400).

+	 * <br>On the client-side, this gets converted to a <c>RestCallException</c> which is thrown before the connection is made.

+	 * <br>On the server-side, this gets converted to a <c>BadRequest</c> (400).

 	 *

 	 * <p>

 	 * Only allowed for the following types: <js>"string"</js>.

@@ -606,8 +606,8 @@
 	 *

 	 * <p>

 	 * If validation fails during serialization or parsing, the part serializer/parser will throw a {@link SchemaValidationException}.

-	 * <br>On the client-side, this gets converted to a <code>RestCallException</code> which is thrown before the connection is made.

-	 * <br>On the server-side, this gets converted to a <code>BadRequest</code> (400).

+	 * <br>On the client-side, this gets converted to a <c>RestCallException</c> which is thrown before the connection is made.

+	 * <br>On the server-side, this gets converted to a <c>BadRequest</c> (400).

 	 *

 	 * <p>

 	 * Only allowed for the following types: <js>"string"</js>.

@@ -632,8 +632,8 @@
 	 *

 	 * <p>

 	 * If validation fails during serialization or parsing, the part serializer/parser will throw a {@link SchemaValidationException}.

-	 * <br>On the client-side, this gets converted to a <code>RestCallException</code> which is thrown before the connection is made.

-	 * <br>On the server-side, this gets converted to a <code>BadRequest</code> (400).

+	 * <br>On the client-side, this gets converted to a <c>RestCallException</c> which is thrown before the connection is made.

+	 * <br>On the server-side, this gets converted to a <c>BadRequest</c> (400).

 	 *

 	 * <p>

 	 * Only allowed for the following types: <js>"array"</js>.

@@ -658,8 +658,8 @@
 	 *

 	 * <p>

 	 * If validation fails during serialization or parsing, the part serializer/parser will throw a {@link SchemaValidationException}.

-	 * <br>On the client-side, this gets converted to a <code>RestCallException</code> which is thrown before the connection is made.

-	 * <br>On the server-side, this gets converted to a <code>BadRequest</code> (400).

+	 * <br>On the client-side, this gets converted to a <c>RestCallException</c> which is thrown before the connection is made.

+	 * <br>On the server-side, this gets converted to a <c>BadRequest</c> (400).

 	 *

 	 * <p>

 	 * Only allowed for the following types: <js>"array"</js>.

@@ -684,8 +684,8 @@
 	 *

 	 * <p>

 	 * If validation fails during serialization or parsing, the part serializer/parser will throw a {@link SchemaValidationException}.

-	 * <br>On the client-side, this gets converted to a <code>RestCallException</code> which is thrown before the connection is made.

-	 * <br>On the server-side, this gets converted to a <code>BadRequest</code> (400).

+	 * <br>On the client-side, this gets converted to a <c>RestCallException</c> which is thrown before the connection is made.

+	 * <br>On the server-side, this gets converted to a <c>BadRequest</c> (400).

 	 *

 	 * <p>

 	 * If the parameter type is a subclass of {@link Set}, this validation is skipped (since a set can only contain unique items anyway).

@@ -714,8 +714,8 @@
 	 *

 	 * <p>

 	 * If validation fails during serialization or parsing, the part serializer/parser will throw a {@link SchemaValidationException}.

-	 * <br>On the client-side, this gets converted to a <code>RestCallException</code> which is thrown before the connection is made.

-	 * <br>On the server-side, this gets converted to a <code>BadRequest</code> (400).

+	 * <br>On the client-side, this gets converted to a <c>RestCallException</c> which is thrown before the connection is made.

+	 * <br>On the server-side, this gets converted to a <c>BadRequest</c> (400).

 	 *

 	 * <p>

 	 * The format is a {@doc juneau-marshall.JsonDetails.SimplifiedJson} array or comma-delimited list.

@@ -764,8 +764,8 @@
 	 *

 	 * <p>

 	 * If validation fails during serialization or parsing, the part serializer/parser will throw a {@link SchemaValidationException}.

-	 * <br>On the client-side, this gets converted to a <code>RestCallException</code> which is thrown before the connection is made.

-	 * <br>On the server-side, this gets converted to a <code>BadRequest</code> (400).

+	 * <br>On the client-side, this gets converted to a <c>RestCallException</c> which is thrown before the connection is made.

+	 * <br>On the server-side, this gets converted to a <c>BadRequest</c> (400).

 	 *

 	 * <p>

 	 * Only allowed for the following types: <js>"integer"</js>, <js>"number"</js>.

@@ -790,7 +790,7 @@
 	 * A serialized example of the parameter.

 	 *

 	 * <p>

-	 * This attribute defines a representation of the value that is used by <code>BasicRestInfoProvider</code> to construct

+	 * This attribute defines a representation of the value that is used by <c>BasicRestInfoProvider</c> to construct

 	 * an example of parameter.

 	 *

 	 * <h5 class='section'>Example:</h5>

@@ -905,7 +905,7 @@
 	 * 	<li>

 	 * 		Automatic validation is NOT performed on input based on attributes in this value.

 	 * 	<li>

-	 * 		The leading/trailing <code>{ }</code> characters are optional.

+	 * 		The leading/trailing <c>{ }</c> characters are optional.

 	 * 		<br>The following two example are considered equivalent:

 	 * 		<p class='bcode w800'>

 	 * 	<ja>@Path</ja>(api=<js>"{description: 'ID of order to fetch'}"</js>)

diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Query.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Query.java
index eadec1b..3986ffd 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Query.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Query.java
@@ -48,7 +48,7 @@
  * Unlike {@link FormData @FormData}, using this annotation does not result in the servlet reading the contents of

  * URL-encoded form posts.

  * Therefore, this annotation can be used in conjunction with the {@link Body @Body} annotation or

- * <code>RestRequest.getBody()</code> method for <code>application/x-www-form-urlencoded POST</code> calls.

+ * <c>RestRequest.getBody()</c> method for <c>application/x-www-form-urlencoded POST</c> calls.

  *

  * <h5 class='section'>Example:</h5>

  * <p class='bcode w800'>

@@ -146,7 +146,7 @@
 	 * A blank value (the default) has the following behavior:

 	 * <ul class='spaced-list'>

 	 * 	<li>

-	 * 		If the data type is <code>NameValuePairs</code>, <code>Map</code>, or a bean,

+	 * 		If the data type is <c>NameValuePairs</c>, <c>Map</c>, or a bean,

 	 * 		then it's the equivalent to <js>"*"</js> which will cause the value to be serialized as name/value pairs.

 	 *

 	 * 		<h5 class='figure'>Examples:</h5>

@@ -246,8 +246,8 @@
 	 *

 	 * <p>

 	 * If validation fails during serialization or parsing, the part serializer/parser will throw a {@link SchemaValidationException}.

-	 * <br>On the client-side, this gets converted to a <code>RestCallException</code> which is thrown before the connection is made.

-	 * <br>On the server-side, this gets converted to a <code>BadRequest</code> (400).

+	 * <br>On the client-side, this gets converted to a <c>RestCallException</c> which is thrown before the connection is made.

+	 * <br>On the server-side, this gets converted to a <c>BadRequest</c> (400).

 	 *

 	 * <h5 class='section'>Used for:</h5>

 	 * <ul class='spaced-list'>

@@ -280,11 +280,11 @@
 	 * 	<li>

 	 * 		<js>"number"</js>

 	 * 		<br>Parameter must be a number primitive or number object.

-	 * 		<br>If parameter is <code>Object</code>, creates either a <code>Float</code> or <code>Double</code> depending on the size of the number.

+	 * 		<br>If parameter is <c>Object</c>, creates either a <c>Float</c> or <c>Double</c> depending on the size of the number.

 	 * 	<li>

 	 * 		<js>"integer"</js>

 	 * 		<br>Parameter must be a integer/long primitive or integer/long object.

-	 * 		<br>If parameter is <code>Object</code>, creates either a <code>Short</code>, <code>Integer</code>, or <code>Long</code> depending on the size of the number.

+	 * 		<br>If parameter is <c>Object</c>, creates either a <c>Short</c>, <c>Integer</c>, or <c>Long</c> depending on the size of the number.

 	 * 	<li>

 	 * 		<js>"boolean"</js>

 	 * 		<br>Parameter must be a boolean primitive or object.

@@ -292,11 +292,11 @@
 	 * 		<js>"array"</js>

 	 * 		<br>Parameter must be an array or collection.

 	 * 		<br>Elements must be strings or POJOs convertible from strings.

-	 * 		<br>If parameter is <code>Object</code>, creates an {@link ObjectList}.

+	 * 		<br>If parameter is <c>Object</c>, creates an {@link ObjectList}.

 	 * 	<li>

 	 * 		<js>"object"</js>

 	 * 		<br>Parameter must be a map or bean.

-	 * 		<br>If parameter is <code>Object</code>, creates an {@link ObjectMap}.

+	 * 		<br>If parameter is <c>Object</c>, creates an {@link ObjectMap}.

 	 * 		<br>Note that this is an extension of the OpenAPI schema as Juneau allows for arbitrarily-complex POJOs to be serialized as HTTP parts.

 	 * 	<li>

 	 * 		<js>"file"</js>

@@ -416,8 +416,8 @@
 	 * Describes the type of items in the array.

 	 *

 	 * <p>

-	 * Required if <code>type</code> is <js>"array"</js>.

-	 * <br>Can only be used if <code>type</code> is <js>"array"</js>.

+	 * Required if <c>type</c> is <js>"array"</js>.

+	 * <br>Can only be used if <c>type</c> is <js>"array"</js>.

 	 *

 	 * <h5 class='section'>Used for:</h5>

 	 * <ul class='spaced-list'>

@@ -435,8 +435,8 @@
 	 * <mk>collectionFormat</mk> field of the {@doc SwaggerParameterObject}.

 	 *

 	 * <p>

-	 * Determines the format of the array if <code>type</code> <js>"array"</js> is used.

-	 * <br>Can only be used if <code>type</code> is <js>"array"</js>.

+	 * Determines the format of the array if <c>type</c> <js>"array"</js> is used.

+	 * <br>Can only be used if <c>type</c> is <js>"array"</js>.

 	 *

 	 * <br>Possible values are:

 	 * <ul class='spaced-list'>

@@ -518,8 +518,8 @@
 	 *

 	 * <p>

 	 * If validation fails during serialization or parsing, the part serializer/parser will throw a {@link SchemaValidationException}.

-	 * <br>On the client-side, this gets converted to a <code>RestCallException</code> which is thrown before the connection is made.

-	 * <br>On the server-side, this gets converted to a <code>BadRequest</code> (400).

+	 * <br>On the client-side, this gets converted to a <c>RestCallException</c> which is thrown before the connection is made.

+	 * <br>On the server-side, this gets converted to a <c>BadRequest</c> (400).

 	 *

 	 * <p>

 	 * Only allowed for the following types: <js>"integer"</js>, <js>"number"</js>.

@@ -544,12 +544,12 @@
 	 *

 	 * <p>

 	 * If validation fails during serialization or parsing, the part serializer/parser will throw a {@link SchemaValidationException}.

-	 * <br>On the client-side, this gets converted to a <code>RestCallException</code> which is thrown before the connection is made.

-	 * <br>On the server-side, this gets converted to a <code>BadRequest</code> (400).

+	 * <br>On the client-side, this gets converted to a <c>RestCallException</c> which is thrown before the connection is made.

+	 * <br>On the server-side, this gets converted to a <c>BadRequest</c> (400).

 	 *

 	 * <p>

 	 * Only allowed for the following types: <js>"integer"</js>, <js>"number"</js>.

-	 * <br>If <jk>true</jk>, must be accompanied with <code>maximum</code>.

+	 * <br>If <jk>true</jk>, must be accompanied with <c>maximum</c>.

 	 *

 	 * <h5 class='section'>Used for:</h5>

 	 * <ul class='spaced-list'>

@@ -572,8 +572,8 @@
 	 *

 	 * <p>

 	 * If validation fails during serialization or parsing, the part serializer/parser will throw a {@link SchemaValidationException}.

-	 * <br>On the client-side, this gets converted to a <code>RestCallException</code> which is thrown before the connection is made.

-	 * <br>On the server-side, this gets converted to a <code>BadRequest</code> (400).

+	 * <br>On the client-side, this gets converted to a <c>RestCallException</c> which is thrown before the connection is made.

+	 * <br>On the server-side, this gets converted to a <c>BadRequest</c> (400).

 	 *

 	 * <p>

 	 * Only allowed for the following types: <js>"integer"</js>, <js>"number"</js>.

@@ -598,12 +598,12 @@
 	 *

 	 * <p>

 	 * If validation fails during serialization or parsing, the part serializer/parser will throw a {@link SchemaValidationException}.

-	 * <br>On the client-side, this gets converted to a <code>RestCallException</code> which is thrown before the connection is made.

-	 * <br>On the server-side, this gets converted to a <code>BadRequest</code> (400).

+	 * <br>On the client-side, this gets converted to a <c>RestCallException</c> which is thrown before the connection is made.

+	 * <br>On the server-side, this gets converted to a <c>BadRequest</c> (400).

 	 *

 	 * <p>

 	 * Only allowed for the following types: <js>"integer"</js>, <js>"number"</js>.

-	 * <br>If <jk>true</jk>, Must be accompanied with <code>minimum</code>.

+	 * <br>If <jk>true</jk>, Must be accompanied with <c>minimum</c>.

 	 *

 	 * <h5 class='section'>Used for:</h5>

 	 * <ul class='spaced-list'>

@@ -623,12 +623,12 @@
 	 * <p>

 	 * A string instance is valid against this keyword if its length is less than, or equal to, the value of this keyword.

 	 * <br>The length of a string instance is defined as the number of its characters as defined by <a href='https://tools.ietf.org/html/rfc4627'>RFC 4627</a>.

-	 * <br>The value <code>-1</code> is always ignored.

+	 * <br>The value <c>-1</c> is always ignored.

 	 *

 	 * <p>

 	 * If validation fails during serialization or parsing, the part serializer/parser will throw a {@link SchemaValidationException}.

-	 * <br>On the client-side, this gets converted to a <code>RestCallException</code> which is thrown before the connection is made.

-	 * <br>On the server-side, this gets converted to a <code>BadRequest</code> (400).

+	 * <br>On the client-side, this gets converted to a <c>RestCallException</c> which is thrown before the connection is made.

+	 * <br>On the server-side, this gets converted to a <c>BadRequest</c> (400).

 	 *

 	 * <p>

 	 * Only allowed for the following types: <js>"string"</js>.

@@ -651,12 +651,12 @@
 	 * <p>

 	 * A string instance is valid against this keyword if its length is greater than, or equal to, the value of this keyword.

 	 * <br>The length of a string instance is defined as the number of its characters as defined by <a href='https://tools.ietf.org/html/rfc4627'>RFC 4627</a>.

-	 * <br>The value <code>-1</code> is always ignored.

+	 * <br>The value <c>-1</c> is always ignored.

 	 *

 	 * <p>

 	 * If validation fails during serialization or parsing, the part serializer/parser will throw a {@link SchemaValidationException}.

-	 * <br>On the client-side, this gets converted to a <code>RestCallException</code> which is thrown before the connection is made.

-	 * <br>On the server-side, this gets converted to a <code>BadRequest</code> (400).

+	 * <br>On the client-side, this gets converted to a <c>RestCallException</c> which is thrown before the connection is made.

+	 * <br>On the server-side, this gets converted to a <c>BadRequest</c> (400).

 	 *

 	 * <p>

 	 * Only allowed for the following types: <js>"string"</js>.

@@ -681,8 +681,8 @@
 	 *

 	 * <p>

 	 * If validation fails during serialization or parsing, the part serializer/parser will throw a {@link SchemaValidationException}.

-	 * <br>On the client-side, this gets converted to a <code>RestCallException</code> which is thrown before the connection is made.

-	 * <br>On the server-side, this gets converted to a <code>BadRequest</code> (400).

+	 * <br>On the client-side, this gets converted to a <c>RestCallException</c> which is thrown before the connection is made.

+	 * <br>On the server-side, this gets converted to a <c>BadRequest</c> (400).

 	 *

 	 * <p>

 	 * Only allowed for the following types: <js>"string"</js>.

@@ -707,8 +707,8 @@
 	 *

 	 * <p>

 	 * If validation fails during serialization or parsing, the part serializer/parser will throw a {@link SchemaValidationException}.

-	 * <br>On the client-side, this gets converted to a <code>RestCallException</code> which is thrown before the connection is made.

-	 * <br>On the server-side, this gets converted to a <code>BadRequest</code> (400).

+	 * <br>On the client-side, this gets converted to a <c>RestCallException</c> which is thrown before the connection is made.

+	 * <br>On the server-side, this gets converted to a <c>BadRequest</c> (400).

 	 *

 	 * <p>

 	 * Only allowed for the following types: <js>"array"</js>.

@@ -733,8 +733,8 @@
 	 *

 	 * <p>

 	 * If validation fails during serialization or parsing, the part serializer/parser will throw a {@link SchemaValidationException}.

-	 * <br>On the client-side, this gets converted to a <code>RestCallException</code> which is thrown before the connection is made.

-	 * <br>On the server-side, this gets converted to a <code>BadRequest</code> (400).

+	 * <br>On the client-side, this gets converted to a <c>RestCallException</c> which is thrown before the connection is made.

+	 * <br>On the server-side, this gets converted to a <c>BadRequest</c> (400).

 	 *

 	 * <p>

 	 * Only allowed for the following types: <js>"array"</js>.

@@ -759,8 +759,8 @@
 	 *

 	 * <p>

 	 * If validation fails during serialization or parsing, the part serializer/parser will throw a {@link SchemaValidationException}.

-	 * <br>On the client-side, this gets converted to a <code>RestCallException</code> which is thrown before the connection is made.

-	 * <br>On the server-side, this gets converted to a <code>BadRequest</code> (400).

+	 * <br>On the client-side, this gets converted to a <c>RestCallException</c> which is thrown before the connection is made.

+	 * <br>On the server-side, this gets converted to a <c>BadRequest</c> (400).

 	 *

 	 * <p>

 	 * If the parameter type is a subclass of {@link Set}, this validation is skipped (since a set can only contain unique items anyway).

@@ -789,8 +789,8 @@
 	 *

 	 * <p>

 	 * If validation fails during serialization or parsing, the part serializer/parser will throw a {@link SchemaValidationException}.

-	 * <br>On the client-side, this gets converted to a <code>RestCallException</code> which is thrown before the connection is made.

-	 * <br>On the server-side, this gets converted to a <code>BadRequest</code> (400).

+	 * <br>On the client-side, this gets converted to a <c>RestCallException</c> which is thrown before the connection is made.

+	 * <br>On the server-side, this gets converted to a <c>BadRequest</c> (400).

 	 *

 	 * <p>

 	 * The format is a {@doc juneau-marshall.JsonDetails.SimplifiedJson} array or comma-delimited list.

@@ -837,8 +837,8 @@
 	 *

 	 * <p>

 	 * If validation fails during serialization or parsing, the part serializer/parser will throw a {@link SchemaValidationException}.

-	 * <br>On the client-side, this gets converted to a <code>RestCallException</code> which is thrown before the connection is made.

-	 * <br>On the server-side, this gets converted to a <code>BadRequest</code> (400).

+	 * <br>On the client-side, this gets converted to a <c>RestCallException</c> which is thrown before the connection is made.

+	 * <br>On the server-side, this gets converted to a <c>BadRequest</c> (400).

 	 *

 	 * <p>

 	 * Only allowed for the following types: <js>"integer"</js>, <js>"number"</js>.

@@ -863,7 +863,7 @@
 	 * A serialized example of the parameter.

 	 *

 	 * <p>

-	 * This attribute defines a representation of the value that is used by <code>BasicRestInfoProvider</code> to construct

+	 * This attribute defines a representation of the value that is used by <c>BasicRestInfoProvider</c> to construct

 	 * an example of parameter.

 	 *

 	 * <h5 class='section'>Example:</h5>

@@ -988,7 +988,7 @@
 	 * 	<li>

 	 * 		The format is a {@doc juneau-marshall.JsonDetails.SimplifiedJson} object.

 	 * 	<li>

-	 * 		The leading/trailing <code>{ }</code> characters are optional.

+	 * 		The leading/trailing <c>{ }</c> characters are optional.

 	 * 		<br>The following two example are considered equivalent:

 	 * 		<p class='bcode w800'>

 	 * 	<ja>@Query</ja>(api=<js>"{description: 'ID of order to fetch'}"</js>)

diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Response.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Response.java
index 63cefe3..e52b56a 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Response.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Response.java
@@ -75,7 +75,7 @@
 	/**
 	 * The HTTP response code.
 	 *
-	 * The default value is <code>500</code> for exceptions and <code>200</code> for return types.
+	 * The default value is <c>500</c> for exceptions and <c>200</c> for return types.
 	 */
 	int[] code() default {};
 
@@ -295,7 +295,7 @@
 	 * 	<li>
 	 * 		The format is a {@doc juneau-marshall.JsonDetails.SimplifiedJson} object with string keys (media type) and string values (example for that media type) .
 	 * 	<li>
-	 * 		The leading/trailing <code>{ }</code> characters are optional.
+	 * 		The leading/trailing <c>{ }</c> characters are optional.
 	 * 	<li>
 	 * 		Multiple lines are concatenated with newlines so that you can format the value to be readable:
 	 * 	<li>
@@ -377,7 +377,7 @@
 	 * 	<li>
 	 * 		The format is a {@doc juneau-marshall.JsonDetails.SimplifiedJson} object.
 	 * 	<li>
-	 * 		The leading/trailing <code>{ }</code> characters are optional.
+	 * 		The leading/trailing <c>{ }</c> characters are optional.
 	 * 		<br>The following two example are considered equivalent:
 	 * 		<p class='bcode w800'>
 	 * 	<ja>@Response</ja>(api=<js>"{description: 'Redirect'}"</js>)
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/ResponseHeader.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/ResponseHeader.java
index fa78432..1b99aa4 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/ResponseHeader.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/ResponseHeader.java
@@ -301,8 +301,8 @@
 	 * <mk>collectionFormat</mk> field of the {@doc SwaggerHeaderObject}.
 	 *
 	 * <p>
-	 * Determines the format of the array if <code>type</code> <js>"array"</js> is used.
-	 * <br>Can only be used if <code>type</code> is <js>"array"</js>.
+	 * Determines the format of the array if <c>type</c> <js>"array"</js> is used.
+	 * <br>Can only be used if <c>type</c> is <js>"array"</js>.
 	 *
 	 * <br>Possible values are:
 	 * <ul class='spaced-list'>
@@ -515,7 +515,7 @@
 	 * A serialized example of the parameter.
 	 *
 	 * <p>
-	 * This attribute defines a representation of the value that is used by <code>BasicRestInfoProvider</code> to construct
+	 * This attribute defines a representation of the value that is used by <c>BasicRestInfoProvider</c> to construct
 	 * an example of parameter.
 	 *
 	 * <h5 class='section'>Example:</h5>
@@ -596,7 +596,7 @@
 	 * 	<li>
 	 * 		The format is a {@doc juneau-marshall.JsonDetails.SimplifiedJson} object.
 	 * 	<li>
-	 * 		The leading/trailing <code>{ }</code> characters are optional.
+	 * 		The leading/trailing <c>{ }</c> characters are optional.
 	 * 		<br>The following two example are considered equivalent:
 	 * 		<p class='bcode w800'>
 	 * 	<ja>@ResponseHeader</ja>(<js>"{description:'The new location of this resource'}"</js>)
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Tag.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Tag.java
index 9162a98..5966a59 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Tag.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Tag.java
@@ -176,7 +176,7 @@
 	 * 	<li>

 	 * 		The format is a {@doc juneau-marshall.JsonDetails.SimplifiedJson} object.

 	 * 	<li>

-	 * 		The leading/trailing <code>{ }</code> characters are optional.

+	 * 		The leading/trailing <c>{ }</c> characters are optional.

 	 * 		<br>The following two example are considered equivalent:

 	 * 		<p class='bcode w800'>

 	 * 	<ja>@Tag</ja>(api=<js>"{description: 'Everything about your Pets'}"</js>)

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 1137fbe..aae1997 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
@@ -179,7 +179,7 @@
 	}
 
 	/**
-	 * Shortcut for calling <code>create().type(type);</code>
+	 * Shortcut for calling <c>create().type(type);</c>
 	 *
 	 * @param type The schema type value.
 	 * @return A new builder.
@@ -189,7 +189,7 @@
 	}
 
 	/**
-	 * Shortcut for calling <code>create().type(type).format(format);</code>
+	 * Shortcut for calling <c>create().type(type).format(format);</c>
 	 *
 	 * @param type The schema type value.
 	 * @param format The schema format value.
@@ -436,7 +436,7 @@
 	}
 
 	/**
-	 * Valid values for the <code>collectionFormat</code> field.
+	 * Valid values for the <c>collectionFormat</c> field.
 	 */
 	public static enum CollectionFormat {
 
@@ -487,7 +487,7 @@
 	}
 
 	/**
-	 * Valid values for the <code>type</code> field.
+	 * Valid values for the <c>type</c> field.
 	 */
 	public static enum Type {
 
@@ -542,7 +542,7 @@
 	}
 
 	/**
-	 * Valid values for the <code>format</code> field.
+	 * Valid values for the <c>format</c> field.
 	 */
 	public static enum Format {
 
@@ -694,9 +694,9 @@
 	}
 
 	/**
-	 * Returns the <code>type</code> field of this schema.
+	 * Returns the <c>type</c> field of this schema.
 	 *
-	 * @return The <code>type</code> field of this schema, or <jk>null</jk> if not specified.
+	 * @return The <c>type</c> field of this schema, or <jk>null</jk> if not specified.
 	 * @see HttpPartSchemaBuilder#type(String)
 	 */
 	public Type getType() {
@@ -704,7 +704,7 @@
 	}
 
 	/**
-	 * Returns the <code>type</code> field of this schema.
+	 * Returns the <c>type</c> field of this schema.
 	 *
 	 * @param cm
 	 * 	The class meta of the object.
@@ -730,7 +730,7 @@
 	}
 
 	/**
-	 * Returns the <code>default</code> field of this schema.
+	 * Returns the <c>default</c> field of this schema.
 	 *
 	 * @return The default value for this schema, or <jk>null</jk> if not specified.
 	 * @see HttpPartSchemaBuilder#_default(String)
@@ -740,9 +740,9 @@
 	}
 
 	/**
-	 * Returns the <code>collectionFormat</code> field of this schema.
+	 * Returns the <c>collectionFormat</c> field of this schema.
 	 *
-	 * @return The <code>collectionFormat</code> field of this schema, or <jk>null</jk> if not specified.
+	 * @return The <c>collectionFormat</c> field of this schema, or <jk>null</jk> if not specified.
 	 * @see HttpPartSchemaBuilder#collectionFormat(String)
 	 */
 	public CollectionFormat getCollectionFormat() {
@@ -750,22 +750,22 @@
 	}
 
 	/**
-	 * Returns the <code>format</code> field of this schema.
+	 * Returns the <c>format</c> field of this schema.
 	 *
 	 * @see HttpPartSchemaBuilder#format(String)
-	 * @return The <code>format</code> field of this schema, or <jk>null</jk> if not specified.
+	 * @return The <c>format</c> field of this schema, or <jk>null</jk> if not specified.
 	 */
 	public Format getFormat() {
 		return format;
 	}
 
 	/**
-	 * Returns the <code>format</code> field of this schema.
+	 * Returns the <c>format</c> field of this schema.
 	 *
 	 * @param cm
 	 * 	The class meta of the object.
 	 * 	<br>Used to auto-detect the format if the format was not specified.
-	 * @return The <code>format</code> field of this schema, or <jk>null</jk> if not specified.
+	 * @return The <c>format</c> field of this schema, or <jk>null</jk> if not specified.
 	 * @see HttpPartSchemaBuilder#format(String)
 	 */
 	public Format getFormat(ClassMeta<?> cm) {
@@ -785,7 +785,7 @@
 	}
 
 	/**
-	 * Returns the <code>maximum</code> field of this schema.
+	 * 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 HttpPartSchemaBuilder#items(HttpPartSchemaBuilder)
@@ -795,9 +795,9 @@
 	}
 
 	/**
-	 * Returns the <code>maximum</code> field of this schema.
+	 * Returns the <c>maximum</c> field of this schema.
 	 *
-	 * @return The <code>maximum</code> field of this schema, or <jk>null</jk> if not specified.
+	 * @return The <c>maximum</c> field of this schema, or <jk>null</jk> if not specified.
 	 * @see HttpPartSchemaBuilder#maximum(Number)
 	 */
 	public Number getMaximum() {
@@ -805,9 +805,9 @@
 	}
 
 	/**
-	 * Returns the <code>minimum</code> field of this schema.
+	 * Returns the <c>minimum</c> field of this schema.
 	 *
-	 * @return The <code>minimum</code> field of this schema, or <jk>null</jk> if not specified.
+	 * @return The <c>minimum</c> field of this schema, or <jk>null</jk> if not specified.
 	 * @see HttpPartSchemaBuilder#minimum(Number)
 	 */
 	public Number getMinimum() {
@@ -815,9 +815,9 @@
 	}
 
 	/**
-	 * Returns the <code>xxx</code> field of this schema.
+	 * Returns the <c>xxx</c> field of this schema.
 	 *
-	 * @return The <code>xxx</code> field of this schema, or <jk>null</jk> if not specified.
+	 * @return The <c>xxx</c> field of this schema, or <jk>null</jk> if not specified.
 	 * @see HttpPartSchemaBuilder#multipleOf(Number)
 	 */
 	public Number getMultipleOf() {
@@ -825,9 +825,9 @@
 	}
 
 	/**
-	 * Returns the <code>xxx</code> field of this schema.
+	 * Returns the <c>xxx</c> field of this schema.
 	 *
-	 * @return The <code>xxx</code> field of this schema, or <jk>null</jk> if not specified.
+	 * @return The <c>xxx</c> field of this schema, or <jk>null</jk> if not specified.
 	 * @see HttpPartSchemaBuilder#pattern(String)
 	 */
 	public Pattern getPattern() {
@@ -835,9 +835,9 @@
 	}
 
 	/**
-	 * Returns the <code>xxx</code> field of this schema.
+	 * Returns the <c>xxx</c> field of this schema.
 	 *
-	 * @return The <code>xxx</code> field of this schema, or <jk>null</jk> if not specified.
+	 * @return The <c>xxx</c> field of this schema, or <jk>null</jk> if not specified.
 	 * @see HttpPartSchemaBuilder#maxLength(Long)
 	 */
 	public Long getMaxLength() {
@@ -845,9 +845,9 @@
 	}
 
 	/**
-	 * Returns the <code>xxx</code> field of this schema.
+	 * Returns the <c>xxx</c> field of this schema.
 	 *
-	 * @return The <code>xxx</code> field of this schema, or <jk>null</jk> if not specified.
+	 * @return The <c>xxx</c> field of this schema, or <jk>null</jk> if not specified.
 	 * @see HttpPartSchemaBuilder#minLength(Long)
 	 */
 	public Long getMinLength() {
@@ -855,9 +855,9 @@
 	}
 
 	/**
-	 * Returns the <code>xxx</code> field of this schema.
+	 * Returns the <c>xxx</c> field of this schema.
 	 *
-	 * @return The <code>xxx</code> field of this schema, or <jk>null</jk> if not specified.
+	 * @return The <c>xxx</c> field of this schema, or <jk>null</jk> if not specified.
 	 * @see HttpPartSchemaBuilder#maxItems(Long)
 	 */
 	public Long getMaxItems() {
@@ -865,9 +865,9 @@
 	}
 
 	/**
-	 * Returns the <code>xxx</code> field of this schema.
+	 * Returns the <c>xxx</c> field of this schema.
 	 *
-	 * @return The <code>xxx</code> field of this schema, or <jk>null</jk> if not specified.
+	 * @return The <c>xxx</c> field of this schema, or <jk>null</jk> if not specified.
 	 * @see HttpPartSchemaBuilder#minItems(Long)
 	 */
 	public Long getMinItems() {
@@ -875,9 +875,9 @@
 	}
 
 	/**
-	 * Returns the <code>xxx</code> field of this schema.
+	 * Returns the <c>xxx</c> field of this schema.
 	 *
-	 * @return The <code>xxx</code> field of this schema, or <jk>null</jk> if not specified.
+	 * @return The <c>xxx</c> field of this schema, or <jk>null</jk> if not specified.
 	 * @see HttpPartSchemaBuilder#maxProperties(Long)
 	 */
 	public Long getMaxProperties() {
@@ -885,9 +885,9 @@
 	}
 
 	/**
-	 * Returns the <code>xxx</code> field of this schema.
+	 * Returns the <c>xxx</c> field of this schema.
 	 *
-	 * @return The <code>xxx</code> field of this schema, or <jk>null</jk> if not specified.
+	 * @return The <c>xxx</c> field of this schema, or <jk>null</jk> if not specified.
 	 * @see HttpPartSchemaBuilder#minProperties(Long)
 	 */
 	public Long getMinProperties() {
@@ -895,9 +895,9 @@
 	}
 
 	/**
-	 * Returns the <code>exclusiveMaximum</code> field of this schema.
+	 * Returns the <c>exclusiveMaximum</c> field of this schema.
 	 *
-	 * @return The <code>exclusiveMaximum</code> field of this schema.
+	 * @return The <c>exclusiveMaximum</c> field of this schema.
 	 * @see HttpPartSchemaBuilder#exclusiveMaximum(Boolean)
 	 */
 	public boolean isExclusiveMaximum() {
@@ -905,9 +905,9 @@
 	}
 
 	/**
-	 * Returns the <code>exclusiveMinimum</code> field of this schema.
+	 * Returns the <c>exclusiveMinimum</c> field of this schema.
 	 *
-	 * @return The <code>exclusiveMinimum</code> field of this schema.
+	 * @return The <c>exclusiveMinimum</c> field of this schema.
 	 * @see HttpPartSchemaBuilder#exclusiveMinimum(Boolean)
 	 */
 	public boolean isExclusiveMinimum() {
@@ -915,9 +915,9 @@
 	}
 
 	/**
-	 * Returns the <code>uniqueItems</code> field of this schema.
+	 * Returns the <c>uniqueItems</c> field of this schema.
 	 *
-	 * @return The <code>uniqueItems</code> field of this schema.
+	 * @return The <c>uniqueItems</c> field of this schema.
 	 * @see HttpPartSchemaBuilder#uniqueItems(Boolean)
 	 */
 	public boolean isUniqueItems() {
@@ -925,9 +925,9 @@
 	}
 
 	/**
-	 * Returns the <code>required</code> field of this schema.
+	 * Returns the <c>required</c> field of this schema.
 	 *
-	 * @return The <code>required</code> field of this schema.
+	 * @return The <c>required</c> field of this schema.
 	 * @see HttpPartSchemaBuilder#required(Boolean)
 	 */
 	public boolean isRequired() {
@@ -935,9 +935,9 @@
 	}
 
 	/**
-	 * Returns the <code>skipIfEmpty</code> field of this schema.
+	 * Returns the <c>skipIfEmpty</c> field of this schema.
 	 *
-	 * @return The <code>skipIfEmpty</code> field of this schema.
+	 * @return The <c>skipIfEmpty</c> field of this schema.
 	 * @see HttpPartSchemaBuilder#skipIfEmpty(Boolean)
 	 */
 	public boolean isSkipIfEmpty() {
@@ -945,9 +945,9 @@
 	}
 
 	/**
-	 * Returns the <code>allowEmptyValue</code> field of this schema.
+	 * Returns the <c>allowEmptyValue</c> field of this schema.
 	 *
-	 * @return The <code>skipIfEmpty</code> field of this schema.
+	 * @return The <c>skipIfEmpty</c> field of this schema.
 	 * @see HttpPartSchemaBuilder#skipIfEmpty(Boolean)
 	 */
 	public boolean isAllowEmptyValue() {
@@ -955,9 +955,9 @@
 	}
 
 	/**
-	 * Returns the <code>enum</code> field of this schema.
+	 * Returns the <c>enum</c> field of this schema.
 	 *
-	 * @return The <code>enum</code> field of this schema, or <jk>null</jk> if not specified.
+	 * @return The <c>enum</c> field of this schema, or <jk>null</jk> if not specified.
 	 * @see HttpPartSchemaBuilder#_enum(Set)
 	 */
 	public Set<String> getEnum() {
@@ -965,9 +965,9 @@
 	}
 
 	/**
-	 * Returns the <code>parser</code> field of this schema.
+	 * Returns the <c>parser</c> field of this schema.
 	 *
-	 * @return The <code>parser</code> field of this schema, or <jk>null</jk> if not specified.
+	 * @return The <c>parser</c> field of this schema, or <jk>null</jk> if not specified.
 	 * @see HttpPartSchemaBuilder#parser(Class)
 	 */
 	public Class<? extends HttpPartParser> getParser() {
@@ -975,9 +975,9 @@
 	}
 
 	/**
-	 * Returns the <code>serializer</code> field of this schema.
+	 * Returns the <c>serializer</c> field of this schema.
 	 *
-	 * @return The <code>serializer</code> field of this schema, or <jk>null</jk> if not specified.
+	 * @return The <c>serializer</c> field of this schema, or <jk>null</jk> if not specified.
 	 * @see HttpPartSchemaBuilder#serializer(Class)
 	 */
 	public Class<? extends HttpPartSerializer> getSerializer() {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartSchemaBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartSchemaBuilder.java
index a70d27d..d91ba60 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartSchemaBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartSchemaBuilder.java
@@ -448,7 +448,7 @@
 	 *
 	 * @param value
 	 * 	The new value for this property.
-	 * 	<br>Ignored if value is <code>0</code>.
+	 * 	<br>Ignored if value is <c>0</c>.
 	 * @return This object (for method chaining).
 	 */
 	public HttpPartSchemaBuilder code(int value) {
@@ -529,11 +529,11 @@
 	 * 	<li>
 	 * 		<js>"number"</js>
 	 * 		<br>Parameter must be a number primitive or number object.
-	 * 		<br>If parameter is <code>Object</code>, creates either a <code>Float</code> or <code>Double</code> depending on the size of the number.
+	 * 		<br>If parameter is <c>Object</c>, creates either a <c>Float</c> or <c>Double</c> depending on the size of the number.
 	 * 	<li>
 	 * 		<js>"integer"</js>
 	 * 		<br>Parameter must be a integer/long primitive or integer/long object.
-	 * 		<br>If parameter is <code>Object</code>, creates either a <code>Short</code>, <code>Integer</code>, or <code>Long</code> depending on the size of the number.
+	 * 		<br>If parameter is <c>Object</c>, creates either a <c>Short</c>, <c>Integer</c>, or <c>Long</c> depending on the size of the number.
 	 * 	<li>
 	 * 		<js>"boolean"</js>
 	 * 		<br>Parameter must be a boolean primitive or object.
@@ -541,11 +541,11 @@
 	 * 		<js>"array"</js>
 	 * 		<br>Parameter must be an array or collection.
 	 * 		<br>Elements must be strings or POJOs convertible from strings.
-	 * 		<br>If parameter is <code>Object</code>, creates an {@link ObjectList}.
+	 * 		<br>If parameter is <c>Object</c>, creates an {@link ObjectList}.
 	 * 	<li>
 	 * 		<js>"object"</js>
 	 * 		<br>Parameter must be a map or bean.
-	 * 		<br>If parameter is <code>Object</code>, creates an {@link ObjectMap}.
+	 * 		<br>If parameter is <c>Object</c>, creates an {@link ObjectMap}.
 	 * 		<br>Note that this is an extension of the OpenAPI schema as Juneau allows for arbitrarily-complex POJOs to be serialized as HTTP parts.
 	 * 	<li>
 	 * 		<js>"file"</js>
@@ -719,8 +719,8 @@
 	 * <p>
 	 * Describes the type of items in the array.
 	 * <p>
-	 * Required if <code>type</code> is <js>"array"</js>.
-	 * <br>Can only be used if <code>type</code> is <js>"array"</js>.
+	 * Required if <c>type</c> is <js>"array"</js>.
+	 * <br>Can only be used if <c>type</c> is <js>"array"</js>.
 	 *
 	 * <p>
 	 * Applicable to the following Swagger schema objects:
@@ -765,8 +765,8 @@
 	 * <mk>collectionFormat</mk> field.
 	 *
 	 * <p>
-	 * Determines the format of the array if <code>type</code> <js>"array"</js> is used.
-	 * <br>Can only be used if <code>type</code> is <js>"array"</js>.
+	 * Determines the format of the array if <c>type</c> <js>"array"</js> is used.
+	 * <br>Can only be used if <c>type</c> is <js>"array"</js>.
 	 *
 	 * <br>Possible values are:
 	 * <ul class='spaced-list'>
@@ -875,7 +875,7 @@
 	 *
 	 * <p>
 	 * Only allowed for the following types: <js>"integer"</js>, <js>"number"</js>.
-	 * <br>If <jk>true</jk>, must be accompanied with <code>maximum</code>.
+	 * <br>If <jk>true</jk>, must be accompanied with <c>maximum</c>.
 	 *
 	 * <p>
 	 * Applicable to the following Swagger schema objects:
@@ -961,7 +961,7 @@
 	 *
 	 * <p>
 	 * Only allowed for the following types: <js>"integer"</js>, <js>"number"</js>.
-	 * <br>If <jk>true</jk>, must be accompanied with <code>minimum</code>.
+	 * <br>If <jk>true</jk>, must be accompanied with <c>minimum</c>.
 	 *
 	 * <p>
 	 * Applicable to the following Swagger schema objects:
@@ -1031,7 +1031,7 @@
 	 *
 	 * @param value
 	 * 	The new value for this property.
-	 * 	<br>Ignored if value is <jk>null</jk> or <code>-1</code>.
+	 * 	<br>Ignored if value is <jk>null</jk> or <c>-1</c>.
 	 * @return This object (for method chaining).
 	 */
 	public HttpPartSchemaBuilder maxLength(Long value) {
@@ -1076,7 +1076,7 @@
 	 *
 	 * @param value
 	 * 	The new value for this property.
-	 * 	<br>Ignored if value is <jk>null</jk> or <code>-1</code>.
+	 * 	<br>Ignored if value is <jk>null</jk> or <c>-1</c>.
 	 * @return This object (for method chaining).
 	 */
 	public HttpPartSchemaBuilder minLength(Long value) {
@@ -1153,7 +1153,7 @@
 	 *
 	 * @param value
 	 * 	The new value for this property.
-	 * 	<br>Ignored if value is <jk>null</jk> or <code>-1</code>.
+	 * 	<br>Ignored if value is <jk>null</jk> or <c>-1</c>.
 	 * @return This object (for method chaining).
 	 */
 	public HttpPartSchemaBuilder maxItems(Long value) {
@@ -1197,7 +1197,7 @@
 	 *
 	 * @param value
 	 * 	The new value for this property.
-	 * 	<br>Ignored if value is <jk>null</jk> or <code>-1</code>.
+	 * 	<br>Ignored if value is <jk>null</jk> or <c>-1</c>.
 	 * @return This object (for method chaining).
 	 */
 	public HttpPartSchemaBuilder minItems(Long value) {
@@ -1406,7 +1406,7 @@
 	 *
 	 * @param value
 	 * 	The new value for this property.
-	 * 	<br>Ignored if value is <jk>null</jk> or <code>-1</code>.
+	 * 	<br>Ignored if value is <jk>null</jk> or <c>-1</c>.
 	 * @return This object (for method chaining).
 	 */
 	public HttpPartSchemaBuilder maxProperties(Long value) {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartSerializer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartSerializer.java
index 537bab4..a412546 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartSerializer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartSerializer.java
@@ -37,7 +37,7 @@
  * 	<li class='ja'>{@link Path#serializer()}
  * 	<li class='ja'>{@link Request#partSerializer()}
  * 	<li class='ja'>{@link Response#partSerializer()}
- * 	<li class='jc'><code>RestClientBuilder.partSerializer(Class)</code>
+ * 	<li class='jc'><c>RestClientBuilder.partSerializer(Class)</c>
  * </ul>
  *
  * <p>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/SimplePartParser.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/SimplePartParser.java
index 14b6b4d..364585f 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/SimplePartParser.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/SimplePartParser.java
@@ -26,17 +26,17 @@
  * 	<li>

  * 		An <jk>enum</jk>.

  * 	<li>

- * 		Have a public constructor with a single <code>String</code> parameter.

+ * 		Have a public constructor with a single <c>String</c> parameter.

  * 	<li>

- * 		Have one of the following public static methods that takes in a single <code>String</code> parameter:

+ * 		Have one of the following public static methods that takes in a single <c>String</c> parameter:

  * 		<ul>

- * 			<li><code>fromString</code>

- * 			<li><code>fromValue</code>

- * 			<li><code>valueOf</code>

- * 			<li><code>parse</code>

- * 			<li><code>parseString</code>

- * 			<li><code>forName</code>

- * 			<li><code>forString</code>

+ * 			<li><c>fromString</c>

+ * 			<li><c>fromValue</c>

+ * 			<li><c>valueOf</c>

+ * 			<li><c>parse</c>

+ * 			<li><c>parseString</c>

+ * 			<li><c>forName</c>

+ * 			<li><c>forString</c>

  * 	</ul>

  * </ul>

  */

diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/ArrayUtils.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/ArrayUtils.java
index a90d7ef..a36bfb6 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/ArrayUtils.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/ArrayUtils.java
@@ -132,13 +132,13 @@
 	}

 

 	/**

-	 * Converts the specified array to a <code>Set</code>.

+	 * Converts the specified array to a <c>Set</c>.

 	 *

 	 * <p>

 	 * The order of the entries in the set are the same as the array.

 	 *

 	 * @param <T> The entry type of the array.

-	 * @param array The array being wrapped in a <code>Set</code> interface.

+	 * @param array The array being wrapped in a <c>Set</c> interface.

 	 * @return The new set.

 	 */

 	public static <T> Set<T> asSet(final T[] array) {

@@ -182,7 +182,7 @@
 	 * Returns an iterator against an array.

 	 *

 	 * <p>

-	 * This works with any array type (e.g. <code>String[]</code>, <code>Object[]</code>,

+	 * This works with any array type (e.g. <c>String[]</c>, <c>Object[]</c>,

 	 * <code><jk>int</jk>[]</code>, etc...).

 	 *

 	 * @param array The array to create an iterator over.

@@ -242,7 +242,7 @@
 	}

 

 	/**

-	 * Converts the specified array to an <code>ArrayList</code>

+	 * Converts the specified array to an <c>ArrayList</c>

 	 *

 	 * @param array The array to convert.

 	 * @param componentType

@@ -259,7 +259,7 @@
 	}

 

 	/**

-	 * Shortcut for calling <code>myList.toArray(new T[myList.size()]);</code>

+	 * Shortcut for calling <c>myList.toArray(new T[myList.size()]);</c>

 	 *

 	 * @param c The collection being converted to an array.

 	 * @param componentType The component type of the array.

@@ -332,7 +332,7 @@
 	 * @param element The element to check for.

 	 * @param array The array to check.

 	 * @return

-	 * 	The index position of the element in the specified array, or <code>-1</code> if the array doesn't contain the

+	 * 	The index position of the element in the specified array, or <c>-1</c> if the array doesn't contain the

 	 * 	element, or the array or element is <jk>null</jk>.

 	 */

 	public static <T> int indexOf(T element, T[] array) {

@@ -367,7 +367,7 @@
 	 * @param array The array to check.

 	 * @return

 	 * 	The index position of the element in the specified array, or

-	 * 	<code>-1</code> if the array doesn't contain the element, or the array or element is <jk>null</jk>.

+	 * 	<c>-1</c> if the array doesn't contain the element, or the array or element is <jk>null</jk>.

 	 */

 	public static int indexOf(String element, String[] array) {

 		if (element == null)

@@ -381,7 +381,7 @@
 	}

 

 	/**

-	 * Converts a primitive wrapper array (e.g. <code>Integer[]</code>) to a primitive array (e.g. <code><jk>int</jk>[]</code>).

+	 * Converts a primitive wrapper array (e.g. <c>Integer[]</c>) to a primitive array (e.g. <code><jk>int</jk>[]</code>).

 	 *

 	 * @param o The array to convert.  Must be a primitive wrapper array.

 	 * @return A new array.

diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/ClassUtils.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/ClassUtils.java
index 4d1ce35..083dab1 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/ClassUtils.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/ClassUtils.java
@@ -140,7 +140,7 @@
 	 *

 	 * @param paramTypes The parameters types specified on a method.

 	 * @param argTypes The class types of the arguments being passed to the method.

-	 * @return The number of matching arguments, or <code>-1</code> a parameter was found that isn't in the list of args.

+	 * @return The number of matching arguments, or <c>-1</c> a parameter was found that isn't in the list of args.

 	 */

 	public static int fuzzyArgsMatch(Class<?>[] paramTypes, Class<?>... argTypes) {

 		int matches = 0;

@@ -163,7 +163,7 @@
 	 *

 	 * @param paramTypes The parameters types specified on a method.

 	 * @param argTypes The class types of the arguments being passed to the method.

-	 * @return The number of matching arguments, or <code>-1</code> a parameter was found that isn't in the list of args.

+	 * @return The number of matching arguments, or <c>-1</c> a parameter was found that isn't in the list of args.

 	 */

 	public static int fuzzyArgsMatch(List<ClassInfo> paramTypes, Class<?>... argTypes) {

 		int matches = 0;

@@ -354,10 +354,10 @@
 	 * <p>

 	 * Class must be one of the following:

 	 * <ul>

-	 * 	<li>Have a public constructor that takes in a single <code>String</code> argument.

-	 * 	<li>Have a static <code>fromString(String)</code> (or related) method.

+	 * 	<li>Have a public constructor that takes in a single <c>String</c> argument.

+	 * 	<li>Have a static <c>fromString(String)</c> (or related) method.

 	 * 		<br>See {@link ClassInfo#getFromStringMethod()} for the list of possible static method names.

-	 * 	<li>Be an <code>enum</code>.

+	 * 	<li>Be an <c>enum</c>.

 	 * </ul>

 	 *

 	 * @param c The class.

@@ -373,7 +373,7 @@
 	 * Converts an object to a string.

 	 *

 	 * <p>

-	 * Normally, this is just going to call <code>toString()</code> on the object.

+	 * Normally, this is just going to call <c>toString()</c> on the object.

 	 * However, the {@link Locale} and {@link TimeZone} objects are treated special so that the returned value

 	 * works with the {@link #fromString(Class, String)} method.

 	 *

@@ -437,14 +437,14 @@
 	}

 

 	/**

-	 * Returns the specified type as a <code>Class</code>.

+	 * Returns the specified type as a <c>Class</c>.

 	 *

 	 * <p>

-	 * If it's already a <code>Class</code>, it just does a cast.

-	 * <br>If it's a <code>ParameterizedType</code>, it returns the raw type.

+	 * If it's already a <c>Class</c>, it just does a cast.

+	 * <br>If it's a <c>ParameterizedType</c>, it returns the raw type.

 	 *

 	 * @param t The type to convert.

-	 * @return The type converted to a <code>Class</code>, or <jk>null</jk> if it could not be converted.

+	 * @return The type converted to a <c>Class</c>, or <jk>null</jk> if it could not be converted.

 	 */

 	public static Class<?> toClass(Type t) {

 		if (t instanceof Class)

diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/DateUtils.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/DateUtils.java
index 952853a..e6732b1 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/DateUtils.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/DateUtils.java
@@ -42,7 +42,7 @@
 	public static final String PATTERN_RFC1036 = "EEE, dd-MMM-yy HH:mm:ss zzz";
 
 	/**
-	 * Date format pattern used to parse HTTP date headers in ANSI C <code>asctime()</code> format.
+	 * Date format pattern used to parse HTTP date headers in ANSI C <c>asctime()</c> format.
 	 */
 	public static final String PATTERN_ASCTIME = "EEE MMM d HH:mm:ss yyyy";
 	private static final String[] DEFAULT_PATTERNS = new String[] { PATTERN_RFC1123, PATTERN_RFC1036, PATTERN_ASCTIME };
@@ -86,9 +86,9 @@
 	 * @param dateValue the date value to parse
 	 * @param dateFormats the date formats to use
 	 * @param startDate
-	 * 	During parsing, two digit years will be placed in the range <code>startDate</code> to
-	 * 	<code>startDate + 100 years</code>. This value may be <code>null</code>. When
-	 * 	<code>null</code> is given as a parameter, year <code>2000</code> will be used.
+	 * 	During parsing, two digit years will be placed in the range <c>startDate</c> to
+	 * 	<c>startDate + 100 years</c>. This value may be <c>null</c>. When
+	 * 	<c>null</c> is given as a parameter, year <c>2000</c> will be used.
 	 * @return the parsed date or null if input could not be parsed
 	 */
 	public static Date parseDate(final String dateValue, final String[] dateFormats, final Date startDate) {
@@ -192,8 +192,8 @@
 		 * Creates a {@link SimpleDateFormat} for the requested format string.
 		 *
 		 * @param pattern
-		 * 	A non-<code>null</code> format String according to {@link SimpleDateFormat}.
-		 * 	The format is not checked against <code>null</code> since all paths go through {@link DateUtils}.
+		 * 	A non-<c>null</c> format String according to {@link SimpleDateFormat}.
+		 * 	The format is not checked against <c>null</c> since all paths go through {@link DateUtils}.
 		 * @return
 		 * 	The requested format.
 		 * 	This simple date-format should not be used to {@link SimpleDateFormat#applyPattern(String) apply} to a
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/HashCode.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/HashCode.java
index 74d85ec..1e83c40 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/HashCode.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/HashCode.java
@@ -50,7 +50,7 @@
 	 * Hashes the hashcode into this object.
 	 *
 	 * <p>
-	 * The formula is simply <code>hashCode = 31*hashCode + i;</code>
+	 * The formula is simply <c>hashCode = 31*hashCode + i;</c>
 	 *
 	 * @param i The hashcode to hash into this object's hashcode.
 	 * @return This object (for method chaining).
@@ -74,7 +74,7 @@
 	 *
 	 * <p>
 	 * Subclasses can override this method to provide specialized handling (e.g. converting numbers to strings so that
-	 * <code>123</code> and <js>"123"</js> end up creating the same hashcode.)
+	 * <c>123</c> and <js>"123"</js> end up creating the same hashcode.)
 	 *
 	 * <p>
 	 * Default implementation does nothing.
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/IOUtils.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/IOUtils.java
index acc32d0..c654aba 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/IOUtils.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/IOUtils.java
@@ -41,7 +41,7 @@
 	}

 

 	/**

-	 * Reads the specified object to a <code>String</code>.

+	 * Reads the specified object to a <c>String</c>.

 	 *

 	 * <p>

 	 * Can be any of the following object types:

@@ -279,7 +279,7 @@
 	}

 

 	/**

-	 * Shortcut for calling <code>readBytes(in, 1024);</code>

+	 * Shortcut for calling <c>readBytes(in, 1024);</c>

 	 *

 	 * @param in

 	 * 	The object to read into a byte array.

@@ -320,7 +320,7 @@
 	}

 

 	/**

-	 * Writes the contents of the specified <code>Reader</code> to the specified file.

+	 * Writes the contents of the specified <c>Reader</c> to the specified file.

 	 *

 	 * @param out The file to write the output to.

 	 * @param in The reader to pipe from.

@@ -336,7 +336,7 @@
 	}

 

 	/**

-	 * Writes the contents of the specified <code>InputStream</code> to the specified file.

+	 * Writes the contents of the specified <c>InputStream</c> to the specified file.

 	 *

 	 * @param out The file to write the output to.

 	 * @param in The input stream to pipe from.

@@ -595,7 +595,7 @@
 	}

 

 	/**

-	 * Converts an object to a <code>Reader</code>.

+	 * Converts an object to a <c>Reader</c>.

 	 *

 	 * @param o

 	 * 	The object to convert to a reader.

@@ -629,7 +629,7 @@
 	}

 

 	/**

-	 * Converts an object to an <code>InputStream</code>.

+	 * Converts an object to an <c>InputStream</c>.

 	 *

 	 * @param o

 	 * 	The object to convert to an input stream.

diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/ObjectUtils.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/ObjectUtils.java
index 39c6bef..5e0f391 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/ObjectUtils.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/ObjectUtils.java
@@ -73,42 +73,42 @@
  * 	</tr>
  * 	<tr>
  * 		<td>
- * 			<code>Collection</code> (e.g. <code>List</code>, <code>LinkedList</code>, <code>HashSet</code>, <code>ObjectList</code>)
+ * 			<c>Collection</c> (e.g. <c>List</c>, <c>LinkedList</c>, <c>HashSet</c>, <c>ObjectList</c>)
  * 		</td>
  * 		<td>
- * 			<code>Collection&lt;Object&gt;</code>
- * 			<br><code>Object[]</code>
+ * 			<c>Collection&lt;Object&gt;</c>
+ * 			<br><c>Object[]</c>
  * 		</td>
  * 		<td>
- * 			If <code>Collection</code> is not constructible, a <code>ObjectList</code> is created.
+ * 			If <c>Collection</c> is not constructible, a <c>ObjectList</c> is created.
  * 		</td>
  * 	</tr>
  * 	<tr>
  * 		<td>
- * 			<code>X[]</code> (array of any type X)
+ * 			<c>X[]</c> (array of any type X)
  * 		</td>
  * 		<td>
- * 			<code>List&lt;X&gt;</code>
+ * 			<c>List&lt;X&gt;</c>
  * 		</td>
  * 		<td>&nbsp;</td>
  * 	</tr>
  * 	<tr>
  * 		<td>
- * 			<code>X[][]</code> (multi-dimensional arrays)
+ * 			<c>X[][]</c> (multi-dimensional arrays)
  * 		</td>
  * 		<td>
- * 			<code>List&lt;List&lt;X&gt;&gt;</code>
- * 			<br><code>List&lt;X[]&gt;</code>
- * 			<br><code> List[]&lt;X&gt;</code>
+ * 			<c>List&lt;List&lt;X&gt;&gt;</c>
+ * 			<br><c>List&lt;X[]&gt;</c>
+ * 			<br><c> List[]&lt;X&gt;</c>
  * 		</td>
  * 		<td>&nbsp;</td>
  * 	</tr>
  * 	<tr>
  * 		<td>
- * 			<code>Enum</code>
+ * 			<c>Enum</c>
  * 		</td>
  * 		<td>
- * 			<code>String</code>
+ * 			<c>String</c>
  * 		</td>
  * 		<td>&nbsp;</td>
  * 	</tr>
@@ -117,13 +117,13 @@
  * 			Bean
  * 		</td>
  * 		<td>
- * 			<code>Map</code>
+ * 			<c>Map</c>
  * 		</td>
  * 		<td>&nbsp;</td>
  * 	</tr>
  * 	<tr>
  * 		<td>
- * 			<code>String</code>
+ * 			<c>String</c>
  * 		</td>
  * 		<td>
  * 			Anything
@@ -140,7 +140,7 @@
  * 			<br><code><jk>public</jk> T(String)</code>
  * 		</td>
  * 		<td>
- * 			<code>String</code>
+ * 			<c>String</c>
  * 		</td>
  * 		<td>
  * 			<br>
@@ -328,7 +328,7 @@
 	 * Returns the first non-zero value in the list of ints.
 	 *
 	 * @param ints The ints to check.
-	 * @return The first non-zero value, or <code>0</code> if they were all zero.
+	 * @return The first non-zero value, or <c>0</c> if they were all zero.
 	 */
 	public static int firstNonZero(int...ints) {
 		for (int i : ints)
@@ -360,8 +360,8 @@
 	 * @param o1 Object 1.
 	 * @param o2 Object 2.
 	 * @return
-	 * 	<code>-1</code>, <code>0</code>, or <code>1</code> if <code>o1</code> is less-than, equal, or greater-than <code>o2</code>.
-	 *	<br><code>0</code> if objects are not of the same type or do not implement the {@link Comparable} interface.
+	 * 	<c>-1</c>, <c>0</c>, or <c>1</c> if <c>o1</c> is less-than, equal, or greater-than <c>o2</c>.
+	 *	<br><c>0</c> if objects are not of the same type or do not implement the {@link Comparable} interface.
 	 */
 	@SuppressWarnings({ "rawtypes", "unchecked" })
 	public static int compare(Object o1, Object o2) {
@@ -385,8 +385,8 @@
 	 * @param i1 Integer #1
 	 * @param i2 Integer #2
 	 * @return
-	 * 	The value <code>0</code> if Integer #1 is equal to Integer #2; a value less than <code>0</code> if
-	 * 	Integer #1 numerically less than Integer #2; and a value greater than <code>0</code> if Integer #1 is
+	 * 	The value <c>0</c> if Integer #1 is equal to Integer #2; a value less than <c>0</c> if
+	 * 	Integer #1 numerically less than Integer #2; and a value greater than <c>0</c> if Integer #1 is
 	 * 	numerically greater than Integer #2 (signed comparison).
 	 */
 	public static final int compare(int i1, int i2) {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/SimpleMap.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/SimpleMap.java
index aff114c..746f1b8 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/SimpleMap.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/SimpleMap.java
@@ -21,10 +21,10 @@
 import org.apache.juneau.*;

 

 /**

- * An instance of a <code>Map</code> where the keys and values are simple arrays.

+ * An instance of a <c>Map</c> where the keys and values are simple arrays.

  *

  * <p>

- * Typically more efficient than <code>HashMaps</code> for small maps (e.g. &lt;10 entries).

+ * Typically more efficient than <c>HashMaps</c> for small maps (e.g. &lt;10 entries).

  *

  * <p>

  * Does not support adding or removing entries.

diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/StringUtils.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/StringUtils.java
index 3305f16..747b0d4 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/StringUtils.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/StringUtils.java
@@ -129,7 +129,7 @@
 	 * 		<li> BigInteger

 	 * 		<li> BigDecimal

 	 * 	</ul>

-	 * 	If <jk>null</jk> or <code>Number</code>, uses the best guess.

+	 * 	If <jk>null</jk> or <c>Number</c>, uses the best guess.

 	 * @return The parsed number, or <jk>null</jk> if the string was null.

 	 * @throws ParseException

 	 */

@@ -215,7 +215,7 @@
 	);

 

 	/**

-	 * Converts a <code>String</code> to a <code>Character</code>

+	 * Converts a <c>String</c> to a <c>Character</c>

 	 *

 	 * @param o The string to convert.

 	 * @return The first character of the string if the string is of length 0, or <jk>null</jk> if the string is <jk>null</jk> or empty.

@@ -336,7 +336,7 @@
 	 * Convenience method for getting a stack trace as a string.

 	 *

 	 * @param t The throwable to get the stack trace from.

-	 * @return The same content that would normally be rendered via <code>t.printStackTrace()</code>

+	 * @return The same content that would normally be rendered via <c>t.printStackTrace()</c>

 	 */

 	public static String getStackTrace(Throwable t) {

 		StringWriter sw = new StringWriter();

@@ -351,7 +351,7 @@
 	 *

 	 * @param tokens The tokens to join.

 	 * @param separator The delimiter.

-	 * @return The delimited string.  If <code>tokens</code> is <jk>null</jk>, returns <jk>null</jk>.

+	 * @return The delimited string.  If <c>tokens</c> is <jk>null</jk>, returns <jk>null</jk>.

 	 */

 	public static String join(Object[] tokens, String separator) {

 		if (tokens == null)

@@ -370,7 +370,7 @@
 	 *

 	 * @param tokens The tokens to join.

 	 * @param d The delimiter.

-	 * @return The delimited string.  If <code>tokens</code> is <jk>null</jk>, returns <jk>null</jk>.

+	 * @return The delimited string.  If <c>tokens</c> is <jk>null</jk>, returns <jk>null</jk>.

 	 */

 	public static String join(int[] tokens, String d) {

 		if (tokens == null)

@@ -389,7 +389,7 @@
 	 *

 	 * @param tokens The tokens to join.

 	 * @param d The delimiter.

-	 * @return The delimited string.  If <code>tokens</code> is <jk>null</jk>, returns <jk>null</jk>.

+	 * @return The delimited string.  If <c>tokens</c> is <jk>null</jk>, returns <jk>null</jk>.

 	 */

 	public static String join(Collection<?> tokens, String d) {

 		if (tokens == null)

@@ -403,7 +403,7 @@
 	 * @param tokens The tokens to join.

 	 * @param d The delimiter.

 	 * @param sb The string builder to append the response to.

-	 * @return The same string builder passed in as <code>sb</code>.

+	 * @return The same string builder passed in as <c>sb</c>.

 	 */

 	public static StringBuilder join(Collection<?> tokens, String d, StringBuilder sb) {

 		if (tokens == null)

@@ -421,7 +421,7 @@
 	 *

 	 * @param tokens The tokens to join.

 	 * @param d The delimiter.

-	 * @return The delimited string.  If <code>tokens</code> is <jk>null</jk>, returns <jk>null</jk>.

+	 * @return The delimited string.  If <c>tokens</c> is <jk>null</jk>, returns <jk>null</jk>.

 	 */

 	public static String join(Object[] tokens, char d) {

 		if (tokens == null)

@@ -434,7 +434,7 @@
 	 *

 	 * @param tokens The tokens to join.

 	 * @param d The delimiter.

-	 * @return The delimited string.  If <code>tokens</code> is <jk>null</jk>, returns <jk>null</jk>.

+	 * @return The delimited string.  If <c>tokens</c> is <jk>null</jk>, returns <jk>null</jk>.

 	 */

 	public static String joine(Object[] tokens, char d) {

 		if (tokens == null)

@@ -458,7 +458,7 @@
 	 * @param tokens The tokens to join.

 	 * @param d The delimiter.

 	 * @param sb The string builder to append the response to.

-	 * @return The same string builder passed in as <code>sb</code>.

+	 * @return The same string builder passed in as <c>sb</c>.

 	 */

 	public static StringBuilder join(Object[] tokens, char d, StringBuilder sb) {

 		if (tokens == null)

@@ -477,7 +477,7 @@
 	 * @param tokens The tokens to join.

 	 * @param d The delimiter.

 	 * @param sb The string builder to append the response to.

-	 * @return The same string builder passed in as <code>sb</code>.

+	 * @return The same string builder passed in as <c>sb</c>.

 	 */

 	public static StringBuilder joine(Object[] tokens, char d, StringBuilder sb) {

 		if (tokens == null)

@@ -496,7 +496,7 @@
 	 *

 	 * @param tokens The tokens to join.

 	 * @param d The delimiter.

-	 * @return The delimited string.  If <code>tokens</code> is <jk>null</jk>, returns <jk>null</jk>.

+	 * @return The delimited string.  If <c>tokens</c> is <jk>null</jk>, returns <jk>null</jk>.

 	 */

 	public static String join(int[] tokens, char d) {

 		if (tokens == null)

@@ -515,7 +515,7 @@
 	 *

 	 * @param tokens The tokens to join.

 	 * @param d The delimiter.

-	 * @return The delimited string.  If <code>tokens</code> is <jk>null</jk>, returns <jk>null</jk>.

+	 * @return The delimited string.  If <c>tokens</c> is <jk>null</jk>, returns <jk>null</jk>.

 	 */

 	public static String join(Collection<?> tokens, char d) {

 		if (tokens == null)

@@ -534,7 +534,7 @@
 	 *

 	 * @param tokens The tokens to join.

 	 * @param d The delimiter.

-	 * @return The delimited string.  If <code>tokens</code> is <jk>null</jk>, returns <jk>null</jk>.

+	 * @return The delimited string.  If <c>tokens</c> is <jk>null</jk>, returns <jk>null</jk>.

 	 */

 	public static String joine(Collection<?> tokens, char d) {

 		if (tokens == null)

@@ -759,12 +759,12 @@
 	 * <p>

 	 * Examples:

 	 * <ul>

-	 * 	<li><js>"foo"</js> =&gt; <code>["foo"]</code>

-	 * 	<li><js>" foo "</js> =&gt; <code>["foo"]</code>

-	 * 	<li><js>"foo bar baz"</js> =&gt; <code>["foo","bar","baz"]</code>

-	 * 	<li><js>"foo 'bar baz'"</js> =&gt; <code>["foo","bar baz"]</code>

-	 * 	<li><js>"foo \"bar baz\""</js> =&gt; <code>["foo","bar baz"]</code>

-	 * 	<li><js>"foo 'bar\'baz'"</js> =&gt; <code>["foo","bar'baz"]</code>

+	 * 	<li><js>"foo"</js> =&gt; <c>["foo"]</c>

+	 * 	<li><js>" foo "</js> =&gt; <c>["foo"]</c>

+	 * 	<li><js>"foo bar baz"</js> =&gt; <c>["foo","bar","baz"]</c>

+	 * 	<li><js>"foo 'bar baz'"</js> =&gt; <c>["foo","bar baz"]</c>

+	 * 	<li><js>"foo \"bar baz\""</js> =&gt; <c>["foo","bar baz"]</c>

+	 * 	<li><js>"foo 'bar\'baz'"</js> =&gt; <c>["foo","bar'baz"]</c>

 	 * </ul>

 	 *

 	 * @param s The input string.

@@ -1205,7 +1205,7 @@
 	}

 

 	/**

-	 * Shortcut for calling <code>base64Decode(String)</code> and converting the result to a UTF-8 encoded string.

+	 * Shortcut for calling <c>base64Decode(String)</c> and converting the result to a UTF-8 encoded string.

 	 *

 	 * @param in The BASE-64 encoded string to decode.

 	 * @return The decoded string.

@@ -1272,14 +1272,14 @@
 	 * This method conforms to the restrictions for hostnames as specified in {@doc https://tools.ietf.org/html/rfc952 RFC 952}

 	 * Since each character has 36 possible values, the square approximation formula for the number of generated IDs

 	 * that would produce a 50% chance of collision is:

-	 * <code>sqrt(36^N)</code>.

+	 * <c>sqrt(36^N)</c>.

 	 * Dividing this number by 10 gives you an approximation of the number of generated IDs needed to produce a

 	 * &lt;1% chance of collision.

 	 *

 	 * <p>

 	 * For example, given 5 characters, the number of generated IDs need to produce a &lt;1% chance of collision would

 	 * be:

-	 * <code>sqrt(36^5)/10=777</code>

+	 * <c>sqrt(36^5)/10=777</c>

 	 *

 	 * @param numchars The number of characters in the generated UUID.

 	 * @return A new random UUID.

@@ -1297,7 +1297,7 @@
 	}

 

 	/**

-	 * Same as {@link String#trim()} but prevents <code>NullPointerExceptions</code>.

+	 * Same as {@link String#trim()} but prevents <c>NullPointerExceptions</c>.

 	 *

 	 * @param s The string to trim.

 	 * @return The trimmed string, or <jk>null</jk> if the string was <jk>null</jk>.

@@ -1325,7 +1325,7 @@
 	 *

 	 * <p>

 	 * Supports any of the following formats:

-	 * <br><code>yyyy, yyyy-MM, yyyy-MM-dd, yyyy-MM-ddThh, yyyy-MM-ddThh:mm, yyyy-MM-ddThh:mm:ss, yyyy-MM-ddThh:mm:ss.SSS</code>

+	 * <br><c>yyyy, yyyy-MM, yyyy-MM-dd, yyyy-MM-ddThh, yyyy-MM-ddThh:mm, yyyy-MM-ddThh:mm:ss, yyyy-MM-ddThh:mm:ss.SSS</c>

 	 *

 	 * @param date The date string.

 	 * @return The parsed date.

@@ -1342,7 +1342,7 @@
 	 *

 	 * <p>

 	 * Supports any of the following formats:

-	 * <br><code>yyyy, yyyy-MM, yyyy-MM-dd, yyyy-MM-ddThh, yyyy-MM-ddThh:mm, yyyy-MM-ddThh:mm:ss, yyyy-MM-ddThh:mm:ss.SSS</code>

+	 * <br><c>yyyy, yyyy-MM, yyyy-MM-dd, yyyy-MM-ddThh, yyyy-MM-ddThh:mm, yyyy-MM-ddThh:mm:ss, yyyy-MM-ddThh:mm:ss.SSS</c>

 	 *

 	 * @param date The date string.

 	 * @return The parsed calendar.

@@ -1886,7 +1886,7 @@
 	}

 

 	/**

-	 * Decodes a <code>application/x-www-form-urlencoded</code> string using <code>UTF-8</code> encoding scheme.

+	 * Decodes a <c>application/x-www-form-urlencoded</c> string using <c>UTF-8</c> encoding scheme.

 	 *

 	 * @param s The string to decode.

 	 * @return The decoded string, or <jk>null</jk> if input is <jk>null</jk>.

@@ -1909,7 +1909,7 @@
 	}

 

 	/**

-	 * Encodes a <code>application/x-www-form-urlencoded</code> string using <code>UTF-8</code> encoding scheme.

+	 * Encodes a <c>application/x-www-form-urlencoded</c> string using <c>UTF-8</c> encoding scheme.

 	 *

 	 * @param s The string to encode.

 	 * @return The encoded string, or <jk>null</jk> if input is <jk>null</jk>.

@@ -1988,7 +1988,7 @@
 	 *

 	 * @param s The string to check.

 	 * @return

-	 * 	The first non-whitespace character, or <code>0</code> if the string is <jk>null</jk>, empty, or composed

+	 * 	The first non-whitespace character, or <c>0</c> if the string is <jk>null</jk>, empty, or composed

 	 * 	of only whitespace.

 	 */

 	public static char firstNonWhitespaceChar(String s) {

@@ -2004,7 +2004,7 @@
 	 *

 	 * @param s The string to check.

 	 * @return

-	 * 	The last non-whitespace character, or <code>0</code> if the string is <jk>null</jk>, empty, or composed

+	 * 	The last non-whitespace character, or <c>0</c> if the string is <jk>null</jk>, empty, or composed

 	 * 	of only whitespace.

 	 */

 	public static char lastNonWhitespaceChar(String s) {

@@ -2021,7 +2021,7 @@
 	 * @param s The string.

 	 * @param i The index position.

 	 * @return

-	 * 	The character at the specified index, or <code>0</code> if the index is out-of-range or the string

+	 * 	The character at the specified index, or <c>0</c> if the index is out-of-range or the string

 	 * 	is <jk>null</jk>.

 	 */

 	public static char charAt(String s, int i) {

@@ -2085,7 +2085,7 @@
 	 * Efficiently determines whether a URL is of the pattern "xxx:/xxx".

 	 *

 	 * <p>

-	 * The pattern matched is: <code>[a-z]{2,}\:\/.*</code>

+	 * The pattern matched is: <c>[a-z]{2,}\:\/.*</c>

 	 *

 	 * <p>

 	 * Note that this excludes filesystem paths such as <js>"C:/temp"</js>.

@@ -2523,7 +2523,7 @@
 	 * Returns the first character in the specified string.

 	 *

 	 * @param s The string to check.

-	 * @return The first character in the string, or <code>0</code> if the string is <jk>null</jk> or empty.

+	 * @return The first character in the string, or <c>0</c> if the string is <jk>null</jk> or empty.

 	 */

 	public static char firstChar(String s) {

 		if (s == null || s.length() == 0)

@@ -2592,7 +2592,7 @@
 	 *

 	 * @param s The string to parse.

 	 * @return

-	 * 	The time in milliseconds, or <code>-1</code> if the string is empty or <jk>null</jk>.

+	 * 	The time in milliseconds, or <c>-1</c> if the string is empty or <jk>null</jk>.

 	 */

 	public static long getDuration(String s) {

 		s = trim(s);

diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/TeeOutputStream.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/TeeOutputStream.java
index 2952f9e..e2c7bc4 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/TeeOutputStream.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/TeeOutputStream.java
@@ -68,7 +68,7 @@
 	}

 

 	/**

-	 * Returns the output stream identified through the <code>id</code> parameter passed in through the

+	 * Returns the output stream identified through the <c>id</c> parameter passed in through the

 	 * {@link #add(String, OutputStream, boolean)} method.

 	 *

 	 * @param id The ID associated with the output stream.

diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/TeeWriter.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/TeeWriter.java
index 618a701..e7631cf 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/TeeWriter.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/TeeWriter.java
@@ -95,7 +95,7 @@
 	}

 

 	/**

-	 * Returns the writer identified through the <code>id</code> parameter passed in through the

+	 * Returns the writer identified through the <c>id</c> parameter passed in through the

 	 * {@link #add(String, Writer, boolean)} method.

 	 *

 	 * @param id The ID associated with the writer.

diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/ThrowableUtils.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/ThrowableUtils.java
index cba4b2a..7065846 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/ThrowableUtils.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/ThrowableUtils.java
@@ -47,7 +47,7 @@
 	}

 

 	/**

-	 * Throws an {@link IllegalArgumentException} if the specified field is <code>&lt;=0</code>.

+	 * Throws an {@link IllegalArgumentException} if the specified field is <c>&lt;=0</c>.

 	 *

 	 * @param fieldValue The object to check.

 	 * @param fieldName The name of the field.

diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/Transform.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/Transform.java
index e0a33c0..28239b7 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/Transform.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/Transform.java
@@ -13,7 +13,7 @@
 package org.apache.juneau.internal;
 
 /**
- * An interface for creating objects from other objects such as a <code>String</code> or <code>Reader</code>.
+ * An interface for creating objects from other objects such as a <c>String</c> or <c>Reader</c>.
  *
  * @param <I> Input type.
  * @param <O> Output type.
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jso/JsoParser.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jso/JsoParser.java
index 1f122c3..90dc384 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jso/JsoParser.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jso/JsoParser.java
@@ -23,7 +23,7 @@
  *

  * <h5 class='topic'>Media types</h5>

  *

- * Consumes <code>Content-Type</code> types:  <code><b>application/x-java-serialized-object</b></code>

+ * Consumes <c>Content-Type</c> types:  <bc>application/x-java-serialized-object</bc>

  */

 @ConfigurableContext

 public final class JsoParser extends InputStreamParser {

diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jso/JsoSerializer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jso/JsoSerializer.java
index 9c9094e..4efdc99 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jso/JsoSerializer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jso/JsoSerializer.java
@@ -23,9 +23,9 @@
  *

  * <h5 class='topic'>Media types</h5>

  *

- * Handles <code>Accept</code> types:  <code><b>application/x-java-serialized-object</b></code>

+ * Handles <c>Accept</c> types:  <bc>application/x-java-serialized-object</bc>

  * <p>

- * Produces <code>Content-Type</code> types:  <code><b>application/x-java-serialized-object</b></code>

+ * Produces <c>Content-Type</c> types:  <bc>application/x-java-serialized-object</bc>

  */

 @ConfigurableContext

 public class JsoSerializer extends OutputStreamSerializer {

diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParser.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParser.java
index 4469279..2aa051d 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParser.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParser.java
@@ -21,7 +21,7 @@
  *

  * <h5 class='topic'>Media types</h5>

  *

- * Handles <code>Content-Type</code> types:  <code><b>application/json, text/json</b></code>

+ * Handles <c>Content-Type</c> types:  <bc>application/json, text/json</bc>

  *

  * <h5 class='topic'>Description</h5>

  *

@@ -52,7 +52,7 @@
  * 		JSON objects (<js>"{...}"</js>) are converted to {@link ObjectMap ObjectMaps}.

  * 		<b>Note:</b>  If a <code><xa>_type</xa>=<xs>'xxx'</xs></code> attribute is specified on the object, then an

  * 		attempt is made to convert the object to an instance of the specified Java bean class.

- * 		See the <code>beanTypeName</code> setting on the {@link PropertyStore} for more information about parsing

+ * 		See the <c>beanTypeName</c> setting on the {@link PropertyStore} for more information about parsing

  * 		beans from JSON.

  * 	<li>

  * 		JSON arrays (<js>"[...]"</js>) are converted to {@link ObjectList ObjectLists}.

@@ -114,7 +114,7 @@
 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"JsonParser.validateEnd.b"</js>

-	 * 	<li><b>Data type:</b>  <code>Boolean</code>

+	 * 	<li><b>Data type:</b>  <c>Boolean</c>

 	 * 	<li><b>Default:</b>  <jk>false</jk>

 	 * 	<li><b>Session property:</b>  <jk>false</jk>

 	 * 	<li><b>Methods:</b>

diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSchemaSerializer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSchemaSerializer.java
index 0b0c68b..5203ae9 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSchemaSerializer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSchemaSerializer.java
@@ -22,9 +22,9 @@
  *

  * <h5 class='topic'>Media types</h5>

  *

- * Handles <code>Accept</code> types:  <code><b>application/json+schema, text/json+schema</b></code>

+ * Handles <c>Accept</c> types:  <bc>application/json+schema, text/json+schema</bc>

  * <p>

- * Produces <code>Content-Type</code> types:  <code><b>application/json</b></code>

+ * Produces <c>Content-Type</c> types:  <bc>application/json</bc>

  *

  * <h5 class='topic'>Description</h5>

  *

diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializer.java
index 004fc6c..ebcebb8 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializer.java
@@ -23,9 +23,9 @@
  *

  * <h5 class='topic'>Media types</h5>

  *

- * Handles <code>Accept</code> types:  <code><b>application/json, text/json</b></code>

+ * Handles <c>Accept</c> types:  <bc>application/json, text/json</bc>

  * <p>

- * Produces <code>Content-Type</code> types:  <code><b>application/json</b></code>

+ * Produces <c>Content-Type</c> types:  <bc>application/json</bc>

  *

  * <h5 class='topic'>Description</h5>

  *

@@ -102,7 +102,7 @@
 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"JsonSerializer.addBeanTypes.b"</js>

-	 * 	<li><b>Data type:</b>  <code>Boolean</code>

+	 * 	<li><b>Data type:</b>  <c>Boolean</c>

 	 * 	<li><b>Default:</b>  <jk>false</jk>

 	 * 	<li><b>Session property:</b>  <jk>false</jk>

 	 * 	<li><b>Methods:</b>

@@ -128,7 +128,7 @@
 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"JsonSerializer.escapeSolidus.b"</js>

-	 * 	<li><b>Data type:</b>  <code>Boolean</code>

+	 * 	<li><b>Data type:</b>  <c>Boolean</c>

 	 * 	<li><b>Default:</b>  <jk>false</jk>

 	 * 	<li><b>Session property:</b>  <jk>false</jk>

 	 * 	<li><b>Methods:</b>

@@ -173,7 +173,7 @@
 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"JsonSerializer.simpleMode.b"</js>

-	 * 	<li><b>Data type:</b>  <code>Boolean</code>

+	 * 	<li><b>Data type:</b>  <c>Boolean</c>

 	 * 	<li><b>Default:</b>  <jk>false</jk>

 	 * 	<li><b>Session property:</b>  <jk>false</jk>

 	 * 	<li><b>Methods:</b>

@@ -335,9 +335,9 @@
 	 * @param accept

 	 * 	The accept media types that the serializer can handle.

 	 * 	<p>

-	 * 	Can contain meta-characters per the <code>media-type</code> specification of {@doc RFC2616.section14.1}

+	 * 	Can contain meta-characters per the <c>media-type</c> specification of {@doc RFC2616.section14.1}

 	 * 	<p>

-	 * 	If empty, then assumes the only media type supported is <code>produces</code>.

+	 * 	If empty, then assumes the only media type supported is <c>produces</c>.

 	 * 	<p>

 	 * 	For example, if this serializer produces <js>"application/json"</js> but should handle media types of

 	 * 	<js>"application/json"</js> and <js>"text/json"</js>, then the arguments should be:

diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializerBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializerBuilder.java
index 1a20001..527d7cd 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializerBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializerBuilder.java
@@ -132,7 +132,7 @@
 	 * Configuration property:  Simple JSON mode and single quote.
 	 *
 	 * <p>
-	 * Shortcut for calling <code>simple().sq()</code>.
+	 * Shortcut for calling <c>simple().sq()</c>.
 	 *
 	 * <h5 class='section'>See Also:</h5>
 	 * <ul>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/SimpleJsonSerializer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/SimpleJsonSerializer.java
index b72d3d7..81c00bd 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/SimpleJsonSerializer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/SimpleJsonSerializer.java
@@ -19,9 +19,9 @@
  *
  * <h5 class='topic'>Media types</h5>
  *
- * Handles <code>Accept</code> types:  <code><b>application/json, text/json</b></code>
+ * Handles <c>Accept</c> types:  <bc>application/json, text/json</bc>
  * <p>
- * Produces <code>Content-Type</code> types:  <code><b>application/json+simple</b></code>
+ * Produces <c>Content-Type</c> types:  <bc>application/json+simple</bc>
  *
  * <h5 class='topic'>Description</h5>
  * <p>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/annotation/Json.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/annotation/Json.java
index 7f1df3a..fdd542c 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/annotation/Json.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/annotation/Json.java
@@ -27,7 +27,7 @@
  * Can be used for the following:

  * <ul class='spaced-list'>

  * 	<li>

- * 		Wrap bean instances inside wrapper object (e.g. <code>{'wrapperAttr':bean}</code>).

+ * 		Wrap bean instances inside wrapper object (e.g. <c>{'wrapperAttr':bean}</c>).

  * </ul>

  */

 @Documented

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 b780a48..950f78a 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
@@ -39,7 +39,7 @@
 	 * <h5 class='section'>Property:</h5>
 	 * <ul>
 	 * 	<li><b>Name:</b>  <js>"JsonSchemaGenerator.addDescriptionsTo.s"</js>
-	 * 	<li><b>Data type:</b>  <code>String</code>
+	 * 	<li><b>Data type:</b>  <c>String</c>
 	 * 	<li><b>Default:</b>  Empty string.
 	 * 	<li><b>Session property:</b>  <jk>false</jk>
 	 * 	<li><b>Methods:</b>
@@ -76,7 +76,7 @@
 	 * <h5 class='section'>Property:</h5>
 	 * <ul>
 	 * 	<li><b>Name:</b>  <js>"JsonSchemaGenerator.addExamplesTo.s"</js>
-	 * 	<li><b>Data type:</b>  <code>String</code>
+	 * 	<li><b>Data type:</b>  <c>String</c>
 	 * 	<li><b>Default:</b>  Empty string.
 	 * 	<li><b>Session property:</b>  <jk>false</jk>
 	 * 	<li><b>Methods:</b>
@@ -119,7 +119,7 @@
 	 * <h5 class='section'>Property:</h5>
 	 * <ul>
 	 * 	<li><b>Name:</b>  <js>"JsonSchemaGenerator.allowNestedDescriptions.b"</js>
-	 * 	<li><b>Data type:</b>  <code>Boolean</code>
+	 * 	<li><b>Data type:</b>  <c>Boolean</c>
 	 * 	<li><b>Default:</b>  <jk>false</jk>
 	 * 	<li><b>Session property:</b>  <jk>false</jk>
 	 * 	<li><b>Methods:</b>
@@ -140,7 +140,7 @@
 	 * <h5 class='section'>Property:</h5>
 	 * <ul>
 	 * 	<li><b>Name:</b>  <js>"JsonSchemaGenerator.allowNestedExamples.b"</js>
-	 * 	<li><b>Data type:</b>  <code>Boolean</code>
+	 * 	<li><b>Data type:</b>  <c>Boolean</c>
 	 * 	<li><b>Default:</b>  <jk>false</jk>
 	 * 	<li><b>Session property:</b>  <jk>false</jk>
 	 * 	<li><b>Methods:</b>
@@ -187,7 +187,7 @@
 	 * <h5 class='section'>Property:</h5>
 	 * <ul>
 	 * 	<li><b>Name:</b>  <js>"JsonSchemaGenerator.defaultSchema.smo"</js>
-	 * 	<li><b>Data type:</b>  <code>Map&lt;String,ObjectMap&gt;</code>
+	 * 	<li><b>Data type:</b>  <c>Map&lt;String,ObjectMap&gt;</c>
 	 * 	<li><b>Default:</b>  Empty map.
 	 * 	<li><b>Session property:</b>  <jk>false</jk>
 	 * 	<li><b>Methods:</b>
@@ -210,7 +210,7 @@
 	 * <h5 class='section'>Property:</h5>
 	 * <ul>
 	 * 	<li><b>Name:</b>  <js>"JsonSchemaGenerator.ignoreTypes.s"</js>
-	 * 	<li><b>Data type:</b>  <code>String</code> (comma-delimited)
+	 * 	<li><b>Data type:</b>  <c>String</c> (comma-delimited)
 	 * 	<li><b>Default:</b>  <jk>null</jk>.
 	 * 	<li><b>Session property:</b>  <jk>false</jk>
 	 * </ul>
@@ -238,7 +238,7 @@
 	 * <h5 class='section'>Property:</h5>
 	 * <ul>
 	 * 	<li><b>Name:</b>  <js>"JsonSchemaGenerator.useBeanDefs.b"</js>
-	 * 	<li><b>Data type:</b>  <code>Boolean</code>
+	 * 	<li><b>Data type:</b>  <c>Boolean</c>
 	 * 	<li><b>Default:</b>  <jk>false</jk>
 	 * 	<li><b>Methods:</b>
 	 * 		<ul>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGeneratorSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGeneratorSession.java
index 53d10a4..566ada1 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGeneratorSession.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGeneratorSession.java
@@ -64,7 +64,7 @@
 	 *
 	 * @param o
 	 * 	The object.
-	 * 	<br>Can either be a POJO or a <code>Class</code>/<code>Type</code>.
+	 * 	<br>Can either be a POJO or a <c>Class</c>/<c>Type</c>.
 	 * @return The schema for the type.
 	 * @throws Exception
 	 */
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/annotation/ExternalDocs.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/annotation/ExternalDocs.java
index 230f5d4..3fd6c67 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/annotation/ExternalDocs.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/annotation/ExternalDocs.java
@@ -151,7 +151,7 @@
 	 * 	<li>
 	 * 		The format is a {@doc juneau-marshall.JsonDetails.SimplifiedJson} object.
 	 * 	<li>
-	 * 		The leading/trailing <code>{ }</code> characters are optional.
+	 * 		The leading/trailing <c>{ }</c> characters are optional.
 	 * 		<br>The following two example are considered equivalent:
 	 * 		<p class='bcode w800'>
 	 * 	<ja>@ExternalDocs</ja>(<js>"{url:'http://juneau.apache.org'}"</js>)
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/annotation/Items.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/annotation/Items.java
index e49ca3d..e45b89a 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/annotation/Items.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/annotation/Items.java
@@ -401,7 +401,7 @@
 	 * 	<li>

 	 * 		The format is a {@doc juneau-marshall.JsonDetails.SimplifiedJson} object.

 	 * 	<li>

-	 * 		The leading/trailing <code>{ }</code> characters are optional.

+	 * 		The leading/trailing <c>{ }</c> characters are optional.

 	 * 		<br>The following two example are considered equivalent:

 	 * 		<p class='bcode w800'>

 	 * 	<ja>@Items</ja>(api=<js>"{type: 'string'}"</js>)

diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/annotation/Schema.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/annotation/Schema.java
index 24ab4e8..b639da1 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/annotation/Schema.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/annotation/Schema.java
@@ -502,8 +502,8 @@
 	 * items are supposed to be represented.

 	 *

 	 * <p>

-	 * Determines the format of the array if <code>type</code> <js>"array"</js> is used.

-	 * <br>Can only be used if <code>type</code> is <js>"array"</js>.

+	 * Determines the format of the array if <c>type</c> <js>"array"</js> is used.

+	 * <br>Can only be used if <c>type</c> is <js>"array"</js>.

 	 *

 	 * <br>Possible values are:

 	 * <ul class='spaced-list'>

@@ -651,7 +651,7 @@
 	 * A free-form property to include an example of an instance for this schema.

 	 *

 	 * <p>

-	 * This attribute defines a JSON representation of the body value that is used by <code>BasicRestInfoProvider</code> to construct

+	 * This attribute defines a JSON representation of the body value that is used by <c>BasicRestInfoProvider</c> to construct

 	 * media-type-based examples of the body of the request.

 	 *

 	 * <h5 class='section'>Notes:</h5>

@@ -736,7 +736,7 @@
 	 * 	<li>

 	 * 		The format is a {@doc juneau-marshall.JsonDetails.SimplifiedJson} object.

 	 * 	<li>

-	 * 		The leading/trailing <code>{ }</code> characters are optional.

+	 * 		The leading/trailing <c>{ }</c> characters are optional.

 	 * 		<br>The following two example are considered equivalent:

 	 * 		<p class='bcode w800'>

 	 * 	<ja>@Schema</ja>(<js>"{type: 'array'}"</js>)

diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/annotation/SubItems.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/annotation/SubItems.java
index ad1d560..87c1817 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/annotation/SubItems.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/annotation/SubItems.java
@@ -359,7 +359,7 @@
 	 * 	<li>

 	 * 		The format is a {@doc juneau-marshall.JsonDetails.SimplifiedJson} object.

 	 * 	<li>

-	 * 		The leading/trailing <code>{ }</code> characters are optional.

+	 * 		The leading/trailing <c>{ }</c> characters are optional.

 	 * 		<br>The following two example are considered equivalent:

 	 * 		<p class='bcode w800'>

 	 * 	<ja>@Items</ja>(api=<js>"{type: 'string'}"</js>)

diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/CharMarshall.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/CharMarshall.java
index 6a2d9aa..83bc6c4 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/CharMarshall.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/CharMarshall.java
@@ -43,7 +43,7 @@
 	}
 
 	/**
-	 * Serializes a POJO directly to a <code>String</code>.
+	 * Serializes a POJO directly to a <c>String</c>.
 	 *
 	 * @param o The object to serialize.
 	 * @return
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/Marshall.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/Marshall.java
index 3f70a57..893f3b9 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/Marshall.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshall/Marshall.java
@@ -84,12 +84,12 @@
 	}
 
 	/**
-	 * Serializes a POJO directly to either a <code>String</code> or <code><jk>byte</jk>[]</code> depending on the serializer type.
+	 * Serializes a POJO directly to either a <c>String</c> or <code><jk>byte</jk>[]</code> depending on the serializer type.
 	 *
 	 * @param o The object to serialize.
 	 * @return
 	 * 	The serialized object.
-	 * 	<br>Character-based serializers will return a <code>String</code>
+	 * 	<br>Character-based serializers will return a <c>String</c>
 	 * 	<br>Stream-based serializers will return a <code><jk>byte</jk>[]</code>
 	 * @throws SerializeException If a problem occurred trying to convert the output.
 	 */
@@ -101,7 +101,7 @@
 	 * Serializes a POJO to the specified output stream or writer.
 	 *
 	 * <p>
-	 * Equivalent to calling <code>serializer.createSession().serialize(o, output);</code>
+	 * Equivalent to calling <c>serializer.createSession().serialize(o, output);</c>
 	 *
 	 * @param o The object to serialize.
 	 * @param output
@@ -145,7 +145,7 @@
 
 
 	/**
-	 * Convenience method for calling <code>System.out.println(...)</code> on the specified object after calling {@link #toString(Object)}.
+	 * Convenience method for calling <c>System.out.println(...)</c> on the specified object after calling {@link #toString(Object)}.
 	 *
 	 * @param o The object to serialize and then send to the console.
 	 * @return This object (for method chaining).
@@ -252,10 +252,10 @@
 	 * </p>
 	 *
 	 * <p>
-	 * <code>Collection</code> classes are assumed to be followed by zero or one objects indicating the element type.
+	 * <c>Collection</c> classes are assumed to be followed by zero or one objects indicating the element type.
 	 *
 	 * <p>
-	 * <code>Map</code> classes are assumed to be followed by zero or two meta objects indicating the key and value types.
+	 * <c>Map</c> classes are assumed to be followed by zero or two meta objects indicating the key and value types.
 	 *
 	 * <p>
 	 * The array can be arbitrarily long to indicate arbitrarily complex data structures.
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackParser.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackParser.java
index adc2331..6b6d883 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackParser.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackParser.java
@@ -21,7 +21,7 @@
  *

  * <h5 class='topic'>Media types</h5>

  *

- * Handles <code>Content-Type</code> types:  <code><b>octal/msgpack</b></code>

+ * Handles <c>Content-Type</c> types:  <bc>octal/msgpack</bc>

  */

 @ConfigurableContext

 public class MsgPackParser extends InputStreamParser {

diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackSerializer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackSerializer.java
index 916d673..ba5ac98 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackSerializer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackSerializer.java
@@ -21,9 +21,9 @@
  *

  * <h5 class='section'>Media types:</h5>

  *

- * Handles <code>Accept</code> types:  <code><b>octal/msgpack</b></code>

+ * Handles <c>Accept</c> types:  <bc>octal/msgpack</bc>

  * <p>

- * Produces <code>Content-Type</code> types: <code><b>octal/msgpack</b></code>

+ * Produces <c>Content-Type</c> types: <bc>octal/msgpack</bc>

  */

 @ConfigurableContext

 public class MsgPackSerializer extends OutputStreamSerializer {

@@ -40,7 +40,7 @@
 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"MsgPackSerializer.addBeanTypes.b"</js>

-	 * 	<li><b>Data type:</b>  <code>Boolean</code>

+	 * 	<li><b>Data type:</b>  <c>Boolean</c>

 	 * 	<li><b>Default:</b>  <jk>false</jk>

 	 * 	<li><b>Session property:</b>  <jk>false</jk>

 	 * 	<li><b>Methods:</b>

diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiSerializer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiSerializer.java
index 1ae619a..da1668a 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiSerializer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiSerializer.java
@@ -57,9 +57,9 @@
 	 * @param accept

 	 * 	The accept media types that the serializer can handle.

 	 * 	<p>

-	 * 	Can contain meta-characters per the <code>media-type</code> specification of {@doc RFC2616.section14.1}

+	 * 	Can contain meta-characters per the <c>media-type</c> specification of {@doc RFC2616.section14.1}

 	 * 	<p>

-	 * 	If empty, then assumes the only media type supported is <code>produces</code>.

+	 * 	If empty, then assumes the only media type supported is <c>produces</c>.

 	 * 	<p>

 	 * 	For example, if this serializer produces <js>"application/json"</js> but should handle media types of

 	 * 	<js>"application/json"</js> and <js>"text/json"</js>, then the arguments should be:

diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/InputStreamParser.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/InputStreamParser.java
index 39669e7..4645a9f 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/InputStreamParser.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/InputStreamParser.java
@@ -23,7 +23,7 @@
  * This class is typically the parent class of all byte-based parsers.

  * It has 1 abstract method to implement...

  * <ul>

- * 	<li><code>parse(InputStream, ClassMeta, Parser)</code>

+ * 	<li><c>parse(InputStream, ClassMeta, Parser)</c>

  * </ul>

   */

 @ConfigurableContext

diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParseException.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParseException.java
index a0b69b9..d8e0c8c 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParseException.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParseException.java
@@ -120,7 +120,7 @@
 	}

 

 	/**

-	 * Returns the highest-level <code>ParseException</code> in the stack trace.

+	 * Returns the highest-level <c>ParseException</c> in the stack trace.

 	 *

 	 * <p>

 	 * Useful for JUnit testing of error conditions.

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 519d945..d746ed3 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
@@ -131,7 +131,7 @@
 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"Parser.autoCloseStreams.b"</js>

-	 * 	<li><b>Data type:</b>  <code>Boolean</code>

+	 * 	<li><b>Data type:</b>  <c>Boolean</c>

 	 * 	<li><b>Default:</b>  <jk>false</jk>

 	 * 	<li><b>Session property:</b>  <jk>false</jk>

 	 * 	<li><b>Methods:</b>

@@ -174,8 +174,8 @@
 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"Parser.debugOutputLines.i"</js>

-	 * 	<li><b>Data type:</b>  <code>Integer</code>

-	 * 	<li><b>Default:</b>  <code>5</code>

+	 * 	<li><b>Data type:</b>  <c>Integer</c>

+	 * 	<li><b>Default:</b>  <c>5</c>

 	 * 	<li><b>Session property:</b>  <jk>false</jk>

 	 * 	<li><b>Methods:</b>

 	 * 		<ul>

@@ -220,7 +220,7 @@
 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"Parser.listener.c"</js>

-	 * 	<li><b>Data type:</b>  <code>Class&lt;? extends ParserListener&gt;</code>

+	 * 	<li><b>Data type:</b>  <c>Class&lt;? extends ParserListener&gt;</c>

 	 * 	<li><b>Default:</b>  <jk>null</jk>

 	 * 	<li><b>Session property:</b>  <jk>false</jk>

 	 * 	<li><b>Methods:</b>

@@ -283,7 +283,7 @@
 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"Parser.strict.b"</js>

-	 * 	<li><b>Data type:</b>  <code>Boolean</code>

+	 * 	<li><b>Data type:</b>  <c>Boolean</c>

 	 * 	<li><b>Default:</b>  <jk>false</jk>

 	 * 	<li><b>Session property:</b>  <jk>false</jk>

 	 * 	<li><b>Methods:</b>

@@ -356,7 +356,7 @@
 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"Parser.trimStrings.b"</js>

-	 * 	<li><b>Data type:</b>  <code>Boolean</code>

+	 * 	<li><b>Data type:</b>  <c>Boolean</c>

 	 * 	<li><b>Default:</b>  <jk>false</jk>

 	 * 	<li><b>Session property:</b>  <jk>false</jk>

 	 * 	<li><b>Methods:</b>

@@ -399,7 +399,7 @@
 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"Parser.unbuffered.b"</js>

-	 * 	<li><b>Data type:</b>  <code>Boolean</code>

+	 * 	<li><b>Data type:</b>  <c>Boolean</c>

 	 * 	<li><b>Default:</b>  <jk>false</jk>

 	 * 	<li><b>Session property:</b>  <jk>false</jk>

 	 * 	<li><b>Methods:</b>

@@ -581,10 +581,10 @@
 	 * </p>

 	 *

 	 * <p>

-	 * <code>Collection</code> classes are assumed to be followed by zero or one objects indicating the element type.

+	 * <c>Collection</c> classes are assumed to be followed by zero or one objects indicating the element type.

 	 *

 	 * <p>

-	 * <code>Map</code> classes are assumed to be followed by zero or two meta objects indicating the key and value types.

+	 * <c>Map</c> classes are assumed to be followed by zero or two meta objects indicating the key and value types.

 	 *

 	 * <p>

 	 * The array can be arbitrarily long to indicate arbitrarily complex data structures.

@@ -792,7 +792,7 @@
 	//-----------------------------------------------------------------------------------------------------------------

 

 	/**

-	 * Returns the media types handled based on the values passed to the <code>consumes</code> constructor parameter.

+	 * Returns the media types handled based on the values passed to the <c>consumes</c> constructor parameter.

 	 *

 	 * @return The list of media types.  Never <jk>null</jk>.

 	 */

@@ -801,7 +801,7 @@
 	}

 

 	/**

-	 * Returns the first media type handled based on the values passed to the <code>consumes</code> constructor parameter.

+	 * Returns the first media type handled based on the values passed to the <c>consumes</c> constructor parameter.

 	 *

 	 * @return The media type.

 	 */

diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserBuilder.java
index 26db98a..1b26654 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserBuilder.java
@@ -99,7 +99,7 @@
 	 *
 	 * @param value
 	 * 	The new value for this property.
-	 * 	<br>The default value is <code>5</code>.
+	 * 	<br>The default value is <c>5</c>.
 	 * @return This object (for method chaining).
 	 */
 	public ParserBuilder debugOutputLines(int value) {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserGroup.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserGroup.java
index cc6dc8f..ce34318 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserGroup.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserGroup.java
@@ -29,7 +29,7 @@
  * Provides the following features:

  * <ul class='spaced-list'>

  * 	<li>

- * 		Finds parsers based on HTTP <code>Content-Type</code> header values.

+ * 		Finds parsers based on HTTP <c>Content-Type</c> header values.

  * 	<li>

  * 		Sets common properties on all parsers in a single method call.

  * 	<li>

@@ -40,7 +40,7 @@
  *

  * <h5 class='topic'>Match ordering</h5>

  *

- * Parsers are matched against <code>Content-Type</code> strings in the order they exist in this group.

+ * Parsers are matched against <c>Content-Type</c> strings in the order they exist in this group.

  *

  * <p>

  * Adding new entries will cause the entries to be prepended to the group.

@@ -48,7 +48,7 @@
  *

  * <p>

  * For example, calling <code>g.append(P1.<jk>class</jk>,P2.<jk>class</jk>).append(P3.<jk>class</jk>,P4.<jk>class</jk>)</code>

- * will result in the order <code>P3, P4, P1, P2</code>.

+ * will result in the order <c>P3, P4, P1, P2</c>.

  *

  * <h5 class='section'>Example:</h5>

  * <p class='bcode w800'>

diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserGroupBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserGroupBuilder.java
index 590b0c2..5caf181 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserGroupBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserGroupBuilder.java
@@ -184,7 +184,7 @@
 	 *
 	 * @param value
 	 * 	The new value for this property.
-	 * 	<br>The default value is <code>5</code>.
+	 * 	<br>The default value is <c>5</c>.
 	 * @return This object (for method chaining).
 	 */
 	public ParserGroupBuilder debugOutputLines(int value) {
@@ -326,7 +326,7 @@
 	 * Configuration property:  File charset.
 	 *
 	 * <p>
-	 * The character set to use for reading <code>Files</code> from the file system.
+	 * The character set to use for reading <c>Files</c> from the file system.
 	 *
 	 * <h5 class='section'>See Also:</h5>
 	 * <ul>
@@ -346,7 +346,7 @@
 	 * Configuration property:  Input stream charset.
 	 *
 	 * <p>
-	 * The character set to use for converting <code>InputStreams</code> and byte arrays to readers.
+	 * The character set to use for converting <c>InputStreams</c> and byte arrays to readers.
 	 *
 	 * <h5 class='section'>See Also:</h5>
 	 * <ul>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserMatch.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserMatch.java
index 64a8aec..5b6b820 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserMatch.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserMatch.java
@@ -15,7 +15,7 @@
 import org.apache.juneau.http.*;
 
 /**
- * Represents a parser and media type that matches an HTTP <code>Content-Type</code> header value.
+ * Represents a parser and media type that matches an HTTP <c>Content-Type</c> header value.
  */
 public final class ParserMatch {
 
@@ -34,7 +34,7 @@
 	}
 
 	/**
-	 * Returns the media type of the parser that matched the HTTP <code>Content-Type</code> header value.
+	 * Returns the media type of the parser that matched the HTTP <c>Content-Type</c> header value.
 	 *
 	 * @return The media type of the match.
 	 */
@@ -43,7 +43,7 @@
 	}
 
 	/**
-	 * Returns the parser that matched the HTTP <code>Content-Type</code> header value.
+	 * Returns the parser that matched the HTTP <c>Content-Type</c> header value.
 	 *
 	 * @return The parser of the match.
 	 */
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserReader.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserReader.java
index dcdb7dd..db8c23e 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserReader.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserReader.java
@@ -352,7 +352,7 @@
 	 * Replaces the last character in the marking buffer with the specified character.

 	 *

 	 * <p>

-	 * <code>offset</code> must be at least <code>1</code> for normal characters, and <code>2</code> for extended

+	 * <c>offset</c> must be at least <c>1</c> for normal characters, and <c>2</c> for extended

 	 * unicode characters in order for the replacement to fit into the buffer.

 	 *

 	 * @param c The new character.

diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserSession.java
index 5d69064..f21478a 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserSession.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserSession.java
@@ -88,8 +88,8 @@
 	 * @param type

 	 * 	The class type of the object to create.

 	 * 	If <jk>null</jk> or <code>Object.<jk>class</jk></code>, object type is based on what's being parsed.

-	 * 	For example, when parsing JSON text, it may return a <code>String</code>, <code>Number</code>,

-	 * 	<code>ObjectMap</code>, etc...

+	 * 	For example, when parsing JSON text, it may return a <c>String</c>, <c>Number</c>,

+	 * 	<c>ObjectMap</c>, etc...

 	 * @param <T> The class type of the object to create.

 	 * @return The parsed object.

 	 * @throws Exception If thrown from underlying stream, or if the input contains a syntax error or is malformed.

@@ -144,7 +144,7 @@
 	/**

 	 * Returns information used to determine at what location in the parse a failure occurred.

 	 *

-	 * @return A map, typically containing something like <code>{line:123,column:456,currentProperty:"foobar"}</code>

+	 * @return A map, typically containing something like <c>{line:123,column:456,currentProperty:"foobar"}</c>

 	 */

 	public final ObjectMap getLastLocation() {

 		ObjectMap m = new ObjectMap();

@@ -199,7 +199,7 @@
 	}

 

 	/**

-	 * Trims the specified object if it's a <code>String</code> and {@link #isTrimStrings()} returns <jk>true</jk>.

+	 * Trims the specified object if it's a <c>String</c> and {@link #isTrimStrings()} returns <jk>true</jk>.

 	 *

 	 * @param o The object to trim.

 	 * @return The trimmed string if it's a string.

@@ -225,7 +225,7 @@
 	}

 

 	/**

-	 * Converts the specified <code>ObjectMap</code> into a bean identified by the <js>"_type"</js> property in the map.

+	 * Converts the specified <c>ObjectMap</c> into a bean identified by the <js>"_type"</js> property in the map.

 	 *

 	 * @param m The map to convert to a bean.

 	 * @param pMeta The current bean property being parsed.

@@ -342,10 +342,10 @@
 	 * </p>

 	 *

 	 * <p>

-	 * <code>Collection</code> classes are assumed to be followed by zero or one objects indicating the element type.

+	 * <c>Collection</c> classes are assumed to be followed by zero or one objects indicating the element type.

 	 *

 	 * <p>

-	 * <code>Map</code> classes are assumed to be followed by zero or two meta objects indicating the key and value types.

+	 * <c>Map</c> classes are assumed to be followed by zero or two meta objects indicating the key and value types.

 	 *

 	 * <p>

 	 * The array can be arbitrarily long to indicate arbitrarily complex data structures.

diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/Position.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/Position.java
index 75619c3..3228049 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/Position.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/Position.java
@@ -65,7 +65,7 @@
 	/**
 	 * Returns the current line.
 	 *
-	 * @return The current line, or <code>-1</code> if not specified.
+	 * @return The current line, or <c>-1</c> if not specified.
 	 */
 	public int getLine() {
 		return line;
@@ -74,7 +74,7 @@
 	/**
 	 * Returns the current column.
 	 *
-	 * @return The current column, or <code>-1</code> if not specified.
+	 * @return The current column, or <c>-1</c> if not specified.
 	 */
 	public int getColumn() {
 		return column;
@@ -83,7 +83,7 @@
 	/**
 	 * Returns the current byte position.
 	 *
-	 * @return The current byte position, or <code>-1</code> if not specified.
+	 * @return The current byte position, or <c>-1</c> if not specified.
 	 */
 	public int getPosition() {
 		return position;
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ReaderParser.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ReaderParser.java
index 143f7bd..3f0985b 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ReaderParser.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ReaderParser.java
@@ -26,7 +26,7 @@
  * This class is typically the parent class of all character-based parsers.

  * It has 1 abstract method to implement...

  * <ul>

- * 	<li><code>parse(ParserSession, ClassMeta)</code>

+ * 	<li><c>parse(ParserSession, ClassMeta)</c>

  * </ul>

  */

 @ConfigurableContext

@@ -44,7 +44,7 @@
 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"ReaderParser.fileCharset.s"</js>

-	 * 	<li><b>Data type:</b>  <code>String</code>

+	 * 	<li><b>Data type:</b>  <c>String</c>

 	 * 	<li><b>Default:</b>  <js>"DEFAULT"</js>

 	 * 	<li><b>Session property:</b>  <jk>false</jk>

 	 * 	<li><b>Methods:</b>

@@ -55,7 +55,7 @@
 	 *

 	 * <h5 class='section'>Description:</h5>

 	 * <p>

-	 * The character set to use for reading <code>Files</code> from the file system.

+	 * The character set to use for reading <c>Files</c> from the file system.

 	 *

 	 * <p>

 	 * Used when passing in files to {@link Parser#parse(Object, Class)}.

@@ -89,7 +89,7 @@
 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"ReaderParser.streamCharset.s"</js>

-	 * 	<li><b>Data type:</b>  <code>String</code>

+	 * 	<li><b>Data type:</b>  <c>String</c>

 	 * 	<li><b>Default:</b>  <js>"UTF-8"</js>

 	 * 	<li><b>Session property:</b>  <jk>false</jk>

 	 * 	<li><b>Methods:</b>

@@ -100,7 +100,7 @@
 	 *

 	 * <h5 class='section'>Description:</h5>

 	 * <p>

-	 * The character set to use for converting <code>InputStreams</code> and byte arrays to readers.

+	 * The character set to use for converting <c>InputStreams</c> and byte arrays to readers.

 	 *

 	 * <p>

 	 * Used when passing in input streams and byte arrays to {@link Parser#parse(Object, Class)}.

@@ -165,7 +165,7 @@
 	 *

 	 * @see #RPARSER_fileCharset

 	 * @return

-	 * 	The character set to use for reading <code>Files</code> from the file system.

+	 * 	The character set to use for reading <c>Files</c> from the file system.

 	 */

 	protected final Charset getFileCharset() {

 		return fileCharset;

@@ -176,7 +176,7 @@
 	 *

 	 * @see #RPARSER_streamCharset

 	 * @return

-	 * 	The character set to use for converting <code>InputStreams</code> and byte arrays to readers.

+	 * 	The character set to use for converting <c>InputStreams</c> and byte arrays to readers.

 	 */

 	protected final Charset getStreamCharset() {

 		return streamCharset;

diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ReaderParserBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ReaderParserBuilder.java
index 204aed9..4e4fb55 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ReaderParserBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ReaderParserBuilder.java
@@ -52,7 +52,7 @@
 	 * Configuration property:  File charset.

 	 *

 	 * <p>

-	 * The character set to use for reading <code>Files</code> from the file system.

+	 * The character set to use for reading <c>Files</c> from the file system.

 	 *

 	 * <h5 class='section'>See Also:</h5>

 	 * <ul>

@@ -72,7 +72,7 @@
 	 * Configuration property:  Input stream charset.

 	 *

 	 * <p>

-	 * The character set to use for converting <code>InputStreams</code> and byte arrays to readers.

+	 * The character set to use for converting <c>InputStreams</c> and byte arrays to readers.

 	 *

 	 * <h5 class='section'>See Also:</h5>

 	 * <ul>

diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/annotation/ParserConfig.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/annotation/ParserConfig.java
index 688a7c7..c7caf1f 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/annotation/ParserConfig.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/annotation/ParserConfig.java
@@ -277,7 +277,7 @@
 	 * Configuration property:  File charset.
 	 *
 	 * <p>
-	 * The character set to use for reading <code>Files</code> from the file system.
+	 * The character set to use for reading <c>Files</c> from the file system.
 	 *
 	 * <p>
 	 * Used when passing in files to {@link Parser#parse(Object, Class)}.
@@ -303,7 +303,7 @@
 	 * Configuration property:  Input stream charset.
 	 *
 	 * <p>
-	 * The character set to use for converting <code>InputStreams</code> and byte arrays to readers.
+	 * The character set to use for converting <c>InputStreams</c> and byte arrays to readers.
 	 *
 	 * <p>
 	 * Used when passing in input streams and byte arrays to {@link Parser#parse(Object, Class)}.
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextParser.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextParser.java
index b28dc71..a441786 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextParser.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextParser.java
@@ -25,13 +25,13 @@
  *

  * <h5 class='topic'>Media types</h5>

  *

- * Handles <code>Accept</code> types:  <code><b>text/plain</b></code>

+ * Handles <c>Accept</c> types:  <bc>text/plain</bc>

  * <p>

- * Produces <code>Content-Type</code> types:  <code><b>text/plain</b></code>

+ * Produces <c>Content-Type</c> types:  <bc>text/plain</bc>

  *

  * <h5 class='topic'>Description</h5>

  *

- * Essentially just converts plain text to POJOs via static <code>fromString()</code> or <code>valueOf()</code>, or

+ * Essentially just converts plain text to POJOs via static <c>fromString()</c> or <c>valueOf()</c>, or

  * through constructors that take a single string argument.

  *

  * <p>

@@ -74,7 +74,7 @@
 	 * @param ps The property store containing all the settings for this object.

 	 * @param consumes The media types that this parser consumes.

 	 * 	<p>

-	 * 	Can contain meta-characters per the <code>media-type</code> specification of {@doc RFC2616.section14.1}

+	 * 	Can contain meta-characters per the <c>media-type</c> specification of {@doc RFC2616.section14.1}

 	 */

 	public PlainTextParser(PropertyStore ps, String...consumes) {

 		super(ps, consumes);

diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextSerializer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextSerializer.java
index 5da73f0..6e65e1f 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextSerializer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextSerializer.java
@@ -18,17 +18,17 @@
 import org.apache.juneau.transform.*;

 

 /**

- * Serializes POJOs to plain text using just the <code>toString()</code> method on the serialized object.

+ * Serializes POJOs to plain text using just the <c>toString()</c> method on the serialized object.

  *

  * <h5 class='topic'>Media types</h5>

  *

- * Handles <code>Accept</code> types:  <code><b>text/plain</b></code>

+ * Handles <c>Accept</c> types:  <bc>text/plain</bc>

  * <p>

- * Produces <code>Content-Type</code> types:  <code><b>text/plain</b></code>

+ * Produces <c>Content-Type</c> types:  <bc>text/plain</bc>

  *

  * <h5 class='topic'>Description</h5>

  *

- * Essentially converts POJOs to plain text using the <code>toString()</code> method.

+ * Essentially converts POJOs to plain text using the <c>toString()</c> method.

  *

  * <p>

  * Also serializes objects using a transform if the object class has an {@link PojoSwap PojoSwap&lt;?,String&gt;}

@@ -75,9 +75,9 @@
 	 * @param accept

 	 * 	The accept media types that the serializer can handle.

 	 * 	<p>

-	 * 	Can contain meta-characters per the <code>media-type</code> specification of {@doc RFC2616.section14.1}

+	 * 	Can contain meta-characters per the <c>media-type</c> specification of {@doc RFC2616.section14.1}

 	 * 	<p>

-	 * 	If empty, then assumes the only media type supported is <code>produces</code>.

+	 * 	If empty, then assumes the only media type supported is <c>produces</c>.

 	 * 	<p>

 	 * 	For example, if this serializer produces <js>"application/json"</js> but should handle media types of

 	 * 	<js>"application/json"</js> and <js>"text/json"</js>, then the arguments should be:

diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/ClassInfo.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/ClassInfo.java
index 40c9ce6..adbcbce 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/ClassInfo.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/ClassInfo.java
@@ -412,13 +412,13 @@
 	 * <p>
 	 * Looks for the following method names:
 	 * <ul>
-	 * 	<li><code>fromString</code>
-	 * 	<li><code>fromValue</code>
-	 * 	<li><code>valueOf</code>
-	 * 	<li><code>parse</code>
-	 * 	<li><code>parseString</code>
-	 * 	<li><code>forName</code>
-	 * 	<li><code>forString</code>
+	 * 	<li><c>fromString</c>
+	 * 	<li><c>fromValue</c>
+	 * 	<li><c>valueOf</c>
+	 * 	<li><c>parse</c>
+	 * 	<li><c>parseString</c>
+	 * 	<li><c>forName</c>
+	 * 	<li><c>forString</c>
 	 * </ul>
 	 *
 	 * @return The static method, or <jk>null</jk> if it couldn't be found.
@@ -440,9 +440,9 @@
 	 * <p>
 	 * Looks for the following method names:
 	 * <ul>
-	 * 	<li><code>create</code>
-	 * 	<li><code>from</code>
-	 * 	<li><code>fromIC</code>
+	 * 	<li><c>create</c>
+	 * 	<li><c>from</c>
+	 * 	<li><c>fromIC</c>
 	 * </ul>
 	 *
 	 * @param ic The argument type.
@@ -463,9 +463,9 @@
 	}
 
 	/**
-	 * Returns the <code>public static Builder create()</code> method on this class.
+	 * Returns the <c>public static Builder create()</c> method on this class.
 	 *
-	 * @return The <code>public static Builder create()</code> method on this class, or <jk>null</jk> if it doesn't exist.
+	 * @return The <c>public static Builder create()</c> method on this class, or <jk>null</jk> if it doesn't exist.
 	 */
 	public MethodInfo getBuilderCreateMethod() {
 		for (MethodInfo m : getDeclaredMethods())
@@ -475,9 +475,9 @@
 	}
 
 	/**
-	 * Returns the <code>T build()</code> method on this class.
+	 * Returns the <c>T build()</c> method on this class.
 	 *
-	 * @return The <code>T build()</code> method on this class, or <jk>null</jk> if it doesn't exist.
+	 * @return The <c>T build()</c> method on this class, or <jk>null</jk> if it doesn't exist.
 	 */
 	public MethodInfo getBuilderBuildMethod() {
 		for (MethodInfo m : getDeclaredMethods())
@@ -539,7 +539,7 @@
 	 * Same as {@link #getPublicConstructor(Class...)} but allows for inexact arg type matching.
 	 *
 	 * <p>
-	 * For example, the method <code>foo(CharSequence)</code> will be matched by <code>getAvailablePublicConstructor(String.<jk>class</jk>)</code>
+	 * For example, the method <c>foo(CharSequence)</c> will be matched by <code>getAvailablePublicConstructor(String.<jk>class</jk>)</code>
 	 *
 	 * @param args The exact argument types.
 	 * @return
@@ -1699,20 +1699,20 @@
 	//-----------------------------------------------------------------------------------------------------------------
 
 	/**
-	 * Returns <jk>true</jk> if this class is a parent or the same as <code>child</code>.
+	 * Returns <jk>true</jk> if this class is a parent or the same as <c>child</c>.
 	 *
 	 * @param child The child class.
-	 * @return <jk>true</jk> if this class is a parent or the same as <code>child</code>.
+	 * @return <jk>true</jk> if this class is a parent or the same as <c>child</c>.
 	 */
 	public boolean isParentOf(Class<?> child) {
 		return c != null && child != null && c.isAssignableFrom(child);
 	}
 
 	/**
-	 * Returns <jk>true</jk> if this class is a parent or the same as <code>child</code>.
+	 * Returns <jk>true</jk> if this class is a parent or the same as <c>child</c>.
 	 *
 	 * @param child The child class.
-	 * @return <jk>true</jk> if this class is a parent or the same as <code>child</code>.
+	 * @return <jk>true</jk> if this class is a parent or the same as <c>child</c>.
 	 */
 	public boolean isParentOf(Type child) {
 		if (child instanceof Class)
@@ -1721,30 +1721,30 @@
 	}
 
 	/**
-	 * Returns <jk>true</jk> if this class is a child of <code>parent</code>.
+	 * Returns <jk>true</jk> if this class is a child of <c>parent</c>.
 	 *
 	 * @param parent The parent class.
-	 * @return <jk>true</jk> if this class is a parent of <code>child</code>.
+	 * @return <jk>true</jk> if this class is a parent of <c>child</c>.
 	 */
 	public boolean isStrictChildOf(Class<?> parent) {
 		return c != null && parent != null && parent.isAssignableFrom(c) && ! c.equals(parent);
 	}
 
 	/**
-	 * Returns <jk>true</jk> if this class is a child or the same as <code>parent</code>.
+	 * Returns <jk>true</jk> if this class is a child or the same as <c>parent</c>.
 	 *
 	 * @param parent The parent class.
-	 * @return <jk>true</jk> if this class is a child or the same as <code>parent</code>.
+	 * @return <jk>true</jk> if this class is a child or the same as <c>parent</c>.
 	 */
 	public boolean isChildOf(Class<?> parent) {
 		return c != null && parent != null && parent.isAssignableFrom(c);
 	}
 
 	/**
-	 * Returns <jk>true</jk> if this class is a child or the same as any of the <code>parents</code>.
+	 * Returns <jk>true</jk> if this class is a child or the same as any of the <c>parents</c>.
 	 *
 	 * @param parents The parents class.
-	 * @return <jk>true</jk> if this class is a child or the same as any of the <code>parents</code>.
+	 * @return <jk>true</jk> if this class is a child or the same as any of the <c>parents</c>.
 	 */
 	public boolean isChildOfAny(Class<?>...parents) {
 		for (Class<?> p : parents)
@@ -1754,10 +1754,10 @@
 	}
 
 	/**
-	 * Returns <jk>true</jk> if this class is a child or the same as <code>parent</code>.
+	 * Returns <jk>true</jk> if this class is a child or the same as <c>parent</c>.
 	 *
 	 * @param parent The parent class.
-	 * @return <jk>true</jk> if this class is a parent or the same as <code>parent</code>.
+	 * @return <jk>true</jk> if this class is a parent or the same as <c>parent</c>.
 	 */
 	public boolean isChildOf(Type parent) {
 		if (parent instanceof Class)
@@ -1821,7 +1821,7 @@
 	/**
 	 * Returns the number of dimensions if this is an array type.
 	 *
-	 * @return The number of dimensions if this is an array type, or <code>0</code> if it is not.
+	 * @return The number of dimensions if this is an array type, or <c>0</c> if it is not.
 	 */
 	public int getDimensions() {
 		if (dim == -1) {
@@ -1877,7 +1877,7 @@
 	 * Finds the real parameter type of this class.
 	 *
 	 * @param index The zero-based index of the parameter to resolve.
-	 * @param pt The parameterized type class containing the parameterized type to resolve (e.g. <code>HashMap</code>).
+	 * @param pt The parameterized type class containing the parameterized type to resolve (e.g. <c>HashMap</c>).
 	 * @return The resolved real class.
 	 */
 	public Class<?> getParameterType(int index, Class<?> pt) {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/MethodInfo.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/MethodInfo.java
index da5a150..4704eaa 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/MethodInfo.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/MethodInfo.java
@@ -417,7 +417,7 @@
 	 *
 	 * <p>
 	 * Note that this only works for methods that have distinguishable argument types.
-	 * <br>It's not going to work on methods with generic argument types like <code>Object</code>
+	 * <br>It's not going to work on methods with generic argument types like <c>Object</c>
 	 *
 	 * @param pojo
 	 * 	The POJO the method is being called on.
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/remote/RemoteInterface.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/remote/RemoteInterface.java
index 6bc3b54..dffafd5 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/remote/RemoteInterface.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/remote/RemoteInterface.java
@@ -38,7 +38,7 @@
 	 * The possible values are:

 	 * <ul class='spaced-list'>

 	 * 	<li>An absolute URL.

-	 * 	<li>A relative URL interpreted as relative to the root URL defined on the <code>RestClient</code>

+	 * 	<li>A relative URL interpreted as relative to the root URL defined on the <c>RestClient</c>

 	 * 	<li>No path interpreted as the class name (e.g. <js>"http://localhost/root-url/org.foo.MyInterface"</js>)

 	 * </ul>

 	 */

diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/OutputStreamSerializer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/OutputStreamSerializer.java
index 45c1625..691890e 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/OutputStreamSerializer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/OutputStreamSerializer.java
@@ -94,9 +94,9 @@
 	 * @param accept

 	 * 	The accept media types that the serializer can handle.

 	 * 	<p>

-	 * 	Can contain meta-characters per the <code>media-type</code> specification of {@doc RFC2616.section14.1}

+	 * 	Can contain meta-characters per the <c>media-type</c> specification of {@doc RFC2616.section14.1}

 	 * 	<p>

-	 * 	If empty, then assumes the only media type supported is <code>produces</code>.

+	 * 	If empty, then assumes the only media type supported is <c>produces</c>.

 	 * 	<p>

 	 * 	For example, if this serializer produces <js>"application/json"</js> but should handle media types of

 	 * 	<js>"application/json"</js> and <js>"text/json"</js>, then the arguments should be:

diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializeException.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializeException.java
index 8836536..e6242fe 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializeException.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializeException.java
@@ -78,7 +78,7 @@
 	}

 

 	/**

-	 * Returns the highest-level <code>ParseException</code> in the stack trace.

+	 * Returns the highest-level <c>ParseException</c> in the stack trace.

 	 * Useful for JUnit testing of error conditions.

 	 *

 	 * @return The root parse exception, or this exception if there isn't one.

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 4300b83..78daa12 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
@@ -53,7 +53,7 @@
 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"Serializer.addBeanTypes.b"</js>

-	 * 	<li><b>Data type:</b>  <code>Boolean</code>

+	 * 	<li><b>Data type:</b>  <c>Boolean</c>

 	 * 	<li><b>Default:</b>  <jk>false</jk>

 	 * 	<li><b>Session property:</b>  <jk>false</jk>

 	 * 	<li><b>Methods:</b>

@@ -70,7 +70,7 @@
 	 *

 	 * <p>

 	 * This is used to recreate the correct objects during parsing if the object types cannot be inferred.

-	 * <br>For example, when serializing a <code>Map&lt;String,Object&gt;</code> field where the bean class cannot be determined from

+	 * <br>For example, when serializing a <c>Map&lt;String,Object&gt;</c> field where the bean class cannot be determined from

 	 * the type of the values.

 	 *

 	 * <p>

@@ -113,7 +113,7 @@
 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"Serializer.addRootType.b"</js>

-	 * 	<li><b>Data type:</b>  <code>Boolean</code>

+	 * 	<li><b>Data type:</b>  <c>Boolean</c>

 	 * 	<li><b>Default:</b>  <jk>false</jk>

 	 * 	<li><b>Session property:</b>  <jk>false</jk>

 	 * 	<li><b>Methods:</b>

@@ -169,7 +169,7 @@
 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"Serializer.listener.c"</js>

-	 * 	<li><b>Data type:</b>  <code>Class&lt;? extends SerializerListener&gt;</code>

+	 * 	<li><b>Data type:</b>  <c>Class&lt;? extends SerializerListener&gt;</c>

 	 * 	<li><b>Default:</b>  <jk>null</jk>

 	 * 	<li><b>Session property:</b>  <jk>false</jk>

 	 * 	<li><b>Methods:</b>

@@ -232,7 +232,7 @@
 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"Serializer.sortCollections.b"</js>

-	 * 	<li><b>Data type:</b>  <code>Boolean</code>

+	 * 	<li><b>Data type:</b>  <c>Boolean</c>

 	 * 	<li><b>Default:</b>  <jk>false</jk>

 	 * 	<li><b>Session property:</b>  <jk>false</jk>

 	 * 	<li><b>Methods:</b>

@@ -273,7 +273,7 @@
 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"Serializer.sortMaps.b"</js>

-	 * 	<li><b>Data type:</b>  <code>Boolean</code>

+	 * 	<li><b>Data type:</b>  <c>Boolean</c>

 	 * 	<li><b>Default:</b>  <jk>false</jk>

 	 * 	<li><b>Session property:</b>  <jk>false</jk>

 	 * 	<li><b>Methods:</b>

@@ -314,7 +314,7 @@
 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"Serializer.trimEmptyCollections.b"</js>

-	 * 	<li><b>Data type:</b>  <code>Boolean</code>

+	 * 	<li><b>Data type:</b>  <c>Boolean</c>

 	 * 	<li><b>Default:</b>  <jk>false</jk>

 	 * 	<li><b>Session property:</b>  <jk>false</jk>

 	 * 	<li><b>Methods:</b>

@@ -361,7 +361,7 @@
 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"Serializer.trimEmptyMaps.b"</js>

-	 * 	<li><b>Data type:</b>  <code>Boolean</code>

+	 * 	<li><b>Data type:</b>  <c>Boolean</c>

 	 * 	<li><b>Default:</b>  <jk>false</jk>

 	 * 	<li><b>Session property:</b>  <jk>false</jk>

 	 * 	<li><b>Methods:</b>

@@ -405,7 +405,7 @@
 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"Serializer.trimNullProperties.b"</js>

-	 * 	<li><b>Data type:</b>  <code>Boolean</code>

+	 * 	<li><b>Data type:</b>  <c>Boolean</c>

 	 * 	<li><b>Default:</b>  <jk>true</jk>

 	 * 	<li><b>Session property:</b>  <jk>false</jk>

 	 * 	<li><b>Methods:</b>

@@ -448,7 +448,7 @@
 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"Serializer.trimStrings.b"</js>

-	 * 	<li><b>Data type:</b>  <code>Boolean</code>

+	 * 	<li><b>Data type:</b>  <c>Boolean</c>

 	 * 	<li><b>Default:</b>  <jk>false</jk>

 	 * 	<li><b>Session property:</b>  <jk>false</jk>

 	 * 	<li><b>Methods:</b>

@@ -491,7 +491,7 @@
 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"Serializer.uriContext.s"</js>

-	 * 	<li><b>Data type:</b>  <code>String</code> (JSON object representing a {@link UriContext})

+	 * 	<li><b>Data type:</b>  <c>String</c> (JSON object representing a {@link UriContext})

 	 * 	<li><b>Default:</b>  <js>"{}"</js>

 	 * 	<li><b>Session property:</b>  <jk>true</jk>

 	 * 	<li><b>Methods:</b>

@@ -549,7 +549,7 @@
 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"Serializer.uriRelativity.s"</js>

-	 * 	<li><b>Data type:</b>  <code>String</code> ({@link UriRelativity})

+	 * 	<li><b>Data type:</b>  <c>String</c> ({@link UriRelativity})

 	 * 	<li><b>Default:</b>  <js>"RESOURCE"</js>

 	 * 	<li><b>Session property:</b>  <jk>false</jk>

 	 * 	<li><b>Methods:</b>

@@ -601,7 +601,7 @@
 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"Serializer.uriResolution.s"</js>

-	 * 	<li><b>Data type:</b>  <code>String</code> ({@link UriResolution})

+	 * 	<li><b>Data type:</b>  <c>String</c> ({@link UriResolution})

 	 * 	<li><b>Default:</b>  <js>"NONE"</js>

 	 * 	<li><b>Session property:</b>  <jk>false</jk>

 	 * 	<li><b>Methods:</b>

@@ -688,9 +688,9 @@
 	 * @param accept

 	 * 	The accept media types that the serializer can handle.

 	 * 	<p>

-	 * 	Can contain meta-characters per the <code>media-type</code> specification of {@doc RFC2616.section14.1}

+	 * 	Can contain meta-characters per the <c>media-type</c> specification of {@doc RFC2616.section14.1}

 	 * 	<p>

-	 * 	If empty, then assumes the only media type supported is <code>produces</code>.

+	 * 	If empty, then assumes the only media type supported is <c>produces</c>.

 	 * 	<p>

 	 * 	For example, if this serializer produces <js>"application/json"</js> but should handle media types of

 	 * 	<js>"application/json"</js> and <js>"text/json"</js>, then the arguments should be:

@@ -775,7 +775,7 @@
 	 * Serializes a POJO to the specified output stream or writer.

 	 *

 	 * <p>

-	 * Equivalent to calling <code>serializer.createSession().serialize(o, output);</code>

+	 * Equivalent to calling <c>serializer.createSession().serialize(o, output);</c>

 	 *

 	 * @param o The object to serialize.

 	 * @param output

@@ -799,13 +799,13 @@
 	}

 

 	/**

-	 * Shortcut method for serializing objects directly to either a <code>String</code> or <code><jk>byte</jk>[]</code>

+	 * Shortcut method for serializing objects directly to either a <c>String</c> or <code><jk>byte</jk>[]</code>

 	 * depending on the serializer type.

 	 *

 	 * @param o The object to serialize.

 	 * @return

 	 * 	The serialized object.

-	 * 	<br>Character-based serializers will return a <code>String</code>

+	 * 	<br>Character-based serializers will return a <c>String</c>

 	 * 	<br>Stream-based serializers will return a <code><jk>byte</jk>[]</code>

 	 * @throws SerializeException If a problem occurred trying to convert the output.

 	 */

@@ -834,7 +834,7 @@
 	//-----------------------------------------------------------------------------------------------------------------

 

 	/**

-	 * Returns the media types handled based on the value of the <code>accept</code> parameter passed into the constructor.

+	 * Returns the media types handled based on the value of the <c>accept</c> parameter passed into the constructor.

 	 *

 	 * <p>

 	 * Note that the order of these ranges are from high to low q-value.

@@ -846,7 +846,7 @@
 	}

 

 	/**

-	 * Returns the first entry in the <code>accept</code> parameter passed into the constructor.

+	 * Returns the first entry in the <c>accept</c> parameter passed into the constructor.

 	 *

 	 * <p>

 	 * This signifies the 'primary' media type for this serializer.

@@ -858,10 +858,10 @@
 	}

 

 	/**

-	 * Returns the media types handled based on the value of the <code>accept</code> parameter passed into the constructor.

+	 * Returns the media types handled based on the value of the <c>accept</c> parameter passed into the constructor.

 	 *

 	 * <p>

-	 * The order of the media types are the same as those in the <code>accept</code> parameter.

+	 * The order of the media types are the same as those in the <c>accept</c> parameter.

 	 *

 	 * @return The list of media types.  Never <jk>null</jk>.

 	 */

@@ -870,14 +870,14 @@
 	}

 

 	/**

-	 * Optional method that returns the response <code>Content-Type</code> for this serializer if it is different from

+	 * Optional method that returns the response <c>Content-Type</c> for this serializer if it is different from

 	 * the matched media type.

 	 *

 	 * <p>

 	 * This method is specified to override the content type for this serializer.

 	 * For example, the {@link org.apache.juneau.json.SimpleJsonSerializer} class returns that it handles media type

 	 * <js>"text/json+simple"</js>, but returns <js>"text/json"</js> as the actual content type.

-	 * This allows clients to request specific 'flavors' of content using specialized <code>Accept</code> header values.

+	 * This allows clients to request specific 'flavors' of content using specialized <c>Accept</c> header values.

 	 *

 	 * <p>

 	 * This method is typically meaningless if the serializer is being used stand-alone (i.e. outside of a REST server

diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerGroup.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerGroup.java
index f953dfa..24a596a 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerGroup.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerGroup.java
@@ -29,7 +29,7 @@
  * Provides the following features:

  * <ul class='spaced-list'>

  * 	<li>

- * 		Finds serializers based on HTTP <code>Accept</code> header values.

+ * 		Finds serializers based on HTTP <c>Accept</c> header values.

  * 	<li>

  * 		Sets common properties on all serializers in a single method call.

  * 	<li>

@@ -38,7 +38,7 @@
  *

  * <h5 class='topic'>Match ordering</h5>

  *

- * Serializers are matched against <code>Accept</code> strings in the order they exist in this group.

+ * Serializers are matched against <c>Accept</c> strings in the order they exist in this group.

  *

  * <p>

  * Adding new entries will cause the entries to be prepended to the group.

@@ -46,7 +46,7 @@
  *

  * <p>

  * For example, calling <code>g.append(S1.<jk>class</jk>,S2.<jk>class</jk>).append(S3.<jk>class</jk>,S4.<jk>class</jk>)</code>

- * will result in the order <code>S3, S4, S1, S2</code>.

+ * will result in the order <c>S3, S4, S1, S2</c>.

  *

  * <h5 class='section'>Example:</h5>

  * <p class='bcode w800'>

@@ -136,10 +136,10 @@
 	}

 

 	/**

-	 * Searches the group for a serializer that can handle the specified <code>Accept</code> value.

+	 * Searches the group for a serializer that can handle the specified <c>Accept</c> value.

 	 *

 	 * <p>

-	 * The <code>accept</code> value complies with the syntax described in RFC2616, Section 14.1, as described below:

+	 * The <c>accept</c> value complies with the syntax described in RFC2616, Section 14.1, as described below:

 	 * <p class='bcode w800'>

 	 * 	Accept         = "Accept" ":"

 	 * 	                  #( media-range [ accept-params ] )

diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerGroupBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerGroupBuilder.java
index 6bafd70..9b56a7e 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerGroupBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerGroupBuilder.java
@@ -546,7 +546,7 @@
 	 *
 	 * @param value
 	 * 	The new value for this property.
-	 * 	<br>The default is <code>100</code>.
+	 * 	<br>The default is <c>100</c>.
 	 * @return This object (for method chaining).
 	 */
 	public SerializerGroupBuilder maxIndent(int value) {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerMatch.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerMatch.java
index 19536eb..d320c73 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerMatch.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerMatch.java
@@ -15,7 +15,7 @@
 import org.apache.juneau.http.*;
 
 /**
- * Represents a serializer and media type that matches an HTTP <code>Accept</code> header value.
+ * Represents a serializer and media type that matches an HTTP <c>Accept</c> header value.
  */
 public final class SerializerMatch {
 
@@ -28,7 +28,7 @@
 	}
 
 	/**
-	 * Returns the media type of the serializers that matched the HTTP <code>Accept</code> header value.
+	 * Returns the media type of the serializers that matched the HTTP <c>Accept</c> header value.
 	 *
 	 * @return The media type of the match.
 	 */
@@ -37,7 +37,7 @@
 	}
 
 	/**
-	 * Returns the serializer that matched the HTTP <code>Accept</code> header value.
+	 * Returns the serializer that matched the HTTP <c>Accept</c> header value.
 	 *
 	 * @return The serializer of the match.
 	 */
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerSession.java
index bc07143..bf64ccb 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerSession.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerSession.java
@@ -144,13 +144,13 @@
 	protected abstract void doSerialize(SerializerPipe pipe, Object o) throws Exception;

 

 	/**

-	 * Shortcut method for serializing objects directly to either a <code>String</code> or <code><jk>byte</jk>[]</code>

+	 * Shortcut method for serializing objects directly to either a <c>String</c> or <code><jk>byte</jk>[]</code>

 	 * depending on the serializer type.

 	 *

 	 * @param o The object to serialize.

 	 * @return

 	 * 	The serialized object.

-	 * 	<br>Character-based serializers will return a <code>String</code>.

+	 * 	<br>Character-based serializers will return a <c>String</c>.

 	 * 	<br>Stream-based serializers will return a <code><jk>byte</jk>[]</code>.

 	 * @throws SerializeException If a problem occurred trying to convert the output.

 	 */

@@ -162,7 +162,7 @@
 	 * @param o The object to serialize.

 	 * @return

 	 * 	The serialized object.

-	 * 	<br>Character-based serializers will return a <code>String</code>

+	 * 	<br>Character-based serializers will return a <c>String</c>

 	 * 	<br>Stream-based serializers will return a <code><jk>byte</jk>[]</code> converted to a string based on the {@link OutputStreamSerializer#OSSERIALIZER_binaryFormat} setting.

 	 * @throws SerializeException If a problem occurred trying to convert the output.

 	 */

@@ -447,7 +447,7 @@
 	 * Opposite of {@link #resolveUri(Object)}.

 	 *

 	 * <p>

-	 * Converts the URI to a value relative to the specified <code>relativeTo</code> parameter.

+	 * Converts the URI to a value relative to the specified <c>relativeTo</c> parameter.

 	 *

 	 * <p>

 	 * Both parameters can be any of the following:

@@ -482,16 +482,16 @@
 	}

 

 	/**

-	 * Converts the specified object to a <code>String</code>.

+	 * Converts the specified object to a <c>String</c>.

 	 *

 	 * <p>

 	 * Also has the following effects:

 	 * <ul>

-	 * 	<li><code>Class</code> object is converted to a readable name.  See {@link ClassInfo#getFullName()}.

+	 * 	<li><c>Class</c> object is converted to a readable name.  See {@link ClassInfo#getFullName()}.

 	 * 	<li>Whitespace is trimmed if the trim-strings setting is enabled.

 	 * </ul>

 	 *

-	 * @param o The object to convert to a <code>String</code>.

+	 * @param o The object to convert to a <c>String</c>.

 	 * @return The object converted to a String, or <jk>null</jk> if the input was <jk>null</jk>.

 	 */

 	public final String toString(Object o) {

@@ -591,7 +591,7 @@
 	 * Optional method that specifies HTTP request headers for this serializer.

 	 *

 	 * <p>

-	 * For example, {@link SoapXmlSerializer} needs to set a <code>SOAPAction</code> header.

+	 * For example, {@link SoapXmlSerializer} needs to set a <c>SOAPAction</c> header.

 	 *

 	 * <p>

 	 * This method is typically meaningless if the serializer is being used stand-alone (i.e. outside of a REST server

diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerWriter.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerWriter.java
index 4b886d5..4c280f1 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerWriter.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerWriter.java
@@ -182,8 +182,8 @@
 	 * Appends the specified object as a URI.

 	 *

 	 * <p>

-	 * Object is converted to a <code>String</code> using <code>toString()</code>, so this will work on {@link URL} or

-	 * {@link URI} objects, or any other type that returns a URI via it's <code>toString()</code> method.

+	 * Object is converted to a <c>String</c> using <c>toString()</c>, so this will work on {@link URL} or

+	 * {@link URI} objects, or any other type that returns a URI via it's <c>toString()</c> method.

 	 *

 	 * <p>

 	 * The URI is resolved based on the {@link Serializer#SERIALIZER_uriRelativity} and

diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/WriterSerializer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/WriterSerializer.java
index 35272bb..6760c1f 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/WriterSerializer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/WriterSerializer.java
@@ -37,7 +37,7 @@
 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"WriterSerializer.fileCharset.s"</js>

-	 * 	<li><b>Data type:</b>  <code>String</code>

+	 * 	<li><b>Data type:</b>  <c>String</c>

 	 * 	<li><b>Default:</b>  <js>"DEFAULT"</js>

 	 * 	<li><b>Session property:</b>  <jk>false</jk>

 	 * 	<li><b>Methods:</b>

@@ -48,7 +48,7 @@
 	 *

 	 * <h5 class='section'>Description:</h5>

 	 * <p>

-	 * The character set to use for writing <code>Files</code> to the file system.

+	 * The character set to use for writing <c>Files</c> to the file system.

 	 *

 	 * <p>

 	 * Used when passing in files to {@link Serializer#serialize(Object, Object)}.

@@ -82,8 +82,8 @@
 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"WriterSerializer.maxIndent.i"</js>

-	 * 	<li><b>Data type:</b>  <code>Integer</code>

-	 * 	<li><b>Default:</b>  <code>100</code>

+	 * 	<li><b>Data type:</b>  <c>Integer</c>

+	 * 	<li><b>Default:</b>  <c>100</c>

 	 * 	<li><b>Session property:</b>  <jk>false</jk>

 	 * 	<li><b>Methods:</b>

 	 * 		<ul>

@@ -121,7 +121,7 @@
 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"WriterSerializer.quoteChar.s"</js>

-	 * 	<li><b>Data type:</b>  <code>String</code>

+	 * 	<li><b>Data type:</b>  <c>String</c>

 	 * 	<li><b>Default:</b>  <js>"\""</js>

 	 * 	<li><b>Session property:</b>  <jk>false</jk>

 	 * 	<li><b>Methods:</b>

@@ -161,7 +161,7 @@
 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"WriterSerializer.streamCharset.s"</js>

-	 * 	<li><b>Data type:</b>  <code>String</code>

+	 * 	<li><b>Data type:</b>  <c>String</c>

 	 * 	<li><b>Default:</b>  <js>"UTF-8"</js>

 	 * 	<li><b>Session property:</b>  <jk>false</jk>

 	 * 	<li><b>Methods:</b>

@@ -172,7 +172,7 @@
 	 *

 	 * <h5 class='section'>Description:</h5>

 	 * <p>

-	 * The character set to use when writing to <code>OutputStreams</code>.

+	 * The character set to use when writing to <c>OutputStreams</c>.

 	 *

 	 * <p>

 	 * Used when passing in output streams and byte arrays to {@link WriterSerializer#serialize(Object, Object)}.

@@ -203,7 +203,7 @@
 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"WriterSerializer.useWhitespace.b"</js>

-	 * 	<li><b>Data type:</b>  <code>Boolean</code>

+	 * 	<li><b>Data type:</b>  <c>Boolean</c>

 	 * 	<li><b>Default:</b>  <jk>false</jk>

 	 * 	<li><b>Session property:</b>  <jk>true</jk>

 	 * 	<li><b>Methods:</b>

@@ -265,9 +265,9 @@
 	 * @param accept

 	 * 	The accept media types that the serializer can handle.

 	 * 	<p>

-	 * 	Can contain meta-characters per the <code>media-type</code> specification of {@doc RFC2616.section14.1}

+	 * 	Can contain meta-characters per the <c>media-type</c> specification of {@doc RFC2616.section14.1}

 	 * 	<p>

-	 * 	If empty, then assumes the only media type supported is <code>produces</code>.

+	 * 	If empty, then assumes the only media type supported is <c>produces</c>.

 	 * 	<p>

 	 * 	For example, if this serializer produces <js>"application/json"</js> but should handle media types of

 	 * 	<js>"application/json"</js> and <js>"text/json"</js>, then the arguments should be:

@@ -313,7 +313,7 @@
 	}

 

 	/**

-	 * Convenience method for serializing an object to a <code>String</code>.

+	 * Convenience method for serializing an object to a <c>String</c>.

 	 *

 	 * @param o The object to serialize.

 	 * @return The output serialized to a string.

@@ -371,7 +371,7 @@
 	 *

 	 * @see #WSERIALIZER_fileCharset

 	 * @return

-	 * 	The character set to use when writing to <code>Files</code> on the file system.

+	 * 	The character set to use when writing to <c>Files</c> on the file system.

 	 */

 	protected final Charset getFileCharset() {

 		return fileCharset;

@@ -404,7 +404,7 @@
 	 *

 	 * @see #WSERIALIZER_streamCharset

 	 * @return

-	 * 	The character set to use when writing to <code>OutputStreams</code> and byte arrays.

+	 * 	The character set to use when writing to <c>OutputStreams</c> and byte arrays.

 	 */

 	protected final Charset getStreamCharset() {

 		return streamCharset;

diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/WriterSerializerBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/WriterSerializerBuilder.java
index 630e4c4..d811708 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/WriterSerializerBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/WriterSerializerBuilder.java
@@ -84,7 +84,7 @@
 	 *
 	 * @param value
 	 * 	The new value for this property.
-	 * 	<br>The default is <code>100</code>.
+	 * 	<br>The default is <c>100</c>.
 	 * @return This object (for method chaining).
 	 */
 	public WriterSerializerBuilder maxIndent(int value) {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/WriterSerializerSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/WriterSerializerSession.java
index 7396a52..ed74a48 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/WriterSerializerSession.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/WriterSerializerSession.java
@@ -82,7 +82,7 @@
 	}
 
 	/**
-	 * Convenience method for serializing an object to a <code>String</code>.
+	 * Convenience method for serializing an object to a <c>String</c>.
 	 *
 	 * @param o The object to serialize.
 	 * @return The output serialized to a string.
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 35bfca4..82d3d53 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
@@ -80,7 +80,7 @@
 	 *
 	 * <p>
 	 * This is used to recreate the correct objects during parsing if the object types cannot be inferred.
-	 * <br>For example, when serializing a <code>Map&lt;String,Object&gt;</code> field where the bean class cannot be determined from
+	 * <br>For example, when serializing a <c>Map&lt;String,Object&gt;</c> field where the bean class cannot be determined from
 	 * the type of the values.
 	 *
 	 * <p>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/SoapXmlSerializer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/SoapXmlSerializer.java
index 21d688a..dbe9422 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/SoapXmlSerializer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/SoapXmlSerializer.java
@@ -22,9 +22,9 @@
  *

  * <h5 class='topic'>Media types</h5>

  *

- * Handles <code>Accept</code> types:  <code><b>text/xml+soap</b></code>

+ * Handles <c>Accept</c> types:  <bc>text/xml+soap</bc>

  * <p>

- * Produces <code>Content-Type</code> types:  <code><b>text/xml+soap</b></code>

+ * Produces <c>Content-Type</c> types:  <bc>text/xml+soap</bc>

  *

  * <h5 class='topic'>Description</h5>

  *

@@ -40,12 +40,12 @@
 	static final String PREFIX = "SoapXmlSerializer";

 

 	/**

-	 * Configuration property:  The <code>SOAPAction</code> HTTP header value to set on responses.

+	 * Configuration property:  The <c>SOAPAction</c> HTTP header value to set on responses.

 	 *

 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"SoapXmlSerializer.SOAPAction.s"</js>

-	 * 	<li><b>Data type:</b>  <code>String</code>

+	 * 	<li><b>Data type:</b>  <c>String</c>

 	 * 	<li><b>Default:</b>  <js>"http://www.w3.org/2003/05/soap-envelope"</js>

 	 * 	<li><b>Methods:</b>

 	 * 		<ul>

diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/SoapXmlSerializerBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/SoapXmlSerializerBuilder.java
index 4429543..b288fc2 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/SoapXmlSerializerBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/SoapXmlSerializerBuilder.java
@@ -56,7 +56,7 @@
 	//-----------------------------------------------------------------------------------------------------------------
 
 	/**
-	 * Configuration property:  The <code>SOAPAction</code> HTTP header value to set on responses.
+	 * Configuration property:  The <c>SOAPAction</c> HTTP header value to set on responses.
 	 *
 	 * <h5 class='section'>See Also:</h5>
 	 * <ul>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/annotation/SoapXmlConfig.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/annotation/SoapXmlConfig.java
index 5fe3df1..f16f76c 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/annotation/SoapXmlConfig.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/annotation/SoapXmlConfig.java
@@ -38,7 +38,7 @@
 	//-------------------------------------------------------------------------------------------------------------------
 
 	/**
-	 * Configuration property:  The <code>SOAPAction</code> HTTP header value to set on responses.
+	 * Configuration property:  The <c>SOAPAction</c> HTTP header value to set on responses.
 	 *
 	 * <h5 class='section'>See Also:</h5>
 	 * <ul>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/DefaultingVar.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/DefaultingVar.java
index 8d8267c..c01981b 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/DefaultingVar.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/DefaultingVar.java
@@ -15,7 +15,7 @@
 import static org.apache.juneau.internal.StringUtils.*;

 

 /**

- * Interface for the resolution of vars with a default value if the <code>resolve()</code> method returns <jk>null</jk>.

+ * Interface for the resolution of vars with a default value if the <c>resolve()</c> method returns <jk>null</jk>.

  *

  * <p>

  * For example, to resolve the system property <js>"myProperty"</js> but resolve to <js>"not found"</js> if the

diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/VarResolver.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/VarResolver.java
index e3e0c0b..1fb93ff 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/VarResolver.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/VarResolver.java
@@ -21,7 +21,7 @@
  * Utility class for resolving variables of the form <js>"$X{key}"</js> in strings.

  *

  * <p>

- * Variables are of the form <code>$X{key}</code>, where <code>X</code> can consist of zero or more ASCII characters.

+ * Variables are of the form <c>$X{key}</c>, where <c>X</c> can consist of zero or more ASCII characters.

  * <br>The variable key can contain anything, even nested variables that get recursively resolved.

  *

  * <p>

@@ -63,21 +63,21 @@
 	 * Default string variable resolver with support for system properties and environment variables:

 	 *

 	 * <ul>

-	 * 	<li><code>$S{key[,default]}</code> - {@link SystemPropertiesVar}

-	 * 	<li><code>$E{key[,default]}</code> - {@link EnvVariablesVar}

-	 * 	<li><code>$A{key[,default]}</code> - {@link ArgsVar}

-	 * 	<li><code>$MF{key[,default]}</code> - {@link ManifestFileVar}

-	 * 	<li><code>$SW{stringArg,pattern:thenValue[,pattern:thenValue...]}</code> - {@link SwitchVar}

-	 * 	<li><code>$IF{arg,then[,else]}</code> - {@link IfVar}

-	 * 	<li><code>$CO{arg[,arg2...]}</code> - {@link CoalesceVar}

-	 * 	<li><code>$PM{arg,pattern}</code> - {@link PatternMatchVar}

-	 * 	<li><code>$PR{stringArg,pattern,replace}</code>- {@link PatternReplaceVar}

-	 * 	<li><code>$PE{arg,pattern,groupIndex}</code> - {@link PatternExtractVar}

-	 * 	<li><code>$UC{arg}</code> - {@link UpperCaseVar}

-	 * 	<li><code>$LC{arg}</code> - {@link LowerCaseVar}

-	 * 	<li><code>$NE{arg}</code> - {@link NotEmptyVar}

-	 * 	<li><code>$LN{arg[,delimiter]}</code> - {@link LenVar}

-	 * 	<li><code>$ST{arg,start[,end]}</code> - {@link SubstringVar}

+	 * 	<li><c>$S{key[,default]}</c> - {@link SystemPropertiesVar}

+	 * 	<li><c>$E{key[,default]}</c> - {@link EnvVariablesVar}

+	 * 	<li><c>$A{key[,default]}</c> - {@link ArgsVar}

+	 * 	<li><c>$MF{key[,default]}</c> - {@link ManifestFileVar}

+	 * 	<li><c>$SW{stringArg,pattern:thenValue[,pattern:thenValue...]}</c> - {@link SwitchVar}

+	 * 	<li><c>$IF{arg,then[,else]}</c> - {@link IfVar}

+	 * 	<li><c>$CO{arg[,arg2...]}</c> - {@link CoalesceVar}

+	 * 	<li><c>$PM{arg,pattern}</c> - {@link PatternMatchVar}

+	 * 	<li><c>$PR{stringArg,pattern,replace}</c>- {@link PatternReplaceVar}

+	 * 	<li><c>$PE{arg,pattern,groupIndex}</c> - {@link PatternExtractVar}

+	 * 	<li><c>$UC{arg}</c> - {@link UpperCaseVar}

+	 * 	<li><c>$LC{arg}</c> - {@link LowerCaseVar}

+	 * 	<li><c>$NE{arg}</c> - {@link NotEmptyVar}

+	 * 	<li><c>$LN{arg[,delimiter]}</c> - {@link LenVar}

+	 * 	<li><c>$ST{arg,start[,end]}</c> - {@link SubstringVar}

 	 * </ul>

 	 */

 	public static final VarResolver DEFAULT = new VarResolverBuilder().defaultVars().build();

diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/VarResolverSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/VarResolverSession.java
index 828ed8e..34e92bf 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/VarResolverSession.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/VarResolverSession.java
@@ -427,7 +427,7 @@
 	 * Returns the {@link Var} with the specified name.
 	 *
 	 * @param name The var name (e.g. <js>"S"</js>).
-	 * @return The {@link Var} instance, or <jk>null</jk> if no <code>Var</code> is associated with the specified name.
+	 * @return The {@link Var} instance, or <jk>null</jk> if no <c>Var</c> is associated with the specified name.
 	 */
 	protected Var getVar(String name) {
 		Var v = this.context.getVarMap().get(name);
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transform/BeanFilterBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transform/BeanFilterBuilder.java
index 0463166..8048c62 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transform/BeanFilterBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transform/BeanFilterBuilder.java
@@ -274,8 +274,8 @@
 	 * <br>Any properties in the stop class or in its base classes will be ignored during analysis.
 	 *
 	 * <p>
-	 * For example, in the following class hierarchy, instances of <code>C3</code> will include property <code>p3</code>,
-	 * but not <code>p1</code> or <code>p2</code>.
+	 * For example, in the following class hierarchy, instances of <c>C3</c> will include property <c>p3</c>,
+	 * but not <c>p1</c> or <c>p2</c>.
 	 *
 	 * <h5 class='section'>Example:</h5>
 	 * <p class='bcode w800'>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transform/InterfaceBeanFilterBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transform/InterfaceBeanFilterBuilder.java
index 54cb8f6..c86278a 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transform/InterfaceBeanFilterBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transform/InterfaceBeanFilterBuilder.java
@@ -24,9 +24,9 @@
  * Simple bean filter that simply identifies a class to be used as an interface class for all child classes.

  *

  * <p>

- * These objects are created when you pass in non-<code>BeanFilterBuilder</code> classes to

+ * These objects are created when you pass in non-<c>BeanFilterBuilder</c> classes to

  * {@link BeanContextBuilder#beanFilters(Class...)}, and are equivalent to adding a

- * <code><ja>@Bean</ja>(interfaceClass=Foo.<jk>class</jk>)</code> annotation on the <code>Foo</code> class.

+ * <code><ja>@Bean</ja>(interfaceClass=Foo.<jk>class</jk>)</code> annotation on the <c>Foo</c> class.

  *

  * @param <T> The interface class.

  */

diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transform/PojoSwap.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transform/PojoSwap.java
index 921adb3..e4f3b47 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transform/PojoSwap.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transform/PojoSwap.java
@@ -30,7 +30,7 @@
  * <h5 class='topic'>Description</h5>

  *

  * <p>

- * <code>PojoSwaps</code> are used to extend the functionality of the serializers and parsers to be able to handle

+ * <c>PojoSwaps</c> are used to extend the functionality of the serializers and parsers to be able to handle

  * POJOs that aren't automatically handled by the serializers or parsers.

  * <br>For example, JSON does not have a standard representation for rendering dates.

  * By defining a special {@code Date} swap and associating it with a serializer and parser, you can convert a

@@ -41,7 +41,7 @@
  * Swaps MUST declare a public no-arg constructor so that the bean context can instantiate them.

  *

  * <p>

- * <code>PojoSwaps</code> are associated with serializers and parsers through the following:

+ * <c>PojoSwaps</c> are associated with serializers and parsers through the following:

  * <ul>

  * 	<li class='ja'>{@link Swap @Swap}

  * 	<li class='ja'>{@link Swaps @Swaps}

@@ -54,7 +54,7 @@
  * </ul>

  *

  * <p>

- * <code>PojoSwaps</code> have two parameters:

+ * <c>PojoSwaps</c> have two parameters:

  * <ol>

  * 	<li>{@code <T>} - The normal representation of an object.

  * 	<li>{@code <S>} - The swapped representation of an object.

@@ -88,7 +88,7 @@
  * </ul>

  *

  * <p>

- * For OpenAPI serialization, the valid swapped types also include <code><jk>byte</jk>[]</code> and <code>Calendar</code>.

+ * For OpenAPI serialization, the valid swapped types also include <code><jk>byte</jk>[]</code> and <c>Calendar</c>.

  *

  * <h5 class='topic'>Normal Class Type {@code <T>}</h5>

  *

@@ -237,11 +237,11 @@
 	 * For example, if the session media type is <js>"text/json"</js>, then the match values are shown below:

 	 *

 	 * <ul>

-	 * 	<li><js>"text/json"</js> = <code>100,000</code>

-	 * 	<li><js>"&#42;/json"</js> = <code>5,100</code>

-	 * 	<li><js>"&#42;/&#42;"</js> = <code>5,000</code>

-	 * 	<li>No media types specified on swap = <code>1</code>

-	 * 	<li><js>"text/xml"</js> = <code>0</code>

+	 * 	<li><js>"text/json"</js> = <c>100,000</c>

+	 * 	<li><js>"&#42;/json"</js> = <c>5,100</c>

+	 * 	<li><js>"&#42;/&#42;"</js> = <c>5,000</c>

+	 * 	<li>No media types specified on swap = <c>1</c>

+	 * 	<li><js>"text/xml"</js> = <c>0</c>

 	 * </ul>

 	 *

 	 * @param session The bean session.

diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transforms/CalendarMapSwap.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transforms/CalendarMapSwap.java
index bcabe1a..06e7c33 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transforms/CalendarMapSwap.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transforms/CalendarMapSwap.java
@@ -18,7 +18,7 @@
 import org.apache.juneau.transform.*;

 

 /**

- * Transforms {@link Calendar Calendars} to {@link Map Maps} of the format <code>{time:long,timeZone:string}</code>.

+ * Transforms {@link Calendar Calendars} to {@link Map Maps} of the format <c>{time:long,timeZone:string}</c>.

  */

 @SuppressWarnings("rawtypes")

 public class CalendarMapSwap extends PojoSwap<Calendar,Map> {

diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transforms/XMLGregorianCalendarSwap.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transforms/XMLGregorianCalendarSwap.java
index 446e150..1a3240a 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transforms/XMLGregorianCalendarSwap.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transforms/XMLGregorianCalendarSwap.java
@@ -44,7 +44,7 @@
 	}

 

 	/**

-	 * Converts the specified <code>XMLGregorianCalendar</code> to a {@link String}.

+	 * Converts the specified <c>XMLGregorianCalendar</c> to a {@link String}.

 	 */

 	@Override /* PojoSwap */

 	public String swap(BeanSession session, XMLGregorianCalendar b) throws Exception {

@@ -52,7 +52,7 @@
 	}

 

 	/**

-	 * Converts the specified {@link String} to an <code>XMLGregorianCalendar</code>.

+	 * Converts the specified {@link String} to an <c>XMLGregorianCalendar</c>.

 	 */

 	@Override /* PojoSwap */

 	public XMLGregorianCalendar unswap(BeanSession session, String s, ClassMeta<?> hint) throws Exception {

diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonParser.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonParser.java
index a5905b6..aff7c9f 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonParser.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonParser.java
@@ -25,7 +25,7 @@
  *

  * <h5 class='topic'>Media types</h5>

  *

- * Handles <code>Content-Type</code> types:  <code><b>text/uon</b></code>

+ * Handles <c>Content-Type</c> types:  <bc>text/uon</bc>

  *

  * <h5 class='topic'>Description</h5>

  *

@@ -46,7 +46,7 @@
 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"UonParser.decoding.b"</js>

-	 * 	<li><b>Data type:</b>  <code>Boolean</code>

+	 * 	<li><b>Data type:</b>  <c>Boolean</c>

 	 * 	<li><b>Default:</b>  <jk>false</jk> for {@link UonParser}, <jk>true</jk> for {@link UrlEncodingParser}

 	 * 	<li><b>Session property:</b>  <jk>false</jk>

 	 * 	<li><b>Methods:</b>

@@ -87,7 +87,7 @@
 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"UonParser.validateEnd.b"</js>

-	 * 	<li><b>Data type:</b>  <code>Boolean</code>

+	 * 	<li><b>Data type:</b>  <c>Boolean</c>

 	 * 	<li><b>Default:</b>  <jk>false</jk>

 	 * 	<li><b>Session property:</b>  <jk>false</jk>

 	 * 	<li><b>Methods:</b>

diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonReader.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonReader.java
index 273f095..7b8359e 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonReader.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonReader.java
@@ -17,7 +17,7 @@
 import org.apache.juneau.parser.*;

 

 /**

- * Same functionality as {@link ParserReader} except automatically decoded <code>%xx</code> escape sequences.

+ * Same functionality as {@link ParserReader} except automatically decoded <c>%xx</c> escape sequences.

  *

  * <p>

  * Escape sequences are assumed to be encoded UTF-8.  Extended Unicode (&gt;\u10000) is supported.

diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonSerializer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonSerializer.java
index 7370ceb..1a292a6 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonSerializer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonSerializer.java
@@ -23,9 +23,9 @@
  *

  * <h5 class='topic'>Media types</h5>

  *

- * Handles <code>Accept</code> types:  <code><b>text/uon</b></code>

+ * Handles <c>Accept</c> types:  <bc>text/uon</bc>

  * <p>

- * Produces <code>Content-Type</code> types:  <code><b>text/uon</b></code>

+ * Produces <c>Content-Type</c> types:  <bc>text/uon</bc>

  *

  * <h5 class='topic'>Description</h5>

  *

@@ -130,7 +130,7 @@
 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"UonSerializer.addBeanTypes.b"</js>

-	 * 	<li><b>Data type:</b>  <code>Boolean</code>

+	 * 	<li><b>Data type:</b>  <c>Boolean</c>

 	 * 	<li><b>Default:</b>  <jk>false</jk>

 	 * 	<li><b>Session property:</b>  <jk>false</jk>

 	 * 	<li><b>Methods:</b>

@@ -156,7 +156,7 @@
 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"UonSerializer.encoding.b"</js>

-	 * 	<li><b>Data type:</b>  <code>Boolean</code>

+	 * 	<li><b>Data type:</b>  <c>Boolean</c>

 	 * 	<li><b>Default:</b>  <jk>false</jk> for {@link UonSerializer}, <jk>true</jk> for {@link UrlEncodingSerializer}

 	 * 	<li><b>Session property:</b>  <jk>false</jk>

 	 * 	<li><b>Methods:</b>

@@ -205,7 +205,7 @@
 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"UonSerializer.paramFormat.s"</js>

-	 * 	<li><b>Data type:</b>  <code>String</code> ({@link ParamFormat})

+	 * 	<li><b>Data type:</b>  <c>String</c> ({@link ParamFormat})

 	 * 	<li><b>Default:</b>  <js>"UON"</js>

 	 * 	<li><b>Session property:</b>  <jk>false</jk>

 	 * 	<li><b>Methods:</b>

@@ -333,9 +333,9 @@
 	 * @param accept

 	 * 	The accept media types that the serializer can handle.

 	 * 	<p>

-	 * 	Can contain meta-characters per the <code>media-type</code> specification of {@doc RFC2616.section14.1}

+	 * 	Can contain meta-characters per the <c>media-type</c> specification of {@doc RFC2616.section14.1}

 	 * 	<p>

-	 * 	If empty, then assumes the only media type supported is <code>produces</code>.

+	 * 	If empty, then assumes the only media type supported is <c>produces</c>.

 	 * 	<p>

 	 * 	For example, if this serializer produces <js>"application/json"</js> but should handle media types of

 	 * 	<js>"application/json"</js> and <js>"text/json"</js>, then the arguments should be:

diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingParser.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingParser.java
index 22c6bb6..ebaac9d 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingParser.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingParser.java
@@ -23,7 +23,7 @@
  *

  * <h5 class='topic'>Media types</h5>

  *

- * Handles <code>Content-Type</code> types:  <code><b>application/x-www-form-urlencoded</b></code>

+ * Handles <c>Content-Type</c> types:  <bc>application/x-www-form-urlencoded</bc>

  *

  * <h5 class='topic'>Description</h5>

  *

@@ -50,7 +50,7 @@
 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"UrlEncodingParser.expandedParams.b"</js>

-	 * 	<li><b>Data type:</b>  <code>Boolean</code>

+	 * 	<li><b>Data type:</b>  <c>Boolean</c>

 	 * 	<li><b>Default:</b>  <jk>false</jk>

 	 * 	<li><b>Session property:</b>  <jk>false</jk>

 	 * 	<li><b>Methods:</b>

@@ -66,8 +66,8 @@
 	 * This is the parser-side equivalent of the {@link #URLENC_expandedParams} setting.

 	 *

 	 * <p>

-	 * If <jk>false</jk>, serializing the array <code>[1,2,3]</code> results in <code>?key=$a(1,2,3)</code>.

-	 * <br>If <jk>true</jk>, serializing the same array results in <code>?key=1&amp;key=2&amp;key=3</code>.

+	 * If <jk>false</jk>, serializing the array <c>[1,2,3]</c> results in <c>?key=$a(1,2,3)</c>.

+	 * <br>If <jk>true</jk>, serializing the same array results in <c>?key=1&amp;key=2&amp;key=3</c>.

 	 *

 	 * <h5 class='section'>Example:</h5>

 	 * <p class='bcode w800'>

@@ -172,8 +172,8 @@
 	 *

 	 * @see #URLENC_expandedParams

 	 * @return

-	 * <jk>false</jk> if serializing the array <code>[1,2,3]</code> results in <code>?key=$a(1,2,3)</code>.

-	 * <br><jk>true</jk> if serializing the same array results in <code>?key=1&amp;key=2&amp;key=3</code>.

+	 * <jk>false</jk> if serializing the array <c>[1,2,3]</c> results in <c>?key=$a(1,2,3)</c>.

+	 * <br><jk>true</jk> if serializing the same array results in <c>?key=1&amp;key=2&amp;key=3</c>.

 	 */

 	protected final boolean isExpandedParams() {

 		return expandedParams;

diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingParserSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingParserSession.java
index 7bf4663..148ea36 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingParserSession.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingParserSession.java
@@ -360,8 +360,8 @@
 	 *

 	 * @see UrlEncodingParser#URLENC_expandedParams

 	 * @return

-	 * <jk>false</jk> if serializing the array <code>[1,2,3]</code> results in <code>?key=$a(1,2,3)</code>.

-	 * <br><jk>true</jk> if serializing the same array results in <code>?key=1&amp;key=2&amp;key=3</code>.

+	 * <jk>false</jk> if serializing the array <c>[1,2,3]</c> results in <c>?key=$a(1,2,3)</c>.

+	 * <br><jk>true</jk> if serializing the same array results in <c>?key=1&amp;key=2&amp;key=3</c>.

 	 */

 	protected final boolean isExpandedParams() {

 		return ctx.isExpandedParams();

diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializer.java
index 34cacc1..87c5f61 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializer.java
@@ -22,9 +22,9 @@
  *

  * <h5 class='section'>Media types:</h5>

  *

- * Handles <code>Accept</code> types:  <code><b>application/x-www-form-urlencoded</b></code>

+ * Handles <c>Accept</c> types:  <bc>application/x-www-form-urlencoded</bc>

  * <p>

- * Produces <code>Content-Type</code> types:  <code><b>application/x-www-form-urlencoded</b></code>

+ * Produces <c>Content-Type</c> types:  <bc>application/x-www-form-urlencoded</bc>

  *

  * <h5 class='topic'>Description</h5>

  *

@@ -126,7 +126,7 @@
 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"UrlEncodingSerializer.expandedParams.b"</js>

-	 * 	<li><b>Data type:</b>  <code>Boolean</code>

+	 * 	<li><b>Data type:</b>  <c>Boolean</c>

 	 * 	<li><b>Default:</b>  <jk>false</jk>

 	 * 	<li><b>Session property:</b>  <jk>false</jk>

 	 * 	<li><b>Methods:</b>

@@ -138,8 +138,8 @@
 	 *

 	 * <h5 class='section'>Description:</h5>

 	 * <p>

-	 * If <jk>false</jk>, serializing the array <code>[1,2,3]</code> results in <code>?key=$a(1,2,3)</code>.

-	 * <br>If <jk>true</jk>, serializing the same array results in <code>?key=1&amp;key=2&amp;key=3</code>.

+	 * If <jk>false</jk>, serializing the array <c>[1,2,3]</c> results in <c>?key=$a(1,2,3)</c>.

+	 * <br>If <jk>true</jk>, serializing the same array results in <c>?key=1&amp;key=2&amp;key=3</c>.

 	 *

 	 * <p>

 	 * This option only applies to beans.

@@ -147,7 +147,7 @@
 	 * <h5 class='section'>Notes:</h5>

 	 * <ul class='spaced-list'>

 	 * 	<li>

-	 * 		If parsing multi-part parameters, it's highly recommended to use <code>Collections</code> or <code>Lists</code>

+	 * 		If parsing multi-part parameters, it's highly recommended to use <c>Collections</c> or <c>Lists</c>

 	 * 		as bean property types instead of arrays since arrays have to be recreated from scratch every time a value

 	 * 		is added to it.

 	 * </ul>

@@ -271,9 +271,9 @@
 	 * @param accept

 	 * 	The accept media types that the serializer can handle.

 	 * 	<p>

-	 * 	Can contain meta-characters per the <code>media-type</code> specification of {@doc RFC2616.section14.1}

+	 * 	Can contain meta-characters per the <c>media-type</c> specification of {@doc RFC2616.section14.1}

 	 * 	<p>

-	 * 	If empty, then assumes the only media type supported is <code>produces</code>.

+	 * 	If empty, then assumes the only media type supported is <c>produces</c>.

 	 * 	<p>

 	 * 	For example, if this serializer produces <js>"application/json"</js> but should handle media types of

 	 * 	<js>"application/json"</js> and <js>"text/json"</js>, then the arguments should be:

@@ -343,8 +343,8 @@
 	 *

 	 * @see #URLENC_expandedParams

 	 * @return

-	 * 	<jk>false</jk> if serializing the array <code>[1,2,3]</code> results in <code>?key=$a(1,2,3)</code>.

-	 * 	<br><jk>true</jk> if serializing the same array results in <code>?key=1&amp;key=2&amp;key=3</code>.

+	 * 	<jk>false</jk> if serializing the array <c>[1,2,3]</c> results in <c>?key=$a(1,2,3)</c>.

+	 * 	<br><jk>true</jk> if serializing the same array results in <c>?key=1&amp;key=2&amp;key=3</c>.

 	 */

 	protected final boolean isExpandedParams() {

 		return expandedParams;

diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializerBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializerBuilder.java
index 69e8898..875d340 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializerBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializerBuilder.java
@@ -59,8 +59,8 @@
 	 * Configuration property:  Serialize bean property collections/arrays as separate key/value pairs.
 	 *
 	 * <p>
-	 * If <jk>false</jk>, serializing the array <code>[1,2,3]</code> results in <code>?key=$a(1,2,3)</code>.
-	 * <br>If <jk>true</jk>, serializing the same array results in <code>?key=1&amp;key=2&amp;key=3</code>.
+	 * If <jk>false</jk>, serializing the array <c>[1,2,3]</c> results in <c>?key=$a(1,2,3)</c>.
+	 * <br>If <jk>true</jk>, serializing the same array results in <c>?key=1&amp;key=2&amp;key=3</c>.
 	 *
 	 * <h5 class='section'>See Also:</h5>
 	 * <ul>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializerSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializerSession.java
index 2aea25a..0b2bccf 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializerSession.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializerSession.java
@@ -267,8 +267,8 @@
 	 *

 	 * @see UrlEncodingSerializer#URLENC_expandedParams

 	 * @return

-	 * 	<jk>false</jk> if serializing the array <code>[1,2,3]</code> results in <code>?key=$a(1,2,3)</code>.

-	 * 	<br><jk>true</jk> if serializing the same array results in <code>?key=1&amp;key=2&amp;key=3</code>.

+	 * 	<jk>false</jk> if serializing the array <c>[1,2,3]</c> results in <c>?key=$a(1,2,3)</c>.

+	 * 	<br><jk>true</jk> if serializing the same array results in <c>?key=1&amp;key=2&amp;key=3</c>.

 	 */

 	protected final boolean isExpandedParams() {

 		return ctx.isExpandedParams();

diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/annotation/UrlEncodingConfig.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/annotation/UrlEncodingConfig.java
index beafdf4..8e17b2d 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/annotation/UrlEncodingConfig.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/annotation/UrlEncodingConfig.java
@@ -44,8 +44,8 @@
 	 * This is the parser-side equivalent of the {@link UrlEncodingSerializer#URLENC_expandedParams} setting.
 	 *
 	 * <p>
-	 * If <js>"false"</js>, serializing the array <code>[1,2,3]</code> results in <code>?key=$a(1,2,3)</code>.
-	 * <br>If <js>"true"</js>, serializing the same array results in <code>?key=1&amp;key=2&amp;key=3</code>.
+	 * If <js>"false"</js>, serializing the array <c>[1,2,3]</c> results in <c>?key=$a(1,2,3)</c>.
+	 * <br>If <js>"true"</js>, serializing the same array results in <c>?key=1&amp;key=2&amp;key=3</c>.
 	 *
 	 * <h5 class='section'>Notes:</h5>
 	 * <ul class='spaced-list'>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/Args.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/Args.java
index 994c4d4..a72cc04 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/Args.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/Args.java
@@ -21,7 +21,7 @@
 

 /**

  * Utility class to make it easier to work with command-line arguments pass in through a

- * <code>main(String[] args)</code> method.

+ * <c>main(String[] args)</c> method.

  *

  * <p>

  * Used to parse command-line arguments of the form

@@ -35,13 +35,13 @@
  *

  * <h5 class='topic'>Command-line examples</h5>

  * <ul>

- * 	<li><code>java com.sample.MyClass mainArg1</code>

- * 	<li><code>java com.sample.MyClass mainArg1 mainArg2</code>

- * 	<li><code>java com.sample.MyClass mainArg1 -optArg1</code>

- * 	<li><code>java com.sample.MyClass -optArg1</code>

- * 	<li><code>java com.sample.MyClass mainArg1 -optArg1 optArg1Val</code>

- * 	<li><code>java com.sample.MyClass mainArg1 -optArg1 optArg1Val1 optArg1Val2</code>

- * 	<li><code>java com.sample.MyClass mainArg1 -optArg1 optArg1Val1 -optArg1 optArg1Val2</code>

+ * 	<li><c>java com.sample.MyClass mainArg1</c>

+ * 	<li><c>java com.sample.MyClass mainArg1 mainArg2</c>

+ * 	<li><c>java com.sample.MyClass mainArg1 -optArg1</c>

+ * 	<li><c>java com.sample.MyClass -optArg1</c>

+ * 	<li><c>java com.sample.MyClass mainArg1 -optArg1 optArg1Val</c>

+ * 	<li><c>java com.sample.MyClass mainArg1 -optArg1 optArg1Val1 optArg1Val2</c>

+ * 	<li><c>java com.sample.MyClass mainArg1 -optArg1 optArg1Val1 -optArg1 optArg1Val2</c>

  * </ul>

  *

  * <h5 class='section'>Example:</h5>

@@ -90,7 +90,7 @@
  *

  * <p>

  * Main arguments are available through numeric string keys (e.g. <js>"0"</js>, <js>"1"</js>, ...).

- * So you could use the {@link ObjectMap} API to convert main arguments directly to POJOs, such as an <code>Enum</code>

+ * So you could use the {@link ObjectMap} API to convert main arguments directly to POJOs, such as an <c>Enum</c>

  * <p class='bcode w800'>

  * 	<jc>// Get 1st main argument as an Enum</jc>

  * 	MyEnum e = a.get(MyEnum.<jk>class</jk>, <js>"0"</js>);

@@ -109,7 +109,7 @@
 	/**

 	 * Constructor.

 	 *

-	 * @param args Arguments passed in through a <code>main(String[] args)</code> method.

+	 * @param args Arguments passed in through a <c>main(String[] args)</c> method.

 	 */

 	public Args(String[] args) {

 		List<String> argList = new LinkedList<>(Arrays.asList(args));

diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/ClasspathResourceFinderSimple.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/ClasspathResourceFinderSimple.java
index 3de00c5..eed8e39 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/ClasspathResourceFinderSimple.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/ClasspathResourceFinderSimple.java
@@ -25,7 +25,7 @@
  * Same as {@link Class#getResourceAsStream(String)} except looks for resources with localized file names.
  *
  * <p>
- * If the <code>locale</code> is specified, then we look for resources whose name matches that locale.
+ * If the <c>locale</c> is specified, then we look for resources whose name matches that locale.
  * For example, if looking for the resource <js>"MyResource.txt"</js> for the Japanese locale, we will look for
  * files in the following order:
  * <ol>
@@ -146,7 +146,7 @@
 	 * Returns the candidate locales for the specified locale.
 	 *
 	 * <p>
-	 * For example, if <code>locale</code> is <js>"ja_JP"</js>, then this method will return:
+	 * For example, if <c>locale</c> is <js>"ja_JP"</js>, then this method will return:
 	 * <ol>
 	 * 	<li><js>"ja_JP"</js>
 	 * 	<li><js>"ja"</js>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/IOPipe.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/IOPipe.java
index 8bd7428..35745dc 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/IOPipe.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/IOPipe.java
@@ -95,7 +95,7 @@
 	/**

 	 * Specifies the temporary buffer size.

 	 *

-	 * @param buffSize The buffer size.  Default is <code>1024</code>.

+	 * @param buffSize The buffer size.  Default is <c>1024</c>.

 	 * @return This object (for method chaining).

 	 */

 	public IOPipe buffSize(int buffSize) {

diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/IdGenerators.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/IdGenerators.java
index 18e1df4..8780be7 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/IdGenerators.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/IdGenerators.java
@@ -20,7 +20,7 @@
 public class IdGenerators {
 
 	/**
-	 * Creates an ID generator using {@link AtomicInteger} initialized to value <code>1</code>.
+	 * Creates an ID generator using {@link AtomicInteger} initialized to value <c>1</c>.
 	 *
 	 * @param initValue The initial value.
 	 * @return A new ID generator.
@@ -51,7 +51,7 @@
 	}
 
 	/**
-	 * Creates an ID generator using {@link AtomicLong} initialized to value <code>1</code>.
+	 * Creates an ID generator using {@link AtomicLong} initialized to value <c>1</c>.
 	 *
 	 * @param initValue The initial value.
 	 * @return A new ID generator.
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/IdMap.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/IdMap.java
index 33253e2..bedc48b 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/IdMap.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/IdMap.java
@@ -31,7 +31,7 @@
 
 
 	/**
-	 * Creates a new ID map with integer keys with generator initialized to <code>1</code>.
+	 * Creates a new ID map with integer keys with generator initialized to <c>1</c>.
 	 *
 	 * @param c The value type.
 	 * @return A new map.
@@ -52,7 +52,7 @@
 	}
 
 	/**
-	 * Creates a new ID map with long keys with generator initialized to <code>1</code>.
+	 * Creates a new ID map with long keys with generator initialized to <c>1</c>.
 	 *
 	 * @param c The value type.
 	 * @return A new map.
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/MessageBundle.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/MessageBundle.java
index 8d2a88a..e11fa69 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/MessageBundle.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/MessageBundle.java
@@ -43,7 +43,7 @@
  * 		The {@link #getString(Locale, String, Object...)} method can be used to retrieve locale-specific messages.

  * 	<li>

  * 		Messages in the resource bundle can optionally be prefixed with the simple class name.

- * 		For example, if the class is <code>MyClass</code> and the properties file contains <js>"MyClass.myMessage"</js>,

+ * 		For example, if the class is <c>MyClass</c> and the properties file contains <js>"MyClass.myMessage"</js>,

  * 		the message can be retrieved using <code>getString(<js>"myMessage"</js>)</code>.

  * </ul>

  *

@@ -93,9 +93,9 @@
 	 * When this method is used, the bundle path is determined by searching for the resource bundle

 	 * in the following locations:

 	 * <ul>

-	 * 	<li><code>[package].ForClass.properties</code>

-	 * 	<li><code>[package].nls.ForClass.properties</code>

-	 * 	<li><code>[package].i18n.ForClass.properties</code>

+	 * 	<li><c>[package].ForClass.properties</c>

+	 * 	<li><c>[package].nls.ForClass.properties</c>

+	 * 	<li><c>[package].i18n.ForClass.properties</c>

 	 * </ul>

 	 *

 	 * @param forClass The class

@@ -109,7 +109,7 @@
 	 * Constructor.

 	 *

 	 * <p>

-	 * A shortcut for calling <code>new MessageBundle(forClass, bundlePath)</code>.

+	 * A shortcut for calling <c>new MessageBundle(forClass, bundlePath)</c>.

 	 *

 	 * @param forClass The class

 	 * @param bundlePath The location of the resource bundle.

@@ -355,7 +355,7 @@
 	 *

 	 * <p>

 	 * Useful for debugging purposes.

-	 * Note that any class that implements a <code>swap()</code> method will automatically be serialized by

+	 * Note that any class that implements a <c>swap()</c> method will automatically be serialized by

 	 * calling this method and serializing the result.

 	 *

 	 * <p>

diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/MockHttpConnection.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/MockHttpConnection.java
index 294e8dd..9791878 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/MockHttpConnection.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/MockHttpConnection.java
@@ -16,10 +16,10 @@
  * Represent the basic connection for mock HTTP requests.
  *
  * <p>
- * Used as a shim between the server and client APIs that allow the <code>RestClient</code>
- * class to send and receive mocked requests using the <code>MockRest</code> interface.
+ * Used as a shim between the server and client APIs that allow the <c>RestClient</c>
+ * class to send and receive mocked requests using the <c>MockRest</c> interface.
  *
- * @deprecated Use <code>org.apache.juneau.rest.mock2</code>
+ * @deprecated Use <c>org.apache.juneau.rest.mock2</c>
  */
 @Deprecated
 public interface MockHttpConnection {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/MockHttpRequest.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/MockHttpRequest.java
index 9a7db00..e16e4cf 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/MockHttpRequest.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/MockHttpRequest.java
@@ -16,10 +16,10 @@
  * Represent the basic interface for an HTTP rquest.
  *
  * <p>
- * Used as a shim between the server and client APIs that allow the <code>RestClient</code>
- * class to send and receive mocked requests using the <code>MockRest</code> interface.
+ * Used as a shim between the server and client APIs that allow the <c>RestClient</c>
+ * class to send and receive mocked requests using the <c>MockRest</c> interface.
  *
- * @deprecated Use <code>org.apache.juneau.rest.mock2</code>
+ * @deprecated Use <c>org.apache.juneau.rest.mock2</c>
  */
 @Deprecated
 public interface MockHttpRequest {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/MockHttpResponse.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/MockHttpResponse.java
index e17d453..8d52006 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/MockHttpResponse.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/MockHttpResponse.java
@@ -18,10 +18,10 @@
  * Represent the basic interface for an HTTP response.
  *
  * <p>
- * Used as a shim between the server and client APIs that allow the <code>RestClient</code>
- * class to send and receive mocked requests using the <code>MockRest</code> interface.
+ * Used as a shim between the server and client APIs that allow the <c>RestClient</c>
+ * class to send and receive mocked requests using the <c>MockRest</c> interface.
  *
- * @deprecated Use <code>org.apache.juneau.rest.mock2</code>
+ * @deprecated Use <c>org.apache.juneau.rest.mock2</c>
  */
 @Deprecated
 public interface MockHttpResponse {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/PojoIntrospector.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/PojoIntrospector.java
index 22c8718..0706a18 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/PojoIntrospector.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/PojoIntrospector.java
@@ -70,7 +70,7 @@
 	 * 	Can be <jk>null</jk> if method has no arguments.

 	 * @return The object returned by the call to the method, or <jk>null</jk> if target object is <jk>null</jk>.

 	 * @throws IllegalAccessException

-	 * 	If the <code>Constructor</code> object enforces Java language access control and the underlying constructor is

+	 * 	If the <c>Constructor</c> object enforces Java language access control and the underlying constructor is

 	 * 	inaccessible.

 	 * @throws IllegalArgumentException

 	 * 	If one of the following occurs:

@@ -108,7 +108,7 @@
 	 * @return The object returned by the call to the method, or <jk>null</jk> if target object is <jk>null</jk>.

 	 * @throws NoSuchMethodException If method does not exist.

 	 * @throws IllegalAccessException

-	 * 	If the <code>Constructor</code> object enforces Java language access control and

+	 * 	If the <c>Constructor</c> object enforces Java language access control and

 	 * 	the underlying constructor is inaccessible.

 	 * @throws IllegalArgumentException

 	 * 	If one of the following occurs:

diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/PojoMerge.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/PojoMerge.java
index 14dc91b..a307b1c 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/PojoMerge.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/PojoMerge.java
@@ -67,10 +67,10 @@
  * 	<li>
  * 		Null POJOs are ignored.
  * 	<li>
- * 		Non-getter methods are either invoked on the first POJO or all POJOs depending on the <code>callAllNonGetters</code> flag
+ * 		Non-getter methods are either invoked on the first POJO or all POJOs depending on the <c>callAllNonGetters</c> flag
  * 		passed into the constructor.
  * 	<li>
- * 		For purposes of this interface, a getter is any method with zero arguments and a non-<code>void</code> return type.
+ * 		For purposes of this interface, a getter is any method with zero arguments and a non-<c>void</c> return type.
  * </ul>
  */
 public class PojoMerge {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/PojoRest.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/PojoRest.java
index 2b7162a..6228427 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/PojoRest.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/PojoRest.java
@@ -169,7 +169,7 @@
 	}

 

 	/**

-	 * Call this method to prevent the root object from being overwritten on <code>put("", xxx);</code> calls.

+	 * Call this method to prevent the root object from being overwritten on <c>put("", xxx);</c> calls.

 	 *

 	 * @return This object (for method chaining).

 	 */

@@ -281,10 +281,10 @@
 	 * </p>

 	 *

 	 * <p>

-	 * <code>Collection</code> classes are assumed to be followed by zero or one objects indicating the element type.

+	 * <c>Collection</c> classes are assumed to be followed by zero or one objects indicating the element type.

 	 *

 	 * <p>

-	 * <code>Map</code> classes are assumed to be followed by zero or two meta objects indicating the key and value types.

+	 * <c>Map</c> classes are assumed to be followed by zero or two meta objects indicating the key and value types.

 	 *

 	 * <p>

 	 * The array can be arbitrarily long to indicate arbitrarily complex data structures.

@@ -601,7 +601,7 @@
 	 * 	This must be an array, like a JSON array.

 	 * @return The returned object from the method call.

 	 * @throws IllegalAccessException

-	 * 	If the <code>Constructor</code> object enforces Java language access control and the underlying constructor is

+	 * 	If the <c>Constructor</c> object enforces Java language access control and the underlying constructor is

 	 * 	inaccessible.

 	 * @throws IllegalArgumentException

 	 * 	If one of the following occurs:

diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/ProcBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/ProcBuilder.java
index 1a3571a..a4be2b4 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/ProcBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/ProcBuilder.java
@@ -43,7 +43,7 @@
 	 * Creates a process builder with the specified arguments.

 	 *

 	 * <p>

-	 * Equivalent to calling <code>ProcessBuilder.create().command(args);</code>

+	 * Equivalent to calling <c>ProcessBuilder.create().command(args);</c>

 	 *

 	 * @param args The command-line arguments.

 	 * @return A new process builder.

diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/SearchArgs.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/SearchArgs.java
index fdcda4f..345a131 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/SearchArgs.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/SearchArgs.java
@@ -233,7 +233,7 @@
 		 *
 		 * @param limit
 		 * 	The number of rows to return.
-		 * 	If <code>&lt;=0</code>, all rows should be returned.
+		 * 	If <c>&lt;=0</c>, all rows should be returned.
 		 * @return This object (for method chaining).
 		 */
 		public Builder limit(int limit) {
@@ -314,7 +314,7 @@
 	 *
 	 * @return
 	 * 	The zero-indexed row number of the first row to display.
-	 * 	Default is <code>0</code>
+	 * 	Default is <c>0</c>
 	 */
 	public int getPosition() {
 		return position;
@@ -325,7 +325,7 @@
 	 *
 	 * @return
 	 * 	The number of rows to return in the result.
-	 * 	Default is <code>0</code> which means return all rows.
+	 * 	Default is <c>0</c> which means return all rows.
 	 */
 	public int getLimit() {
 		return limit;
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/StringMessage.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/StringMessage.java
index 34a3482..5c42d77 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/StringMessage.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/StringMessage.java
@@ -25,7 +25,7 @@
  *
  * <p>
  * Useful for delayed serialization of arguments for logging.
- * Message string will not be constructed until the <code>toString()</code> method is called.
+ * Message string will not be constructed until the <c>toString()</c> method is called.
  */
 public class StringMessage implements CharSequence, Writable {
 
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/ZipFileList.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/ZipFileList.java
index b6ff14b..b088057 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/ZipFileList.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/ZipFileList.java
@@ -25,7 +25,7 @@
  * serialization time.

  *

  * <p>

- * Generally associated with <code>RestServlets</code> using the <code>responseHandlers</code> annotation so that

+ * Generally associated with <c>RestServlets</c> using the <c>responseHandlers</c> annotation so that

  * REST methods can easily create ZIP file responses by simply returning instances of this class.

  */

 @Response

@@ -45,9 +45,9 @@
 	}

 

 	/**

-	 * Returns the value for the <code>Content-Disposition</code> header.

+	 * Returns the value for the <c>Content-Disposition</c> header.

 	 *

-	 * @return The value for the <code>Content-Disposition</code> header.

+	 * @return The value for the <c>Content-Disposition</c> header.

 	 */

 	@Header("Content-Disposition")

 	public String getContentDisposition() {

diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/Namespace.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/Namespace.java
index 37d1c34..4c04540 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/Namespace.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/Namespace.java
@@ -102,7 +102,7 @@
 	 * <ul>

 	 * 	<li>A {@link Namespace} array

 	 * 	<li>A comma-delimited string with key/value pairs of the form <js>"name:uri"</js>.

-	 * 	<li>A <code>Collection</code> containing any of object that can be passed to {@link #createArray(Object)}.

+	 * 	<li>A <c>Collection</c> containing any of object that can be passed to {@link #createArray(Object)}.

 	 * </ul>

 	 *

 	 * @param o The input.

diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlDocSerializer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlDocSerializer.java
index 2b0426f..34b0882 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlDocSerializer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlDocSerializer.java
@@ -20,9 +20,9 @@
  *

  * <h5 class='topic'>Media types</h5>

  *

- * Handles <code>Accept</code> types:  <code><b>text/xml</b></code>

+ * Handles <c>Accept</c> types:  <bc>text/xml</bc>

  * <p>

- * Produces <code>Content-Type</code> types:  <code><b>text/xml</b></code>

+ * Produces <c>Content-Type</c> types:  <bc>text/xml</bc>

  *

  * <h5 class='topic'>Description</h5>

  *

diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlParser.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlParser.java
index 52a69ae..24450b8 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlParser.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlParser.java
@@ -24,7 +24,7 @@
  *

  * <h5 class='topic'>Media types</h5>

  *

- * Handles <code>Content-Type</code> types:  <code><b>text/xml</b></code>

+ * Handles <c>Content-Type</c> types:  <bc>text/xml</bc>

  *

  * <h5 class='topic'>Description</h5>

  *

@@ -66,7 +66,7 @@
 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"XmlParser.preserveRootElement.b"</js>

-	 * 	<li><b>Data type:</b>  <code>Boolean</code>

+	 * 	<li><b>Data type:</b>  <c>Boolean</c>

 	 * 	<li><b>Default:</b>  <jk>false</jk>

 	 * 	<li><b>Session property:</b>  <jk>false</jk>

 	 * 	<li><b>Methods:</b>

@@ -160,7 +160,7 @@
 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"XmlParser.validating.b"</js>

-	 * 	<li><b>Data type:</b>  <code>Boolean</code>

+	 * 	<li><b>Data type:</b>  <c>Boolean</c>

 	 * 	<li><b>Default:</b>  <jk>false</jk>

 	 * 	<li><b>Session property:</b>  <jk>false</jk>

 	 * 	<li><b>Methods:</b>

diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializer.java
index 106b09e..269a41c 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializer.java
@@ -23,9 +23,9 @@
  *

  * <h5 class='topic'>Media types</h5>

  *

- * Handles <code>Accept</code> types:  <code><b>text/xml</b></code>

+ * Handles <c>Accept</c> types:  <bc>text/xml</bc>

  * <p>

- * Produces <code>Content-Type</code> types:  <code><b>text/xml</b></code>

+ * Produces <c>Content-Type</c> types:  <bc>text/xml</bc>

  *

  * <h5 class='topic'>Description</h5>

  *

@@ -125,7 +125,7 @@
 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"XmlSerializer.addBeanTypes.b"</js>

-	 * 	<li><b>Data type:</b>  <code>Boolean</code>

+	 * 	<li><b>Data type:</b>  <c>Boolean</c>

 	 * 	<li><b>Default:</b>  <jk>false</jk>

 	 * 	<li><b>Session property:</b>  <jk>false</jk>

 	 * 	<li><b>Methods:</b>

@@ -151,7 +151,7 @@
 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"XmlSerializer.addNamespaceUrisToRoot.b"</js>

-	 * 	<li><b>Data type:</b>  <code>Boolean</code>

+	 * 	<li><b>Data type:</b>  <c>Boolean</c>

 	 * 	<li><b>Default:</b>  <jk>false</jk>

 	 * 	<li><b>Session property:</b>  <jk>false</jk>

 	 * 	<li><b>Methods:</b>

@@ -181,7 +181,7 @@
 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"XmlSerializer.autoDetectNamespaces.b"</js>

-	 * 	<li><b>Data type:</b>  <code>Boolean</code>

+	 * 	<li><b>Data type:</b>  <c>Boolean</c>

 	 * 	<li><b>Default:</b>  <jk>true</jk>

 	 * 	<li><b>Session property:</b>  <jk>false</jk>

 	 * 	<li><b>Methods:</b>

@@ -226,7 +226,7 @@
 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"XmlSerializer.defaultNamespace.s"</js>

-	 * 	<li><b>Data type:</b>  <code>String</code> ({@link Namespace})

+	 * 	<li><b>Data type:</b>  <c>String</c> ({@link Namespace})

 	 * 	<li><b>Default:</b>  <js>"juneau: http://www.apache.org/2013/Juneau"</js>

 	 * 	<li><b>Session property:</b>  <jk>false</jk>

 	 * 	<li><b>Methods:</b>

@@ -252,7 +252,7 @@
 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"XmlSerializer.enableNamespaces.b"</js>

-	 * 	<li><b>Data type:</b>  <code>Boolean</code>

+	 * 	<li><b>Data type:</b>  <c>Boolean</c>

 	 * 	<li><b>Default:</b>  <jk>false</jk>

 	 * 	<li><b>Session property:</b>  <jk>false</jk>

 	 * 	<li><b>Methods:</b>

@@ -278,7 +278,7 @@
 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"XmlSerializer.namespaces.ls"</js>

-	 * 	<li><b>Data type:</b>  <code>Set&lt;String&gt;</code> ({@link Namespace})

+	 * 	<li><b>Data type:</b>  <c>Set&lt;String&gt;</c> ({@link Namespace})

 	 * 	<li><b>Default:</b>  empty set

 	 * 	<li><b>Session property:</b>  <jk>false</jk>

 	 * 	<li><b>Methods:</b>

@@ -304,7 +304,7 @@
 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"XmlSerializer.xsNamespace.s"</js>

-	 * 	<li><b>Data type:</b>  <code>String</code> ({@link Namespace})

+	 * 	<li><b>Data type:</b>  <c>String</c> ({@link Namespace})

 	 * 	<li><b>Default:</b>  <js>"xs: http://www.w3.org/2001/XMLSchema"</js>

 	 * 	<li><b>Session property:</b>  <jk>false</jk>

 	 * 	<li><b>Methods:</b>

@@ -315,7 +315,7 @@
 	 *

 	 * <h5 class='section'>Description:</h5>

 	 * <p>

-	 * Specifies the namespace for the <code>XMLSchema</code> namespace, used by the schema generated by the

+	 * Specifies the namespace for the <c>XMLSchema</c> namespace, used by the schema generated by the

 	 * {@link XmlSchemaSerializer} class.

 	 *

 	 * <h5 class='section'>See Also:</h5>

@@ -485,9 +485,9 @@
 	 * @param accept

 	 * 	The accept media types that the serializer can handle.

 	 * 	<p>

-	 * 	Can contain meta-characters per the <code>media-type</code> specification of {@doc RFC2616.section14.1}

+	 * 	Can contain meta-characters per the <c>media-type</c> specification of {@doc RFC2616.section14.1}

 	 * 	<p>

-	 * 	If empty, then assumes the only media type supported is <code>produces</code>.

+	 * 	If empty, then assumes the only media type supported is <c>produces</c>.

 	 * 	<p>

 	 * 	For example, if this serializer produces <js>"application/json"</js> but should handle media types of

 	 * 	<js>"application/json"</js> and <js>"text/json"</js>, then the arguments should be:

@@ -630,7 +630,7 @@
 	 *

 	 * @see #XML_xsNamespace

 	 * @return

-	 * 	The namespace for the <code>XMLSchema</code> namespace, used by the schema generated by the

+	 * 	The namespace for the <c>XMLSchema</c> namespace, used by the schema generated by the

 	 * 	{@link XmlSchemaSerializer} class.

 	 */

 	protected final Namespace getXsNamespace() {

diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializerBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializerBuilder.java
index 76708d6..913586f 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializerBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializerBuilder.java
@@ -225,7 +225,7 @@
 	 * Configuration property:  XMLSchema namespace.
 	 *
 	 * <p>
-	 * Specifies the namespace for the <code>XMLSchema</code> namespace, used by the schema generated by the
+	 * Specifies the namespace for the <c>XMLSchema</c> namespace, used by the schema generated by the
 	 * {@link org.apache.juneau.xmlschema.XmlSchemaSerializer} class.
 	 *
 	 * <h5 class='section'>See Also:</h5>
@@ -246,7 +246,7 @@
 	 * Configuration property:  XMLSchema namespace.
 	 *
 	 * <p>
-	 * Specifies the namespace for the <code>XMLSchema</code> namespace, used by the schema generated by the
+	 * Specifies the namespace for the <c>XMLSchema</c> namespace, used by the schema generated by the
 	 * {@link org.apache.juneau.xmlschema.XmlSchemaSerializer} class.
 	 *
 	 * <h5 class='section'>See Also:</h5>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializerSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializerSession.java
index 1752ce5..cbbab8f 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializerSession.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializerSession.java
@@ -809,7 +809,7 @@
 	 *

 	 * @see XmlSerializer#XML_xsNamespace

 	 * @return

-	 * 	The namespace for the <code>XMLSchema</code> namespace, used by the schema generated by the

+	 * 	The namespace for the <c>XMLSchema</c> namespace, used by the schema generated by the

 	 * 	{@link org.apache.juneau.xmlschema.XmlSchemaSerializer} class.

 	 */

 	protected final Namespace getXsNamespace() {

diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlUtils.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlUtils.java
index 1de8644..4aed29a 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlUtils.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlUtils.java
@@ -33,7 +33,7 @@
 	//-----------------------------------------------------------------------------------------------------------------

 

 	/**

-	 * Encodes any invalid XML element name characters to <code>_x####_</code> sequences.

+	 * Encodes any invalid XML element name characters to <c>_x####_</c> sequences.

 	 *

 	 * @param w The writer to send the output to.

 	 * @param o The object being encoded.

@@ -55,7 +55,7 @@
 	}

 

 	/**

-	 * Encodes any invalid XML element name characters to <code>_x####_</code> sequences.

+	 * Encodes any invalid XML element name characters to <c>_x####_</c> sequences.

 	 *

 	 * @param o The object being encoded.

 	 * @return The encoded element name string.

@@ -129,7 +129,7 @@
 	//-----------------------------------------------------------------------------------------------------------------

 

 	/**

-	 * Escapes invalid XML text characters to <code>_x####_</code> sequences.

+	 * Escapes invalid XML text characters to <c>_x####_</c> sequences.

 	 *

 	 * @param o The object being encoded.

 	 * @return The encoded string.

@@ -167,10 +167,10 @@
 	 * Encodes the specified element text and sends the results to the specified writer.

 	 *

 	 * <p>

-	 * Encodes any invalid XML text characters to <code>_x####_</code> sequences and sends the response to the specified

+	 * Encodes any invalid XML text characters to <c>_x####_</c> sequences and sends the response to the specified

 	 * writer.

 	 * <br>Encodes <js>'&amp;'</js>, <js>'&lt;'</js>, and <js>'&gt;'</js> as XML entities.

-	 * <br>Encodes invalid XML text characters to <code>_x####_</code> sequences.

+	 * <br>Encodes invalid XML text characters to <c>_x####_</c> sequences.

 	 *

 	 * @param w The writer to send the output to.

 	 * @param o The object being encoded.

@@ -303,10 +303,10 @@
 	 * Encodes the specified attribute value and sends the results to the specified writer.

 	 *

 	 * <p>

-	 * Encodes any invalid XML text characters to <code>_x####_</code> sequences and sends the response to the specified

+	 * Encodes any invalid XML text characters to <c>_x####_</c> sequences and sends the response to the specified

 	 * writer.

 	 * <br>Encodes <js>'&amp;'</js>, <js>'&lt;'</js>, <js>'&gt;'</js>, <js>'"'</js>, and <js>'\''</js> as XML entities.

-	 * <br>Encodes invalid XML text characters to <code>_x####_</code> sequences.

+	 * <br>Encodes invalid XML text characters to <c>_x####_</c> sequences.

 	 *

 	 * @param w The writer to send the output to.

 	 * @param o The object being encoded.

diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlWriter.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlWriter.java
index 5e5996b..f765a94 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlWriter.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlWriter.java
@@ -96,7 +96,7 @@
 	}

 

 	/**

-	 * Shortcut for <code>i(indent).oTag(ns, name, needsEncoding);</code>

+	 * Shortcut for <c>i(indent).oTag(ns, name, needsEncoding);</c>

 	 *

 	 * @param indent The number of prefix tabs to add.

 	 * @param ns The namespace.  Can be <jk>null</jk>.

@@ -218,7 +218,7 @@
 	}

 

 	/**

-	 * Shortcut for <code>i(indent).tag(ns, name, needsEncoding);</code>

+	 * Shortcut for <c>i(indent).tag(ns, name, needsEncoding);</c>

 	 *

 	 * @param indent The number of prefix tabs to add.

 	 * @param ns The namespace.  Can be <jk>null</jk>.

@@ -282,7 +282,7 @@
 	}

 

 	/**

-	 * Shortcut for <code>i(indent).sTag(ns, name, needsEncoding);</code>

+	 * Shortcut for <c>i(indent).sTag(ns, name, needsEncoding);</c>

 	 *

 	 * @param indent The number of prefix tabs to add.

 	 * @param ns The namespace.  Can be <jk>null</jk>.

@@ -365,7 +365,7 @@
 	}

 

 	/**

-	 * Shortcut for <code>i(indent).eTag(ns, name, needsEncoding);</code>

+	 * Shortcut for <c>i(indent).eTag(ns, name, needsEncoding);</c>

 	 *

 	 * @param indent The number of prefix tabs to add.

 	 * @param ns The namespace.  Can be <jk>null</jk>.

@@ -502,7 +502,7 @@
 	 *

 	 * @param ns The namespace.  Can be <jk>null</jk>.

 	 * @param name The attribute name.

-	 * @param value The attribute value, convertible to a URI via <code>toString()</code>

+	 * @param value The attribute value, convertible to a URI via <c>toString()</c>

 	 * @return This object (for method chaining).

 	 * @throws IOException If a problem occurred.

 	 */

@@ -515,7 +515,7 @@
 	 *

 	 * @param ns The namespace.  Can be <jk>null</jk>.

 	 * @param name The attribute name.

-	 * @param value The attribute value, convertible to a URI via <code>toString()</code>

+	 * @param value The attribute value, convertible to a URI via <c>toString()</c>

 	 * @return This object (for method chaining).

 	 * @throws IOException If a problem occurred.

 	 */

@@ -527,7 +527,7 @@
 	 * Append an attribute with a URI value.

 	 *

 	 * @param name The attribute name.

-	 * @param value The attribute value.  Can be any object whose <code>toString()</code> method returns a URI.

+	 * @param value The attribute value.  Can be any object whose <c>toString()</c> method returns a URI.

 	 * @return This object (for method chaining);

 	 * @throws IOException If a problem occurred.

 	 */

diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/annotation/XmlConfig.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/annotation/XmlConfig.java
index 531aa12..1267694 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/annotation/XmlConfig.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/annotation/XmlConfig.java
@@ -331,7 +331,7 @@
 	 * Configuration property:  XMLSchema namespace.
 	 *
 	 * <p>
-	 * Specifies the namespace for the <code>XMLSchema</code> namespace, used by the schema generated by the
+	 * Specifies the namespace for the <c>XMLSchema</c> namespace, used by the schema generated by the
 	 * {@link XmlSchemaSerializer} class.
 	 *
 	 * <h5 class='section'>Notes:</h5>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/annotation/XmlFormat.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/annotation/XmlFormat.java
index 4ea6a8f..db57677 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/annotation/XmlFormat.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/annotation/XmlFormat.java
@@ -35,7 +35,7 @@
 	 * Only applicable for bean properties, not bean classes.

 	 *

 	 * <p>

-	 * Can only be applied to properties (methods/fields) of class types that can be convertible to <code>Strings</code>.

+	 * Can only be applied to properties (methods/fields) of class types that can be convertible to <c>Strings</c>.

 	 */

 	ATTR,

 

@@ -48,8 +48,8 @@
 	 * <p>

 	 * On bean properties, implies that the bean property value itself should be serialized as attributes on the bean

 	 * element.

-	 * The bean property data type must be of class type <code>Map&lt;Object,Object&gt;</code> where both

-	 * objects are convertible to <code>Strings</code>.

+	 * The bean property data type must be of class type <c>Map&lt;Object,Object&gt;</c> where both

+	 * objects are convertible to <c>Strings</c>.

 	 */

 	ATTRS,

 

diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/annotation/XmlSchema.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/annotation/XmlSchema.java
index 6969138..b86fc27 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/annotation/XmlSchema.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/annotation/XmlSchema.java
@@ -56,7 +56,7 @@
 	 *

 	 * <h5 class='section'>Example:</h5>

 	 * <p>

-	 * Contents of <code>package-info.java</code>...

+	 * Contents of <c>package-info.java</c>...

 	 * <p class='bcode w800'>

 	 * 	<jc>// XML namespaces used within this package.</jc>

 	 * 	<ja>@XmlSchema</ja>(prefix=<js>"ab"</js>,

diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xmlschema/XmlSchemaDocSerializer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xmlschema/XmlSchemaDocSerializer.java
index 75037a9..d630c3b 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xmlschema/XmlSchemaDocSerializer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xmlschema/XmlSchemaDocSerializer.java
@@ -21,9 +21,9 @@
  *

  * <h5 class='topic'>Media types</h5>

  *

- * Handles <code>Accept</code> types:  <code><b>text/xml+schema</b></code>

+ * Handles <c>Accept</c> types:  <bc>text/xml+schema</bc>

  * <p>

- * Produces <code>Content-Type</code> types:  <code><b>text/xml</b></code>

+ * Produces <c>Content-Type</c> types:  <bc>text/xml</bc>

  *

  * <h5 class='topic'>Description</h5>

  *

diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xmlschema/XmlSchemaSerializer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xmlschema/XmlSchemaSerializer.java
index 2866450..ac68cdb 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xmlschema/XmlSchemaSerializer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xmlschema/XmlSchemaSerializer.java
@@ -22,9 +22,9 @@
  *

  * <h5 class='topic'>Media types</h5>

  *

- * Handles <code>Accept</code> types:  <code><b>text/xml+schema</b></code>

+ * Handles <c>Accept</c> types:  <bc>text/xml+schema</bc>

  * <p>

- * Produces <code>Content-Type</code> types:  <code><b>text/xml</b></code>

+ * Produces <c>Content-Type</c> types:  <bc>text/xml</bc>

  *

  * <h5 class='topic'>Description</h5>

  *

diff --git a/juneau-core/juneau-svl/.settings/org.eclipse.wst.html.core.prefs b/juneau-core/juneau-svl/.settings/org.eclipse.wst.html.core.prefs
index f70192e..7de0d38 100644
--- a/juneau-core/juneau-svl/.settings/org.eclipse.wst.html.core.prefs
+++ b/juneau-core/juneau-svl/.settings/org.eclipse.wst.html.core.prefs
@@ -32,7 +32,7 @@
 elemUnclosedStartTag=1
 elemUnknownName=2
 elemUnnecessaryEnd=2
-elementNamesToIgnore=jc,jd,jt,jk,js,jf,jsf,jsm,ja,xt,xa,xc,xs,xv,ua,uk,un,us,mk,mv,cc,cs,ck,cv,l,property
+elementNamesToIgnore=bc,c,cc,ci,ck,cs,cv,dc,del,ja,jc,jd,jf,jk,joc,jok,jov,js,jsf,jsm,jt,l,mk,mv,ua,uk,un,us,xa,xc,xs,xt,xv
 ignoreAttrNames=false
 ignoreElementNames=true
 piInvalidContent=2
diff --git a/juneau-doc/.settings/org.eclipse.wst.html.core.prefs b/juneau-doc/.settings/org.eclipse.wst.html.core.prefs
index 8850c6c..4a6a46f 100644
--- a/juneau-doc/.settings/org.eclipse.wst.html.core.prefs
+++ b/juneau-doc/.settings/org.eclipse.wst.html.core.prefs
@@ -32,7 +32,7 @@
 elemUnclosedStartTag=1
 elemUnknownName=2
 elemUnnecessaryEnd=2
-elementNamesToIgnore=jc,jd,jt,jk,js,jf,jsf,jsm,ja,xt,xa,xc,xs,xv,ua,uk,un,us,mk,mv,cc,cs,ck,cv,l,property,joc,jov,jok,del
+elementNamesToIgnore=bc,c,cc,ci,ck,cs,cv,dc,del,ja,jc,jd,jf,jk,joc,jok,jov,js,jsf,jsm,jt,l,mk,mv,ua,uk,un,us,xa,xc,xs,xt,xv
 ignoreAttrNames=false
 ignoreElementNames=true
 piInvalidContent=2
diff --git a/juneau-doc/docs/ReleaseNotes/5.0.0.00.html b/juneau-doc/docs/ReleaseNotes/5.0.0.00.html
index aa65418..089c012 100644
--- a/juneau-doc/docs/ReleaseNotes/5.0.0.00.html
+++ b/juneau-doc/docs/ReleaseNotes/5.0.0.00.html
@@ -38,16 +38,16 @@
 	</li>
 	<li>
 		Simplified Filter API for handling non-standard POJOs.<br>
-		The API for handling non-standard POJOs has been simplified by introducing the concept of a <code><del>Transform</del></code> class, which is associated with the <code>BeanContext</code> class (and thus the Serializer and Parser classes too) through the <code>BeanContext.addTransforms(Class[])</code> method.<br>
-		Two new subclasses of <code><del>Transform</del></code>:
+		The API for handling non-standard POJOs has been simplified by introducing the concept of a <dc>Transform</dc> class, which is associated with the <c>BeanContext</c> class (and thus the Serializer and Parser classes too) through the <c>BeanContext.addTransforms(Class[])</c> method.<br>
+		Two new subclasses of <dc>Transform</dc>:
 		<ul>
 			<li>{@link oaj.transform.BeanFilter} - Filter POJO beans.</li>
 			<li>{@link oaj.transform.PojoSwap} - Filter POJOs that aren't beans.</li>
 		</ul>
-		This new API replaces the previous separate <code>Cast</code> and <code>BeanFilter</code> APIs which were considerably more complicated and puts them under a common API. 
+		This new API replaces the previous separate <c>Cast</c> and <c>BeanFilter</c> APIs which were considerably more complicated and puts them under a common API. 
 	</li>
 	<li>
-		Elimination of <code>_class</code> attributes in parsable output.<br>
+		Elimination of <c>_class</c> attributes in parsable output.<br>
 		One of the complaints about the previous version of JJSON was that if you wanted to have the resulting JSON or XML be parsable back into beans, you had to enable the <js>"addClassAttrs"</js> property on the bean map factory class so that <js>"_class"</js> attributes could be added to the output.<br>
 		This requirement is virtually eliminated in v5.  In many cases, the parsers are able to determine through reflection what the correct target type is based on the top-level class passed in on the parse method. 
 	</li>
@@ -65,13 +65,13 @@
 				The old XML parser was based on DOM.  The new XML parser uses a StAX parser which significantly reduces memory consumption.
 			</li>
 			<li>
-				Caching of reflection data in the <code>BeanMap</code> API.<br>
-				The number of reflection calls have been significantly reduced in the <code>BeanMap</code> API code.  
+				Caching of reflection data in the <c>BeanMap</c> API.<br>
+				The number of reflection calls have been significantly reduced in the <c>BeanMap</c> API code.  
 				Reflection is used to determine the class types of property values on beans.  
 				This information is now cached and persisted so that the reflection API calls to determine class types are only performed the first time a bean type is encountered.
    				</li>
    				<li>
-				Automatic support for GZIP compression/decompression in <code>RestServlets</code>.<br>
+				Automatic support for GZIP compression/decompression in <c>RestServlets</c>.<br>
 				This is completely transparent to the developer.  
 				The output writer is negotiated by the framework to automatically handle compression and charset requests without the developer needing to know anything about it.
 			</li>
@@ -98,17 +98,17 @@
 			</li>
 			<li>
 				Other improvments have been made in the area of automatic negotiation of input and output type streams.  
-				For example, automatic support is provided for GZIP (<code>Accept-Encoding: gzip</code>) and charsets (e.g <code>Accept-Charset: SJIS</code>) on both incoming and outgoing data.  
+				For example, automatic support is provided for GZIP (<c>Accept-Encoding: gzip</c>) and charsets (e.g <c>Accept-Charset: SJIS</c>) on both incoming and outgoing data.  
 				It's all transparent from a developers perspective.  
 				The developer simply working with POJOs, and all details about content types, encoding, charsets, and so forth are handled by the framework.
 			</li>
 			<li>
-				Support for generating complex <code>OPTIONS</code> pages for resources.
+				Support for generating complex <c>OPTIONS</c> pages for resources.
 			</li>
 		</ul>
 	</li>
 	<li>
-		Automatic support for SOAP XML output on <js>"text/soap+xml"</js> requests against <code>RestServlet</code>.
+		Automatic support for SOAP XML output on <js>"text/soap+xml"</js> requests against <c>RestServlet</c>.
 	</li>
 	<li>
 		Support for XML namespaces. 
@@ -120,10 +120,10 @@
 		Support for loading beans directly from Readers and Strings. 
 	</li>
 	<li>
-		Parsing support for POJOs of type <code>Enum</code>.
+		Parsing support for POJOs of type <c>Enum</c>.
 	</li>
 		<li>
-		Significant improved support for various flavors of parameterized types, such as subclasses of parameterized types (e.g. <code>MyBeanList <jk>extends</jk> LinkedList&lt;MyBean&gt;</code>).
+		Significant improved support for various flavors of parameterized types, such as subclasses of parameterized types (e.g. <c>MyBeanList <jk>extends</jk> LinkedList&lt;MyBean&gt;</c>).
 		</li>
 		<li>
 		Improved ordering of bean properties (should now be ordered as they are defined in the class).
diff --git a/juneau-doc/docs/ReleaseNotes/5.0.0.02.html b/juneau-doc/docs/ReleaseNotes/5.0.0.02.html
index 68bb1ea..b010aa2 100644
--- a/juneau-doc/docs/ReleaseNotes/5.0.0.02.html
+++ b/juneau-doc/docs/ReleaseNotes/5.0.0.02.html
@@ -28,14 +28,14 @@
 		Support for defining default XML namespaces on packages and classes for the XML and RDF serializers.
 	</li>
 	<li>
-		Restructured the packages along content type support (e.g. all JSON support moved to <code>org.apache.juneau.json</code>).
+		Restructured the packages along content type support (e.g. all JSON support moved to <c>org.apache.juneau.json</c>).
 	</li>
 	<li>
-		Automatic support for parsing maps with <code>Enum</code> keys, and parsing <code>Enum</code> strings.<br>
+		Automatic support for parsing maps with <c>Enum</c> keys, and parsing <c>Enum</c> strings.<br>
 		This was previously possible using filters, but now it's built-in for all the parsers.
 	</li>
 	<li> 
-		Replaced the <code>ObjectList.toXArray()</code> methods with a new <code>elements(Class&lt;T&gt; type)</code> method that's more efficient and avoids creating an unnecessary array.
+		Replaced the <c>ObjectList.toXArray()</c> methods with a new <c>elements(Class&lt;T&gt; type)</c> method that's more efficient and avoids creating an unnecessary array.
 	</li>
 	<li> 
 		Support for parsing into beans with read-only properties.<br>
diff --git a/juneau-doc/docs/ReleaseNotes/5.0.0.04.html b/juneau-doc/docs/ReleaseNotes/5.0.0.04.html
index 4bb7a6f..7752b17 100644
--- a/juneau-doc/docs/ReleaseNotes/5.0.0.04.html
+++ b/juneau-doc/docs/ReleaseNotes/5.0.0.04.html
@@ -25,7 +25,7 @@
 		See {@link oajr.RestServlet} for more information.
 	</li>
 	<li>
-		Enhancements to <code><del>BeanContext.convertToType(Object,Class)</del></code> to be able to convert <code>Strings</code> to classes with 
-		<code>fromString(String)</code>/<code>valueOf(String)</code> static methods or <code>T(String)</code> constructors.
+		Enhancements to <dc>BeanContext.convertToType(Object,Class)</dc> to be able to convert <c>Strings</c> to classes with 
+		<c>fromString(String)</c>/<c>valueOf(String)</c> static methods or <c>T(String)</c> constructors.
 	</li>	
 </ul>
diff --git a/juneau-doc/docs/ReleaseNotes/5.0.0.05.html b/juneau-doc/docs/ReleaseNotes/5.0.0.05.html
index d0d922f..2b37c61 100644
--- a/juneau-doc/docs/ReleaseNotes/5.0.0.05.html
+++ b/juneau-doc/docs/ReleaseNotes/5.0.0.05.html
@@ -19,10 +19,10 @@
 	Juno 5.0.0.5 is a major update.
 </p>
 <ul class='spaced-list'>
-	<li>New <code><ja>@RestChild</ja></code> annotation for identifying child resources.</li>
+	<li>New <c><ja>@RestChild</ja></c> annotation for identifying child resources.</li>
 	<li>
-		New <code>traversable</code> and <code>filterable</code> attributes added to {@link oajr.annotation.RestMethod @RestMethod} annotation.<br>
-		Eliminates the need for <code>PojoResource</code> and <code>FilteredRestResource</code> classes.
+		New <c>traversable</c> and <c>filterable</c> attributes added to {@link oajr.annotation.RestMethod @RestMethod} annotation.<br>
+		Eliminates the need for <c>PojoResource</c> and <c>FilteredRestResource</c> classes.
 	</li>
 	<li>Simplified client API.  Easier to use when making multiple connections to the same server.</li>
 	<li>Support for pluggable authentication in the client API.</li>
@@ -31,11 +31,11 @@
 	<li>Support for parsing of header values into specific object types.</li>
 	<li>Changed default XML representation to not include JSON-type attributes.  Produces cleaner XML.</li>
 	<li>
-		New <code>resourceUri</code> attributed added to <ja>@Bean</ja> annotation to associate beans with resource URIs.
+		New <c>resourceUri</c> attributed added to <ja>@Bean</ja> annotation to associate beans with resource URIs.
 		<ul>
 			<li>Used for automatically creating hyperlinks in {@link oaj.html.HtmlSerializer}.</li>
 			<li>Used for automatically creating <xa>uri</xa> attributes in {@link oaj.xml.XmlSerializer}.</li>
-			<li>Used for automatically creating <xa>rdf:about</xa> attributes in <code>RdfXmlSerializer</code>.</li>
+			<li>Used for automatically creating <xa>rdf:about</xa> attributes in <c>RdfXmlSerializer</c>.</li>
 		</ul>
 	</li>	
 </ul>
diff --git a/juneau-doc/docs/ReleaseNotes/5.0.0.07.html b/juneau-doc/docs/ReleaseNotes/5.0.0.07.html
index 2c73fd7..6a82ac3 100644
--- a/juneau-doc/docs/ReleaseNotes/5.0.0.07.html
+++ b/juneau-doc/docs/ReleaseNotes/5.0.0.07.html
@@ -45,15 +45,15 @@
 				Also allows you to collapse collections and arrays.
 			</li>
 			<li>
-				New <code>@Xml.namespaces</code> annotation.<br>
+				New <c>@Xml.namespaces</c> annotation.<br>
 				Namespaces can be defined at package, class, method, or field levels.
 			</li>
 			<li>
-				New <code>@Xml.nsUri</code> annotation.<br>
+				New <c>@Xml.nsUri</c> annotation.<br>
 				Shortcut for specifying namespace URIs.
 			</li>
 			<li>
-				New <code>@Xml.valAttr</code> annotation.<br>
+				New <c>@Xml.valAttr</c> annotation.<br>
 			Serializes a bean property value as an attribute.
 			</li>
 			<li>Ability to override XS and XSI namespaces on XML and RDF/XML serializers.</li>
@@ -65,33 +65,33 @@
 		New configurable property classes for everything are now structured better and easier to locate and identify through the following new classes:
 		<ul>
 			<li>{@link oaj.BeanContext}</li>
-			<li><code><del>SerializerContext</del></code></li>
-			<li><code><del>ParserContext</del></code></li>
+			<li><dc>SerializerContext</dc></li>
+			<li><dc>ParserContext</dc></li>
 		</ul>		
 	</li>
 	<li>
 		Enhancements to {@link oaj.BeanContext}:
 		<ul>
 			<li>
-				Ability to mark bean properties as hidden using <code>@BeanProperty(hidden)</code> so that they don't get serialized.
+				Ability to mark bean properties as hidden using <c>@BeanProperty(hidden)</c> so that they don't get serialized.
 			</li>
 			<li>
-				Simplified <code>ClassType</code> {@link oaj.ClassMeta} API.<br>
+				Simplified <c>ClassType</c> {@link oaj.ClassMeta} API.<br>
 				Combined 4 classes into a single class.
 			</li>
 			<li>
-				New <code><del>@Bean.filter</del></code> and <code><del>@BeanProperty.filter</del></code> annotations.<br>
-				Used for defining filters on bean classes and bean properties instead of just globally through <code>BeanContext.addTransforms(Class[])</code>.
+				New <dc>@Bean.filter</dc> and <dc>@BeanProperty.filter</dc> annotations.<br>
+				Used for defining filters on bean classes and bean properties instead of just globally through <c>BeanContext.addTransforms(Class[])</c>.
 			</li>
 			<li>
 				New {@link oaj.PropertyNamer} API / {@link oaj.annotation.Bean#propertyNamer() @Bean.propertyNamer} annotation.<br>
 				Used for customizing bean property names.
 			</li>
 			<li>
-				New <code><del>@BeanProperty.beanUri</del></code> and <code><del>@BeanProperty.id</del></code> annotations.<br>
+				New <dc>@BeanProperty.beanUri</dc> and <dc>@BeanProperty.id</dc> annotations.<br>
 				Used for associating beans with URLs and IDs.<br>
 				Used by XML serializer to add a url attribute on a bean element.<br>
-				Used by RDF/XML serializer to construct <code>rdf:resource</code> attributes.
+				Used by RDF/XML serializer to construct <c>rdf:resource</c> attributes.
 			</li>
 			<li>
 				New {@link oaj.annotation.BeanProperty#properties() @BeanProperty(properties)} annotation.
@@ -122,13 +122,13 @@
 <h5 class='topic w800'>REST server updates</h5>
 <ul class='spaced-list'>
 		<li>
-		Support for overriding bean context and serializer properties in a REST method call through new <code><del>RestResponse.setProperty(String,Object)</del></code> method.<br>
+		Support for overriding bean context and serializer properties in a REST method call through new <dc>RestResponse.setProperty(String,Object)</dc> method.<br>
 		For example, allows you to control whitespace options on a per-request basis.
 	</li>
 	<li>
 		Several new annotations on REST servlets:
 		<ul>
-			<li><code>@RestResource(filters)</code> - Associate post-formatting filters on a resource level.</li>
+			<li><c>@RestResource(filters)</c> - Associate post-formatting filters on a resource level.</li>
 			<li>{@link oajr.annotation.RestResource#guards() @RestResource.guards} - Associate resource-level guards.</li>
 			<li>{@link oajr.annotation.RestResource#messages() @RestResource.messages} - Associate a resource bundle with a REST servlet.  Comes with several convenience methods for looking up messages for the client locale.</li>
 			<li>{@link oajr.annotation.RestResource#properties() @RestResource.properties} - Override default bean context, serializer, and parser properties though an annotation.</li>
@@ -137,18 +137,18 @@
 	<li>
 		Several new annotations on REST methods:
 		<ul>
-			<li><code>@RestMethod(filters)</code> - Associate post-formatting filters on a method level.</li>
+			<li><c>@RestMethod(filters)</c> - Associate post-formatting filters on a method level.</li>
 			<li>{@link oajr.annotation.RestMethod#guards() @RestMethod(guards)} - Associate method-level guards.</li>
 		</ul>
 	</li>
 	<li>				
 		New annotations on REST method parameters with automatic conversion:
 		<ul>
-			<li><code><del>@Attr</del></code> - A parameter or URL variable value as a parsed POJO.</li>
-			<li><code><del>@Param</del></code> - A query parameter value as a parsed POJO.</li>
-			<li><code><del>@PathRemainder</del></code>- The remainder after a URL pattern match as a String.</li>
-			<li><code><del>@Header</del></code> - An HTTP header value as a parsed POJO.</li>
-			<li><code><del>@Content</del></code> - The HTTP content as a parsed POJO.</li>
+			<li><dc>@Attr</dc> - A parameter or URL variable value as a parsed POJO.</li>
+			<li><dc>@Param</dc> - A query parameter value as a parsed POJO.</li>
+			<li><dc>@PathRemainder</dc>- The remainder after a URL pattern match as a String.</li>
+			<li><dc>@Header</dc> - An HTTP header value as a parsed POJO.</li>
+			<li><dc>@Content</dc> - The HTTP content as a parsed POJO.</li>
 			<li>{@link oajr.annotation.Method @Method} - The HTTP method name as a String.</li>
 		</ul>
 	</li>
diff --git a/juneau-doc/docs/ReleaseNotes/5.0.0.09.html b/juneau-doc/docs/ReleaseNotes/5.0.0.09.html
index c6c3db7..12aff30 100644
--- a/juneau-doc/docs/ReleaseNotes/5.0.0.09.html
+++ b/juneau-doc/docs/ReleaseNotes/5.0.0.09.html
@@ -31,19 +31,19 @@
 	</li>
 	<li>Support for fluent-style bean setters (setters that return the bean itself).</li>
 	<li>Ability to use {@link oaj.annotation.Bean @Bean} annotation to override bean identification settings.</li>
-	<li>New {@link oaj.ObjectMap#cast(Class)} method to convert <code>ObjectMaps</code> directly to beans.</li>
+	<li>New {@link oaj.ObjectMap#cast(Class)} method to convert <c>ObjectMaps</c> directly to beans.</li>
 </ul>
 <h5 class='topic w800'>REST server API changes</h5>
 <ul class='spaced-list'>
-	<li>Build-in default <code>OPTIONS</code> pages.</li>
+	<li>Build-in default <c>OPTIONS</c> pages.</li>
 	<li>New {@link oajr.annotation.RestResource#defaultRequestHeaders() @RestResource.defaultRequestHeaders} and {@link oajr.annotation.RestResource#defaultResponseHeaders() @RestResource.defaultResponseHeaders} annotations.</li>
 	<li>New {@link oajr.annotation.RestMethod#serializers() @RestMethod(serializers)} and {@link oajr.annotation.RestMethod#parsers() @RestMethod(parsers)} annotations.</li>
 	<li>New {@link oajr.annotation.RestMethod#properties() @RestMethod(properties)} annotation.</li>
 	<li>New {@link oajr.annotation.RestMethod#defaultRequestHeaders() @RestMethod(defaultRequestHeaders)} annotation.</li>
 	<li>New {@link oajr.annotation.RestMethod#matchers() @RestMethod(matchers)} annotation and {@link oajr.RestMatcher} class.</li>
-	<li><code>Readers</code> and <code>InputStreams</code> can be specified on <code><del>@Content</del></code> annotated parameters.</li>
-	<li>New <code><del>@HasParam</del></code> annotation.</li>
-	<li>Full RFC2616 support for matching <code>Accept</code> headers to serializers.</li>		
+	<li><c>Readers</c> and <c>InputStreams</c> can be specified on <dc>@Content</dc> annotated parameters.</li>
+	<li>New <dc>@HasParam</dc> annotation.</li>
+	<li>Full RFC2616 support for matching <c>Accept</c> headers to serializers.</li>		
 </ul>
 <h5 class='topic w800'>Other notes</h5>
 <ul class='spaced-list'>
diff --git a/juneau-doc/docs/ReleaseNotes/5.0.0.10.html b/juneau-doc/docs/ReleaseNotes/5.0.0.10.html
index ccc34f4..67554e5 100644
--- a/juneau-doc/docs/ReleaseNotes/5.0.0.10.html
+++ b/juneau-doc/docs/ReleaseNotes/5.0.0.10.html
@@ -25,12 +25,12 @@
 </ul>
 <h5 class='topic w800'>REST server API changes</h5>
 <ul class='spaced-list'>
-	<li>New <code>RestServletProperties</code> class that defines all the class-level properties that can be set on the servlet.</li>
-	<li>Properties can be set through {@link oajr.annotation.RestResource#properties() @RestResource.properties} annotation, or new <code><del>RestServlet.setProperty(String,Object)</del></code> method.</li>
+	<li>New <c>RestServletProperties</c> class that defines all the class-level properties that can be set on the servlet.</li>
+	<li>Properties can be set through {@link oajr.annotation.RestResource#properties() @RestResource.properties} annotation, or new <dc>RestServlet.setProperty(String,Object)</dc> method.</li>
 	<li>New <js>"?noTrace"</js> URL parameter to prevent stack traces from being logged (for JUnit testing of error conditions).</li>
-	<li>New <code>RestServletProperties.REST_useStackTraceHashes</code> property to prevent the same stack trace from being logged multiple times.</li>
-	<li>New <code>RestServletProperties.REST_renderResponseStackTraces</code> property for preventing stack traces in responses for security reasons.</li>
-	<li>New overridable <code>RestServlet.onError(HttpServletRequest,HttpServletResponse,RestException,boolean)</code> and <code><del>RestServlet.onSuccess(RestRequest,RestResponse,long)</del></code> methods for plugging in your own logging and peformance monitoring.</li>
-	<li>Eliminated <code>RestServlet.getInitParams()</code> method, since it's now redundant with <code><del>RestServlet.getProperties()</del></code>.</li>
+	<li>New <c>RestServletProperties.REST_useStackTraceHashes</c> property to prevent the same stack trace from being logged multiple times.</li>
+	<li>New <c>RestServletProperties.REST_renderResponseStackTraces</c> property for preventing stack traces in responses for security reasons.</li>
+	<li>New overridable <c>RestServlet.onError(HttpServletRequest,HttpServletResponse,RestException,boolean)</c> and <dc>RestServlet.onSuccess(RestRequest,RestResponse,long)</dc> methods for plugging in your own logging and peformance monitoring.</li>
+	<li>Eliminated <c>RestServlet.getInitParams()</c> method, since it's now redundant with <dc>RestServlet.getProperties()</dc>.</li>
 	<li>Header parameters passed as URL parameters are now case-insensitive.</li>			
 </ul>
diff --git a/juneau-doc/docs/ReleaseNotes/5.0.0.11.html b/juneau-doc/docs/ReleaseNotes/5.0.0.11.html
index 986f2ad..9146db0 100644
--- a/juneau-doc/docs/ReleaseNotes/5.0.0.11.html
+++ b/juneau-doc/docs/ReleaseNotes/5.0.0.11.html
@@ -21,13 +21,13 @@
 <h5 class='topic w800'>REST server API changes</h5>
 <ul class='spaced-list'>
 	<li>	
-		New <code>UrlEncodingRestSerializer</code> and <code>UrlEncodingRestParser</code> classes.<br>
+		New <c>UrlEncodingRestSerializer</c> and <c>UrlEncodingRestParser</c> classes.<br>
 		Allows parsing form posts directly to POJOs.
 	</li>
 	<li>
-		Support for <code>Accept</code> and <code>Content-Type</code> <js>"application/x-www-form-urlencoded"</js> added by default on {@link oajr.BasicRestServlet}.
+		Support for <c>Accept</c> and <c>Content-Type</c> <js>"application/x-www-form-urlencoded"</js> added by default on {@link oajr.BasicRestServlet}.
 	</li>
 	<li>
-		New <code><del>RestServlet.renderError(HttpServletRequest,HttpServletResponse,RestException)</del></code> method to allow customized handling of response errors.
+		New <dc>RestServlet.renderError(HttpServletRequest,HttpServletResponse,RestException)</dc> method to allow customized handling of response errors.
 	</li>
 </ul>
diff --git a/juneau-doc/docs/ReleaseNotes/5.0.0.12.html b/juneau-doc/docs/ReleaseNotes/5.0.0.12.html
index 3d5884d..8a81025 100644
--- a/juneau-doc/docs/ReleaseNotes/5.0.0.12.html
+++ b/juneau-doc/docs/ReleaseNotes/5.0.0.12.html
@@ -23,7 +23,7 @@
 	<li>
 		Relaxed method naming conventions when using {@link oaj.annotation.BeanProperty @BeanProperty} annotation.<br>
 		Methods with zero parameters are interpreted as getters, and methods with one parameter are interpreted as setters.<br>
-		Eliminated the <code>BeanProperty.method</code> annotation, since it's now unnecessary.
+		Eliminated the <c>BeanProperty.method</c> annotation, since it's now unnecessary.
 			</li>
 </ul>		
 <h5 class='topic w800'>REST server API changes</h5>
@@ -33,15 +33,15 @@
 		Older messages were rather cryptic.   Error conditions should be much easier to debug now.
 	</li>
 	<li>
-		New <code>PlainTextRestSerializer</code> class for serializing <js>"plain/text"</js> requests.<br>
+		New <c>PlainTextRestSerializer</c> class for serializing <js>"plain/text"</js> requests.<br>
 		Useful for debugging purposes.
 	</li>
    		<li>
-		<code>Readers</code> and <code>InputStreams</code> can now be passed in as <code><del>@Content</del></code> parameters if you need direct access to the HTTP body content without involving the parsers.<br> 
+		<c>Readers</c> and <c>InputStreams</c> can now be passed in as <dc>@Content</dc> parameters if you need direct access to the HTTP body content without involving the parsers.<br> 
 		Equivalent to previously calling {@link oajr.RestRequest#getInputStream()} and {@link oajr.RestRequest#getReader()}.
    		</li>
    		<li>
-		Improved support for the <code>?debug</code> parameter.<br>
+		Improved support for the <c>?debug</c> parameter.<br>
 		Dumps better information to the log file, such as all header parameters.
 	</li>
 </ul>		
diff --git a/juneau-doc/docs/ReleaseNotes/5.0.0.13.html b/juneau-doc/docs/ReleaseNotes/5.0.0.13.html
index ba5cb09..7d94426 100644
--- a/juneau-doc/docs/ReleaseNotes/5.0.0.13.html
+++ b/juneau-doc/docs/ReleaseNotes/5.0.0.13.html
@@ -28,19 +28,19 @@
 		</ul>
 	</li>
 	<li>
-		New <code>SerializerContext.SERIALIZER_uriContext</code> and <code>SerializerContext.SERIALIZER_uriAuthority</code> serializer properties for specifying values for relative URIs.
+		New <c>SerializerContext.SERIALIZER_uriContext</c> and <c>SerializerContext.SERIALIZER_uriAuthority</c> serializer properties for specifying values for relative URIs.
    		</li>
    		<li>
-		New {@link oaj.annotation.URI @URI} annotation that allows you to specify classes and bean properties as URLs that aren't <code>java.net.URI</code> or <code>java.net.URL</code>.
+		New {@link oaj.annotation.URI @URI} annotation that allows you to specify classes and bean properties as URLs that aren't <c>java.net.URI</c> or <c>java.net.URL</c>.
 	</li>
 	<li>
 		New {@link oaj.html.HtmlSerializer#HTML_uriAnchorText} HTML serializer property for tailoring how anchor text is rendered.
 	</li>
 	<li>
-		Renamed <code>BeanProperty#uri</code> annotation to <code>BeanProperty#beanUri</code> to make it clear that this property represents the URI of the bean itself instead of an arbitrary property containing a URI.
+		Renamed <c>BeanProperty#uri</c> annotation to <c>BeanProperty#beanUri</c> to make it clear that this property represents the URI of the bean itself instead of an arbitrary property containing a URI.
    		</li>
    		<li>
-		Removed <code>BeanProperty#id</code> annotation.
+		Removed <c>BeanProperty#id</c> annotation.
 	</li>
 </ul>
 <h5 class='topic w800'>REST server API changes</h5>
@@ -48,12 +48,12 @@
 	<li>
 		Improvements to {@link oajr.RestServlet} to automatically handle relative URIs in POJOs.
 		<ul>
-      			<li><code>SerializerContext.SERIALIZER_uriContext</code> property set by default to web app context root.</li>
-			<li><code>SerializerContext.SERIALIZER_uriAuthority</code> property set by default to the request scheme+hostname+port.</li>
+      			<li><c>SerializerContext.SERIALIZER_uriContext</c> property set by default to web app context root.</li>
+			<li><c>SerializerContext.SERIALIZER_uriAuthority</c> property set by default to the request scheme+hostname+port.</li>
        		</ul>
        	</li>
        	<li>
-		Fixed bug involving <code>Accept-Charset</code> header in Chrome that prevented HTML output from rendering correctly in that browser.<br>
-		<code>Accept-Charset</code> handling should now be fully W3C compliant.
+		Fixed bug involving <c>Accept-Charset</c> header in Chrome that prevented HTML output from rendering correctly in that browser.<br>
+		<c>Accept-Charset</c> handling should now be fully W3C compliant.
 	</li>
 </ul>
diff --git a/juneau-doc/docs/ReleaseNotes/5.0.0.14.html b/juneau-doc/docs/ReleaseNotes/5.0.0.14.html
index ab8e74a..1c7d3cb 100644
--- a/juneau-doc/docs/ReleaseNotes/5.0.0.14.html
+++ b/juneau-doc/docs/ReleaseNotes/5.0.0.14.html
@@ -19,7 +19,7 @@
 	Juno 5.0.0.14 is a major update.
 </p>
 <p>
-	The biggest change is that the <code>RestSerializer</code>, <code>RestParser</code>, <code>RestSerializerGroup</code>, and <code>RestParserGroup</code> classes have been eliminated entirely.<br>  
+	The biggest change is that the <c>RestSerializer</c>, <c>RestParser</c>, <c>RestSerializerGroup</c>, and <c>RestParserGroup</c> classes have been eliminated entirely.<br>  
 	Instead, the existing {@link oaj.serializer.Serializer}, {@link oaj.parser.Parser}, {@link oaj.serializer.SerializerGroup}, and {@link oaj.parser.ParserGroup} classes of the core API have been augmented to replace them.
 </p>
 <p>
@@ -28,17 +28,17 @@
 <h5 class='topic w800'>Core API changes</h5>
 <ul class='spaced-list'>
 	<li>
-		New <code>org.apache.juneau.serializer</code> package.
+		New <c>org.apache.juneau.serializer</c> package.
 		<ul>
 			<li>Entirely reworked class hierarchy to make it easier to define new serializers.</li>
 			<li>New {@link oaj.serializer.WriterSerializer} base class for defining character-based serializers.</li>
 			<li>New {@link oaj.serializer.OutputStreamSerializer} base class for defining byte-based serializers.</li>
-			<li>Updated {@link oaj.serializer.SerializerGroup} class with full support for RFC2616 <code>Accept-Content</code> headers.</li>
+			<li>Updated {@link oaj.serializer.SerializerGroup} class with full support for RFC2616 <c>Accept-Content</c> headers.</li>
 			<li>Improved cloning support on serializers and serializer groups.</li>
 		</ul>
        	</li>
        	<li>
-       		New <code>org.apache.juneau.parser</code> package.
+       		New <c>org.apache.juneau.parser</c> package.
        		<ul>
        			<li>Entirely reworked class hierarchy to make it easier to define new parsers.</li>
 			<li>New {@link oaj.parser.ReaderParser} base class for defining character-based parsers.</li>
@@ -47,38 +47,38 @@
        		</ul>
        	</li>
        	<li>
-		New <code>org.apache.juneau.transform</code> package.
+		New <c>org.apache.juneau.transform</c> package.
 		<ul>
 			<li>Cleaner class structure.</li>
 			<li>Improved {@link oaj.transform.BeanFilter} class for defining property filters on beans.</li>
-			<li>Improved {@link oaj.utils.PojoQuery} class for defining filters on objects (previously called <code>ObjectFilter</code>).</li>
+			<li>Improved {@link oaj.utils.PojoQuery} class for defining filters on objects (previously called <c>ObjectFilter</c>).</li>
        		</ul>
        	</li>
        	<li>
-		New <code>org.apache.juneau.encoders</code> package.
+		New <c>org.apache.juneau.encoders</c> package.
 		<ul>
 			<li>Defines API for {@link oaj.encoders.Encoder Encoders} for enabling compression in REST servlets and clients.</li>
 			<li>Previously, gzip compression was enabled by default.  This new API allows you to plug in your own compression algorithms.</li>
 			<li>New {@link oaj.encoders.GzipEncoder} class for enabling gzip compression.</li>
-			<li>New {@link oaj.encoders.EncoderGroup} class for managing multiple encoders and finding them based on RFC2616 <code>Accept-Encoding</code> header values.</li>
+			<li>New {@link oaj.encoders.EncoderGroup} class for managing multiple encoders and finding them based on RFC2616 <c>Accept-Encoding</c> header values.</li>
 		</ul>
 	</li>
 	<li>
-		New <code>org.apache.juneau.plaintext</code> package.
+		New <c>org.apache.juneau.plaintext</c> package.
 		<ul>
 			<li>New {@link oaj.plaintext.PlainTextSerializer} and {@link oaj.plaintext.PlainTextParser} classes for serializing/parsing text/plain content.</li>
 		</ul>
 	</li>
 	<li>
-		New <code>org.apache.juneau.jso</code> package.
+		New <c>org.apache.juneau.jso</c> package.
 		<ul>
-			<li>New {@link oaj.jso.JsoSerializer} class for serializing <code>application/x-java-serialized-object</code> content.</li>
+			<li>New {@link oaj.jso.JsoSerializer} class for serializing <c>application/x-java-serialized-object</c> content.</li>
 		</ul>
 	</li>
 	<li>
-		New <code>org.apache.juneau.soap</code> package.
+		New <c>org.apache.juneau.soap</c> package.
 		<ul>
-			<li>New {@link oaj.soap.SoapXmlSerializer} class for serializing <code>text/xml+soap</code> content.</li>
+			<li>New {@link oaj.soap.SoapXmlSerializer} class for serializing <c>text/xml+soap</c> content.</li>
 		</ul>
 	</li>
 	<li>
@@ -88,16 +88,16 @@
 		</ul>
 	</li>
        	<li>
-		<code>JsonMap</code> and <code>JsonList</code> changed to {@link oaj.ObjectMap} and {@link oaj.ObjectList} to better reflect that they're not limited to just JSON support.
+		<c>JsonMap</c> and <c>JsonList</c> changed to {@link oaj.ObjectMap} and {@link oaj.ObjectList} to better reflect that they're not limited to just JSON support.
    		</li>
    		<li>
-		Renamed <code>PojoSwap</code> to {@link oaj.utils.PojoQuery} to not confuse it with the new Filter API.
+		Renamed <c>PojoSwap</c> to {@link oaj.utils.PojoQuery} to not confuse it with the new Filter API.
 	</li>
 </ul>
 <h5 class='topic w800'>REST server API changes</h5>
 <ul class='spaced-list'>
 	<li>
-		Eliminated <code>org.apache.juneau.rest.serializers</code> and <code>org.apache.juneau.rest.parsers</code> packages.
+		Eliminated <c>org.apache.juneau.rest.serializers</c> and <c>org.apache.juneau.rest.parsers</c> packages.
 		<ul>
 			<li>All existing REST serializers and parsers merged into the core API.</li>
 		</ul>
@@ -113,6 +113,6 @@
 		</ul>
 	</li>
 	<li>
-		Eliminated <code>RestCmdLine</code> (since it's essentially redundant with CURL).
+		Eliminated <c>RestCmdLine</c> (since it's essentially redundant with CURL).
 	</li>
 </ul>
diff --git a/juneau-doc/docs/ReleaseNotes/5.0.0.15.html b/juneau-doc/docs/ReleaseNotes/5.0.0.15.html
index 421d0b9..e6b634c 100644
--- a/juneau-doc/docs/ReleaseNotes/5.0.0.15.html
+++ b/juneau-doc/docs/ReleaseNotes/5.0.0.15.html
@@ -24,11 +24,11 @@
 		Refer to <del>org.apache.juneau.rest.jaxrs</del> for information.
 	</li>
 	<li>
-		New <code><del>@Produces</del></code> annotation in place of <code>ISerializer.getMediaTypes()</code> for specifying what media types a serializer produces.<br>
+		New <dc>@Produces</dc> annotation in place of <c>ISerializer.getMediaTypes()</c> for specifying what media types a serializer produces.<br>
 		Available when subclassing from {@link oaj.serializer.Serializer}.
 	</li>
 	<li>
-		New <code><del>@Consumes</del></code> annotation in place of <code>IParser.getMediaTypes()</code> for specifying what media types a parser consumes.<br>
+		New <dc>@Consumes</dc> annotation in place of <c>IParser.getMediaTypes()</c> for specifying what media types a parser consumes.<br>
 		Available when subclassing from {@link oaj.parser.Parser}.
 	</li>
 </ul>
diff --git a/juneau-doc/docs/ReleaseNotes/5.0.0.16.html b/juneau-doc/docs/ReleaseNotes/5.0.0.16.html
index 6151029..b6dfe34 100644
--- a/juneau-doc/docs/ReleaseNotes/5.0.0.16.html
+++ b/juneau-doc/docs/ReleaseNotes/5.0.0.16.html
@@ -20,6 +20,6 @@
 </p>
 <ul class='spaced-list'>
 	<li>
-		New <code><del>@Properties</del></code> REST method parameter annotation that can be used to get the runtime properties map through a parameter instead of through {@link oajr.RestResponse}. 
+		New <dc>@Properties</dc> REST method parameter annotation that can be used to get the runtime properties map through a parameter instead of through {@link oajr.RestResponse}. 
 	</li>
 </ul>
diff --git a/juneau-doc/docs/ReleaseNotes/5.0.0.17.html b/juneau-doc/docs/ReleaseNotes/5.0.0.17.html
index 8dd1390..2ec8630 100644
--- a/juneau-doc/docs/ReleaseNotes/5.0.0.17.html
+++ b/juneau-doc/docs/ReleaseNotes/5.0.0.17.html
@@ -20,6 +20,6 @@
 </p>
 <ul class='spaced-list'>
 	<li>
-		Charset now passed as a parameter to <code>IOutputStreamSerializer.serialize()</code> and <code>IInputStreamParser.parse()</code>. 
+		Charset now passed as a parameter to <c>IOutputStreamSerializer.serialize()</c> and <c>IInputStreamParser.parse()</c>. 
 	</li>
 </ul>
diff --git a/juneau-doc/docs/ReleaseNotes/5.0.0.18.html b/juneau-doc/docs/ReleaseNotes/5.0.0.18.html
index ca0c8bf..b473ded 100644
--- a/juneau-doc/docs/ReleaseNotes/5.0.0.18.html
+++ b/juneau-doc/docs/ReleaseNotes/5.0.0.18.html
@@ -23,10 +23,10 @@
 </p>
 <p>
 	This code should be considered prototype-quality, and subject to change in the future.<br>  
-	There are plans of adding an equivalent <code>RdfParser</code> class in the future, so the serializer logic may need to be tweaked to allow POJOs to be reconstituted correctly in the parser.
+	There are plans of adding an equivalent <c>RdfParser</c> class in the future, so the serializer logic may need to be tweaked to allow POJOs to be reconstituted correctly in the parser.
 </p>
 <p>
-	The <code>RdfXmlSerializer</code> class should be considered deprecated for now.<br>  
+	The <c>RdfXmlSerializer</c> class should be considered deprecated for now.<br>  
 	However, I'm keeping it around, since it's considerably faster and uses far less memory than the Jena-based serializer since it serializes directly from POJOs to RDF/XML.<br> 
 	It may or may not be removed in the future depending on demand.
 </p>
diff --git a/juneau-doc/docs/ReleaseNotes/5.0.0.19.html b/juneau-doc/docs/ReleaseNotes/5.0.0.19.html
index 14e21f0..e33f879 100644
--- a/juneau-doc/docs/ReleaseNotes/5.0.0.19.html
+++ b/juneau-doc/docs/ReleaseNotes/5.0.0.19.html
@@ -22,12 +22,12 @@
 	<li>
 		New methods on {@link oajr.RestServlet}:
 		<ul>
-			<li><code><del>RestServlet.onPreCall(RestRequest)</del></code></li>
-			<li><code><del>RestServlet.onPostCall(RestRequest,RestResponse)</del></code></li>
+			<li><dc>RestServlet.onPreCall(RestRequest)</dc></li>
+			<li><dc>RestServlet.onPostCall(RestRequest,RestResponse)</dc></li>
 		</ul>
 	</li>
 	<li>
-		<jsf>TRIM_NULLS</jsf> setting changed to <code><del>SerializerContext.SERIALIZER_trimNullProperties</del></code>.<br>
+		<jsf>TRIM_NULLS</jsf> setting changed to <dc>SerializerContext.SERIALIZER_trimNullProperties</dc>.<br>
 		New property default is <jk>true</jk>. 
 		Only applies to bean properties, not map or collection entries.
 	</li>
diff --git a/juneau-doc/docs/ReleaseNotes/5.0.0.20.html b/juneau-doc/docs/ReleaseNotes/5.0.0.20.html
index 5315441..f88a7b8 100644
--- a/juneau-doc/docs/ReleaseNotes/5.0.0.20.html
+++ b/juneau-doc/docs/ReleaseNotes/5.0.0.20.html
@@ -28,8 +28,8 @@
 		New Jena-based {@link oaj.jena.RdfParser} for parsing RDF/XML, RDF/XML-ABBREV, N3, Turtle, and N-Triple back into POJOs.
 	</li>
 	<li>
-		<code><del>XmlSerializerContext.XML_autoDetectNamespaces</del></code> default changed to <jk>true</jk>.<br>
-		The old default value would cause XML with unmapped namespaces if you didn't manually specify them via the <code><del>XmlSerializerContext.XML_namespaces</del></code> annotation.<br>
+		<dc>XmlSerializerContext.XML_autoDetectNamespaces</dc> default changed to <jk>true</jk>.<br>
+		The old default value would cause XML with unmapped namespaces if you didn't manually specify them via the <dc>XmlSerializerContext.XML_namespaces</dc> annotation.<br>
 		While setting the default to <jk>true</jk> is somewhat slower (since the serializer must crawl the POJO tree to find namespaces), the benefits of having it work out-of-the-box outweighs the performance concerns.<br>
 		For developers concerned about performance, they can always change it back to false and specify the namespaces themselves.	
 	</li>
@@ -44,36 +44,36 @@
 		Enhancements to {@link oajr.annotation.RestMethod @RestMethod} annotation:
 		<ul>
 			<li>
-				New <code>RestMethod.filters()</code> annotation for defining POJO filters at the method level.
+				New <c>RestMethod.filters()</c> annotation for defining POJO filters at the method level.
 			</li>
 			<li>
-				New <code><del>RestMethod.serializersInherit()</del></code> and <code><del>RestMethod.parsersInherit()</del></code> annotations for controlling how serializers and parsers (and associated filters and properties) are inherited from the class.<br>
-				This replaces the previous <code>addSerializers</code> and <code>addParsers</code> annotations.
+				New <dc>RestMethod.serializersInherit()</dc> and <dc>RestMethod.parsersInherit()</dc> annotations for controlling how serializers and parsers (and associated filters and properties) are inherited from the class.<br>
+				This replaces the previous <c>addSerializers</c> and <c>addParsers</c> annotations.
 		</ul>
 	</li>
 	<li>
-		New <code><del>RestServletJenaDefault</del></code> servlet that includes serialization/parsing support for all Jena-based serializers and parsers.
+		New <dc>RestServletJenaDefault</dc> servlet that includes serialization/parsing support for all Jena-based serializers and parsers.
 	</li>
 	<li>
-		New <code><del>DefaultJenaProvider</del></code> JAX-RS provider that includes serialization/parsing support for all Jena-based serializers and parsers.
+		New <dc>DefaultJenaProvider</dc> JAX-RS provider that includes serialization/parsing support for all Jena-based serializers and parsers.
 	</li>
 	<li>
-		Eliminated <code>RestServletChild</code> class.<br>  
+		Eliminated <c>RestServletChild</c> class.<br>  
 		It's redundant with the introduction of inheritable annotations.
 	</li>
 	<li>
 		New methods on {@link oajr.RestServlet}:
 		<ul>
-			<li><code>RestServlet.createConfigFactory()</code></li>
-			<li><code>RestServlet.createSerializers()</code></li>
-			<li><code>RestServlet.createParsers()</code></li>
+			<li><c>RestServlet.createConfigFactory()</c></li>
+			<li><c>RestServlet.createSerializers()</c></li>
+			<li><c>RestServlet.createParsers()</c></li>
 		</ul>
-		These augment the existing <code>getBeanContext()</code> / <code>getSerializers()</code> / <code>getParsers()</code> methods.		
+		These augment the existing <c>getBeanContext()</c> / <c>getSerializers()</c> / <c>getParsers()</c> methods.		
 	</li>
 </ul>
 <h5 class='topic w800'>REST client API changes</h5>
 <ul class='spaced-list'>
 	<li>
-		New <code>RestCall.setDateHeader(String,Object)</code> method for setting ISO8601 datetime headers.
+		New <c>RestCall.setDateHeader(String,Object)</c> method for setting ISO8601 datetime headers.
 	</li>
 </ul>
diff --git a/juneau-doc/docs/ReleaseNotes/5.0.0.21.html b/juneau-doc/docs/ReleaseNotes/5.0.0.21.html
index 7947f8d..4d06c32 100644
--- a/juneau-doc/docs/ReleaseNotes/5.0.0.21.html
+++ b/juneau-doc/docs/ReleaseNotes/5.0.0.21.html
@@ -21,27 +21,27 @@
 <h5 class='topic w800'>Core API changes</h5>
 <ul class='spaced-list'>
 	<li>
-		New <code><del>HtmlDocSerializerContext.HTMLDOC_navlinks</del></code> annotation for addint links to HTML page views.
+		New <dc>HtmlDocSerializerContext.HTMLDOC_navlinks</dc> annotation for addint links to HTML page views.
 	</li>
 	<li>
-		Renamed the properties in <code><del>HtmlDocSerializerContext</del></code> for clarity.
+		Renamed the properties in <dc>HtmlDocSerializerContext</dc> for clarity.
 	</li>
 </ul>		
 <h5 class='topic w800'>Servlet API changes</h5>
 <ul class='spaced-list'>
 	<li>
-		Added new <code>RestServlet.addDefaultProperties(ObjectMap,RestRequest)</code> method for programatically adding properties to the property map per request.
+		Added new <c>RestServlet.addDefaultProperties(ObjectMap,RestRequest)</c> method for programatically adding properties to the property map per request.
 	</li>
 	<li>
 		Added the following new properties in the properties map to make them easily available to serializers and parsers (since they don't have access to the HTTP request object).<br>  
-		Note that the <code>SerializerContext.SERIALIZER_uriAuthority</code> and <code>SerializerContext.SERIALIZER_uriContext</code> properties were previously available.
+		Note that the <c>SerializerContext.SERIALIZER_uriAuthority</c> and <c>SerializerContext.SERIALIZER_uriContext</c> properties were previously available.
 		<ul>
-			<li><code>RestServletProperties.REST_servletPath</code></li>
-			<li><code>RestServletProperties.REST_pathInfo</code></li>
-			<li><code>RestServletProperties.REST_method</code></li>
+			<li><c>RestServletProperties.REST_servletPath</c></li>
+			<li><c>RestServletProperties.REST_pathInfo</c></li>
+			<li><c>RestServletProperties.REST_method</c></li>
 		</ul>
 	</li>
 	<li>
-		Path variables annotated with <code><del>@Attr</del></code> are now automatically URL-decoded.
+		Path variables annotated with <dc>@Attr</dc> are now automatically URL-decoded.
 	</li>
 </ul>		
diff --git a/juneau-doc/docs/ReleaseNotes/5.0.0.22.html b/juneau-doc/docs/ReleaseNotes/5.0.0.22.html
index c50706b..dd560c1 100644
--- a/juneau-doc/docs/ReleaseNotes/5.0.0.22.html
+++ b/juneau-doc/docs/ReleaseNotes/5.0.0.22.html
@@ -21,12 +21,12 @@
 <h5 class='topic w800'>Core API changes</h5>
 <ul class='spaced-list'>
 	<li>
-    	New <code><ja>@Property</ja>.nls()</code> annotation for specifying localized property values.<br>
+    	New <c><ja>@Property</ja>.nls()</c> annotation for specifying localized property values.<br>
     	For example, allows you to set the <jsf>HTMLDOC_title</jsf> and <jsf>HTMLDOC_description</jsf> properties to localized values pulled from a resource bundle.<br>
-    	See the <code>AddressBookResource</code> class for an example.
+    	See the <c>AddressBookResource</c> class for an example.
     </li>
 </ul>
 <h5 class='topic w800'>REST Servlet API changes</h5>
 <ul class='spaced-list'>
-	<li>Fix a bug where the <code>&amp;Content</code> query parameter was not always parsed correctly.</li>
+	<li>Fix a bug where the <c>&amp;Content</c> query parameter was not always parsed correctly.</li>
 </ul>
diff --git a/juneau-doc/docs/ReleaseNotes/5.0.0.23.html b/juneau-doc/docs/ReleaseNotes/5.0.0.23.html
index 70aeb2c..1653ae3 100644
--- a/juneau-doc/docs/ReleaseNotes/5.0.0.23.html
+++ b/juneau-doc/docs/ReleaseNotes/5.0.0.23.html
@@ -23,7 +23,7 @@
 		Simplified {@link oaj.dto.cognos Cognos} support.
 	</li>
 	<li>
-		Fixed bug where <code><ja>@Xml</ja></code> annotation was not being inherited by inner classes.
+		Fixed bug where <c><ja>@Xml</ja></c> annotation was not being inherited by inner classes.
 	</li>
 	<li>
 		Javadoc stylesheet improvements.
diff --git a/juneau-doc/docs/ReleaseNotes/5.0.0.24.html b/juneau-doc/docs/ReleaseNotes/5.0.0.24.html
index 6ee0341..fc71f96 100644
--- a/juneau-doc/docs/ReleaseNotes/5.0.0.24.html
+++ b/juneau-doc/docs/ReleaseNotes/5.0.0.24.html
@@ -23,15 +23,15 @@
 	<li>
 		New support for {@link oaj.dto.atom ATOM}.
 		<ul>
-			<li>New <code>AtomFeedResource</code> class added to sample war.
+			<li>New <c>AtomFeedResource</c> class added to sample war.
 		</ul>
 	</li>
 	<li>
-		New <code><del>XmlFormat.CONTENT</del></code> enum value.<br>
+		New <dc>XmlFormat.CONTENT</dc> enum value.<br>
 		Allows bean properties to be persisted as XML element text.
 	</li>
 	<li>
-		New <code><del>XmlContentHandler</del></code> class and <code><del>@Xml.contentHandler</del></code> annotation.<br>
+		New <dc>XmlContentHandler</dc> class and <dc>@Xml.contentHandler</dc> annotation.<br>
 		Allows customized serialization and parsing of beans to XML element text.<br>
 		Added for support of ATOM text content that must support both plain text and embedded XHTML.
 	</li>
@@ -39,13 +39,13 @@
 		New {@link oaj.xml.annotation.XmlSchema @XmlSchema} and updated {@link oaj.xml.annotation.XmlNs @XmlNs} annotations to better mimic JAXB.
 	</li>
 	<li>
-		Removed <code><ja>@Xml</ja>.valAttr</code> annotation since it's now redundant with <code><ja>@Xml</ja>(format=<jsf>CONTENT</jsf>)</code>.
+		Removed <c><ja>@Xml</ja>.valAttr</c> annotation since it's now redundant with <c><ja>@Xml</ja>(format=<jsf>CONTENT</jsf>)</c>.
 		</li>
 		<li>
 		Fixed timezone bug in {@link oaj.transforms.CalendarSwap}.
 	</li>
 		<li>
-		Simplified <code>Serializer.serialize(Object,Object,SerializerContext)</code> method.
+		Simplified <c>Serializer.serialize(Object,Object,SerializerContext)</c> method.
 	</li>
 	<li>
 		Fixed bug where lists returned by {@link oaj.ObjectMap#getObjectList(String)} were not updatable.
diff --git a/juneau-doc/docs/ReleaseNotes/5.0.0.25.html b/juneau-doc/docs/ReleaseNotes/5.0.0.25.html
index c6575b9..fb29cbe 100644
--- a/juneau-doc/docs/ReleaseNotes/5.0.0.25.html
+++ b/juneau-doc/docs/ReleaseNotes/5.0.0.25.html
@@ -24,7 +24,7 @@
 		New {@link oaj.dto.ResultSetList} DTO for serializing SQL result sets to JSON/XML/HTML and so forth.
 	</li>
 	<li>
-		New <code>SqlQueryResource</code> class in the sample war for demonstrating the <code>ResultSetList</code> DTO.
+		New <c>SqlQueryResource</c> class in the sample war for demonstrating the <c>ResultSetList</c> DTO.
 	</li>
 </ul>
 <h5 class='topic w800'>Server API updates</h5>
@@ -33,9 +33,9 @@
 		Fixed issue with media type for CSS files being reported as <js>"text/plain"</js> instead of <js>"text/css"</js>.
 	</li>
 	<li>
-		Moved initialization of class properties to before the call to <code>Servlet.init()</code> so that <code>getProperties()</code> can be called during servlet initialization.
+		Moved initialization of class properties to before the call to <c>Servlet.init()</c> so that <c>getProperties()</c> can be called during servlet initialization.
 	</li>
    		<li>
-  			New <code><ja>@Property</ja>.type</code> annotation with support for using system properties as resource properties.
+  			New <c><ja>@Property</ja>.type</c> annotation with support for using system properties as resource properties.
   		</li>
 </ul>		
diff --git a/juneau-doc/docs/ReleaseNotes/5.0.0.26.html b/juneau-doc/docs/ReleaseNotes/5.0.0.26.html
index 90aa709..8f7c781 100644
--- a/juneau-doc/docs/ReleaseNotes/5.0.0.26.html
+++ b/juneau-doc/docs/ReleaseNotes/5.0.0.26.html
@@ -28,9 +28,9 @@
 		Child resource paths are specified through {@link oajr.annotation.RestResource#path() @RestResource(path)}.
    		</li>
    		<li>
-   			New <code><del>ChildResourceDescriptions</del></code> bean for automatically generating the contents of router resource pages.
+   			New <dc>ChildResourceDescriptions</dc> bean for automatically generating the contents of router resource pages.
    		</li>
    		<li>
-		Changed <code><ja>@RestMethod</ja>.pattern()</code> to {@link oajr.annotation.RestMethod#path() @RestMethod(path)} for naming consistency.
+		Changed <c><ja>@RestMethod</ja>.pattern()</c> to {@link oajr.annotation.RestMethod#path() @RestMethod(path)} for naming consistency.
 	</li>
 </ul>
diff --git a/juneau-doc/docs/ReleaseNotes/5.0.0.27.html b/juneau-doc/docs/ReleaseNotes/5.0.0.27.html
index 3ea06cc..044ace1 100644
--- a/juneau-doc/docs/ReleaseNotes/5.0.0.27.html
+++ b/juneau-doc/docs/ReleaseNotes/5.0.0.27.html
@@ -26,7 +26,7 @@
   			{@link oajr.BasicRestServlet} now includes {@link oaj.plaintext.PlainTextSerializer} and {@link oaj.plaintext.PlainTextParser} for plain-text support.
   		</li>
   		<li>
-		Child resources now render on default <code>OPTIONS</code> pages through new method <code><del>ResourceOptions.getChildren()</del></code>.
+		Child resources now render on default <c>OPTIONS</c> pages through new method <dc>ResourceOptions.getChildren()</dc>.
 	</li>
 	<li>
 		Changes to {@link oaj.urlencoding.UrlEncodingSerializer}/{@link oaj.urlencoding.UrlEncodingParser} to reduce the need for quoted string values.<br>
diff --git a/juneau-doc/docs/ReleaseNotes/5.0.0.28.html b/juneau-doc/docs/ReleaseNotes/5.0.0.28.html
index d95f607..5fc654b 100644
--- a/juneau-doc/docs/ReleaseNotes/5.0.0.28.html
+++ b/juneau-doc/docs/ReleaseNotes/5.0.0.28.html
@@ -20,10 +20,10 @@
 </p>
 <ul class='spaced-list'>
 	<li>
-		Fixes an <code>OutOfMemoryError</code> and performance issue caused by incorrect caching of class metadata. 
+		Fixes an <c>OutOfMemoryError</c> and performance issue caused by incorrect caching of class metadata. 
 	</li>
 	<li>
-		Added <code>WriterSerializer.serialize(Object,Writer)</code> convenience method for serializing directly to a writer.<br> 
+		Added <c>WriterSerializer.serialize(Object,Writer)</c> convenience method for serializing directly to a writer.<br> 
 		Applies to all serializers.
 	</li>
 </ul>
diff --git a/juneau-doc/docs/ReleaseNotes/5.0.0.29.html b/juneau-doc/docs/ReleaseNotes/5.0.0.29.html
index 3e78355..2342b66 100644
--- a/juneau-doc/docs/ReleaseNotes/5.0.0.29.html
+++ b/juneau-doc/docs/ReleaseNotes/5.0.0.29.html
@@ -23,8 +23,8 @@
 		Revamped the API for filter support:
 		<ul>
 			<li>Updated {@link oaj.transform.BeanFilter} class to mirror the {@link oaj.annotation.Bean @Bean} annotation.</li>
-			<li>Introduced support for bean <code><del>Bean.subTypeProperty() subtypes</del></code>. </li>
-			<li>Replaced <code><ja>@Bean</ja>(filter=xxx)</code> with new <code><del>@Transform</del></code> annotation.</li>
+			<li>Introduced support for bean <dc>Bean.subTypeProperty() subtypes</dc>. </li>
+			<li>Replaced <c><ja>@Bean</ja>(filter=xxx)</c> with new <dc>@Transform</dc> annotation.</li>
 		</ul>
 	</li>
 	<li>
@@ -42,8 +42,8 @@
 	<li>
 		New predefined DateFilters with millisecond precision:
 		<ul>
-			<li><code>org.apache.juneau.transforms.DateSwap.ISO8601DTP</code></li>
-			<li><code>org.apache.juneau.transforms.DateSwap.ISO8601DTZP</code></li>
+			<li><c>org.apache.juneau.transforms.DateSwap.ISO8601DTP</c></li>
+			<li><c>org.apache.juneau.transforms.DateSwap.ISO8601DTZP</c></li>
 		</ul>
 	</li>
 </ul>		
diff --git a/juneau-doc/docs/ReleaseNotes/5.0.0.30.html b/juneau-doc/docs/ReleaseNotes/5.0.0.30.html
index 9aeea00..2f71da3 100644
--- a/juneau-doc/docs/ReleaseNotes/5.0.0.30.html
+++ b/juneau-doc/docs/ReleaseNotes/5.0.0.30.html
@@ -20,7 +20,7 @@
 </p>
 <ul class='spaced-list'>
 	<li> 
-		Fixed bug involving beans using <code><del>Bean.subTypes()</del></code> annotation in addition to <code>subTypes</code> property.
+		Fixed bug involving beans using <dc>Bean.subTypes()</dc> annotation in addition to <c>subTypes</c> property.
 	</li>
 	<li>
 		Modified the JSON parser to handle non-existent JSON values to get around an issue where Cognos was generating invalid JSON.
diff --git a/juneau-doc/docs/ReleaseNotes/5.0.0.32.html b/juneau-doc/docs/ReleaseNotes/5.0.0.32.html
index eb734e0..8193bb4 100644
--- a/juneau-doc/docs/ReleaseNotes/5.0.0.32.html
+++ b/juneau-doc/docs/ReleaseNotes/5.0.0.32.html
@@ -21,21 +21,21 @@
 <ul class='spaced-list'>
 	<li>
 		New support for generating and consuming fully-compliant JSON-Schema documents.<br>
-		See <code><del>org.apache.juneau.dto.jsonschema</del></code> for information.
+		See <dc>org.apache.juneau.dto.jsonschema</dc> for information.
 	</li>
 	<li>
 		New methods added to {@link oaj.parser.Parser}:
 		<ul>
-			<li><code>org.apache.juneau.parser.Parser.parseMap(Object,int,Class,Class,Class)</code></li>
-			<li><code>org.apache.juneau.parser.Parser.parseCollection(Object,int,Class,Class)</code></li>
+			<li><c>org.apache.juneau.parser.Parser.parseMap(Object,int,Class,Class,Class)</c></li>
+			<li><c>org.apache.juneau.parser.Parser.parseCollection(Object,int,Class,Class)</c></li>
 		</ul>
 	</li>
 		<li>
 		{@link oaj.annotation.Bean @Bean} annotation can now be defined on interfaces and inherited by subclasses.
 	</li>
 	<li>
-			Support for customizing serialized values for <code>Enums</code> through overriding <code>toString()</code> and <code>fromString()</code> on the enum class.<br>
-		Previously used <code>Enum.valueOf()</code> to convert strings back into <code>Enums</code>.<br>
+			Support for customizing serialized values for <c>Enums</c> through overriding <c>toString()</c> and <c>fromString()</c> on the enum class.<br>
+		Previously used <c>Enum.valueOf()</c> to convert strings back into <c>Enums</c>.<br>
 		Used for JSON-Schema support to allow {@link oaj.dto.jsonschema.JsonType} enum to be serialized to lowercase per the specification (e.g. <js>"string"</js> instead of <js>"STRING"</js>).
 		</li>
 		<li>
@@ -44,18 +44,18 @@
 		<li>
 		Support for generic bean objects whose type was erased at compile time.<br> 
 		Previous behavior gave you an error message that the type could not be determined.<br>
-		New behavior assumes a type of <code>Object</code> when the type is erased.
+		New behavior assumes a type of <c>Object</c> when the type is erased.
 		</li>
 		<li>
 			Bug fixes:
 			<ul>
 				<li>
-				When duplicate fluent-style setters were defined with different parameter types (e.g. <code>setFoo(Foo f)</code>, <code>setFoo(Bar b)</code>), the {@link oaj.BeanMap} API would sometime choose the wrong setter as the bean property setter. <br>
+				When duplicate fluent-style setters were defined with different parameter types (e.g. <c>setFoo(Foo f)</c>, <c>setFoo(Bar b)</c>), the {@link oaj.BeanMap} API would sometime choose the wrong setter as the bean property setter. <br>
 				Now validates that the setter being chosen is the one whose return type matches the property getter.
 			</li>
 			<li>
-				Passing in <code>Accept</code> GET parameters with <js>'+'</js> (e.g. <code>&amp;Accept=text/json+simple</code>) wasn't working anymore.<br>
-				The <code>Accept</code> parameter is supposed to interpret spaces as <js>'+'</js> to allow you to not have to write <code>&amp;Accept=text/json%2Bsimple</code>.
+				Passing in <c>Accept</c> GET parameters with <js>'+'</js> (e.g. <c>&amp;Accept=text/json+simple</c>) wasn't working anymore.<br>
+				The <c>Accept</c> parameter is supposed to interpret spaces as <js>'+'</js> to allow you to not have to write <c>&amp;Accept=text/json%2Bsimple</c>.
 				</li>
 				<li>
 				Parsers would not set bean properties of abstract type {@link java.lang.Number}.<br> 
diff --git a/juneau-doc/docs/ReleaseNotes/5.0.0.33.html b/juneau-doc/docs/ReleaseNotes/5.0.0.33.html
index 079b640..6b2e7cd 100644
--- a/juneau-doc/docs/ReleaseNotes/5.0.0.33.html
+++ b/juneau-doc/docs/ReleaseNotes/5.0.0.33.html
@@ -24,7 +24,7 @@
 		<ul>
 			<li>
 				Many of the examples in the documentation were written as follows, which resulted in "unchecked" compile warnings:<br>
-				<code>WriterSerializer s = <jk>new</jk> JsonSerializer();</code><br>
+				<c>WriterSerializer s = <jk>new</jk> JsonSerializer();</c><br>
 				These compile warnings will now go away.
 			</li>
 		</ul>
@@ -39,36 +39,36 @@
 		</ul>
 	</li>
 	<li>
-		Eliminated <code>addNotBeanClassPatterns(String...)</code> methods throughout API since these are now controlled by {@link oaj.BeanContext#BEAN_notBeanPackages_add} / {@link oaj.BeanContext#BEAN_notBeanPackages_remove} properties.
+		Eliminated <c>addNotBeanClassPatterns(String...)</c> methods throughout API since these are now controlled by {@link oaj.BeanContext#BEAN_notBeanPackages_add} / {@link oaj.BeanContext#BEAN_notBeanPackages_remove} properties.
 	</li>
 	<li>
-		New settings in <code>RestServletProperties</code>.
+		New settings in <c>RestServletProperties</c>.
 		<ul>
-			<li><code>RestServletProperties.REST_trimTrailingUriSlashes</code><br>
-				Also removed <code>RestRequest.getRequestURI(boolean trimTrailingSlashes)</code> method which is now redundant with this property.
-			<li><code>RestServletProperties.REST_pathInfoBlankForNull</code><br>
-				Also removed <code>RestRequest.getPathInfo(boolean returnBlankForNull)</code> method which is now redundant with this property.
+			<li><c>RestServletProperties.REST_trimTrailingUriSlashes</c><br>
+				Also removed <c>RestRequest.getRequestURI(boolean trimTrailingSlashes)</c> method which is now redundant with this property.
+			<li><c>RestServletProperties.REST_pathInfoBlankForNull</c><br>
+				Also removed <c>RestRequest.getPathInfo(boolean returnBlankForNull)</c> method which is now redundant with this property.
 		</ul>
 	</li>
 	<li>
 		New JSON-Schema {@link oaj.dto.jsonschema.JsonSchemaMap} class for supporting linked schemas.
 	</li>
 	<li>
-		Serializers will no longer throw an exception when <code>maxDepth</code> setting is reached, and will instead simply ignore content below the specified depth.<br>
+		Serializers will no longer throw an exception when <c>maxDepth</c> setting is reached, and will instead simply ignore content below the specified depth.<br>
 		While the old behavior was as-designed, the new behavior is more in-line with expected behavior.
 	</li>
 	<li>
 		Added support for HTTP header <js>"X-Response-Headers"</js> to {@link oajr.RestServlet}. <br>
 		Allows you to specify one or more headers that should be returned on the response from the servlet.<br>
-		For example, to get a page to automatically refresh every 1 second, you can append the following to a URL:  <code>?x-response-headers={Refresh=1}</code>
+		For example, to get a page to automatically refresh every 1 second, you can append the following to a URL:  <c>?x-response-headers={Refresh=1}</c>
 	</li>
 	<li>
-		Removed <code>HtmlDocSerializerContext.<jsf>HTML_REFRESH</jsf></code> setting that added a Refresh meta tag to HTML documents, since this can now be controlled through <code>X-Response-Headers</code>.
+		Removed <c>HtmlDocSerializerContext.<jsf>HTML_REFRESH</jsf></c> setting that added a Refresh meta tag to HTML documents, since this can now be controlled through <c>X-Response-Headers</c>.
 	</li>
 	<li>
 		Small improvements to samples.
 		<ul>
-			<li><code>PhotosResource</code> now includes a default entry.
+			<li><c>PhotosResource</c> now includes a default entry.
 		</ul>
 	</li>
 </ul>
diff --git a/juneau-doc/docs/ReleaseNotes/5.0.0.34.html b/juneau-doc/docs/ReleaseNotes/5.0.0.34.html
index 972162d..f44d9b0 100644
--- a/juneau-doc/docs/ReleaseNotes/5.0.0.34.html
+++ b/juneau-doc/docs/ReleaseNotes/5.0.0.34.html
@@ -34,7 +34,7 @@
 		}
 	)
 		</p>
-		See <code>RestServlet.createRequestVarResolver(RestRequest)</code> for more information.
+		See <c>RestServlet.createRequestVarResolver(RestRequest)</c> for more information.
 	</li>
 	<li>
 		 Eliminated <ja>@Property.type</ja> annotation which was the old way of specifying NLS variables that got resolved at runtime.
@@ -42,42 +42,42 @@
 	<li>
 		New methods on {@link oajr.RestRequest}:
 		<ul>
-			<li><code><del>RestRequest.getVarResolver()</del></code></li>
-			<li><code><del>RestRequest.getServletURI()</del></code></li>
-			<li><code><del>RestRequest.getRequestParentURI()</del></code></li>
+			<li><dc>RestRequest.getVarResolver()</dc></li>
+			<li><dc>RestRequest.getServletURI()</dc></li>
+			<li><dc>RestRequest.getRequestParentURI()</dc></li>
 		</ul>
 	</li>
 	<li>
 		New methods on {@link oajr.RestResponse}:
 		<ul>
-			<li><code>RestResponse.sendRedirect(CharSequence)</code>
+			<li><c>RestResponse.sendRedirect(CharSequence)</c>
 		</ul>
 	</li>
 	<li>
 		New methods on {@link oajr.RestServlet} that allow easier customization by subclasses:
 		<ul>
-			<li><code><del>RestServlet.createConfigFactory()</del></code></li>
-			<li><code><del>RestServlet.createConverters()</del></code></li>
-			<li><code><del>RestServlet.createDefaultRequestHeaders()</del></code></li>
-			<li><code><del>RestServlet.createDefaultResponseHeaders()</del></code></li>
-			<li><code><del>RestServlet.createEncoders()</del></code></li>
-			<li><code><del>RestServlet.createFilters()</del></code></li>
-			<li><code><del>RestServlet.createGuards()</del></code></li>
-			<li><code><del>RestServlet.createMimetypesFileTypeMap()</del></code></li>
-			<li><code><del>RestServlet.createParsers()</del></code></li>
-			<li><code><del>RestServlet.createProperties()</del></code></li>
-			<li><code><del>RestServlet.createRequestProperties(ObjectMap,RestRequest)</del></code></li>
-			<li><code><del>RestServlet.createRequestVarResolver(RestRequest)</del></code></li>
-			<li><code><del>RestServlet.createSerializers()</del></code></li>
-			<li><code><del>RestServlet.createUrlEncodingParser()</del></code></li>
+			<li><dc>RestServlet.createConfigFactory()</dc></li>
+			<li><dc>RestServlet.createConverters()</dc></li>
+			<li><dc>RestServlet.createDefaultRequestHeaders()</dc></li>
+			<li><dc>RestServlet.createDefaultResponseHeaders()</dc></li>
+			<li><dc>RestServlet.createEncoders()</dc></li>
+			<li><dc>RestServlet.createFilters()</dc></li>
+			<li><dc>RestServlet.createGuards()</dc></li>
+			<li><dc>RestServlet.createMimetypesFileTypeMap()</dc></li>
+			<li><dc>RestServlet.createParsers()</dc></li>
+			<li><dc>RestServlet.createProperties()</dc></li>
+			<li><dc>RestServlet.createRequestProperties(ObjectMap,RestRequest)</dc></li>
+			<li><dc>RestServlet.createRequestVarResolver(RestRequest)</dc></li>
+			<li><dc>RestServlet.createSerializers()</dc></li>
+			<li><dc>RestServlet.createUrlEncodingParser()</dc></li>
 		</ul>
 	</li>
 	<li>
-		Changed <code>RestServletNls</code> to use <code>ResourceDescription/MethodDescription</code>
-			instead of <code>RestResource/RestMethod</code>
+		Changed <c>RestServletNls</c> to use <c>ResourceDescription/MethodDescription</c>
+			instead of <c>RestResource/RestMethod</c>
 	</li>
 	<li>
-		New property <code>RestServletProperties.REST_htDocsFolder</code>.<br>
+		New property <c>RestServletProperties.REST_htDocsFolder</c>.<br>
 		New support for serving up static documents from classpath through REST interface.
 	</li>
 	<li>
@@ -87,12 +87,12 @@
 		New {@link oaj.annotation.Bean#stopClass @Bean.stopClass} annotation for specifying stop classes for bean properties.
 	</li>
 	<li>
-		New <code><del>BeanFilter.setStopClass(Class)</del></code> which is the program equivalent to the annotation above.
+		New <dc>BeanFilter.setStopClass(Class)</dc> which is the program equivalent to the annotation above.
 	</li>
 	<li>
 		New methods on {@link oaj.dto.ResultSetList}:
 		<ul>
-			<li><code>ResultSetList.handleBlob(Blob)</code></li>
-			<li><code>ResultSetList.handleClob(Clob)</code></li>
+			<li><c>ResultSetList.handleBlob(Blob)</c></li>
+			<li><c>ResultSetList.handleClob(Clob)</c></li>
 		</ul>
 </ul>	
diff --git a/juneau-doc/docs/ReleaseNotes/5.0.0.36.html b/juneau-doc/docs/ReleaseNotes/5.0.0.36.html
index 2cb2847..c3bd263 100644
--- a/juneau-doc/docs/ReleaseNotes/5.0.0.36.html
+++ b/juneau-doc/docs/ReleaseNotes/5.0.0.36.html
@@ -19,13 +19,13 @@
 	Juno 5.0.0.36 is a minor update.
 </p>
 <ul class='spaced-list'>
-	<li>Implemented <code>org.apache.juneau.urlencoding.UrlEncodingParser.parseArgs(Reader,int,ClassMeta[])</code>.
-	<li><code>name</code> parameter of <code><del>ResourceDescription#ResourceDescription(String,String,String)</del></code>. 
+	<li>Implemented <c>org.apache.juneau.urlencoding.UrlEncodingParser.parseArgs(Reader,int,ClassMeta[])</c>.
+	<li><c>name</c> parameter of <dc>ResourceDescription#ResourceDescription(String,String,String)</dc>. 
 		is now automatically URL-encoded so that the name can contain special characters (e.g. <js>"foo/bar(baz)"</js>).
 	<li>Support for URL-matching and path info containing encoded characters (e.g. <js>'/'</js>) now supported.	
 	<li>Removed some lazy-initialization of bean information in {@link oaj.ClassMeta} that allowed the removal of
 		some synchronized blocks.
-	<li>Improved support of <code><del>BeanContext.getClassMetaFromString(String)</del></code>.
+	<li>Improved support of <dc>BeanContext.getClassMetaFromString(String)</dc>.
 		Now supports primitive arrays such as <js>"long[]"</js> in addition to the previous support for the equivalent <js>"[J"</js>.
 	<li>Various new convenience methods added to {@link oaj.internal.StringUtils} and {@link oaj.internal.ClassUtils}.
 </ul>	
diff --git a/juneau-doc/docs/ReleaseNotes/5.1.0.00.html b/juneau-doc/docs/ReleaseNotes/5.1.0.00.html
index 98a8969..41d92b7 100644
--- a/juneau-doc/docs/ReleaseNotes/5.1.0.00.html
+++ b/juneau-doc/docs/ReleaseNotes/5.1.0.00.html
@@ -21,47 +21,47 @@
 <h5 class='topic w800'>Major changes</h5>
 <ul class='spaced-list'>
 	<li>Brand new REST client API that uses Apache HttpClient for HTTP communication.<br>
-		The new client API is simply a thin layer on top of <code>HttpClient</code> that performs 
+		The new client API is simply a thin layer on top of <c>HttpClient</c> that performs 
 		serialization and parsing using Juno parsers, but leaves all the details of the HTTP connection
 		to the Apache code. <br>
 		See the <del>org.apache.juneau.rest.client</del> package for details.
-	<li>New <code>org.apache.juneau.rest.client.jazz</code> package and <code>org.apache.juneau.rest.client.jazz.JazzRestClient</code> class
+	<li>New <c>org.apache.juneau.rest.client.jazz</c> package and <c>org.apache.juneau.rest.client.jazz.JazzRestClient</c> class
 		for performing REST operations against Jazz servers.<br>
 		Includes improved support for FORM authentication, and better SSL certificate validation.
 	<li>Completely redesigned URL-Encoding support.<br>
-		See <code><del>org.apache.juneau.urlencoding</del></code> package for details. 
+		See <dc>org.apache.juneau.urlencoding</dc> package for details. 
 	<li>Changes to Parser API.
 	<ul>
-		<li>Removal of <code>ExtendedReaderParser</code> abstract class and moved methods into 
+		<li>Removal of <c>ExtendedReaderParser</c> abstract class and moved methods into 
 			{@link oaj.parser.ReaderParser} class.  
-		<li>Removal of <code>DataFormat</code> class from API since it was no longer necessary
+		<li>Removal of <c>DataFormat</c> class from API since it was no longer necessary
 			due to API change above.
-		<li>Removal of <code>ParserStringReader</code> class.<br>
-			This was a reader optimized to work with <code>String</code> input.<br>
+		<li>Removal of <c>ParserStringReader</c> class.<br>
+			This was a reader optimized to work with <c>String</c> input.<br>
 			However, it could interfere with garbage collection of the original string object.<br>
 			Instead, the existing {@link oaj.parser.ParserReader} was enhanced to work
-			well with <code>String</code> input, and tests show no significant performance differences.
-		<li>New <code>org.apache.juneau.parser.Parser.parse(Object,int,ClassMeta)</code> convenience method added.
+			well with <c>String</c> input, and tests show no significant performance differences.
+		<li>New <c>org.apache.juneau.parser.Parser.parse(Object,int,ClassMeta)</c> convenience method added.
 	</ul>
 </ul>	
 <h5 class='topic w800'>Other changes</h5>
 <ul class='spaced-list'>
 	<li>Various new methods added to {@link oaj.internal.StringUtils} and {@link oaj.internal.ClassUtils}.
-	<li>Improved support on <code><del>BeanContext.getClassMetaFromString(String)</del></code>.<br>
-		Now supports resolving <code>"long[]"</code>, and so forth.
-	<li><code><del>ResourceDescription</del></code> name parameter is now automatically URL-encoded in links.
+	<li>Improved support on <dc>BeanContext.getClassMetaFromString(String)</dc>.<br>
+		Now supports resolving <c>"long[]"</c>, and so forth.
+	<li><dc>ResourceDescription</dc> name parameter is now automatically URL-encoded in links.
 	<li>{@link oajr.RestRequest} now correctly handles cases involving URL-encoded characters in the 
-		path info portion of URLs (e.g. <code>http://host/contextRoot/foo%2Fbar</code>).
+		path info portion of URLs (e.g. <c>http://host/contextRoot/foo%2Fbar</c>).
 	<li>Removed lazy-initialization that required locking in {@link oaj.ClassMeta}.  
-	<li>New <code>BeanContext.setDefaultParser(ReaderParser)</code> method added for specifying 
-		a default parser to use in a bean context (used when converting beans to <code>Strings</code> using 
-		<code><del>BeanContext.convertToType(Object,Class)</del></code>.
+	<li>New <c>BeanContext.setDefaultParser(ReaderParser)</c> method added for specifying 
+		a default parser to use in a bean context (used when converting beans to <c>Strings</c> using 
+		<dc>BeanContext.convertToType(Object,Class)</dc>.
 		Old behavior simply used the default JSON serializer in these cases.
 	<li>More consistent handling of exceptions across all parsers.
 	<li>Minor changes to {@link oajr.RestRequest} class.
 	<ul>
-		<li>Changed the order of parameters on <code><del>RestRequest#getParameter(String,Class)</del></code>.
-		<li>Added <code>RestRequest.getMapParameter(String,Class,Class,Class)</code> and 
-			<code>RestRequest.getCollectionParameter(String,Class,Class)}</code> methods.
+		<li>Changed the order of parameters on <dc>RestRequest#getParameter(String,Class)</dc>.
+		<li>Added <c>RestRequest.getMapParameter(String,Class,Class,Class)</c> and 
+			<c>RestRequest.getCollectionParameter(String,Class,Class)}</c> methods.
 	</ul>
 </ul>
diff --git a/juneau-doc/docs/ReleaseNotes/5.1.0.01.html b/juneau-doc/docs/ReleaseNotes/5.1.0.01.html
index dcd222c..0a98370 100644
--- a/juneau-doc/docs/ReleaseNotes/5.1.0.01.html
+++ b/juneau-doc/docs/ReleaseNotes/5.1.0.01.html
@@ -27,6 +27,6 @@
 	<li>Fixed bug involving incorrect resolution of overlapping URL match patterns.
 	<li>Overall improvements in HTTP request parameter and header value resolution.  
 	<li>Made workspace changes so as not to be dependent on the WAS test environment being loaded.
-	<li>Renamed <ja>@Remainder</ja> annotation to <code><del>@PathRemainder</del></code>.
-	<li>Fixed bug involving incorrect calculation of <code>pathInfo</code> on child resources.
+	<li>Renamed <ja>@Remainder</ja> annotation to <dc>@PathRemainder</dc>.
+	<li>Fixed bug involving incorrect calculation of <c>pathInfo</c> on child resources.
 </ul>	
diff --git a/juneau-doc/docs/ReleaseNotes/5.1.0.02.html b/juneau-doc/docs/ReleaseNotes/5.1.0.02.html
index fdaa233..04667da 100644
--- a/juneau-doc/docs/ReleaseNotes/5.1.0.02.html
+++ b/juneau-doc/docs/ReleaseNotes/5.1.0.02.html
@@ -19,9 +19,9 @@
 	Juno 5.1.0.2 is a minor update.
 </p>
 <ul class='spaced-list'>
-	<li>Fixed issue preventing <code>&amp;Accept-Language</code> from being used as a GET parameter.  
+	<li>Fixed issue preventing <c>&amp;Accept-Language</c> from being used as a GET parameter.  
 	<li>Minor XSS vulnerability fix.
 	<li>Empty results on HTML pages now shows <js>"no results"</js> instead of a blank page.
 	<li>Fixed issues preventing REST pages from rendering HTML in newer versions of Internet Explorer.
-	<li>Changed <code>RestServletProperties.REST_allowMethodParam</code> to be disabled by default.  
+	<li>Changed <c>RestServletProperties.REST_allowMethodParam</c> to be disabled by default.  
 </ul>
diff --git a/juneau-doc/docs/ReleaseNotes/5.1.0.03.html b/juneau-doc/docs/ReleaseNotes/5.1.0.03.html
index 9475ce9..8b9d01e 100644
--- a/juneau-doc/docs/ReleaseNotes/5.1.0.03.html
+++ b/juneau-doc/docs/ReleaseNotes/5.1.0.03.html
@@ -28,16 +28,16 @@
 			<li>{@link oaj.BeanContext#BEAN_beanFieldVisibility} - Control which fields are visible to Juno as bean properties.
 			<li>{@link oaj.BeanContext#BEAN_beanMethodVisibility} - Control which getters/setters are visible to Juno as bean properties.
 		</ul>
-		Removed <code>BeanContext.<jsf>INCLUDE_BEAN_FIELD_PROPERTIES</jsf></code> and <code>BeanContext.<jsf>INCLUDE_BEAN_METHOD_PROPERTIES</jsf></code> properties, since ignoring fields and methods
+		Removed <c>BeanContext.<jsf>INCLUDE_BEAN_FIELD_PROPERTIES</jsf></c> and <c>BeanContext.<jsf>INCLUDE_BEAN_METHOD_PROPERTIES</jsf></c> properties, since ignoring fields and methods
 		can be accomplished by setting the appropriate properties above to {@link oaj.Visibility#NONE NONE}.
 		Also, the {@link oaj.annotation.BeanProperty @BeanProperty} annotation can now be used on non-public fields/getters/setters to override
-		the default behavior defined by the <code>VISIBILITY</code> properties identified above.  This is a convenient way of identifying protected or
+		the default behavior defined by the <c>VISIBILITY</c> properties identified above.  This is a convenient way of identifying protected or
 		private fields or methods as bean properties.  Previously, you could only identify public fields/getters/setters using this annotation.
 	</li>
-	<li>New {@link oaj.BeanContext#BEAN_useJavaBeanIntrospector} property that lets Juno use the Java bean <code>Introspector</code>
+	<li>New {@link oaj.BeanContext#BEAN_useJavaBeanIntrospector} property that lets Juno use the Java bean <c>Introspector</c>
 		class to determine bean properties.  In the previous release, the method for determining bean properties was a mixture of Juno-based and Introspector-based.
 		Now it's either pure Juno-based or pure Introspector-based.  The result is considerably cleaner code and consistent behavior.
-	<li>New {@link oaj.annotation.BeanIgnore @BeanIgnore} annotation.  Replaces the previous <code><ja>@BeanProperty</ja>(hidden=<jk>true</jk>)</code> annotation
+	<li>New {@link oaj.annotation.BeanIgnore @BeanIgnore} annotation.  Replaces the previous <c><ja>@BeanProperty</ja>(hidden=<jk>true</jk>)</c> annotation
 		for ignoring bean properties.  Can also be used on classes that look like beans so that they're not treated as beans.
 	<li>Support for parsing into non-static member classes.  This applies to all parsers.
 	<li>New {@link oaj.json.annotation.Json#wrapperAttr() @Json(wrapperAttr)}	annotation that automatically wraps beans and objects in a wrapper
@@ -45,11 +45,11 @@
 	<li>Changed the default ordering of bean properties to be in parent-to-child class order.
 	<li>New {@link oaj.transform.BeanFilter#readProperty(Object,String,Object) readProperty()} and {@link oaj.transform.BeanFilter#writeProperty(Object,String,Object) writeProperty()}
 		methods added to {@link oaj.transform.BeanFilter} class to allow individualized serialization and parsing behavior on a class-by-class basis.
-	<li>Eliminated previous restriction where bean subtype attributes had to be listed first in JSON objects when using the <code><del>Bean.subTypeProperty()</del></code> annotation.
+	<li>Eliminated previous restriction where bean subtype attributes had to be listed first in JSON objects when using the <dc>Bean.subTypeProperty()</dc> annotation.
 		The previous behavior was not strictly JSON-compliant since JSON objects are supposed to consist of unordered lists of key/value pairs.
 		While targeted for JSON, the restriction is also lifted for all other parsers.  	
 	<li>New fluent-style {@link oaj.BeanMap#load(String) BeanMap.load()} methods for initializing bean maps.
-	<li>{@link oaj.html.HtmlDocSerializer} will now embed the data portion of the output in a <code><xt>&lt;div</xt> <xa>id</xa>=<xs>'data'</xs><xt>&gt;</xt></code> element to make it easier to extract the data portion of the page in Javascript in browsers.
+	<li>{@link oaj.html.HtmlDocSerializer} will now embed the data portion of the output in a <c><xt>&lt;div</xt> <xa>id</xa>=<xs>'data'</xs><xt>&gt;</xt></c> element to make it easier to extract the data portion of the page in Javascript in browsers.
 </ul>
 
 <h5 class='topic w800'>REST Server API updates</h5>
@@ -57,5 +57,5 @@
 	<li>New {@link oajr.RestRequest#getJavaMethod()} method for getting access to the method used to handle a request.
 		Useful for accessing the method name or annotations during requests, such as in calls to {@link oajr.RestGuard#guard(RestRequest,RestResponse)}.
 	<li>Fixed bug when using Jetty where you tried to read text input after a header was written.
-	<li>Added new string variables <code><del>$A{...}</del></code> (request attributes) and <code><del>$P{...}</del></code> (request parameters) to <code>RestServlet.createRequestVarResolver(RestRequest)</code>.
+	<li>Added new string variables <dc>$A{...}</dc> (request attributes) and <dc>$P{...}</dc> (request parameters) to <c>RestServlet.createRequestVarResolver(RestRequest)</c>.
 </ul>
diff --git a/juneau-doc/docs/ReleaseNotes/5.1.0.04.html b/juneau-doc/docs/ReleaseNotes/5.1.0.04.html
index 6873746..4f7da86 100644
--- a/juneau-doc/docs/ReleaseNotes/5.1.0.04.html
+++ b/juneau-doc/docs/ReleaseNotes/5.1.0.04.html
@@ -20,15 +20,15 @@
 </p>
 
 <ul class='spaced-list'>
-	<li>New <code><del>RestServlet.getPath()</del></code> method.
-	<li>New <code>SerializerContext.getJavaMethod()</code> and <code>ParserContext.getJavaMethod()</code>
+	<li>New <dc>RestServlet.getPath()</dc> method.
+	<li>New <c>SerializerContext.getJavaMethod()</c> and <c>ParserContext.getJavaMethod()</c>
 			to allow access to REST methods that invoked the serializers or parsers.
 		For example, can be used to access additional annotations on REST methods to perform special handing
 			during serialization or parsing.
-	<li>Better behavior on overriding of filters in <code>BeanContext.addTransforms(Class[])</code>.
+	<li>Better behavior on overriding of filters in <c>BeanContext.addTransforms(Class[])</c>.
 		Previously, adding multiple conflicting filters resulted in random behavior.  
 		Now filters are overridden when multiple matching filters are applied.
-	<li>Allow <code><del>HtmlDocSerializerContext</del></code> properties to be set via <code><del>Serializer.setProperty(String,Object)</del></code>.
+	<li>Allow <dc>HtmlDocSerializerContext</dc> properties to be set via <dc>Serializer.setProperty(String,Object)</dc>.
 		Previously, these could only be defined through override properties (e.g. through REST class and method annotations).
 	<li>Fixed memory leak in XML parser.	
 </ul>
diff --git a/juneau-doc/docs/ReleaseNotes/5.1.0.05.html b/juneau-doc/docs/ReleaseNotes/5.1.0.05.html
index a66292d..f2bf551 100644
--- a/juneau-doc/docs/ReleaseNotes/5.1.0.05.html
+++ b/juneau-doc/docs/ReleaseNotes/5.1.0.05.html
@@ -19,18 +19,18 @@
 	Juno 5.1.0.5 is a moderate update.
 </p>
 <ul class='spaced-list'>
-	<li>New <code><del>Redirect</del></code> class that simplifies performing redirections in REST methods.
+	<li>New <dc>Redirect</dc> class that simplifies performing redirections in REST methods.
 	<li>New pluggable {@link oajr.ResponseHandler} class and {@link oajr.annotation.RestResource#responseHandlers() @RestResource(responseHandlers)} annotation
 		for defining customer response handlers for special kinds of POJOs.
-	<li>New method <code><del>UrlEncodingSerializer.serializeUrlPart(Object)</del></code> method.
-	<li>New method <code><del>RestRequest.getServletURIBuilder()</del></code> for construcing servlet-based URLs more efficiently.
+	<li>New method <dc>UrlEncodingSerializer.serializeUrlPart(Object)</dc> method.
+	<li>New method <dc>RestRequest.getServletURIBuilder()</dc> for construcing servlet-based URLs more efficiently.
 	<li>New method {@link oajr.RestResponse#getNegotiatedOutputStream()} that uses encoders if a match is found, 
 		and {@link oajr.RestResponse#getOutputStream()} that just return the underlying output stream without any modifications.
-	<li>Fixed bug where some properties were not being propagated correctly when using <code><del>CoreObject.setProperties(ObjectMap)</del></code>
+	<li>Fixed bug where some properties were not being propagated correctly when using <dc>CoreObject.setProperties(ObjectMap)</dc>
 		on serializer and parser subclasses.
 	<li>Fixed bug in {@link oaj.html.HtmlSerializer} where URL keys in Maps were not being serialized as hyperlinks.
 	<li>Fixed bug in {@link oaj.json.JsonSerializer} where <js>"_class"</js> and <js>"items"</js> attributes were not quoted in strict mode when using SERIALIZER_addClassAttrs feature.	
-	<li>Fixed bug where <code>Content-Encoding</code> and<code>Character-Encoding</code> headers were being set when calling {@link oajr.RestResponse#getOutputStream()}.
+	<li>Fixed bug where <c>Content-Encoding</c> and<c>Character-Encoding</c> headers were being set when calling {@link oajr.RestResponse#getOutputStream()}.
 		These should not be set if interacting with the output streams at a low level.
-	<li>Eliminated various convenience <code>RestResponse.sendRedirect(...)</code> methods due to the introduction of the <code><del>Redirect</del></code> class.
+	<li>Eliminated various convenience <c>RestResponse.sendRedirect(...)</c> methods due to the introduction of the <dc>Redirect</dc> class.
 </ul>
diff --git a/juneau-doc/docs/ReleaseNotes/5.1.0.06.html b/juneau-doc/docs/ReleaseNotes/5.1.0.06.html
index a158055..103b644 100644
--- a/juneau-doc/docs/ReleaseNotes/5.1.0.06.html
+++ b/juneau-doc/docs/ReleaseNotes/5.1.0.06.html
@@ -20,15 +20,15 @@
 </p>
 <ul class='spaced-list'>
 	<li>Simplified API for {@link oaj.transform.PojoSwap}.  
-		Since it's rarely used, the <code>beanContext</code> parameter was replaced with a <code><del>PojoSwap#getBeanContext()</del></code> method on
+		Since it's rarely used, the <c>beanContext</c> parameter was replaced with a <dc>PojoSwap#getBeanContext()</dc> method on
 		the class.
 	<li>New simplified way of defining POJO filters without needing to extend {@link oaj.transform.PojoSwap}.
 		See {@link oaj.transform.SurrogateSwap} for details.
 	<li>New {@link oaj.html.annotation.Html @Html} annotation.
 		Will allow the definition of standard XHTML DTOs in future releases.  
-		For now, <code><del>Img</del></code> is an example of defining an XHTML element using Juno DTOs.
-	<li>{@link oaj.json.JsonParser} now ignores trailing <code>';'</code> characters in input so that it can 
+		For now, <dc>Img</dc> is an example of defining an XHTML element using Juno DTOs.
+	<li>{@link oaj.json.JsonParser} now ignores trailing <c>';'</c> characters in input so that it can 
 		parse strings of the form <js>"var x = {'foo':'bar'};"</js>.
-	<li>New <code>TumblrParserResource</code> in the samples war file showing how to combine the REST client and server APIs into a single
+	<li>New <c>TumblrParserResource</c> in the samples war file showing how to combine the REST client and server APIs into a single
 		resource in order to download Tumblr blogs and convert the response into any supported response content type.
 </ul>
diff --git a/juneau-doc/docs/ReleaseNotes/5.1.0.07.html b/juneau-doc/docs/ReleaseNotes/5.1.0.07.html
index be32745..394480c 100644
--- a/juneau-doc/docs/ReleaseNotes/5.1.0.07.html
+++ b/juneau-doc/docs/ReleaseNotes/5.1.0.07.html
@@ -20,19 +20,19 @@
 </p>
 <ul class='spaced-list'>
 	<li>Improved error handling.  
-	<li>New <code><del>ParserContext.PARSER_debug</del></code> and <code><del>SerializerContext.SERIALIZER_debug</del></code>.
+	<li>New <dc>ParserContext.PARSER_debug</dc> and <dc>SerializerContext.SERIALIZER_debug</dc>.
 		settings for logging additional information for debugging problems.
-	<li>New <code><del>SERIALIZER_ignoreRecursions</del></code> setting for explicitly ignoring recursions when 
+	<li>New <dc>SERIALIZER_ignoreRecursions</dc> setting for explicitly ignoring recursions when 
 		serializing models.  Previously, the <jsf>SERIALIZER_detectRecursions</jsf> setting did this, but now it simply looks for recursions 
 		and throws exceptions when they occur.
-	<li>Improved handling of <code>StackOverflowErrors</code>.  When <jsf>SERIALIZER_detectRecursions</jsf> is enabled, a useful error message
+	<li>Improved handling of <c>StackOverflowErrors</c>.  When <jsf>SERIALIZER_detectRecursions</jsf> is enabled, a useful error message
 		is displayed showing the exact chain of objects that resulted in the stack overflow.
 	<li>Bug fixes in {@link oaj.dto.ResultSetList} for Oracle and SQL Server.
-	<li>Serializers and parsers can now access HTTP request attributes, parameters, and headers through <code>SerializerContext.getProperties()</code> and
-		<code>ParserContext.getProperties()</code>.		
-	<li>Removed media-type and encoding attributes from <code><del>SerializerContext</del></code> and <code><del>ParserContext</del></code>	
+	<li>Serializers and parsers can now access HTTP request attributes, parameters, and headers through <c>SerializerContext.getProperties()</c> and
+		<c>ParserContext.getProperties()</c>.		
+	<li>Removed media-type and encoding attributes from <dc>SerializerContext</dc> and <dc>ParserContext</dc>	
 		since these are now available through context properties, and are typically not used.
-	<li>{@link oaj.xml.XmlParser} now accepts <code>application/xml</code>.		
+	<li>{@link oaj.xml.XmlParser} now accepts <c>application/xml</c>.		
 	<li>Improved handling of bean property serialization when multiple matching pojo filters for the bean property class exist.
 	<li>Improved concurrency on BeanContext class.
 	<li>Fixed bug in {@link oajr.converters.Traversable} that was causing it to be executed even if the servlet extra path info was empty.
diff --git a/juneau-doc/docs/ReleaseNotes/5.1.0.08.html b/juneau-doc/docs/ReleaseNotes/5.1.0.08.html
index 7448022..54a7443 100644
--- a/juneau-doc/docs/ReleaseNotes/5.1.0.08.html
+++ b/juneau-doc/docs/ReleaseNotes/5.1.0.08.html
@@ -24,23 +24,23 @@
 			<li>Rewrote {@link oaj.parser.ParserReader} class to handle it's own buffering.
 				The change allowed several optimizations to be made when dealing with JSON and URL-Encoding
 				text by avoiding char array copies.  
-			<li>Added a <code>estimatedSize</code> parameter to the {@link oaj.parser.Parser} parse methods to 
+			<li>Added a <c>estimatedSize</c> parameter to the {@link oaj.parser.Parser} parse methods to 
 				optimize buffering when the input size is known beforehand.
 		</ul>
 	</li>
 	<li>Revamped the {@link oaj.BeanContext} API to perform better in multi-threaded environments.
 		<ul>
-			<li>Introduced a new <code>BeanPropertyStore</code> class that handles creation of {@link oaj.BeanContext} objects.
-				This allows <code>BeanContext</code> objects to be considered immutable, and therefore cacheable/reusable by the framework.
+			<li>Introduced a new <c>BeanPropertyStore</c> class that handles creation of {@link oaj.BeanContext} objects.
+				This allows <c>BeanContext</c> objects to be considered immutable, and therefore cacheable/reusable by the framework.
 				While this was technically possible to cache these objects beforehand, it relied on a locking mechanism to prevent bean contexts
 					from being modified after being created.  The new mechanism is much more straightforward.
 		</ul>
 	</li>
 	<li>Modifications to the <del>org.apache.juneau.rest.client</del> APIs to make it easier to work with custom Apache HTTP clients.
 		<ul>
-			<li>Added overridable <code><del>RestClient#createHttpClient()</del></code> to allow customized subclasses to construct customized HTTP clients.
-			<li>Removed the <code>DefaultRestClient</code> class since it's now fully redundant with <code>RestClient</code>.
-			<li>Added <code>RestClient.shutdown()</code> method for cleaning up the internal HTTP client when you're done using a REST client.
+			<li>Added overridable <dc>RestClient#createHttpClient()</dc> to allow customized subclasses to construct customized HTTP clients.
+			<li>Removed the <c>DefaultRestClient</c> class since it's now fully redundant with <c>RestClient</c>.
+			<li>Added <c>RestClient.shutdown()</c> method for cleaning up the internal HTTP client when you're done using a REST client.
 		</ul>
 	</li>
 </ul>
diff --git a/juneau-doc/docs/ReleaseNotes/5.1.0.09.html b/juneau-doc/docs/ReleaseNotes/5.1.0.09.html
index 3d107a6..ad159cc 100644
--- a/juneau-doc/docs/ReleaseNotes/5.1.0.09.html
+++ b/juneau-doc/docs/ReleaseNotes/5.1.0.09.html
@@ -25,19 +25,19 @@
 <ul class='spaced-list'>
 	<li>Project split up into 3 separate bundles:
 		<ul>
-			<li><code>org.apache.juneau</code> - Core serializers and parsers.
-			<li><code>org.apache.juneau.rest</code> - REST server component.
-			<li><code>org.apache.juneau.rest.client</code> - REST client component.
+			<li><c>org.apache.juneau</c> - Core serializers and parsers.
+			<li><c>org.apache.juneau.rest</c> - REST server component.
+			<li><c>org.apache.juneau.rest.client</c> - REST client component.
 		</ul>
 	<li>Code changes to facilitate breaking up bundles:
 		<ul>
-			<li><code>org.apache.juneau.rest.labels.Link</code> class moved to <code><del>Link</del></code>.
-			<li>References to <code>org.apache.juneau.rest.RestException</code> in {@link oaj.encoders.Encoder} class changed to <code>IOException</code>.
+			<li><c>org.apache.juneau.rest.labels.Link</c> class moved to <dc>Link</dc>.
+			<li>References to <c>org.apache.juneau.rest.RestException</c> in {@link oaj.encoders.Encoder} class changed to <c>IOException</c>.
 		</ul>
 	<li>Changed configuration names for consistency with Jazz Framework.
 	<li>New {@link oajrc.RestClient#execute(HttpUriRequest)} method that allows subclasses to handle their own HTTP request execution.
-	<li>Changes in <code>JazzRestClient</code> to handle introduction of SSO support in v6.
-	<li><code>&amp;plainText</code> debug feature was broken.
-	<li>Removed double-buffering in <code>RestRequest</code>.
+	<li>Changes in <c>JazzRestClient</c> to handle introduction of SSO support in v6.
+	<li><c>&amp;plainText</c> debug feature was broken.
+	<li>Removed double-buffering in <c>RestRequest</c>.
 	<li>Metadata cleanup, Find Bug fixes.
 </ul>
diff --git a/juneau-doc/docs/ReleaseNotes/5.1.0.10.html b/juneau-doc/docs/ReleaseNotes/5.1.0.10.html
index 8f0c0c2..be9aaf7 100644
--- a/juneau-doc/docs/ReleaseNotes/5.1.0.10.html
+++ b/juneau-doc/docs/ReleaseNotes/5.1.0.10.html
@@ -27,48 +27,48 @@
 			<li>Logic for serializing and parsing URL-Encoded values moved to new {@link oaj.uon.UonSerializer} and {@link oaj.uon.UonParser} classes.
 		</ul>
 	</li>
-	<li>Fix bug where <code>BeanRuntimeExceptions</code> weren't being thrown on subsequent calls to {@link oaj.BeanContext#getClassMeta(Class)}.
-	<li>Moved logic for <code>BeanContext.getPrimitiveDefault(Class)</code> to new {@link oaj.ClassMeta#getPrimitiveDefault()} method for performance reasons.
-	<li>Fixed bug in <code><del>BeanContext.addTransforms(Class[])</del></code> that would cause filter order to get messed up.
+	<li>Fix bug where <c>BeanRuntimeExceptions</c> weren't being thrown on subsequent calls to {@link oaj.BeanContext#getClassMeta(Class)}.
+	<li>Moved logic for <c>BeanContext.getPrimitiveDefault(Class)</c> to new {@link oaj.ClassMeta#getPrimitiveDefault()} method for performance reasons.
+	<li>Fixed bug in <dc>BeanContext.addTransforms(Class[])</dc> that would cause filter order to get messed up.
 	<li>{@link oaj.ClassMeta#newInstance()} can now create array instances.
 	<li>Fixed indentation bugs in {@link oaj.html.HtmlSerializer}.
 	<li>Fixed issue in {@link oaj.html.HtmlSerializer} where newlines were not being converted into line breaks.
-	<li>New {@link oaj.serializer.WriterSerializer#toString(Object)} method that's identical to the serialize method but throws <code>RuntimeExceptions</code> to make the serializer easier to use for debugging.
+	<li>New {@link oaj.serializer.WriterSerializer#toString(Object)} method that's identical to the serialize method but throws <c>RuntimeExceptions</c> to make the serializer easier to use for debugging.
 </ul>
 
 <h5 class='topic w800'>Server</h5>		
 <ul class='spaced-list'>
 	<li>Fixed major issue that prevented parsing URL-Encoded form posts into POJOs.
-		Calling <code><del>HttpServlet.getParameter(String)</del></code> was forcing the underlying servlet code to process the HTTP body itself, preventing the <code>UrlEncodingSerializer</code>
+		Calling <dc>HttpServlet.getParameter(String)</dc> was forcing the underlying servlet code to process the HTTP body itself, preventing the <c>UrlEncodingSerializer</c>
 		class from being able to parse the content.  Updated code no longer inadvertantly calls this method.
-	<li>New <code><del>RestRequest.getQueryParameter(String)</del></code>, <code><del>RestRequest.hasQueryParameter(String)</del></code>, and <code><del>RestRequest.hasAnyQueryParameters(String[])</del></code>
+	<li>New <dc>RestRequest.getQueryParameter(String)</dc>, <dc>RestRequest.hasQueryParameter(String)</dc>, and <dc>RestRequest.hasAnyQueryParameters(String[])</dc>
 		methods that only look for parameters in the URL query string to prevent loading and parsing of URL-Encoded form posts.
-	<li>New <code><del>@QParam</del></code> and <code><del>@HasQParam</del></code> annotations for accessing query parameters from the URL query string.
-	<li><code>&amp;plainText</code> parameter can now specify a false value.
-	<li>Removed properties parameters from <code><del>RestServlet.onPreCall(RestRequest)</del></code> and <code><del>RestServlet#onPostCall(RestRequest,RestResponse)</del></code> methods
-		since the properties are already accessible through <code>RestRequest.getProperties()</code>.
+	<li>New <dc>@QParam</dc> and <dc>@HasQParam</dc> annotations for accessing query parameters from the URL query string.
+	<li><c>&amp;plainText</c> parameter can now specify a false value.
+	<li>Removed properties parameters from <dc>RestServlet.onPreCall(RestRequest)</dc> and <dc>RestServlet#onPostCall(RestRequest,RestResponse)</dc> methods
+		since the properties are already accessible through <c>RestRequest.getProperties()</c>.
 	<li>Added {@link oaj.uon.UonSerializer} and {@link oaj.uon.UonParser} to serializer and parser lists on 
-		{@link oajr.BasicRestServlet} and <code><del>RestServletJenaDefault</del></code>.
+		{@link oajr.BasicRestServlet} and <dc>RestServletJenaDefault</dc>.
 </ul>
 
 <h5 class='topic w800'>Client</h5>		
 <ul class='spaced-list'>
 	<li>Moved to Apache HttpClient 4.3 to match Jazz 6.0.
-	<li>Renamed <code>RestResponseEntity</code> to {@link oajrc.RestRequestEntity}.
+	<li>Renamed <c>RestResponseEntity</c> to {@link oajrc.RestRequestEntity}.
 	<li>Improved performance on URL-Encoded form posts by serializing directly to output stream instead of serialized to string first.
 	<li>New methods on {@link oajrc.RestClient} class that makes it easier to associate serializer and parser attributes with registered serializer and parser:
 		<ul>
-			<li><code><del>RestClient#setProperty(String,Object)</del></code>			
-			<li><code><del>RestClient#setProperties(ObjectMap)</del></code>	
-			<li><code><del>RestClient#addNotBeanClasses(Class[])</del></code>		
-			<li><code><del>RestClient.addTransforms(Class[])</del></code>		
-			<li><code><del>RestClient#addImplClass(Class,Class)</del></code>	
+			<li><dc>RestClient#setProperty(String,Object)</dc>			
+			<li><dc>RestClient#setProperties(ObjectMap)</dc>	
+			<li><dc>RestClient#addNotBeanClasses(Class[])</dc>		
+			<li><dc>RestClient.addTransforms(Class[])</dc>		
+			<li><dc>RestClient#addImplClass(Class,Class)</dc>	
 		</ul>
-	<li>Renamed <code>RestClient.shutdown()</code> to {@link oajrc.RestClient#close()} to mirror change in Apache API.		
+	<li>Renamed <c>RestClient.shutdown()</c> to {@link oajrc.RestClient#close()} to mirror change in Apache API.		
 </ul>
 
 <h5 class='topic w800'>Samples</h5>		
 <ul class='spaced-list'>
-	<li>New <code>CodeFormatterResource</code> for quickly formatting Java and XML code samples in Javadocs.
-	<li>New <code>UrlEncodedFormResource</code> for showing how to work with URL-Encoded form posts.
+	<li>New <c>CodeFormatterResource</c> for quickly formatting Java and XML code samples in Javadocs.
+	<li>New <c>UrlEncodedFormResource</c> for showing how to work with URL-Encoded form posts.
 </ul>
diff --git a/juneau-doc/docs/ReleaseNotes/5.1.0.11.html b/juneau-doc/docs/ReleaseNotes/5.1.0.11.html
index 65419ab..827cb8f 100644
--- a/juneau-doc/docs/ReleaseNotes/5.1.0.11.html
+++ b/juneau-doc/docs/ReleaseNotes/5.1.0.11.html
@@ -32,19 +32,19 @@
 	<li>Several improvements to URL-Encoding support.
 		<ul>
 			<li>Improved whitespace handling in {@link oaj.uon.UonParser}.
-			<li>New <code><del>UonParserContext.UON_whitespaceAware</del></code> property for controlling whether whitespace is ignored.
-			<li>New <code><del>UrlEncodingContext.URLENC_expandedParams</del></code> property for controlling whether arrays/Collections 
+			<li>New <dc>UonParserContext.UON_whitespaceAware</dc> property for controlling whether whitespace is ignored.
+			<li>New <dc>UrlEncodingContext.URLENC_expandedParams</dc> property for controlling whether arrays/Collections 
 				should be serialized/parsed as multi-part parameters.
 			<li>New {@link oaj.urlencoding.annotation.UrlEncoding#expandedParams() @UrlEncoding(expandedParams)}
-				annotation that specifies that bean properties of type array/Collection be serialized as multi-part parameters (e.g. <code>&amp;key=val1&amp;key=val2</code>).
+				annotation that specifies that bean properties of type array/Collection be serialized as multi-part parameters (e.g. <c>&amp;key=val1&amp;key=val2</c>).
 		</ul>
 	</li>
-	<li>New <code><del>JsonSerializerContext.JSON_escapeSolidus</del></code> property for controlling whether slash characters should be escaped.
+	<li>New <dc>JsonSerializerContext.JSON_escapeSolidus</dc> property for controlling whether slash characters should be escaped.
 	<li>New {@link oaj.internal.TeeOutputStream} and {@link oaj.internal.TeeWriter} classes.
 	<li>New {@link oaj.ClassMeta#isInstance(Object)} method.
 	<li>Performance improvements when using the {@link oaj.BeanMap#add(String,Object)} method.  
 		Array properties are stored in a temporary list cache until {@link oaj.BeanMap#getBean()} is called.
-	<li>New <code><del>BeanPropertyMeta.add(BeanMap,Object)</del></code> method for adding values to Collection and array properties.
+	<li>New <dc>BeanPropertyMeta.add(BeanMap,Object)</dc> method for adding values to Collection and array properties.
 	<li>Config INI files now support keys with name <js>"*"</js>.
 </ul>
 
@@ -52,48 +52,48 @@
 <ul class='spaced-list'>
 	<li>REST method parameters can now be generic types (e.g. <del><ja>@Param</ja>(<js>"foo"</js>) Map&lt;String,Integer&gt; foo</del>).
 		This applies to headers, attributes, and parameters.
-	<li>New <code><del>@Param(multipart)</del></code>
-		and <code><del>@Query(multipart)</del></code> annotations
+	<li>New <dc>@Param(multipart)</dc>
+		and <dc>@Query(multipart)</dc> annotations
 		for handling multi-part GET and POST parameters.	
 	<li>GET parameters are now CASE-SENSITIVE per W3C standards.
 		<ul>
 			<li>
-			<li><code>&amp;Content</code> must now be specified as <code>&amp;content</code>.
-			<li><code>&amp;Method</code> must now be specified as <code>&amp;method</code>.
-			<li><code>&amp;debug</code> must now be specified as <code>&amp;debug=true</code>.
-			<li><code>&amp;plainText</code> must now be specified as <code>&amp;plainText=true</code>.
-			<li><code>&amp;notrace</code> must now be specified as <code>&amp;noTrace=true</code>.
+			<li><c>&amp;Content</c> must now be specified as <c>&amp;content</c>.
+			<li><c>&amp;Method</c> must now be specified as <c>&amp;method</c>.
+			<li><c>&amp;debug</c> must now be specified as <c>&amp;debug=true</c>.
+			<li><c>&amp;plainText</c> must now be specified as <c>&amp;plainText=true</c>.
+			<li><c>&amp;notrace</c> must now be specified as <c>&amp;noTrace=true</c>.
 		</ul>
 	</li>
 	<li>Performance improvements around query parameters.
 	<li>New methods on {@link oajr.RestRequest} for handling multi-part parameters:
 		<ul>
-			<li><code><del>RestRequest.getParameters(String,Class)</del></code>
-			<li><code><del>RestRequest#getQueryParameters(String,Class)</del></code>
+			<li><dc>RestRequest.getParameters(String,Class)</dc>
+			<li><dc>RestRequest#getQueryParameters(String,Class)</dc>
 		</ul>
 	</li>
 	<li>Fixed Jetty issue in {@link oajr.RestResponse#setHeader(String,String)} where setting 
-		the <code>Content-Type</code> through this method was inconsistent with the behavior in WAS/Tomcat.
-	<li><code>&amp;noTrace=true</code> now prevents any errors from being logged in log file.
-	<li>Workaround for Jetty issue where <code>ServletContext.getContextPath()</code> always ends with <js>"null"</js>.
-	<li><code>RestServletProperties.REST_allowMethodParam</code> is now <jk>true</jk> by default on all subclasses 
-		of {@link oajr.BasicRestServlet} and <code><del>RestServletJenaDefault</del></code>.
+		the <c>Content-Type</c> through this method was inconsistent with the behavior in WAS/Tomcat.
+	<li><c>&amp;noTrace=true</c> now prevents any errors from being logged in log file.
+	<li>Workaround for Jetty issue where <c>ServletContext.getContextPath()</c> always ends with <js>"null"</js>.
+	<li><c>RestServletProperties.REST_allowMethodParam</c> is now <jk>true</jk> by default on all subclasses 
+		of {@link oajr.BasicRestServlet} and <dc>RestServletJenaDefault</dc>.
 </ul>
 		
 <h5 class='topic w800'>Client</h5>		
 <ul class='spaced-list'>
 	<li>New method {@link oajrc.RestCall#allowRedirectsOnPosts(boolean)}.
-	<li>New method <code>RestCall.peekInputStream()</code> allows you to read response bodies without interrupting execution flow.
+	<li>New method <c>RestCall.peekInputStream()</c> allows you to read response bodies without interrupting execution flow.
 	<li>New method {@link oajrc.RestCall#toString()} now useful for debugging purposes.  
 		Shows all request/response headers and bodies.
-	<li>{@link oajrc.RestCallException} now includes <code>HttpResponse</code> object for easier debugging.
-	<li>New method <code>RestClient.addListener(RestClientListener)</code> for registering request/response listeners.
-	<li>New <code><del>RestClient.setClassLoader(ClassLoader)</del></code> method.
-	<li>TLS support in <code>JazzRestClient</code>.
+	<li>{@link oajrc.RestCallException} now includes <c>HttpResponse</c> object for easier debugging.
+	<li>New method <c>RestClient.addListener(RestClientListener)</c> for registering request/response listeners.
+	<li>New <dc>RestClient.setClassLoader(ClassLoader)</dc> method.
+	<li>TLS support in <c>JazzRestClient</c>.
 </ul>
 
 <h5 class='topic w800'>Other changes</h5>	
 <ul class='spaced-list'>
-	<li><code>samples.ear</code> and <code>samples.war</code> projects
-		have been replaced with an OSGi bundle with activated servlets in <code>juno.samples</code>.
+	<li><c>samples.ear</c> and <c>samples.war</c> projects
+		have been replaced with an OSGi bundle with activated servlets in <c>juno.samples</c>.
 </ul>
diff --git a/juneau-doc/docs/ReleaseNotes/5.1.0.12.html b/juneau-doc/docs/ReleaseNotes/5.1.0.12.html
index a9a4cf0..c08637d 100644
--- a/juneau-doc/docs/ReleaseNotes/5.1.0.12.html
+++ b/juneau-doc/docs/ReleaseNotes/5.1.0.12.html
@@ -21,15 +21,15 @@
 
 <h5 class='topic w800'>Core</h5>		
 <ul class='spaced-list'>
-	<li>Fixed <code><del>ConfigFile.isEmpty()</del></code> method.
+	<li>Fixed <dc>ConfigFile.isEmpty()</dc> method.
 	<li>Changed behavior on {@link oaj.uon.UonParser} to not treat <js>'~'</js> characters as escapes
-		unless followed by one of the following characters:  <code>( ) , $ = ~</code>.
+		unless followed by one of the following characters:  <c>( ) , $ = ~</c>.
 </ul>
 
 <h5 class='topic w800'>Client</h5>		
 <ul class='spaced-list'>
 	<li>New class {@link oajrc.RestCallInterceptor}.  
 		Allows responses to be inspected and modified before being processed.  
-		Replaces <code>RestClientListener</code> class.
+		Replaces <c>RestClientListener</c> class.
 	<li>Minor connection cleanup fixes.
 </ul>
diff --git a/juneau-doc/docs/ReleaseNotes/5.1.0.13.html b/juneau-doc/docs/ReleaseNotes/5.1.0.13.html
index dc9a1a7..8b6ea81 100644
--- a/juneau-doc/docs/ReleaseNotes/5.1.0.13.html
+++ b/juneau-doc/docs/ReleaseNotes/5.1.0.13.html
@@ -22,13 +22,13 @@
 <h5 class='topic w800'>Core</h5>		
 <ul class='spaced-list'>
 	<li>{@link oaj.ClassMeta#newInstance()} method can now create new instances of arrays.
-	<li>Arguments passed to <code><del>Link</del></code> are now serialized using {@link oaj.urlencoding.UrlEncodingSerializer}, so arbitrary POJOs can now be passed as arguments.
-	<li>New date filters:  <code>org.apache.juneau.transforms.Datefilter.ISO8601DTZP</code> and <code>org.apache.juneau.transforms.Datefilter.SimpleP</code>.
-	<li>New <code><del>HtmlDocSerializerContext.HTMLDOC_nowrap</del></code> setting for {@link oaj.html.HtmlDocSerializer} class.  
+	<li>Arguments passed to <dc>Link</dc> are now serialized using {@link oaj.urlencoding.UrlEncodingSerializer}, so arbitrary POJOs can now be passed as arguments.
+	<li>New date filters:  <c>org.apache.juneau.transforms.Datefilter.ISO8601DTZP</c> and <c>org.apache.juneau.transforms.Datefilter.SimpleP</c>.
+	<li>New <dc>HtmlDocSerializerContext.HTMLDOC_nowrap</dc> setting for {@link oaj.html.HtmlDocSerializer} class.  
 		Adds <js>"* {white-space:nowrap}"</js> to the style header to prevent word wrapping.
-	<li>Fixed bug in {@link oaj.uon.UonParser} where passing in a blank value on an array or collection type in a form post would cause a <code>ClassCastException</code>.  
-		New behavior creates an empty array or <code>Collection</code>.
-	<li>Improved implementation of <code><del>UrlEncodingSerializer.serializeUrlPart(Object)</del></code> method.
+	<li>Fixed bug in {@link oaj.uon.UonParser} where passing in a blank value on an array or collection type in a form post would cause a <c>ClassCastException</c>.  
+		New behavior creates an empty array or <c>Collection</c>.
+	<li>Improved implementation of <dc>UrlEncodingSerializer.serializeUrlPart(Object)</dc> method.
 </ul>
 
 <h5 class='topic w800'>Server</h5>		
@@ -36,13 +36,13 @@
 	<li>{@link oajr.RestConverter} API fixed to handle the existence of POJO filters.
 		{@link oajr.converters.Introspectable}/{@link oajr.converters.Queryable}/{@link oajr.converters.Traversable} classes can now work with filtered POJOs.  
 	<li>{@link oajr.annotation.RestResource#messages() @RestResource(messages)} annotation can now be defined on super and subclasses so that NLS messages can be defined in multiple resource bundles.
-	<li>Performance improvements in <code>RestServletNls</code> class. 
+	<li>Performance improvements in <c>RestServletNls</c> class. 
 	<li>Fixed bug where two REST java methods mapped to the same path pattern wasn't triggering an exception when it was supposed to.
 </ul>
 
 <h5 class='topic w800'>Client</h5>		
 <ul class='spaced-list'>	
-	<li>New <code><del>RestCall.setRedirectMaxAttempts(int)</del></code> method to prevent endless redirection loops.
-	<li>New <code><del>RestCall#setRetryable(int,long,RetryOn)</del></code> method to automatically retry on failed connection attempts.
-	<li>New <code>RestCallInterceptor.onRetry(RestCall,int,HttpRequest,HttpResponse)</code> method for listening in on retry attempts.		
+	<li>New <dc>RestCall.setRedirectMaxAttempts(int)</dc> method to prevent endless redirection loops.
+	<li>New <dc>RestCall#setRetryable(int,long,RetryOn)</dc> method to automatically retry on failed connection attempts.
+	<li>New <c>RestCallInterceptor.onRetry(RestCall,int,HttpRequest,HttpResponse)</c> method for listening in on retry attempts.		
 </ul>
diff --git a/juneau-doc/docs/ReleaseNotes/5.1.0.14.html b/juneau-doc/docs/ReleaseNotes/5.1.0.14.html
index 9a90245..877805b 100644
--- a/juneau-doc/docs/ReleaseNotes/5.1.0.14.html
+++ b/juneau-doc/docs/ReleaseNotes/5.1.0.14.html
@@ -19,33 +19,33 @@
 	Juno 5.1.0.14 is a moderate update.
 </p>
 <p>
-	The major addition is support for <code><del>Remoteable Services</del></code>, the ability
+	The major addition is support for <dc>Remoteable Services</dc>, the ability
 		to invoke server-side POJO methods through client-side proxy interfaces.
 </p>
 
 <h5 class='topic w800'>Core</h5>		
 <ul class='spaced-list'>
 	<li>Simplified {@link oaj.utils.PojoIntrospector} class.
-	<li>New <code><del>ClassUtils.getMethodSignature(Method)</del></code> method.
+	<li>New <dc>ClassUtils.getMethodSignature(Method)</dc> method.
 </ul>
 
 <h5 class='topic w800'>Client</h5>		
 <ul class='spaced-list'>
 	<li>New methods in {@link oajrc.RestClient} for working with remoteable services:
 	<ul>
-		<li><code><del>RestClient.setRemoteableServletUri(String)</del></code>
-		<li><code><del>RestClient#getRemoteableProxy(Class)</del></code>
+		<li><dc>RestClient.setRemoteableServletUri(String)</dc>
+		<li><dc>RestClient#getRemoteableProxy(Class)</dc>
 	</ul>
 </ul>
 
 <h5 class='topic w800'>Server</h5>		
 <ul class='spaced-list'>
-	<li>Added a default OPTIONS page to {@link oajr.BasicRestServlet} and <code><del>RestServletJenaDefault</del></code>.
-	<li><code>RestServletProperties.REST_allowMethodParam</code> has been enhanced to allow you to
-		explicitly specify which HTTP methods can be used in the <code>&amp;method</code> parameter.
+	<li>Added a default OPTIONS page to {@link oajr.BasicRestServlet} and <dc>RestServletJenaDefault</dc>.
+	<li><c>RestServletProperties.REST_allowMethodParam</c> has been enhanced to allow you to
+		explicitly specify which HTTP methods can be used in the <c>&amp;method</c> parameter.
 	<li>New methods added to {@link oajr.RestRequest}:
 	<ul>
-		<li><code><del>RestRequest.getParser()</del></code>
-		<li><code><del>RestRequest.getReaderParser()</del></code>
+		<li><dc>RestRequest.getParser()</dc>
+		<li><dc>RestRequest.getReaderParser()</dc>
 	</ul>
 </ul>
diff --git a/juneau-doc/docs/ReleaseNotes/5.1.0.15.html b/juneau-doc/docs/ReleaseNotes/5.1.0.15.html
index 4bc2519..4be6c6a 100644
--- a/juneau-doc/docs/ReleaseNotes/5.1.0.15.html
+++ b/juneau-doc/docs/ReleaseNotes/5.1.0.15.html
@@ -21,23 +21,23 @@
 
 <h5 class='topic w800'>Core</h5>
 <ul class='spaced-list'>
-	<li>New properties in <code><del>SerializerContext</del></code>:
+	<li>New properties in <dc>SerializerContext</dc>:
 		<ol>
-			<li><code><del>SerializerContext.SERIALIZER_relativeUriBase</del></code>
-			<li><code><del>SerializerContext.SERIALIZER_absolutePathUriBase</del></code>
+			<li><dc>SerializerContext.SERIALIZER_relativeUriBase</dc>
+			<li><dc>SerializerContext.SERIALIZER_absolutePathUriBase</dc>
 		</ol>
-		These replace the <code>SERIALIZER_uriAuthority</code> and <code>SERIALIZER_uriContext</code> properties.
+		These replace the <c>SERIALIZER_uriAuthority</c> and <c>SERIALIZER_uriContext</c> properties.
 	</li>
 	<li>Improvements in {@link oaj.csv.CsvSerializer}.
 </ul>
 
 <h5 class='topic w800'>Server</h5>
 <ul class='spaced-list'>
-	<li>New properties in <code>RestServletProperties</code>:
+	<li>New properties in <c>RestServletProperties</c>:
 		<ol>
-			<li><code>REST_defaultCharset</code>
-			<li><code>REST_servletURI</code>
-			<li><code>REST_relativeServletURI</code>
+			<li><c>REST_defaultCharset</c>
+			<li><c>REST_servletURI</c>
+			<li><c>REST_relativeServletURI</c>
 		</ol>
 	<li>Improvements involving path calculations when servlets deployed outside of a war file with a context root.
 </ul>
@@ -46,24 +46,24 @@
 <ul class='spaced-list'>
 	<li>New methods in {@link oajrc.RestCall}:
 		<ol>
-			<li><code><del>RestRequest.getHeader(String,Class)</del></code>
-			<li><code><del>RestRequest.getHeader(String,Object,Class)</del></code>
-			<li><code><del>RestRequest.getHeader(String,Type,Type...)</del></code>
-			<li><code><del>RestRequest.getQueryParameter(String,Class)</del></code>
-			<li><code><del>RestRequest.getQueryParameter(String,Object,Class)</del></code>
-			<li><code><del>RestRequest.getQueryParameter(String,Type,Type...)</del></code>
-			<li><code><del>RestRequest.getQueryParameter(String,Object,Type,Type...)</del></code>
-			<li><code><del>RestRequest.getQueryParameters(String,Class)</del></code>
-			<li><code><del>RestRequest.getQueryParameters(String,Type,Type...)</del></code>
-			<li><code><del>RestRequest.getFormDataParameter(String,Class)</del></code>
-			<li><code><del>RestRequest.getFormDataParameter(String,Object,Class)</del></code>
-			<li><code><del>RestRequest.getFormDataParameters(String,Class)</del></code>
-			<li><code><del>RestRequest.getFormDataParameter(String,Type,Type...)</del></code>
-			<li><code><del>RestRequest.getFormDataParameters(String,Type,Type...)</del></code>
-			<li><code><del>RestRequest.getPathParameter(String,Class)</del></code>
-			<li><code><del>RestRequest.getPathParameter(String,Type,Type...)</del></code>
-			<li><code><del>RestRequest.getBody(Class)</del></code>
-			<li><code><del>RestRequest.getBody(Type,Type...)</del></code>
+			<li><dc>RestRequest.getHeader(String,Class)</dc>
+			<li><dc>RestRequest.getHeader(String,Object,Class)</dc>
+			<li><dc>RestRequest.getHeader(String,Type,Type...)</dc>
+			<li><dc>RestRequest.getQueryParameter(String,Class)</dc>
+			<li><dc>RestRequest.getQueryParameter(String,Object,Class)</dc>
+			<li><dc>RestRequest.getQueryParameter(String,Type,Type...)</dc>
+			<li><dc>RestRequest.getQueryParameter(String,Object,Type,Type...)</dc>
+			<li><dc>RestRequest.getQueryParameters(String,Class)</dc>
+			<li><dc>RestRequest.getQueryParameters(String,Type,Type...)</dc>
+			<li><dc>RestRequest.getFormDataParameter(String,Class)</dc>
+			<li><dc>RestRequest.getFormDataParameter(String,Object,Class)</dc>
+			<li><dc>RestRequest.getFormDataParameters(String,Class)</dc>
+			<li><dc>RestRequest.getFormDataParameter(String,Type,Type...)</dc>
+			<li><dc>RestRequest.getFormDataParameters(String,Type,Type...)</dc>
+			<li><dc>RestRequest.getPathParameter(String,Class)</dc>
+			<li><dc>RestRequest.getPathParameter(String,Type,Type...)</dc>
+			<li><dc>RestRequest.getBody(Class)</dc>
+			<li><dc>RestRequest.getBody(Type,Type...)</dc>
 		</ol>
 	</li>
 </ul>
diff --git a/juneau-doc/docs/ReleaseNotes/5.1.0.16.html b/juneau-doc/docs/ReleaseNotes/5.1.0.16.html
index 08d8c5e..8b08da0 100644
--- a/juneau-doc/docs/ReleaseNotes/5.1.0.16.html
+++ b/juneau-doc/docs/ReleaseNotes/5.1.0.16.html
@@ -24,15 +24,15 @@
 	<li>New methods on {@link oaj.ClassMeta} that eliminates language-specific code in 
 		the general class metadata.
 		<ul>
-			<li><code><del>ClassMeta.getXmlMeta()</del></code>
-			<li><code><del>ClassMeta.getJsonMeta()</del></code>
-			<li><code><del>ClassMeta.getHtmlMeta()</del></code>
-			<li><code><del>ClassMeta.getUrlEncodingMeta()</del></code>
-			<li><code><del>ClassMeta.getRdfMeta()</del></code>
+			<li><dc>ClassMeta.getXmlMeta()</dc>
+			<li><dc>ClassMeta.getJsonMeta()</dc>
+			<li><dc>ClassMeta.getHtmlMeta()</dc>
+			<li><dc>ClassMeta.getUrlEncodingMeta()</dc>
+			<li><dc>ClassMeta.getRdfMeta()</dc>
 		</ul>
 	<li>New {@link oaj.dto.jsonschema.JsonType#ANY} enum.
-	<li>New <code><del>@Html(asPlainText)</del></code> annotation.
-	<li>New <code><del>HtmlDocSerializerContext.HTMLDOC_cssImports</del></code> property.
+	<li>New <dc>@Html(asPlainText)</dc> annotation.
+	<li>New <dc>HtmlDocSerializerContext.HTMLDOC_cssImports</dc> property.
 	<li>Significant changes to RDF support.
 		<ul>
 			<li>New {@link oaj.jena.annotation.Rdf @Rdf} and {@link oaj.jena.annotation.RdfSchema @RdfSchema}
@@ -41,16 +41,16 @@
 			<li>Support for serializing arrays/collections as RDF bags, RDF lists, and multi-valued properties.   
 			<li>Fixed warning message about <js>"tab"</js> setting when using the N3/Turtle serializers.
 		</ul>
-	<li>New <code><del>SerializerContext.SERIALIZER_sortCollections</del></code> and 
-		<code><del>SerializerContext.SERIALIZER_sortMaps</del></code> properties.
+	<li>New <dc>SerializerContext.SERIALIZER_sortCollections</dc> and 
+		<dc>SerializerContext.SERIALIZER_sortMaps</dc> properties.
 	<li>FindBug fixes.
 </ul>
 
 <h5 class='topic w800'>Server</h5>
 <ul class='spaced-list'>
-	<li>New <code><del>RestRequest.getServletParentURI()</del></code> method.
-	<li>New <code>$R{servletParentURI}</code> variable.
-	<li>Removed final modifier from <code><del>ChildResourceDescriptions</del></code>.
+	<li>New <dc>RestRequest.getServletParentURI()</dc> method.
+	<li>New <c>$R{servletParentURI}</c> variable.
+	<li>Removed final modifier from <dc>ChildResourceDescriptions</dc>.
 </ul>
 
 <h5 class='topic w800'>Samples</h5>
diff --git a/juneau-doc/docs/ReleaseNotes/5.1.0.17.html b/juneau-doc/docs/ReleaseNotes/5.1.0.17.html
index 2dce14e..bdb8197 100644
--- a/juneau-doc/docs/ReleaseNotes/5.1.0.17.html
+++ b/juneau-doc/docs/ReleaseNotes/5.1.0.17.html
@@ -26,102 +26,102 @@
 		<ul>
 			<li>Deleted the following methods which are now unnecessary:
 				<ul>
-					<li><code>BeanMap.getFiltered(String)</code>
-					<li><code>BeanMap.putFiltered(String,Object)</code>
-					<li><code>BeanMapEntry.getFiltered(String)</code>
-					<li><code>BeanMapEntry.putFiltered(String,Object)</code>
-					<li><code>BeanMapEntry.putFiltered(String,Object)</code>
-					<li><code>BeanPropertyMeta.getFiltered()</code>
-					<li><code>BeanPropertyMeta.setFiltered(Object)</code>
-					<li><code>BeanPropertyMeta.getTransformedClassMeta()</code>
+					<li><c>BeanMap.getFiltered(String)</c>
+					<li><c>BeanMap.putFiltered(String,Object)</c>
+					<li><c>BeanMapEntry.getFiltered(String)</c>
+					<li><c>BeanMapEntry.putFiltered(String,Object)</c>
+					<li><c>BeanMapEntry.putFiltered(String,Object)</c>
+					<li><c>BeanPropertyMeta.getFiltered()</c>
+					<li><c>BeanPropertyMeta.setFiltered(Object)</c>
+					<li><c>BeanPropertyMeta.getTransformedClassMeta()</c>
 				</ul>
 			<li>{@link oaj.BeanPropertyMeta#getClassMeta()} now returns the filtered type of the property.
 		</ul> 
-	<li><code><del>StringVarResolver</del></code> now has support for chained resolvers.
-	<li><code><del>StringVarResolver</del></code>  now resolves variables inside resolved values.
+	<li><dc>StringVarResolver</dc> now has support for chained resolvers.
+	<li><dc>StringVarResolver</dc>  now resolves variables inside resolved values.
 		i.e. if a resolved variable value itself contains a variable, it now resolves that variable too.
-	<li>Fixed bug where inner interface classes being used in <code>RestResource.filters()</code> were being
+	<li>Fixed bug where inner interface classes being used in <c>RestResource.filters()</c> were being
 		interpreted as surrogate classes because they have hidden 1-arg constructors due to being inner classes.
 	<li>Fixed bug in {@link oaj.internal.MultiSet} where exception was being thrown if last set was empty.
 	<li>New {@link oaj.utils.ZipFileList} class for providing efficiently zipped directories through the REST interface.
-	<li>New <code>RdfProperties.RDF_useXmlNamespaces</code> property.			
-	<li>New <code><del>XmlParserContext.XML_preserveRootElement</del></code> property.
+	<li>New <c>RdfProperties.RDF_useXmlNamespaces</c> property.			
+	<li>New <dc>XmlParserContext.XML_preserveRootElement</dc> property.
 	<li>Worked around bug in Sun VM on OS/X where XML parser was throwing an exception when trying to set a reporter.			
 </ul>
 
 
 <h5 class='topic w800'>Server</h5>
 <ul class='spaced-list'>
-	<li>New <code><del>ZipFileListResponseHandler</del></code> class.
+	<li>New <dc>ZipFileListResponseHandler</dc> class.
 	<li>Simplified labels in servlet resource bundles:
 		<ul>
-			<li><code>"[ClassName].ResourceDescription"</code> is now <code>"[ClassName].label"</code>.
-			<li><code>"[ClassName].MethodDescription.[methodName]"</code> is now <code>"[ClassName].[methodName]"</code>.
+			<li><c>"[ClassName].ResourceDescription"</c> is now <c>"[ClassName].label"</c>.
+			<li><c>"[ClassName].MethodDescription.[methodName]"</c> is now <c>"[ClassName].[methodName]"</c>.
 		</ul>
 	<li>Several changes to {@link oajr.RestRequest}:
 		<ul>
 			<li>Added new methods:
 				<ul>
-					<li><code><del>RestRequest.getQueryParameterMap()</del></code>
-					<li><code><del>RestRequest.getQueryParameterNames()</del></code>
-					<li><code><del>RestRequest.getPathInfoUndecoded()</del></code>
-					<li><code><del>RestRequest.getPathRemainderUndecoded()</del></code>
-					<li><code><del>RestRequest.getTrimmedRequestURI()</del></code>
-					<li><code><del>RestRequest.getTrimmedRequestURL()</del></code>
-					<li><code><del>RestRequest.getServletTitle()</del></code>
-					<li><code><del>RestRequest.getServletDescription()</del></code>
+					<li><dc>RestRequest.getQueryParameterMap()</dc>
+					<li><dc>RestRequest.getQueryParameterNames()</dc>
+					<li><dc>RestRequest.getPathInfoUndecoded()</dc>
+					<li><dc>RestRequest.getPathRemainderUndecoded()</dc>
+					<li><dc>RestRequest.getTrimmedRequestURI()</dc>
+					<li><dc>RestRequest.getTrimmedRequestURL()</dc>
+					<li><dc>RestRequest.getServletTitle()</dc>
+					<li><dc>RestRequest.getServletDescription()</dc>
 					<li>{@link oajr.RestRequest#getMethodDescription()}
 				</ul>
 			<li>Behavior changes to {@link oajr.RestRequest#getPathInfo()} to follow Servlet specs.
 				Returns <jk>null</jk> instead of blank for no path info.
-			<li><code><del>RestRequest.getPathRemainder()</del></code> now automatically decodes the path remainder. 
-				Use <code><del>RestRequest.getPathRemainderUndecoded()</del></code> to get the unencoded path remainder.
-			<li>Bug fixes in <code><del>RestRequest.getRequestParentURI()</del></code> when servlet is mapped to <js>"/*"</js>.
-			<li>Bug fixes in <code><del>RestRequest.getServletURI()</del></code> when servlet is mapped to <js>"/*"</js>.
+			<li><dc>RestRequest.getPathRemainder()</dc> now automatically decodes the path remainder. 
+				Use <dc>RestRequest.getPathRemainderUndecoded()</dc> to get the unencoded path remainder.
+			<li>Bug fixes in <dc>RestRequest.getRequestParentURI()</dc> when servlet is mapped to <js>"/*"</js>.
+			<li>Bug fixes in <dc>RestRequest.getServletURI()</dc> when servlet is mapped to <js>"/*"</js>.
 		</ul>
 	<li>New string replacement variables:
 		<ul>
-			<li><code>$R{contextPath}</code> - Returns value from {@link oajr.RestRequest#getContextPath()}
-			<li><code>$R{methodDescription}</code> - Returns value from {@link oajr.RestRequest#getMethodDescription()}
-			<li><code>$R{resourceTitle}</code> - Returns value from <code><del>RestRequest.getServletTitle()</del></code>
-			<li><code>$R{resourceDescription}</code> - Returns value from <code><del>RestRequest.getServletDescription()</del></code>
-			<li><code>$R{trimmedRequestURI}</code> - Returns value from <code><del>RestRequest.getTrimmedRequestURI()</del></code>
-			<li><code>$E{var}</code> - Environment variables.
+			<li><c>$R{contextPath}</c> - Returns value from {@link oajr.RestRequest#getContextPath()}
+			<li><c>$R{methodDescription}</c> - Returns value from {@link oajr.RestRequest#getMethodDescription()}
+			<li><c>$R{resourceTitle}</c> - Returns value from <dc>RestRequest.getServletTitle()</dc>
+			<li><c>$R{resourceDescription}</c> - Returns value from <dc>RestRequest.getServletDescription()</dc>
+			<li><c>$R{trimmedRequestURI}</c> - Returns value from <dc>RestRequest.getTrimmedRequestURI()</dc>
+			<li><c>$E{var}</c> - Environment variables.
 		</ul>
-	<li>Added methods <code><del>RestServlet.getDescription(RestRequest)</del></code> and <code><del>RestServlet.getLabel(RestRequest)</del></code>.
-	<li>{@link oajr.BasicRestServlet} and <code><del>RestServletJenaDefault</del></code> now provide default HTML titles
+	<li>Added methods <dc>RestServlet.getDescription(RestRequest)</dc> and <dc>RestServlet.getLabel(RestRequest)</dc>.
+	<li>{@link oajr.BasicRestServlet} and <dc>RestServletJenaDefault</dc> now provide default HTML titles
 		and descriptions:
 		<p class='bcode w800'>
 	<ja>@Property</ja>(name=<jsf>HTMLDOC_title</jsf>, value=<js>"$R{resourceTitle}"</js>),
 	<ja>@Property</ja>(name=<jsf>HTMLDOC_description</jsf>, value=<js>"$R{resourceDescription}"</js>)
 		</p>
-	<li>Options pages on {@link oajr.BasicRestServlet} and <code><del>RestServletJenaDefault</del></code> now provide default descriptions and back links:
+	<li>Options pages on {@link oajr.BasicRestServlet} and <dc>RestServletJenaDefault</dc> now provide default descriptions and back links:
 		and descriptions:
 		<p class='bcode w800'>
 	<ja>@Property</ja>(name=<jsf>HTMLDOC_navlinks</jsf>, value=<js>"{back:'$R{servletURI}"</js>),
 	<ja>@Property</ja>(name=<jsf>HTMLDOC_description</jsf>, value=<js>"Resource options"</js>)
 		</p>
 	<li>New {@link oajr.BasicRestServletGroup} class.
-	<li>Removed <code>RestServletProperties.REST_trimTrailingUriSlashes</code> and <code>RestServletProperties.REST_pathInfoBlankForNull</code>. 
+	<li>Removed <c>RestServletProperties.REST_trimTrailingUriSlashes</c> and <c>RestServletProperties.REST_pathInfoBlankForNull</c>. 
 	<li>New annotations for providing labels and descriptions.  Useful if you don't plan on having to support other languages, so you don't 
 		want to provide labels in resource bundles.
 		<ul>
-			<li><code><del>RestResource.label()</del></code>
+			<li><dc>RestResource.label()</dc>
 			<li>{@link oajr.annotation.RestResource#description() @RestResource(description)}
 			<li>{@link oajr.annotation.RestMethod#description() @RestMethod(description)}
-			<li><code><del>RestMethod#responses()</del></code>
-			<li><code><del>Attr.description()</del></code>
-			<li><code><del>Content.description()</del></code>
-			<li><code><del>HasParam.description()</del></code>
-			<li><code><del>HasQParam.description()</del></code>
-			<li><code><del>Header.description()</del></code>
-			<li><code><del>Param.description()</del></code>
-			<li><code><del>QParam.description()</del></code>
+			<li><dc>RestMethod#responses()</dc>
+			<li><dc>Attr.description()</dc>
+			<li><dc>Content.description()</dc>
+			<li><dc>HasParam.description()</dc>
+			<li><dc>HasQParam.description()</dc>
+			<li><dc>Header.description()</dc>
+			<li><dc>Param.description()</dc>
+			<li><dc>QParam.description()</dc>
 		</ul>
-	<li>Support for sorting resources by name in <code><del>ChildResourceDescriptions</del></code>.
+	<li>Support for sorting resources by name in <dc>ChildResourceDescriptions</dc>.
 </ul>
 
 <h5 class='topic w800'>Samples</h5>
 <ul class='spaced-list'>
-	<li>Added <code>/tempDir/upload</code> showing how to use <code>ServletFileUpload</code> with multipart form posts.
+	<li>Added <c>/tempDir/upload</c> showing how to use <c>ServletFileUpload</c> with multipart form posts.
 </ul>
diff --git a/juneau-doc/docs/ReleaseNotes/5.1.0.18.html b/juneau-doc/docs/ReleaseNotes/5.1.0.18.html
index 2c76a72..5beadbf 100644
--- a/juneau-doc/docs/ReleaseNotes/5.1.0.18.html
+++ b/juneau-doc/docs/ReleaseNotes/5.1.0.18.html
@@ -23,17 +23,17 @@
 <ul class='spaced-list'>
 	<li>Fixed bug where localized strings weren't resolving when using chained resource bundles.
 	<li>Servlet and method labels and descriptions can now contain embedded string variables.
-	<li>New <code><del>RestMethod.input()</del></code> and <code><del>RestMethod.responses()</del></code>
+	<li>New <dc>RestMethod.input()</dc> and <dc>RestMethod.responses()</dc>
 		annotations.
-		These replace the various <code>description</code> annotations added 2 days ago with a simpler design.
+		These replace the various <c>description</c> annotations added 2 days ago with a simpler design.
 	<li>New methods on {@link oajr.RestServlet}:
 		<ul>
-			<li><code><del>RestServlet.getMethodDescription(String,RestRequest)</del></code> so that subclasses
+			<li><dc>RestServlet.getMethodDescription(String,RestRequest)</dc> so that subclasses
 				can override the method description in the OPTIONS page.
-			<li><code><del>RestServlet.createRequestVarResolver(RestRequest)</del></code> so that subclasses
+			<li><dc>RestServlet.createRequestVarResolver(RestRequest)</dc> so that subclasses
 				can override and augment the variable resolver.
-			<li><code><del>RestServlet.resolveChild(Class)</del></code> and <code><del>RestServlet.replaceChild(RestServlet)</del></code>
+			<li><dc>RestServlet.resolveChild(Class)</dc> and <dc>RestServlet.replaceChild(RestServlet)</dc>
 				classes that allows customized resolution of servlet instances (e.g. if services are defined in OSGi).
 		</ul> 
-	<li>Reverted the <code><del>MethodDescription</del></code> back to 5.1.0.16 since it was being used by someone.
+	<li>Reverted the <dc>MethodDescription</dc> back to 5.1.0.16 since it was being used by someone.
 </ul>
diff --git a/juneau-doc/docs/ReleaseNotes/5.1.0.19.html b/juneau-doc/docs/ReleaseNotes/5.1.0.19.html
index 4609d4e..1105810 100644
--- a/juneau-doc/docs/ReleaseNotes/5.1.0.19.html
+++ b/juneau-doc/docs/ReleaseNotes/5.1.0.19.html
@@ -17,7 +17,7 @@
 
 <p>
 	Juno 5.1.0.19 is a minor update in terms of core functionality.
-	But it introduces a <code><del>Microservices</del></code> project for building REST microservices and docker containers.
+	But it introduces a <dc>Microservices</dc> project for building REST microservices and docker containers.
 </p>
 
 <h5 class='topic w800'>Core</h5>
@@ -27,7 +27,7 @@
 	<li>New {@link oaj.ObjectMap#include(String[])} and {@link oaj.ObjectMap#exclude(String[])} methods.
 	<li>{@link oaj.html.annotation.Html @Html} annotations can now be applied to bean properties.
 	<li>New {@link oaj.utils.IOPipe} utility class.
-	<li>Behavior change on <code><del>StringVarResolver</del></code>.  <jk>null</jk> input now results in blank strings instead of <jk>null</jk>.
+	<li>Behavior change on <dc>StringVarResolver</dc>.  <jk>null</jk> input now results in blank strings instead of <jk>null</jk>.
 </ul>
 
 <h5 class='topic w800'>Client</h5>
@@ -38,12 +38,12 @@
 <h5 class='topic w800'>Server</h5>
 <ul class='spaced-list'>
 	<li>New {@link oajr.RestRequest#getHeaders()} method.
-	<li>New <code>RestResponse.getUnbufferedWriter()</code> method.
-	<li>Fixed bug that was preventing <code>x-response-headers</code> parameter from working correctly.
+	<li>New <c>RestResponse.getUnbufferedWriter()</c> method.
+	<li>Fixed bug that was preventing <c>x-response-headers</c> parameter from working correctly.
 	<li>Added {@link oaj.annotation.Bean#properties() @Bean.properties} annotations to the various 
-		classes in <code>org.apache.juneau.rest.labels</code> so that the order of the bean properties are consistent
+		classes in <c>org.apache.juneau.rest.labels</c> so that the order of the bean properties are consistent
 		on all JVMs.  On IBM JVMs this is unnecessary because the order of the properties as defined in the class
 		are stored in the bytecode.  Other JVMs such as OpenJRE do not implement this feature causing the bean
 		properties to be in random order.
-	<li>New <code><del>ResourceDescription.ResourceDescription(RestRequest,String,String)</del></code> constructor.
+	<li>New <dc>ResourceDescription.ResourceDescription(RestRequest,String,String)</dc> constructor.
 </ul>
diff --git a/juneau-doc/docs/ReleaseNotes/5.1.0.20.html b/juneau-doc/docs/ReleaseNotes/5.1.0.20.html
index aa7b045..62dd99d 100644
--- a/juneau-doc/docs/ReleaseNotes/5.1.0.20.html
+++ b/juneau-doc/docs/ReleaseNotes/5.1.0.20.html
@@ -17,15 +17,15 @@
 
 <p>
 	Juno 5.1.0.20 is a moderate update.
-	The biggest improvement is the ability to associate external INI config files with REST servlets using the <code><del>ConfigFile</del></code> functionality.
+	The biggest improvement is the ability to associate external INI config files with REST servlets using the <dc>ConfigFile</dc> functionality.
 </p>
 
 <h5 class='topic w800'>Core</h5>
 <ul class='spaced-list'>
-	<li>Significant API changes to <code>org.apache.juneau.config</code> API.
+	<li>Significant API changes to <c>org.apache.juneau.config</c> API.
 		<ul>
-			<li><code><del>ConfigFile</del></code> is now thread safe and can be shared across multiple threads.
-			<li>New <code><del>ConfigMgr</del></code> class for managing configuration files.
+			<li><dc>ConfigFile</dc> is now thread safe and can be shared across multiple threads.
+			<li>New <dc>ConfigMgr</dc> class for managing configuration files.
 			<li>Serializers and parsers can be associated with config files for storing and retrieving POJOs.  
 				Default support provided for JSON.
 		</ul>
@@ -33,18 +33,18 @@
 	<li>New {@link oaj.html.SimpleHtmlWriter} class.  
 		Can be used for simple HTML DOM construction.
 	<li>New {@link oaj.utils.ProcBuilder} class for calling external processes.
-	<li>New <code><del>ObjectMap.remove(Class,String,Object)</del></code> method.
+	<li>New <dc>ObjectMap.remove(Class,String,Object)</dc> method.
 	<li><js>"class='link'"</js> added to links generated by {@link oaj.html.HtmlDocSerializer}.
-	<li>New <code><del>EncoderGroup#append(EncoderGroup)</del></code> method.
-	<li>New <code>HtmlDocSerializerContext.HTMLDOC_addLinks</code> configuration property.
-	<li>Modified the <code>Parser.createContext(ObjectMap,Method,Object)</code> method.  
+	<li>New <dc>EncoderGroup#append(EncoderGroup)</dc> method.
+	<li>New <c>HtmlDocSerializerContext.HTMLDOC_addLinks</c> configuration property.
+	<li>Modified the <c>Parser.createContext(ObjectMap,Method,Object)</c> method.  
 		Outer context objects can be passed in to create instances of non-static inner classes.
 	<li>Fixed bug in {@link oaj.html.HtmlStrippedDocSerializer} where exception was thrown when trying to serialize primitive arrays.
 	<li>{@link oaj.json.JsonParser} now handles parsing JSON boolean/numeric values as strings to bean properties of type boolean or number. 
 	<li>{@link oaj.urlencoding.UrlEncodingSerializer} and {@link oaj.urlencoding.UrlEncodingParser} now 
 		represent arrays and collections as key-value pairs where the keys are numbers (e.g. <js>"?0=foo&amp;1=bar"</js>).
 	<li>Various internal improvements to {@link oaj.utils.IOPipe}.
-	<li>New <code><del>ReflectionUtils.getResource(Class,String)</del></code> method.
+	<li>New <dc>ReflectionUtils.getResource(Class,String)</dc> method.
 	<li>{@link oaj.internal.StringUtils#parseNumber(String,Class)} now returns zero for empty strings. 
 		This affects the way most parsers handle blank values.
 </ul>
@@ -56,39 +56,39 @@
 	<li>Changes to {@link oajr.RestServlet}:
 		<ul>
 			<li>New methods for accessing external INI config files:<br>  
-				<code><del>RestServlet.getConfig()</del></code><br>
-				<code><del>RestServlet.createConfigFile()</del></code>
+				<dc>RestServlet.getConfig()</dc><br>
+				<dc>RestServlet.createConfigFile()</dc>
 			<li>New <js>"$C{...}"</js> variable that resolve to INI config file values.
 			<li>New <js>"$UE{...}"</js> variable that  URL-encodes the value inside the variable.
 			<li>New convenience methods for retrieving classpath resource files:<br>  
-				<code><del>RestServlet.getResource(String)</del></code><br>
-				<code><del>RestServlet.getResourceAsString(String)</del></code><br>
-				<code><del>RestServlet.getResource(Class,String,String)</del></code>.
+				<dc>RestServlet.getResource(String)</dc><br>
+				<dc>RestServlet.getResourceAsString(String)</dc><br>
+				<dc>RestServlet.getResource(Class,String,String)</dc>.
 					Useful if you want to load predefined POJOs from JSON files in your classpath.
-			<li>New <code><del>RestServlet.handleNotFound(int,RestRequest,RestResponse)</del></code> method for customized handling
+			<li>New <dc>RestServlet.handleNotFound(int,RestRequest,RestResponse)</dc> method for customized handling
 				of when a resource or method was not found.  
 		</ul>
 	<li>{@link oajr.BasicRestServlet}  now automatically processes <js>"/favicon.ico"</js> requests by 
-		overriding the new <code><del>RestServlet.handleNotFound(int,RestRequest,RestResponse)</del></code> method.
+		overriding the new <dc>RestServlet.handleNotFound(int,RestRequest,RestResponse)</dc> method.
 	<li>New {@link oajr.RestRequest} methods: 
 		<ul>
-			<li><code><del>RestRequest.resolveVars(String)</del></code>
-			<li><code>RestRequest.getVarResource(String)</code>
-			<li><code><del>RestRequest.getConfig()</del></code>
+			<li><dc>RestRequest.resolveVars(String)</dc>
+			<li><c>RestRequest.getVarResource(String)</c>
+			<li><dc>RestRequest.getConfig()</dc>
 		</ul>
 	<li>New {@link oajr.RestResponse} methods: 
 		<ul>
 			<li>{@link oajr.RestResponse#getDirectWriter(String)}.
 			<li>{@link oajr.RestResponse#getNegotiatedWriter()}.  
-				<code>getWriter()</code> now returns an unnegotiated writer.  
-				<code>getUnbufferedWriter()</code> has been removed.
+				<c>getWriter()</c> now returns an unnegotiated writer.  
+				<c>getUnbufferedWriter()</c> has been removed.
 		</ul>
 	<li>New {@link oajr.annotation.RestMethod#encoders() @RestMethod(encoders)} and 
-		<code><del>RestMethod.inheritEncoders()</del></code> annotations.  
+		<dc>RestMethod.inheritEncoders()</dc> annotations.  
 		Allows encoders to be fine-tuned at the method level.
-	<li>New {@link oajr.annotation.RestResource#config() @RestResource(config)} annotation for associating external <code><del>ConfigFile</del></code> config files with servlets.
-	<li><code><del>ResourceLink</del></code>.
-	<li>New <code>org.apache.juneau.rest.matchers</code> package for commonly-used {@link oajr.RestMatcher RestMatchers}:
+	<li>New {@link oajr.annotation.RestResource#config() @RestResource(config)} annotation for associating external <dc>ConfigFile</dc> config files with servlets.
+	<li><dc>ResourceLink</dc>.
+	<li>New <c>org.apache.juneau.rest.matchers</c> package for commonly-used {@link oajr.RestMatcher RestMatchers}:
 		<ul>
 			<li>{@link oajr.matchers#MultipartFormDataMatcher}
 			<li>{@link oajr.matchers#UrlEncodedFormMatcher}
diff --git a/juneau-doc/docs/ReleaseNotes/5.2.0.0.html b/juneau-doc/docs/ReleaseNotes/5.2.0.0.html
index 14c7435..e01ac1f 100644
--- a/juneau-doc/docs/ReleaseNotes/5.2.0.0.html
+++ b/juneau-doc/docs/ReleaseNotes/5.2.0.0.html
@@ -22,80 +22,80 @@
 
 <h5 class='topic w800'>Core</h5>
 <ul class='spaced-list'>
-	<li>Significant changes and enhancements to the <code>org.apache.juneau.config</code> API.
+	<li>Significant changes and enhancements to the <c>org.apache.juneau.config</c> API.
 		<ul>
 			<li>More consistent handling of comma-delimited lists of objects.
-			<li>New methods in <code><del>ConfigFile</del></code>:
+			<li>New methods in <dc>ConfigFile</dc>:
 				<ul>
-					<li><code><del>ConfigFile.getStringArray(String)</del></code>,<code><del>ConfigFile.getStringArray(String,String[])</del></code>
-					<li><code><del>ConfigFile.getSectionAsBean(String,Class)</del></code> - Instantiate a new bean with property values in the specified section..
-					<li><code><del>ConfigFile.writeProperties(String,Object,boolean,Class[])</del></code> - Copy the properties in a config file section into properties on an existing bean or POJO.
-					<li><code><del>ConfigFile.getSectionMap(String)</del></code> - Get all the resolved values in a section.
-					<li><code><del>ConfigFile.containsNonEmptyValue(String)</del></code> 
-					<li><code><del>ConfigFile.isEncoded(String)</del></code> 
-					<li><code><del>ConfigFile.addListener(ConfigFileListener)</del></code> - Listen for modification events on the config file.
-					<li><code><del>ConfigFile.merge(ConfigFile)</del></code> - Merge the contents of another config file into this config file.
-					<li><code><del>ConfigFile.getResolving()</del></code>, <code><del>ConfigFile.getResolving(StringVarResolver)</del></code> - Return an instance of the config file that resolves string variables.
+					<li><dc>ConfigFile.getStringArray(String)</dc>,<dc>ConfigFile.getStringArray(String,String[])</dc>
+					<li><dc>ConfigFile.getSectionAsBean(String,Class)</dc> - Instantiate a new bean with property values in the specified section..
+					<li><dc>ConfigFile.writeProperties(String,Object,boolean,Class[])</dc> - Copy the properties in a config file section into properties on an existing bean or POJO.
+					<li><dc>ConfigFile.getSectionMap(String)</dc> - Get all the resolved values in a section.
+					<li><dc>ConfigFile.containsNonEmptyValue(String)</dc> 
+					<li><dc>ConfigFile.isEncoded(String)</dc> 
+					<li><dc>ConfigFile.addListener(ConfigFileListener)</dc> - Listen for modification events on the config file.
+					<li><dc>ConfigFile.merge(ConfigFile)</dc> - Merge the contents of another config file into this config file.
+					<li><dc>ConfigFile.getResolving()</dc>, <dc>ConfigFile.getResolving(StringVarResolver)</dc> - Return an instance of the config file that resolves string variables.
 						Much more efficient than the previous design since the same underlying config file object is shared.
-					<li><code><del>ConfigFile.toWritable()</del></code> - Wraps the config file in a {@link oaj.Writable} interface so that it can be serialized by the REST interface as a plain-text INI file instead of as a serialized POJO.
-					<li><code><del>ConfigFile.getInt(String)</del></code> - Now supports <js>"M"</js> and <js>"K"</js> to identify millions and thousands.
+					<li><dc>ConfigFile.toWritable()</dc> - Wraps the config file in a {@link oaj.Writable} interface so that it can be serialized by the REST interface as a plain-text INI file instead of as a serialized POJO.
+					<li><dc>ConfigFile.getInt(String)</dc> - Now supports <js>"M"</js> and <js>"K"</js> to identify millions and thousands.
 				</ul>
-			<li>New methods in <code><del>ConfigMgr</del></code>:
+			<li>New methods in <dc>ConfigMgr</dc>:
 				<ul>
-					<li><code><del>ConfigMgr.create()</del></code>, <code><del>ConfigMgr.create(Reader)</del></code>, <code><del>ConfigMgr.create(File)</del></code>
-					<li><code><del>ConfigMgr.deleteAll()</del></code>	
+					<li><dc>ConfigMgr.create()</dc>, <dc>ConfigMgr.create(Reader)</dc>, <dc>ConfigMgr.create(File)</dc>
+					<li><dc>ConfigMgr.deleteAll()</dc>	
 				</ul>
-			<li>New methods in <code><del>Section</del></code>:
+			<li>New methods in <dc>Section</dc>:
 				<ul>
-					<li><code><del>Section.setParent(ConfigFileImpl)</del></code> - Used by parsers to set the config file for this section.
-					<li><code><del>Section.setName(String)</del></code> - Used by parsers to set the name for this section.
+					<li><dc>Section.setParent(ConfigFileImpl)</dc> - Used by parsers to set the config file for this section.
+					<li><dc>Section.setName(String)</dc> - Used by parsers to set the name for this section.
 				</ul>
 			<li>New interfaces:
 				<ul>
-					<li><code><del>org.apache.juneau.config.ConfigFileListener</del></code>
-					<li><code><del>org.apache.juneau.config.SectionListener</del></code>
-					<li><code><del>org.apache.juneau.config.EntryListener</del></code> 
+					<li><dc>org.apache.juneau.config.ConfigFileListener</dc>
+					<li><dc>org.apache.juneau.config.SectionListener</dc>
+					<li><dc>org.apache.juneau.config.EntryListener</dc> 
 				</ul>
-			<li><code><del>org.apache.juneau.config.Encoder</del></code> methods have access to field names to use them as salt values.
+			<li><dc>org.apache.juneau.config.Encoder</dc> methods have access to field names to use them as salt values.
 			<li>The name of the default section is now <js>"default"</js>.  Before it was just <jk>null</jk>.
-			<li><code><del>org.apache.juneau.config.XorEncoder</del></code> XOR key can be overridden through the <js>"org.apache.juneau.config.XorEncoder.key"</js> system property.
+			<li><dc>org.apache.juneau.config.XorEncoder</dc> XOR key can be overridden through the <js>"org.apache.juneau.config.XorEncoder.key"</js> system property.
 		</ul> 
 	<li>Support for converting Strings to POJOs if the POJO class has any of the following static methods: 
 		<ul>
-			<li><code>fromString(String)</code>
-			<li><code>valueOf(String)</code> (e.g. enums)
-			<li><code>parse(String)</code> (e.g. logging <code>Level</code> class)
-			<li><code>parseString(String)</code>
-			<li><code>forName(String)</code> (e.g. <code>Class</code> and <code>Charset</code> classes)
+			<li><c>fromString(String)</c>
+			<li><c>valueOf(String)</c> (e.g. enums)
+			<li><c>parse(String)</c> (e.g. logging <c>Level</c> class)
+			<li><c>parseString(String)</c>
+			<li><c>forName(String)</c> (e.g. <c>Class</c> and <c>Charset</c> classes)
 		</ul>
 	<li>Support for parsing into objects with unbound type variables.
-		For example, if you have a class <code>Pair&lt;S,T&gt;</code> and you try to parse into this
-		class (e.g. <code>parser.parse(in, Pair.<jk>class</jk>)</code>), the unbound type variables
-		is interpreted as <code>Object</code> instead of throwing an exception.
+		For example, if you have a class <c>Pair&lt;S,T&gt;</c> and you try to parse into this
+		class (e.g. <c>parser.parse(in, Pair.<jk>class</jk>)</c>), the unbound type variables
+		is interpreted as <c>Object</c> instead of throwing an exception.
 	<li>Support for serializing/parsing the following new types:
 		<ul>
-			<li><code>AtomicInteger</code>
-			<li><code>AtomicLong</code>
-			<li><code>BigInteger</code>
-			<li><code>BigDecimal</code>
+			<li><c>AtomicInteger</c>
+			<li><c>AtomicLong</c>
+			<li><c>BigInteger</c>
+			<li><c>BigDecimal</c>
 		</ul>
 	<li>Parsers have been enhanced to allow parent POJOs and field names to be passed into child POJOs.
 		New {@link oaj.annotation.NameProperty @NameProperty} and {@link oaj.annotation.ParentProperty @ParentProperty}
 			annotations are provided for identifying methods for setting names and parent POJOs on child POJOs.
-		For example, the config file <code><del>Section</del></code> class represents a section
-		in a config file.  It needs to know it's own name and have a link to the <code><del>ConfigFile</del></code> 
+		For example, the config file <dc>Section</dc> class represents a section
+		in a config file.  It needs to know it's own name and have a link to the <dc>ConfigFile</dc> 
 		that it belongs to.  With these new annotations, config files can be reconstructed using any of the parsers.
 	<li>New classes and interfaces:
 		<ul>
 			<li>{@link oaj.Streamable} interface for identifying objects that can be serialized directly to an output stream.
 			<li>{@link oaj.Writable} interface for identifying objects that can be serialized directly to a writer.
-			<li><code><del>StringObject</del></code> class that can be used for delayed object serialization.
-			<li><code><del>ByteArrayCache</del></code>
+			<li><dc>StringObject</dc> class that can be used for delayed object serialization.
+			<li><dc>ByteArrayCache</dc>
 			<li>{@link oaj.internal.ByteArrayInOutStream} 
 			<li>{@link oaj.internal.FileUtils}
 			<li>{@link oaj.internal.ThrowableUtils}
-			<li><code><del>StringVarMultipart</del></code>
-			<li><code><del>StringVarWithDefault</del></code>
+			<li><dc>StringVarMultipart</dc>
+			<li><dc>StringVarWithDefault</dc>
 		</ul> 
 	<li>New fields on {@link oaj.ObjectList}:
 		<ul>
@@ -117,14 +117,14 @@
 		</ul>	
 	<li>New methods in {@link oaj.internal.IOUtils}:
 		<ul>
-			<li><code><del>IOUtils.pipe(Reader,Writer)</del></code>
+			<li><dc>IOUtils.pipe(Reader,Writer)</dc>
 			<li>{@link oaj.internal.IOUtils#read(File)}
 			<li>{@link oaj.internal.IOUtils#readFile(String)}
 			<li>{@link oaj.internal.IOUtils#write(File,Reader)}
 		</ul>
 	<li>New methods on {@link oaj.utils.PojoRest}:
 		<ul>
-			<li><code><del>PojoRest.get(Class,String,Object)</del></code>
+			<li><dc>PojoRest.get(Class,String,Object)</dc>
 			<li>{@link oaj.utils.PojoRest#getString(String)}
 			<li>{@link oaj.utils.PojoRest#getString(String,String)}
 			<li>{@link oaj.utils.PojoRest#getInt(String)}
@@ -161,47 +161,47 @@
 			<li>{@link oaj.internal.StringUtils#base64Decode(String)}
 			<li>{@link oaj.internal.StringUtils#generateUUID(int)}
 			<li>{@link oaj.internal.StringUtils#trim(String)}
-			<li><code><del>StringUtils.parseISO8601Date(String)</del></code>
+			<li><dc>StringUtils.parseISO8601Date(String)</dc>
 			<li>{@link oaj.internal.StringUtils#replaceVars(String,Map)}
 			<li>{@link oaj.internal.StringUtils#pathStartsWith(String,String)}
 			<li>{@link oaj.internal.StringUtils#pathStartsWith(String,String[])}
 		</ul>
-	<li>New <code><del>StringVar.doResolve(String)</del></code> method.
-	<li>New <code><del>StringVarResolver.DEFAULT</del></code> field.
-	<li>Eliminated dependency on <code>javax.mail.internet.MimeUtility</code> by implementing our own {@link oaj.internal.StringUtils#base64Encode(byte[])} method.
+	<li>New <dc>StringVar.doResolve(String)</dc> method.
+	<li>New <dc>StringVarResolver.DEFAULT</dc> field.
+	<li>Eliminated dependency on <c>javax.mail.internet.MimeUtility</c> by implementing our own {@link oaj.internal.StringUtils#base64Encode(byte[])} method.
 	<li>{@link oaj.transforms.CalendarSwap} and {@link oaj.transforms.DateSwap} classes now handle blank input better.  Returns <jk>null</jk> instead of throwing an exception.
-	<li>{@link oaj.html.HtmlDocSerializer} specifies the default CSS location as <code>/servletPath/style.css</code> instead of <code>/servletPath/htdocs/juneau.css</code>.  
+	<li>{@link oaj.html.HtmlDocSerializer} specifies the default CSS location as <c>/servletPath/style.css</c> instead of <c>/servletPath/htdocs/juneau.css</c>.  
 		This coincides with enhancements made in the server code for specifying styles.
-	<li>{@link oaj.html.HtmlDocSerializer} wraps output in two div tags instead of one (e.g. <code>&lt;div class='outerdata'&gt;&lt;div class='data' id='data'&gt;...&lt;/div&gt;&lt;/div&gt;</code>).
+	<li>{@link oaj.html.HtmlDocSerializer} wraps output in two div tags instead of one (e.g. <c>&lt;div class='outerdata'&gt;&lt;div class='data' id='data'&gt;...&lt;/div&gt;&lt;/div&gt;</c>).
 		Needed for supporting the new devops look-and-feel.
 	<li>Fixed indentation inconsistencies in {@link oaj.html.HtmlDocSerializer}.
 	<li>Renamed <del>HtmlSchemaSerializer</del> to <del>HtmlSchemaDocSerializer</del>.
-	<li>RDF serializers and parsers now support <code>RdfProperties.RDF_looseCollection</code> loose collections.
+	<li>RDF serializers and parsers now support <c>RdfProperties.RDF_looseCollection</c> loose collections.
 	<li>RDF parser handles case where resources point to themselves (an unfortunate behavior in JFS RDF documents).
 	<li>JSON parser with throw an exception in strict mode if it encounters numbers that are valid in Java but invalid in JSON (e.g. octal, hexadecimal numbers).
 	<li>{@link oaj.parser.Parser} methods now check for <jk>null</jk> input.
-	<li>{@link oaj.serializer.SerializerGroup} and {@link oaj.parser.ParserGroup} ignores serializers and parsers if they throw <code>NoClassDefFoundErrors</code>.
+	<li>{@link oaj.serializer.SerializerGroup} and {@link oaj.parser.ParserGroup} ignores serializers and parsers if they throw <c>NoClassDefFoundErrors</c>.
 	<li>{@link oaj.urlencoding.UrlEncodingParser} creates lists if the same attribute name is encountered more than once.  Before it would just replace the previous value with the new value.
-	<li>New <code><del>UrlEncodingSerializer.DEFAULT_SIMPLE_EXPANDED</del></code> serializer.
+	<li>New <dc>UrlEncodingSerializer.DEFAULT_SIMPLE_EXPANDED</dc> serializer.
 	<li>Changes to {@link oaj.utils.Args}:
 		<ul>
-			<li><code>getMainArg(int)</code> changed to {@link oaj.utils.Args#getArg(int)}.  
+			<li><c>getMainArg(int)</c> changed to {@link oaj.utils.Args#getArg(int)}.  
 				Non-existent arguments are returned as <jk>null</jk> instead of blank strings.  
 				This is more inline with the behavior of the rest of the library.
 			<li>New {@link oaj.utils.Args#hasArg(int)} method.
 		</ul> 
-	<li>Removed <code>org.apache.juneau.utils.CharsetUtils</code> class.
-	<li>Removed <code>org.apache.juneau.utils.ConcurrentIdentityList</code> class.
+	<li>Removed <c>org.apache.juneau.utils.CharsetUtils</c> class.
+	<li>Removed <c>org.apache.juneau.utils.ConcurrentIdentityList</c> class.
 	<li>Fixed bug in {@link oaj.internal.MultiIterable} class.
-	<li>{@link oaj.utils.PojoIntrospector} must now be instantiated with a <code>ReaderParser</code>.
+	<li>{@link oaj.utils.PojoIntrospector} must now be instantiated with a <c>ReaderParser</c>.
 		Simplifies the API on the class.
-	<li>{@link oaj.utils.PojoRest} must now be instantiated with a <code>ReaderParser</code>.
+	<li>{@link oaj.utils.PojoRest} must now be instantiated with a <c>ReaderParser</c>.
 		Simplifies the API on the class.
-	<li>{@link oaj.utils.MessageBundle} and <code>SafeResourceMultiBundle</code> moved from server component.
-	<li>Several bug fixes and performance improvements in <code><del>StringVarResolver</del></code>.
+	<li>{@link oaj.utils.MessageBundle} and <c>SafeResourceMultiBundle</c> moved from server component.
+	<li>Several bug fixes and performance improvements in <dc>StringVarResolver</dc>.
 	<li>Various enhancements to {@link oaj.internal.TeeWriter} and {@link oaj.internal.TeeOutputStream}.
 	<li>Renamed <del>CharSet</del> to {@link oaj.internal.AsciiSet}.
-	<li>{@link oaj.serializer.SerializerGroup} and {@link oaj.parser.ParserGroup} now ignores <code>NoClassDefFoundErrors</code>
+	<li>{@link oaj.serializer.SerializerGroup} and {@link oaj.parser.ParserGroup} now ignores <c>NoClassDefFoundErrors</c>
 		so that resources that include Jena support can continue to operate even if the Jena libraries are not present.
 	<li>New {@link oaj.internal.FileUtils#createTempFile(String)} method.
 	<li>New {@link oaj.utils.PojoQuery} modified to handle bean getters that throw exceptions.
@@ -216,12 +216,12 @@
 			<li>{@link oajrc.HttpMethod}
 			<li>{@link oajrc.ResponsePattern}
 			<li>{@link oajrc.SimpleX509TrustManager}
-			<li><code><del>SSLOpts</del></code>
+			<li><dc>SSLOpts</dc>
 		</ul>
-	<li>Removed <code>org.apache.juneau.rest.client.LaxRedirectStrategy</code>.  Use HTTP Client equivalent.
+	<li>Removed <c>org.apache.juneau.rest.client.LaxRedirectStrategy</c>.  Use HTTP Client equivalent.
 	<li>New methods on {@link oajrc.RestCall}:
 		<ul>
-			<li><code><del>RestCall#addInterceptor(RestCallInterceptor)</del></code>
+			<li><dc>RestCall#addInterceptor(RestCallInterceptor)</dc>
 			<li>{@link oajrc.RestCall#pipeTo(Writer)}
 			<li>{@link oajrc.RestCall#pipeTo(Writer,boolean)}
 			<li>{@link oajrc.RestCall#pipeTo(String,Writer,boolean)}
@@ -234,8 +234,8 @@
 			<li>{@link oajrc.RestCall#captureResponse()}
 			<li>{@link oajrc.RestCall#successPattern(String)}
 			<li>{@link oajrc.RestCall#failurePattern(String)}
-			<li><code><del>RestCall#addResponsePattern(ResponsePattern)</del></code>
-			<li>{@link oajrc.RestCall#run()} - Renamed from <code>execute()</code>.
+			<li><dc>RestCall#addResponsePattern(ResponsePattern)</dc>
+			<li>{@link oajrc.RestCall#run()} - Renamed from <c>execute()</c>.
 			<li>{@link oajrc.RestCall#getCapturedResponse()}
 			<li>{@link oajrc.RestCall#getResponsePojoRest(Class)}
 			<li>{@link oajrc.RestCall#getResponsePojoRest()}
@@ -249,134 +249,134 @@
 		</ul>
 	<li>New methods on {@link oajrc.RestClient}:
 		<ul>
-			<li><code><del>RestClient.setBasicAuth(String,int,String,String)</del></code>
-			<li><code><del>RestClient.logTo(Level,Logger)</del></code>
-			<li><code><del>RestClient.setRootUrl(String)</del></code>
-			<li><code><del>RestClient.enableSSL(SSLOpts)</del></code>
-			<li><code><del>RestClient.enableLaxSSL()</del></code>
+			<li><dc>RestClient.setBasicAuth(String,int,String,String)</dc>
+			<li><dc>RestClient.logTo(Level,Logger)</dc>
+			<li><dc>RestClient.setRootUrl(String)</dc>
+			<li><dc>RestClient.enableSSL(SSLOpts)</dc>
+			<li><dc>RestClient.enableLaxSSL()</dc>
 			<li>{@link oajrc.RestClient#doCall(HttpMethod,Object,Object)}
-			<li><code><del>RestClient.createHttpClientBuilder()</del></code>
+			<li><dc>RestClient.createHttpClientBuilder()</dc>
 		</ul>
-	<li>New passthrough methods on {@link oajrc.RestClient} defined on <code>HttpClientBuilder</code>:
+	<li>New passthrough methods on {@link oajrc.RestClient} defined on <c>HttpClientBuilder</c>:
 		<ul>
-			<li><code><del>RestClient.setRedirectStrategy(RedirectStrategy)</del></code>
-			<li><code><del>RestClient.setDefaultCookieSpecRegistry(Lookup)</del></code>
-			<li><code><del>RestClient.setRequestExecutor(HttpRequestExecutor)</del></code>
-			<li><code><del>RestClient.setSSLHostnameVerifier(HostnameVerifier)</del></code>
-			<li><code><del>RestClient.setPublicSuffixMatcher(PublicSuffixMatcher)</del></code>
-			<li><code><del>RestClient.setSSLContext(SSLContext)</del></code>
-			<li><code><del>RestClient.setSSLSocketFactory(LayeredConnectionSocketFactory)</del></code>
-			<li><code><del>RestClient.setMaxConnTotal(int)</del></code>
-			<li><code><del>RestClient.setMaxConnPerRoute(int)</del></code>
-			<li><code><del>RestClient.setDefaultSocketConfig(SocketConfig)</del></code>
-			<li><code><del>RestClient.setDefaultConnectionConfig(ConnectionConfig)</del></code>
-			<li><code><del>RestClient.setConnectionTimeToLive(long,TimeUnit)</del></code>
-			<li><code><del>RestClient.setConnectionManager(HttpClientConnectionManager)</del></code>
-			<li><code><del>RestClient.setConnectionManagerShared(boolean)</del></code>
-			<li><code><del>RestClient.setConnectionReuseStrategy(ConnectionReuseStrategy)</del></code>
-			<li><code><del>RestClient.setKeepAliveStrategy(ConnectionKeepAliveStrategy)</del></code>
-			<li><code><del>RestClient.setTargetAuthenticationStrategy(AuthenticationStrategy)</del></code>
-			<li><code><del>RestClient.setProxyAuthenticationStrategy(AuthenticationStrategy)</del></code>
-			<li><code><del>RestClient.setUserTokenHandler(UserTokenHandler)</del></code>
-			<li><code><del>RestClient.disableConnectionState()</del></code>
-			<li><code><del>RestClient.setSchemePortResolver(SchemePortResolver)</del></code>
-			<li><code><del>RestClient.setUserAgent(String userAgent)</del></code>
-			<li><code><del>RestClient.setDefaultHeaders(Collection)</del></code>
-			<li><code><del>RestClient.addInterceptorFirst(HttpResponseInterceptor)</del></code>
-			<li><code><del>RestClient.addInterceptorLast(HttpResponseInterceptor)</del></code>
-			<li><code><del>RestClient.addInterceptorFirst(HttpRequestInterceptor)</del></code>
-			<li><code><del>RestClient.addInterceptorLast(HttpRequestInterceptor)</del></code>
-			<li><code><del>RestClient.disableCookieManagement()</del></code>
-			<li><code><del>RestClient.disableContentCompression()</del></code>
-			<li><code><del>RestClient.disableAuthCaching()</del></code>
-			<li><code><del>RestClient.setHttpProcessor(HttpProcessor)</del></code>
-			<li><code><del>RestClient.setRetryHandler(HttpRequestRetryHandler)</del></code>
-			<li><code><del>RestClient.disableAutomaticRetries()</del></code>
-			<li><code><del>RestClient.setProxy(HttpHost)</del></code>
-			<li><code><del>RestClient.setRoutePlanner(HttpRoutePlanner)</del></code>
-			<li><code><del>RestClient.disableRedirectHandling()</del></code>
-			<li><code><del>RestClient.setConnectionBackoffStrategy(ConnectionBackoffStrategy)</del></code>
-			<li><code><del>RestClient.setBackoffManager(BackoffManager)</del></code>
-			<li><code><del>RestClient.setServiceUnavailableRetryStrategy(ServiceUnavailableRetryStrategy)</del></code>
-			<li><code><del>RestClient.setDefaultCookieStore(CookieStore)</del></code>
-			<li><code><del>RestClient.setDefaultCredentialsProvider(CredentialsProvider)</del></code>
-			<li><code><del>RestClient.setDefaultAuthSchemeRegistry(Lookup)</del></code>
-			<li><code><del>RestClient.setContentDecoderRegistry(Map)</del></code>
-			<li><code><del>RestClient.setDefaultRequestConfig(RequestConfig)</del></code>
-			<li><code><del>RestClient.useSystemProperties()</del></code>
-			<li><code><del>RestClient.evictExpiredConnections()</del></code>
-			<li><code><del>RestClient.evictIdleConnections(long,TimeUnit)</del></code>
+			<li><dc>RestClient.setRedirectStrategy(RedirectStrategy)</dc>
+			<li><dc>RestClient.setDefaultCookieSpecRegistry(Lookup)</dc>
+			<li><dc>RestClient.setRequestExecutor(HttpRequestExecutor)</dc>
+			<li><dc>RestClient.setSSLHostnameVerifier(HostnameVerifier)</dc>
+			<li><dc>RestClient.setPublicSuffixMatcher(PublicSuffixMatcher)</dc>
+			<li><dc>RestClient.setSSLContext(SSLContext)</dc>
+			<li><dc>RestClient.setSSLSocketFactory(LayeredConnectionSocketFactory)</dc>
+			<li><dc>RestClient.setMaxConnTotal(int)</dc>
+			<li><dc>RestClient.setMaxConnPerRoute(int)</dc>
+			<li><dc>RestClient.setDefaultSocketConfig(SocketConfig)</dc>
+			<li><dc>RestClient.setDefaultConnectionConfig(ConnectionConfig)</dc>
+			<li><dc>RestClient.setConnectionTimeToLive(long,TimeUnit)</dc>
+			<li><dc>RestClient.setConnectionManager(HttpClientConnectionManager)</dc>
+			<li><dc>RestClient.setConnectionManagerShared(boolean)</dc>
+			<li><dc>RestClient.setConnectionReuseStrategy(ConnectionReuseStrategy)</dc>
+			<li><dc>RestClient.setKeepAliveStrategy(ConnectionKeepAliveStrategy)</dc>
+			<li><dc>RestClient.setTargetAuthenticationStrategy(AuthenticationStrategy)</dc>
+			<li><dc>RestClient.setProxyAuthenticationStrategy(AuthenticationStrategy)</dc>
+			<li><dc>RestClient.setUserTokenHandler(UserTokenHandler)</dc>
+			<li><dc>RestClient.disableConnectionState()</dc>
+			<li><dc>RestClient.setSchemePortResolver(SchemePortResolver)</dc>
+			<li><dc>RestClient.setUserAgent(String userAgent)</dc>
+			<li><dc>RestClient.setDefaultHeaders(Collection)</dc>
+			<li><dc>RestClient.addInterceptorFirst(HttpResponseInterceptor)</dc>
+			<li><dc>RestClient.addInterceptorLast(HttpResponseInterceptor)</dc>
+			<li><dc>RestClient.addInterceptorFirst(HttpRequestInterceptor)</dc>
+			<li><dc>RestClient.addInterceptorLast(HttpRequestInterceptor)</dc>
+			<li><dc>RestClient.disableCookieManagement()</dc>
+			<li><dc>RestClient.disableContentCompression()</dc>
+			<li><dc>RestClient.disableAuthCaching()</dc>
+			<li><dc>RestClient.setHttpProcessor(HttpProcessor)</dc>
+			<li><dc>RestClient.setRetryHandler(HttpRequestRetryHandler)</dc>
+			<li><dc>RestClient.disableAutomaticRetries()</dc>
+			<li><dc>RestClient.setProxy(HttpHost)</dc>
+			<li><dc>RestClient.setRoutePlanner(HttpRoutePlanner)</dc>
+			<li><dc>RestClient.disableRedirectHandling()</dc>
+			<li><dc>RestClient.setConnectionBackoffStrategy(ConnectionBackoffStrategy)</dc>
+			<li><dc>RestClient.setBackoffManager(BackoffManager)</dc>
+			<li><dc>RestClient.setServiceUnavailableRetryStrategy(ServiceUnavailableRetryStrategy)</dc>
+			<li><dc>RestClient.setDefaultCookieStore(CookieStore)</dc>
+			<li><dc>RestClient.setDefaultCredentialsProvider(CredentialsProvider)</dc>
+			<li><dc>RestClient.setDefaultAuthSchemeRegistry(Lookup)</dc>
+			<li><dc>RestClient.setContentDecoderRegistry(Map)</dc>
+			<li><dc>RestClient.setDefaultRequestConfig(RequestConfig)</dc>
+			<li><dc>RestClient.useSystemProperties()</dc>
+			<li><dc>RestClient.evictExpiredConnections()</dc>
+			<li><dc>RestClient.evictIdleConnections(long,TimeUnit)</dc>
 		</ul>
-	<li><code>JazzRestClient</code> now supports OIDC authentication.
+	<li><c>JazzRestClient</c> now supports OIDC authentication.
 	<li>These classes are now deprecated and will be removed in a future release:
 		<ul>
-			<li><code>org.apache.juneau.rest.client.jazz.CertificateStore</code>
-			<li><code>org.apache.juneau.rest.client.jazz.ICertificateValidator</code>
-			<li><code>org.apache.juneau.rest.client.jazz.ITrustStoreProvider</code>
-			<li><code>org.apache.juneau.rest.client.jazz.LenientCertificateValidator</code>
-			<li><code>org.apache.juneau.rest.client.jazz.SharedTrustStoreProvider</code>
-			<li><code>org.apache.juneau.rest.client.jazz.ValidatingX509TrustManager</code>
+			<li><c>org.apache.juneau.rest.client.jazz.CertificateStore</c>
+			<li><c>org.apache.juneau.rest.client.jazz.ICertificateValidator</c>
+			<li><c>org.apache.juneau.rest.client.jazz.ITrustStoreProvider</c>
+			<li><c>org.apache.juneau.rest.client.jazz.LenientCertificateValidator</c>
+			<li><c>org.apache.juneau.rest.client.jazz.SharedTrustStoreProvider</c>
+			<li><c>org.apache.juneau.rest.client.jazz.ValidatingX509TrustManager</c>
 		</ul>
 </ul>
 
 <h5 class='topic w800'>Server</h5>
 <ul class='spaced-list'>
-	<li>New <code><del>ReaderResource</del></code> class.   
+	<li>New <dc>ReaderResource</dc> class.   
 		Represents the contents of a text file with convenience methods for resolving
-		<code><del>StringVar</del></code> variables and adding HTTP response headers.	
-		REST Java methods can return instances of these to serialize <code>Readers</code>
-			containing text with <code><del>StringVarResolver</del></code> variables in them.
-	<li>New <code><del>StreamResource</del></code> class.   
-		REST Java methods can return instances of these to serialize <code>OutputStreams</code>.
+		<dc>StringVar</dc> variables and adding HTTP response headers.	
+		REST Java methods can return instances of these to serialize <c>Readers</c>
+			containing text with <dc>StringVarResolver</dc> variables in them.
+	<li>New <dc>StreamResource</dc> class.   
+		REST Java methods can return instances of these to serialize <c>OutputStreams</c>.
 	<li>Fixed a bug in the stack trace hash algorithm in {@link oajr.RestException}.
 	<li>New methods in {@link oajr.RestRequest}:
 		<ul>
-			<li><code><del>RestRequest.getReaderResource(String)</del></code> - Replaces <code>getVarResource(String)</code>.
-			<li><code><del>RestRequest.getReaderResource(String,boolean)</del></code> 
-			<li><code><del>RestRequest.getReaderResource(String,boolean,String)</del></code>
+			<li><dc>RestRequest.getReaderResource(String)</dc> - Replaces <c>getVarResource(String)</c>.
+			<li><dc>RestRequest.getReaderResource(String,boolean)</dc> 
+			<li><dc>RestRequest.getReaderResource(String,boolean,String)</dc>
 		</ul>
 	<li>Changes in {@link oajr.RestResponse}:
 		<ul>
-			<li>Don't set <code>Content-Encoding: identity</code> when no encoding is used.  Some clients don't interpret it correctly.
+			<li>Don't set <c>Content-Encoding: identity</c> when no encoding is used.  Some clients don't interpret it correctly.
 		</ul>
 	<li>New methods in {@link oajr.RestServlet}:
 		<ul>
-			<li><code><del>RestServlet.getChildClasses()</del></code>  - Programmatic equivalent to {@link oajr.annotation.RestResource#children() @RestResource(children)} annotation.
-			<li><code><del>RestServlet.shouldLog(HttpServletRequest,HttpServletResponse,RestException)</del></code> 
-			<li><code><del>RestServlet.shouldLogStackTrace(HttpServletRequest,HttpServletResponse,RestException)</del></code> 
-			<li><code><del>RestServlet.logObjects(Level,String,Object[])</del></code> 
-			<li><code><del>RestServlet.resolveStaticFile(String)</del></code> 
-			<li><code><del>RestServlet.createStyleSheet()</del></code> 
-			<li><code><del>RestServlet.createFavIcon()</del></code> 
-			<li><code><del>RestServlet.createStaticFilesMap()</del></code> 
-			<li><code><del>RestServlet.getConfigMgr()</del></code>
+			<li><dc>RestServlet.getChildClasses()</dc>  - Programmatic equivalent to {@link oajr.annotation.RestResource#children() @RestResource(children)} annotation.
+			<li><dc>RestServlet.shouldLog(HttpServletRequest,HttpServletResponse,RestException)</dc> 
+			<li><dc>RestServlet.shouldLogStackTrace(HttpServletRequest,HttpServletResponse,RestException)</dc> 
+			<li><dc>RestServlet.logObjects(Level,String,Object[])</dc> 
+			<li><dc>RestServlet.resolveStaticFile(String)</dc> 
+			<li><dc>RestServlet.createStyleSheet()</dc> 
+			<li><dc>RestServlet.createFavIcon()</dc> 
+			<li><dc>RestServlet.createStaticFilesMap()</dc> 
+			<li><dc>RestServlet.getConfigMgr()</dc>
 		</ul>
 	<li>Removed {@link oaj.jso.JsoParser}
-		from {@link oajr.BasicRestServlet} and <code><del>RestServletJenaDefault</del></code>.  
+		from {@link oajr.BasicRestServlet} and <dc>RestServletJenaDefault</dc>.  
 		These may represent a security risk if not handled correctly, so removed
 		them as a precaution.
-	<li>Removed <code>RestServletProperties.REST_htDocsFolder</code>.  Replaced with {@link oajr.annotation.RestResource#staticFiles() @RestResource(staticFiles)}.
+	<li>Removed <c>RestServletProperties.REST_htDocsFolder</c>.  Replaced with {@link oajr.annotation.RestResource#staticFiles() @RestResource(staticFiles)}.
 	<li>New annotations on {@link oajr.annotation.RestResource @RestResource}.
 		<ul>
-			<li><code><del>RestResource.stylesheet()</del></code>
-			<li><code><del>RestResource.favicon()</del></code>
+			<li><dc>RestResource.stylesheet()</dc>
+			<li><dc>RestResource.favicon()</dc>
 			<li>{@link oajr.annotation.RestResource#staticFiles() @RestResource(staticFiles)}
 		</ul>
-	<li>Eliminated <code>org.apache.juneau.rest.jaxrs.JsonProvider</code> class.  
-		Some JAX-RS implementations use code scanning to find providers, so if you were using <code>DefaultJenaProvider</code>, it would
-		pick up <code>JsonProvider</code> as well.  It's easy enough to create your own implementation if needed.
-	<li>OPTIONS pages now specify <code>consumes</code> and <code>produces</code> fields instead of <code>accept</code> and <code>contentType</code> which was confusing.  
-	<li>Eliminated <code>properties</code> from OPTIONS pages. 
-	<li>New <code><del>ResourceLink.ResourceLink(String,RestRequest,String,Object[])</del></code> constructor.
+	<li>Eliminated <c>org.apache.juneau.rest.jaxrs.JsonProvider</c> class.  
+		Some JAX-RS implementations use code scanning to find providers, so if you were using <c>DefaultJenaProvider</c>, it would
+		pick up <c>JsonProvider</c> as well.  It's easy enough to create your own implementation if needed.
+	<li>OPTIONS pages now specify <c>consumes</c> and <c>produces</c> fields instead of <c>accept</c> and <c>contentType</c> which was confusing.  
+	<li>Eliminated <c>properties</c> from OPTIONS pages. 
+	<li>New <dc>ResourceLink.ResourceLink(String,RestRequest,String,Object[])</dc> constructor.
 	<li>New response handlers:
 		<ul>
-			<li><code><del>StreamableHandler</del></code> - Allows REST Java methods to return instances of {@link oaj.Streamable}.
-			<li><code><del>WritableHandler</del></code> - Allows REST Java methods to return instances of {@link oaj.Writable}.
+			<li><dc>StreamableHandler</dc> - Allows REST Java methods to return instances of {@link oaj.Streamable}.
+			<li><dc>WritableHandler</dc> - Allows REST Java methods to return instances of {@link oaj.Writable}.
 		</ul>
 	<li>New DevOps stylesheet.
 	<li>Servlet initialization and HTTP requests are now logged at <JSF>FINE</JSF> level.
 	<li>Added <jk>abstract</jk> modifier on various <l>RestServlet</l> subclasses to indicate that they're meant to be subclassed.
-	<li>New <code><del>RestUtils.trimPathInfo(StringBuffer,String,String)</del></code> method.
+	<li>New <dc>RestUtils.trimPathInfo(StringBuffer,String,String)</dc> method.
 </ul>
 
 <h5 class='topic w800'>Microservice</h5>
@@ -384,7 +384,7 @@
 	<li>Completely revamped API.
 	<li>New {@link oaj.microservice.Microservice} class that serves as a generic
 		interface for microservices and their lifecycles.
-	<li>New <code><del>RestMicroservice</del></code> class that implements a microservice
+	<li>New <dc>RestMicroservice</dc> class that implements a microservice
 		consisting of a REST interface.
 		<ul>
 			<li>REST resources and configuration settings can be defined through either manifest files
@@ -394,20 +394,20 @@
 			<li>BASIC auth support.
 			<li>Automatic restartability if the config file changes.
 		</ul>
-	<li>Eliminated <code>org.apache.juneau.microservice.Main</code> class.  This is replaced by
+	<li>Eliminated <c>org.apache.juneau.microservice.Main</c> class.  This is replaced by
 		the microservice classes defined above.
-	<li><code><del>Resource</del></code> and <code><del>ResourceGroup</del></code>
+	<li><dc>Resource</dc> and <dc>ResourceGroup</dc>
 		classes now support the following new string variables:
 		<ul>
 			<li><js>"$A{key,default}""</js> - Command line arguments.
 			<li><js>"$MF{key,default}""</js> - Manifest file entries.
 		</ul> 
 	<li>CSS stylesheet now configurable through config file entry <js>"REST/stylesheet"</js>.
-	<li>New <code><del>BasicRestServletJena</del></code> class if you want your REST interface to support RDF.
+	<li>New <dc>BasicRestServletJena</dc> class if you want your REST interface to support RDF.
 	<li>Eliminated the following classes:
 		<ul>
-			<li><code>org.apache.juneau.microservice.RootResource</code>
-			<li><code>org.apache.juneau.microservice.SampleResource</code>
+			<li><c>org.apache.juneau.microservice.RootResource</c>
+			<li><c>org.apache.juneau.microservice.SampleResource</c>
 		</ul> 
 	<li>New predefined reusable resources:
 		<ul>
@@ -428,9 +428,9 @@
 <ul class='spaced-list'>
 	<li><del>org.apache.juneau.microservice</del> - New package-level javadoc.
 	<li><del>org.apache.juneau.config</del> - New package-level javadoc.
-	<li><code><del>StringVarResolver</del></code> - New documentation.
+	<li><dc>StringVarResolver</dc> - New documentation.
 	<li><del>org.apache.juneau.rest.client</del> - New package-level javadoc.
-	<li><code><del>Overview / Samples</del></code> - New section.
+	<li><dc>Overview / Samples</dc> - New section.
 	<li><del>org.apache.juneau.transform / Stop Classes</del> - New section.
 	<li><del>org.apache.juneau.rest</del> - Extensive updates.
 </ul>
diff --git a/juneau-doc/docs/ReleaseNotes/5.2.0.1.html b/juneau-doc/docs/ReleaseNotes/5.2.0.1.html
index 7d02a05..75a3708 100644
--- a/juneau-doc/docs/ReleaseNotes/5.2.0.1.html
+++ b/juneau-doc/docs/ReleaseNotes/5.2.0.1.html
@@ -27,31 +27,31 @@
 	<li>Fixed issue in {@link oaj.xml.XmlSerializer} where <js>'\r'</js> and <js>'\n'</js> characters were not being handled per XML specs.
 	<li>New methods on {@link oaj.ObjectList}:  
 		<ul>
-			<li><code><del>ObjectList.getAt(Class,String)</del></code>
+			<li><dc>ObjectList.getAt(Class,String)</dc>
 			<li>{@link oaj.ObjectList#putAt(String,Object)}
 			<li>{@link oaj.ObjectList#postAt(String,Object)}
 			<li>{@link oaj.ObjectList#deleteAt(String)}
 		</ul>
 	<li>New methods on {@link oaj.ObjectMap}:  
 		<ul>
-			<li><code><del>ObjectMap.getAt(Class,String)</del></code>
+			<li><dc>ObjectMap.getAt(Class,String)</dc>
 			<li>{@link oaj.ObjectMap#putAt(String,Object)}
 			<li>{@link oaj.ObjectMap#postAt(String,Object)}
 			<li>{@link oaj.ObjectMap#deleteAt(String)}
 		</ul>
-	<li><code><del>@ThreadSafe</del></code> annotation.
-	<li>New <code>ClassFilter</code> class.
-	<li><code><del>ConfigFile.getResolving(StringVarResolver,boolean)</del></code> method.
-	<li><code><del>ConfigFile.getStringVar()</del></code> method.
-	<li>New <code><del>ParserContext.PARSER_trimStrings</del></code> property.
-	<li>New <code><del>SerializerContext.SERIALIZER_trimStrings</del></code> property.
-	<li><code><del>Args.getStringVar()}</del></code> method.
+	<li><dc>@ThreadSafe</dc> annotation.
+	<li>New <c>ClassFilter</c> class.
+	<li><dc>ConfigFile.getResolving(StringVarResolver,boolean)</dc> method.
+	<li><dc>ConfigFile.getStringVar()</dc> method.
+	<li>New <dc>ParserContext.PARSER_trimStrings</dc> property.
+	<li>New <dc>SerializerContext.SERIALIZER_trimStrings</dc> property.
+	<li><dc>Args.getStringVar()}</dc> method.
 	<li>New {@link oaj.utils.ManifestFile} class
 	<li>New {@link oaj.utils.MessageBundle} class.  Replaces <l>SafeResourceBundle</l>/<l>SafeResourceMultiBundle</l>/<l>RestNls</l>.
-	<li>New <code><del>StringMapVar</del></code> class.
-	<li>New <code><del>StringVars</del></code> class with reusable common <code><del>StringVar</del></code> instances.
+	<li>New <dc>StringMapVar</dc> class.
+	<li>New <dc>StringVars</dc> class with reusable common <dc>StringVar</dc> instances.
 	<li>New {@link oaj.internal.JuneauLogger} class.
-	<li>Default value for <code><del>XmlParserContext.XML_trimWhitespace</del></code> changed to <jk>true</jk>.			
+	<li>Default value for <dc>XmlParserContext.XML_trimWhitespace</dc> changed to <jk>true</jk>.			
 </ul>
 
 <h5 class='topic w800'>Server</h5>
diff --git a/juneau-doc/docs/ReleaseNotes/6.0.0.html b/juneau-doc/docs/ReleaseNotes/6.0.0.html
index 4a5bee5..1353380 100644
--- a/juneau-doc/docs/ReleaseNotes/6.0.0.html
+++ b/juneau-doc/docs/ReleaseNotes/6.0.0.html
@@ -39,7 +39,7 @@
 			<li>More consistent handling of exceptions.
 			<li>More consistent method declarations.
 		</ul>
-	<li>Refactored var resolver API and added them to a new package - <code>org.apache.juneau.svl</code>.
+	<li>Refactored var resolver API and added them to a new package - <c>org.apache.juneau.svl</c>.
 		<ul>
 			<li>Support for stream-based variables - {@link oaj.svl.StreamedVar}.
 			<li>Added support for context and session objects.
@@ -58,47 +58,47 @@
 			<li>{@link oaj.BeanContext#BEAN_beanTypePropertyName} - The overridable type property name.  Default is <js>"_type"</js>.
 			<li>{@link oaj.annotation.BeanProperty#beanDictionary() @BeanProperty(beanDictionary)} - Define a type dictionary
 				for a particular bean property value.  This overrides the value specified using {@link oaj.BeanContext#BEAN_beanDictionary}.
-			<li><code><del>SerializerContext.SERIALIZER_addBeanTypeProperties</del></code> - Controls whether type properties are serialized.
+			<li><dc>SerializerContext.SERIALIZER_addBeanTypeProperties</dc> - Controls whether type properties are serialized.
 		</ul>
-		In addition, the {@link oaj.annotation.Bean#typeName() @Bean(typeName)} value replaces the <code>@Xml(name)</code> annotation, and the 
+		In addition, the {@link oaj.annotation.Bean#typeName() @Bean(typeName)} value replaces the <c>@Xml(name)</c> annotation, and the 
 		<js>"type"</js> and <js>"_class"</js> attributes in the XML and HTML serializers have been standardized on a single <js>"_type"</js> attribute.
 	<li>Refactor bean filter support to use {@link oaj.transform.BeanFilterBuilder} class.
-		Allows the <code>BeanFilter</code> class to use final fields.
+		Allows the <c>BeanFilter</c> class to use final fields.
 	<li>{@link oaj.msgpack MessagePack} support.
 	<li>Serializers can now serialize directly to {@link java.io.File Files}.
 		See {@link oaj.serializer.Serializer#serialize(Object,Object)}
 	<li>Parsers can now parse directly from {@link java.io.File Files} and other types.
 		See {@link oaj.parser.Parser#parse(Object,ClassMeta)}
-	<li>Parsers will automatically covert numeric input to POJOs that have numeric constructors (e.g. <code>java.util.Date</code>).
+	<li>Parsers will automatically covert numeric input to POJOs that have numeric constructors (e.g. <c>java.util.Date</c>).
 	<li>Renamed 'Filters' to 'BeanFilters' and 'PojoSwaps'.  Filters is just too overloaded a term.
-	<li>Internal utility classes moved to a new <code>org.apache.juneau.internal</code> package.
+	<li>Internal utility classes moved to a new <c>org.apache.juneau.internal</c> package.
 		These internal utility classes are not meant for consumption outside the Juneau codebase.
 	<li>New methods on {@link oaj.parser.Parser}:
 		<ul>
-			<li><code>org.apache.juneau.parser.Parser.createSession(ObjectMap,Method,Object)</code>
-			<li><code><del>Parser.getMediaRanges()</del></code>
+			<li><c>org.apache.juneau.parser.Parser.createSession(ObjectMap,Method,Object)</c>
+			<li><dc>Parser.getMediaRanges()</dc>
 		</ul>
 	</li>
 	<li>New methods on {@link oaj.serializer.Serializer}:
 		<ul>
-			<li><code>org.apache.juneau.serializer.Serializer.createSession(ObjectMap,Method)</code>
-			<li><code><del>Serializer.getMediaRanges()</del></code>
+			<li><c>org.apache.juneau.serializer.Serializer.createSession(ObjectMap,Method)</c>
+			<li><dc>Serializer.getMediaRanges()</dc>
 		</ul>
 	</li>
 	<li>New {@link oaj.annotation.Bean#sort() @Bean(sort)} annotation.
 	<li>Added <ja>@Bean.properties</ja> annotations on various DTO beans to make the ordering consistent
 		between IBM and Oracle JVMs.<br>
 		IBM JVMs maintain the order of methods in a class, whereas Oracle JVMs do not.
-	<li>Serializers and parsers now automatically convert {@link java.lang.Class} objects to readable names via <code><del>ClassUtils.getReadableClassName(Class)</del></code>.
-	<li>Eliminated the <code>ClassFilter</code> class since it's no longer needed.
+	<li>Serializers and parsers now automatically convert {@link java.lang.Class} objects to readable names via <dc>ClassUtils.getReadableClassName(Class)</dc>.
+	<li>Eliminated the <c>ClassFilter</c> class since it's no longer needed.
 	<li>Code and concurrency improvements to {@link oaj.serializer.SerializerGroup} and {@link oaj.parser.ParserGroup}.
-	<li>Various enhancements to <code><del>BeanContext.convertToType(Object,Class)</del></code>.
+	<li>Various enhancements to <dc>BeanContext.convertToType(Object,Class)</dc>.
 	<li>New properties on {@link oaj.html.HtmlSerializer}:
 		<ul>
-			<li><code><del>HtmlSerializerContext.HTML_detectLinksInStrings</del></code> - Automatically detect hyperlinks in strings.
-			<li><code><del>HtmlSerializerContext.HTML_lookForLabelParameters</del></code> - Specify anchor text by appending <code>&amp;label=MyLabel</code> to URL.
-			<li><code><del>HtmlSerializerContext.HTML_labelParameter</del></code> - Specify what URL parameter to use as the anchor text label.
-			<li><code><del>HtmlSerializerContext.URI_ANCHOR</del></code> option for <code><del>HtmlSerializerContext.HTML_uriAnchorText</del></code>.				
+			<li><dc>HtmlSerializerContext.HTML_detectLinksInStrings</dc> - Automatically detect hyperlinks in strings.
+			<li><dc>HtmlSerializerContext.HTML_lookForLabelParameters</dc> - Specify anchor text by appending <c>&amp;label=MyLabel</c> to URL.
+			<li><dc>HtmlSerializerContext.HTML_labelParameter</dc> - Specify what URL parameter to use as the anchor text label.
+			<li><dc>HtmlSerializerContext.URI_ANCHOR</dc> option for <dc>HtmlSerializerContext.HTML_uriAnchorText</dc>.				
 		</ul>
 	</li>
 	<li>Removed generics from {@link oaj.BeanPropertyMeta}.
@@ -109,7 +109,7 @@
 			<li>{@link oaj.BeanPropertyMetaExtended} / {@link oaj.BeanPropertyMeta#getExtendedMeta(Class)} 
 		</ul>
 	</li>
-	<li>Renamed <code>@Transform</code> annotation to <code><del>@Pojo</del></code> so that it can be used for various POJO-related behavior, not just associating transforms.  
+	<li>Renamed <c>@Transform</c> annotation to <dc>@Pojo</dc> so that it can be used for various POJO-related behavior, not just associating transforms.  
 	<li>Introduced {@link oaj.dto.swagger Swagger DTOs}.
 </ul>		
 
@@ -119,44 +119,44 @@
 		Lots of changes related to supporting Swagger.
 		<ul>
 			<li>Annotation name changes to conform to Swagger specs:  <ja>@Attr</ja>-&gt;<ja>@Path</ja>, <ja>@QParam</ja>-&gt;<ja>@Query</ja>, <ja>@Param</ja>-&gt;<ja>@FormData</ja>, <ja>@Content</ja>-&gt;<ja>@Body</ja>
-			<li>Eliminated <code>ResourceOptions</code> and related code.
+			<li>Eliminated <c>ResourceOptions</c> and related code.
 			<li>New annotations and related methods:
 				<ul>
 					<li>{@link oajr.annotation.RestResource#title() @RestResource(title)} / {@link oajr.RestInfoProvider#getTitle(RestRequest)}
 					<li>{@link oajr.annotation.RestResource#description() @RestResource(description)} / {@link oajr.RestInfoProvider#getDescription(RestRequest)}
-					<li><code><del>@RestResource(termsOfService)</del></code> / <code><del>RestInfoProvider.getTermsOfService(RestRequest)</del></code>
-					<li><code><del>@RestResource(contact)</del></code> / <code><del>RestInfoProvider.getContact(RestRequest)</del></code>
-					<li><code><del>@RestResource(license)</del></code> / <code><del>RestInfoProvider.getLicense(RestRequest)</del></code>
-					<li><code><del>@RestResource(version)</del></code> / <code><del>RestInfoProvider.getVersion(RestRequest)</del></code>
-					<li><code><del>@RestResource(tags)</del></code> / <code><del>RestInfoProvider.getTags(RestRequest)</del></code>
-					<li><code><del>@RestResource(externalDocs)</del></code> / <code><del>RestInfoProvidergetExternalDocs(RestRequest)</del></code>
-					<li>{@link oajr.annotation.RestMethod#summary() @RestMethod(summary)} / <code><del>RestInfoProvider.getMethodSummary(String,RestRequest)</del></code>
-					<li>{@link oajr.annotation.RestMethod#description() @RestMethod(description)} /<code><del>RestInfoProvider.getMethodDescription(String,RestRequest)</del></code>
-					<li><code><del>@RestMethod(externalDocs)</del></code>
-					<li><code><del>@RestMethod(tags)</del></code>
-					<li><code><del>@RestMethod(deprecated)</del></code> 
-					<li><code><del>@RestMethod(parameters)</del></code> 
-					<li><code><del>@RestMethod(responses)</del></code>
+					<li><dc>@RestResource(termsOfService)</dc> / <dc>RestInfoProvider.getTermsOfService(RestRequest)</dc>
+					<li><dc>@RestResource(contact)</dc> / <dc>RestInfoProvider.getContact(RestRequest)</dc>
+					<li><dc>@RestResource(license)</dc> / <dc>RestInfoProvider.getLicense(RestRequest)</dc>
+					<li><dc>@RestResource(version)</dc> / <dc>RestInfoProvider.getVersion(RestRequest)</dc>
+					<li><dc>@RestResource(tags)</dc> / <dc>RestInfoProvider.getTags(RestRequest)</dc>
+					<li><dc>@RestResource(externalDocs)</dc> / <dc>RestInfoProvidergetExternalDocs(RestRequest)</dc>
+					<li>{@link oajr.annotation.RestMethod#summary() @RestMethod(summary)} / <dc>RestInfoProvider.getMethodSummary(String,RestRequest)</dc>
+					<li>{@link oajr.annotation.RestMethod#description() @RestMethod(description)} /<dc>RestInfoProvider.getMethodDescription(String,RestRequest)</dc>
+					<li><dc>@RestMethod(externalDocs)</dc>
+					<li><dc>@RestMethod(tags)</dc>
+					<li><dc>@RestMethod(deprecated)</dc> 
+					<li><dc>@RestMethod(parameters)</dc> 
+					<li><dc>@RestMethod(responses)</dc>
 				</ul>
 			</li>					
 		</ul>
-	<li>New <code><del>RestServletContext.paramFormat</del></code> context property.
+	<li>New <dc>RestServletContext.paramFormat</dc> context property.
 	<li>New/updated methods on {@link oajr.RestServlet}:
 		<ul>
-			<li><code><del>RestServlet.createProperties()</del></code>
-			<li><code><del>RestServlet.createBeanContext(ObjectMap,Class[],Class[])</del></code>
-			<li><code><del>RestServlet.createBeanFilters()</del></code>
-			<li><code><del>RestServlet.createPojoSwaps()</del></code>
-			<li><code><del>RestServlet.createParsers(ObjectMap,Class[],Class[])</del></code>
-			<li><code><del>RestServlet.createUrlEncodingSerializer(ObjectMap,Class[],Class[])</del></code>
-			<li><code><del>RestServlet.createUrlEncodingParser(ObjectMap,Class[],Class[])</del></code>
-			<li><code><del>RestServlet.createConverters(ObjectMap)</del></code>
-			<li><code><del>RestServlet.createDefaultRequestHeaders(ObjectMap)</del></code>
-			<li><code><del>RestServlet.createDefaultResponseHeaders(ObjectMap)</del></code>
-			<li><code><del>RestServlet.createEncoders(ObjectMap)</del></code>
-			<li><code><del>RestServlet.createGuards(ObjectMap)</del></code>
-			<li><code><del>RestServlet.createMimetypesFileTypeMap(ObjectMap)</del></code>
-			<li><code><del>RestServlet.createResponseHandlers(ObjectMap)</del></code>
+			<li><dc>RestServlet.createProperties()</dc>
+			<li><dc>RestServlet.createBeanContext(ObjectMap,Class[],Class[])</dc>
+			<li><dc>RestServlet.createBeanFilters()</dc>
+			<li><dc>RestServlet.createPojoSwaps()</dc>
+			<li><dc>RestServlet.createParsers(ObjectMap,Class[],Class[])</dc>
+			<li><dc>RestServlet.createUrlEncodingSerializer(ObjectMap,Class[],Class[])</dc>
+			<li><dc>RestServlet.createUrlEncodingParser(ObjectMap,Class[],Class[])</dc>
+			<li><dc>RestServlet.createConverters(ObjectMap)</dc>
+			<li><dc>RestServlet.createDefaultRequestHeaders(ObjectMap)</dc>
+			<li><dc>RestServlet.createDefaultResponseHeaders(ObjectMap)</dc>
+			<li><dc>RestServlet.createEncoders(ObjectMap)</dc>
+			<li><dc>RestServlet.createGuards(ObjectMap)</dc>
+			<li><dc>RestServlet.createMimetypesFileTypeMap(ObjectMap)</dc>
+			<li><dc>RestServlet.createResponseHandlers(ObjectMap)</dc>
 		</ul>
 	</li>
 	<li>New client-version annotations:
@@ -169,6 +169,6 @@
 
 <h5 class='topic w800'>org.apache.juneau.rest.client</h5>
 <ul class='spaced-list'>
-	<li>Removed the <code>JazzRestClient</code> class.
-	<li>New method <code><del>RestClient.setClientVersion(String)</del></code>.
+	<li>Removed the <c>JazzRestClient</c> class.
+	<li>New method <dc>RestClient.setClientVersion(String)</dc>.
 </ul>		
diff --git a/juneau-doc/docs/ReleaseNotes/6.0.1.html b/juneau-doc/docs/ReleaseNotes/6.0.1.html
index 7566b57..5dbc229 100644
--- a/juneau-doc/docs/ReleaseNotes/6.0.1.html
+++ b/juneau-doc/docs/ReleaseNotes/6.0.1.html
@@ -25,12 +25,12 @@
 		<ul>
 			<li>Several fixes to handle obscure edge cases.
 		</ul>
-	<li>New properties in <code><del>ParserContext</del></code>.
+	<li>New properties in <dc>ParserContext</dc>.
 		<ul>
-			<li><code><del>ParserContext.PARSER_strict</del></code>
-			<li><code><del>ParserContext.PARSER_inputStreamCharset</del></code>
-			<li><code><del>ParserContext.PARSER_fileCharset</del></code>
+			<li><dc>ParserContext.PARSER_strict</dc>
+			<li><dc>ParserContext.PARSER_inputStreamCharset</dc>
+			<li><dc>ParserContext.PARSER_fileCharset</dc>
 		</ul>
-	<li>Removed <code>JsonParserContext.JSON_strictMode</code>.  Replaced by <code>PARSER_strict</code>.		
-	<li><code><jk>byte[]</jk></code> arrays can now be passed to {@link oaj.parser.Parser#parse(Object,Class)} for reader-based parsers.	
+	<li>Removed <c>JsonParserContext.JSON_strictMode</c>.  Replaced by <c>PARSER_strict</c>.		
+	<li><c><jk>byte[]</jk></c> arrays can now be passed to {@link oaj.parser.Parser#parse(Object,Class)} for reader-based parsers.	
 </ul>			
diff --git a/juneau-doc/docs/ReleaseNotes/6.1.0.html b/juneau-doc/docs/ReleaseNotes/6.1.0.html
index c05c0be..18979f9 100644
--- a/juneau-doc/docs/ReleaseNotes/6.1.0.html
+++ b/juneau-doc/docs/ReleaseNotes/6.1.0.html
@@ -43,28 +43,28 @@
 				<li>New {@link oaj.xml.annotation.XmlFormat#XMLTEXT} format that's identical to {@link oaj.xml.annotation.XmlFormat#TEXT} except 
 					XML content is not escaped and serialized directly as the child content.  The parser will reconvert this to the original XML text during parsing.
 			</ul>
-			<li>New support methodology and other improvements to <code><del>org.apache.juneau.xml</del></code> documentation.
+			<li>New support methodology and other improvements to <dc>org.apache.juneau.xml</dc> documentation.
 			<li>Eliminated unnecessary <xt>&lt;string&gt;</xt> elements.
-			<li>Eliminated <code><del>XmlContentHandler</del></code> class.
+			<li>Eliminated <dc>XmlContentHandler</dc> class.
 			<li>Parser efficiency improvements through reuse of string builders.
 			<li>Reworked and simplified the default XML serializers.  The {@link oaj.xml.XmlSerializer#DEFAULT} serializer now has namespaces disabled,
 				and {@link oaj.xml.XmlSerializer#DEFAULT_NS} has namespaces enabled.  The 'XML-JSON' serializers have been eliminated.
-			<li>Eliminated the <code>addJsonTypeAttrs</code> and <code>addJsonStringTypeAttrs</code> settings.
+			<li>Eliminated the <c>addJsonTypeAttrs</c> and <c>addJsonStringTypeAttrs</c> settings.
 			<li>Namespace support is now disabled by default.
 		</ul>
 	<li>Significant modifications and improvements to HTML serialization support.
 		<ul>
-			<li>Parser converted from <code>XMLEventReader</code>-based to <code>XMLStreamReader</code>.
+			<li>Parser converted from <c>XMLEventReader</c>-based to <c>XMLStreamReader</c>.
 			<li>Eliminated many unnecessary type tags and <xt>&lt;string&gt;</xt> elements and improved the readable layout.  
 				The new format is much leaner.
-			<li>New exhaustive support methodology section added to <code><del>org.apache.juneau.html</del></code> documentation.
+			<li>New exhaustive support methodology section added to <dc>org.apache.juneau.html</dc> documentation.
 		</ul>
-	<li>New HTML5 DTO support:  <code><del>org.apache.juneau.dto.html5</del></code>.
+	<li>New HTML5 DTO support:  <dc>org.apache.juneau.dto.html5</dc>.
 	<li>{@link oaj.BeanContext} class split into separate {@link oaj.BeanContext} and {@link oaj.BeanSession} classes.
 	<ul>
 		<li>Session object meant to be single-use that can be discarded after use and contains session-level object cache and overridable Locale and TimeZone.
 	</ul>  
-	<li><code><del>SerializerContext</del></code> and <code><del>ParserContext</del></code>
+	<li><dc>SerializerContext</dc> and <dc>ParserContext</dc>
 		now extend directly from {@link oaj.BeanContext}.
 	<li>{@link oaj.serializer.SerializerSession} and {@link oaj.parser.ParserSession}
 		now extend directly from {@link oaj.BeanSession}.
@@ -77,14 +77,14 @@
 	</ul>
 	<li>Improvements to Parser class:  
 	<ul>
-		<li>Simplified the parse methods (e.g. <code>parseMap()</code>, <code>parseCollection()</code>)
+		<li>Simplified the parse methods (e.g. <c>parseMap()</c>, <c>parseCollection()</c>)
 		by replacing them with two simple methods: 
 		<ul>
 			<li>{@link oaj.parser.Parser#parse(Object,Class)} - Normal method.
 			<li>{@link oaj.parser.Parser#parse(Object,Type,Type...)} - Method for parsing into parameterized maps and collections.
 		</ul>
 		Using these methods, you can construct arbitrarily complex objects consisting of maps and collections.
-		You could do this before, but it required constructing a <code>ClassMeta</code> object.  
+		You could do this before, but it required constructing a <c>ClassMeta</c> object.  
 		<br>For example:
 			<p class='bcode w800'>
 	<jc>// Old way:</jc>
@@ -101,9 +101,9 @@
 	<jc>// New way:</jc>
 	Map&lt;String,List&lt;MyBean&gt;&gt; map = parser.parse(input, HashMap.<jk>class</jk>, String.<jk>class</jk>, LinkedList.<jk>class</jk>, MyBean.<jk>class</jk>);
 			</p>
-		<li>Arbitrarily-complex parameterized maps and collections can now be parsed without the need for creating intermediate <code>ClassMeta</code> objects.
-		<li>No need for casting anymore if you were using the old <code>parseMap()</code> and <code>parseCollection()</code> methods!
-		<li>Changes allow me to eliminate <code>BeanContext.normalizeClassMeta()</code> method.
+		<li>Arbitrarily-complex parameterized maps and collections can now be parsed without the need for creating intermediate <c>ClassMeta</c> objects.
+		<li>No need for casting anymore if you were using the old <c>parseMap()</c> and <c>parseCollection()</c> methods!
+		<li>Changes allow me to eliminate <c>BeanContext.normalizeClassMeta()</c> method.
 		<li>Convenience methods added for setting parser properties:
 			<p class='bcode w800'>
 	<jc>// Old way:</jc>
@@ -132,9 +132,9 @@
 	<li>General code improvements made to {@link oaj.ClassMeta} class.
 	<ul>
 		<li>All fields are now final which should improve overall performance.
-		<li>Replaced support for <code>toObjectMap()</code> and <code>fromObjectMap()/T(ObjectMap)</code> methods with
-			generalized <code>swap(BeanSession)</code>/<code>unswap(BeanSession,X)</code>/<code>T(BeanSession,X)</code> methods.<br>
-			See new section <code><del>Swap methods</del></code> for information.
+		<li>Replaced support for <c>toObjectMap()</c> and <c>fromObjectMap()/T(ObjectMap)</c> methods with
+			generalized <c>swap(BeanSession)</c>/<c>unswap(BeanSession,X)</c>/<c>T(BeanSession,X)</c> methods.<br>
+			See new section <dc>Swap methods</dc> for information.
 	</ul>
 	<li>Session-level media type now available through {@link oaj.BeanSession#getMediaType()} method.
 		Allows for swaps and serializer/parser behavior to be tailored to individual media types.
@@ -180,65 +180,65 @@
 		<ul>
 			<li>New {@link oaj.dto.atom.AtomBuilder} class.
 			<li>New setter method names for a better fluent design.
-			<li>Updated <code><del>org.apache.juneau.dto.atom</del></code> documentation.
+			<li>Updated <dc>org.apache.juneau.dto.atom</dc> documentation.
 		</ul>
 	<li>New {@link oaj.transform.MapSwap} and {@link oaj.transform.StringSwap} classes.
 	<li>New {@link oaj.serializer.WriterSerializer#println(Object)} method.  Useful for debugging purposes.
 	<li>New {@link oaj.BeanContext#getClassMeta(Type,Type...)} and {@link oaj.BeanSession#getClassMeta(Type,Type...)}
 		methods for retrieving Map and Collection class metas.  
-		Replaces the various <code>getMapClassMeta()</code>/<code>getCollectionClassMeta()</code> methods.  
-	<li>New section added to this document:	<code><del>Juneau Data Transfer Objects (org.apache.juneau.dto)</del></code>
+		Replaces the various <c>getMapClassMeta()</c>/<c>getCollectionClassMeta()</c> methods.  
+	<li>New section added to this document:	<dc>Juneau Data Transfer Objects (org.apache.juneau.dto)</dc>
 	<li>Modified the UON specification to work with mixed content.
 	<ul>
 		<li>The new specification is considerably cleaner and eliminates the need for separate normal/simple modes.
 			<br>It also allows for arbitrary whitespace to be added to the output without any confusion.
-		<li>Eliminated the <code>UonParser.<jsf>DEFAULT_WS_AWARE</jsf></code> and <code>UrlEncodingParser.<jsf>DEFAULT_WS_AWARE</jsf></code> parsers.
+		<li>Eliminated the <c>UonParser.<jsf>DEFAULT_WS_AWARE</jsf></c> and <c>UrlEncodingParser.<jsf>DEFAULT_WS_AWARE</jsf></c> parsers.
 			<br>The normal {@link oaj.uon.UonParser#DEFAULT} and {@link oaj.urlencoding.UrlEncodingParser#DEFAULT} parsers will now handle whitespace.
-		<li>Eliminated the <code>UonParserContext.<jsf>UON_whitespaceAware</jsf></code> configuration setting.
-		<li>Eliminated the <code>UonSerializer.<jsf>DEFAULT_SIMPLE</jsf></code>, <code>UonSerializer.<jsf>DEFAULT_SIMPLE_ENCODING</jsf></code>
-			and <code>UrlEncodingSerializer.<jsf>DEFAULT_SIMPLE</jsf></code>
+		<li>Eliminated the <c>UonParserContext.<jsf>UON_whitespaceAware</jsf></c> configuration setting.
+		<li>Eliminated the <c>UonSerializer.<jsf>DEFAULT_SIMPLE</jsf></c>, <c>UonSerializer.<jsf>DEFAULT_SIMPLE_ENCODING</jsf></c>
+			and <c>UrlEncodingSerializer.<jsf>DEFAULT_SIMPLE</jsf></c>
 			serializers since there is no separate simple mode anymore.
-		<li>Eliminated the <code>UonParserContext.<jsf>UON_simpleMode</jsf></code> configuration setting.
+		<li>Eliminated the <c>UonParserContext.<jsf>UON_simpleMode</jsf></c> configuration setting.
 	</ul>
-	<li>Added new <code><del>OutputStreamSerializer.serializeToHex(Object)</del></code> method. 
+	<li>Added new <dc>OutputStreamSerializer.serializeToHex(Object)</dc> method. 
 		<br>Useful mostly for testing purposes.
 		<br>Equivalently, the {@link oaj.parser.InputStreamParser#parse(Object,Class)} method can now 
 			read the output from this method.
-	<li>Eliminated the <code><ja>@Bean</ja>(subTypeProperty)</code> and <code><ja>@Bean</ja>(subTypes)</code> annotations
+	<li>Eliminated the <c><ja>@Bean</ja>(subTypeProperty)</c> and <c><ja>@Bean</ja>(subTypes)</c> annotations
 		and replaced them with the ability to define subtypes using the existing {@link oaj.annotation.Bean#beanDictionary() @Bean(beanDictionary)}
 		annotation on parent classes and interfaces.
 		<br>This has the added benefit of simplifying the overall code.
-	<li>The <code><del>SerializerContext.SERIALIZER_addBeanTypeProperties</del></code> setting is now enabled by default.
-	<li>Combined the <code>SERIALIZER_addIndentation</code>/<code>JSON_addWhitespace</code>/<code>UON_addWhitespace</code>
-		properties into a single <code><del>SerializerContext.SERIALIZER_useWhitespace</del></code> setting.
+	<li>The <dc>SerializerContext.SERIALIZER_addBeanTypeProperties</dc> setting is now enabled by default.
+	<li>Combined the <c>SERIALIZER_addIndentation</c>/<c>JSON_addWhitespace</c>/<c>UON_addWhitespace</c>
+		properties into a single <dc>SerializerContext.SERIALIZER_useWhitespace</dc> setting.
 </ul>
 
 <h5 class='topic w800'>org.apache.juneau.rest</h5>
 <ul class='spaced-list'>
 	<li>{@link oajr.RestRequest} now passes locale and timezone to serializers/parsers/transforms.
-	<li><code><del>RestRequest.getTimeZone()</del></code> method.
-	<li>Standardized the following methods in {@link oajr.RestRequest} to remove dependency on <code>ClassMeta</code>
+	<li><dc>RestRequest.getTimeZone()</dc> method.
+	<li>Standardized the following methods in {@link oajr.RestRequest} to remove dependency on <c>ClassMeta</c>
 		objects and eliminate the need for casts:
 		<ul>
-			<li><code><del>RestRequest.getHeader(String,Class)</del></code>
-			<li><code><del>RestRequest.getHeader(String,Object,Class)</del></code>
-			<li><code><del>RestRequest.getHeader(String,Type,Type...)</del></code>
-			<li><code><del>RestRequest.getQueryParameter(String,Class)</del></code>
-			<li><code><del>RestRequest.getQueryParameter(String,Object,Class)</del></code>
-			<li><code><del>RestRequest.getQueryParameter(String,Type,Type...)</del></code>
-			<li><code><del>RestRequest.getQueryParameter(String,Object,Type,Type...)</del></code>
-			<li><code><del>RestRequest.getQueryParameters(String,Class)</del></code>
-			<li><code><del>RestRequest.getQueryParameters(String,Type,Type...)</del></code>
-			<li><code><del>RestRequest.getFormDataParameter(String,Class)</del></code>
-			<li><code><del>RestRequest.getFormDataParameter(String,Object,Class)</del></code>
-			<li><code><del>RestRequest.getFormDataParameters(String,Class)</del></code>
-			<li><code><del>RestRequest.getFormDataParameter(String,Type,Type...)</del></code>
-			<li><code><del>RestRequest.getFormDataParameters(String,Type,Type...)</del></code>
-			<li><code><del>RestRequest.getPathParameter(String,Class)</del></code>
-			<li><code><del>RestRequest.getPathParameter(String,Type,Type...)</del></code>
-			<li><code><del>RestRequest.getBody(Class)</del></code>
-			<li><code><del>RestRequest.getBody(Type,Type...)</del></code>
+			<li><dc>RestRequest.getHeader(String,Class)</dc>
+			<li><dc>RestRequest.getHeader(String,Object,Class)</dc>
+			<li><dc>RestRequest.getHeader(String,Type,Type...)</dc>
+			<li><dc>RestRequest.getQueryParameter(String,Class)</dc>
+			<li><dc>RestRequest.getQueryParameter(String,Object,Class)</dc>
+			<li><dc>RestRequest.getQueryParameter(String,Type,Type...)</dc>
+			<li><dc>RestRequest.getQueryParameter(String,Object,Type,Type...)</dc>
+			<li><dc>RestRequest.getQueryParameters(String,Class)</dc>
+			<li><dc>RestRequest.getQueryParameters(String,Type,Type...)</dc>
+			<li><dc>RestRequest.getFormDataParameter(String,Class)</dc>
+			<li><dc>RestRequest.getFormDataParameter(String,Object,Class)</dc>
+			<li><dc>RestRequest.getFormDataParameters(String,Class)</dc>
+			<li><dc>RestRequest.getFormDataParameter(String,Type,Type...)</dc>
+			<li><dc>RestRequest.getFormDataParameters(String,Type,Type...)</dc>
+			<li><dc>RestRequest.getPathParameter(String,Class)</dc>
+			<li><dc>RestRequest.getPathParameter(String,Type,Type...)</dc>
+			<li><dc>RestRequest.getBody(Class)</dc>
+			<li><dc>RestRequest.getBody(Type,Type...)</dc>
 		</ul>
 	<li>New methods on {@link oajrc.NameValuePairs}
-	<li>Fixed issue where whitespace was not added to UON/URL-Encoding output when <code>&amp;plainText=true</code> specified.
+	<li>Fixed issue where whitespace was not added to UON/URL-Encoding output when <c>&amp;plainText=true</c> specified.
 </ul>
diff --git a/juneau-doc/docs/ReleaseNotes/6.2.0.html b/juneau-doc/docs/ReleaseNotes/6.2.0.html
index 7735cce..a495957 100644
--- a/juneau-doc/docs/ReleaseNotes/6.2.0.html
+++ b/juneau-doc/docs/ReleaseNotes/6.2.0.html
@@ -50,36 +50,36 @@
 			<li>{@link oaj.parser.ParserGroupBuilder}
 			<li>{@link oaj.encoders.EncoderGroupBuilder}
 		</ul>
-	<li>Revamped the config file API to use a build:  <code><del>ConfigFileBuilder</del></code>.
-	<li>Removed the <code><del>Lockable</del></code> interface.
-	<li>New <code>addBeanTypeProperties</code> setting added to serializers to override the 
-		<code><del>SerializerContext.SERIALIZER_addBeanTypeProperties</del></code> setting
+	<li>Revamped the config file API to use a build:  <dc>ConfigFileBuilder</dc>.
+	<li>Removed the <dc>Lockable</dc> interface.
+	<li>New <c>addBeanTypeProperties</c> setting added to serializers to override the 
+		<dc>SerializerContext.SERIALIZER_addBeanTypeProperties</dc> setting
 		for individual serializers in a serializer group:
 		<ul>
-			<li><code><del>HtmlSerializerContext.HTML_addBeanTypeProperties</del></code>
-			<li><code><del>JsonSerializerContext.JSON_addBeanTypeProperties</del></code>
-			<li><code><del>MsgPackSerializerContext.MSGPACK_addBeanTypeProperties</del></code>
-			<li><code><del>UonSerializerContext.UON_addBeanTypeProperties</del></code>
-			<li><code><del>XmlSerializerContext.#XML_addBeanTypeProperties</del></code>
-			<li><code><del>RdfSerializerContext.RDF_addBeanTypeProperties</del></code>
+			<li><dc>HtmlSerializerContext.HTML_addBeanTypeProperties</dc>
+			<li><dc>JsonSerializerContext.JSON_addBeanTypeProperties</dc>
+			<li><dc>MsgPackSerializerContext.MSGPACK_addBeanTypeProperties</dc>
+			<li><dc>UonSerializerContext.UON_addBeanTypeProperties</dc>
+			<li><dc>XmlSerializerContext.#XML_addBeanTypeProperties</dc>
+			<li><dc>RdfSerializerContext.RDF_addBeanTypeProperties</dc>
 		</ul>
-	<li>UON notation serializers and parsers moved into the new <code>org.apache.juneau.uon</code> package.
+	<li>UON notation serializers and parsers moved into the new <c>org.apache.juneau.uon</c> package.
 	<li>New {@link oaj.xml.annotation.XmlFormat#VOID} format to identify HTML void elements.
 	<li>Tweaks to HTML5 support.
 		<ul>
 			<li>Fixed handling of empty non-void elements in HTML serializer.
-			<li>Added <code>style()</code> override methods to all elements.
+			<li>Added <c>style()</c> override methods to all elements.
 		</ul>
 	<li>Improvements to Swagger support.
 		<ul>
 			<li>New {@link oaj.dto.swagger.SwaggerBuilder} class.
 			<li>Fluent-style setters added to the Swagger beans.
-			<li>Added Swagger examples <code><del>here</del></code> and in the <del>org.apache.juneau.dto.swagger</del> javadocs.
+			<li>Added Swagger examples <dc>here</dc> and in the <del>org.apache.juneau.dto.swagger</del> javadocs.
 		</ul>
 	<li>Improvements to {@link oaj.svl.VarResolver}.
 		<ul>
 			<li>New {@link oaj.svl.vars.IfVar $IF} variable for if-else block logic.
-			<li><code><del>$SWITCH</del></code> variable for switch block logic.
+			<li><dc>$SWITCH</dc> variable for switch block logic.
 			<li>Whitespace wasn't being ignored in some cases.
 		</ul>
 	<li>{@link oaj.html.HtmlParser} can now parse full body contents generated by {@link oaj.html.HtmlDocSerializer}. 
@@ -97,17 +97,17 @@
 			<li>{@link oaj.dto.html5.HtmlElementContainer#getChild(int...)}
 			<li>{@link oaj.dto.html5.HtmlElementMixed#getChild(int...)}
 		</ul>
-	<li>New common serializer setting: <code><del>SerializerContext.SERIALIZER_abridged</del></code>.
+	<li>New common serializer setting: <dc>SerializerContext.SERIALIZER_abridged</dc>.
 	<li>Support for defining interface proxies against 3rd-party REST interfaces.
-		<br>New package <code><del>org.apache.juneau.remoteable</del></code> for all remoteable proxy interface annotations.
+		<br>New package <dc>org.apache.juneau.remoteable</dc> for all remoteable proxy interface annotations.
 		<br><ja>@Remoteable</ja> annotation has been moved to this package.
-	<li>Updated doc: <code><del>6 - Remoteable Services</del></code>
-	<li>New doc: <code><del>6.1 -  Interface proxies against 3rd-party REST interfaces</del></code>
-	<li>New URL-encoding serializer setting: <code><del>UrlEncodingSerializerContext.URLENC_paramFormat</del></code>.
+	<li>Updated doc: <dc>6 - Remoteable Services</dc>
+	<li>New doc: <dc>6.1 -  Interface proxies against 3rd-party REST interfaces</dc>
+	<li>New URL-encoding serializer setting: <dc>UrlEncodingSerializerContext.URLENC_paramFormat</dc>.
 	<li>New methods on {@link oaj.urlencoding.UrlEncodingSerializerBuilder}:
 	<ul>
-		<li><code><del>UrlEncodingSerializerBuilder.paramFormat(String)</del></code>	
-		<li><code><del>UrlEncodingSerializerBuilder.plainTextParams()</del></code>	
+		<li><dc>UrlEncodingSerializerBuilder.paramFormat(String)</dc>	
+		<li><dc>UrlEncodingSerializerBuilder.plainTextParams()</dc>	
 	</ul> 		
 </ul>
 
@@ -115,36 +115,36 @@
 <ul class='spaced-list'>
 	<li>{@link oajr.annotation.RestResource @RestResource} annotation can now be applied to 
 		any class!  You're no longer restricted to subclassing your resources from {@link oajr.RestServlet}.
-		<br>This is a major enhancement in the API.  Anything you could do by subclassing from <code>RestServlet</code>
-		should have an equivalent for non-<code>RestServlet</code> classes.
-		<br>The only restriction is that the top-level resource must subclass from <code>RestServlet</code>.
+		<br>This is a major enhancement in the API.  Anything you could do by subclassing from <c>RestServlet</c>
+		should have an equivalent for non-<c>RestServlet</c> classes.
+		<br>The only restriction is that the top-level resource must subclass from <c>RestServlet</c>.
 		Child resources do not.
 		<br><br>
 		The majority of code has been split up into two separate classes:
 		<ul>
-			<li><code><del>RestConfig</del></code> - A modifiable configuration of a resource.  Subclasses from {@link javax.servlet.ServletConfig}.
+			<li><dc>RestConfig</dc> - A modifiable configuration of a resource.  Subclasses from {@link javax.servlet.ServletConfig}.
 			<li>{@link oajr.RestContext} - A read-only configuration that's the result of a snapshot of the config.
 		</ul>
 		<br><br>
 		The {@link oajr.RestServlet} class now has the following initialization method that allows you to override
 		the config settings define via annotations:
 		<ul>
-			<li><code><del>RestServlet.init(RestConfig)</del></code> - A modifiable configuration of a resource.
+			<li><dc>RestServlet.init(RestConfig)</dc> - A modifiable configuration of a resource.
 		</ul>
-		Non-<code>RestServlet</code> classes must have one of the following to allow it to be instantiated:
+		Non-<c>RestServlet</c> classes must have one of the following to allow it to be instantiated:
 		<ul>
-			<li>A <code><jk>public</jk> T(RestConfig)</code> constructor.
-			<li>A <code><jk>public</jk> T()</code> constructor.
+			<li>A <c><jk>public</jk> T(RestConfig)</c> constructor.
+			<li>A <c><jk>public</jk> T()</c> constructor.
 			<li>The parent resource must have a customized {@link oajr.RestResourceResolver} for instantiating it.
 		</ul>
 		<br>
-		Non-<code>RestServlet</code> classes can optionally include the following init methods to gain access to the config and context:
+		Non-<c>RestServlet</c> classes can optionally include the following init methods to gain access to the config and context:
 		<ul>
-			<li><code><del><jk>public</jk> init(RestConfig)</del></code>
-			<li><code><del><jk>public</jk> init(RestContext)</del></code>
+			<li><dc><jk>public</jk> init(RestConfig)</dc>
+			<li><dc><jk>public</jk> init(RestContext)</dc>
 		</ul>
-	<li>New annotations added to {@link oajr.annotation.RestResource @RestResource} to allow non-<code>RestServlet</code>
-		resources to do the same as subclassing directly from <code>RestServlet</code>:
+	<li>New annotations added to {@link oajr.annotation.RestResource @RestResource} to allow non-<c>RestServlet</c>
+		resources to do the same as subclassing directly from <c>RestServlet</c>:
 		<ul>
 			<li>{@link oajr.annotation.RestResource#resourceResolver() resourceResolver()} 
 				- Specify a {@link oajr.RestResourceResolver} class for resolving child resources.
@@ -158,12 +158,12 @@
 	<li>New annotations added to {@link oajr.annotation.RestResource @RestResource} and {@link oajr.annotation.RestMethod @RestMethod}
 		to simplify defining page title, text, and links on HTML views:
 		<ul>
-			<li><code><del>@RestResource(pageTitle)</del></code>
-			<li><code><del>@RestMethod(pageTitle)</del></code> 
-			<li><code><del>@RestResource(pageText)</del></code> 
-			<li><code><del>@RestMethod(pageText)</del></code> 
-			<li><code><del>@RestResource(pageLinks)</del></code> 
-			<li><code><del>@RestMethod(pageLinks)</del></code> 
+			<li><dc>@RestResource(pageTitle)</dc>
+			<li><dc>@RestMethod(pageTitle)</dc> 
+			<li><dc>@RestResource(pageText)</dc> 
+			<li><dc>@RestMethod(pageText)</dc> 
+			<li><dc>@RestResource(pageLinks)</dc> 
+			<li><dc>@RestMethod(pageLinks)</dc> 
 		</ul>				
 		<p class='bcode w800'>
 	<jc>// Old method</jc>
@@ -183,7 +183,7 @@
 	)
 		</p>		
 		<p>
-			Typically you're going to simply want to use the <code>title</code> and <code>description</code> annotations
+			Typically you're going to simply want to use the <c>title</c> and <c>description</c> annotations
 			which apply to both the page title/text and the swagger doc:		
 		</p>
 		<p class='bcode w800'>
@@ -193,11 +193,11 @@
 		pageLinks=<js>"{up:'$R{requestParentURI}',options:'?method=OPTIONS'}"</js>
 	)
 		</p>
-	<li><code><del>RestResource.stylesheet()</del></code> can now take in a comma-delimited list of stylesheet paths.
-	<li><code><del>StreamResource</del></code> can now contain multiple sources from a variety of source types (e.g. <code><jk>byte</jk>[]</code> arrays, <code>InputStreams</code>, <code>Files</code>, etc...)
-		and is now immutable.  It also includes a new <code><del>StreamResourceBuilder</del></code> class.
-	<li>Simplified remoteable proxies using the <code><ja>@RestMethod</ja>(name=<js>"PROXY"</js>)</code> annotation on REST methods.
-		Used to expose interface proxies without the need for <code><del>RemoteableServlet</del></code>.
+	<li><dc>RestResource.stylesheet()</dc> can now take in a comma-delimited list of stylesheet paths.
+	<li><dc>StreamResource</dc> can now contain multiple sources from a variety of source types (e.g. <c><jk>byte</jk>[]</c> arrays, <c>InputStreams</c>, <c>Files</c>, etc...)
+		and is now immutable.  It also includes a new <dc>StreamResourceBuilder</dc> class.
+	<li>Simplified remoteable proxies using the <c><ja>@RestMethod</ja>(name=<js>"PROXY"</js>)</c> annotation on REST methods.
+		Used to expose interface proxies without the need for <dc>RemoteableServlet</dc>.
 	<p class='bcode w800'>
 	<jc>// Server side</jc>
 	<ja>@RestMethod</ja>(name=<js>"PROXY"</js>, path=<js>"/myproxy/*"</js>)
@@ -219,11 +219,11 @@
 <ul class='spaced-list'>
 	<li>Revamped the client API to use builders.
 	<li>New doc: <del>1.5 - Debugging</del>
-	<li>The <code>RestClient</code> class <code>doX(Object url)</code> methods now handle HttpClient <code>URIBuilder</code> instances.
+	<li>The <c>RestClient</c> class <c>doX(Object url)</c> methods now handle HttpClient <c>URIBuilder</c> instances.
 	<li>New methods added/updated to {@link oajrc.RestClient}:
 	<ul>
-		<li><code><del>RestClient.getRemoteableProxy(Class,Object)</del></code> - For interface proxies defined using <code><ja>@RestMethod</ja>(name=<js>"PROXY"</js>)</code>.
-		<li><code><del>RestClient.getRemoteableProxy(Class,Object,Serializer,Parser)</del></code> - Same as above, but overrides the serializer and parser defined on the client.
+		<li><dc>RestClient.getRemoteableProxy(Class,Object)</dc> - For interface proxies defined using <c><ja>@RestMethod</ja>(name=<js>"PROXY"</js>)</c>.
+		<li><dc>RestClient.getRemoteableProxy(Class,Object,Serializer,Parser)</dc> - Same as above, but overrides the serializer and parser defined on the client.
 		<li>{@link oajrc.RestClient#doPost(Object) doPost(Object)} 
 		<li>{@link oajrc.RestClient#doCall(HttpMethod,Object,Object) doCall(HttpMethod,Object,Object)} - Can now pass in instances of {@link oajrc.NameValuePairs} for easy form posts.
 			<br>This extends to all methods that take in the input.
@@ -231,18 +231,18 @@
 	<li>New methods on {@link oajrc.RestCall}:
 		<ul>
 			<li>{@link oajrc.RestCall#uri(Object) uri(Object)}
-			<li><code><del>query(String,Object,boolean,PartSerializer)</del></code>
+			<li><dc>query(String,Object,boolean,PartSerializer)</dc>
 			<li>{@link oajrc.RestCall#query(String,Object) query(String,Object)}
 			<li>{@link oajrc.RestCall#queryIfNE(String,Object) queryIfNE(String,Object)}
 			<li>{@link oajrc.RestCall#query(Map) query(Map)}
 			<li>{@link oajrc.RestCall#queryIfNE(Map) queryIfNE(Map)}
 			<li>{@link oajrc.RestCall#query(String) query(String)}
-			<li><code><del>formData(String,Object,boolean,PartSerializer)</del></code>
+			<li><dc>formData(String,Object,boolean,PartSerializer)</dc>
 			<li>{@link oajrc.RestCall#formData(String,Object) formData(String,Object)}
 			<li>{@link oajrc.RestCall#formDataIfNE(String,Object) formDataIfNE(String,Object)}
 			<li>{@link oajrc.RestCall#formData(Map) formData(Map)}
 			<li>{@link oajrc.RestCall#formDataIfNE(Map) formDataIfNE(Map)}
-			<li><code><del>header(String,Object,boolean,PartSerializer)</del></code>
+			<li><dc>header(String,Object,boolean,PartSerializer)</dc>
 			<li>{@link oajrc.RestCall#header(String,Object) header(String,Object)}
 			<li>{@link oajrc.RestCall#headerIfNE(String,Object) headerIfNE(String,Object)}
 			<li>{@link oajrc.RestCall#headers(Map) headers(Map)}
@@ -257,11 +257,11 @@
 		<ul>
 			<li>{@link oajrc.RestClientBuilder#executorService(ExecutorService,boolean) executorService(ExecutorService,boolean)}
 			<li>{@link oajrc.RestClientBuilder#paramFormat(String) paramFormat(ExecutorService,boolean)}
-			<li><code><del>RestClientBuilder.plainTextParams()</del></code>
-			<li>{@link oajrc.RestClientBuilder#noTrace() noTrace()} - Adds a <code>No-Trace: true</code> header on all requests to prevent
+			<li><dc>RestClientBuilder.plainTextParams()</dc>
+			<li>{@link oajrc.RestClientBuilder#noTrace() noTrace()} - Adds a <c>No-Trace: true</c> header on all requests to prevent
 				the servlet from logging errors.
 				<br>Useful for testing scenarios when you don't want the console to end up showing errors done on purpose.
-			<li>{@link oajrc.RestClientBuilder#debug() debug()} now adds a <code>Debug: true</code> header on all requests.
+			<li>{@link oajrc.RestClientBuilder#debug() debug()} now adds a <c>Debug: true</c> header on all requests.
 		</ul>
 	<li>New methods added/updated to {@link oajrc.RestCall}:
 		<ul>
@@ -271,10 +271,10 @@
 			<li>{@link oajrc.RestCall#getResponseAsStringFuture() getResponseAsStringFuture()}
 			<li>{@link oajrc.RestCall#serializer(Serializer) serializer(Serializer)} - Override the serializer defined on the client for a single call.
 			<li>{@link oajrc.RestCall#parser(Parser) parser(Parser)} - Override the parser defined on the client for a single call.
-			<li><code><del>input(Object)</del></code> - Now accepts instances of {@link oajrc.NameValuePairs}.
+			<li><dc>input(Object)</dc> - Now accepts instances of {@link oajrc.NameValuePairs}.
 			<li>{@link oajrc.RestCall#getResponse(Class) getResponse(Class)} - Can now pass in any of the following:
 				<ul>
-					<li>{@link org.apache.http.HttpResponse} - Returns the raw <code>HttpResponse</code> returned by the inner <code>HttpClient</code>.
+					<li>{@link org.apache.http.HttpResponse} - Returns the raw <c>HttpResponse</c> returned by the inner <c>HttpClient</c>.
 					<li>{@link java.io.Reader} - Returns access to the raw reader of the response.
 					<li>{@link java.io.InputStream} - Returns access to the raw input stream of the response.
 				</ul>
@@ -282,7 +282,7 @@
 	<li>New methods added to {@link oajrc.NameValuePairs}:
 		<ul>
 			<li>{@link oajrc.NameValuePairs#append(String,Object) append(String,Object)}
-			<li><code><del>append(String,Object,PartSerializer)</del></code>
+			<li><dc>append(String,Object,PartSerializer)</dc>
 		</ul>
 	<li>{@link oajrc.RetryOn} is now an abstract class with an additional method:
 		<ul>
@@ -293,11 +293,11 @@
 <h5 class='topic w800'>org.apache.juneau.microservice</h5>
 <ul class='spaced-list'>
 	<li><js>"REST/port"</js> configuration setting can now be a comma-limited list of port numbers to try.
-		<br>You can also specify one or more <code>0</code>s to try a random port.
-	<li>Methods added to <code><del>RestMicroservice</del></code> class:
+		<br>You can also specify one or more <c>0</c>s to try a random port.
+	<li>Methods added to <dc>RestMicroservice</dc> class:
 	<ul>
-		<li><code><del>getPort()</del></code>
-		<li><code><del>getURI()</del></code>
+		<li><dc>getPort()</dc>
+		<li><dc>getURI()</dc>
 		<li>Override methods added from {@link oaj.microservice.Microservice} class for easier method chaining.
 	</ul>
 </ul>		
diff --git a/juneau-doc/docs/ReleaseNotes/6.3.0.html b/juneau-doc/docs/ReleaseNotes/6.3.0.html
index 64ebcb3..367ca36 100644
--- a/juneau-doc/docs/ReleaseNotes/6.3.0.html
+++ b/juneau-doc/docs/ReleaseNotes/6.3.0.html
@@ -27,9 +27,9 @@
 	<li>
 		Support for dynamic beans.  See {@link oaj.annotation.BeanProperty#name() @BeanProperty(name)}.
 	<li>
-		New doc: <code><del>2.8 - Virtual Beans</del></code>
+		New doc: <dc>2.8 - Virtual Beans</dc>
 	<li>
-		New doc: <code><del>2.13 - Comparison with Jackson</del></code>
+		New doc: <dc>2.13 - Comparison with Jackson</dc>
 	<li>
 		All parsers now allow for numeric types with <js>'K'</js>/<js>'M'</js>/<js>'G'</js> suffixes to represent
 		kilobytes, megabytes, and gigabytes.
@@ -37,47 +37,47 @@
 	<jc>// Example</jc>
 	<jk>int</jk> i = JsonParser.<jsf>DEFAULT</jsf>.parse(<js>"123M"</js>);  <jc>// 123MB</jc>
 		</p>
-	<li>New/modified methods on <code><del>ConfigFile</del></code>:
+	<li>New/modified methods on <dc>ConfigFile</dc>:
 		<ul>
-			<li><code><del>ConfigFile.put(String,String,String,boolean)</del></code>
-			<li><code><del>ConfigFile.put(String,String,Object,Serializer,boolean,boolean)</del></code>
-			<li><code><del>ConfigFile.getObject(String,Type,Type...)</del></code>
-			<li><code><del>ConfigFile.getObject(String,Parser,Type,Type...)</del></code>
-			<li><code><del>ConfigFile.getObject(String,Class)</del></code>
-			<li><code><del>ConfigFile.getObject(String,Parser,Class)</del></code>
-			<li><code><del>ConfigFile.getObject(String,String,Type,Type...)</del></code>
-			<li><code><del>ConfigFile.getObject(String,String,Parser,Type,Type...)</del></code>
-			<li><code><del>ConfigFile.getObject(String,String,Class)</del></code>
-			<li><code><del>ConfigFile.getObject(String,String,Parser,Class)</del></code>
-			<li><code><del>ConfigFile.getObjectWithDefault(String,Object,Type,Type...)</del></code> 
-			<li><code><del>ConfigFile.getObjectWithDefault(String,Parser,Object,Type,Type...)</del></code>
-			<li><code><del>ConfigFile.getObjectWithDefault(String,Object,Class)</del></code>
-			<li><code><del>ConfigFile.getObjectWithDefault(String,Parser,Object,Class)</del></code> 
+			<li><dc>ConfigFile.put(String,String,String,boolean)</dc>
+			<li><dc>ConfigFile.put(String,String,Object,Serializer,boolean,boolean)</dc>
+			<li><dc>ConfigFile.getObject(String,Type,Type...)</dc>
+			<li><dc>ConfigFile.getObject(String,Parser,Type,Type...)</dc>
+			<li><dc>ConfigFile.getObject(String,Class)</dc>
+			<li><dc>ConfigFile.getObject(String,Parser,Class)</dc>
+			<li><dc>ConfigFile.getObject(String,String,Type,Type...)</dc>
+			<li><dc>ConfigFile.getObject(String,String,Parser,Type,Type...)</dc>
+			<li><dc>ConfigFile.getObject(String,String,Class)</dc>
+			<li><dc>ConfigFile.getObject(String,String,Parser,Class)</dc>
+			<li><dc>ConfigFile.getObjectWithDefault(String,Object,Type,Type...)</dc> 
+			<li><dc>ConfigFile.getObjectWithDefault(String,Parser,Object,Type,Type...)</dc>
+			<li><dc>ConfigFile.getObjectWithDefault(String,Object,Class)</dc>
+			<li><dc>ConfigFile.getObjectWithDefault(String,Parser,Object,Class)</dc> 
 		</ul>
-	<li>New ability to interact with config file sections with proxy interfaces with new method <code><del>ConfigFile.getSectionAsInterface(String,Class)</del></code>.
+	<li>New ability to interact with config file sections with proxy interfaces with new method <dc>ConfigFile.getSectionAsInterface(String,Class)</dc>.
 	<li>{@link oaj.annotation.BeanProperty @BeanProperty} annotation can now be applied to getters
 		and setters defined on interfaces.
 	<li>New methods on {@link oaj.serializer.SerializerSession} and {@link oaj.parser.ParserSession}
 		for retrieving context and runtime-override properties:
 		<ul>
-			<li><code><del>Session.getProperty(String)</del></code>
-			<li><code><del>Session.getProperty(String,String)</del></code>
-			<li><code><del>Session.getProperty(Class,String)</del></code>
-			<li><code><del>Session.getProperty(Class,String,Object)</del></code>
+			<li><dc>Session.getProperty(String)</dc>
+			<li><dc>Session.getProperty(String,String)</dc>
+			<li><dc>Session.getProperty(Class,String)</dc>
+			<li><dc>Session.getProperty(Class,String,Object)</dc>
 		</ul>	
-	<li>New <code><del>org.apache.juneau.serializer.PartSerializer</del></code> interface particularly tailored to HTTP
+	<li>New <dc>org.apache.juneau.serializer.PartSerializer</dc> interface particularly tailored to HTTP
 		headers, query parameters, form-data parameters, and path variables.  
 		<br>Allows easy user-defined serialization of these objects.
 		<br>The interface can be used in the following locations:
 		<ul>
-			<li><code><del>org.apache.juneau.rest.client.RestClientBuilder.partSerializer(Class)</del></code> 
-			<li><code><del>org.apache.juneau.remoteable.Path.serializer</del></code> 
-			<li><code><del>org.apache.juneau.remoteable.Query.serializer</del></code> 
-			<li><code><del>org.apache.juneau.remoteable.QueryIfNE.serializer</del></code> 
-			<li><code><del>org.apache.juneau.remoteable.FormData.serializer</del></code> 
-			<li><code><del>org.apache.juneau.remoteable.FormDataIfNE.serializer</del></code> 
-			<li><code><del>org.apache.juneau.remoteable.Header.serializer</del></code> 
-			<li><code><del>org.apache.juneau.remoteable.HeaderIfNE.serializer</del></code> 
+			<li><dc>org.apache.juneau.rest.client.RestClientBuilder.partSerializer(Class)</dc> 
+			<li><dc>org.apache.juneau.remoteable.Path.serializer</dc> 
+			<li><dc>org.apache.juneau.remoteable.Query.serializer</dc> 
+			<li><dc>org.apache.juneau.remoteable.QueryIfNE.serializer</dc> 
+			<li><dc>org.apache.juneau.remoteable.FormData.serializer</dc> 
+			<li><dc>org.apache.juneau.remoteable.FormDataIfNE.serializer</dc> 
+			<li><dc>org.apache.juneau.remoteable.Header.serializer</dc> 
+			<li><dc>org.apache.juneau.remoteable.HeaderIfNE.serializer</dc> 
 		</ul>
 	<li>Across-the-board improvements to the URI-resolution support (i.e. how URIs get serialized).
 		<ul>
@@ -108,10 +108,10 @@
 					<li>{@link oaj.UriResolver}
 				</ul>
 			<li>New configuration properties:
-				<li><code><del>SerializerContext.SERIALIZER_uriContext</del></code>
-				<li><code><del>SerializerContext.SERIALIZER_uriRelativity</del></code>
-				<li><code><del>SerializerContext.SERIALIZER_uriResolution</del></code>
-				<li><code><del>SerializerContext.SERIALIZER_maxIndent</del></code>
+				<li><dc>SerializerContext.SERIALIZER_uriContext</dc>
+				<li><dc>SerializerContext.SERIALIZER_uriRelativity</dc>
+				<li><dc>SerializerContext.SERIALIZER_uriResolution</dc>
+				<li><dc>SerializerContext.SERIALIZER_maxIndent</dc>
 		</ul>
 	<li>New annotation property: {@link oaj.annotation.BeanProperty#value() @BeanProperty(value)}.
 		<br>The following two annotations are considered equivalent:
@@ -121,7 +121,7 @@
 	<ja>@BeanProperty</ja>(<js>"foo"</js>)
 		</p>
 	<li>Fixed a race condition in ClassMeta.
-	<li><jsf>URLENC_paramFormat</jsf> has been moved to <code><del>UonSerializer.UON_paramFormat</del></code>, 
+	<li><jsf>URLENC_paramFormat</jsf> has been moved to <dc>UonSerializer.UON_paramFormat</dc>, 
 		and the UON/URL-Encoding serializers will now always serialize all values as plain text.
 		<br>This means that arrays and maps are converted to simple comma-delimited lists.
 	<li>Listener APIs added to serializers and parsers:
@@ -129,15 +129,15 @@
 			<li>{@link oaj.serializer.SerializerListener}
 			<li>{@link oaj.serializer.SerializerBuilder#listener(Class)}
 			<li>{@link oajr.annotation.RestResource#serializerListener() @RestResource(serializerListener)}
-			<li><code><del>RestConfig.serializerListener(Class)</del></code>
+			<li><dc>RestConfig.serializerListener(Class)</dc>
 			<li>{@link oaj.parser.ParserListener}
 			<li>{@link oaj.parser.ParserBuilder#listener(Class)}
 			<li>{@link oajr.annotation.RestResource#parserListener() @RestResource(parserListener)}
-			<li><code><del>RestConfig.parserListener(Class)</del></code>
-			<li><code><del>RestClientBuilder.listeners(Class,Class)</del></code>
+			<li><dc>RestConfig.parserListener(Class)</dc>
+			<li><dc>RestClientBuilder.listeners(Class,Class)</dc>
 		</ul>juneau-examples-core.import1.pngjuneau-examples-core.import1.png
 	<li>The {@link oaj.BeanContext#BEAN_debug} flag will now capture parser input and make it
-		available through the <code><del>ParserSession.getInputAsString()</del></code> method so that it can be used
+		available through the <dc>ParserSession.getInputAsString()</dc> method so that it can be used
 		in the listeners.
 	<li>Significant new functionality introduced to the HTML serializer.  
 		<br>Lots of new options for customizing the HTML output.
@@ -148,17 +148,17 @@
 				<br>Annotation can be applied to POJO classes and bean properties.
 			<li>Several new properties for customizing parts of the HTML page:
 				<ul>
-					<li><code><del>HtmlDocSerializerContext.HTMLDOC_title</del></code>
-					<li><code><del>HtmlDocSerializerContext.HTMLDOC_description</del></code>
-					<li><code><del>HtmlDocSerializerContext.HTMLDOC_branding</del></code>
-					<li><code><del>HtmlDocSerializerContext.HTMLDOC_header</del></code>
-					<li><code><del>HtmlDocSerializerContext.HTMLDOC_nav</del></code>
-					<li><code><del>HtmlDocSerializerContext.HTMLDOC_aside</del></code>
-					<li><code><del>HtmlDocSerializerContext.HTMLDOC_footer</del></code>
-					<li><code><del>HtmlDocSerializerContext.HTMLDOC_noResultsMessage</del></code>
-					<li><code><del>HtmlDocSerializerContext.HTMLDOC_cssUrl</del></code>
-					<li><code><del>HtmlDocSerializerContext.HTMLDOC_css</del></code>
-					<li><code><del>HtmlDocSerializerContext.HTMLDOC_template</del></code>
+					<li><dc>HtmlDocSerializerContext.HTMLDOC_title</dc>
+					<li><dc>HtmlDocSerializerContext.HTMLDOC_description</dc>
+					<li><dc>HtmlDocSerializerContext.HTMLDOC_branding</dc>
+					<li><dc>HtmlDocSerializerContext.HTMLDOC_header</dc>
+					<li><dc>HtmlDocSerializerContext.HTMLDOC_nav</dc>
+					<li><dc>HtmlDocSerializerContext.HTMLDOC_aside</dc>
+					<li><dc>HtmlDocSerializerContext.HTMLDOC_footer</dc>
+					<li><dc>HtmlDocSerializerContext.HTMLDOC_noResultsMessage</dc>
+					<li><dc>HtmlDocSerializerContext.HTMLDOC_cssUrl</dc>
+					<li><dc>HtmlDocSerializerContext.HTMLDOC_css</dc>
+					<li><dc>HtmlDocSerializerContext.HTMLDOC_template</dc>
 				</ul>
 			<li>New interface {@link oaj.html.HtmlDocTemplate} that allows full control over rendering
 				of HTML produced by {@link oaj.html.HtmlDocSerializer}.
@@ -201,9 +201,9 @@
 		<br>For reference, the previous supported types were:
 		<ul>
 			<li>{@link oajr.RestRequest} - The request object.
-			<li>{@link javax.servlet.http.HttpServletRequest} - The superclass of <code>RestRequest</code>.
+			<li>{@link javax.servlet.http.HttpServletRequest} - The superclass of <c>RestRequest</c>.
 			<li>{@link oajr.RestResponse} - The response object.
-			<li>{@link javax.servlet.http.HttpServletResponse} - The superclass of <code>RestResponse</code>.
+			<li>{@link javax.servlet.http.HttpServletResponse} - The superclass of <c>RestResponse</c>.
 		</ul>
 		The new supported types are:
 		<ul>
@@ -250,13 +250,13 @@
 			<li>{@link oajr.RequestFormData} - API for accessing request form data.
 			<li>{@link oajr.RequestPath} - API for accessing path variables.
 			<li>{@link oajr.RequestBody} - API for accessing request body.
-			<li>{@link oaj.http.HttpMethod} - The method name matched (when using <code><ja>@RestMethod</ja>(name=<js>"*"</js>)</code>)
+			<li>{@link oaj.http.HttpMethod} - The method name matched (when using <c><ja>@RestMethod</ja>(name=<js>"*"</js>)</c>)
 			<li>{@link java.util.logging.Logger} - The logger to use for logging.
 			<li>{@link oaj.internal.JuneauLogger} - Logger with additional features.
 			<li>{@link oajr.RestContext} - The resource read-only context.
 			<li>{@link oaj.parser.Parser} - The parser matching the request content type.
 			<li>{@link oaj.dto.swagger.Swagger} - The auto-generated Swagger doc.
-			<li><code><del>ConfigFile</del></code> - The external config file for the resource.
+			<li><dc>ConfigFile</dc> - The external config file for the resource.
 		</ul>
 		So, for example...
 		<p class='bcode w800'>
@@ -295,29 +295,29 @@
 		<ul>
 			<li>{@link oajr.annotation.RestMethod#defaultQuery() defaultQuery()}
 			<li>{@link oajr.annotation.RestMethod#defaultFormData() defaultFormData()}
-			<li><code><del>bpIncludes()</del></code>
-			<li><code><del>bpExcludes()</del></code>
+			<li><dc>bpIncludes()</dc>
+			<li><dc>bpExcludes()</dc>
 		</ul>
 	<li>
 		Default values on header, query, and form-data annotations:
 		<ul>
-			<li><code><del>@Header(def)</del></code> - Default header value.
-			<li><code><del>@Query(def)</del></code> - Default query parameter value.
-			<li><code><del>@FormData(def)</del></code> - Default form data parameter value.
+			<li><dc>@Header(def)</dc> - Default header value.
+			<li><dc>@Query(def)</dc> - Default query parameter value.
+			<li><dc>@FormData(def)</dc> - Default form data parameter value.
 		</ul>
 	<li>
 		New attributes on {@link oajr.annotation.RestResource @RestResource}:
 		<ul>
 			<li>{@link oajr.annotation.RestResource#serializerListener() serializerListener()}
 			<li>{@link oajr.annotation.RestResource#parserListener() parserListener()}
-			<li><code><del>widgets()</del></code>
+			<li><dc>widgets()</dc>
 			<li>{@link oajr.annotation.RestResource#swagger() swagger()}
 			<li>{@link oajr.annotation.RestResource#htmldoc() htmldoc()}
 		</ul>
 	<li>
 		New attributes on {@link oajr.annotation.RestMethod @RestMethod}:
 		<ul>
-			<li><code><del>widgets()</del></code>
+			<li><dc>widgets()</dc>
 			<li>{@link oajr.annotation.RestMethod#swagger() swagger()}
 			<li>{@link oajr.annotation.RestMethod#htmldoc() htmldoc()}
 		</ul>
@@ -328,55 +328,55 @@
 			<li>{@link oajr.vars.WidgetVar} - Resolve <js>"$W{...}"</js> variables to widget contents.
 		</ul>
 	<li>
-		New methods on <code><del>RestConfig</del></code>:
+		New methods on <dc>RestConfig</dc>:
 		<ul>
-			<li><code><del>setHtmlTitle(String)</del></code>
-			<li><code><del>setHtmlDescription(String)</del></code>
-			<li><code><del>setHtmlBranding(String)</del></code>
-			<li><code><del>setHtmlHeader(String)</del></code>
-			<li><code><del>setHtmlLinks(String)</del></code>
-			<li><code><del>setHtmlNav(String)</del></code>
-			<li><code><del>setHtmlAside(String)</del></code>
-			<li><code><del>setHtmlFooter(String)</del></code>
-			<li><code><del>setHtmlCss(String)</del></code>
-			<li><code><del>setHtmlCssUrl(String)</del></code>
-			<li><code><del>setHtmlNoWrap(boolean)</del></code>
-			<li><code><del>setHtmlNoResultsMessage(String)</del></code>
-			<li><code><del>setHtmlTemplate(Class)</del></code>
-			<li><code><del>setHtmlTemplate(HtmlDocTemplate)</del></code>
-			<li><code><del>addWidget(Class)</del></code>
+			<li><dc>setHtmlTitle(String)</dc>
+			<li><dc>setHtmlDescription(String)</dc>
+			<li><dc>setHtmlBranding(String)</dc>
+			<li><dc>setHtmlHeader(String)</dc>
+			<li><dc>setHtmlLinks(String)</dc>
+			<li><dc>setHtmlNav(String)</dc>
+			<li><dc>setHtmlAside(String)</dc>
+			<li><dc>setHtmlFooter(String)</dc>
+			<li><dc>setHtmlCss(String)</dc>
+			<li><dc>setHtmlCssUrl(String)</dc>
+			<li><dc>setHtmlNoWrap(boolean)</dc>
+			<li><dc>setHtmlNoResultsMessage(String)</dc>
+			<li><dc>setHtmlTemplate(Class)</dc>
+			<li><dc>setHtmlTemplate(HtmlDocTemplate)</dc>
+			<li><dc>addWidget(Class)</dc>
 		</ul>
 	<li>
 		New methods on {@link oajr.RestResponse}:
 		<ul>
-			<li><code><del>setHtmlTitle(Object)</del></code>
-			<li><code><del>setHtmlDescription(Object)</del></code>
-			<li><code><del>setHtmlBranding(Object)</del></code>
-			<li><code><del>setHtmlHeader(Object)</del></code>
-			<li><code><del>setHtmlLinks(Object)</del></code>
-			<li><code><del>setHtmlNav(Object)</del></code>
-			<li><code><del>setHtmlAside(Object)</del></code>
-			<li><code><del>setHtmlFooter(Object)</del></code>
-			<li><code><del>setHtmlCss(Object)</del></code>
-			<li><code><del>setHtmlCssUrl(Object)</del></code>
-			<li><code><del>setHtmlNoWrap(boolean)</del></code>
-			<li><code><del>setHtmlNoResultsMessage(Object)</del></code>
-			<li><code><del>setHtmlTemplate(Class)</del></code>
-			<li><code><del>setHtmlTemplate(HtmlDocTemplate)</del></code>
+			<li><dc>setHtmlTitle(Object)</dc>
+			<li><dc>setHtmlDescription(Object)</dc>
+			<li><dc>setHtmlBranding(Object)</dc>
+			<li><dc>setHtmlHeader(Object)</dc>
+			<li><dc>setHtmlLinks(Object)</dc>
+			<li><dc>setHtmlNav(Object)</dc>
+			<li><dc>setHtmlAside(Object)</dc>
+			<li><dc>setHtmlFooter(Object)</dc>
+			<li><dc>setHtmlCss(Object)</dc>
+			<li><dc>setHtmlCssUrl(Object)</dc>
+			<li><dc>setHtmlNoWrap(boolean)</dc>
+			<li><dc>setHtmlNoResultsMessage(Object)</dc>
+			<li><dc>setHtmlTemplate(Class)</dc>
+			<li><dc>setHtmlTemplate(HtmlDocTemplate)</dc>
 		</ul>
 	<li>
-		<code>&amp;plainText=true</code> parameter now works on byte-based serializers by converting the output to hex.
+		<c>&amp;plainText=true</c> parameter now works on byte-based serializers by converting the output to hex.
 	<li>
 		New classes for widget support:
 		<ul>
 			<li>{@link oajr.widget.Widget}
-			<li><code><del>PoweredByJuneauWidget</del></code>
-			<li><code><del>ContentTypeLinksColumnWidget</del></code>
-			<li><code><del>ContentTypeLinksRowWidget</del></code>
-			<li><code><del>QueryWidget</del></code>
+			<li><dc>PoweredByJuneauWidget</dc>
+			<li><dc>ContentTypeLinksColumnWidget</dc>
+			<li><dc>ContentTypeLinksRowWidget</dc>
+			<li><dc>QueryWidget</dc>
 		</ul>
 	<li>
-		<code>devops.css</code> cleaned up.
+		<c>devops.css</c> cleaned up.
 	<li>
 		Removed a bunch of URL-related methods from {@link oajr.RestRequest}.  
 		These all have equivalents in {@link oajr.RestRequest#getUriContext()}.
@@ -396,16 +396,16 @@
 <h5 class='topic w800'>org.apache.juneau.rest.client</h5>
 <ul class='spaced-list'>
 	<li>
-		New <code><del>org.apache.juneau.remoteable.Path</del></code> annotation for specifying path variables on remoteable interfaces.
+		New <dc>org.apache.juneau.remoteable.Path</dc> annotation for specifying path variables on remoteable interfaces.
 	<li>
-		New <code><del>@RequestBean</del></code> annotation for specifying beans with remoteable annotations
+		New <dc>@RequestBean</dc> annotation for specifying beans with remoteable annotations
 		defined on properties.
 	<li>
-		The following annotations (and related methods on RestCall) can now take <code>NameValuePairs</code> and beans as input 
+		The following annotations (and related methods on RestCall) can now take <c>NameValuePairs</c> and beans as input 
 		when using <js>"*"</js> as the name.
-		<br><code><del>org.apache.juneau.remoteable.FormData</del></code>,<code><del>org.apache.juneau.remoteable.FormDataIfNE</del></code>,
-		<code><del>org.apache.juneau.remoteable.Query</del></code>,<code><del>org.apache.juneau.remoteable.QueryIfNE</del></code>,
-		<code><del>org.apache.juneau.remoteable.Header</del></code>,<code><del>org.apache.juneau.remoteable.HeaderIfNE</del></code> 
+		<br><dc>org.apache.juneau.remoteable.FormData</dc>,<dc>org.apache.juneau.remoteable.FormDataIfNE</dc>,
+		<dc>org.apache.juneau.remoteable.Query</dc>,<dc>org.apache.juneau.remoteable.QueryIfNE</dc>,
+		<dc>org.apache.juneau.remoteable.Header</dc>,<dc>org.apache.juneau.remoteable.HeaderIfNE</dc> 
 </ul>
 
 <h5 class='topic w800'>org.apache.juneau.microservice</h5>
diff --git a/juneau-doc/docs/ReleaseNotes/6.3.1.html b/juneau-doc/docs/ReleaseNotes/6.3.1.html
index 7fa80ff..5118014 100644
--- a/juneau-doc/docs/ReleaseNotes/6.3.1.html
+++ b/juneau-doc/docs/ReleaseNotes/6.3.1.html
@@ -24,23 +24,23 @@
 	<li>
 		{@link oaj.utils.PojoQuery} improvements.
 	<li>
-		New <code><del>RemoteMethod.returns()</del></code> annotation.
+		New <dc>RemoteMethod.returns()</dc> annotation.
 		<br>Allows you to specify whether the remote method returns the HTTP body or status code.
 	<li>
 		Fixed bugs with {@link oaj.BeanContext#BEAN_includeProperties} and {@link oaj.BeanContext#BEAN_excludeProperties} settings.
 	<li>
-		New/modified settings in <code><del>HtmlDocSerializerContext</del></code>:
+		New/modified settings in <dc>HtmlDocSerializerContext</dc>:
 		<ul>
-			<li><code><del>HTMLDOC_script</del></code>
-			<li><code><del>HTMLDOC_style</del></code> - Was <jsf>HTMLDOC_css</jsf>.
-			<li><code><del>HTMLDOC_stylesheet</del></code> - Was <jsf>HTMLDOC_cssUrl</jsf>.  Now an array.
+			<li><dc>HTMLDOC_script</dc>
+			<li><dc>HTMLDOC_style</dc> - Was <jsf>HTMLDOC_css</jsf>.
+			<li><dc>HTMLDOC_stylesheet</dc> - Was <jsf>HTMLDOC_cssUrl</jsf>.  Now an array.
 		</ul>
 	<li>
-		New <code><del>ResourceFinder</del></code> utility class.
+		New <dc>ResourceFinder</dc> utility class.
 		Allows you to search for resources up the parent hierarchy chain.
 		Also allows you to search for localized resources.
 	<li>
-		Eliminated the following properties from <code><del>HtmlDocSerializerContext</del></code>:
+		Eliminated the following properties from <dc>HtmlDocSerializerContext</dc>:
 		<jsf>HTMLDOC_title</jsf>, <jsf>HTMLDOC_description</jsf>, <jsf>HTMLDOC_description</jsf>
 		<br>See below on changes to simplify HTML headers.
 	<li>
@@ -110,9 +110,9 @@
 			<li>
 				You can now add arbitrary CSS and Javascript along with your widgets through new methods:
 				<ul>
-					<li><code><del>Widget#getHtml(RestRequest)</del></code>
-					<li><code><del>Widget#getScript(RestRequest)</del></code>
-					<li><code><del>Widget#getStyle(RestRequest)</del></code>
+					<li><dc>Widget#getHtml(RestRequest)</dc>
+					<li><dc>Widget#getScript(RestRequest)</dc>
+					<li><dc>Widget#getStyle(RestRequest)</dc>
 				</ul>
 			</li>
 			<li>
@@ -124,8 +124,8 @@
 			<li>
 				Renamed widgets:
 				<ul>
-					<li><code>PoweredByApacheWidget</code> -&gt; <code>PoweredByApache</code>  
-					<li><code>PoweredByJuneauWidget</code> -&gt; <code>PoweredByJuneau</code>  
+					<li><c>PoweredByApacheWidget</c> -&gt; <c>PoweredByApache</c>  
+					<li><c>PoweredByJuneauWidget</c> -&gt; <c>PoweredByJuneau</c>  
 				</ul>
 			<li>
 				New {@link oajr.widget.MenuItemWidget} can be used as a starting point for creatint pull-down menu items.
@@ -146,8 +146,8 @@
 	<li>
 		New/modified annotations on {@link oajr.annotation.HtmlDoc @HtmlDoc}:
 		<ul>
-			<li>{@link oajr.annotation.HtmlDoc#style() style()} - Renamed from <code>css()</code>.
-			<li>{@link oajr.annotation.HtmlDoc#stylesheet() stylesheet()} - Renamed from <code>cssUrl()</code>.
+			<li>{@link oajr.annotation.HtmlDoc#style() style()} - Renamed from <c>css()</c>.
+			<li>{@link oajr.annotation.HtmlDoc#stylesheet() stylesheet()} - Renamed from <c>cssUrl()</c>.
 				<br>Can now be a comma-delimited list of URLs.
 			<li>{@link oajr.annotation.HtmlDoc#script() script()} - Add arbitrary Javascript to page header.
 		</ul>
@@ -171,14 +171,14 @@
 		</ul>
 	</li>
 	<li>
-		Eliminated the <code>@RestResource(stylesheet)</code> annotation.  
+		Eliminated the <c>@RestResource(stylesheet)</c> annotation.  
 		It's no longer needed now that you can easily specify styles via <ja>@Htmldoc</ja>.
 	<li>
 		Eliminated the following annotations since they are now redundant with {@link oajr.annotation.HtmlDoc#header() @HtmlDoc(header)}:
 		<ul>
-			<li><code>title()</code>
-			<li><code>description()</code>
-			<li><code>branding()</code>
+			<li><c>title()</c>
+			<li><c>description()</c>
+			<li><c>branding()</c>
 		</ul>
 		Instead, the {@link oajr.BasicRestServlet} class defines the following default header
 		that can be easily overridden: 
@@ -195,7 +195,7 @@
 	<li>
 		New {@link oajr.vars.FileVar $F} variable resolver for resolving the contents of 
 		files in the classpath.
-		<br>The <code>DockerRegistryResource</code> examples shows how it can be used to pull in a localized
+		<br>The <c>DockerRegistryResource</c> examples shows how it can be used to pull in a localized
 		file from the classpath to populate the aside section of a page.
 		<p class='bcode w800'>
 	htmldoc=<ja>@HtmlDoc</ja>(
@@ -204,16 +204,16 @@
 	)
 		</p>
 	<li>
-		New <code><del>ReaderResource.toCommentStrippedString()</del></code> method.
+		New <dc>ReaderResource.toCommentStrippedString()</dc> method.
 	<li>
-		The <code>bpIncludes()</code> and <code>bpExcludes()</code> annotations on <ja>@RestMethod</ja>
+		The <c>bpIncludes()</c> and <c>bpExcludes()</c> annotations on <ja>@RestMethod</ja>
 		has been replaced with the following:
 		<ul>
 			<li>{@link oajr.annotation.RestMethod#bpi() bpi()} - Now an array of simplified values instead of LAX JSON.
 			<li>{@link oajr.annotation.RestMethod#bpx() bpx()} - Now an array of simplified values instead of LAX JSON.
 		</ul>
 	<li>
-		Two new variables added to <code>$R</code> variable: <js>"$R{servletClass}"</js>, <js>"$R{servletClassSimple}"</js>
+		Two new variables added to <c>$R</c> variable: <js>"$R{servletClass}"</js>, <js>"$R{servletClassSimple}"</js>
 </ul>
 
 <h5 class='topic w800'>org.apache.juneau.rest.examples</h5>
diff --git a/juneau-doc/docs/ReleaseNotes/6.4.0.html b/juneau-doc/docs/ReleaseNotes/6.4.0.html
index 7c44144..c13ae9a 100644
--- a/juneau-doc/docs/ReleaseNotes/6.4.0.html
+++ b/juneau-doc/docs/ReleaseNotes/6.4.0.html
@@ -19,7 +19,7 @@
 	The major change in this release is the project structure.
 </p>
 <p>
-	The library now consists of the following artifacts found in the Maven group <code>"org.apache.juneau"</code>:
+	The library now consists of the following artifacts found in the Maven group <c>"org.apache.juneau"</c>:
 </p>
 <table class='styled w800'>
 	<tr>
@@ -160,14 +160,14 @@
 	</tr>
 	<tr class='light bb'>
 		<td rowspan='2' style='text-align:center;font-weight:bold;padding:20px;'>Examples</td>
-		<td class='code'><code>juneau-examples-core</code></td>
+		<td class='code'><c>juneau-examples-core</c></td>
 		<td>
 			Core code examples
 		</td>
 		<td></td>
 	</tr>
 	<tr class='light bb'>
-		<td class='code'><code>juneau-examples-rest</code></td>
+		<td class='code'><c>juneau-examples-rest</c></td>
 		<td>
 			REST code examples
 		</td>
@@ -175,7 +175,7 @@
 	</tr>
 	<tr class='dark bb'>
 		<td rowspan='1' style='text-align:center;font-weight:bold;padding:20px;'>Juneau All</td>
-		<td class='code'><code>juneau-all</code></td>
+		<td class='code'><c>juneau-all</c></td>
 		<td>
 			Combination of the following:
 			<ul style='margin:0px 10px;'>
@@ -203,7 +203,7 @@
 		Improvements to swap support.
 		<ul>
 			<li>New {@link oaj.annotation.Swap @Swap} annotation.
-				<br>Replaces the <code>@Pojo</code> and <code>@BeanProperty(swap)</code> annotations.
+				<br>Replaces the <c>@Pojo</c> and <c>@BeanProperty(swap)</c> annotations.
 			<li>Support for per-media-type swaps.
 				<br>Programmatic example:
 				<p class='bcode w800'>
@@ -270,7 +270,7 @@
 	<li>
 		Serializers now serialize the contents of {@link java.io.Reader Readers} and {@link java.io.InputStream InputStreams}
 		directly to the output stream or writer.
-		<br>When used with conjunction with <code>PojoSwaps</code>, this can be used to provide customized
+		<br>When used with conjunction with <c>PojoSwaps</c>, this can be used to provide customized
 		output for specific content types.
 		<p class='bcode w800'>
 	<ja>@Pojo</ja>(swap=MyBeanSwap.<jk>class</jk>)
@@ -311,7 +311,7 @@
 		This is mostly an internal change and doesn't affect the existing APIs.
 	<li>
 		{@link oaj.transform.PojoSwap#swap(BeanSession,Object)} and {@link oaj.transform.PojoSwap#unswap(BeanSession,Object,ClassMeta)} 
-		can now throw arbitrary exceptions instead of having to wrap them in <code>SerializeException</code>/<code>ParseException</code>.
+		can now throw arbitrary exceptions instead of having to wrap them in <c>SerializeException</c>/<c>ParseException</c>.
 	<li>
 		New {@link oaj.utils.CalendarUtils} class that encapsulates serialization/parsing logic from {@link oaj.transforms.CalendarSwap} and 
 		{@link oaj.transforms.DateSwap}.
@@ -354,8 +354,8 @@
 		Eliminated the <ja>@Consumes</ja> and <ja>@Produces</ja> annotations.
 		<br>The supported media types are now passed in through the constructors.
 		<br>This was changed to eliminate a performance issue where a field could not be set as final because
-		the call to <code>getClass()</code> to retrieve the annotation value could not be called before calling
-		the <code><jk>super</jk>()</code> method.
+		the call to <c>getClass()</c> to retrieve the annotation value could not be called before calling
+		the <c><jk>super</jk>()</c> method.
 	<li>
 		New class: {@link oaj.utils.PojoMerge}
 	<li>
@@ -370,8 +370,8 @@
 		{@link oaj.dto.html5.HtmlElementMixed#children(Object...)} can now take in collections
 		of objects.
 	<li>
-		The DTO beans can now be serialized to strings of their typical language by calling the <code>toString()</code> method.
-		<br>For example, <code>Swagger.toString()</code> produces JSON and the HTML5 <code>Form.toString()</code>
+		The DTO beans can now be serialized to strings of their typical language by calling the <c>toString()</c> method.
+		<br>For example, <c>Swagger.toString()</c> produces JSON and the HTML5 <c>Form.toString()</c>
 		produces HTML.
 </ul>
 
@@ -388,19 +388,19 @@
 				{@link oajr.annotation.HookEvent#POST_INIT} for initialization.
 			<li>The following methods on {@link oajr.RestServlet} have been removed:
 				<ul>
-					<li><code>init(RestConfig)</code> 
+					<li><c>init(RestConfig)</c> 
 						- Use {@link oajr.annotation.HookEvent#INIT} instead.
-					<li><code>onSuccess(RestRequest, RestResponse, long)</code>
+					<li><c>onSuccess(RestRequest, RestResponse, long)</c>
 						- Use {@link oajr.annotation.HookEvent#END_CALL} instead.
-					<li><code>onPreCall(RestRequest)</code>
+					<li><c>onPreCall(RestRequest)</c>
 						- Use {@link oajr.annotation.HookEvent#PRE_CALL} instead.
-					<li><code>onPostCall(RestRequest, RestResponse)</code>
+					<li><c>onPostCall(RestRequest, RestResponse)</c>
 						- Use {@link oajr.annotation.HookEvent#POST_CALL} instead.
 				</ul> 	
 		</ul>
 	<li>
 		Simplified {@link oajr.widget.MenuItemWidget}.
-		<br>Exposes an abstract method <code><del>getContent(RestRequest)</del></code> that
+		<br>Exposes an abstract method <dc>getContent(RestRequest)</dc> that
 		can return raw HTML via readers or char-sequences, or any other object (such as HTML5 beans) that will
 		get converted to HTML using {@link oaj.html.HtmlSerializer#DEFAULT}.
 	<li>
@@ -412,29 +412,29 @@
 			<li>{@link oajr.annotation.RestResource#resourceResolver() resourceResolver()}
 				<br>Allows you to specify a resource resolver on the servlet context to make it easier to work with
 				dependency injection frameworks.
-			<li><code><del>RestResource.contextPath()</del></code> - 
+			<li><dc>RestResource.contextPath()</dc> - 
 				<br>Allows you to override the context path value inherited from the servlet container.
 			<li>{@link oajr.annotation.RestResource#allowHeaderParams() allowHeaderParams()} - 
-				<br>Replaces the <code>RestContext.REST_allowHeaderParams</code> setting.
-			<li><code><del>RestResource.allowMethodParam()</del></code> - 
-				<br>Replaces the <code>RestContext.REST_allowMethodParam</code> setting.
+				<br>Replaces the <c>RestContext.REST_allowHeaderParams</c> setting.
+			<li><dc>RestResource.allowMethodParam()</dc> - 
+				<br>Replaces the <c>RestContext.REST_allowMethodParam</c> setting.
 			<li>{@link oajr.annotation.RestResource#allowBodyParam() allowBodyParam()} - 
-				<br>Replaces the <code>RestContext.REST_allowBodyParam</code> setting.
+				<br>Replaces the <c>RestContext.REST_allowBodyParam</c> setting.
 			<li>{@link oajr.annotation.RestResource#renderResponseStackTraces() renderResponseStackTraces()} - 
-				<br>Replaces the <code>RestContext.REST_xxx</code> setting.
+				<br>Replaces the <c>RestContext.REST_xxx</c> setting.
 			<li>{@link oajr.annotation.RestResource#useStackTraceHashes() useStackTraceHashes()} - 
-				<br>Replaces the <code>RestContext.REST_useStackTraceHashes</code> setting.
+				<br>Replaces the <c>RestContext.REST_useStackTraceHashes</c> setting.
 			<li>{@link oajr.annotation.RestResource#defaultCharset() defaultCharset()} - 
-				<br>Replaces the <code>RestContext.REST_defaultCharset</code> setting.
-			<li><code><del>RestResource.paramFormat()</del></code> - 
-				<br>Replaces the <code>RestContext.REST_paramFormat</code> setting.
+				<br>Replaces the <c>RestContext.REST_defaultCharset</c> setting.
+			<li><dc>RestResource.paramFormat()</dc> - 
+				<br>Replaces the <c>RestContext.REST_paramFormat</c> setting.
 		</ul>
 	<li>New annotations on {@link oajr.annotation.RestMethod @RestMethod}:
 		<ul>
 			<li>{@link oajr.annotation.RestMethod#defaultCharset() defaultCharset()} - 
-				<br>Replaces the <code>RestContext.REST_defaultCharset</code> setting.
-			<li><code><del>RestMethod.paramFormat()</del></code> - 
-				<br>Replaces the <code>RestContext.REST_paramFormat</code> setting.
+				<br>Replaces the <c>RestContext.REST_defaultCharset</c> setting.
+			<li><dc>RestMethod.paramFormat()</dc> - 
+				<br>Replaces the <c>RestContext.REST_paramFormat</c> setting.
 		</ul>
 	<li>
 		The following implementation classes can now be defined as non-static inner classes of servlets/resources:
@@ -455,33 +455,33 @@
 		New dark theme:
 		<br><img src='doc-files/ReleaseNotes.632.DarkStyle.png'>
 	<li>
-		Stylesheet selection now stored in HTTP session when passed in via <code>?stylesheet</code> query parameter.
+		Stylesheet selection now stored in HTTP session when passed in via <c>?stylesheet</c> query parameter.
 	<li>
 		New doc: <del>Lifecycle Hooks</del>
 	<li>
-		Eliminated the <code>RestServletJenaDefault</code> class to remove the Jena dependency class on 
-		the <code>juneau-rest-server</code> artifact. 
-		<br>It's simple enough to simply extend <code>BasicRestServlet</code> and add the RDF serializers and
+		Eliminated the <c>RestServletJenaDefault</c> class to remove the Jena dependency class on 
+		the <c>juneau-rest-server</c> artifact. 
+		<br>It's simple enough to simply extend <c>BasicRestServlet</c> and add the RDF serializers and
 		parsers.
 </ul>
 
 <h5 class='topic w800'>juneau-microservice</h5>
 <ul class='spaced-list'>
 	<li>
-		The microservice has been significantly modified to be configured via a <code>jetty.xml</code> file
+		The microservice has been significantly modified to be configured via a <c>jetty.xml</c> file
 		for maximum flexibility instead of the hodge-podge of support in the config file.
-		<br>Top-level servlets should now be defined in the provided <code>jetty.xml</code> file.
+		<br>Top-level servlets should now be defined in the provided <c>jetty.xml</c> file.
 	<li>
-		New methods on <code><del>RestMicroservice</del></code>:
+		New methods on <dc>RestMicroservice</dc>:
 		<ul>
-			<li><code><del>addServlet(Servlet,String)</del></code>
-			<li><code><del>addServletAttribute(String,Object)</del></code>
-			<li><code><del>getServer()</del></code>
-			<li><code><del>getInstance()</del></code>
-			<li><code><del>getPort()</del></code>
-			<li><code><del>getContextPath()</del></code>
-			<li><code><del>getProtocol()</del></code>
-			<li><code><del>getHostName()</del></code>
+			<li><dc>addServlet(Servlet,String)</dc>
+			<li><dc>addServletAttribute(String,Object)</dc>
+			<li><dc>getServer()</dc>
+			<li><dc>getInstance()</dc>
+			<li><dc>getPort()</dc>
+			<li><dc>getContextPath()</dc>
+			<li><dc>getProtocol()</dc>
+			<li><dc>getHostName()</dc>
 		</ul>
 	<li>
 		New methods on {@link oaj.microservice.Microservice}:
@@ -489,10 +489,10 @@
 			<li>{@link oaj.microservice.Microservice#getInstance() getInstance()}
 		</ul>
 	<li>
-		New class <code><del>JettyLogger</del></code> for directing Jetty logging to the
+		New class <dc>JettyLogger</dc> for directing Jetty logging to the
 		java.util.logging framework.
 	<li>
-		New class <code><del>DebugResource</del></code> for viewing and generating
+		New class <dc>DebugResource</dc> for viewing and generating
 		Jetty thread dumps through REST calls.
 </ul>
 
diff --git a/juneau-doc/docs/ReleaseNotes/7.0.0.html b/juneau-doc/docs/ReleaseNotes/7.0.0.html
index bc97cca..01d507b 100644
--- a/juneau-doc/docs/ReleaseNotes/7.0.0.html
+++ b/juneau-doc/docs/ReleaseNotes/7.0.0.html
@@ -28,27 +28,27 @@
 <h5 class='topic w800'>juneau-dto</h5>
 <ul class='spaced-list'>
 	<li>
-		Class <code>org.apache.juneau.dto.Link</code> renamed to {@link oaj.dto.LinkString}.
+		Class <c>org.apache.juneau.dto.Link</c> renamed to {@link oaj.dto.LinkString}.
 		Helps avoid confusion since there are other Link classes in the library.
 </ul>
 
 <h5 class='topic w800'>juneau-rest-server</h5>
 <ul class='spaced-list'>
 	<li>
-		Annotation <code><ja>@HtmlDoc</ja>(links)</code> renamed to {@link oajr.annotation.HtmlDoc#navlinks() navlinks}.
+		Annotation <c><ja>@HtmlDoc</ja>(links)</c> renamed to {@link oajr.annotation.HtmlDoc#navlinks() navlinks}.
 	<li>
 		New annotation {@link oajr.annotation.HtmlDoc#head() @HtmlDoc(head)}.
 		<br>Allows you to specify arbitrary HTML content in the <xt>&lt;head&gt;</xt> section of the page.
 	<li>
-		Removed annotation <code><ja>@HtmlDoc</ja>(favIcon)</code>.
+		Removed annotation <c><ja>@HtmlDoc</ja>(favIcon)</c>.
 		<br>This was a discouraged way of defining fav-icons anyway, and with the addition of 
-		<code><ja>@HtmlDoc</ja>(head)</code>, you can define them using:
+		<c><ja>@HtmlDoc</ja>(head)</c>, you can define them using:
 		<p class='bcode w800'>
 	head={
 		<js>"&lt;link rel='icon' href='$U{servlet:/htdocs/juneau.png}'/&gt;"</js>
 	}
 		</p>
 	<li>
-		Removed several of the HTMLDOC-related methods from the <code>RestResponse/RestConfig/RestContext</code>
+		Removed several of the HTMLDOC-related methods from the <c>RestResponse/RestConfig/RestContext</c>
 		classes and moved it into the new {@link oajr.HtmlDocBuilder} class.
 </ul>
diff --git a/juneau-doc/docs/ReleaseNotes/7.0.1.html b/juneau-doc/docs/ReleaseNotes/7.0.1.html
index 65c7558..16fe7df 100644
--- a/juneau-doc/docs/ReleaseNotes/7.0.1.html
+++ b/juneau-doc/docs/ReleaseNotes/7.0.1.html
@@ -26,7 +26,7 @@
 
 <h5 class='topic w800'>juneau-marshall</h5>
 <ul class='spaced-list'>
-	<li>New static <code>create()</code> methods for builders on serializers and parsers.
+	<li>New static <c>create()</c> methods for builders on serializers and parsers.
 		<br>This simplifies the syntax of creation of serializers and parsers by scratch.
 		<p class='bcode w800'>
 	<jc>// Old way</jc>
@@ -41,7 +41,7 @@
 			<li>{@link oaj.parser.ParserGroup#create()}
 			<li>{@link oaj.encoders.EncoderGroup#create()}
 			<li>{@link oajrc.RestClient#create()}
-			<li><code><del>ConfigFile.create()</del></code>
+			<li><dc>ConfigFile.create()</dc>
 		</ul>
 	<li>
 		The order of the parameters in {@link oaj.serializer.SerializerSession#serialize(Object,Object)}
@@ -134,7 +134,7 @@
 			<li>New methods on {@link oaj.microservice.Microservice}
 				<ul>
 					<li>{@link oaj.microservice.Microservice#startConsole() startConsole()}
-					<li><code><del>createConsoleCommands()</del></code>
+					<li><dc>createConsoleCommands()</dc>
 					<li>{@link oaj.microservice.Microservice#getConsoleReader() getConsoleReader()}
 					<li>{@link oaj.microservice.Microservice#getConsoleWriter() getConsoleWriter()}
 				</ul>	
diff --git a/juneau-doc/docs/ReleaseNotes/7.1.0.html b/juneau-doc/docs/ReleaseNotes/7.1.0.html
index 866e173..e6ccc9c 100644
--- a/juneau-doc/docs/ReleaseNotes/7.1.0.html
+++ b/juneau-doc/docs/ReleaseNotes/7.1.0.html
@@ -30,10 +30,10 @@
 				<br>The 17000+ JUnit tests now execute in less than 10 seconds and have a cache-reuse hit rate
 				of 98% (164104 serializers/parsers/bean-contexts retrieved, but only 1801 created from scratch).
 			<li>
-				All the various separate <code>Context</code> classes (e.g. <code>JsonSerializerContext</code>) have been folded into
-				their respective serializer or parser classes (e.g. <code>JsonSerializer</code>).
+				All the various separate <c>Context</c> classes (e.g. <c>JsonSerializerContext</c>) have been folded into
+				their respective serializer or parser classes (e.g. <c>JsonSerializer</c>).
 				<br>Additionally, these classes are their own bean contexts.
-				<br>For example, the class hierarchy of <code>JsonSerializer</code> is now:
+				<br>For example, the class hierarchy of <c>JsonSerializer</c> is now:
 				<ul class='doctree'>
 					<li class='jac'>{@link oaj.Context}
 					<ul>
@@ -49,10 +49,10 @@
 						</ul>
 					</ul>
 				</ul>
-				All <code>Context</code> objects are thread-safe and read-only.
+				All <c>Context</c> objects are thread-safe and read-only.
 			<li>
 				Session objects also now have a consistent class hierarchy.
-				<br>For example, the class hierarchy of <code>JsonSerializerSession</code> is now:
+				<br>For example, the class hierarchy of <c>JsonSerializerSession</c> is now:
 				<ul class='doctree'>
 					<li class='jac'>{@link oaj.Session}
 					<ul>
@@ -71,7 +71,7 @@
 				Session objects are transient objects that live for the duration of a single parse.
 			<li>
 				Builder objects also now have a consistent class hierarchy.
-				<br>For example, the class hierarchy of <code>JsonSerializerBuilder</code> is now:
+				<br>For example, the class hierarchy of <c>JsonSerializerBuilder</c> is now:
 				<ul class='doctree'>
 					<li class='jac'>{@link oaj.ContextBuilder}
 					<ul>
@@ -84,42 +84,42 @@
 						</ul>
 					</ul>
 				</ul>
-				Builder objects are used for building up and creating <code>Context</code> objects.
+				Builder objects are used for building up and creating <c>Context</c> objects.
 			<li>
 				The {@link oaj.PropertyStore} class has been completely rewritten.
 				It is now a read-only configuration store build using the {@link oaj.PropertyStoreBuilder}
 				class.
-				<br>The previous <code>PropertyStore</code> class was overly-complicated with many read/write
+				<br>The previous <c>PropertyStore</c> class was overly-complicated with many read/write
 				locks to ensure thread-safety. 
-				<br>The new design shifts to a builder-based model with read-only <code>PropertyStore</code> objects
+				<br>The new design shifts to a builder-based model with read-only <c>PropertyStore</c> objects
 				that can be used as hash keys.
 		</ul>
 	<li>
 		Improvements to the HTTP-Part APIs.
-		<br>The existing <code>PartSerializer</code>/<code>PartParser</code> classes
-		have been replaced with the following all located in the new <code>org.apache.juneau.httppart</code> package:
+		<br>The existing <c>PartSerializer</c>/<c>PartParser</c> classes
+		have been replaced with the following all located in the new <c>org.apache.juneau.httppart</c> package:
 		<ul class='doctree'>
 			<li class='jp'>{@link oaj.httppart}
 			<ul>
 				<li class='jc'>{@link oaj.httppart.HttpPartType}
 				<li class='jic'>{@link oaj.httppart.HttpPartSerializer}
 				<ul>
-					<li class='jc'><code><del>UonPartSerializer</del></code>
-					<li class='jc'><code><del>SimpleUonPartSerializer</del></code>
+					<li class='jc'><dc>UonPartSerializer</dc>
+					<li class='jc'><dc>SimpleUonPartSerializer</dc>
 					<li class='jc'>{@link oaj.httppart.SimplePartSerializer}
 				</ul>
 				<li class='jic'>{@link oaj.httppart.HttpPartParser}
 				<ul>
-					<li class='jc'><code><del>UonPartParser</del></code>
-					<li class='jc'><code><del>SimplePartParser</del></code>
+					<li class='jc'><dc>UonPartParser</dc>
+					<li class='jc'><dc>SimplePartParser</dc>
 				</ul>
 			</ul>
 		</ul>
 		Code for marshalling of parts have been removed from the URL-Encoding serializers and parsers.
 	<li>	
-		<code>ContextBuilder.property(String,Object)</code> renamed to {@link oaj.ContextBuilder#set(String,Object)}.
+		<c>ContextBuilder.property(String,Object)</c> renamed to {@link oaj.ContextBuilder#set(String,Object)}.
 	<li>
-		<code>ResourceFinder</code> class has been replaced with the following:
+		<c>ResourceFinder</c> class has been replaced with the following:
 		<ul>
 			<li>{@link oaj.utils.ClasspathResourceFinder}
 			<li>{@link oaj.utils.ClasspathResourceFinderSimple}
@@ -213,13 +213,13 @@
 <h5 class='topic w800'>juneau-rest-server</h5>
 <ul class='spaced-list'>
 	<li>
-		<code>RestServletDefault</code> renamed to {@link oajr.BasicRestServlet}.
+		<c>RestServletDefault</c> renamed to {@link oajr.BasicRestServlet}.
 	<li>
-		<code>RestServletGroupDefault</code> renamed to {@link oajr.BasicRestServletGroup}.
+		<c>RestServletGroupDefault</c> renamed to {@link oajr.BasicRestServletGroup}.
 	<li>
 		The <js>"$R{...}"</js> variable has been split into the following:
 		<ul>
-			<li><js>"$RA{key1[,key2...]}"</js> - {@link oajr.vars.RequestAttributeVar}, first non-null value returned by <code>HttpServletRequest.getAttribute(String)</code>.
+			<li><js>"$RA{key1[,key2...]}"</js> - {@link oajr.vars.RequestAttributeVar}, first non-null value returned by <c>HttpServletRequest.getAttribute(String)</c>.
 			<li><js>"$RF{key1[,key2...]}"</js> - {@link oajr.vars.RequestFormDataVar}, first non-null value returned by {@link oajr.RestRequest#getFormData(String)}.
 			<li><js>"$RH{key1[,key2...]}"</js> - {@link oajr.vars.RequestHeaderVar}, first non-null value returned by {@link oajr.RestRequest#getHeader(String)}.
 			<li><js>"$RI{key1[,key2...]}"</js> - {@link oajr.vars.RestInfoVar}, first non-null value returned by {@link oajr.RestRequest#getInfoProvider()}.
@@ -258,7 +258,7 @@
 				</ul>
 		</ul>
 	<li>
-		Refactored the <code>RestConfig</code> class into {@link oajr.RestContextBuilder}.
+		Refactored the <c>RestConfig</c> class into {@link oajr.RestContextBuilder}.
 		<br>Settings on {@link oajr.RestContext} objects can now be set declaratively through the 
 			following new properties:
 		<ul>
@@ -283,7 +283,7 @@
 			<li>{@link oajr.RestContext#REST_callHandler REST_callHandler}
 			<li>{@link oajr.RestContext#REST_infoProvider REST_infoProvider}
 			<li>{@link oajr.RestContext#REST_path REST_path}
-			<li><code><del>REST_contextPath</del></code>
+			<li><dc>REST_contextPath</dc>
 			<li>{@link oajr.RestContext#REST_staticFiles REST_staticFiles}
 			<li>{@link oajr.RestContext#REST_staticFileResponseHeaders REST_staticFileResponseHeaders}
 			<li>{@link oajr.RestContext#REST_classpathResourceFinder REST_classpathResourceFinder}
@@ -304,57 +304,57 @@
 				{@link oajr.RestContext#REST_classpathResourceFinder REST_classpathResourceFinder}
 		</ul>
 	<li>
-		Eliminated the <code>RestMatcherReflecting</code> class.
+		Eliminated the <c>RestMatcherReflecting</c> class.
 		<br>You can now simply create a {@link oajr.RestMatcher} that has a public constructor that 
 		takes in the server and method arguments.
 	<li>
-		<code>@RestResource.allowMethodParam</code> renamed to {@link oajr.annotation.RestResource#allowedMethodParams}.
+		<c>@RestResource.allowMethodParam</c> renamed to {@link oajr.annotation.RestResource#allowedMethodParams}.
 	<li>
-		<code>@RestMethod.serializersInherit</code> and <code>@RestMethod.parsersInherit</code> replaced with
-		simplified <code><del>@RestMethod(inherit)</del></code>. 
+		<c>@RestMethod.serializersInherit</c> and <c>@RestMethod.parsersInherit</c> replaced with
+		simplified <dc>@RestMethod(inherit)</dc>. 
 	<li>
 		Changes to {@link oajr.RequestFormData}:
 		<ul>
 			<li>{@link oajr.RequestFormData#addDefault(Map) addDefault(Map)} takes in a 
-				<code>Map&lt;String,Object&gt;</code> instead of <code>Map&lt;String,String&gt;</code>.
+				<c>Map&lt;String,Object&gt;</c> instead of <c>Map&lt;String,String&gt;</c>.
 		</ul>
 	<li>
 		Changes to {@link oajr.RequestHeaders}:
 		<ul>
 			<li>{@link oajr.RequestHeaders#addDefault(Map) addDefault(Map)} takes in a 
-				<code>Map&lt;String,Object&gt;</code> instead of <code>Map&lt;String,String&gt;</code>.
+				<c>Map&lt;String,Object&gt;</c> instead of <c>Map&lt;String,String&gt;</c>.
 		</ul>
 	<li>
 		Changes to {@link oajr.RequestQuery}:
 		<ul>
 			<li>{@link oajr.RequestQuery#addDefault(Map) addDefault(Map)} takes in a 
-				<code>Map&lt;String,Object&gt;</code> instead of <code>Map&lt;String,String&gt;</code>.
+				<c>Map&lt;String,Object&gt;</c> instead of <c>Map&lt;String,String&gt;</c>.
 		</ul>
 	<li>
 		Changes to {@link oajr.RestContext}:
 		<ul>
-			<li><code>getResource(String,Locale)</code> renamed to {@link oajr.RestContext#getClasspathResource(String,Locale) getClasspathResource(String,Locale)}
-			<li><code>getResourceAsString(String,Locale)</code> renamed to {@link oajr.RestContext#getClasspathResourceAsString(String,Locale) getClasspathResourceAsString(String,Locale)}
-			<li><code>getResource(Class,MediaType,String,Locale)</code> renamed to {@link oajr.RestContext#getClasspathResource(Class,MediaType,String,Locale) getClasspathResourceAsString(Class,MediaType,String,Locale)}
+			<li><c>getResource(String,Locale)</c> renamed to {@link oajr.RestContext#getClasspathResource(String,Locale) getClasspathResource(String,Locale)}
+			<li><c>getResourceAsString(String,Locale)</c> renamed to {@link oajr.RestContext#getClasspathResourceAsString(String,Locale) getClasspathResourceAsString(String,Locale)}
+			<li><c>getResource(Class,MediaType,String,Locale)</c> renamed to {@link oajr.RestContext#getClasspathResource(Class,MediaType,String,Locale) getClasspathResourceAsString(Class,MediaType,String,Locale)}
 			<li>New method {@link oajr.RestContext#getClasspathResource(Class,String,Locale) getClasspathResource(Class,String,Locale)}.
 			<li>New method {@link oajr.RestContext#getClasspathResourceAsString(Class,String,Locale) getClasspathResourceAsString(Class,String,Locale)}.
 			<li>New method {@link oajr.RestContext#getClasspathResource(Class,Class,MediaType,String,Locale) getClasspathResource(Class,Class,MediaType,String,Locale)}.
 			<li>{@link oajr.RestContext#getDefaultRequestHeaders() getDefaultRequestHeaders} returns a 
-				<code>Map&lt;String,Object&gt;</code> instead of <code>Map&lt;String,String&gt;</code>.
+				<c>Map&lt;String,Object&gt;</c> instead of <c>Map&lt;String,String&gt;</c>.
 			<li>{@link oajr.RestContext#getDefaultResponseHeaders() getDefaultRequestHeaders} returns a 
-				<code>Map&lt;String,Object&gt;</code> instead of <code>Map&lt;String,String&gt;</code>.
+				<c>Map&lt;String,Object&gt;</c> instead of <c>Map&lt;String,String&gt;</c>.
 		</ul>
 	<li>
 		Changes to {@link oajr.RestRequest}:
 		<ul>	
-			<li><code>getSupportedMediaTypes()</code> replaced with
+			<li><c>getSupportedMediaTypes()</c> replaced with
 				{@link oajr.RestRequest#getConsumes() getConsumes()} and
 				{@link oajr.RestRequest#getProduces() getProduces()}.
-			<li><code>getReaderResource(String,boolean,MediaType)</code> renamed to 
-				<code><del>getClasspathReaderResource(String,boolean,MediaType)</del></code>
-			<li><code>getReaderResource(String,boolean)</code> renamed to 
+			<li><c>getReaderResource(String,boolean,MediaType)</c> renamed to 
+				<dc>getClasspathReaderResource(String,boolean,MediaType)</dc>
+			<li><c>getReaderResource(String,boolean)</c> renamed to 
 				{@link oajr.RestRequest#getClasspathReaderResource(String,boolean) getClasspathReaderResource(String,boolean)}
-			<li><code>getReaderResource(String)</code> renamed to 
+			<li><c>getReaderResource(String)</c> renamed to 
 				{@link oajr.RestRequest#getClasspathReaderResource(String) getClasspathReaderResource(String)}
 		</ul>
 	<li>
@@ -370,16 +370,16 @@
 				for overriding the supported media types inferred from the serializers and parsers.
 		</ul>
 	<li>
-		<code>RestCallHandler</code> split up into {@link oajr.RestCallHandler} and 
+		<c>RestCallHandler</c> split up into {@link oajr.RestCallHandler} and 
 		{@link oajr.BasicRestCallHandler}
 	<li>
-		<code>RestInfoProvider</code> split up into {@link oajr.RestInfoProvider} and 
+		<c>RestInfoProvider</c> split up into {@link oajr.RestInfoProvider} and 
 		{@link oajr.BasicRestInfoProvider}
 	<li>
-		<code>RestLogger</code> split up into {@link oajr.RestLogger}, 
+		<c>RestLogger</c> split up into {@link oajr.RestLogger}, 
 		{@link oajr.BasicRestLogger} and {@link oajr.NoOpRestLogger}
 	<li>
-		<code>RestResourceResolverSimple</code> renamed to {@link oajr.BasicRestResourceResolver}
+		<c>RestResourceResolverSimple</c> renamed to {@link oajr.BasicRestResourceResolver}
 	<li>
 		Introduced the following classes that helps make the code more understandable:
 		<ul>
@@ -388,28 +388,28 @@
 			<li>{@link oajr.RequestProperties}
 		</ul>
 	<li>
-		Eliminated the <code>@Messages</code> and <code>@Properties</code> REST java method parameter
+		Eliminated the <c>@Messages</c> and <c>@Properties</c> REST java method parameter
 		annotations.
-		<br>These aren't needed anymore since you can just pass in <code>MessageBundle</code> and
-		<code>RestRequestProperties</code> as unannotated parameters.
+		<br>These aren't needed anymore since you can just pass in <c>MessageBundle</c> and
+		<c>RestRequestProperties</c> as unannotated parameters.
 	<li>
 		Revamped the {@link oajr.RestInfoProvider} class.
 	<li>
 		New builder classes:
 		<ul>
-			<li><code><del>ReaderResourceBuilder</del></code>
-			<li><code><del>StreamResourceBuilder</del></code>
+			<li><dc>ReaderResourceBuilder</dc>
+			<li><dc>StreamResourceBuilder</dc>
 		</ul>
 	<li>
 		{@link oajr.RestResponse#getNegotiatedOutputStream()} now returns a 
-		<code><del>FinishableServletOutputStream</del></code> and {@link oajr.RestResponse#getNegotiatedWriter()}
-		now returns a <code><del>FinishablePrintWriter</del></code> that allows you to finish the output
+		<dc>FinishableServletOutputStream</dc> and {@link oajr.RestResponse#getNegotiatedWriter()}
+		now returns a <dc>FinishablePrintWriter</dc> that allows you to finish the output
 		without closing the stream.
-		<br>The {@link oajr.reshandlers.DefaultHandler} class now calls <code>finish()</code>
-		instead of <code>close()</code> on the stream.
+		<br>The {@link oajr.reshandlers.DefaultHandler} class now calls <c>finish()</c>
+		instead of <c>close()</c> on the stream.
 	<li>
 		Added the following annotations to the {@link oajr.BasicRestServlet} class
-		(which were previously defined on the <code><del>Resource</del></code> class):
+		(which were previously defined on the <dc>Resource</dc> class):
 		<p class='bcode w800'>
 	<ja>@RestResource</ja>(
 		htmldoc=<ja>@HtmlDoc</ja>(
@@ -432,8 +432,8 @@
 		New configuration property {@link oajrc.RestClient#RESTCLIENT_query} and
 		builder method {@link oajrc.RestClientBuilder#query(String,Object)}.
 	<li>
-		API changes to replace <code>PartSerializer</code> with {@link oaj.httppart.HttpPartSerializer}.
-		<br>The default value is now <code><del>SimpleUonPartSerializer</del></code> which will
+		API changes to replace <c>PartSerializer</c> with {@link oaj.httppart.HttpPartSerializer}.
+		<br>The default value is now <dc>SimpleUonPartSerializer</dc> which will
 		serialize strings as plain-text and collections/arrays as comma-delimited lists.
 		<br>We decided to change the default behavior in favor of practicality over purity.
 	<li>
@@ -444,15 +444,15 @@
 		</ul>
 	<li>
 		{@link oajrc.RestCall} and {@link oajrc.RestClient}
-		now implement the <code>Closeable</code> interface.
+		now implement the <c>Closeable</c> interface.
 </ul>
 
 <h5 class='topic w800'>juneau-microservice</h5>
 <ul class='spaced-list'>
 	<li>
-		<code>Resource</code> and <code>ResourceGroup</code> classes removed.
+		<c>Resource</c> and <c>ResourceGroup</c> classes removed.
 		<br>{@link oajr.BasicRestServlet} and {@link oajr.BasicRestServletGroup} can be used instead.
 	<li>
-		<code>ResourceJena</code> and <code>ResourceJenaGroup</code> classes renamed to
-		<code><del>BasicRestServletJena</del></code> and <code><del>BasicRestServletJenaGroup</del></code>.
+		<c>ResourceJena</c> and <c>ResourceJenaGroup</c> classes renamed to
+		<dc>BasicRestServletJena</dc> and <dc>BasicRestServletJenaGroup</dc>.
 </ul>
diff --git a/juneau-doc/docs/ReleaseNotes/7.2.0.html b/juneau-doc/docs/ReleaseNotes/7.2.0.html
index 8840aa4..89ed2a7 100644
--- a/juneau-doc/docs/ReleaseNotes/7.2.0.html
+++ b/juneau-doc/docs/ReleaseNotes/7.2.0.html
@@ -49,18 +49,18 @@
 			and auto-generated Swagger documentation:
 		<ul class='doctree'>
 			<li class='ja'>{@link oaj.http.annotation.Contact}
-			<li class='ja'><code><del>ExternalDocs</del></code>
-			<li class='ja'><code><del>Items</del></code>
+			<li class='ja'><dc>ExternalDocs</dc>
+			<li class='ja'><dc>Items</dc>
 			<li class='ja'>{@link oaj.http.annotation.License}
-			<li class='ja'><code><del>Schema</del></code>
-			<li class='ja'><code><del>SubItems</del></code>
+			<li class='ja'><dc>Schema</dc>
+			<li class='ja'><dc>SubItems</dc>
 			<li class='ja'>{@link oaj.http.annotation.Tag}
 		</ul>
 		<br>Additionally, the <ja>@Remoteable</ja> annotation has been split into the following two annotations:
 		<ul class='doctree'>
 			<li class='ja'>{@link oaj.remote.RemoteInterface} 
 				- Used for remote proxy interfaces served up through 
-				<code><del>RemoteInterfaceServlet</del></code> or REST <js>"PROXY"</js> methods.
+				<dc>RemoteInterfaceServlet</dc> or REST <js>"PROXY"</js> methods.
 				<br>Defaults to <js>"POST"</js> with method signatures as paths.
 			<li class='ja'>{@link oajrc.remote.RemoteResource} 
 				- Used for 3rd-party REST interfaces.
@@ -68,11 +68,11 @@
 		</ul>
 	<li>
 		Support for multi-valued parameters as maps or beans on server-side annotations (it was previously supported on client-side):
-		<code><ja>@Query</ja>(<js>"*"</js>)</code>, <code><ja>@FormData</ja>(<js>"*"</js>)</code>, <code><ja>@Header</ja>(<js>"*"</js>)</code>, <code><ja>@Path</ja>(<js>"*"</js>)</code>
+		<c><ja>@Query</ja>(<js>"*"</js>)</c>, <c><ja>@FormData</ja>(<js>"*"</js>)</c>, <c><ja>@Header</ja>(<js>"*"</js>)</c>, <c><ja>@Path</ja>(<js>"*"</js>)</c>
 	<li>
 		Support for server-side use of <ja>@Request</ja> annotation on <ja>@RestMethod</ja> annotations and new {@link oajr.RestRequest#getRequest(RequestBeanMeta)} method.
 	<li>
-		Fixed bug where <code><ja>@Bean</ja>(typeName)</code> was not being detected on non-bean POJO classes.
+		Fixed bug where <c><ja>@Bean</ja>(typeName)</c> was not being detected on non-bean POJO classes.
 	<li>
 		Fixed bug where HTML-Schema was not being rendered correctly.
 	<li>
@@ -84,14 +84,14 @@
 	<li>
 		Fixed bug where parsers could report the wrong line number when an error occurred.
 	<li>
-		A runtime exception is now thrown if you define a <code><ja>@BeanProperty</ja>(name)</code> but forget to
-		add it to your <code><ja>@Bean</ja>(properties)</code> annotation.
+		A runtime exception is now thrown if you define a <c><ja>@BeanProperty</ja>(name)</c> but forget to
+		add it to your <c><ja>@Bean</ja>(properties)</c> annotation.
 	<li>
-		<code><ja>@Html</ja>(asXml)</code> and <code><ja>@Html</ja>(asPlainText)</code> replaced with
+		<c><ja>@Html</ja>(asXml)</c> and <c><ja>@Html</ja>(asPlainText)</c> replaced with
 		{@link oaj.html.annotation.Html#format() @Html(format)}.
 	<li>
 		HTML serializer will now serializers beans and maps as HTML even when those objects are embedded
-		within an object with <code><ja>@Html</ja>(format=<jsf>XML</jsf>)</code>.
+		within an object with <c><ja>@Html</ja>(format=<jsf>XML</jsf>)</c>.
 		<br>The previous behavior was to serialize it as XML.
 	<li>
 		New settings for binary-based serializers and parsers:
@@ -136,25 +136,25 @@
 		New property {@link oaj.parser.Parser#PARSER_debugOutputLines} for controlling how many input lines are added to the exception message above.
 	<li>
 		New property {@link oaj.BeanContext#BEAN_useEnumNames} for controlling whether enums are serialized
-		using their name or the <code>toString()</code> method.
+		using their name or the <c>toString()</c> method.
 	<li>
 		New property {@link oaj.BeanContext#BEAN_examples} for defining examples of POJOs.
 	<li>
 		New {@link oaj.annotation.Example @Example} annotation for defining examples of POJOs.
 		<br>Used heavily in JSON-Schema support.
 	<li>
-		If a bean has both a <code>getX()</code> and <code>isX()</code> method, the <code>getX()</code> method takes precedence.
+		If a bean has both a <c>getX()</c> and <c>isX()</c> method, the <c>getX()</c> method takes precedence.
 		<br>The previous behavior was arbitrary.
 	<li>
 		Significant improvements to JSON-Schema serialization support.
 		<ul>
-			<li>New <code><del>@JsonSchema</del></code> annotation.
+			<li>New <dc>@JsonSchema</dc> annotation.
 		</ul>
 	<li>
-		Fixed <code>NullPointerException</code> when serializing beans with a dyna-property (i.e. <code><ja>@Bean</ja>(<js>"*"</js>)</code>)
+		Fixed <c>NullPointerException</c> when serializing beans with a dyna-property (i.e. <c><ja>@Bean</ja>(<js>"*"</js>)</c>)
 		which returns a <jk>null</jk> value.
 	<li>
-		New option for dyna-property (i.e. <code><ja>@Bean</ja>(<js>"*"</js>)</code>) using a method that returns a collection of extra keys.
+		New option for dyna-property (i.e. <c><ja>@Bean</ja>(<js>"*"</js>)</c>) using a method that returns a collection of extra keys.
 		<br>See new options #4 on {@link oaj.annotation.BeanProperty#name()}
 	<li>
 		New formats for the {@link oaj.html.annotation.Html#format() @Html(format)} annotation:
@@ -164,7 +164,7 @@
 		</ul> 
 	<li>
 		Serializers now allow for q-values on the media types they handle.
-		<br>For example, the accept media type on <code>JsonSerializer.Simple</code> is <js>"application/json+simple,application/json;q=0.9"</js>.
+		<br>For example, the accept media type on <c>JsonSerializer.Simple</c> is <js>"application/json+simple,application/json;q=0.9"</js>.
 		<br>This means the serializer CAN handle requests for <js>"application/json"</js> if no other serializers provide a better match.
 	<li>
 		New methods for creating unmodifiable {@link oaj.ObjectMap ObjectMaps} and {@link oaj.ObjectList ObjectLists}.
@@ -183,19 +183,19 @@
 			</ul>
 		</ul>
 	<li>
-		The <code>JsonSerializer.Simple</code> class has been moved into the top-level {@link oaj.json.SimpleJsonSerializer} class.
+		The <c>JsonSerializer.Simple</c> class has been moved into the top-level {@link oaj.json.SimpleJsonSerializer} class.
 	<li>
 		RDF serializer subclasses have been moved into top-level classes:
 		<ul>
-			<li><code>RdfSerializer.Xml</code> -&gt; {@link oaj.jena.RdfXmlSerializer}
-			<li><code>RdfSerializer.XmlAbbrev</code> -&gt; {@link oaj.jena.RdfXmlAbbrevSerializer}
-			<li><code>RdfSerializer.N3</code> -&gt; {@link oaj.jena.N3Serializer}
-			<li><code>RdfSerializer.NTriple</code> -&gt; {@link oaj.jena.NTripleSerializer}
-			<li><code>RdfSerializer.Turtle</code> -&gt; {@link oaj.jena.TurtleSerializer}
-			<li><code>RdfParser.Xml</code> -&gt; {@link oaj.jena.RdfXmlParser}
-			<li><code>RdfParser.N3</code> -&gt; {@link oaj.jena.N3Parser}
-			<li><code>RdfParser.NTriple</code> -&gt; {@link oaj.jena.NTripleParser}
-			<li><code>RdfParser.Turtle</code> -&gt; {@link oaj.jena.TurtleParser}
+			<li><c>RdfSerializer.Xml</c> -&gt; {@link oaj.jena.RdfXmlSerializer}
+			<li><c>RdfSerializer.XmlAbbrev</c> -&gt; {@link oaj.jena.RdfXmlAbbrevSerializer}
+			<li><c>RdfSerializer.N3</c> -&gt; {@link oaj.jena.N3Serializer}
+			<li><c>RdfSerializer.NTriple</c> -&gt; {@link oaj.jena.NTripleSerializer}
+			<li><c>RdfSerializer.Turtle</c> -&gt; {@link oaj.jena.TurtleSerializer}
+			<li><c>RdfParser.Xml</c> -&gt; {@link oaj.jena.RdfXmlParser}
+			<li><c>RdfParser.N3</c> -&gt; {@link oaj.jena.N3Parser}
+			<li><c>RdfParser.NTriple</c> -&gt; {@link oaj.jena.NTripleParser}
+			<li><c>RdfParser.Turtle</c> -&gt; {@link oaj.jena.TurtleParser}
 		</ul>
 	<li>
 		New API for pairing serializers and parsers for simplified syntax:
@@ -250,7 +250,7 @@
 		instead of a list of strings.
 	<li>
 		Boolean attributes are now handled correctly for HTML5.
-		<br>For example, calling <code><jk>new</jk> Select().disabled(<jk>true</jk>)</code> will produce <code>&lt;select disabled='disabled'&gt;</code>
+		<br>For example, calling <c><jk>new</jk> Select().disabled(<jk>true</jk>)</c> will produce <c>&lt;select disabled='disabled'&gt;</c>
 </ul>
 
 <h5 class='topic w800'>juneau-rest-server</h5>
@@ -261,15 +261,15 @@
 		Simplified {@link oajr.annotation.RestResource#swagger() @RestResource(swagger)}
 		and {@link oajr.annotation.RestMethod#swagger() @RestMethod(swagger)} annotations.
 	<li>
-		Fixed bug in <code>UriResolver</code> when request path info had special characters.
+		Fixed bug in <c>UriResolver</c> when request path info had special characters.
 	<li>
-		Fixed bug where incorrect media type was being set on responses (e.g. <code>text/html+schema</code> instead of <code>text/html</code> for schema documents).
+		Fixed bug where incorrect media type was being set on responses (e.g. <c>text/html+schema</c> instead of <c>text/html</c> for schema documents).
 	<li>
-		The <code>RemoteableServlet</code> class has been moved and renamed to <code><del>RemoteInterfaceServlet</del></code>.
+		The <c>RemoteableServlet</c> class has been moved and renamed to <dc>RemoteInterfaceServlet</dc>.
 	<li>
-		<code><del>RemoteInterfaceServlet</del></code> now provides a form page for invoking remote interface methods in a browser.
+		<dc>RemoteInterfaceServlet</dc> now provides a form page for invoking remote interface methods in a browser.
 	<li>
-		Newlines were being stripped from <code><ja>@HtmlDoc</ja>(script)</code> when serialized which could cause script lines to become commented out.
+		Newlines were being stripped from <c><ja>@HtmlDoc</ja>(script)</c> when serialized which could cause script lines to become commented out.
 	<li>
 		New {@link oaj.http.annotation.Response @Response} annotation that can be applied to
 		throwables thrown from REST methods and POJOs returned by REST methods to specify non-200 status return codes and descriptions in Swagger documentation.
@@ -284,7 +284,7 @@
 		</ul>
 	<li>
 		The <ja>@PathRemainder</ja> annotation has been removed entirely.  
-		<br>Use <code><ja>@Path</ja>(<js>"/*"</js>)</code> to access the path remainder which includes all the new OpenAPI parsing support.
+		<br>Use <c><ja>@Path</ja>(<js>"/*"</js>)</c> to access the path remainder which includes all the new OpenAPI parsing support.
 	<li>
 		"Helper" classes (i.e. reusable beans that can be returned by REST methods) have been moved to the following package with some new additions:
 		<ul class='doctree'>
@@ -292,12 +292,12 @@
 			<ul>
 				<li class='jc'>{@link oajr.helper.BeanDescription}
 				<li class='jc'>{@link oajr.helper.ChildResourceDescriptions}
-				<li class='jc'><code><del>ReaderResource</del></code>
-				<li class='jc'><code><del>ReaderResourceBuilder</del></code>
+				<li class='jc'><dc>ReaderResource</dc>
+				<li class='jc'><dc>ReaderResourceBuilder</dc>
 				<li class='jc'>{@link oajr.helper.SeeOtherRoot}
 				<li class='jc'>{@link oajr.helper.ResourceDescription}
-				<li class='jc'><code><del>StreamResource</del></code>
-				<li class='jc'><code><del>StreamResourceBuilder</del></code>
+				<li class='jc'><dc>StreamResource</dc>
+				<li class='jc'><dc>StreamResourceBuilder</dc>
 			</ul>
 		</ul>
 	<li>
@@ -373,7 +373,7 @@
 	<li>
 		The {@link oajr.annotation.HtmlDoc#nav() @HtmlDoc(nav)} and {@link oajr.annotation.HtmlDoc#navlinks() @HtmlDoc(navlinks)}
 		can now both be used on the same annotation.
-		<br>The contents of <code>nav()</code> are free-form HTML that gets rendered immediately after the navigation links.
+		<br>The contents of <c>nav()</c> are free-form HTML that gets rendered immediately after the navigation links.
 	<li>
 		The following new parameter types can be used on REST methods:
 		<ul class='doctree'>
@@ -381,8 +381,8 @@
 			<li class='jc'>{@link oaj.parser.InputStreamParser} - The input stream parser matching the request content type.
 		</ul>
 	<li>
-		The <code>$F</code> variable can now be used as a initialization time variable.
-		<br>For example, the <code>AtomFeedResource</code> example pulls a bean example from a file on the classpath:
+		The <c>$F</c> variable can now be used as a initialization time variable.
+		<br>For example, the <c>AtomFeedResource</c> example pulls a bean example from a file on the classpath:
 		<p class='bcode w800'>
 	<ja>@RestResource</ja>(
 		path=<js>"/atom"</js>,
@@ -393,20 +393,20 @@
 		...
 	)
 		</p>
-		<br>It should be noted that you cannot use the <code>$F</code> variable to retrieve localized versions of files (since you're not within
+		<br>It should be noted that you cannot use the <c>$F</c> variable to retrieve localized versions of files (since you're not within
 		the scope of a client request.
 	<li>
-		The <code><del>RestResource.nowrap()</del></code> annotation has been changed to a string with a default value of <js>"true"</js>.
+		The <dc>RestResource.nowrap()</dc> annotation has been changed to a string with a default value of <js>"true"</js>.
 		<br>Having it as a string allows us to differentiate between a set and unset value so that it can be overridden in subclasses.
 	<li>
 		The {@link oaj.http.annotation.Path#name()} annotation parameter is now required.
 	<li>
 		New class for mock unit testing of REST resources:
 		<ul class='doctree'>
-			<li class='jc'><code><del>MockRest</del></code>
+			<li class='jc'><dc>MockRest</dc>
 		</ul>
 	<li>
-		<code><ja>@RestMethod</ja>(inherit)</code> annotation has been removed and replaced with the following classes:
+		<c><ja>@RestMethod</ja>(inherit)</c> annotation has been removed and replaced with the following classes:
 		<ul class='doctree'>
 			<li class='jc'>{@link oajr.Inherit}
 			<li class='jc'>{@link oajr.None}
@@ -422,9 +422,9 @@
 			<li class='ja'>{@link oajr.annotation.RestMethod#beanFilters()}
 			<li class='ja'>{@link oajr.annotation.RestMethod#pojoSwaps()}
 		</ul>
-		<br>One advantage is that you now have control over the precedence of serializers and parsers by where you insert the <code>Inherit</code> class. 
+		<br>One advantage is that you now have control over the precedence of serializers and parsers by where you insert the <c>Inherit</c> class. 
 	<li>
-		<code>RequestPathMatch</code> class has been renamed to {@link oajr.RequestPath}.
+		<c>RequestPathMatch</c> class has been renamed to {@link oajr.RequestPath}.
 	<li>
 		{@link oaj.http.annotation.Request @Request} objects can now be used as parameters in <ja>@RestMethod</ja> methods.
 		<br>Includes new methods on {@link oajr.RestRequest}:
@@ -437,8 +437,8 @@
 		<ul class='doctree'>
 			<li class='jc'>{@link oajr.widget.MenuItemWidget}
 			<ul>
-				<li class='jm'><code><del>getBeforeShowScript(RestRequest)</del></code>
-				<li class='jm'><code><del>getAfterShowScript(RestRequest)</del></code>
+				<li class='jm'><dc>getBeforeShowScript(RestRequest)</dc>
+				<li class='jm'><dc>getAfterShowScript(RestRequest)</dc>
 			</ul>
 		</ul>
 	<li>
@@ -446,21 +446,21 @@
 		<ul class='doctree'>
 			<li class='jc'>{@link oajr.widget.Widget}
 			<ul>
-				<li class='jm'><code><del>loadHtmlWithVars(RestRequest,String)</del></code>
-				<li class='jm'><code><del>loadScriptWithVars(RestRequest,String)</del></code>
-				<li class='jm'><code><del>loadStyleWithVars(RestRequest,String)</del></code>
+				<li class='jm'><dc>loadHtmlWithVars(RestRequest,String)</dc>
+				<li class='jm'><dc>loadScriptWithVars(RestRequest,String)</dc>
+				<li class='jm'><dc>loadStyleWithVars(RestRequest,String)</dc>
 			</ul>
 		</ul>
 	<li>
 		New/updated documentation: 
-		<br><code><del>juneau-rest-server.UnitTesting</del></code>
+		<br><dc>juneau-rest-server.UnitTesting</dc>
 	<li>
 		The behavior of the default values for {@link oajr.annotation.RestMethod#name()} and {@link oajr.annotation.RestMethod#path()}
 		have changed.
 		<br>If not specified, the values are inferred from the Java method name.
 		<br>See Also: {@doc juneau-rest-server.RestMethod}
 	<li>
-		<code>RedirectToServletRoot</code> class has been renamed to {@link oajr.helper.SeeOtherRoot}.
+		<c>RedirectToServletRoot</c> class has been renamed to {@link oajr.helper.SeeOtherRoot}.
 	<li>
 		New REST context settings:
 		<ul class='doctree'>
@@ -473,7 +473,7 @@
 			</ul>
 		</ul>
 	<li>
-		New convenience annotations for specifying default <code>Accept</code> and <code>Content-Type</code> headers:
+		New convenience annotations for specifying default <c>Accept</c> and <c>Content-Type</c> headers:
 		<ul class='doctree'>	
 			<li class='jc'>{@link oajr.annotation.RestResource}
 			<ul>
@@ -530,24 +530,24 @@
 		<ul class='doctree'>
 			<li class='jc'>{@link oajrc.RestClientBuilder}
 			<ul>
-				<li class='jf'><code><del>mockHttpConnection(MockHttpConnection)</del></code>
+				<li class='jf'><dc>mockHttpConnection(MockHttpConnection)</dc>
 			</ul>
 		</ul>
 	<li>
-		Removed the deprecated <code>RestCall.execute()</code> method.
+		Removed the deprecated <c>RestCall.execute()</c> method.
 		<br>Use {@link oajrc.RestCall#run()}.
 	<li>
-		<code>RestCall.input(Object)</code> method renamed to {@link oajrc.RestCall#body(Object)} to match OpenAPI terminology.
+		<c>RestCall.input(Object)</c> method renamed to {@link oajrc.RestCall#body(Object)} to match OpenAPI terminology.
 	<li>
-		Made constructors on <code>RestClient</code> and <code>RestClientBuilder</code> protected so that they can be subclassed.
+		Made constructors on <c>RestClient</c> and <c>RestClientBuilder</c> protected so that they can be subclassed.
 	<li>
-		The <code>RestClient.getRemoteableProxy()</code> methods have been split into separate methods for Remote Interfaces and Remote Resources:
+		The <c>RestClient.getRemoteableProxy()</c> methods have been split into separate methods for Remote Interfaces and Remote Resources:
 		<ul class='doctree'>
 			<li class='jc'>{@link oajrc.RestClient}
 			<ul>
-				<li class='jm'><code><del>RestClient.getRemoteInterface(Class)</del></code>
-				<li class='jm'><code><del>RestClient.getRemoteInterface(Class,Object)</del></code>
-				<li class='jm'><code><del>RestClient.getRemoteInterface(Class,Object,Serializer,Parser)</del></code>
+				<li class='jm'><dc>RestClient.getRemoteInterface(Class)</dc>
+				<li class='jm'><dc>RestClient.getRemoteInterface(Class,Object)</dc>
+				<li class='jm'><dc>RestClient.getRemoteInterface(Class,Object,Serializer,Parser)</dc>
 				<li class='jm'>{@link oajrc.RestClient#getRemoteResource(Class)}
 				<li class='jm'>{@link oajrc.RestClient#getRemoteResource(Class,Object)}
 				<li class='jm'>{@link oajrc.RestClient#getRemoteResource(Class,Object,Serializer,Parser)}
@@ -559,7 +559,7 @@
 <ul class='spaced-list'>
 	<li>
 		The look-and-feel of an application is now controlled through the external configuration file and access to
-		CSS stylesheets in the working directory in a new folder called <code>files</code>:
+		CSS stylesheets in the working directory in a new folder called <c>files</c>:
 		<br><img class='bordered' style='width:170px' src='doc-files/ReleaseNotes.711.1.png'>
 		<br><br>
 		The default configuration is this: 
@@ -584,12 +584,12 @@
 	<ck>footer</ck> = <cv>&lt;a href='$U{$C{REST/footerLink}}'&gt;&lt;img style='float:right;padding-right:20px;height:32px' src='$U{$C{REST/footerIcon}}'&gt;</cv>	
 		</p>				
 		<br><br>
-		Note that static files can now be served up from the <code>files</code> directory in the working directory, 
+		Note that static files can now be served up from the <c>files</c> directory in the working directory, 
 		and you have access to modify the CSS theme files.
-		<br>The <code>SwaggerUI.css</code> file controls the look-and-feel of the Swagger UI, so you can make
+		<br>The <c>SwaggerUI.css</c> file controls the look-and-feel of the Swagger UI, so you can make
 		modification there as well.
 		<br><br>
-		The <code>BasicRestConfig</code> interface (which defines the default settings for the <code>BasicRestServlet</code> class)
+		The <c>BasicRestConfig</c> interface (which defines the default settings for the <c>BasicRestServlet</c> class)
 		now looks like this...
 		<p class='bcode w800'>
 	<ja>@RestResource</ja>(
@@ -617,7 +617,7 @@
 	<jk>public interface</jk> BasicRestConfig {}			
 			</p>	
 			<br><br>
-			The <code>PoweredByApache</code> widget which used to serve as a page footer has been eliminated.
+			The <c>PoweredByApache</c> widget which used to serve as a page footer has been eliminated.
 			<br><br>
 			If you're testing out changes in the theme stylesheets, you may want to set the following system property
 			that prevents caching of those files so that you don't need to restart the microservice each time a change is made:
diff --git a/juneau-doc/docs/ReleaseNotes/7.2.1.html b/juneau-doc/docs/ReleaseNotes/7.2.1.html
index 341213f..bd1bdcf 100644
--- a/juneau-doc/docs/ReleaseNotes/7.2.1.html
+++ b/juneau-doc/docs/ReleaseNotes/7.2.1.html
@@ -23,7 +23,7 @@
 <h5 class='topic w800'>juneau-marshall</h5>
 <ul class='spaced-list'>
 	<li>
-		The <code><del>@JsonSchema</del></code> annotation has been merged with the {@link oaj.jsonschema.annotation.Schema @Schema} annotation.
+		The <dc>@JsonSchema</dc> annotation has been merged with the {@link oaj.jsonschema.annotation.Schema @Schema} annotation.
 	<li>
 		Annotations typically used on bean properties (getters/setters/public fields) can now be used on private fields.
 		This is inline with behavior on JPA-annotated beans.
@@ -37,20 +37,20 @@
 		from parent classes and interfaces. 
 		<br>This allows you to define {@doc juneau-rest-client.RestProxies.DualPurposeInterfaces}.
 	<li>
-		The <code>ReaderResource</code> and <code>StreamResource</code> classes have been moved to the <code>org.apache.juneau.http</code>
-		package in <code>juneau-marshall</code>.  This allows them to be used as return types in remote REST interfaces.
+		The <c>ReaderResource</c> and <c>StreamResource</c> classes have been moved to the <c>org.apache.juneau.http</c>
+		package in <c>juneau-marshall</c>.  This allows them to be used as return types in remote REST interfaces.
 		<br>A new {@link oajr.helper.ResolvingReaderResource} class has been added that includes the variable-resolving support since
-		this relies on the <code>juneau-svl</code> package.
+		this relies on the <c>juneau-svl</c> package.
 	<li>
-		The <code>RemoteInterfaceServlet</code> class has been renamed to {@link oajr.remote.RrpcServlet}.
+		The <c>RemoteInterfaceServlet</c> class has been renamed to {@link oajr.remote.RrpcServlet}.
 	<li>
-		<code><ja>@RestMethod</ja>(name=<js>"PROXY"</js>)</code> has been changed to <code><ja>@RestMethod</ja>(name=<js>"RRPC"</js>)</code>.
+		<c><ja>@RestMethod</ja>(name=<js>"PROXY"</js>)</c> has been changed to <c><ja>@RestMethod</ja>(name=<js>"RRPC"</js>)</c>.
 </ul>
 
 <h5 class='topic w800'>juneau-rest-client</h5>
 <ul class='spaced-list'>
 	<li>
-		The <code>RestClient.getRemoteInterface()</code> method has been renamed to {@link oajrc.RestClient#getRrpcInterface(Class)}.
+		The <c>RestClient.getRemoteInterface()</c> method has been renamed to {@link oajrc.RestClient#getRrpcInterface(Class)}.
 	<li>
-		Fixed a bug where <code><ja>@RemoteMethod</ja>(path)</code> values containing '/' characters were erroneously being encoded.
+		Fixed a bug where <c><ja>@RemoteMethod</ja>(path)</c> values containing '/' characters were erroneously being encoded.
 </ul>
\ No newline at end of file
diff --git a/juneau-doc/docs/ReleaseNotes/8.0.0.html b/juneau-doc/docs/ReleaseNotes/8.0.0.html
index f98ea13..9c4ed8f 100644
--- a/juneau-doc/docs/ReleaseNotes/8.0.0.html
+++ b/juneau-doc/docs/ReleaseNotes/8.0.0.html
@@ -26,27 +26,27 @@
 	The structure is now as follows:
 </p>
 <ul>
-	<li><code>juneau-rest</code>
+	<li><c>juneau-rest</c>
 	<ul>
-		<li><code>juneau-rest-client</code>
-		<li><code>juneau-rest-server</code>
-		<li><code>juneau-rest-server-jaxrs</code>
-		<li><code>juneau-rest-server-rdf</code>
-		<li><b><code>juneau-rest-server-springboot</code></b> - New Spring Boot integration support classes. 
+		<li><c>juneau-rest-client</c>
+		<li><c>juneau-rest-server</c>
+		<li><c>juneau-rest-server-jaxrs</c>
+		<li><c>juneau-rest-server-rdf</c>
+		<li><b><c>juneau-rest-server-springboot</c></b> - New Spring Boot integration support classes. 
 	</ul>
-	<li><code>juneau-microservice</code>
+	<li><c>juneau-microservice</c>
 	<ul>
-		<li><b><code>juneau-microservice-core</code></b> - New.  Contains base {@link oaj.microservice.Microservice} class.
-		<li><b><code>juneau-microservice-jetty</code></b> - New.  Contains new {@link oaj.microservice.jetty.JettyMicroservice} class.
-		<li><b><code>juneau-my-jetty-microservice</code></b> - New.  Template starter project for Jetty-based microservices.
-		<li><b><code>juneau-my-springboot-microservice</code></b> - New.  Template starter project for Spring-Boot-based microservices.
+		<li><b><c>juneau-microservice-core</c></b> - New.  Contains base {@link oaj.microservice.Microservice} class.
+		<li><b><c>juneau-microservice-jetty</c></b> - New.  Contains new {@link oaj.microservice.jetty.JettyMicroservice} class.
+		<li><b><c>juneau-my-jetty-microservice</c></b> - New.  Template starter project for Jetty-based microservices.
+		<li><b><c>juneau-my-springboot-microservice</c></b> - New.  Template starter project for Spring-Boot-based microservices.
 	</ul>
-	<li><code>juneau-examples</code>
+	<li><c>juneau-examples</c>
 	<ul>
-		<li><code>juneau-core</code>
-		<li><b><code>juneau-microservice-rest</code></b> - Now contains only servlet example classes.  No Jetty configuration.
-		<li><b><code>juneau-microservice-rest-jetty</code></b> - Servlet examples deployed using Jetty.
-		<li><b><code>juneau-microservice-rest-springboot</code></b> - Servlet examples deployed using Spring Boot.
+		<li><c>juneau-core</c>
+		<li><b><c>juneau-microservice-rest</c></b> - Now contains only servlet example classes.  No Jetty configuration.
+		<li><b><c>juneau-microservice-rest-jetty</c></b> - Servlet examples deployed using Jetty.
+		<li><b><c>juneau-microservice-rest-springboot</c></b> - Servlet examples deployed using Spring Boot.
 	</ul>
 </ul>
 
@@ -129,7 +129,7 @@
 <h5 class='topic w800'>juneau-microservice-jetty</h5>
 <ul class='spaced-list'>
 	<li>
-		New {@link oaj.microservice.jetty.JettyMicroservice} class replaces the previous <code>RestMicroservice</code>.
+		New {@link oaj.microservice.jetty.JettyMicroservice} class replaces the previous <c>RestMicroservice</c>.
 </ul>
 
 <h5 class='topic w800'>juneau-my-jetty-microservice</h5>
@@ -143,6 +143,6 @@
 	<li>
 		Template starter project for Spring-Boot-based microservices.
 	<li>
-		<code>app.json</code> and <code>Procfile</code> files for deploying examples into Heroku.
+		<c>app.json</c> and <c>Procfile</c> files for deploying examples into Heroku.
 		<br>Includes instructions.
 </ul>
diff --git a/juneau-doc/docs/ReleaseNotes/8.0.1.html b/juneau-doc/docs/ReleaseNotes/8.0.1.html
index 785d114..d7c389c 100644
--- a/juneau-doc/docs/ReleaseNotes/8.0.1.html
+++ b/juneau-doc/docs/ReleaseNotes/8.0.1.html
@@ -35,23 +35,23 @@
 		The following POJO methods can be used to convert a POJO to/from a Map before serialization and after parsing.
 		<br>It's a convenient way of defining a POJO transform.
 		<ul class='doctree'>
-			<li class='jm'><code><jk>public</jk> Map toMap()</code> -  Can be any type of map with string keys and object vals. 
-			<li class='jm'><code><jk>public</jk> ObjectMap toMap()</code>
-			<li class='jm'><code><jk>public</jk> Map toMap(BeanSession bs)</code> -  Can be any type of map with string keys and object vals. 
-			<li class='jm'><code><jk>public</jk> ObjectMap toMap(BeanSession bs)</code>
-			<li class='jm'><code><jk>public static</jk> T fromMap(Map m)</code> -  Can be any type of map with string keys and object vals. 
-			<li class='jm'><code><jk>public static</jk> T fromMap(ObjectMap m)</code>
-			<li class='jm'><code><jk>public static</jk> T fromMap(BeanSession bs, Map m)</code> -  Can be any type of map with string keys and object vals. 
-			<li class='jm'><code><jk>public static</jk> T fromMap(BeanSession bs, ObjectMap m)</code>
+			<li class='jm'><c><jk>public</jk> Map toMap()</c> -  Can be any type of map with string keys and object vals. 
+			<li class='jm'><c><jk>public</jk> ObjectMap toMap()</c>
+			<li class='jm'><c><jk>public</jk> Map toMap(BeanSession bs)</c> -  Can be any type of map with string keys and object vals. 
+			<li class='jm'><c><jk>public</jk> ObjectMap toMap(BeanSession bs)</c>
+			<li class='jm'><c><jk>public static</jk> T fromMap(Map m)</c> -  Can be any type of map with string keys and object vals. 
+			<li class='jm'><c><jk>public static</jk> T fromMap(ObjectMap m)</c>
+			<li class='jm'><c><jk>public static</jk> T fromMap(BeanSession bs, Map m)</c> -  Can be any type of map with string keys and object vals. 
+			<li class='jm'><c><jk>public static</jk> T fromMap(BeanSession bs, ObjectMap m)</c>
 		</ul>
 	<li>
 		New convenience debugging methods on Marshall API:
 		<ul class='doctree'>
 			<li class='jc'>{@link oaj.marshall.Marshall}
 			<ul>
-				<li class='jm'>{@link oaj.marshall.Marshall#format(String,Object...)} - <code>MessageFormat</code>-style formatter.
-				<li class='jm'>{@link oaj.marshall.Marshall#out(String,Object...)} - Prints <code>MessageFormat</code>-style messages to STDOUT.
-				<li class='jm'>{@link oaj.marshall.Marshall#err(String,Object...)} - Prints <code>MessageFormat</code>-style messages to STDERR.
+				<li class='jm'>{@link oaj.marshall.Marshall#format(String,Object...)} - <c>MessageFormat</c>-style formatter.
+				<li class='jm'>{@link oaj.marshall.Marshall#out(String,Object...)} - Prints <c>MessageFormat</c>-style messages to STDOUT.
+				<li class='jm'>{@link oaj.marshall.Marshall#err(String,Object...)} - Prints <c>MessageFormat</c>-style messages to STDERR.
 			</ul>
 		</ul>
 </ul>
@@ -84,7 +84,7 @@
 	<li>
 		Entries in the system config are automatically set as system properties.
 		<br>This mean you can set any of the various serializer and parser settings (e.g. <js>"JsonSerializer.simpleMode.b"</js>)
-		in the default configuration area or <code>application.properties</code>.
+		in the default configuration area or <c>application.properties</c>.
 </ul>
 
 <h5 class='topic w800'>juneau-rest-server</h5>
@@ -184,7 +184,7 @@
 			</ul>
 		</ul>
 	<li>
-		Added the following classes that provide the same support as the servlet classes but doesn't extend from <code>HttpServlet</code>.
+		Added the following classes that provide the same support as the servlet classes but doesn't extend from <c>HttpServlet</c>.
 		<br>This fixes an issue where instances of {@link oajr.BasicRestServlet} are registered as top-level servlets even though
 		you don't want them to be.  
 		<ul class='doctree'>
@@ -194,7 +194,7 @@
 			<li class='jac'>{@link oajr.BasicRestJenaGroup} - Non-servlet equivalent to {@link oajr.BasicRestServletJenaGroup}
 		</ul>
 	<li>
-		HTML widgets now have access to the <code>RestResponse</code> object if they need access to the output bean.
+		HTML widgets now have access to the <c>RestResponse</c> object if they need access to the output bean.
 	<li>
 		New annotations for simplified role-based guards on classes and methods:
 		<ul class='doctree'>
diff --git a/juneau-doc/docs/Topics/01.Introduction/02.Components.html b/juneau-doc/docs/Topics/01.Introduction/02.Components.html
index ddf6d09..5749a77 100644
--- a/juneau-doc/docs/Topics/01.Introduction/02.Components.html
+++ b/juneau-doc/docs/Topics/01.Introduction/02.Components.html
@@ -19,7 +19,7 @@
 	We've strived to keep prerequisites to an absolute minimum in order to make adoption as easy as possible.
 </p>
 <p>
-	The library consists of the following artifacts found in the Maven group <code>"org.apache.juneau"</code>:
+	The library consists of the following artifacts found in the Maven group <c>"org.apache.juneau"</c>:
 </p>
 <table class='styled w800'>
 	<tr>
@@ -226,7 +226,7 @@
 	</tr>
 	<tr class='dark bb'>
 		<td rowspan="1" style='text-align:center;font-weight:bold;padding:20px;' class='code'>juneau-all</td>
-		<td class='code'><code>juneau-all</code></td>
+		<td class='code'><c>juneau-all</c></td>
 		<td>
 			Combination of the following:
 			<ul style='margin:0px 10px;'>
@@ -249,7 +249,7 @@
 </table>
 
 <p>
-	The current version of Juneau is <code>{@property juneauVersion}</code>.
+	The current version of Juneau is <c>{@property juneauVersion}</c>.
 	The easiest way to pull in the library is through the following maven dependency:
 </p>
 <p class='bpcode w800'>
@@ -260,7 +260,7 @@
 	<xt>&lt;/dependency&gt;</xt>
 </p>	
 <p>
-	If you would like to work with the bleeding-edge code, you can access the <code>{@property juneauVersionNext}-SNAPSHOT</code>
+	If you would like to work with the bleeding-edge code, you can access the <c>{@property juneauVersionNext}-SNAPSHOT</c>
 	version through the following repository:
 </p>
 <p class='bpcode w800'>
diff --git a/juneau-doc/docs/Topics/02.juneau-marshall.html b/juneau-doc/docs/Topics/02.juneau-marshall.html
index 8c183bf..f8a0a1c 100644
--- a/juneau-doc/docs/Topics/02.juneau-marshall.html
+++ b/juneau-doc/docs/Topics/02.juneau-marshall.html
@@ -35,7 +35,7 @@
 </p>	
 
 <p>
-	The <code>juneau-marshall</code> artifact contains the API for defining serializers and parsers, and
+	The <c>juneau-marshall</c> artifact contains the API for defining serializers and parsers, and
 	marshalling support for JSON, XML, HTML, URL-Encoding, UON and others.
 </p>
 <p>
diff --git a/juneau-doc/docs/Topics/02.juneau-marshall/01.Serializers.html b/juneau-doc/docs/Topics/02.juneau-marshall/01.Serializers.html
index 079e1d4..b2cc649 100644
--- a/juneau-doc/docs/Topics/02.juneau-marshall/01.Serializers.html
+++ b/juneau-doc/docs/Topics/02.juneau-marshall/01.Serializers.html
@@ -93,10 +93,10 @@
 	String json = serializer.serialize(someObject);
 </p>
 <p>
-	Default serialization support is provided for Java primitives, <code>Maps</code>, <code>Collections</code>, 
+	Default serialization support is provided for Java primitives, <c>Maps</c>, <c>Collections</c>, 
 	beans, and arrays. 
-	Extensible support for other data types such as <code>Calendars</code>, <code>Dates</code>, 
-	<code>Iterators</code> is available through the use of POJO swaps (described later).
+	Extensible support for other data types such as <c>Calendars</c>, <c>Dates</c>, 
+	<c>Iterators</c> is available through the use of POJO swaps (described later).
 </p>
 <p>
 	The class hierarchy for the serializers (excluding specialized subclasses) are:
diff --git a/juneau-doc/docs/Topics/02.juneau-marshall/07.ConfigurableProperties.html b/juneau-doc/docs/Topics/02.juneau-marshall/07.ConfigurableProperties.html
index 1a750fc..0dca317 100644
--- a/juneau-doc/docs/Topics/02.juneau-marshall/07.ConfigurableProperties.html
+++ b/juneau-doc/docs/Topics/02.juneau-marshall/07.ConfigurableProperties.html
@@ -74,7 +74,7 @@
 </p>
 <p>
 	For performance reasons, serializers and parsers are immutable.
-	However, they can be 'copied' and modified using the <code>builder()</code> method.
+	However, they can be 'copied' and modified using the <c>builder()</c> method.
 </p>
 <p class='bpcode w800'>
 	<jc>// Clone and customize an existing serializer.</jc>
diff --git a/juneau-doc/docs/Topics/02.juneau-marshall/08.ObjectMap.html b/juneau-doc/docs/Topics/02.juneau-marshall/08.ObjectMap.html
index 02291fc..a7102d5 100644
--- a/juneau-doc/docs/Topics/02.juneau-marshall/08.ObjectMap.html
+++ b/juneau-doc/docs/Topics/02.juneau-marshall/08.ObjectMap.html
@@ -88,7 +88,7 @@
 	json = m.toString();
 </p>
 <p>
-	The <code>ObjectMap</code> and <code>ObjectList</code> classes have many convenience features:
+	The <c>ObjectMap</c> and <c>ObjectList</c> classes have many convenience features:
 </p>
 <p class='bpcode w800'>	
 	<jc>// Convert the map to a bean.</jc>		
diff --git a/juneau-doc/docs/Topics/02.juneau-marshall/09.Groups.html b/juneau-doc/docs/Topics/02.juneau-marshall/09.Groups.html
index 1bf8b6b..31d0296 100644
--- a/juneau-doc/docs/Topics/02.juneau-marshall/09.Groups.html
+++ b/juneau-doc/docs/Topics/02.juneau-marshall/09.Groups.html
@@ -18,8 +18,8 @@
 <p>
 	Above the serializers and parsers are the {@link oaj.serializer.SerializerGroup} and 
 	{@link oaj.parser.ParserGroup} classes.
-	These classes allow serializers and parsers to be retrieved by W3C-compliant HTTP <code>Accept</code> 
-	and <code>Content-Type</code> values...
+	These classes allow serializers and parsers to be retrieved by W3C-compliant HTTP <c>Accept</c> 
+	and <c>Content-Type</c> values...
 </p>
 <p class='bpcode w800'>
 	<jc>// Construct a new serializer group with configuration parameters that get applied to all serializers.</jc>
@@ -42,7 +42,7 @@
 	Person p = pg.getParser(<js>"text/json"</js>).parse(myReader, Person.<jk>class</jk>);
 </p>
 <p>
-	The REST servlet API builds upon the <code>SerializerGroup</code> and <code>ParserGroup</code> classes 
+	The REST servlet API builds upon the <c>SerializerGroup</c> and <c>ParserGroup</c> classes 
 	to provide annotated REST servlets that automatically negotiate the HTTP media types and allow the developer
 	to work with requests and responses as POJOs.
 </p>			
diff --git a/juneau-doc/docs/Topics/02.juneau-marshall/10.ContextsBuildersSessionsPropertyStores.html b/juneau-doc/docs/Topics/02.juneau-marshall/10.ContextsBuildersSessionsPropertyStores.html
index ece15c1..702bd5d 100644
--- a/juneau-doc/docs/Topics/02.juneau-marshall/10.ContextsBuildersSessionsPropertyStores.html
+++ b/juneau-doc/docs/Topics/02.juneau-marshall/10.ContextsBuildersSessionsPropertyStores.html
@@ -24,29 +24,29 @@
 		<ul>
 			<li>Heavy to construct and designed to be cached and reused.
 			<li>Created by <l>ContextBuilder</l> classes.
-			<li>Examples:  <code>BeanContext</code>, <code>JsonSerializer</code>
+			<li>Examples:  <c>BeanContext</c>, <c>JsonSerializer</c>
 		</ul>
 	<li>
 		<l>Session</l> - A non-thread-safe single-use object with configuration combined from context and 
 		runtime args such as locale/timezone.
 		<ul>
 			<li>Lightweight objects that take a minimum amount of time to instantiate and are not typically reused.
-			<li>Created by <code>Context</code> objects.
-			<li>Examples:  <code>BeanSession</code>, <code>JsonSerializerSession</code>
+			<li>Created by <c>Context</c> objects.
+			<li>Examples:  <c>BeanSession</c>, <c>JsonSerializerSession</c>
 		</ul>
 	<li>
 		<l>PropertyStore</l> - A thread-safe read-only set of configuration properties.
 		<ul>
-			<li>Heavier to create than <code>Sessions</code> but lighter than <code>Contexts</code>.
-			<li>Each <code>Context</code> contains one <code>PropertyStore</code> that defines all the configuration about that object.
+			<li>Heavier to create than <c>Sessions</c> but lighter than <c>Contexts</c>.
+			<li>Each <c>Context</c> contains one <c>PropertyStore</c> that defines all the configuration about that object.
 			<li>Created by <l>PropertyStoreBuilder</l> classes.
 		</ul>
 </ul>	
 <p>
-	For example, the class hierarchy for <code>JsonSerializer</code> is:
+	For example, the class hierarchy for <c>JsonSerializer</c> is:
 </p>
 <ul class='doctree'>
-	<li class='jc'><code>Object</code>
+	<li class='jc'><c>Object</c>
 	<ul>
 		<li class='jac'>{@link oaj.Context}
 		<ul>
@@ -64,14 +64,14 @@
 	</ul>
 </ul>
 <p>
-	Each context object in the hierarchy define properties that can be stored in a <code>PropertyStore</code>
+	Each context object in the hierarchy define properties that can be stored in a <c>PropertyStore</c>
 	such as <jsf>WSERIALIZER_useWhitespace</jsf> or <jsf>JSON_simpleMode</jsf>.
 </p>
 <p>
-	The class hierarchy for <code>JsonSerializerBuilder</code> is:
+	The class hierarchy for <c>JsonSerializerBuilder</c> is:
 </p>
 <ul class='doctree'>
-	<li class='jc'><code>Object</code>
+	<li class='jc'><c>Object</c>
 	<ul>
 		<li class='jac'>{@link oaj.ContextBuilder}
 		<ul>
@@ -89,10 +89,10 @@
 	</ul>
 </ul>
 <p>
-	The class hierarchy for <code>JsonSerializerSession</code> is:
+	The class hierarchy for <c>JsonSerializerSession</c> is:
 </p>
 <ul class='doctree'>
-	<li class='jc'><code>Object</code>
+	<li class='jc'><c>Object</c>
 	<ul>
 		<li class='jac'>{@link oaj.Session}
 		<ul>
@@ -129,7 +129,7 @@
 </p>
 <p>
 	The {@link oaj.PropertyStoreBuilder} class is used to build up and instantiate immutable 
-	<code>PropertyStore</code> objects.
+	<c>PropertyStore</c> objects.
 </p>
 <p>
 	In the example above, the property store being built looks like the following:
diff --git a/juneau-doc/docs/Topics/02.juneau-marshall/11.Transforms/01.PojoSwaps.html b/juneau-doc/docs/Topics/02.juneau-marshall/11.Transforms/01.PojoSwaps.html
index 4fd2224..bb47c61 100644
--- a/juneau-doc/docs/Topics/02.juneau-marshall/11.Transforms/01.PojoSwaps.html
+++ b/juneau-doc/docs/Topics/02.juneau-marshall/11.Transforms/01.PojoSwaps.html
@@ -24,13 +24,13 @@
 	non-serializable ones during serialization, and vis-versa during parsing.
 </p>
 <p>
-	Some examples of non-serializable POJOs are <code>File</code>, <code>Reader</code>, 
-	<code>Iterable</code>, etc...
+	Some examples of non-serializable POJOs are <c>File</c>, <c>Reader</c>, 
+	<c>Iterable</c>, etc...
 	These are classes that aren't beans and cannot be represented as simple maps, collections, or primitives.
 </p>
 <p>
-	In the following example, we introduce a <code>PojoSwap</code> that will swap in ISO8601 strings for 
-	<code>Date</code> objects:
+	In the following example, we introduce a <c>PojoSwap</c> that will swap in ISO8601 strings for 
+	<c>Date</c> objects:
 </p>
 <p class='bpcode w800'>
 	<jc>// Sample swap for converting Dates to ISO8601 strings.</jc>
@@ -94,7 +94,7 @@
 	<jk>int</jk> year = myBean.<jf>date</jf>.getYear(); 								<jc>// == 113</jc>
 </p>
 <p>
-	Another example of a <code>PojoSwap</code> is one that converts <code><jk>byte</jk>[]</code> arrays to
+	Another example of a <c>PojoSwap</c> is one that converts <c><jk>byte</jk>[]</c> arrays to
 	BASE64-encoded strings:
 </p>
 <p class='bpcode w800'>
@@ -139,7 +139,7 @@
 	bytes2d = p.parse(json, <jk>byte</jk>[][].<jk>class</jk>);		<jc>// Reproduces {{1,2,3},{4,5,6},null}</jc>
 </p>
 <p>
-	Several <code>PojoSwaps</code> are already provided for common Java objects:
+	Several <c>PojoSwaps</c> are already provided for common Java objects:
 </p>
 <ul class='doctree'>
 	<li class='jp'><jk>org.apache.juneau.transforms</jk>
@@ -172,8 +172,8 @@
 	This allows you to specify localized swap values when needed.
 </p>
 <p>
-	If using the REST server API, the locale and timezone are set based on the <code>Accept-Language</code> and
-	<code>Time-Zone</code> headers on the request.
+	If using the REST server API, the locale and timezone are set based on the <c>Accept-Language</c> and
+	<c>Time-Zone</c> headers on the request.
 </p>
 
 <ul class='doctree'>
diff --git a/juneau-doc/docs/Topics/02.juneau-marshall/11.Transforms/04.SwapAnnotation.html b/juneau-doc/docs/Topics/02.juneau-marshall/11.Transforms/04.SwapAnnotation.html
index b9da026..d1c8d4e 100644
--- a/juneau-doc/docs/Topics/02.juneau-marshall/11.Transforms/04.SwapAnnotation.html
+++ b/juneau-doc/docs/Topics/02.juneau-marshall/11.Transforms/04.SwapAnnotation.html
@@ -18,7 +18,7 @@
 <p>
 	{@link oaj.annotation.Swap @Swap} can be used to associate a swap class using an 
 	annotation.
-	This is often cleaner than using the builder <code>pojoSwaps()</code> method since you can keep
+	This is often cleaner than using the builder <c>pojoSwaps()</c> method since you can keep
 	your swap class near your POJO class. 
 </p>
 <p class='bpcode w800'>
@@ -50,7 +50,7 @@
 	<jk>public class</jk> MyPojo {}
 </p>
 <p>
-	<code>Readers</code> get serialized directly to the output of a serializer.
+	<c>Readers</c> get serialized directly to the output of a serializer.
 	Therefore it's possible to implement a swap that provides fully-customized output.
 </p>
 <p class='bpcode w800'>
diff --git a/juneau-doc/docs/Topics/02.juneau-marshall/11.Transforms/06.SwapMethods.html b/juneau-doc/docs/Topics/02.juneau-marshall/11.Transforms/06.SwapMethods.html
index 79d014e..91ff45b 100644
--- a/juneau-doc/docs/Topics/02.juneau-marshall/11.Transforms/06.SwapMethods.html
+++ b/juneau-doc/docs/Topics/02.juneau-marshall/11.Transforms/06.SwapMethods.html
@@ -17,71 +17,71 @@
 
 <p>
 	Various methods can be defined on a class directly to affect how it gets serialized.
-	This can often be simpler than using <code>PojoSwaps</code>.
+	This can often be simpler than using <c>PojoSwaps</c>.
 </p>
 <p>
-	Objects serialized as <code>Strings</code> can be parsed back into their original objects by 
+	Objects serialized as <c>Strings</c> can be parsed back into their original objects by 
 	implementing one of the following methods on the class:
 </p>		
 <ul class='spaced-list'>
 	<li>
-		<code><jk>public static</jk> T fromString(String)</code> method.
+		<c><jk>public static</jk> T fromString(String)</c> method.
 		<br>Any of the following method names also work: 
 		<ul>
-			<li><code>valueOf(String)</code>
-			<li><code>parse(String)</code>
-			<li><code>parseString(String)</code>
-			<li><code>forName(String)</code>
-			<li><code>forString(String)</code>
+			<li><c>valueOf(String)</c>
+			<li><c>parse(String)</c>
+			<li><c>parseString(String)</c>
+			<li><c>forName(String)</c>
+			<li><c>forString(String)</c>
 		</ul>
 	<li>
-		<code><jk>public</jk> T(String)</code> constructor.
+		<c><jk>public</jk> T(String)</c> constructor.
 </ul>
 <p>
 	Note that these methods cover conversion from several built-in Java types, meaning the parsers can 
 	automatically construct these objects from strings:
 </p>
 <ul>
-	<li><code>fromString(String)</code> - {@link java.util.UUID}
-	<li><code>valueOf(String)</code> - {@link java.lang.Boolean}, {@link java.lang.Byte}, 
+	<li><c>fromString(String)</c> - {@link java.util.UUID}
+	<li><c>valueOf(String)</c> - {@link java.lang.Boolean}, {@link java.lang.Byte}, 
 		{@link java.lang.Double}, {@link java.lang.Float}, 
 		{@link java.lang.Integer}, {@link java.lang.Long}, {@link java.lang.Short}, {@link java.sql.Date}, 
 		{@link java.sql.Time}, {@link java.sql.Timestamp}
-	<li><code>parse(String)</code> - {@link java.text.DateFormat}, {@link java.text.MessageFormat}, 
+	<li><c>parse(String)</c> - {@link java.text.DateFormat}, {@link java.text.MessageFormat}, 
 		{@link java.text.NumberFormat}, {@link java.util.Date}, {@link java.util.logging.Level}
-	<li><code>parseString(String)</code> - {@link javax.xml.bind.DatatypeConverter}
-	<li><code>forName(String)</code> - {@link java.lang.Class}
+	<li><c>parseString(String)</c> - {@link javax.xml.bind.DatatypeConverter}
+	<li><c>forName(String)</c> - {@link java.lang.Class}
 </ul>
 <p>
 	If you want to force a bean-like class to be serialized as a string, you can use the 
 	{@link oaj.annotation.BeanIgnore @BeanIgnore} annotation on the class to force it to be 
-	serialized to a string using the <code>toString()</code> method.
+	serialized to a string using the <c>toString()</c> method.
 </p>
 <p>
 	Serializing to other intermediate objects can be accomplished by defining a swap method directly on the 
 	class:
 </p>			
 <ul>
-	<li><code><jk>public</jk> X swap()</code> method, where <code>X</code> is any serializable object.
-	<li><code><jk>public</jk> X swap(BeanSession)</code> method, where <code>X</code> is any serializable object.
-	<li><code><jk>public static</jk> MyPojo unswap(X)</code> method, where <code>X</code> is any serializable object.
-	<li><code><jk>public static</jk> MyPojo swap(X,BeanSession)</code> method, where <code>X</code> is any serializable object.
+	<li><c><jk>public</jk> X swap()</c> method, where <c>X</c> is any serializable object.
+	<li><c><jk>public</jk> X swap(BeanSession)</c> method, where <c>X</c> is any serializable object.
+	<li><c><jk>public static</jk> MyPojo unswap(X)</c> method, where <c>X</c> is any serializable object.
+	<li><c><jk>public static</jk> MyPojo swap(X,BeanSession)</c> method, where <c>X</c> is any serializable object.
 </ul>
 <p>
 	Serializing to and from Maps can be accomplished by defining any of the following methods:
 </p>			
 <ul>
-	<li><code><jk>public</jk> Map toMap()</code> method.  Can be any type of map with string keys and object vals. 
-	<li><code><jk>public</jk> ObjectMap toMap()</code> method. 
-	<li><code><jk>public</jk> Map toMap(BeanSession)</code> method.  Can be any type of map with string keys and object vals. 
-	<li><code><jk>public</jk> ObjectMap toMap(BeanSession)</code> method.
-	<li><code><jk>public static</jk> MyPojo fromMap(Map)</code> method.  Can be any type of map with string keys and object vals. 
-	<li><code><jk>public static</jk> MyPojo fromMap(ObjectMap)</code> method.
-	<li><code><jk>public static</jk> MyPojo fromMap(Map,BeanSession)</code> method.  Can be any type of map with string keys and object vals. 
-	<li><code><jk>public static</jk> MyPojo fromMap(ObjectMap,BeanSession)</code> method.
+	<li><c><jk>public</jk> Map toMap()</c> method.  Can be any type of map with string keys and object vals. 
+	<li><c><jk>public</jk> ObjectMap toMap()</c> method. 
+	<li><c><jk>public</jk> Map toMap(BeanSession)</c> method.  Can be any type of map with string keys and object vals. 
+	<li><c><jk>public</jk> ObjectMap toMap(BeanSession)</c> method.
+	<li><c><jk>public static</jk> MyPojo fromMap(Map)</c> method.  Can be any type of map with string keys and object vals. 
+	<li><c><jk>public static</jk> MyPojo fromMap(ObjectMap)</c> method.
+	<li><c><jk>public static</jk> MyPojo fromMap(Map,BeanSession)</c> method.  Can be any type of map with string keys and object vals. 
+	<li><c><jk>public static</jk> MyPojo fromMap(ObjectMap,BeanSession)</c> method.
 </ul>
 <p>
-	The <code>BeanSession</code> parameter allows you access to various information about the current 
+	The <c>BeanSession</c> parameter allows you access to various information about the current 
 	serialization session.
 	For example, you could provide customized results based on the media type being produced 
 	({@link oaj.BeanSession#getMediaType()}).
@@ -123,9 +123,9 @@
 	following methods:
 </p>
 <ul>
-	<li><code><jk>public static</jk> T unswap(BeanSession, X)</code> method where <code>X</code> is the 
+	<li><c><jk>public static</jk> T unswap(BeanSession, X)</c> method where <c>X</c> is the 
 		swap class type.
-	<li><code><jk>public</jk> T(X)</code> constructor where <code>X</code> is the swap class type.
+	<li><c><jk>public</jk> T(X)</c> constructor where <c>X</c> is the swap class type.
 </ul>
 <p>
 	The following shows how our form template class can be modified to allow the parsers to reconstruct our 
diff --git a/juneau-doc/docs/Topics/02.juneau-marshall/11.Transforms/07.SurrogateClasses.html b/juneau-doc/docs/Topics/02.juneau-marshall/11.Transforms/07.SurrogateClasses.html
index 6c21b5a..8969f18 100644
--- a/juneau-doc/docs/Topics/02.juneau-marshall/11.Transforms/07.SurrogateClasses.html
+++ b/juneau-doc/docs/Topics/02.juneau-marshall/11.Transforms/07.SurrogateClasses.html
@@ -17,7 +17,7 @@
 
 <p>
 <p>
-	Surrogate classes are very similar in concept to <code>PojoSwaps</code> except they're simpler to define.
+	Surrogate classes are very similar in concept to <c>PojoSwaps</c> except they're simpler to define.
 </p>
 <p>
 	For example, let's say we want to be able to serialize the following class, but it's not serializable for 
@@ -29,7 +29,7 @@
 	}
 </p>
 <p>
-	This could be solved with the following <code>PojoSwap</code>.
+	This could be solved with the following <c>PojoSwap</c>.
 </p>
 <p class='bpcode w800'>
 	<jc>// A serializable bean with 1 property.</jc>
@@ -64,7 +64,7 @@
 	}
 </p>
 <p>
-	The surrogate class is registered in the same way as a <code>PojoSwap</code>:
+	The surrogate class is registered in the same way as a <c>PojoSwap</c>:
 </p>
 <p class='bpcode w800'>
 	<jc>// Create a JSON serializer that can serialize Iterators.</jc>
diff --git a/juneau-doc/docs/Topics/02.juneau-marshall/11.Transforms/08.BeanAnnotation.html b/juneau-doc/docs/Topics/02.juneau-marshall/11.Transforms/08.BeanAnnotation.html
index 7ff9999..38e1428 100644
--- a/juneau-doc/docs/Topics/02.juneau-marshall/11.Transforms/08.BeanAnnotation.html
+++ b/juneau-doc/docs/Topics/02.juneau-marshall/11.Transforms/08.BeanAnnotation.html
@@ -98,8 +98,8 @@
 	Any properties in the stop class or in its base classes will be ignored during analysis.
 </p>
 <p>
-	For example, in the following class hierarchy, instances of <code>C3</code> will include property 
-	<code>p3</code>, but not <code>p1</code> or <code>p2</code>.
+	For example, in the following class hierarchy, instances of <c>C3</c> will include property 
+	<c>p3</c>, but not <c>p1</c> or <c>p2</c>.
 </p>
 <p class='bpcode w800'>
 	<jk>public class</jk> C1 {
diff --git a/juneau-doc/docs/Topics/02.juneau-marshall/11.Transforms/10.BeanConstructorAnnotation.html b/juneau-doc/docs/Topics/02.juneau-marshall/11.Transforms/10.BeanConstructorAnnotation.html
index 768fb54..bf47665 100644
--- a/juneau-doc/docs/Topics/02.juneau-marshall/11.Transforms/10.BeanConstructorAnnotation.html
+++ b/juneau-doc/docs/Topics/02.juneau-marshall/11.Transforms/10.BeanConstructorAnnotation.html
@@ -59,7 +59,7 @@
 	Beans can also be defined with a combination of read-only and read-write properties.
 </p>
 <p>
-	The {@link oaj.annotation.Name @Name} annotation can also be used instead of <code><ja>@BeanConstructor</ja>(properties)</code>:
+	The {@link oaj.annotation.Name @Name} annotation can also be used instead of <c><ja>@BeanConstructor</ja>(properties)</c>:
 </p>
 <p class='bpcode w800'>
 	<ja>@BeanConstructor</ja>
@@ -69,6 +69,6 @@
 	}
 </p>
 <p>
-	If neither <code><ja>@BeanConstructor</ja>(properties)</code> or <ja>@Name</ja> is used to identify the bean property names, 
+	If neither <c><ja>@BeanConstructor</ja>(properties)</c> or <ja>@Name</ja> is used to identify the bean property names, 
 	we will try to use the parameter names if they are available in the bytecode.
 </p>
diff --git a/juneau-doc/docs/Topics/02.juneau-marshall/11.Transforms/14.PojoBuilders.html b/juneau-doc/docs/Topics/02.juneau-marshall/11.Transforms/14.PojoBuilders.html
index f58424d..6cb2b77 100644
--- a/juneau-doc/docs/Topics/02.juneau-marshall/11.Transforms/14.PojoBuilders.html
+++ b/juneau-doc/docs/Topics/02.juneau-marshall/11.Transforms/14.PojoBuilders.html
@@ -90,7 +90,7 @@
 	The first can be accomplished through any of the following:
 </p>
 <ul class='spaced-list'>
-	<li>A static <code>create()</code> method on the POJO class that returns a builder instance.
+	<li>A static <c>create()</c> method on the POJO class that returns a builder instance.
 		<p class='bcode w800'>
 	<jk>public static</jk> MyBuilder <jsm>create</jsm>() {...}
 		</p>
@@ -110,7 +110,7 @@
 	The second can be accomplished through any of the following:
 </p>
 <ul class='spaced-list'>
-	<li>The existence of a <code>build()</code> method on the builder class.
+	<li>The existence of a <c>build()</c> method on the builder class.
 		<p class='bcode w800'>
 	<jk>public</jk> MyPojo build() {...}
 		</p>
diff --git a/juneau-doc/docs/Topics/02.juneau-marshall/11.Transforms/16.InterfaceFilters.html b/juneau-doc/docs/Topics/02.juneau-marshall/11.Transforms/16.InterfaceFilters.html
index e5c2b86..5538ea5 100644
--- a/juneau-doc/docs/Topics/02.juneau-marshall/11.Transforms/16.InterfaceFilters.html
+++ b/juneau-doc/docs/Topics/02.juneau-marshall/11.Transforms/16.InterfaceFilters.html
@@ -72,9 +72,9 @@
 </p>	
 <p>
 	The {@link oaj.BeanContextBuilder#beanFilters(Object...)} method will automatically interpret any 
-	non-<code>BeanFilter</code> classes passed in as meaning interface classes. 
-	So in the previous example, the <code>BeanFilter</code> class could have been avoided altogether by just 
-	passing in <code>MyInterface.<jk>class</jk></code> to the serializer, like so:
+	non-<c>BeanFilter</c> classes passed in as meaning interface classes. 
+	So in the previous example, the <c>BeanFilter</c> class could have been avoided altogether by just 
+	passing in <c>MyInterface.<jk>class</jk></c> to the serializer, like so:
 </p>
 <p class='bpcode w800'>
 	WriterSerializer s = JsonSerializer
diff --git a/juneau-doc/docs/Topics/02.juneau-marshall/11.Transforms/17.StopClasses.html b/juneau-doc/docs/Topics/02.juneau-marshall/11.Transforms/17.StopClasses.html
index 876a06d..43213c3 100644
--- a/juneau-doc/docs/Topics/02.juneau-marshall/11.Transforms/17.StopClasses.html
+++ b/juneau-doc/docs/Topics/02.juneau-marshall/11.Transforms/17.StopClasses.html
@@ -31,8 +31,8 @@
 	Any properties in the stop class or in its base classes will be ignored during serialization.
 </p>
 <p>
-	For example, in the following class hierarchy, instances of <code>C3</code> will include property <code>p3</code>,
-	but not <code>p1</code> or <code>p2</code>.
+	For example, in the following class hierarchy, instances of <c>C3</c> will include property <c>p3</c>,
+	but not <c>p1</c> or <c>p2</c>.
 </p>
 <p class='bpcode w800'>
 	<jk>public class</jk> C1 {
diff --git a/juneau-doc/docs/Topics/02.juneau-marshall/11.Transforms/18.BypassSerialization.html b/juneau-doc/docs/Topics/02.juneau-marshall/11.Transforms/18.BypassSerialization.html
index a5227e3..39f8b36 100644
--- a/juneau-doc/docs/Topics/02.juneau-marshall/11.Transforms/18.BypassSerialization.html
+++ b/juneau-doc/docs/Topics/02.juneau-marshall/11.Transforms/18.BypassSerialization.html
@@ -16,7 +16,7 @@
 Bypass Serialization using Readers and InputStreams
 
 <p>
-	Juneau serializers treat instances of <code>Readers</code> and <code>InputStreams</code> special by 
+	Juneau serializers treat instances of <c>Readers</c> and <c>InputStreams</c> special by 
 	simply serializing their contents directly to the output stream or writer.
 	This allows you to embed fully customized serializer output.
 </p>
diff --git a/juneau-doc/docs/Topics/02.juneau-marshall/12.BeanDictionaries.html b/juneau-doc/docs/Topics/02.juneau-marshall/12.BeanDictionaries.html
index 731b440..2fc71e5 100644
--- a/juneau-doc/docs/Topics/02.juneau-marshall/12.BeanDictionaries.html
+++ b/juneau-doc/docs/Topics/02.juneau-marshall/12.BeanDictionaries.html
@@ -36,7 +36,7 @@
 	On the parsing side, these type names are resolved to classes through the use of bean dictionaries.
 </p>
 <p>
-	For example, if a bean property is of type <code>Object</code>, then the serializer will add 
+	For example, if a bean property is of type <c>Object</c>, then the serializer will add 
 	<js>"_type"</js> attributes so that the class can be determined during parsing.
 </p>
 <p class='bpcode w800'>
@@ -68,7 +68,7 @@
 <p>
 	Type names can be represented slightly differently in different languages.
 	For example, the dictionary name is used as element names when serialized to XML.
-	This allows the <code>typeName</code> annotation to be used as a shortcut for defining element names for 
+	This allows the <c>typeName</c> annotation to be used as a shortcut for defining element names for 
 	beans.
 </p>
 <p>
@@ -160,7 +160,7 @@
 		However, they must be unique within a dictionary.
 	<li class='info'>
 		The following reserved words cannot be used as type names:  
-		<code>object, array, number, boolean, null</code>.
+		<c>object, array, number, boolean, null</c>.
 	<li class='info'>
 		Serialized type names are DISABLED by default.
 		They must be enabled on the serializer using the 
diff --git a/juneau-doc/docs/Topics/02.juneau-marshall/13.VirtualBeans.html b/juneau-doc/docs/Topics/02.juneau-marshall/13.VirtualBeans.html
index 517cd76..69c4cb8 100644
--- a/juneau-doc/docs/Topics/02.juneau-marshall/13.VirtualBeans.html
+++ b/juneau-doc/docs/Topics/02.juneau-marshall/13.VirtualBeans.html
@@ -52,12 +52,12 @@
 	Getter and setter values can be any {@doc PojoCategories parsable} values, even other virtual beans.
 </p>
 <p>
-	Under-the-covers, a virtual bean is simply a proxy interface on top of an existing <code>BeanMap</code>
+	Under-the-covers, a virtual bean is simply a proxy interface on top of an existing <c>BeanMap</c>
 	instance.  From a programmatic point-of-view, they're indistinguishable from real beans, and can be 
 	manipulated and serialized like any other bean.
 </p>	
 <p>
-	Virtual beans can also be created programmatically using the <code>BeanContext</code> class:
+	Virtual beans can also be created programmatically using the <c>BeanContext</c> class:
 </p>
 <p class='bpcode w800'>
 	Address address = BeanContext.<jsf>DEFAULT</jsf>.createSession().newBean(Address.<jk>class</jk>);
diff --git a/juneau-doc/docs/Topics/02.juneau-marshall/14.Recursion.html b/juneau-doc/docs/Topics/02.juneau-marshall/14.Recursion.html
index 1be5b27..c9062aa 100644
--- a/juneau-doc/docs/Topics/02.juneau-marshall/14.Recursion.html
+++ b/juneau-doc/docs/Topics/02.juneau-marshall/14.Recursion.html
@@ -18,7 +18,7 @@
 <p>
 	The Juneau Serializer API is designed to be used against POJO tree structures. 
 	It expects that there not be loops in the POJO model (e.g. children with references to parents, etc...).
-	If you try to serialize models with loops, you will usually cause a <code>StackOverflowError</code> to 
+	If you try to serialize models with loops, you will usually cause a <c>StackOverflowError</c> to 
 	be thrown (if {@link oaj.BeanTraverseContext#BEANTRAVERSE_maxDepth} is not reached 
 	first).
 </p>
@@ -61,7 +61,7 @@
 	String json = s.serialize(a);
 </p>
 <p>
-	What we end up with is the following, which does not serialize the contents of the <code>c</code> field:
+	What we end up with is the following, which does not serialize the contents of the <c>c</c> field:
 </p>
 <p class='bpcode w800'>
 	{
diff --git a/juneau-doc/docs/Topics/02.juneau-marshall/15.ParsingIntoGenericModels.html b/juneau-doc/docs/Topics/02.juneau-marshall/15.ParsingIntoGenericModels.html
index 516889d..92b45e8 100644
--- a/juneau-doc/docs/Topics/02.juneau-marshall/15.ParsingIntoGenericModels.html
+++ b/juneau-doc/docs/Topics/02.juneau-marshall/15.ParsingIntoGenericModels.html
@@ -18,20 +18,20 @@
 <p>
 	The Juneau parsers are not limited to parsing back into the original bean classes.
 	If the bean classes are not available on the parsing side, the parser can also be used to 
-	parse into a generic model consisting of <code>Maps</code>, <code>Collections</code>, and primitive
+	parse into a generic model consisting of <c>Maps</c>, <c>Collections</c>, and primitive
 	objects.
 </p>
 <p>
-	You can parse into any <code>Map</code> type (e.g. <code>HashMap</code>, <code>TreeMap</code>), but
+	You can parse into any <c>Map</c> type (e.g. <c>HashMap</c>, <c>TreeMap</c>), but
 	using {@link oaj.ObjectMap} is recommended since it has many convenience methods
 	for converting values to various types.
-	The same is true when parsing collections.  You can use any Collection (e.g. <code>HashSet</code>, 
-	<code>LinkedList</code>) or array (e.g. <code>Object[]</code>, <code>String[]</code>, 
-	<code>String[][]</code>), but using {@link oaj.ObjectList} is recommended.
+	The same is true when parsing collections.  You can use any Collection (e.g. <c>HashSet</c>, 
+	<c>LinkedList</c>) or array (e.g. <c>Object[]</c>, <c>String[]</c>, 
+	<c>String[][]</c>), but using {@link oaj.ObjectList} is recommended.
 </p>
 <p>
-	When the map or list type is not specified, or is the abstract <code>Map</code>, <code>Collection</code>, 
-	or <code>List</code> types, the parser will use <code>ObjectMap</code> and <code>ObjectList</code> by 
+	When the map or list type is not specified, or is the abstract <c>Map</c>, <c>Collection</c>, 
+	or <c>List</c> types, the parser will use <c>ObjectMap</c> and <c>ObjectList</c> by 
 	default.
 </p>
 <p>
@@ -59,7 +59,7 @@
 	}
 </p>
 <p>
-	We can parse this into a generic <code>ObjectMap</code>:
+	We can parse this into a generic <c>ObjectMap</c>:
 </p>
 <p class='bpcode w800'>	
 	<jc>// Parse JSON into a generic POJO model.</jc>
@@ -70,8 +70,8 @@
 </p>
 <p>
 	What we end up with is the exact same output.
-	Even the numbers and booleans are preserved because they are parsed into <code>Number</code> and 
-	<code>Boolean</code> objects when parsing into generic models.
+	Even the numbers and booleans are preserved because they are parsed into <c>Number</c> and 
+	<c>Boolean</c> objects when parsing into generic models.
 </p>
 <p class='bpcode w800'>
 	{
@@ -95,8 +95,8 @@
 	}
 </p>
 <p>
-	Once parsed into a generic model, various convenience methods are provided on the <code>ObjectMap</code>
-		and <code>ObjectList</code> classes to retrieve values:
+	Once parsed into a generic model, various convenience methods are provided on the <c>ObjectMap</c>
+		and <c>ObjectList</c> classes to retrieve values:
 </p>
 <p class='bpcode w800'>
 	<jc>// Parse JSON into a generic POJO model.</jc>
diff --git a/juneau-doc/docs/Topics/02.juneau-marshall/16.ReadingContinuousStreams.html b/juneau-doc/docs/Topics/02.juneau-marshall/16.ReadingContinuousStreams.html
index e29e7a2..9707a02 100644
--- a/juneau-doc/docs/Topics/02.juneau-marshall/16.ReadingContinuousStreams.html
+++ b/juneau-doc/docs/Topics/02.juneau-marshall/16.ReadingContinuousStreams.html
@@ -47,7 +47,7 @@
 </p>
 <p>
 	Note that this isn't perfect in all cases since you can't combine two JSON numbers into a single
-	reader (e.g. <code>"123" + "456" = "123456"</code>).
+	reader (e.g. <c>"123" + "456" = "123456"</c>).
 </p>
 <p>
 	For obvious reasons, do not use the following properties when reading continuous streams:
diff --git a/juneau-doc/docs/Topics/02.juneau-marshall/18.JacksonComparison.html b/juneau-doc/docs/Topics/02.juneau-marshall/18.JacksonComparison.html
index 4152e91..dcb3873 100644
--- a/juneau-doc/docs/Topics/02.juneau-marshall/18.JacksonComparison.html
+++ b/juneau-doc/docs/Topics/02.juneau-marshall/18.JacksonComparison.html
@@ -55,13 +55,13 @@
 		</td>
 	</tr>
 	<tr>
-		<td><code><ja>@JsonIgnoreProperties</ja>({...})</code></td>
+		<td><c><ja>@JsonIgnoreProperties</ja>({...})</c></td>
 		<td>
 			{@link oaj.annotation.Bean#excludeProperties @Bean(excludeProperties="...")}
 		</td>
 	</tr>
 	<tr>
-		<td><code><ja>@JsonAutoDetect</ja>(fieldVisibility=...)</code></td>
+		<td><c><ja>@JsonAutoDetect</ja>(fieldVisibility=...)</c></td>
 		<td>
 			No equivalent annotation, but can be controlled via: 
 			<br>{@link oaj.BeanContext#BEAN_beanFieldVisibility}
@@ -118,7 +118,7 @@
 			<br><ja>@JsonRawValue</ja>
 		</td>
 		<td>
-			Can be replicated using swaps with <code>Reader</code> swapped values.
+			Can be replicated using swaps with <c>Reader</c> swapped values.
 		</td>
 	</tr>
 </table>
diff --git a/juneau-doc/docs/Topics/02.juneau-marshall/19.PojoCategories.html b/juneau-doc/docs/Topics/02.juneau-marshall/19.PojoCategories.html
index 64b30fc..81af2e6 100644
--- a/juneau-doc/docs/Topics/02.juneau-marshall/19.PojoCategories.html
+++ b/juneau-doc/docs/Topics/02.juneau-marshall/19.PojoCategories.html
@@ -51,10 +51,10 @@
 		</td>
 		<td>
 			<ul class='normal'>
-				<li><code>HashSet&lt;String,Integer&gt;</code>
-				<li><code>TreeMap&lt;Integer,Bean&gt;</code>
-				<li><code>List&lt;<jk>int</jk>[][]&gt;</code>
-				<li><code>Bean[]</code>
+				<li><c>HashSet&lt;String,Integer&gt;</c>
+				<li><c>TreeMap&lt;Integer,Bean&gt;</c>
+				<li><c>List&lt;<jk>int</jk>[][]&gt;</c>
+				<li><c>Bean[]</c>
 			</ul>
 		</td>
 		<td style='background-color:lightgreen;text-align:center'><b>yes</b></td>
@@ -69,8 +69,8 @@
 		</td>
 		<td>
 			<ul class='normal'>
-				<li><code>HashSet&lt;Bean,Integer&gt;</code>
-				<li><code>TreeMap&lt;Integer,Reader&gt;</code>
+				<li><c>HashSet&lt;Bean,Integer&gt;</c>
+				<li><c>TreeMap&lt;Integer,Reader&gt;</c>
 			</ul>
 		</td>
 		<td style='background-color:lightgreen;text-align:center'><b>yes</b></td>
@@ -154,8 +154,8 @@
 		</td>
 		<td>
 			<ul class='normal'>
-				<li><code>java.util.Date</code>
-				<li><code>java.util.GregorianCalendar</code>
+				<li><c>java.util.Date</c>
+				<li><c>java.util.GregorianCalendar</c>
 			</ul>
 		</td>
 		<td style='background-color:lightgreen;text-align:center'><b>yes</b></td>
@@ -170,7 +170,7 @@
 		</td>
 		<td>
 			<ul class='normal'>
-				<li><code>java.util.Iterator</code>
+				<li><c>java.util.Iterator</c>
 			</ul>
 		</td>
 		<td style='background-color:lightgreen;text-align:center'><b>yes</b></td>
@@ -208,34 +208,34 @@
 		<td>
 			Classes with a method that converts it to a serializable form:
 			<ul>
-				<li><code><jk>public</jk> X swap(BeanSession);</code> where <code>X</code> is in groups 
+				<li><c><jk>public</jk> X swap(BeanSession);</c> where <c>X</c> is in groups 
 					[1, 2a, 3ac].
-				<li><code><jk>public</jk> String toString();</code> where the string is any meaningful data.
+				<li><c><jk>public</jk> String toString();</c> where the string is any meaningful data.
 			</ul>
 			And a method that converts it back into the original object:
 			<ul>
-				<li><code><jk>public static</jk> T fromString(String);</code>		
-				<li><code><jk>public static</jk> T valueOf(String);</code>		
-				<li><code><jk>public static</jk> T parse(String);</code>		
-				<li><code><jk>public static</jk> T parseString(String);</code>		
-				<li><code><jk>public static</jk> T forName(String);</code>		
-				<li><code><jk>public static</jk> T forString(String);</code>		
-				<li><code><jk>public</jk> T(X);</code> where <code>X</code> is in groups [1, 2a, 3ac].
-				<li><code><jk>public static</jk> T unswap(BeanSession,X);</code> where <code>X</code> is in 
+				<li><c><jk>public static</jk> T fromString(String);</c>		
+				<li><c><jk>public static</jk> T valueOf(String);</c>		
+				<li><c><jk>public static</jk> T parse(String);</c>		
+				<li><c><jk>public static</jk> T parseString(String);</c>		
+				<li><c><jk>public static</jk> T forName(String);</c>		
+				<li><c><jk>public static</jk> T forString(String);</c>		
+				<li><c><jk>public</jk> T(X);</c> where <c>X</c> is in groups [1, 2a, 3ac].
+				<li><c><jk>public static</jk> T unswap(BeanSession,X);</c> where <c>X</c> is in 
 					groups [1, 2a, 3ac].		
 			</ul>
 		</td>
 		<td>
 			<ul class='normal'>
-				<li><code>java.lang.Class</code>
-				<li><code>java.sql.Time</code>
-				<li><code>java.sql.Timestamp</code>
-				<li><code>java.text.MessageFormat</code>
-				<li><code>java.text.NumberFormat</code>
-				<li><code>java.util.Date</code>
-				<li><code>java.util.UUID</code>
-				<li><code>java.util.logging.Level</code>
-				<li><code>javax.xml.bind.DatatypeConverter</code>
+				<li><c>java.lang.Class</c>
+				<li><c>java.sql.Time</c>
+				<li><c>java.sql.Timestamp</c>
+				<li><c>java.text.MessageFormat</c>
+				<li><c>java.text.NumberFormat</c>
+				<li><c>java.util.Date</c>
+				<li><c>java.util.UUID</c>
+				<li><c>java.util.logging.Level</c>
+				<li><c>javax.xml.bind.DatatypeConverter</c>
 			</ul>
 		</td>
 		<td style='background-color:lightgreen;text-align:center'><b>yes</b></td>
@@ -246,9 +246,9 @@
 		<td>
 			Classes that only have a method to convert to a serializable form:
 			<ul>
-				<li><code><jk>public</jk> X swap(BeanSession);</code> where <code>X</code> is in groups 
+				<li><c><jk>public</jk> X swap(BeanSession);</c> where <c>X</c> is in groups 
 					[1, 2, 3].
-				<li><code><jk>public</jk> String toString();</code> where the string is any meaningful data.
+				<li><c><jk>public</jk> String toString();</c> where the string is any meaningful data.
 			</ul>
 		</td>
 		<td>&nbsp;</td>
@@ -289,7 +289,7 @@
 </ul>
 
 <p>
-	As a general rule, all POJOs are converted to Strings using the <code>toString()</code> method.
+	As a general rule, all POJOs are converted to Strings using the <c>toString()</c> method.
 	However, there is one exception:
 </p>
 <ul class='spaced-list'>
@@ -302,16 +302,16 @@
 <ul class='spaced-list'>
 	<li>Any any of the following public static non-deprecated methods:
 	<ul>
-		<li><code>create(String)</code>
-		<li><code>fromString(String)</code>
-		<li><code>fromValue(String)</code>
-		<li><code>valueOf(String)</code>
-		<li><code>parse(String)</code>
-		<li><code>parseString(String)</code>
-		<li><code>forName(String)</code>
-		<li><code>forString(String)</code>
+		<li><c>create(String)</c>
+		<li><c>fromString(String)</c>
+		<li><c>fromValue(String)</c>
+		<li><c>valueOf(String)</c>
+		<li><c>parse(String)</c>
+		<li><c>parseString(String)</c>
+		<li><c>forName(String)</c>
+		<li><c>forString(String)</c>
 	</ul>
-	<li>Has a public constructor that takes in a <code>String</code>.
+	<li>Has a public constructor that takes in a <c>String</c>.
 </ul>
 <p>
 	Exceptions exist for the following classes:
@@ -320,13 +320,13 @@
 	<li>{@link java.util.TimeZone} - Uses {@link java.util.TimeZone#getTimeZone(String)}
 	<li>{@link java.util.Locale} - Uses {@link java.util.Locale#forLanguageTag(String)} after replacing <js>'_'</js> with <js>'-'</js>.
 	<li>{@link java.lang.Boolean} - Blank and <js>"null"</js> are interpreted as null values.
-	<li>Primitives (except for <code><jk>void</jk>.<jk>class</jk></code>) - Uses the primitive wrapper classes for instantiating from Strings.
+	<li>Primitives (except for <c><jk>void</jk>.<jk>class</jk></c>) - Uses the primitive wrapper classes for instantiating from Strings.
 </ul>
 
 <h5 class='topic' id='PojosConveribleToOtherTypes'>POJOs convertible to/from other types</h5>
 <p>
 	POJOs are also converted to various other types in places such as the Open-API serializers and parsers. 
-	In this section, the type being converted to will be referred to as <code>X</code>.
+	In this section, the type being converted to will be referred to as <c>X</c>.
 </p>
 <p>
 	POJOs are considered convertible from X if it has any of the following (matched in the specified order):
@@ -334,11 +334,11 @@
 <ul class='spaced-list'>
 	<li>Any any of the following public static non-deprecated methods:
 	<ul>
-		<li><code>create(X)</code>
-		<li><code>from*(X)</code>
+		<li><c>create(X)</c>
+		<li><c>from*(X)</c>
 	</ul>
-	<li>Has a public constructor that takes in an <code>X</code>.
-	<li>The X class has a public non-static no-arg non-deprecated method called <code>to*()</code>.
+	<li>Has a public constructor that takes in an <c>X</c>.
+	<li>The X class has a public non-static no-arg non-deprecated method called <c>to*()</c>.
 </ul>
 <p>
 	POJOs are considered convertible from X if any of the reverse of above are true.
diff --git a/juneau-doc/docs/Topics/02.juneau-marshall/20.JsonDetails/01.Methodology.html b/juneau-doc/docs/Topics/02.juneau-marshall/20.JsonDetails/01.Methodology.html
index 0eb39ea..5592de6 100644
--- a/juneau-doc/docs/Topics/02.juneau-marshall/20.JsonDetails/01.Methodology.html
+++ b/juneau-doc/docs/Topics/02.juneau-marshall/20.JsonDetails/01.Methodology.html
@@ -40,48 +40,48 @@
 	<tr>
 		<td>String</td>
 		<td>String</td>
-		<td><code>serialize(<js>"foobar"</js>);</code></td>
-		<td><code><js>'foobar'</js></code>
+		<td><c>serialize(<js>"foobar"</js>);</c></td>
+		<td><c><js>'foobar'</js></c>
 	</tr>
 	<tr>
 		<td>Number</td>
 		<td>Number</td>
-		<td><code>serialize(123);</code></td>
-		<td><code>123</code>
+		<td><c>serialize(123);</c></td>
+		<td><c>123</c>
 	</tr>
 	<tr>
 		<td>Boolean</td>
 		<td>Boolean</td>
-		<td><code>serialize(<jk>true</jk>);</code></td>
-		<td><code><jk>true</jk></code>
+		<td><c>serialize(<jk>true</jk>);</c></td>
+		<td><c><jk>true</jk></c>
 	</tr>
 	<tr>
 		<td>Null</td>
 		<td>Null</td>
-		<td><code>serialize(<jk>null</jk>);</code></td>
-		<td><code><jk>null</jk></code>
+		<td><c>serialize(<jk>null</jk>);</c></td>
+		<td><c><jk>null</jk></c>
 	</tr>
 	<tr>
 		<td>Beans with properties of any type on this list</td>
 		<td>Object</td>
-		<td><code>serialize(<jk>new</jk> MyBean());</code></td>
-		<td><code>{p1:<js>'val1'</js>,p2:<jk>true</jk>}</code>
+		<td><c>serialize(<jk>new</jk> MyBean());</c></td>
+		<td><c>{p1:<js>'val1'</js>,p2:<jk>true</jk>}</c>
 	</tr>
 	<tr>
 		<td>Maps with values of any type on this list</td>
 		<td>Object</td>
-		<td><code>serialize(<jk>new</jk> TreeMap());</code></td>
-		<td><code>{key1:<js>'val1'</js>,key2:<jk>true</jk>}</code>
+		<td><c>serialize(<jk>new</jk> TreeMap());</c></td>
+		<td><c>{key1:<js>'val1'</js>,key2:<jk>true</jk>}</c>
 	</tr>
 	<tr>
 		<td>Collections and arrays of any type on this list</td>
 		<td>Array</td>
-		<td><code>serialize(<jk>new</jk> Object[]{1,<js>"foo"</js>,<jk>true</jk>});</code></td>
-		<td><code>[1,<js>'foo'</js>,<jk>true</jk>]</code>
+		<td><c>serialize(<jk>new</jk> Object[]{1,<js>"foo"</js>,<jk>true</jk>});</c></td>
+		<td><c>[1,<js>'foo'</js>,<jk>true</jk>]</c>
 	</tr>
 </table>
 <p>
 	In addition, swaps can be used to convert non-serializable POJOs into serializable forms, such as converting 
-	<code>Calendar</code> object to ISO8601 strings, or <code><jk>byte</jk>[]</code> arrays to Base-64 
+	<c>Calendar</c> object to ISO8601 strings, or <c><jk>byte</jk>[]</c> arrays to Base-64 
 	encoded strings.
 </p>
diff --git a/juneau-doc/docs/Topics/02.juneau-marshall/20.JsonDetails/06.JsonSchema.html b/juneau-doc/docs/Topics/02.juneau-marshall/20.JsonDetails/06.JsonSchema.html
index 8a52bd4..375ff4c 100644
--- a/juneau-doc/docs/Topics/02.juneau-marshall/20.JsonDetails/06.JsonSchema.html
+++ b/juneau-doc/docs/Topics/02.juneau-marshall/20.JsonDetails/06.JsonSchema.html
@@ -18,7 +18,7 @@
 <p>
 	Juneau provides the {@link oaj.json.JsonSchemaSerializer} class for generating JSON-Schema 
 	documents that describe the output generated by the {@link oaj.json.JsonSerializer} class.
-	This class shares the same properties as <code>JsonSerializer</code>.
+	This class shares the same properties as <c>JsonSerializer</c>.
 	For convenience the {@link oaj.json.JsonSerializer#getSchemaSerializer()} method has been 
 	added for creating instances of schema serializers from the regular serializer instance.
 </p>
diff --git a/juneau-doc/docs/Topics/02.juneau-marshall/21.XmlDetails/01.Methodology.html b/juneau-doc/docs/Topics/02.juneau-marshall/21.XmlDetails/01.Methodology.html
index 4bb69c0..75d9b24 100644
--- a/juneau-doc/docs/Topics/02.juneau-marshall/21.XmlDetails/01.Methodology.html
+++ b/juneau-doc/docs/Topics/02.juneau-marshall/21.XmlDetails/01.Methodology.html
@@ -63,7 +63,7 @@
 </p>
 <p>
 	<xa>_type</xa> attributes are added to bean properties or map entries if the type cannot be inferred 
-	through reflection (e.g. an <code>Object</code> or superclass/interface value type).
+	through reflection (e.g. an <c>Object</c> or superclass/interface value type).
 </p>
 <table class='styled w800'>
 	<tr>
diff --git a/juneau-doc/docs/Topics/02.juneau-marshall/21.XmlDetails/04.BeanTypeNameAnnotation.html b/juneau-doc/docs/Topics/02.juneau-marshall/21.XmlDetails/04.BeanTypeNameAnnotation.html
index af2719a..d0552f5 100644
--- a/juneau-doc/docs/Topics/02.juneau-marshall/21.XmlDetails/04.BeanTypeNameAnnotation.html
+++ b/juneau-doc/docs/Topics/02.juneau-marshall/21.XmlDetails/04.BeanTypeNameAnnotation.html
@@ -68,7 +68,7 @@
 </p>
 <p>
 	In the following example, a type attribute is used on property 'b' but not property 'a' since
-	'b' is of type <code>Object</code> and therefore the bean class cannot be inferred.
+	'b' is of type <c>Object</c> and therefore the bean class cannot be inferred.
 </p>
 
 <h5 class='figure'>Example</h5>
@@ -115,8 +115,8 @@
 </table>
 <ul class='doctree'>
 	<li class='info'>
-		<code>string</code>, <code>number</code>, <code>boolean</code>, <code>object</code>, 
-		<code>array</code>, and <code>null</code> are reserved keywords that cannot be used as type names.
+		<c>string</c>, <c>number</c>, <c>boolean</c>, <c>object</c>, 
+		<c>array</c>, and <c>null</c> are reserved keywords that cannot be used as type names.
 </ul>
 <p>
 	Beans with type names are often used in conjunction with the 
diff --git a/juneau-doc/docs/Topics/02.juneau-marshall/21.XmlDetails/06.XmlFormatAnnotation.html b/juneau-doc/docs/Topics/02.juneau-marshall/21.XmlDetails/06.XmlFormatAnnotation.html
index 9a7cb87..ae22b1c 100644
--- a/juneau-doc/docs/Topics/02.juneau-marshall/21.XmlDetails/06.XmlFormatAnnotation.html
+++ b/juneau-doc/docs/Topics/02.juneau-marshall/21.XmlDetails/06.XmlFormatAnnotation.html
@@ -139,7 +139,7 @@
 </table>
 <p>
 	The {@link oaj.xml.annotation.XmlFormat#ATTRS} format can be applied to a single bean 
-	property of type <code>Map&lt;String,Object&gt;</code> to denote arbitrary XML attribute values on the 
+	property of type <c>Map&lt;String,Object&gt;</c> to denote arbitrary XML attribute values on the 
 	element.
 	These can be mixed with other {@link oaj.xml.annotation.XmlFormat#ATTR} annotated 
 	properties, but there must not be an overlap in bean property names and map keys. 
@@ -653,7 +653,7 @@
 	The {@link oaj.xml.annotation.XmlFormat#TEXT} format is similar to 
 	{@link oaj.xml.annotation.XmlFormat#MIXED} except it's meant for solitary objects that 
 	get serialized as simple child text nodes.
-	Any object that can be serialize to a <code>String</code> can be used.
+	Any object that can be serialize to a <c>String</c> can be used.
 	The {@link oaj.xml.annotation.XmlFormat#TEXT_PWS} is the same except whitespace is 
 	preserved in the output.
 </p>
@@ -690,7 +690,7 @@
 	The {@link oaj.xml.annotation.XmlFormat#XMLTEXT} format is similar to 
 	{@link oaj.xml.annotation.XmlFormat#TEXT} except it's meant for strings containing XML 
 	that should be serialized as-is to the document.
-	Any object that can be serialize to a <code>String</code> can be used.
+	Any object that can be serialize to a <c>String</c> can be used.
 	During parsing, the element content gets parsed with the rest of the document and then re-serialized to 
 	XML before being set as the property value.  
 	This process may not be perfect (e.g. double quotes may be replaced by single quotes, etc...).
diff --git a/juneau-doc/docs/Topics/02.juneau-marshall/21.XmlDetails/07.Namespaces.html b/juneau-doc/docs/Topics/02.juneau-marshall/21.XmlDetails/07.Namespaces.html
index 3b11d5a..ef450b7 100644
--- a/juneau-doc/docs/Topics/02.juneau-marshall/21.XmlDetails/07.Namespaces.html
+++ b/juneau-doc/docs/Topics/02.juneau-marshall/21.XmlDetails/07.Namespaces.html
@@ -16,7 +16,7 @@
 Namespaces
 
 <p>
-	Let's go back to the example of our original <code>Person</code> bean class, but add some namespace annotations:
+	Let's go back to the example of our original <c>Person</c> bean class, but add some namespace annotations:
 </p>
 <h5 class='figure'>Sample Beans</h5>
 <p class='bpcode w800'>
diff --git a/juneau-doc/docs/Topics/02.juneau-marshall/21.XmlDetails/08.XmlSchema.html b/juneau-doc/docs/Topics/02.juneau-marshall/21.XmlDetails/08.XmlSchema.html
index eacbfa8..4f822a5 100644
--- a/juneau-doc/docs/Topics/02.juneau-marshall/21.XmlDetails/08.XmlSchema.html
+++ b/juneau-doc/docs/Topics/02.juneau-marshall/21.XmlDetails/08.XmlSchema.html
@@ -18,7 +18,7 @@
 <p>
 	Juneau provides the {@link oaj.xmlschema.XmlSchemaSerializer} class for generating XML-Schema 
 	documents that describe the output generated by the {@link oaj.xml.XmlSerializer} class.
-	This class shares the same properties as <code>XmlSerializer</code>.
+	This class shares the same properties as <c>XmlSerializer</c>.
 	Since the XML output differs based on settings on the XML serializer class, the XML-Schema serializer
 	class must have the same property values as the XML serializer class it's describes.
 	To help facilitate creating an XML Schema serializer with the same properties as the corresponding 
diff --git a/juneau-doc/docs/Topics/02.juneau-marshall/22.HtmlDetails/04.HtmlAnnotation.html b/juneau-doc/docs/Topics/02.juneau-marshall/22.HtmlDetails/04.HtmlAnnotation.html
index f39cfdb..bd7f311 100644
--- a/juneau-doc/docs/Topics/02.juneau-marshall/22.HtmlDetails/04.HtmlAnnotation.html
+++ b/juneau-doc/docs/Topics/02.juneau-marshall/22.HtmlDetails/04.HtmlAnnotation.html
@@ -55,7 +55,7 @@
 </p>
 <p>
 	The {@link oaj.html.annotation.Html#format @Html(format)} annotation is used to specify what format to use for HTML elements.
-	For example, the HTML beans defined in the {@link oaj.dto.html5} package use <code>format=<jsf>XML</jsf></code> so that
+	For example, the HTML beans defined in the {@link oaj.dto.html5} package use <c>format=<jsf>XML</jsf></c> so that
 	the beans get serialized as standard XML:
 </p>
 <h5 class='figure'>Example:</h5>
diff --git a/juneau-doc/docs/Topics/02.juneau-marshall/22.HtmlDetails/05.HtmlRenderAnnotation.html b/juneau-doc/docs/Topics/02.juneau-marshall/22.HtmlDetails/05.HtmlRenderAnnotation.html
index 52905d2..abed250 100644
--- a/juneau-doc/docs/Topics/02.juneau-marshall/22.HtmlDetails/05.HtmlRenderAnnotation.html
+++ b/juneau-doc/docs/Topics/02.juneau-marshall/22.HtmlDetails/05.HtmlRenderAnnotation.html
@@ -20,8 +20,8 @@
 	Using this class, you can alter the CSS style and HTML content of the bean property.
 </p>
 <p>
-	The following example shows two render classes that customize the appearance of the <code>pctFull</code> and
-	<code>status</code> columns in the code below:
+	The following example shows two render classes that customize the appearance of the <c>pctFull</c> and
+	<c>status</c> columns in the code below:
 </p>
 <p class='bpcode w800'>
 	<jk>import static</jk> org.apache.juneau.dto.html5.HtmlBuilder.*;	
diff --git a/juneau-doc/docs/Topics/02.juneau-marshall/26.OpenApiDetails/01.Methodology.html b/juneau-doc/docs/Topics/02.juneau-marshall/26.OpenApiDetails/01.Methodology.html
index 97d38f2..061fd0c 100644
--- a/juneau-doc/docs/Topics/02.juneau-marshall/26.OpenApiDetails/01.Methodology.html
+++ b/juneau-doc/docs/Topics/02.juneau-marshall/26.OpenApiDetails/01.Methodology.html
@@ -17,25 +17,25 @@
 
 <p>
 	Unlike the other Juneau serializers and parsers that convert input and output directly to-and-from POJOs,
-	the OpenAPI serializers and parsers use intermediate objects based on the <code>type</code> and <code>format</code>
+	the OpenAPI serializers and parsers use intermediate objects based on the <c>type</c> and <c>format</c>
 	of the schema.
 </p>
 <p>
-	The following table shows the "natural" intermediate type of the object based on the <code>type/format</code>:
+	The following table shows the "natural" intermediate type of the object based on the <c>type/format</c>:
 </p>
 <table class='styled w800'>
 	<tr><th>Type</th><th>Format</th><th>Intermediate Java Type</th></tr>
 	<tr class='dark bb'>
-		<td rowspan='4'><code>string</code> or empty</td>
-		<td><code>byte<br>binary<br>binary-spaced</code></td>
-		<td><code><jk>byte</jk>[]</code></td>
+		<td rowspan='4'><c>string</c> or empty</td>
+		<td><c>byte<br>binary<br>binary-spaced</c></td>
+		<td><c><jk>byte</jk>[]</c></td>
 	</tr>
 	<tr class='dark bb'>
-		<td><code>date<br>date-time</code></td>
+		<td><c>date<br>date-time</c></td>
 		<td>{@link java.util.Calendar}</td>
 	</tr>
 	<tr class='dark bb'>
-		<td><code>uon</code></td>
+		<td><c>uon</c></td>
 		<td>No intermediate type.<br>(serialized directly to/from POJO)</td>
 	</tr>
 	<tr class='dark bb'>
@@ -43,44 +43,44 @@
 		<td>{@link java.lang.String}</td>
 	</tr>
 	<tr class='light bb'>
-		<td rowspan='1'><code>boolean</code></td>
+		<td rowspan='1'><c>boolean</c></td>
 		<td>empty</td>
 		<td>{@link java.lang.Boolean}</td>
 	</tr>
 	<tr class='dark bb'>
-		<td rowspan='2'><code>integer</code></td>
-		<td><code>int32</code></td>
+		<td rowspan='2'><c>integer</c></td>
+		<td><c>int32</c></td>
 		<td>{@link java.lang.Integer}</td>
 	</tr>
 	<tr class='dark bb'>
-		<td><code>int64</code></td>
+		<td><c>int64</c></td>
 		<td>{@link java.lang.Long}</td>
 	</tr>
 	<tr class='light bb'>
-		<td rowspan='2'><code>number</code></td>
-		<td><code>float</code></td>
+		<td rowspan='2'><c>number</c></td>
+		<td><c>float</c></td>
 		<td>{@link java.lang.Float}</td>
 	</tr>
 	<tr class='light bb'>
-		<td><code>double</code></td>
+		<td><c>double</c></td>
 		<td>{@link java.lang.Double}</td>
 	</tr>
 	<tr class='dark bb'>
-		<td rowspan='2'><code>array</code></td>
+		<td rowspan='2'><c>array</c></td>
 		<td>empty</td>
 		<td>Arrays of intermediate types on this list.</td>
 	</tr>
 	<tr class='dark bb'>
-		<td><code>uon</code></td>
+		<td><c>uon</c></td>
 		<td>No intermediate type.<br>(serialized directly to/from POJO)</td>
 	</tr>
 	<tr class='light bb'>
-		<td rowspan='2'><code>object</code></td>
+		<td rowspan='2'><c>object</c></td>
 		<td>empty</td>
-		<td><code>Map&lt;String,Object&gt;</code></td>
+		<td><c>Map&lt;String,Object&gt;</c></td>
 	</tr>
 	<tr class='light bb'>
-		<td><code>uon</code></td>
+		<td><c>uon</c></td>
 		<td>No intermediate type.<br>(serialized directly to/from POJO)</td>
 	</tr>
 </table>
diff --git a/juneau-doc/docs/Topics/02.juneau-marshall/26.OpenApiDetails/02.Serializers.html b/juneau-doc/docs/Topics/02.juneau-marshall/26.OpenApiDetails/02.Serializers.html
index 42f92fc..d3b4f59 100644
--- a/juneau-doc/docs/Topics/02.juneau-marshall/26.OpenApiDetails/02.Serializers.html
+++ b/juneau-doc/docs/Topics/02.juneau-marshall/26.OpenApiDetails/02.Serializers.html
@@ -88,47 +88,47 @@
 	}
 </p>
 <p>
-	As a general rule, any POJO convertible to the intermediate type for the <code>type/format</code> of the schema can
+	As a general rule, any POJO convertible to the intermediate type for the <c>type/format</c> of the schema can
 	be serialized using the OpenAPI serializer.
 	Here are the rules of POJO types allowed for various type/format combinations:
 </p>
 <table class='styled w800'>
 	<tr><th>Type</th><th>Format</th><th>Valid parameter types</th></tr>
 	<tr class='dark bb'>
-		<td rowspan='4'><code>string</code> or empty</td>
-		<td><code>byte<br>binary<br>binary-spaced</code></td>
+		<td rowspan='4'><c>string</c> or empty</td>
+		<td><c>byte<br>binary<br>binary-spaced</c></td>
 		<td>
 			<ul>
-				<li><code><jk>byte</jk>[]</code> (default)
+				<li><c><jk>byte</jk>[]</c> (default)
 				<li>{@link java.io.InputStream}
 				<li>{@link java.io.Reader} - Read into String and then converted using {@link java.lang.String#getBytes()}.
 				<li>{@link java.lang.Object} - Converted to String and then converted using {@link java.lang.String#getBytes()}.
-				<li>Any POJO transformable to a <code><jk>byte</jk>[]</code> via the following methods:
+				<li>Any POJO transformable to a <c><jk>byte</jk>[]</c> via the following methods:
 					<ul>
-						<li><code><jk>public byte</jk>[] toBytes() {...}</code>
-						<li><code><jk>public byte</jk>[]</jk> toFoo() {...}</code> (any method name starting with "to")
+						<li><c><jk>public byte</jk>[] toBytes() {...}</c>
+						<li><c><jk>public byte</jk>[]</jk> toFoo() {...}</c> (any method name starting with "to")
 					</ul>
-				<li>Any POJO transformable to a <code><jk>byte</jk>[]</code> via a {@link oaj.transform.PojoSwap}.
+				<li>Any POJO transformable to a <c><jk>byte</jk>[]</c> via a {@link oaj.transform.PojoSwap}.
 			</ul>
 		</td>
 	</tr>
 	<tr class='dark bb'>
-		<td><code>date<br>date-time</code></td>
+		<td><c>date<br>date-time</c></td>
 		<td>
 			<ul>
 				<li>{@link java.util.Calendar} (default)
 				<li>{@link java.util.Date}
 				<li>Any POJO transformable to a {@link java.util.Calendar} via the following methods:
 					<ul>
-						<li><code><jk>public</jk> Calendar toCalendar() {...}</code>
-						<li><code><jk>public</jk> Calendar toFoo() {...}</code> (any method name starting with "to")
+						<li><c><jk>public</jk> Calendar toCalendar() {...}</c>
+						<li><c><jk>public</jk> Calendar toFoo() {...}</c> (any method name starting with "to")
 					</ul>
 				<li>Any POJO transformable to a {@link java.util.Calendar} via a {@link oaj.transform.PojoSwap}.
 			</ul>
 		</td>
 	</tr>
 	<tr class='dark bb'>
-		<td><code>uon</code></td>
+		<td><c>uon</c></td>
 		<td>
 			<ul>
 				<li>Any {@doc PojoCategories Serializable POJO} type.
@@ -142,14 +142,14 @@
 				<li>{@link java.lang.String} (default)
 				<li>Any POJO transformable to a {@link java.lang.String} via the following methods:
 					<ul>
-						<li><code><jk>public</jk> String toString() {...}</code>
+						<li><c><jk>public</jk> String toString() {...}</c>
 					</ul>
 				<li>Any POJO transformable to a {@link java.lang.String} via a {@link oaj.transform.PojoSwap}.
 			</ul>
 		</td>
 	</tr>
 	<tr class='light bb'>
-		<td rowspan='1'><code>boolean</code></td>
+		<td rowspan='1'><c>boolean</c></td>
 		<td>empty</td>
 		<td>
 			<ul>
@@ -158,16 +158,16 @@
 				<li>{@link java.lang.String} - Converted to a {@link java.lang.Boolean}.
 				<li>Any POJO transformable to a {@link java.lang.Boolean} via the following methods:
 					<ul>
-						<li><code><jk>public</jk> Boolean toBoolean() {...}</code>
-						<li><code><jk>public</jk> Boolean toFoo() {...}</code> (any method name starting with "to")
+						<li><c><jk>public</jk> Boolean toBoolean() {...}</c>
+						<li><c><jk>public</jk> Boolean toFoo() {...}</c> (any method name starting with "to")
 					</ul>
 				<li>Any POJO transformable to a {@link java.lang.Boolean} via a {@link oaj.transform.PojoSwap}.
 			</ul>
 		</td>
 	</tr>
 	<tr class='dark bb'>
-		<td rowspan='2'><code>integer</code></td>
-		<td><code>int32</code></td>
+		<td rowspan='2'><c>integer</c></td>
+		<td><c>int32</c></td>
 		<td>
 			<ul>
 				<li>{@link java.lang.Integer} (default)
@@ -175,15 +175,15 @@
 				<li>{@link java.lang.String} - Converted to an {@link java.lang.String}.
 				<li>Any POJO transformable to an {@link java.lang.Integer} via the following methods:
 					<ul>
-						<li><code><jk>public</jk> Integer toInteger() {...}</code>
-						<li><code><jk>public</jk> Integer toFoo() {...}</code> (any method name starting with "to")
+						<li><c><jk>public</jk> Integer toInteger() {...}</c>
+						<li><c><jk>public</jk> Integer toFoo() {...}</c> (any method name starting with "to")
 					</ul>
 				<li>Any POJO transformable to an {@link java.lang.Integer} via a {@link oaj.transform.PojoSwap}.
 			</ul>
 		</td>
 	</tr>
 	<tr class='dark bb'>
-		<td><code>int64</code></td>
+		<td><c>int64</c></td>
 		<td>
 			<ul>
 				<li>{@link java.lang.Long} (default)
@@ -191,16 +191,16 @@
 				<li>{@link java.lang.String} - Converted to a {@link java.lang.Long}.
 				<li>Any POJO transformable to a {@link java.lang.Long} via the following methods:
 					<ul>
-						<li><code><jk>public</jk> Long toLong() {...}</code>
-						<li><code><jk>public</jk> Long toFoo() {...}</code> (any method name starting with "to")
+						<li><c><jk>public</jk> Long toLong() {...}</c>
+						<li><c><jk>public</jk> Long toFoo() {...}</c> (any method name starting with "to")
 					</ul>
 				<li>Any POJO transformable to a {@link java.lang.Long} via a {@link oaj.transform.PojoSwap}.
 			</ul>
 		</td>
 	</tr>
 	<tr class='light bb'>
-		<td rowspan='2'><code>number</code></td>
-		<td><code>float</code></td>
+		<td rowspan='2'><c>number</c></td>
+		<td><c>float</c></td>
 		<td>
 			<ul>
 				<li>{@link java.lang.Float} (default)
@@ -208,15 +208,15 @@
 				<li>{@link java.lang.String} - Converted to a {@link java.lang.Float}.
 				<li>Any POJO transformable to a {@link java.lang.Float} via the following methods:
 					<ul>
-						<li><code><jk>public</jk> Float toFloat() {...}</code>
-						<li><code><jk>public</jk> Float toFoo() {...}</code> (any method name starting with "to")
+						<li><c><jk>public</jk> Float toFloat() {...}</c>
+						<li><c><jk>public</jk> Float toFoo() {...}</c> (any method name starting with "to")
 					</ul>
 				<li>Any POJO transformable to a {@link java.lang.Float} via a {@link oaj.transform.PojoSwap}.
 			</ul>
 		</td>
 	</tr>
 	<tr class='light bb'>
-		<td><code>double</code></td>
+		<td><c>double</c></td>
 		<td>
 			<ul>
 				<li>{@link java.lang.Double} (default)
@@ -224,30 +224,30 @@
 				<li>{@link java.lang.String} - Converted to a {@link java.lang.Double}.
 				<li>Any POJO transformable to a {@link java.lang.Double} via the following methods:
 					<ul>
-						<li><code><jk>public</jk> Double toDouble() {...}</code>
-						<li><code><jk>public</jk> Double toFoo() {...}</code> (any method name starting with "to")
+						<li><c><jk>public</jk> Double toDouble() {...}</c>
+						<li><c><jk>public</jk> Double toFoo() {...}</c> (any method name starting with "to")
 					</ul>
 				<li>Any POJO transformable to a {@link java.lang.Double} via a {@link oaj.transform.PojoSwap}.
 			</ul>
 		</td>
 	</tr>
 	<tr class='dark bb'>
-		<td rowspan='2'><code>array</code></td>
+		<td rowspan='2'><c>array</c></td>
 		<td>empty</td>
 		<td>
 			<ul>
 				<li>Arrays or Collections of any defaults on this list.
-				<li>Any POJO transformable to arrays of the default types (e.g. <code>Integer[]</code>, <code>Boolean[][]</code>, etc...).
+				<li>Any POJO transformable to arrays of the default types (e.g. <c>Integer[]</c>, <c>Boolean[][]</c>, etc...).
 					<br>For example:
 					<ul>
-						<li><code><jk>public</jk> Boolean[][] toFoo() {...}</code> (any method name starting with "to")
+						<li><c><jk>public</jk> Boolean[][] toFoo() {...}</c> (any method name starting with "to")
 					</ul>
 				<li>Any POJO transformable to arrays of the default types via a {@link oaj.transform.PojoSwap}
 			</ul>
 		</td>
 	</tr>
 	<tr class='dark bb'>
-		<td><code>uon</code></td>
+		<td><c>uon</c></td>
 		<td>
 			<ul>
 				<li>Any {@doc PojoCategories Serializable POJO} type.
@@ -255,18 +255,18 @@
 		</td>
 	</tr>
 	<tr class='light bb'>
-		<td rowspan='2'><code>object</code></td>
+		<td rowspan='2'><c>object</c></td>
 		<td>empty</td>
 		<td>
 			<ul>
-				<li><code>Map&lt;String,Object&gt;</code> (default)
+				<li><c>Map&lt;String,Object&gt;</c> (default)
 				<li>Beans with properties of anything on this list.
 				<li>Any POJO transformable to a map via a {@link oaj.transform.PojoSwap}
 			</ul>
 		</td>
 	</tr>
 	<tr class='light bb'>
-		<td><code>uon</code></td>
+		<td><c>uon</c></td>
 		<td>
 			<ul>
 				<li>Any {@doc PojoCategories Serializable POJO} type.
@@ -303,7 +303,7 @@
 	}
 </p>
 <p>
-	The <code>object</code> type is not officially part of the OpenAPI standard.  
+	The <c>object</c> type is not officially part of the OpenAPI standard.  
 	However, Juneau supports serializing Maps and beans to HTTP parts using UON notation.
 </p>
 <p>
@@ -445,6 +445,6 @@
 		They can be skipped or partially defined.
 	<li>
 		We make our best attempt to convert the input to the matching type.  
-		However, you will get <code>SerializeExceptions</code> if you attempt an impossible conversion.
+		However, you will get <c>SerializeExceptions</c> if you attempt an impossible conversion.
 		(e.g. trying to serialize the string "foo" as a boolean). 
 </ul>
diff --git a/juneau-doc/docs/Topics/02.juneau-marshall/26.OpenApiDetails/03.Parsers.html b/juneau-doc/docs/Topics/02.juneau-marshall/26.OpenApiDetails/03.Parsers.html
index 32a7395..2150840 100644
--- a/juneau-doc/docs/Topics/02.juneau-marshall/26.OpenApiDetails/03.Parsers.html
+++ b/juneau-doc/docs/Topics/02.juneau-marshall/26.OpenApiDetails/03.Parsers.html
@@ -59,28 +59,28 @@
 	}
 </p>
 <p>
-	As a general rule, any POJO convertible from the intermediate type for the <code>type/format</code> of the schema can
+	As a general rule, any POJO convertible from the intermediate type for the <c>type/format</c> of the schema can
 	be parsed using the OpenAPI parser.
 	Here are the rules of POJO types allowed for various type/format combinations:
 </p>
 <table class='styled w800'>
 	<tr><th>Type</th><th>Format</th><th>Valid parameter types</th></tr>
 	<tr class='dark bb'>
-		<td rowspan='4'><code>string</code> or empty</td>
-		<td><code>byte<br>binary<br>binary-spaced</code></td>
+		<td rowspan='4'><c>string</c> or empty</td>
+		<td><c>byte<br>binary<br>binary-spaced</c></td>
 		<td>
 			<ul>
-				<li><code><jk>byte</jk>[]</code> (default)
+				<li><c><jk>byte</jk>[]</c> (default)
 				<li>{@link java.io.InputStream} - Returns a {@link java.io.ByteArrayInputStream}.
 				<li>{@link java.io.Reader} - Returns a {@link java.io.InputStreamReader} wrapped around a {@link java.io.ByteArrayInputStream}.
 				<li>{@link java.lang.String} - Constructed using {@link java.lang.String#String(byte[])}.
-				<li>{@link java.lang.Object} - Returns the default <code><jk>byte</jk>[]</code>.
-				<li>Any POJO transformable from a <code><jk>byte</jk>[]</code> (via constructors or static create methods).
+				<li>{@link java.lang.Object} - Returns the default <c><jk>byte</jk>[]</c>.
+				<li>Any POJO transformable from a <c><jk>byte</jk>[]</c> (via constructors or static create methods).
 			</ul>
 		</td>
 	</tr>
 	<tr class='dark bb'>
-		<td><code>date<br>date-time</code></td>
+		<td><c>date<br>date-time</c></td>
 		<td>
 			<ul>
 				<li>{@link java.util.Calendar} (default)
@@ -93,7 +93,7 @@
 		</td>
 	</tr>
 	<tr class='dark bb'>
-		<td><code>uon</code></td>
+		<td><c>uon</c></td>
 		<td>
 			<ul>
 				<li>Any {@doc PojoCategories Parsable POJO} type.
@@ -111,7 +111,7 @@
 		</td>
 	</tr>
 	<tr class='light bb'>
-		<td rowspan='1'><code>boolean</code></td>
+		<td rowspan='1'><c>boolean</c></td>
 		<td>empty</td>
 		<td>
 			<ul>
@@ -124,8 +124,8 @@
 		</td>
 	</tr>
 	<tr class='dark bb'>
-		<td rowspan='2'><code>integer</code></td>
-		<td><code>int32</code></td>
+		<td rowspan='2'><c>integer</c></td>
+		<td><c>int32</c></td>
 		<td>
 			<ul>
 				<li>{@link java.lang.Integer} (default)
@@ -138,7 +138,7 @@
 		</td>
 	</tr>
 	<tr class='dark bb'>
-		<td><code>int64</code></td>
+		<td><c>int64</c></td>
 		<td>
 			<ul>
 				<li>{@link java.lang.Long} (default)
@@ -151,8 +151,8 @@
 		</td>
 	</tr>
 	<tr class='light bb'>
-		<td rowspan='2'><code>number</code></td>
-		<td><code>float</code></td>
+		<td rowspan='2'><c>number</c></td>
+		<td><c>float</c></td>
 		<td>
 			<ul>
 				<li>{@link java.lang.Float} (default)
@@ -165,7 +165,7 @@
 		</td>
 	</tr>
 	<tr class='light bb'>
-		<td><code>double</code></td>
+		<td><c>double</c></td>
 		<td>
 			<ul>
 				<li>{@link java.lang.Double} (default)
@@ -178,17 +178,17 @@
 		</td>
 	</tr>
 	<tr class='dark bb'>
-		<td rowspan='2'><code>array</code></td>
+		<td rowspan='2'><c>array</c></td>
 		<td>empty</td>
 		<td>
 			<ul>
 				<li>Arrays or Collections of anything on this list.
-				<li>Any POJO transformable from arrays of the default types (e.g. <code>Integer[]</code>, <code>Boolean[][]</code>, etc...).
+				<li>Any POJO transformable from arrays of the default types (e.g. <c>Integer[]</c>, <c>Boolean[][]</c>, etc...).
 			</ul>
 		</td>
 	</tr>
 	<tr class='dark bb'>
-		<td><code>uon</code></td>
+		<td><c>uon</c></td>
 		<td>
 			<ul>
 				<li>Any {@doc PojoCategories Parsable POJO} type.
@@ -196,18 +196,18 @@
 		</td>
 	</tr>
 	<tr class='light bb'>
-		<td rowspan='2'><code>object</code></td>
+		<td rowspan='2'><c>object</c></td>
 		<td>empty</td>
 		<td>
 			<ul>
-				<li><code>Map&lt;String,Object&gt;</code> (default)
+				<li><c>Map&lt;String,Object&gt;</c> (default)
 				<li>Beans with properties of anything on this list.
 				<li>Maps with string keys.
 			</ul>
 		</td>
 	</tr>
 	<tr class='light bb'>
-		<td><code>uon</code></td>
+		<td><c>uon</c></td>
 		<td>
 			<ul>
 				<li>Any {@doc PojoCategories Parsable POJO} type.
@@ -244,7 +244,7 @@
 	}
 </p>
 <p>
-	Just like serialization, the <code>object</code> type is not officially part of the OpenAPI standard, but
+	Just like serialization, the <c>object</c> type is not officially part of the OpenAPI standard, but
 	Juneau supports parsing HTTP parts in UON notation to Maps and beans.
 </p>
 <p>
@@ -299,7 +299,7 @@
 	MyBean b = p.parse(schema, input, MyBean.<jk>class</jk>);
 </p>
 <p>
-	Note that serializing into generic <code>Object</code> properties would have produced similar results:
+	Note that serializing into generic <c>Object</c> properties would have produced similar results:
 </p>
 <p class='bpcode w800'>
 	<jk>public class</jk> MyBean {
@@ -340,6 +340,6 @@
 		They can be skipped or partially defined.
 	<li>
 		We make our best attempt to convert the output to the matching type.  
-		However, you will get <code>ParseExceptions</code> if you attempt an impossible conversion.
+		However, you will get <c>ParseExceptions</c> if you attempt an impossible conversion.
 		(e.g. trying to parse the string "foo" into a boolean). 
 </ul>
diff --git a/juneau-doc/docs/Topics/03.juneau-marshall-rdf.html b/juneau-doc/docs/Topics/03.juneau-marshall-rdf.html
index 8bbc3b6..d65eff9 100644
--- a/juneau-doc/docs/Topics/03.juneau-marshall-rdf.html
+++ b/juneau-doc/docs/Topics/03.juneau-marshall-rdf.html
@@ -32,7 +32,7 @@
 	org.apache.juneau.marshall.rdf_{@property juneauVersion}.jar 
 </p>	
 <p>
-	The <code>juneau-marshall-rdf</code> library provides additional serializers and parsers for RDF.
+	The <c>juneau-marshall-rdf</c> library provides additional serializers and parsers for RDF.
 	These rely on the Apache Jena library to provide support for the following languages:
 </p>
 <ul>
diff --git a/juneau-doc/docs/Topics/03.juneau-marshall-rdf/01.RdfDetails.html b/juneau-doc/docs/Topics/03.juneau-marshall-rdf/01.RdfDetails.html
index 7817568..58df4db 100644
--- a/juneau-doc/docs/Topics/03.juneau-marshall-rdf/01.RdfDetails.html
+++ b/juneau-doc/docs/Topics/03.juneau-marshall-rdf/01.RdfDetails.html
@@ -27,7 +27,7 @@
 </ul>
 
 <p>
-	The serializers and parsers work identically to those in <code>juneau-marshall</code>, but are
+	The serializers and parsers work identically to those in <c>juneau-marshall</c>, but are
 	packaged separately so that you don't need to pull in the Jena dependency unless you need it.
 </p>
 
diff --git a/juneau-doc/docs/Topics/03.juneau-marshall-rdf/01.RdfDetails/01.Serializers.html b/juneau-doc/docs/Topics/03.juneau-marshall-rdf/01.RdfDetails/01.Serializers.html
index e844f13..d9afe16 100644
--- a/juneau-doc/docs/Topics/03.juneau-marshall-rdf/01.RdfDetails/01.Serializers.html
+++ b/juneau-doc/docs/Topics/03.juneau-marshall-rdf/01.RdfDetails/01.Serializers.html
@@ -17,7 +17,7 @@
 
 <p>
 	The {@link oaj.jena.RdfSerializer} class is the top-level class for all Jena-based serializers.
-	Language-specific serializers are defined as inner subclasses of the <code>RdfSerializer</code> class:
+	Language-specific serializers are defined as inner subclasses of the <c>RdfSerializer</c> class:
 </p>	
 <ul class='doctree'>
 	<li class='jc'>{@link oaj.jena.RdfSerializer}
diff --git a/juneau-doc/docs/Topics/03.juneau-marshall-rdf/01.RdfDetails/02.Parsers.html b/juneau-doc/docs/Topics/03.juneau-marshall-rdf/01.RdfDetails/02.Parsers.html
index d9ae6ff..90a42f2 100644
--- a/juneau-doc/docs/Topics/03.juneau-marshall-rdf/01.RdfDetails/02.Parsers.html
+++ b/juneau-doc/docs/Topics/03.juneau-marshall-rdf/01.RdfDetails/02.Parsers.html
@@ -17,7 +17,7 @@
 
 <p>
 	The {@link oaj.jena.RdfParser} class is the top-level class for all Jena-based parsers.
-	Language-specific parsers are defined as inner subclasses of the <code>RdfParser</code> class:
+	Language-specific parsers are defined as inner subclasses of the <c>RdfParser</c> class:
 </p>	
 <ul class='doctree'>
 	<li class='jc'>{@link oaj.jena.RdfParser}
@@ -29,7 +29,7 @@
 	</ul>
 </ul>
 <p>
-	The <code>RdfParser.Xml</code> parser handles both regular and abbreviated RDF/XML.
+	The <c>RdfParser.Xml</c> parser handles both regular and abbreviated RDF/XML.
 </p>
 <p>
 	The RDF parser provides the following settings:
diff --git a/juneau-doc/docs/Topics/03.juneau-marshall-rdf/01.RdfDetails/04.Namespaces.html b/juneau-doc/docs/Topics/03.juneau-marshall-rdf/01.RdfDetails/04.Namespaces.html
index d5ef8d2..3476515 100644
--- a/juneau-doc/docs/Topics/03.juneau-marshall-rdf/01.RdfDetails/04.Namespaces.html
+++ b/juneau-doc/docs/Topics/03.juneau-marshall-rdf/01.RdfDetails/04.Namespaces.html
@@ -20,16 +20,16 @@
 	These are used by default when namespaces are not explicitly specified.
 </p>
 <p>
-	The <code>juneau</code> namespace is used for generic names for objects that don't have namespaces 
+	The <c>juneau</c> namespace is used for generic names for objects that don't have namespaces 
 	associated with them.
 </p>
 <p>
-	The <code>juneaubp</code> namespace is used on bean properties that don't have namespaces associated with 
+	The <c>juneaubp</c> namespace is used on bean properties that don't have namespaces associated with 
 	them.
 </p>
 <p>
 	The easiest way to specify namespaces is through annotations.
-	In this example, we're going to associate the prefix <code>'per'</code> to our bean class and all properties 
+	In this example, we're going to associate the prefix <c>'per'</c> to our bean class and all properties 
 	of this class.
 	We do this by adding the following annotation to our class:
 </p>
@@ -39,7 +39,7 @@
 </p>
 <p>
 	In general, the best approach is to define the namespace URIs at the package level using a 
-	<code>package-info.java</code> class, like so:
+	<c>package-info.java</c> class, like so:
 </p>
 <p class='bpcode w800'>
 	<jc>// RDF namespaces used in this package</jc>
diff --git a/juneau-doc/docs/Topics/03.juneau-marshall-rdf/01.RdfDetails/05.UriProperties.html b/juneau-doc/docs/Topics/03.juneau-marshall-rdf/01.RdfDetails/05.UriProperties.html
index 587ea41..69986e6 100644
--- a/juneau-doc/docs/Topics/03.juneau-marshall-rdf/01.RdfDetails/05.UriProperties.html
+++ b/juneau-doc/docs/Topics/03.juneau-marshall-rdf/01.RdfDetails/05.UriProperties.html
@@ -16,7 +16,7 @@
 URI Properties
 
 <p>
-	Bean properties of type <code>java.net.URI</code> or <code>java.net.URL</code> have special meaning to the 
+	Bean properties of type <c>java.net.URI</c> or <c>java.net.URL</c> have special meaning to the 
 	RDF serializer.
 	They are interpreted as resource identifiers.
 </p>
@@ -72,8 +72,8 @@
 </p>
 <p>
 	The {@link oaj.annotation.URI @URI} annotation can also be used on classes and properties 
-	to identify them as URLs when they're not instances of <code>java.net.URI</code> or <code>java.net.URL</code> 
-	(not needed if <code><ja>@Rdf</ja>(beanUri=<jk>true</jk>)</code> is already specified).
+	to identify them as URLs when they're not instances of <c>java.net.URI</c> or <c>java.net.URL</c> 
+	(not needed if <c><ja>@Rdf</ja>(beanUri=<jk>true</jk>)</c> is already specified).
 </p>
 <p>
 	The following properties would have produced the same output as before.  
diff --git a/juneau-doc/docs/Topics/03.juneau-marshall-rdf/01.RdfDetails/06.RootProperty.html b/juneau-doc/docs/Topics/03.juneau-marshall-rdf/01.RdfDetails/06.RootProperty.html
index 6edb82b..0422ffd 100644
--- a/juneau-doc/docs/Topics/03.juneau-marshall-rdf/01.RdfDetails/06.RootProperty.html
+++ b/juneau-doc/docs/Topics/03.juneau-marshall-rdf/01.RdfDetails/06.RootProperty.html
@@ -19,7 +19,7 @@
 	For all RDF languages, the POJO objects get broken down into simple triplets.
 	Unfortunately, for tree-structured data like the POJOs shown above, this causes the root node of the tree 
 	to become lost.
-	There is no easy way to identify that <code>person/1</code> is the root node in our tree once in triplet 
+	There is no easy way to identify that <c>person/1</c> is the root node in our tree once in triplet 
 	form, and in some cases it's impossible.
 </p>
 <p>
@@ -32,7 +32,7 @@
 <p>
 	To resolve this issue, the property {@link oaj.jena.RdfSerializer#RDF_addRootProperty} 
 	was introduced.
-	When enabled, this adds a special <code>root</code> attribute to the root node to make it easy to locate 
+	When enabled, this adds a special <c>root</c> attribute to the root node to make it easy to locate 
 	by the parser.
 </p>
 <p>
@@ -47,7 +47,7 @@
 		.build();
 </p>	
 <p>
-	Now when we rerun the sample code, we'll see the added <code>root</code> attribute on the root resource.
+	Now when we rerun the sample code, we'll see the added <c>root</c> attribute on the root resource.
 </p>
 <p class='bpcode w800'>
 	<xt>&lt;rdf:RDF</xt>
diff --git a/juneau-doc/docs/Topics/03.juneau-marshall-rdf/01.RdfDetails/07.TypedLiterals.html b/juneau-doc/docs/Topics/03.juneau-marshall-rdf/01.RdfDetails/07.TypedLiterals.html
index 584964f..ac2cba7 100644
--- a/juneau-doc/docs/Topics/03.juneau-marshall-rdf/01.RdfDetails/07.TypedLiterals.html
+++ b/juneau-doc/docs/Topics/03.juneau-marshall-rdf/01.RdfDetails/07.TypedLiterals.html
@@ -16,7 +16,7 @@
 Typed Literals
 
 <p>
-	XML-Schema data-types can be added to non-<code>String</code> literals through the 
+	XML-Schema data-types can be added to non-<c>String</c> literals through the 
 	{@link oaj.jena.RdfSerializer#RDF_addLiteralTypes} setting.
 </p>
 <p>
@@ -31,7 +31,7 @@
 		.build();
 </p>	
 <p>
-	Now when we rerun the sample code, we'll see the added <code>root</code> attribute on the root resource.
+	Now when we rerun the sample code, we'll see the added <c>root</c> attribute on the root resource.
 </p>
 <p class='bpcode w800'>
 	<xt>&lt;rdf:RDF</xt>
diff --git a/juneau-doc/docs/Topics/04.juneau-dto.html b/juneau-doc/docs/Topics/04.juneau-dto.html
index 90b8d9e..71c78e6 100644
--- a/juneau-doc/docs/Topics/04.juneau-dto.html
+++ b/juneau-doc/docs/Topics/04.juneau-dto.html
@@ -32,6 +32,6 @@
 	org.apache.juneau.dto_{@property juneauVersion}.jar 
 </p>	
 <p>
-	The <code>juneau-dto</code> library contains several predefined POJOs for generating commonly-used document types.
+	The <c>juneau-dto</c> library contains several predefined POJOs for generating commonly-used document types.
 	This section describes support for these POJOs.
 </p>
diff --git a/juneau-doc/docs/Topics/04.juneau-dto/04.SwaggerUI.html b/juneau-doc/docs/Topics/04.juneau-dto/04.SwaggerUI.html
index 56d5e6a..2b1bb2f 100644
--- a/juneau-doc/docs/Topics/04.juneau-dto/04.SwaggerUI.html
+++ b/juneau-doc/docs/Topics/04.juneau-dto/04.SwaggerUI.html
@@ -20,7 +20,7 @@
 	from {@link oaj.dto.swagger.Swagger} beans.
 </p>
 <p>
-	The <code>PetStore</code> example described later provides an example of auto-generated Swagger JSON:
+	The <c>PetStore</c> example described later provides an example of auto-generated Swagger JSON:
 </p>
 <img class='bordered w900' src='doc-files/SwaggerUI.json.png'>
 <p>
diff --git a/juneau-doc/docs/Topics/05.juneau-svl/01.SimpleVarLanguage.html b/juneau-doc/docs/Topics/05.juneau-svl/01.SimpleVarLanguage.html
index 81ca420..a75f796 100644
--- a/juneau-doc/docs/Topics/05.juneau-svl/01.SimpleVarLanguage.html
+++ b/juneau-doc/docs/Topics/05.juneau-svl/01.SimpleVarLanguage.html
@@ -30,24 +30,24 @@
 	configured with the following basic variables:
 </p>
 <ul class='doctree'>
-	<li class='jc'>{@link oaj.svl.vars.SystemPropertiesVar} - <code>$S{key[,default]}</code>
-		<li class='jc'>{@link oaj.svl.vars.EnvVariablesVar} - <code>$E{key[,default]}</code>
+	<li class='jc'>{@link oaj.svl.vars.SystemPropertiesVar} - <c>$S{key[,default]}</c>
+		<li class='jc'>{@link oaj.svl.vars.EnvVariablesVar} - <c>$E{key[,default]}</c>
 </ul>
 <p>
 	The following logic variables are also provided:
 </p>
 <ul class='doctree'>
-		<li class='jc'>{@link oaj.svl.vars.IfVar} - <code>$IF{arg,then[,else]}</code>
-		<li class='jc'>{@link oaj.svl.vars.SwitchVar} - <code>$SW{arg,pattern1:then1[,pattern2:then2...]}</code>
-		<li class='jc'>{@link oaj.svl.vars.CoalesceVar} - <code>$CO{arg1[,arg2...]}</code>
-		<li class='jc'>{@link oaj.svl.vars.PatternMatchVar} - <code>$PM{arg,pattern}</code> 
-		<li class='jc'>{@link oaj.svl.vars.PatternReplaceVar} - <code>$PR{arg,pattern,replace}</code> 
-		<li class='jc'>{@link oaj.svl.vars.PatternExtractVar} - <code>$PE{arg,pattern,groupIndex}</code> 
-		<li class='jc'>{@link oaj.svl.vars.NotEmptyVar} - <code>$NE{arg}</code>
-		<li class='jc'>{@link oaj.svl.vars.UpperCaseVar} - <code>$UC{arg}</code>
-		<li class='jc'>{@link oaj.svl.vars.LowerCaseVar} - <code>$LC{arg}</code>
-		<li class='jc'>{@link oaj.svl.vars.LenVar} - <code>$LN{arg[,delimiter]}</code>
-		<li class='jc'>{@link oaj.svl.vars.SubstringVar} - <code>$ST{arg,start[,end]}</code>
+		<li class='jc'>{@link oaj.svl.vars.IfVar} - <c>$IF{arg,then[,else]}</c>
+		<li class='jc'>{@link oaj.svl.vars.SwitchVar} - <c>$SW{arg,pattern1:then1[,pattern2:then2...]}</c>
+		<li class='jc'>{@link oaj.svl.vars.CoalesceVar} - <c>$CO{arg1[,arg2...]}</c>
+		<li class='jc'>{@link oaj.svl.vars.PatternMatchVar} - <c>$PM{arg,pattern}</c> 
+		<li class='jc'>{@link oaj.svl.vars.PatternReplaceVar} - <c>$PR{arg,pattern,replace}</c> 
+		<li class='jc'>{@link oaj.svl.vars.PatternExtractVar} - <c>$PE{arg,pattern,groupIndex}</c> 
+		<li class='jc'>{@link oaj.svl.vars.NotEmptyVar} - <c>$NE{arg}</c>
+		<li class='jc'>{@link oaj.svl.vars.UpperCaseVar} - <c>$UC{arg}</c>
+		<li class='jc'>{@link oaj.svl.vars.LowerCaseVar} - <c>$LC{arg}</c>
+		<li class='jc'>{@link oaj.svl.vars.LenVar} - <c>$LN{arg[,delimiter]}</c>
+		<li class='jc'>{@link oaj.svl.vars.SubstringVar} - <c>$ST{arg,start[,end]}</c>
 </ul>
 <h5 class='figure'>Example:</h5>
 <p class='bpcode w800'>
diff --git a/juneau-doc/docs/Topics/05.juneau-svl/04.DefaultVarResolver.html b/juneau-doc/docs/Topics/05.juneau-svl/04.DefaultVarResolver.html
index 5231caf..fd7cac8 100644
--- a/juneau-doc/docs/Topics/05.juneau-svl/04.DefaultVarResolver.html
+++ b/juneau-doc/docs/Topics/05.juneau-svl/04.DefaultVarResolver.html
@@ -19,20 +19,20 @@
 	{@link oaj.svl.VarResolver#DEFAULT} is a reusable variable resolver with default support for the following variables:
 </p>
 <ul>
-	<li><code>$S{key[,default]}</code> - {@link oaj.svl.vars.SystemPropertiesVar}
-	<li><code>$E{key[,default]}</code> - {@link oaj.svl.vars.EnvVariablesVar}
-	<li><code>$A{key[,default]}</code> - {@link oaj.svl.vars.ArgsVar}
-	<li><code>$MF{key[,default]}</code> - {@link oaj.svl.vars.ManifestFileVar}
-	<li><code>$SW{stringArg,pattern:thenValue[,pattern:thenValue...]}</code> - {@link oaj.svl.vars.SwitchVar}
-	<li><code>$IF{arg,then[,else]}</code> - {@link oaj.svl.vars.IfVar}
-	<li><code>$CO{arg[,arg2...]}</code> - {@link oaj.svl.vars.CoalesceVar}
-	<li><code>$PM{arg,pattern}</code> - {@link oaj.svl.vars.PatternMatchVar}
-	<li><code>$PR{stringArg,pattern,replace}</code>- {@link oaj.svl.vars.PatternReplaceVar}
-	<li><code>$PE{arg,pattern,groupIndex}</code> - {@link oaj.svl.vars.PatternExtractVar}
-	<li><code>$UC{arg}</code> - {@link oaj.svl.vars.UpperCaseVar}
-	<li><code>$LC{arg}</code> - {@link oaj.svl.vars.LowerCaseVar}
-	<li><code>$NE{arg}</code> - {@link oaj.svl.vars.NotEmptyVar}
-	<li><code>$LN{arg[,delimiter]}</code> - {@link oaj.svl.vars.LenVar}
-	<li><code>$ST{arg,start[,end]}</code> - {@link oaj.svl.vars.SubstringVar}
+	<li><c>$S{key[,default]}</c> - {@link oaj.svl.vars.SystemPropertiesVar}
+	<li><c>$E{key[,default]}</c> - {@link oaj.svl.vars.EnvVariablesVar}
+	<li><c>$A{key[,default]}</c> - {@link oaj.svl.vars.ArgsVar}
+	<li><c>$MF{key[,default]}</c> - {@link oaj.svl.vars.ManifestFileVar}
+	<li><c>$SW{stringArg,pattern:thenValue[,pattern:thenValue...]}</c> - {@link oaj.svl.vars.SwitchVar}
+	<li><c>$IF{arg,then[,else]}</c> - {@link oaj.svl.vars.IfVar}
+	<li><c>$CO{arg[,arg2...]}</c> - {@link oaj.svl.vars.CoalesceVar}
+	<li><c>$PM{arg,pattern}</c> - {@link oaj.svl.vars.PatternMatchVar}
+	<li><c>$PR{stringArg,pattern,replace}</c>- {@link oaj.svl.vars.PatternReplaceVar}
+	<li><c>$PE{arg,pattern,groupIndex}</c> - {@link oaj.svl.vars.PatternExtractVar}
+	<li><c>$UC{arg}</c> - {@link oaj.svl.vars.UpperCaseVar}
+	<li><c>$LC{arg}</c> - {@link oaj.svl.vars.LowerCaseVar}
+	<li><c>$NE{arg}</c> - {@link oaj.svl.vars.NotEmptyVar}
+	<li><c>$LN{arg[,delimiter]}</c> - {@link oaj.svl.vars.LenVar}
+	<li><c>$ST{arg,start[,end]}</c> - {@link oaj.svl.vars.SubstringVar}
 </ul>
 
diff --git a/juneau-doc/docs/Topics/05.juneau-svl/05.OtherNotes.html b/juneau-doc/docs/Topics/05.juneau-svl/05.OtherNotes.html
index 887d588..469436c 100644
--- a/juneau-doc/docs/Topics/05.juneau-svl/05.OtherNotes.html
+++ b/juneau-doc/docs/Topics/05.juneau-svl/05.OtherNotes.html
@@ -18,15 +18,15 @@
 <ul class='spaced-list'>
 	<li>
 		The escape character <js>'\'</js> can be used when necessary to escape the following characters: 
-		<code>$ , { }</code>
+		<c>$ , { }</c>
 	<li>
 		<b>WARNING:</b>  It is possible to cause {@link java.lang.StackOverflowError StackOverflowErrors} if 
 		your nested variables result in a recursive loop (e.g. the environment variable 
-		<code>'MYPROPERTY'</code> has the value <code>'$E{MYPROPERTY}'</code>).
+		<c>'MYPROPERTY'</c> has the value <c>'$E{MYPROPERTY}'</c>).
 		So don't do that!
 	<li>
 		As a general rule, this class tries to be as efficient as possible by not creating new strings when not 
 		needed.
 		<br>For example, calling the resolve method on a string that doesn't contain variables (e.g. 
-		<code>resolver.resolve(<js>"foobar"</js>)</code>) will simply be a no-op and return the same string.
+		<c>resolver.resolve(<js>"foobar"</js>)</c>) will simply be a no-op and return the same string.
 </ul>
diff --git a/juneau-doc/docs/Topics/06.juneau-config/01.Overview.html b/juneau-doc/docs/Topics/06.juneau-config/01.Overview.html
index 11c1689..37c5076 100644
--- a/juneau-doc/docs/Topics/06.juneau-config/01.Overview.html
+++ b/juneau-doc/docs/Topics/06.juneau-config/01.Overview.html
@@ -16,7 +16,7 @@
 Overview
 
 <p>
-	The <code>juneau-config</code> library contains a powerful API for creating and using INI-style config files.
+	The <c>juneau-config</c> library contains a powerful API for creating and using INI-style config files.
 </p>
 <h5 class='figure'>Example configuration file:</h5>
 <p class='bpcode w800'>
@@ -38,7 +38,7 @@
 <p>
 	Config files are accessed through the {@link oaj.config.Config} class which
 	are created through the {@link oaj.config.ConfigBuilder} class.
-	Builder creator methods are provided on the <code>Config</code> class:
+	Builder creator methods are provided on the <c>Config</c> class:
 </p>
 <p class='bpcode w800'>
 	<jc>// Create a Config object</jc>
diff --git a/juneau-doc/docs/Topics/06.juneau-config/02.EntryTypes/03.Arrays.html b/juneau-doc/docs/Topics/06.juneau-config/02.EntryTypes/03.Arrays.html
index 0cda0b7..c8c9e7a 100644
--- a/juneau-doc/docs/Topics/06.juneau-config/02.EntryTypes/03.Arrays.html
+++ b/juneau-doc/docs/Topics/06.juneau-config/02.EntryTypes/03.Arrays.html
@@ -28,7 +28,7 @@
 	</ul>
 </ul>
 <p>
-	The <code>getStringArray()</code> methods allow you to retrieve comma-delimited lists of values:
+	The <c>getStringArray()</c> methods allow you to retrieve comma-delimited lists of values:
 <p class='bpcode w800'>
 	<ck>key1</ck> = <cv>foo, bar, baz</cv>
 </p>
@@ -36,7 +36,7 @@
 	String[] key1 = c.getStringArray(<js>"key1"</js>);
 </p>
 <p>
-	String arrays can also be represented in JSON when using the <code>getObject()</code> methods:
+	String arrays can also be represented in JSON when using the <c>getObject()</c> methods:
 </p>
 <p class='bpcode w800'>
 	<ck>key1</ck> = <cv>['foo','bar','baz']</cv>
@@ -45,7 +45,7 @@
 	String[] key1 = c.getObject(<js>"key1"</js>, String[].<jk>class</jk>);
 </p>
 <p>
-	Primitive arrays can also be retrieved using the <code>getObject()</code> methods:
+	Primitive arrays can also be retrieved using the <c>getObject()</c> methods:
 </p>
 <p class='bpcode w800'>
 	<ck>key1</ck> = <cv>[1,2,3]</cv>
@@ -54,7 +54,7 @@
 	<jk>int</jk>[] key1 = c.getObject(<js>"key1"</js>, <jk>int</jk>[].<jk>class</jk>);
 </p>
 <p>
-	Arrays of POJOs can also be retrieved using the <code>getObject()</code> methods:
+	Arrays of POJOs can also be retrieved using the <c>getObject()</c> methods:
 </p>
 <p class='bpcode w800'>
 	<ck>addresses</ck> = 
diff --git a/juneau-doc/docs/Topics/06.juneau-config/02.EntryTypes/04.Collections.html b/juneau-doc/docs/Topics/06.juneau-config/02.EntryTypes/04.Collections.html
index fe4dd05..12bbcb3 100644
--- a/juneau-doc/docs/Topics/06.juneau-config/02.EntryTypes/04.Collections.html
+++ b/juneau-doc/docs/Topics/06.juneau-config/02.EntryTypes/04.Collections.html
@@ -28,29 +28,29 @@
 	</ul>
 </ul>
 <p>
-	The <code>Type,Type...</code> arguments allow you to specify the component types for maps and collections.
-	<code>List</code> class arguments can be followed by zero or one arguments representing the entry types.
-	<code>Map</code> class arguments can be followed by zero or two arguments representing the key and value types.
+	The <c>Type,Type...</c> arguments allow you to specify the component types for maps and collections.
+	<c>List</c> class arguments can be followed by zero or one arguments representing the entry types.
+	<c>Map</c> class arguments can be followed by zero or two arguments representing the key and value types.
 	The arguments can be chained to produce any data structure consisting of maps, collections, or POJOs.
 </p>
 <p>
 	Examples are shown below:
 </p>
 <ul class='spaced-list'>
-	<li><code>getObject(<js>"..."</js>, List.<jk>class</jk>)</code>
-		<br>Produces: <code>List&lt;?&gt;</code>
-	<li><code>getObject(<js>"..."</js>, LinkedList.<jk>class</jk>)</code>
-		<br>Produces: <code>LinkedList&lt;?&gt;</code>
-	<li><code>getObject(<js>"..."</js>, HashSet.<jk>class</jk>, Integer.<jk>class</jk>)</code>
-		<br>Produces: <code>HashSet&lt;Integer&gt;</code>
-	<li><code>getObject(<js>"..."</js>, Map.<jk>class</jk>)</code>
-		<br>Produces: <code>Map&lt;?,?&gt;</code>
-	<li><code>getObject(<js>"..."</js>, HashMap.<jk>class</jk>)</code>
-		<br>Produces: <code>HashMap&lt;?,?&gt;</code>
-	<li><code>getObject(<js>"..."</js>, LinkedHashMap.<jk>class</jk>, String.<jk>class</jk>, MyBean.<jk>class</jk>)</code>
-		<br>Produces: <code>LinkedHashMap&lt;String,MyBean&gt;</code> 
-	<li><code>getObject(<js>"..."</js>, HashMap.<jk>class</jk>, Integer.<jk>class</jk>, ArrayList.<jk>class</jk>, MyBean[].<jk>class</jk>)</code>
-		<br>Produces: <code>LinkedHashMap&lt;Integer,ArrayList&lt;MyBean[]&gt;&gt;</code> 
+	<li><c>getObject(<js>"..."</js>, List.<jk>class</jk>)</c>
+		<br>Produces: <c>List&lt;?&gt;</c>
+	<li><c>getObject(<js>"..."</js>, LinkedList.<jk>class</jk>)</c>
+		<br>Produces: <c>LinkedList&lt;?&gt;</c>
+	<li><c>getObject(<js>"..."</js>, HashSet.<jk>class</jk>, Integer.<jk>class</jk>)</c>
+		<br>Produces: <c>HashSet&lt;Integer&gt;</c>
+	<li><c>getObject(<js>"..."</js>, Map.<jk>class</jk>)</c>
+		<br>Produces: <c>Map&lt;?,?&gt;</c>
+	<li><c>getObject(<js>"..."</js>, HashMap.<jk>class</jk>)</c>
+		<br>Produces: <c>HashMap&lt;?,?&gt;</c>
+	<li><c>getObject(<js>"..."</js>, LinkedHashMap.<jk>class</jk>, String.<jk>class</jk>, MyBean.<jk>class</jk>)</c>
+		<br>Produces: <c>LinkedHashMap&lt;String,MyBean&gt;</c> 
+	<li><c>getObject(<js>"..."</js>, HashMap.<jk>class</jk>, Integer.<jk>class</jk>, ArrayList.<jk>class</jk>, MyBean[].<jk>class</jk>)</c>
+		<br>Produces: <c>LinkedHashMap&lt;Integer,ArrayList&lt;MyBean[]&gt;&gt;</c> 
 </ul>
 <h5 class='figure'>Example:</h5>
 <p class='bpcode w800'>
diff --git a/juneau-doc/docs/Topics/06.juneau-config/02.EntryTypes/05.BinaryData.html b/juneau-doc/docs/Topics/06.juneau-config/02.EntryTypes/05.BinaryData.html
index 258bd0f..8d72842 100644
--- a/juneau-doc/docs/Topics/06.juneau-config/02.EntryTypes/05.BinaryData.html
+++ b/juneau-doc/docs/Topics/06.juneau-config/02.EntryTypes/05.BinaryData.html
@@ -30,11 +30,11 @@
 </p>
 <ul class='spaced-list'>
 	<li>BASE-64 (default)
-		<br>Example: <code><js>"Zm9vYmFycw=="</js></code>
+		<br>Example: <c><js>"Zm9vYmFycw=="</js></c>
 	<li>Hexadecimal
-		<br>Example: <code><js>"666F6F62617273"</js></code>
+		<br>Example: <c><js>"666F6F62617273"</js></c>
 	<li>Spaced hexadecimal
-		<br>Example: <code><js>"66 6F 6F 62 61 72 73"</js></code>
+		<br>Example: <c><js>"66 6F 6F 62 61 72 73"</js></c>
 </ul>
 <p>
 	The binary data format is controlled via the following setting:
diff --git a/juneau-doc/docs/Topics/06.juneau-config/03.Variables.html b/juneau-doc/docs/Topics/06.juneau-config/03.Variables.html
index fedc6a8..6a22aeb 100644
--- a/juneau-doc/docs/Topics/06.juneau-config/03.Variables.html
+++ b/juneau-doc/docs/Topics/06.juneau-config/03.Variables.html
@@ -49,13 +49,13 @@
 	ABean bean = cf.getObject(<js>"MySection/aBean"</js>, ABean.<jk>class</jk>); 
 </p>
 <p>
-	By default, <code>Configs</code> use the {@link oaj.svl.VarResolver#DEFAULT} variable resolver
+	By default, <c>Configs</c> use the {@link oaj.svl.VarResolver#DEFAULT} variable resolver
 	which provides support for the following variables and constructs:
 </p>
 <ul class='doctree'>
-	<li class='jc'>{@link oaj.svl.vars.SystemPropertiesVar} - <code>$S{key[,default]}</code>
-		<li class='jc'>{@link oaj.svl.vars.EnvVariablesVar} - <code>$E{key[,default]}</code>
-		<li class='jc'>{@link oaj.config.vars.ConfigVar} - <code>$C{key[,default]}</code>
+	<li class='jc'>{@link oaj.svl.vars.SystemPropertiesVar} - <c>$S{key[,default]}</c>
+		<li class='jc'>{@link oaj.svl.vars.EnvVariablesVar} - <c>$E{key[,default]}</c>
+		<li class='jc'>{@link oaj.config.vars.ConfigVar} - <c>$C{key[,default]}</c>
 </ul>
 <p>
 	The variable resolver is controlled via the following setting:
@@ -64,7 +64,7 @@
 	<li class='jf'>{@link oaj.config.Config#CONFIG_varResolver}
 </ul>
 <p>
-	Additionally, the following method can be used to retrieve a <code>Config</code> with a different variable resolver:
+	Additionally, the following method can be used to retrieve a <c>Config</c> with a different variable resolver:
 </p>
 <ul class='doctree'>
 	<li class='jm'>{@link oaj.config.Config#resolving(VarResolverSession)}
diff --git a/juneau-doc/docs/Topics/06.juneau-config/03.Variables/01.LogicVariables.html b/juneau-doc/docs/Topics/06.juneau-config/03.Variables/01.LogicVariables.html
index e5e7f65..96b2665 100644
--- a/juneau-doc/docs/Topics/06.juneau-config/03.Variables/01.LogicVariables.html
+++ b/juneau-doc/docs/Topics/06.juneau-config/03.Variables/01.LogicVariables.html
@@ -19,16 +19,16 @@
 	The default variable resolver also provides the following logic variables for performing simple logical operations:
 </p>
 <ul class='doctree'>
-		<li class='jc'>{@link oaj.svl.vars.IfVar} - <code>$IF{arg,then[,else]}</code>
-		<li class='jc'>{@link oaj.svl.vars.SwitchVar} - <code>$SW{arg,pattern1:then1[,pattern2:then2...]}</code>
-		<li class='jc'>{@link oaj.svl.vars.CoalesceVar} - <code>$CO{arg1[,arg2...]}</code>
-		<li class='jc'>{@link oaj.svl.vars.PatternMatchVar} - <code>$PM{arg,pattern}</code> 
-		<li class='jc'>{@link oaj.svl.vars.NotEmptyVar} - <code>$NE{arg}</code>
-		<li class='jc'>{@link oaj.svl.vars.UpperCaseVar} - <code>$UC{arg}</code>
-		<li class='jc'>{@link oaj.svl.vars.LowerCaseVar} - <code>$LC{arg}</code>
+		<li class='jc'>{@link oaj.svl.vars.IfVar} - <c>$IF{arg,then[,else]}</c>
+		<li class='jc'>{@link oaj.svl.vars.SwitchVar} - <c>$SW{arg,pattern1:then1[,pattern2:then2...]}</c>
+		<li class='jc'>{@link oaj.svl.vars.CoalesceVar} - <c>$CO{arg1[,arg2...]}</c>
+		<li class='jc'>{@link oaj.svl.vars.PatternMatchVar} - <c>$PM{arg,pattern}</c> 
+		<li class='jc'>{@link oaj.svl.vars.NotEmptyVar} - <c>$NE{arg}</c>
+		<li class='jc'>{@link oaj.svl.vars.UpperCaseVar} - <c>$UC{arg}</c>
+		<li class='jc'>{@link oaj.svl.vars.LowerCaseVar} - <c>$LC{arg}</c>
 </ul>
 <p>
-	The <code>$IF</code> variable can be used for simple if/else logic:
+	The <c>$IF</c> variable can be used for simple if/else logic:
 </p>
 <p class='bpcode w800'>
 	<cc># Value set to 'foo' if myBooleanProperty is true</cc>
@@ -55,7 +55,7 @@
 		}</cv>		
 </p>
 <p>
-	The <code>$SW</code> variable can be used for switch blocks based on pattern matching:
+	The <c>$SW</c> variable can be used for switch blocks based on pattern matching:
 </p>
 <p class='bpcode w800'>
 	<cc># Shell command depends on the OS</cc>
@@ -68,7 +68,7 @@
 		}</cv>		
 </p>
 <p>
-	The <code>$CO</code> variable can be used for coalescing of values (finding the first non-null/empty match):
+	The <c>$CO</c> variable can be used for coalescing of values (finding the first non-null/empty match):
 </p>
 <p class='bpcode w800'>
 	<cc># Debug flag can be enabled by system property or environment variable.</cc>
@@ -80,7 +80,7 @@
 		}</cv>		
 </p>
 <p>
-	The <code>$PM</code> variable can be used for calculating boolean values:
+	The <c>$PM</c> variable can be used for calculating boolean values:
 </p>
 <p class='bpcode w800'>
 	<cc># Debug flag can be enabled by system property or environment variable.</cc>
diff --git a/juneau-doc/docs/Topics/06.juneau-config/08.SettingValues.html b/juneau-doc/docs/Topics/06.juneau-config/08.SettingValues.html
index 1082e8c..7e795a9 100644
--- a/juneau-doc/docs/Topics/06.juneau-config/08.SettingValues.html
+++ b/juneau-doc/docs/Topics/06.juneau-config/08.SettingValues.html
@@ -70,7 +70,7 @@
 	To remove pre-lines, you should pass in an empty list.
 </p>	
 <p>
-	Sections can be added with optional pre-lines using the <code>setSection</code> methods:
+	Sections can be added with optional pre-lines using the <c>setSection</c> methods:
 </p>
 <p class='bpcode w800'>
 	<jc>// Set an encoded value with some comments.</jc>
diff --git a/juneau-doc/docs/Topics/06.juneau-config/08.SettingValues/01.FileSystemChanges.html b/juneau-doc/docs/Topics/06.juneau-config/08.SettingValues/01.FileSystemChanges.html
index b04e6f9..4a1b7f5 100644
--- a/juneau-doc/docs/Topics/06.juneau-config/08.SettingValues/01.FileSystemChanges.html
+++ b/juneau-doc/docs/Topics/06.juneau-config/08.SettingValues/01.FileSystemChanges.html
@@ -16,19 +16,19 @@
 File System Changes
 
 <p>
-	In general, external file modifications will be detected immediately in the <code>Config</code>
+	In general, external file modifications will be detected immediately in the <c>Config</c>
 	object when a watcher thread is enabled (explained later).
 	Otherwise, they are detected when a commit is performed.
 </p>
 <p>
-	The <code>Config</code> object maintains an in-memory record of all changes that have been applied to it
+	The <c>Config</c> object maintains an in-memory record of all changes that have been applied to it
 	through getters and setters.
 	When the underlying file changes, the new contents are loaded and the in-memory changes are then 
 	applied to the new configuration.
 	This provides the benefits of real-time updates of configurations while not losing any changes made in the JVM.
 </p>
 <p>
-	If the <code>commit()</code> method is called on the <code>Config</code> objects after the file system
+	If the <c>commit()</c> method is called on the <c>Config</c> objects after the file system
 	contents have been modified, we will then reload the configuration from the file system, apply the
 	changes, and then try to save to the file system again (up to 10 times).
 </p>
diff --git a/juneau-doc/docs/Topics/06.juneau-config/08.SettingValues/02.CustomEntrySerialization.html b/juneau-doc/docs/Topics/06.juneau-config/08.SettingValues/02.CustomEntrySerialization.html
index 479f204..2a71889 100644
--- a/juneau-doc/docs/Topics/06.juneau-config/08.SettingValues/02.CustomEntrySerialization.html
+++ b/juneau-doc/docs/Topics/06.juneau-config/08.SettingValues/02.CustomEntrySerialization.html
@@ -16,7 +16,7 @@
 Custom Entry Serialization
 
 <p>
-	Setter methods that take in a <code>Serializer</code> can be used to provide custom serialization of entries
+	Setter methods that take in a <c>Serializer</c> can be used to provide custom serialization of entries
 	instead of using the predefined serializer.
 </p>
 <p class='bpcode w800'>
diff --git a/juneau-doc/docs/Topics/06.juneau-config/10.Serializing.html b/juneau-doc/docs/Topics/06.juneau-config/10.Serializing.html
index 2bf88fd..62b3a52 100644
--- a/juneau-doc/docs/Topics/06.juneau-config/10.Serializing.html
+++ b/juneau-doc/docs/Topics/06.juneau-config/10.Serializing.html
@@ -16,7 +16,7 @@
 Serializing
 
 <p>
-	The following methods are used for serializing <code>Config</code> objects back into INI files:
+	The following methods are used for serializing <c>Config</c> objects back into INI files:
 </p>
 <ul class='doctree'>
 	<li class='jc'>{@link oaj.config.Config}
@@ -29,6 +29,6 @@
 	Both methods are thread safe.
 </p>
 <p>
-	The <code>Config</code> class implements the {@link oaj.Writable} which means it can be 
+	The <c>Config</c> class implements the {@link oaj.Writable} which means it can be 
 	returned as-is by REST methods to be serialized as INI text.
 </p>
diff --git a/juneau-doc/docs/Topics/06.juneau-config/12.ConfigStores.html b/juneau-doc/docs/Topics/06.juneau-config/12.ConfigStores.html
index a3b0579..086580b 100644
--- a/juneau-doc/docs/Topics/06.juneau-config/12.ConfigStores.html
+++ b/juneau-doc/docs/Topics/06.juneau-config/12.ConfigStores.html
@@ -68,7 +68,7 @@
 	<li class='jc'>{@link oaj.config.store.ConfigMemoryStore} - In-memory storage.
 </ul>
 <p>
-	The store is defined on the <code>Config</code> object via the following setting:
+	The store is defined on the <c>Config</c> object via the following setting:
 </p>
 <ul>
 	<li class='jf'>{@link oaj.config.Config#CONFIG_store}
diff --git a/juneau-doc/docs/Topics/06.juneau-config/12.ConfigStores/03.CustomConfigStores.html b/juneau-doc/docs/Topics/06.juneau-config/12.ConfigStores/03.CustomConfigStores.html
index 18c1c94..2f4cbd7 100644
--- a/juneau-doc/docs/Topics/06.juneau-config/12.ConfigStores/03.CustomConfigStores.html
+++ b/juneau-doc/docs/Topics/06.juneau-config/12.ConfigStores/03.CustomConfigStores.html
@@ -16,7 +16,7 @@
 Custom ConfigStores
 
 <p>
-	The <code>ConfigStore</code> API has been written to allow easy development of custom configuration storage classes.
+	The <c>ConfigStore</c> API has been written to allow easy development of custom configuration storage classes.
 </p>
 <p>
 	The example below shows a starting point for an implementation based on polling a relational database.
@@ -128,7 +128,7 @@
 </p>
 <p>
 	The purpose of the builder class is to simply set values in the {@link oaj.PropertyStore}
-	that's passed to the <code>ConfigStore</code>:
+	that's passed to the <c>ConfigStore</c>:
 </p>
 <h5 class='figure'>Example Builder Class:</h5>
 <p class='bpcode w800'>
diff --git a/juneau-doc/docs/Topics/06.juneau-config/12.ConfigStores/04.ConfigStoreListeners.html b/juneau-doc/docs/Topics/06.juneau-config/12.ConfigStores/04.ConfigStoreListeners.html
index 13a2a00..6070bbe 100644
--- a/juneau-doc/docs/Topics/06.juneau-config/12.ConfigStores/04.ConfigStoreListeners.html
+++ b/juneau-doc/docs/Topics/06.juneau-config/12.ConfigStores/04.ConfigStoreListeners.html
@@ -16,7 +16,7 @@
 ConfigStore Listeners
 
 <p>
-	The <code>ConfigStore</code> class has the following listener methods:
+	The <c>ConfigStore</c> class has the following listener methods:
 </p>
 <ul class='doctree'>
 	<li class='jac'>{@link oaj.config.store.ConfigStore}
@@ -36,6 +36,6 @@
 	</ul>
 </ul>
 <p>
-	This listener is used by the <code>Config</code> class to listen for changes on the file system so that it can be
+	This listener is used by the <c>Config</c> class to listen for changes on the file system so that it can be
 	updated in real-time.
 </p>
diff --git a/juneau-doc/docs/Topics/06.juneau-config/13.ReadOnlyConfigs.html b/juneau-doc/docs/Topics/06.juneau-config/13.ReadOnlyConfigs.html
index 0f24ea7..c86c49a 100644
--- a/juneau-doc/docs/Topics/06.juneau-config/13.ReadOnlyConfigs.html
+++ b/juneau-doc/docs/Topics/06.juneau-config/13.ReadOnlyConfigs.html
@@ -16,7 +16,7 @@
 Read-only Configs
 
 <p>
-	The following settings can be used to create read-only <code>Config</code> objects:
+	The following settings can be used to create read-only <c>Config</c> objects:
 </p>
 <ul class='doctree'>
 	<li class='jf'>{@link oaj.config.Config#CONFIG_readOnly}
diff --git a/juneau-doc/docs/Topics/06.juneau-config/15.SystemDefaultConfig.html b/juneau-doc/docs/Topics/06.juneau-config/15.SystemDefaultConfig.html
index 43efe00..698cec0 100644
--- a/juneau-doc/docs/Topics/06.juneau-config/15.SystemDefaultConfig.html
+++ b/juneau-doc/docs/Topics/06.juneau-config/15.SystemDefaultConfig.html
@@ -37,25 +37,25 @@
 	<li>
 		In the home directory:
 		<ol>
-			<li><code>&lt;jar-name&gt;.cfg</code>
-			<li>Any file that end with <code>.cfg</code>.  First one matched alphabetically is used.
+			<li><c>&lt;jar-name&gt;.cfg</c>
+			<li>Any file that end with <c>.cfg</c>.  First one matched alphabetically is used.
 		</ol>
 	<li>
 		In the context classpath root package (i.e. inside the jar itself):
 		<ol>
-			<li><code>&lt;jar-name&gt;.cfg</code>
-			<li><code>juneau.cfg</code>
-			<li><code>default.cfg</code>
-			<li><code>application.cfg</code>
-			<li><code>app.cfg</code>
-			<li><code>settings.cfg</code>
-			<li><code>application.properties</code>
+			<li><c>&lt;jar-name&gt;.cfg</c>
+			<li><c>juneau.cfg</c>
+			<li><c>default.cfg</c>
+			<li><c>application.cfg</c>
+			<li><c>app.cfg</c>
+			<li><c>settings.cfg</c>
+			<li><c>application.properties</c>
 		</ol>
 </ol>
 <p>
 	Later in the section on REST resources, we describe how to associate configurations with REST resources
 	using the {@link oajr.annotation.RestResource#config() @RestResource(config)} annotation.
-	The system default configuration can be referenced with the keyword <code>SYSTEM_DEFAULT</code> like so:
+	The system default configuration can be referenced with the keyword <c>SYSTEM_DEFAULT</c> like so:
 </p>
 <p class='bpcode w800'>
 	<jc>// Always use system default.</jc>
diff --git a/juneau-doc/docs/Topics/07.juneau-rest-server/02.ClassHierarchy.html b/juneau-doc/docs/Topics/07.juneau-rest-server/02.ClassHierarchy.html
index 62acfa9..be29488 100644
--- a/juneau-doc/docs/Topics/07.juneau-rest-server/02.ClassHierarchy.html
+++ b/juneau-doc/docs/Topics/07.juneau-rest-server/02.ClassHierarchy.html
@@ -44,7 +44,7 @@
 </p>
 <p>
 	For child resources, you can either extend from one of the classes above, or extend from one of the following
-	that provides identical support but does not extent from <code>HttpServlet</code>:
+	that provides identical support but does not extent from <c>HttpServlet</c>:
 </p>
 <ul class='doctree'>
 	<li class='jic'>
diff --git a/juneau-doc/docs/Topics/07.juneau-rest-server/03.Instantiation.html b/juneau-doc/docs/Topics/07.juneau-rest-server/03.Instantiation.html
index 7b1617f..576bcbc 100644
--- a/juneau-doc/docs/Topics/07.juneau-rest-server/03.Instantiation.html
+++ b/juneau-doc/docs/Topics/07.juneau-rest-server/03.Instantiation.html
@@ -31,8 +31,8 @@
 	The only requirement is that the class be annotated with <ja>@RestResource</ja> and have one of the following constructors:
 </p>
 <ul>
-	<li class='jm'><code><jk>public</jk> T()</code>
-	<li class='jm'><code><jk>public</jk> T(RestContextBuilder)</code>
+	<li class='jm'><c><jk>public</jk> T()</c>
+	<li class='jm'><c><jk>public</jk> T(RestContextBuilder)</c>
 </ul>
 <p>
 	And even that requirement is relaxed if you implement your own REST resource resolver (described later).
diff --git a/juneau-doc/docs/Topics/07.juneau-rest-server/03.Instantiation/01.RestServlet.html b/juneau-doc/docs/Topics/07.juneau-rest-server/03.Instantiation/01.RestServlet.html
index 67f44a7..697e2e0 100644
--- a/juneau-doc/docs/Topics/07.juneau-rest-server/03.Instantiation/01.RestServlet.html
+++ b/juneau-doc/docs/Topics/07.juneau-rest-server/03.Instantiation/01.RestServlet.html
@@ -33,7 +33,7 @@
 	However, the class does provide a couple of convenience methods to be aware of:
 </p>
 <ul class='doctree'>
-	<li class='jac'><code>{@link oajr.RestServlet} <jk>extends</jk> HttpServlet</code>
+	<li class='jac'><c>{@link oajr.RestServlet} <jk>extends</jk> HttpServlet</c>
 	<ul>
 		<li class='jm'>{@link oajr.RestServlet#init(ServletConfig) init(ServletConfig)} - Can override to provide custom initialization.
 		<li class='jm'>{@link oajr.RestServlet#service(HttpServletRequest,HttpServletResponse) service(HttpServletRequest,HttpServletResponse)} - Can override to provide custom request handling.
diff --git a/juneau-doc/docs/Topics/07.juneau-rest-server/03.Instantiation/03.BasicRest.html b/juneau-doc/docs/Topics/07.juneau-rest-server/03.Instantiation/03.BasicRest.html
index 81df566..2e2a476 100644
--- a/juneau-doc/docs/Topics/07.juneau-rest-server/03.Instantiation/03.BasicRest.html
+++ b/juneau-doc/docs/Topics/07.juneau-rest-server/03.Instantiation/03.BasicRest.html
@@ -17,7 +17,7 @@
 
 <p>
 	The {@link oajr.BasicRest} class is identical to the {@link oajr.BasicRestServlet} class except that
-	it does not extend from <code>HttpServlet</code>.
+	it does not extend from <c>HttpServlet</c>.
 	It defines the exact same set of serializers, parsers, etc., but it cannot be deployed as a top-level
 	servlet.  It can however be used for child resources registered via the {@link oajr.annotation.RestResource#children() @RestResource(children)} 
 	annotation. 
diff --git a/juneau-doc/docs/Topics/07.juneau-rest-server/03.Instantiation/06.BasicRestGroup.html b/juneau-doc/docs/Topics/07.juneau-rest-server/03.Instantiation/06.BasicRestGroup.html
index b119b98..976698e 100644
--- a/juneau-doc/docs/Topics/07.juneau-rest-server/03.Instantiation/06.BasicRestGroup.html
+++ b/juneau-doc/docs/Topics/07.juneau-rest-server/03.Instantiation/06.BasicRestGroup.html
@@ -17,7 +17,7 @@
 
 <p>
 	The {@link oajr.BasicRestGroup} class is identical to the {@link oajr.BasicRestServletGroup} class except that
-	it does not extend from <code>HttpServlet</code>.
+	it does not extend from <c>HttpServlet</c>.
 	It defines the exact same set of serializers, parsers, etc., but it cannot be deployed as a top-level
 	servlet.  It can however be used for child resources registered via the {@link oajr.annotation.RestResource#children() @RestResource(children)} 
 	annotation. 
diff --git a/juneau-doc/docs/Topics/07.juneau-rest-server/03.Instantiation/07.ResourceResolvers.html b/juneau-doc/docs/Topics/07.juneau-rest-server/03.Instantiation/07.ResourceResolvers.html
index 0f7286e..87460e3 100644
--- a/juneau-doc/docs/Topics/07.juneau-rest-server/03.Instantiation/07.ResourceResolvers.html
+++ b/juneau-doc/docs/Topics/07.juneau-rest-server/03.Instantiation/07.ResourceResolvers.html
@@ -20,8 +20,8 @@
 	to any class as long as it has one of the following constructors:
 </p>
 <ul>
-	<li class='jm'><code><jk>public</jk> T()</code>
-	<li class='jm'><code><jk>public</jk> T(RestContextBuilder)</code>
+	<li class='jm'><c><jk>public</jk> T()</c>
+	<li class='jm'><c><jk>public</jk> T(RestContextBuilder)</c>
 </ul>
 <p>
 	The latter constructor can be used to get access to the {@link oajr.RestContextBuilder} object to make
diff --git a/juneau-doc/docs/Topics/07.juneau-rest-server/06.RestMethod.html b/juneau-doc/docs/Topics/07.juneau-rest-server/06.RestMethod.html
index 7581f3f..449e7c7 100644
--- a/juneau-doc/docs/Topics/07.juneau-rest-server/06.RestMethod.html
+++ b/juneau-doc/docs/Topics/07.juneau-rest-server/06.RestMethod.html
@@ -29,24 +29,24 @@
 </p>
 
 <p>
-	When the <code>name</code> and/or <code>path</code> values are not specified, their values are inferred
+	When the <c>name</c> and/or <c>path</c> values are not specified, their values are inferred
 	from the Java method name. 
 </p>
 <p>
 	The HTTP method can be inferred from the Java method by starting the method name with any of the following:
 </p>
 <ul>
-	<li><code>get</code>
-	<li><code>put</code>
-	<li><code>post</code>
-	<li><code>delete</code>
-	<li><code>options</code>
-	<li><code>head</code>
-	<li><code>trace</code>
-	<li><code>patch</code>
+	<li><c>get</c>
+	<li><c>put</c>
+	<li><c>post</c>
+	<li><c>delete</c>
+	<li><c>options</c>
+	<li><c>head</c>
+	<li><c>trace</c>
+	<li><c>patch</c>
 </ul>
 <p>
-	If <code>path</code> is not defined, it's inferred from the Java method name (minus the prefix above).
+	If <c>path</c> is not defined, it's inferred from the Java method name (minus the prefix above).
 </p>
 
 <h5 class='figure'>Examples:</h5>
@@ -83,5 +83,5 @@
 </p>
 
 <p>
-	If <code>name</code> and <code>path</code> are both specified, the Java method name can be anything.
+	If <c>name</c> and <c>path</c> are both specified, the Java method name can be anything.
 </p>
diff --git a/juneau-doc/docs/Topics/07.juneau-rest-server/06.RestMethod/01.MethodParameters.html b/juneau-doc/docs/Topics/07.juneau-rest-server/06.RestMethod/01.MethodParameters.html
index e84e35f..efe7004 100644
--- a/juneau-doc/docs/Topics/07.juneau-rest-server/06.RestMethod/01.MethodParameters.html
+++ b/juneau-doc/docs/Topics/07.juneau-rest-server/06.RestMethod/01.MethodParameters.html
@@ -25,9 +25,9 @@
 			<li><b>Request/response objects:</b>
 				<ul>
 					<li class='jc'>{@link oajr.RestRequest} - The request object.
-					<li class='jc'>{@link javax.servlet.http.HttpServletRequest} - The superclass of <code>RestRequest</code>.
+					<li class='jc'>{@link javax.servlet.http.HttpServletRequest} - The superclass of <c>RestRequest</c>.
 					<li class='jc'>{@link oajr.RestResponse} - The response object.
-					<li class='jc'>{@link javax.servlet.http.HttpServletResponse} - The superclass of <code>RestResponse</code>.
+					<li class='jc'>{@link javax.servlet.http.HttpServletResponse} - The superclass of <c>RestResponse</c>.
 				</ul>
 			<li><b>Parsed request header values:</b>
 				<ul>
@@ -86,7 +86,7 @@
 				</ul>
 			<li><b>Other:</b>
 				<ul>
-					<li class='jc'>{@link oaj.http.HttpMethod} - The method name matched (when using <code><ja>@RestMethod</ja>(name=<js>"*"</js>)</code>)
+					<li class='jc'>{@link oaj.http.HttpMethod} - The method name matched (when using <c><ja>@RestMethod</ja>(name=<js>"*"</js>)</c>)
 					<li class='jc'>{@link oajr.RestLogger} - Logger with additional features.
 					<li class='jc'>{@link oajr.RestContext} - The resource read-only context.
 					<li class='jc'>{@link oaj.parser.Parser} - The parser matching the request content type.
diff --git a/juneau-doc/docs/Topics/07.juneau-rest-server/06.RestMethod/02.RestRequest.html b/juneau-doc/docs/Topics/07.juneau-rest-server/06.RestMethod/02.RestRequest.html
index 0db17c3..caceab1 100644
--- a/juneau-doc/docs/Topics/07.juneau-rest-server/06.RestMethod/02.RestRequest.html
+++ b/juneau-doc/docs/Topics/07.juneau-rest-server/06.RestMethod/02.RestRequest.html
@@ -28,7 +28,7 @@
 	There are many useful methods on this object, but the main ones are shown below:
 </p>
 <ul class='doctree'>
-	<li class='jc'><code>{@link oajr.RestRequest} <jk>extends</jk> HttpServletRequest</code>
+	<li class='jc'><c>{@link oajr.RestRequest} <jk>extends</jk> HttpServletRequest</c>
 	<ul>
 		<li class='jm'>{@link oajr.RestRequest#getHeaders() getHeaders()} - HTTP request headers.
 		<li class='jm'>{@link oajr.RestRequest#getQuery() getQuery()} - Query parameters.
diff --git a/juneau-doc/docs/Topics/07.juneau-rest-server/06.RestMethod/03.RestResponse.html b/juneau-doc/docs/Topics/07.juneau-rest-server/06.RestMethod/03.RestResponse.html
index 7727209..93d978e 100644
--- a/juneau-doc/docs/Topics/07.juneau-rest-server/06.RestMethod/03.RestResponse.html
+++ b/juneau-doc/docs/Topics/07.juneau-rest-server/06.RestMethod/03.RestResponse.html
@@ -28,7 +28,7 @@
 	Some important methods on this class are:
 </p>
 <ul class='doctree'>
-	<li class='jc'><code>{@link oajr.RestResponse} <jk>extends</jk> HttpServletResponse</code>
+	<li class='jc'><c>{@link oajr.RestResponse} <jk>extends</jk> HttpServletResponse</c>
 	<ul>
 		<li class='jm'>{@link oajr.RestResponse#setOutput(Object) setOutput(Object)} - Set response output programmatically.
 		<li class='jm'>{@link oajr.RestResponse#getHtmlDocBuilder() getHtmlDocBuilder()} - Set HTTP page contents programmatically.
diff --git a/juneau-doc/docs/Topics/07.juneau-rest-server/06.RestMethod/05.RequestHeaders.html b/juneau-doc/docs/Topics/07.juneau-rest-server/06.RestMethod/05.RequestHeaders.html
index 3f02302..353450e 100644
--- a/juneau-doc/docs/Topics/07.juneau-rest-server/06.RestMethod/05.RequestHeaders.html
+++ b/juneau-doc/docs/Topics/07.juneau-rest-server/06.RestMethod/05.RequestHeaders.html
@@ -42,7 +42,7 @@
 	Some important methods on this class are:
 </p>
 <ul class='doctree'>
-	<li class='jc'><code>{@link oajr.RequestHeaders} <jk>extends</jk> TreeMap&lt;String,String[]&gt;</code>
+	<li class='jc'><c>{@link oajr.RequestHeaders} <jk>extends</jk> TreeMap&lt;String,String[]&gt;</c>
 	<ul>
 		<li class='jm'>{@link oajr.RequestHeaders#get(String,Class) get(String,Class)} - Get header value converted to a POJO.
 		<li class='jm'>{@link oajr.RequestHeaders#get(String,Type,Type...) get(String,Type,Type)} - Get header value converted to a map or collection of POJOs.
diff --git a/juneau-doc/docs/Topics/07.juneau-rest-server/06.RestMethod/07.RequestQuery.html b/juneau-doc/docs/Topics/07.juneau-rest-server/06.RestMethod/07.RequestQuery.html
index 8bb0cb0..a7ddeb8 100644
--- a/juneau-doc/docs/Topics/07.juneau-rest-server/06.RestMethod/07.RequestQuery.html
+++ b/juneau-doc/docs/Topics/07.juneau-rest-server/06.RestMethod/07.RequestQuery.html
@@ -45,7 +45,7 @@
 	Some important methods on this class are:
 </p>
 <ul class='doctree'>
-	<li class='jc'><code>{@link oajr.RequestQuery} <jk>extends</jk> LinkedHashMap&lt;String,String[]&gt;</code>
+	<li class='jc'><c>{@link oajr.RequestQuery} <jk>extends</jk> LinkedHashMap&lt;String,String[]&gt;</c>
 	<ul>
 		<li class='jm'>{@link oajr.RequestQuery#get(String,Class) get(String,Class)} - Get query parameter value converted to a POJO.
 		<li class='jm'>{@link oajr.RequestQuery#get(String,Type,Type...) get(String,Type,Type)} - Get query parameter value converted to a map or collection of POJOs.
diff --git a/juneau-doc/docs/Topics/07.juneau-rest-server/06.RestMethod/08.RequestFormData.html b/juneau-doc/docs/Topics/07.juneau-rest-server/06.RestMethod/08.RequestFormData.html
index f81d413..c64083f 100644
--- a/juneau-doc/docs/Topics/07.juneau-rest-server/06.RestMethod/08.RequestFormData.html
+++ b/juneau-doc/docs/Topics/07.juneau-rest-server/06.RestMethod/08.RequestFormData.html
@@ -41,7 +41,7 @@
 	Some important methods on this class are:
 </p>
 <ul class='doctree'>
-	<li class='jc'><code>{@link oajr.RequestFormData} <jk>extends</jk> LinkedHashMap&lt;String,String[]&gt;</code>
+	<li class='jc'><c>{@link oajr.RequestFormData} <jk>extends</jk> LinkedHashMap&lt;String,String[]&gt;</c>
 	<ul>
 		<li class='jm'>{@link oajr.RequestFormData#get(String,Class) get(String,Class)} - Get form-data parameter values converted to a POJO.
 		<li class='jm'>{@link oajr.RequestFormData#get(String,Type,Type...) get(String,Type,Type)} - Get form-data parameter value converted to a map or collection of POJOs.
diff --git a/juneau-doc/docs/Topics/07.juneau-rest-server/06.RestMethod/09.RestMethodPath.html b/juneau-doc/docs/Topics/07.juneau-rest-server/06.RestMethod/09.RestMethodPath.html
index 578b98b..85afc7e 100644
--- a/juneau-doc/docs/Topics/07.juneau-rest-server/06.RestMethod/09.RestMethodPath.html
+++ b/juneau-doc/docs/Topics/07.juneau-rest-server/06.RestMethod/09.RestMethodPath.html
@@ -84,7 +84,7 @@
 	Paths that end with <js>"/*"</js> will do a prefix match on the incoming URL.  
 	Any remainder after the match can be accessed through 
 	{@link oajr.RequestPath#getRemainder()} or parameters with the 
-	<code><ja>@Path</ja>(<js>"/*"</js>)</code> annotation.
+	<c><ja>@Path</ja>(<js>"/*"</js>)</c> annotation.
 	On the other hand, paths that don't end with <js>"/*"</js> (e.g. <js>"/"</js> or <js>"/foo"</js>) will 
 	require an exact URL match, and if any remainder exists, a 404 (not found) error will be thrown.
 </p>
diff --git a/juneau-doc/docs/Topics/07.juneau-rest-server/06.RestMethod/10.RequestPathMatch.html b/juneau-doc/docs/Topics/07.juneau-rest-server/06.RestMethod/10.RequestPathMatch.html
index 55dddc6..bc62b74 100644
--- a/juneau-doc/docs/Topics/07.juneau-rest-server/06.RestMethod/10.RequestPathMatch.html
+++ b/juneau-doc/docs/Topics/07.juneau-rest-server/06.RestMethod/10.RequestPathMatch.html
@@ -39,7 +39,7 @@
 	Some important methods on this class are:
 </p>
 <ul class='doctree'>
-	<li class='jc'><code>{@link oajr.RequestPath} <jk>extends</jk> TreeMap&lt;String,String&gt;</code>
+	<li class='jc'><c>{@link oajr.RequestPath} <jk>extends</jk> TreeMap&lt;String,String&gt;</c>
 	<ul>
 		<li class='jm'>{@link oajr.RequestPath#get(String,Class) get(String,Class)} - Get path match variable converted to a POJO.
 		<li class='jm'>{@link oajr.RequestPath#get(String,Type,Type...) get(String,Type,Type)} - Get path match variable converted to a map or collection of POJOs.
diff --git a/juneau-doc/docs/Topics/07.juneau-rest-server/06.RestMethod/17.PredefinedHelperBeans.html b/juneau-doc/docs/Topics/07.juneau-rest-server/06.RestMethod/17.PredefinedHelperBeans.html
index aee1249..ea2d6b5 100644
--- a/juneau-doc/docs/Topics/07.juneau-rest-server/06.RestMethod/17.PredefinedHelperBeans.html
+++ b/juneau-doc/docs/Topics/07.juneau-rest-server/06.RestMethod/17.PredefinedHelperBeans.html
@@ -171,11 +171,11 @@
 	page using reflection against the resource class.
 </p>
 <p>
-	For example, the <code>RootResources</code> page in the REST examples renders the child resources attached to the root resource:
+	For example, the <c>RootResources</c> page in the REST examples renders the child resources attached to the root resource:
 </p>
 <img class='bordered' src='doc-files/juneau-rest-server.PredefinedLabelBeans.4.png' style='width:800px'/>
 <p>
-	The <code>RootResources</code> page consists of the following and extends from the {@link oajr.BasicRestServletGroup} class:
+	The <c>RootResources</c> page consists of the following and extends from the {@link oajr.BasicRestServletGroup} class:
 </p>
 <p class='bpcode w800'>
 	<ja>@RestResource</ja>(
diff --git a/juneau-doc/docs/Topics/07.juneau-rest-server/07.restRPC.html b/juneau-doc/docs/Topics/07.juneau-rest-server/07.restRPC.html
index 1be0a1a..66c6e45 100644
--- a/juneau-doc/docs/Topics/07.juneau-rest-server/07.restRPC.html
+++ b/juneau-doc/docs/Topics/07.juneau-rest-server/07.restRPC.html
@@ -57,7 +57,7 @@
 	<li>
 		Can return a {@doc PojoCategories serializable and parsable} value.
 	<li>
-		Can throw any <code>Throwables</code>.
+		Can throw any <c>Throwables</c>.
 </ul>
 <p>
 	Throwables with public no-arg or single-arg-string constructors are automatically recreated on the client side
@@ -77,9 +77,9 @@
 	</ul>
 </ul>
 <p>
-	Since we build upon the existing <code>RestClient</code> API, we inherit all of it's features.
+	Since we build upon the existing <c>RestClient</c> API, we inherit all of it's features.
 	For example, convenience methods for setting POJO filters and properties to customize the behavior of the 
-	serializers and parsers, and the ability to provide your own customized Apache <code>HttpClient</code> for 
+	serializers and parsers, and the ability to provide your own customized Apache <c>HttpClient</c> for 
 	handling various scenarios involving authentication and Internet proxies.
 </p>
 <p>
@@ -142,7 +142,7 @@
 	<li>
 		Extending from {@link oajr.remote.RrpcServlet}.
 	<li>
-		Using a <code><ja>@RestMethod</ja>(name=<jsf>RRPC</jsf>)</code> annotation on a Java method.
+		Using a <c><ja>@RestMethod</ja>(name=<jsf>RRPC</jsf>)</c> annotation on a Java method.
 </ol>
 <p>
 	In either case, the proxy communications layer is pure REST.
@@ -155,7 +155,7 @@
 <h5 class='topic'>RrpcServlet</h5>
 <p>
 	The {@link oajr.remote.RrpcServlet} class is a simple specialized servlet with an abstract 
-	<code>getServiceMap()</code> method to define the server-side POJOs:
+	<c>getServiceMap()</c> method to define the server-side POJOs:
 </p>
 <p class='bpcode w800'>
 	<ja>@RestResource</ja>(
@@ -182,7 +182,7 @@
 
 <h5 class='topic'>@RestMethod(name=RRPC)</h5>
 <p>
-	The <code><ja>@RestMethod</ja>(name=<jsf>RRPC</jsf>)</code> approach is easier if you only have a single 
+	The <c><ja>@RestMethod</ja>(name=<jsf>RRPC</jsf>)</c> approach is easier if you only have a single 
 	interface you want to expose.  
 	You simply define a Java method whose return type is an interface, and return the implementation of that 
 	interface:
@@ -205,8 +205,8 @@
 <img class='bordered w800' src='doc-files/juneau-rest-server.restRPC.1.png'>
 <p>
 	Clicking the hyperlinks on each shows you the list of methods that can be invoked on that service.
-	Note that the <code>IAddressBook</code> link shows that you can only invoke methods defined on that
-	interface, whereas the <code>AddressBook</code> link shows ALL public methods defined on that class.
+	Note that the <c>IAddressBook</c> link shows that you can only invoke methods defined on that
+	interface, whereas the <c>AddressBook</c> link shows ALL public methods defined on that class.
 </p>
 <h5 class='figure'>IAddressBook</h5>
 <p class='bpcode w800'>
@@ -214,7 +214,7 @@
 </p>
 <img class='bordered w800' src='doc-files/juneau-rest-server.restRPC.2.png'>
 <p>
-	Since <code>AddressBook</code> extends from <code>LinkedList</code>, you may notice familiar collections
+	Since <c>AddressBook</c> extends from <c>LinkedList</c>, you may notice familiar collections
 	framework methods listed.
 </p>
 <h5 class='figure'>AddressBook</h5>
@@ -271,14 +271,14 @@
 	http://localhost:10000/remote/org.apache.juneau.examples.addressbook.IAddressBook/createPerson(org.apache.juneau.examples.addressbook.CreatePerson)
 </p>
 <p>
-	Make sure that we specify the <code>Content-Type</code> of the body as <code>text/json</code>.
-	We also want the results to be returned as JSON, so we set the <code>Accept</code> header to 
-	<code>text/json</code> as well.
+	Make sure that we specify the <c>Content-Type</c> of the body as <c>text/json</c>.
+	We also want the results to be returned as JSON, so we set the <c>Accept</c> header to 
+	<c>text/json</c> as well.
 </p>
 <img class='bordered w400' src='doc-files/juneau-rest-server.restRPC.4.png'>
 <p>
 	When we execute the POST, we should see the following successful response whose body contains the returned 
-	<code>Person</code> bean serialized to JSON:
+	<c>Person</c> bean serialized to JSON:
 </p>
 <img class='bordered w400' src='doc-files/juneau-rest-server.restRPC.5.png'>
 <p>
@@ -302,15 +302,15 @@
 	<jk>public class</jk> SampleRrpcServlet <jk>extends</jk> RrpcServlet {
 </p>
 <p>
-	For example, to invoke the <code>getPeople()</code> method on our bean:
+	For example, to invoke the <c>getPeople()</c> method on our bean:
 </p>
 <p class='bpcode w800'>
 	http://localhost:10000/remote/org.apache.juneau.examples.addressbook.IAddressBook/getPeople?method=POST
 </p>			
 <img class='bordered w800' src='doc-files/juneau-rest-server.restRPC.6.png'>
 <p>
-	Here we call the <code>findPerson(<jk>int</jk>)</code> method to retrieve a person and get the 
-	returned POJO (in this case as HTML since that's what's in the <code>Accept</code> header when calling from a 
+	Here we call the <c>findPerson(<jk>int</jk>)</c> method to retrieve a person and get the 
+	returned POJO (in this case as HTML since that's what's in the <c>Accept</c> header when calling from a 
 	browser):
 </p>
 <p class='bpcode w800'>
@@ -318,10 +318,10 @@
 </p>			
 <img class='bordered w800' src='doc-files/juneau-rest-server.restRPC.7.png'>
 <p>
-	When specifying the POST body as a <code>&amp;body</code> parameter, the method arguments should be in UON 
+	When specifying the POST body as a <c>&amp;body</c> parameter, the method arguments should be in UON 
 	notation.
 	See {@link oaj.uon.UonSerializer} for more information about this encoding.
-	Usually you can also pass in JSON if you specify <code>&amp;Content-Type=text/json</code> in the URL parameters
+	Usually you can also pass in JSON if you specify <c>&amp;Content-Type=text/json</c> in the URL parameters
 	but passing in unencoded JSON in a URL may not work in all browsers.  
 	Therefore, UON is preferred.
 </p>
diff --git a/juneau-doc/docs/Topics/07.juneau-rest-server/08.OpenApiSchemaPartParsing.html b/juneau-doc/docs/Topics/07.juneau-rest-server/08.OpenApiSchemaPartParsing.html
index f0e550c..7334d79 100644
--- a/juneau-doc/docs/Topics/07.juneau-rest-server/08.OpenApiSchemaPartParsing.html
+++ b/juneau-doc/docs/Topics/07.juneau-rest-server/08.OpenApiSchemaPartParsing.html
@@ -24,10 +24,10 @@
 	<li class='ja'>{@link oaj.http.annotation.Query}
 	<li class='ja'>{@link oaj.http.annotation.FormData}
 	<li class='ja'>{@link oaj.http.annotation.Path}
-	<li class='ja'>{@link oaj.http.annotation.Body} (<code>Content-Type</code> must match <js>"text/openapi"</js>)
+	<li class='ja'>{@link oaj.http.annotation.Body} (<c>Content-Type</c> must match <js>"text/openapi"</js>)
 </ul>
 <p>
-	For example, the following shows how a pipe-delimited list of comma-delimited numbers (e.g. <js>"1,2,3|4,5,6|7,8,9"</js>) in a query parameter can be converted to a 2-dimensional array of <code>Longs</code>:
+	For example, the following shows how a pipe-delimited list of comma-delimited numbers (e.g. <js>"1,2,3|4,5,6|7,8,9"</js>) in a query parameter can be converted to a 2-dimensional array of <c>Longs</c>:
 </p>
 <p class='bpcode w800'>
 	<ja>@RestMethod</ja>(method=<js>"GET"</js>, path=<js>"/testQuery"</js>)	
@@ -52,7 +52,7 @@
 </p>
 <p>
 	Input will be converted based on the types and formats defined in the schema definition.
-	Input validations such as <code>minLength/maxLength</code> that don't match the input will result in automatic <code>400 Bad Request</code> responses.
+	Input validations such as <c>minLength/maxLength</c> that don't match the input will result in automatic <c>400 Bad Request</c> responses.
 </p>
 <p>
 	The following shows the same for a request body:
@@ -85,7 +85,7 @@
 </p>
 <p>
 	The list of valid POJO types for parameters depends on type and format of the value or items/entries of the value.
-	For example, instead of <code>Longs</code> in the example above, we could also define a 2-dimensional array of POJOs convertible from <code>Longs</code>:
+	For example, instead of <c>Longs</c> in the example above, we could also define a 2-dimensional array of POJOs convertible from <c>Longs</c>:
 </p>
 <p class='bpcode w800'>
 	<ja>@RestMethod</ja>(method=<js>"POST"</js>, path=<js>"/2dLongArray"</js>)	
@@ -97,7 +97,7 @@
 	}
 </p>
 <p>
-	Or even POJOs that take in arrays of <code>Longs[]</code>:
+	Or even POJOs that take in arrays of <c>Longs[]</c>:
 </p>
 <p class='bpcode w800'>
 	<ja>@RestMethod</ja>(method=<js>"POST"</js>, path=<js>"/2dLongArray"</js>)	
diff --git a/juneau-doc/docs/Topics/07.juneau-rest-server/09.OpenApiSchemaPartSerializing.html b/juneau-doc/docs/Topics/07.juneau-rest-server/09.OpenApiSchemaPartSerializing.html
index 38df8b8..e88632e 100644
--- a/juneau-doc/docs/Topics/07.juneau-rest-server/09.OpenApiSchemaPartSerializing.html
+++ b/juneau-doc/docs/Topics/07.juneau-rest-server/09.OpenApiSchemaPartSerializing.html
@@ -21,10 +21,10 @@
 </p>
 <ul class='doctree'>
 	<li class='ja'>{@link oaj.http.annotation.ResponseHeader}
-	<li class='ja'>{@link oaj.http.annotation.Response} (<code>Accept</code> must match <js>"text/openapi"</js>)
+	<li class='ja'>{@link oaj.http.annotation.Response} (<c>Accept</c> must match <js>"text/openapi"</js>)
 </ul>
 <p>
-	For example, the following shows how a pipe-delimited list of comma-delimited numbers (e.g. <js>"1,2,3|4,5,6|7,8,9"</js>) in a response header can be converted to a 2-dimensional array of <code>Longs</code>:
+	For example, the following shows how a pipe-delimited list of comma-delimited numbers (e.g. <js>"1,2,3|4,5,6|7,8,9"</js>) in a response header can be converted to a 2-dimensional array of <c>Longs</c>:
 </p>
 <p class='bpcode w800'>
 	<ja>@RestMethod</ja>(method=<js>"GET"</js>, path=<js>"/testResponseHeader"</js>)	
diff --git a/juneau-doc/docs/Topics/07.juneau-rest-server/10.HttpPartAnnotations/01.Body.html b/juneau-doc/docs/Topics/07.juneau-rest-server/10.HttpPartAnnotations/01.Body.html
index 5ca5364..436d617 100644
--- a/juneau-doc/docs/Topics/07.juneau-rest-server/10.HttpPartAnnotations/01.Body.html
+++ b/juneau-doc/docs/Topics/07.juneau-rest-server/10.HttpPartAnnotations/01.Body.html
@@ -62,40 +62,40 @@
 	<li>
 		{@link java.io.Reader}
 		<br><ja>@Body</ja> annotation is optional.
-		<br><code>Content-Type</code> is ignored.
+		<br><c>Content-Type</c> is ignored.
 	<li>
 		{@link java.io.InputStream}
 		<br><ja>@Body</ja> annotation is optional.
-		<br><code>Content-Type</code> is ignored.
+		<br><c>Content-Type</c> is ignored.
 	<li>
 		Any {@doc PojoCategories Parsable POJO} type.
-		<br><code>Content-Type</code> is required to identify correct parser.
+		<br><c>Content-Type</c> is required to identify correct parser.
 	<li>
 		Objects convertible from {@link java.io.Reader} by having one of the following non-deprecated methods:
 		<ul>
-			<li><code><jk>public</jk> T(Reader in) {...}</code>
-			<li><code><jk>public static</jk> T <jsm>create</jsm>(Reader in) {...}</code>
-			<li><code><jk>public static</jk> T <jsm>fromReader</jsm>(Reader in) {...}</code>
+			<li><c><jk>public</jk> T(Reader in) {...}</c>
+			<li><c><jk>public static</jk> T <jsm>create</jsm>(Reader in) {...}</c>
+			<li><c><jk>public static</jk> T <jsm>fromReader</jsm>(Reader in) {...}</c>
 		</ul>
-		<code>Content-Type</code> must not be present or match an existing parser so that it's not parsed as a POJO.
+		<c>Content-Type</c> must not be present or match an existing parser so that it's not parsed as a POJO.
 	<li>
 		Objects convertible from {@link java.io.InputStream} by having one of the following non-deprecated methods:
 		<ul>
-			<li><code><jk>public</jk> T(InputStream in) {...}</code>
-			<li><code><jk>public static</jk> T <jsm>create</jsm>(InputStream in) {...}</code>
-			<li><code><jk>public static</jk> T <jsm>fromInputStream</jsm>(InputStream in) {...}</code>
+			<li><c><jk>public</jk> T(InputStream in) {...}</c>
+			<li><c><jk>public static</jk> T <jsm>create</jsm>(InputStream in) {...}</c>
+			<li><c><jk>public static</jk> T <jsm>fromInputStream</jsm>(InputStream in) {...}</c>
 		</ul>
-		<code>Content-Type</code> must not be present or match an existing parser so that it's not parsed as a POJO.
+		<c>Content-Type</c> must not be present or match an existing parser so that it's not parsed as a POJO.
 	<li>
 		Objects convertible from {@link java.lang.String} by having one of the following non-deprecated methods:
 		<ul>
-			<li><code><jk>public</jk> T(String in) {...}</code>
-			<li><code><jk>public static</jk> T <jsm>create</jsm>(String in) {...}</code>
-			<li><code><jk>public static</jk> T <jsm>fromString</jsm>(String in) {...}</code>
-			<li><code><jk>public static</jk> T <jsm>parse</jsm>(String in) {...}</code>
-			<li><code><jk>public static</jk> T <jsm>parseString</jsm>(String in) {...}</code>
-			<li><code><jk>public static</jk> T <jsm>forName</jsm>(String in) {...}</code>
-			<li><code><jk>public static</jk> T <jsm>forString</jsm>(String in) {...}</code>
+			<li><c><jk>public</jk> T(String in) {...}</c>
+			<li><c><jk>public static</jk> T <jsm>create</jsm>(String in) {...}</c>
+			<li><c><jk>public static</jk> T <jsm>fromString</jsm>(String in) {...}</c>
+			<li><c><jk>public static</jk> T <jsm>parse</jsm>(String in) {...}</c>
+			<li><c><jk>public static</jk> T <jsm>parseString</jsm>(String in) {...}</c>
+			<li><c><jk>public static</jk> T <jsm>forName</jsm>(String in) {...}</c>
+			<li><c><jk>public static</jk> T <jsm>forString</jsm>(String in) {...}</c>
 		</ul>
 		Note that this also includes all enums.
 </ol>
@@ -103,7 +103,7 @@
 	The {@link oaj.oapi.OpenApiSerializer} class can be used to serialize HTTP bodies to OpenAPI-based output.
 </p>
 <p>
-	For example, the following shows how a pipe-delimited list of comma-delimited numbers (e.g. <js>"1,2,3|4,5,6|7,8,9"</js>) can be converted to a 2-dimensional array of <code>Longs</code>:
+	For example, the following shows how a pipe-delimited list of comma-delimited numbers (e.g. <js>"1,2,3|4,5,6|7,8,9"</js>) can be converted to a 2-dimensional array of <c>Longs</c>:
 </p>
 <p class='bpcode w800'>
 	<jc>// Body is a pipe-delimited list of comma-delimited lists of longs.</jc>
@@ -137,7 +137,7 @@
 </p>
 <p>
 	Input will be converted based on the types and formats defined in the schema definition.
-	Input validations such as <code>minLength/maxLength</code> that don't match the input will result in automatic <code>400 Bad Request</code> responses.
+	Input validations such as <c>minLength/maxLength</c> that don't match the input will result in automatic <c>400 Bad Request</c> responses.
 </p>
 <p>
 	For more information about valid parameter types when using OpenAPI parsing, see {@doc juneau-marshall.OpenApiDetails.Parsers OpenAPI Parsers}
diff --git a/juneau-doc/docs/Topics/07.juneau-rest-server/10.HttpPartAnnotations/02.FormData.html b/juneau-doc/docs/Topics/07.juneau-rest-server/10.HttpPartAnnotations/02.FormData.html
index 6d297af..76e2141 100644
--- a/juneau-doc/docs/Topics/07.juneau-rest-server/10.HttpPartAnnotations/02.FormData.html
+++ b/juneau-doc/docs/Topics/07.juneau-rest-server/10.HttpPartAnnotations/02.FormData.html
@@ -50,7 +50,7 @@
 </ul>
 
 <p>
-	The most typical scenario is to simply use the <code>value</code> field to define form data parameter names:
+	The most typical scenario is to simply use the <c>value</c> field to define form data parameter names:
 </p>
 <h5 class='figure'>Example:</h5>
 <p class='bpcode w800'>	
@@ -75,7 +75,7 @@
 
 <p>
 	The special name <js>"*"</js> (or blank) can be used to represent all values.
-	When used, the data type must be a <code>Map</code> or bean.
+	When used, the data type must be a <c>Map</c> or bean.
 </p>
 <h5 class='figure'>Examples:</h5>
 <p class='bpcode w800'>
@@ -100,7 +100,7 @@
 	By default, this is the {@link oaj.oapi.OpenApiParser} which supports the standard Swagger-based rules for parsing.
 </p>
 <p>
-	For example, the following shows how a pipe-delimited list of comma-delimited numbers (e.g. <js>"1,2,3|4,5,6|7,8,9"</js>) can be converted to a 2-dimensional array of <code>Longs</code>:
+	For example, the following shows how a pipe-delimited list of comma-delimited numbers (e.g. <js>"1,2,3|4,5,6|7,8,9"</js>) can be converted to a 2-dimensional array of <c>Longs</c>:
 </p>
 <p class='bpcode w800'>
 	<ja>@RestMethod</ja>(method=<js>"POST"</js>, path=<js>"/testFormData"</js>)	
@@ -125,7 +125,7 @@
 </p>
 <p>
 	Input will be converted based on the types and formats defined in the schema definition.
-	Input validations such as <code>minLength/maxLength</code> that don't match the input will result in automatic <code>400 Bad Request</code> responses.
+	Input validations such as <c>minLength/maxLength</c> that don't match the input will result in automatic <c>400 Bad Request</c> responses.
 </p>
 <p>
 	For more information about valid parameter types, see {@doc juneau-marshall.OpenApiDetails.Parsers OpenAPI Parsers}
@@ -173,7 +173,7 @@
 <ul class='doctree'>
 	<li class='warn'>
 			This annotation should not be combined with the {@link oaj.http.annotation.Body @Body} annotation or {@link oajr.RestRequest#getBody()} method
-			for <code>application/x-www-form-urlencoded POST</code> posts, since it will trigger the underlying servlet
+			for <c>application/x-www-form-urlencoded POST</c> posts, since it will trigger the underlying servlet
 		API to parse the body content as key-value pairs resulting in empty content.
 		<br>The {@link oaj.http.annotation.Query @Query} annotation can be used to retrieve a URL parameter in the URL string without triggering the
 		servlet to drain the body content.
diff --git a/juneau-doc/docs/Topics/07.juneau-rest-server/10.HttpPartAnnotations/03.HasFormData.html b/juneau-doc/docs/Topics/07.juneau-rest-server/10.HttpPartAnnotations/03.HasFormData.html
index 7742af6..72e2202 100644
--- a/juneau-doc/docs/Topics/07.juneau-rest-server/10.HttpPartAnnotations/03.HasFormData.html
+++ b/juneau-doc/docs/Topics/07.juneau-rest-server/10.HttpPartAnnotations/03.HasFormData.html
@@ -45,27 +45,27 @@
 </p>
 <table class='styled w400'>
 	<tr>
-		<th><code>Body content</code></th>
-		<th><code><ja>@HasFormData</ja>(<js>"a"</js>)</code></th>
-		<th><code><ja>@FormData</ja>(<js>"a"</js>)</code></th>
+		<th><c>Body content</c></th>
+		<th><c><ja>@HasFormData</ja>(<js>"a"</js>)</c></th>
+		<th><c><ja>@FormData</ja>(<js>"a"</js>)</c></th>
 	</tr>
 	<tr>
-		<td><code>a=foo</code></td>
+		<td><c>a=foo</c></td>
 		<td><jk>true</jk></td>
 		<td><js>"foo"</js></td>
 	</tr>
 	<tr>
-		<td><code>a=</code></td>
+		<td><c>a=</c></td>
 		<td><jk>true</jk></td>
 		<td><js>""</js></td>
 	</tr>
 	<tr>
-		<td><code>a</code></td>
+		<td><c>a</c></td>
 		<td><jk>true</jk></td>
 		<td><jk>null</jk></td>
 	</tr>
 	<tr>
-		<td><code>b=foo</code></td>
+		<td><c>b=foo</c></td>
 		<td><jk>false</jk></td>
 		<td><jk>null</jk></td>
 	</tr>
@@ -74,7 +74,7 @@
 <h5 class='topic'>Important note concerning FORM posts</h5>
 <p>
 	This annotation should not be combined with the {@link oaj.http.annotation.Body @Body} annotation or {@link oajr.RestRequest#getBody()} method
-	for <code>application/x-www-form-urlencoded POST</code> posts, since it will trigger the underlying servlet API to
+	for <c>application/x-www-form-urlencoded POST</c> posts, since it will trigger the underlying servlet API to
 	parse the body content as key-value pairs, resulting in empty content.
 </p>
 <p>
diff --git a/juneau-doc/docs/Topics/07.juneau-rest-server/10.HttpPartAnnotations/04.Query.html b/juneau-doc/docs/Topics/07.juneau-rest-server/10.HttpPartAnnotations/04.Query.html
index 7b5013e..3653819 100644
--- a/juneau-doc/docs/Topics/07.juneau-rest-server/10.HttpPartAnnotations/04.Query.html
+++ b/juneau-doc/docs/Topics/07.juneau-rest-server/10.HttpPartAnnotations/04.Query.html
@@ -54,10 +54,10 @@
 	Unlike {@link oaj.http.annotation.FormData @FormData}, using this annotation does not result in the servlet reading the contents of
 	URL-encoded form posts.
 	Therefore, this annotation can be used in conjunction with the {@link oaj.http.annotation.Body @Body} annotation or
-	{@link oajr.RestRequest#getBody()} method for <code>application/x-www-form-urlencoded POST</code> calls.
+	{@link oajr.RestRequest#getBody()} method for <c>application/x-www-form-urlencoded POST</c> calls.
 </p>
 <p>
-	The most typical scenario is to simply use the <code>value</code> field to define query parameter names:
+	The most typical scenario is to simply use the <c>value</c> field to define query parameter names:
 </p>
 <h5 class='figure'>Example:</h5>
 <p class='bpcode w800'>
@@ -83,7 +83,7 @@
 
 <p>
 	The special name <js>"*"</js> (or blank) can be used to represent all values.
-	When used, the data type must be a <code>Map</code> or bean.
+	When used, the data type must be a <c>Map</c> or bean.
 </p>
 <h5 class='figure'>Examples:</h5>
 <p class='bpcode w800'>
@@ -108,7 +108,7 @@
 	By default, this is the {@link oaj.oapi.OpenApiParser} which supports the standard Swagger-based rules for parsing.
 </p>
 <p>
-	For example, the following shows how a pipe-delimited list of comma-delimited numbers (e.g. <js>"1,2,3|4,5,6|7,8,9"</js>) can be converted to a 2-dimensional array of <code>Longs</code>:
+	For example, the following shows how a pipe-delimited list of comma-delimited numbers (e.g. <js>"1,2,3|4,5,6|7,8,9"</js>) can be converted to a 2-dimensional array of <c>Longs</c>:
 </p>
 <p class='bpcode w800'>
 	<ja>@RestMethod</ja>(method=<js>"GET"</js>, path=<js>"/testQuery"</js>)	
@@ -133,7 +133,7 @@
 </p>
 <p>
 	Input will be converted based on the types and formats defined in the schema definition.
-	Input validations such as <code>minLength/maxLength</code> that don't match the input will result in automatic <code>400 Bad Request</code> responses.
+	Input validations such as <c>minLength/maxLength</c> that don't match the input will result in automatic <c>400 Bad Request</c> responses.
 </p>
 <p>
 	For more information about valid parameter types, see {@doc juneau-marshall.OpenApiDetails.Parsers OpenAPI Parsers}
diff --git a/juneau-doc/docs/Topics/07.juneau-rest-server/10.HttpPartAnnotations/05.HasQuery.html b/juneau-doc/docs/Topics/07.juneau-rest-server/10.HttpPartAnnotations/05.HasQuery.html
index 9f8a3b8..cd60b85 100644
--- a/juneau-doc/docs/Topics/07.juneau-rest-server/10.HttpPartAnnotations/05.HasQuery.html
+++ b/juneau-doc/docs/Topics/07.juneau-rest-server/10.HttpPartAnnotations/05.HasQuery.html
@@ -26,7 +26,7 @@
 	Unlike {@link oaj.http.annotation.HasFormData @HasFormData}, using this annotation does not result in the servlet reading the contents
 	of URL-encoded form posts.
 	Therefore, this annotation can be used in conjunction with the {@link oaj.http.annotation.Body @Body} annotation or
-	{@link oajr.RestRequest#getBody()} method for <code>application/x-www-form-urlencoded POST</code> calls.
+	{@link oajr.RestRequest#getBody()} method for <c>application/x-www-form-urlencoded POST</c> calls.
  </p>
 <h5 class='figure'>Example:</h5>
 <p class='bpcode w800'>
@@ -51,27 +51,27 @@
 </p>
 <table class='styled w400'>
 	<tr>
-		<th><code>Query content</code></th>
-		<th><code><ja>@HasQuery</ja>(<js>"a"</js>)</code></th>
-		<th><code><ja>@Query</ja>(<js>"a"</js>)</code></th>
+		<th><c>Query content</c></th>
+		<th><c><ja>@HasQuery</ja>(<js>"a"</js>)</c></th>
+		<th><c><ja>@Query</ja>(<js>"a"</js>)</c></th>
 	</tr>
 	<tr>
-		<td><code>?a=foo</code></td>
+		<td><c>?a=foo</c></td>
 		<td><jk>true</jk></td>
 		<td><js>"foo"</js></td>
 	</tr>
 	<tr>
-		<td><code>?a=</code></td>
+		<td><c>?a=</c></td>
 		<td><jk>true</jk></td>
 		<td><js>""</js></td>
 	</tr>
 	<tr>
-		<td><code>?a</code></td>
+		<td><c>?a</c></td>
 		<td><jk>true</jk></td>
 		<td><jk>null</jk></td>
 	</tr>
 	<tr>
-		<td><code>?b=foo</code></td>
+		<td><c>?b=foo</c></td>
 		<td><jk>false</jk></td>
 		<td><jk>null</jk></td>
 	</tr>
diff --git a/juneau-doc/docs/Topics/07.juneau-rest-server/10.HttpPartAnnotations/06.Header.html b/juneau-doc/docs/Topics/07.juneau-rest-server/10.HttpPartAnnotations/06.Header.html
index 19a0dcb..1f173f1 100644
--- a/juneau-doc/docs/Topics/07.juneau-rest-server/10.HttpPartAnnotations/06.Header.html
+++ b/juneau-doc/docs/Topics/07.juneau-rest-server/10.HttpPartAnnotations/06.Header.html
@@ -49,7 +49,7 @@
 	</ul>
 </ul>
 <p>
-	The most typical scenario is to simply use the <code>value</code> field to define header parameter names:
+	The most typical scenario is to simply use the <c>value</c> field to define header parameter names:
 </p>
 <h5 class='figure'>Example:</h5>
 <p class='bpcode w800'>
@@ -69,7 +69,7 @@
 
 <p>
 	The special name <js>"*"</js> (or blank) can be used to represent all values.
-	When used, the data type must be a <code>Map</code> or bean.
+	When used, the data type must be a <c>Map</c> or bean.
 </p>
 <h5 class='figure'>Examples:</h5>
 <p class='bpcode w800'>
@@ -94,7 +94,7 @@
 	By default, this is the {@link oaj.oapi.OpenApiParser} which supports the standard Swagger-based rules for parsing.
 </p>
 <p>
-	For example, the following shows how a pipe-delimited list of comma-delimited numbers (e.g. <js>"1,2,3|4,5,6|7,8,9"</js>) can be converted to a 2-dimensional array of <code>Longs</code>:
+	For example, the following shows how a pipe-delimited list of comma-delimited numbers (e.g. <js>"1,2,3|4,5,6|7,8,9"</js>) can be converted to a 2-dimensional array of <c>Longs</c>:
 </p>
 <p class='bpcode w800'>
 	<ja>@RestMethod</ja>(method=<js>"GET"</js>, path=<js>"/testHeader"</js>)	
@@ -119,7 +119,7 @@
 </p>
 <p>
 	Input will be converted based on the types and formats defined in the schema definition.
-	Input validations such as <code>minLength/maxLength</code> that don't match the input will result in automatic <code>400 Bad Request</code> responses.
+	Input validations such as <c>minLength/maxLength</c> that don't match the input will result in automatic <c>400 Bad Request</c> responses.
 </p>
 <p>
 	For more information about valid parameter types, see {@doc juneau-marshall.OpenApiDetails.Parsers OpenAPI Parsers}
diff --git a/juneau-doc/docs/Topics/07.juneau-rest-server/10.HttpPartAnnotations/07.Path.html b/juneau-doc/docs/Topics/07.juneau-rest-server/10.HttpPartAnnotations/07.Path.html
index cbf11af..21ca66f 100644
--- a/juneau-doc/docs/Topics/07.juneau-rest-server/10.HttpPartAnnotations/07.Path.html
+++ b/juneau-doc/docs/Topics/07.juneau-rest-server/10.HttpPartAnnotations/07.Path.html
@@ -44,7 +44,7 @@
 	</ul>
 </ul>
 <p>
-	The most typical scenario is to simply use the <code>value</code> field to define path parameter names:
+	The most typical scenario is to simply use the <c>value</c> field to define path parameter names:
 </p>
 <h5 class='figure'>Example:</h5>
 <p class='bpcode w800'>
@@ -75,7 +75,7 @@
 
 <p>
 	The special name <js>"*"</js> (or blank) can be used to represent all values.
-	When used, the data type must be a <code>Map</code> or bean.
+	When used, the data type must be a <c>Map</c> or bean.
 </p>
 <h5 class='figure'>Examples:</h5>
 <p class='bpcode w800'>
@@ -101,7 +101,7 @@
 </p>
 
 <p>
-	For example, the following shows how a pipe-delimited list of comma-delimited numbers (e.g. <js>"1,2,3|4,5,6|7,8,9"</js>) can be converted to a 2-dimensional array of <code>Longs</code>:
+	For example, the following shows how a pipe-delimited list of comma-delimited numbers (e.g. <js>"1,2,3|4,5,6|7,8,9"</js>) can be converted to a 2-dimensional array of <c>Longs</c>:
 </p>
 <p class='bpcode w800'>
 	<ja>@RestMethod</ja>(method=<js>"POST"</js>, path=<js>"/testPath/{pathParam}"</js>)	
@@ -126,7 +126,7 @@
 </p>
 <p>
 	Input will be converted based on the types and formats defined in the schema definition.
-	Input validations such as <code>minLength/maxLength</code> that don't match the input will result in automatic <code>400 Bad Request</code> responses.
+	Input validations such as <c>minLength/maxLength</c> that don't match the input will result in automatic <c>400 Bad Request</c> responses.
 </p>
 <p>
 	For more information about valid parameter types, see {@doc juneau-marshall.OpenApiDetails.Parsers OpenAPI Parsers}
diff --git a/juneau-doc/docs/Topics/07.juneau-rest-server/10.HttpPartAnnotations/09.Response.html b/juneau-doc/docs/Topics/07.juneau-rest-server/10.HttpPartAnnotations/09.Response.html
index bfe6a8a..72fe80f 100644
--- a/juneau-doc/docs/Topics/07.juneau-rest-server/10.HttpPartAnnotations/09.Response.html
+++ b/juneau-doc/docs/Topics/07.juneau-rest-server/10.HttpPartAnnotations/09.Response.html
@@ -109,7 +109,7 @@
 	When applied type classes returned by a Java method, this annotation defines schema and Swagger information on the body of responses.
 </p>
 <p>
-	In the example above, we're using the <code>Ok</code> class which is defined like so:
+	In the example above, we're using the <c>Ok</c> class which is defined like so:
 </p>
 <p class='bpcode w800'>
 	<ja>@Response</ja>(
@@ -236,7 +236,7 @@
 <p>
 	The {@link oaj.http.annotation.ResponseStatus @ResponseStatus} annotation can be used on 
 	the method of a <ja>@Response</ja>-annotated class to identify HTTP response
-	statuses other than <code>200</code> (the default).	
+	statuses other than <c>200</c> (the default).	
 </p>
 
 <h5 class='figure'>Example:</h5>
@@ -299,13 +299,13 @@
 
 <p>
 	If a <ja>@Response</ja> class does not have a <ja>@ResponseBody</ja>-annotated method, then the response
-	object itself is serialized in the response (typically using <code>toString()</code>).
+	object itself is serialized in the response (typically using <c>toString()</c>).
 </p>
 
 <h5 class='topic'>Notes about OpenAPI part serialization</h5>
 <p>
 	By default, POJOs representing the body of the request are serialized using the Juneau serializer
-	matching the requesting <code>Accept</code> header.
+	matching the requesting <c>Accept</c> header.
 	The {@link oaj.oapi.OpenApiSerializer} class can be used to serialize response bodies using OpenAPI rules.
 </p>
 <p>
@@ -340,7 +340,7 @@
 	}
 </p>
 <p>
-	The <code><ja>@Response</ja>(schema)</code> annotation can be used to define the format of the output using OpenAPI-based rules.
+	The <c><ja>@Response</ja>(schema)</c> annotation can be used to define the format of the output using OpenAPI-based rules.
 </p>
 <p class='bpcode w800'>
 	<ja>@RestResource</ja>
@@ -361,7 +361,7 @@
 <h5 class='topic'>Swagger documentation</h5>
 <p>
 	The attributes on this annotation are also used to populate the generated Swagger for the method.
-	For example, in the case of the <code>InvalidLogin</code> example above, the following Swagger is generated:
+	For example, in the case of the <c>InvalidLogin</c> example above, the following Swagger is generated:
 </p>
 <p class='bpcode w800'>
 	<jok>'/user/login'</jok>: {
diff --git a/juneau-doc/docs/Topics/07.juneau-rest-server/10.HttpPartAnnotations/10.ResponseHeader.html b/juneau-doc/docs/Topics/07.juneau-rest-server/10.HttpPartAnnotations/10.ResponseHeader.html
index c6e3cf1..993b954 100644
--- a/juneau-doc/docs/Topics/07.juneau-rest-server/10.HttpPartAnnotations/10.ResponseHeader.html
+++ b/juneau-doc/docs/Topics/07.juneau-rest-server/10.HttpPartAnnotations/10.ResponseHeader.html
@@ -105,7 +105,7 @@
 <h5 class='topic'>Swagger documentation</h5>
 <p>
 	The attributes on this annotation are also used to populate the generated Swagger for the method.
-	For example, in the case of the <code>X-Rate-Limit</code> example above, the following Swagger is generated:
+	For example, in the case of the <c>X-Rate-Limit</c> example above, the following Swagger is generated:
 </p>
 <p class='bpcode w800'>
 	<jok>'/user/login'</jok>: {
diff --git a/juneau-doc/docs/Topics/07.juneau-rest-server/15.Properties.html b/juneau-doc/docs/Topics/07.juneau-rest-server/15.Properties.html
index e4a5538..fa0305c 100644
--- a/juneau-doc/docs/Topics/07.juneau-rest-server/15.Properties.html
+++ b/juneau-doc/docs/Topics/07.juneau-rest-server/15.Properties.html
@@ -108,7 +108,7 @@
 	Properties set via {@link oajr.RequestProperties} are session-override
 	properties that are passed in through {@link oaj.serializer.SerializerSessionArgs}
 	and {@link oaj.parser.ParserSessionArgs} and can only be used on configuration settings
-	marked as <code>Session property: <jk>true</jk></code>.
+	marked as <c>Session property: <jk>true</jk></c>.
 </p>			
 <p>
 	Properties are open-ended and can be used for other purposes.
diff --git a/juneau-doc/docs/Topics/07.juneau-rest-server/29.Swagger.html b/juneau-doc/docs/Topics/07.juneau-rest-server/29.Swagger.html
index 1eb418b..c00ed9a 100644
--- a/juneau-doc/docs/Topics/07.juneau-rest-server/29.Swagger.html
+++ b/juneau-doc/docs/Topics/07.juneau-rest-server/29.Swagger.html
@@ -20,7 +20,7 @@
 	(i.e. REST interfaces that document themselves).
 </p>
 <p>
-	As described previously, the <code>PetStore</code> example provides an example of auto-generated Swagger JSON:
+	As described previously, the <c>PetStore</c> example provides an example of auto-generated Swagger JSON:
 </p>
 <img class='bordered w900' src='doc-files/juneau-rest-server.Swagger.1.png'>
 <p>
diff --git a/juneau-doc/docs/Topics/07.juneau-rest-server/29.Swagger/01.BasicRestServlet.html b/juneau-doc/docs/Topics/07.juneau-rest-server/29.Swagger/01.BasicRestServlet.html
index e6b6687..c8bc344 100644
--- a/juneau-doc/docs/Topics/07.juneau-rest-server/29.Swagger/01.BasicRestServlet.html
+++ b/juneau-doc/docs/Topics/07.juneau-rest-server/29.Swagger/01.BasicRestServlet.html
@@ -16,8 +16,8 @@
 {updated} BasicRestServlet
 
 <p>
-	Any subclass of {@link oajr.BasicRestServlet} gets an auto-generated Swagger UI when performing an <code>OPTIONS</code>
-	request with <code>Accept:text/html</code>.
+	Any subclass of {@link oajr.BasicRestServlet} gets an auto-generated Swagger UI when performing an <c>OPTIONS</c>
+	request with <c>Accept:text/html</c>.
 </p>
 <p>
 	The underlying mechanics are simple.  
diff --git a/juneau-doc/docs/Topics/07.juneau-rest-server/29.Swagger/02.BasicSwaggerInfo.html b/juneau-doc/docs/Topics/07.juneau-rest-server/29.Swagger/02.BasicSwaggerInfo.html
index cd0a458..dbb366d 100644
--- a/juneau-doc/docs/Topics/07.juneau-rest-server/29.Swagger/02.BasicSwaggerInfo.html
+++ b/juneau-doc/docs/Topics/07.juneau-rest-server/29.Swagger/02.BasicSwaggerInfo.html
@@ -16,7 +16,7 @@
 Basic Swagger Info
 
 <p>
-	Let's look at the various parts of the <code>Petstore</code> application Swagger UI to see how they are defined.
+	Let's look at the various parts of the <c>Petstore</c> application Swagger UI to see how they are defined.
 </p>
 <p>
 	The top part of the page shows general information about the REST interface:
@@ -38,7 +38,7 @@
 </p>
 <p>
 	In this particular case, the Swagger is pulled in from a localized Swagger JSON file located in the 
-	<code>org.apache.juneau.examples.rest.petstore</code> package using the {@link oajr.vars.FileVar $F} variable.
+	<c>org.apache.juneau.examples.rest.petstore</c> package using the {@link oajr.vars.FileVar $F} variable.
 </p>
 <h5 class='figure'>PetStoreResource.json</h5>
 <p class='bpcode w800'>
diff --git a/juneau-doc/docs/Topics/07.juneau-rest-server/29.Swagger/03.Tags.html b/juneau-doc/docs/Topics/07.juneau-rest-server/29.Swagger/03.Tags.html
index 3373d9e..141f089 100644
--- a/juneau-doc/docs/Topics/07.juneau-rest-server/29.Swagger/03.Tags.html
+++ b/juneau-doc/docs/Topics/07.juneau-rest-server/29.Swagger/03.Tags.html
@@ -18,8 +18,8 @@
 <p>
 	Tags allow you to group operations into general categories.
 	In the user interface, these can be expanded/collapsed by clicking on the tag sections.
-	In the example below, the <code>pet</code> and <code>store</code> tag sections are collapsed
-	and the <code>user</code> section is not:
+	In the example below, the <c>pet</c> and <c>store</c> tag sections are collapsed
+	and the <c>user</c> section is not:
 </p>
 <img class='bordered w900' src='doc-files/juneau-rest-server.Swagger.4.png'>
 <p>
@@ -105,8 +105,8 @@
 	Operations not mapped to tags are listed in the UI before tagged operations.
 </p>
 <p>
-	For example, the <code>getTopPage()</code> method in <code>PetStoreResource</code> is not tagged, 
-	as well as the <code>getOptions()</code> method inherited from <code>BaseRestServlet</code>, so these
+	For example, the <c>getTopPage()</c> method in <c>PetStoreResource</c> is not tagged, 
+	as well as the <c>getOptions()</c> method inherited from <c>BaseRestServlet</c>, so these
 	show up at the top of the page:
 </p>
 <img class='bordered w900' src='doc-files/juneau-rest-server.Swagger.5.png'>
diff --git a/juneau-doc/docs/Topics/07.juneau-rest-server/29.Swagger/04.Operations.html b/juneau-doc/docs/Topics/07.juneau-rest-server/29.Swagger/04.Operations.html
index 5a363ab..9085b1e 100644
--- a/juneau-doc/docs/Topics/07.juneau-rest-server/29.Swagger/04.Operations.html
+++ b/juneau-doc/docs/Topics/07.juneau-rest-server/29.Swagger/04.Operations.html
@@ -20,7 +20,7 @@
 </p>
 <img class='bordered w900' src='doc-files/juneau-rest-server.Swagger.Operations.1.png'>
 <p>
-	The following shows the annotations defined on the <code>GET /pet</code> operation:
+	The following shows the annotations defined on the <c>GET /pet</c> operation:
 </p>
 <h5 class='figure'>PetStoreResource.getPets()</h5>
 <p class='bpcode w800'>
diff --git a/juneau-doc/docs/Topics/07.juneau-rest-server/29.Swagger/05.Parameters.html b/juneau-doc/docs/Topics/07.juneau-rest-server/29.Swagger/05.Parameters.html
index f6e55bf..d6a5c86 100644
--- a/juneau-doc/docs/Topics/07.juneau-rest-server/29.Swagger/05.Parameters.html
+++ b/juneau-doc/docs/Topics/07.juneau-rest-server/29.Swagger/05.Parameters.html
@@ -59,13 +59,13 @@
 	}
 </p>
 <p>
-	<b>Note:</b>  The <code>type</code> and <code>collectionFormat</code> values above are optional and auto-detected based on the
+	<b>Note:</b>  The <c>type</c> and <c>collectionFormat</c> values above are optional and auto-detected based on the
 	parameter class type if omitted.  They're included here for clarity.
 	The examples will be explained in the next section.
 </p>
 <p>
-	Another option is to specify your parameter information in the <code>parameters</code> annotation as free-form Simple JSON.
-	In the case of the <code>PetStoreResource.getPets()</code> method, we pull this information from a static field
+	Another option is to specify your parameter information in the <c>parameters</c> annotation as free-form Simple JSON.
+	In the case of the <c>PetStoreResource.getPets()</c> method, we pull this information from a static field
 	defined in the {@link oajr.converters.Queryable} class:
 </p>
 <h5 class='figure'>PetStoreResource.getPets()</h5>
diff --git a/juneau-doc/docs/Topics/07.juneau-rest-server/29.Swagger/06.ParameterExamples.html b/juneau-doc/docs/Topics/07.juneau-rest-server/29.Swagger/06.ParameterExamples.html
index 554a7fd..4b384aa 100644
--- a/juneau-doc/docs/Topics/07.juneau-rest-server/29.Swagger/06.ParameterExamples.html
+++ b/juneau-doc/docs/Topics/07.juneau-rest-server/29.Swagger/06.ParameterExamples.html
@@ -16,11 +16,11 @@
 {updated} Parameter Examples
 
 <p>
-	The <code>model</code> select box in the parameters can be expanded to show examples:
+	The <c>model</c> select box in the parameters can be expanded to show examples:
 </p>
 <img class='bordered w900' src='doc-files/juneau-rest-server.Swagger.Parameters.1.png'>
 <p>
-	The examples for query/form-data/path/header parameters can be defined using the <code>example</code> attribute on your annotated parameters as shown here:
+	The examples for query/form-data/path/header parameters can be defined using the <c>example</c> attribute on your annotated parameters as shown here:
 </p>
 <p class='bpcode w800'>
 	<ja>@RestMethod</ja>(
@@ -46,7 +46,7 @@
 	}
 </p>
 <p>
-	This value gets converted to an <code>x-examples</code> attribute in your parameter information:
+	This value gets converted to an <c>x-examples</c> attribute in your parameter information:
 </p>
 <p class='bpcode w800'>
 	{
@@ -68,7 +68,7 @@
 	...
 </p>
 <p>
-	Examples for request bodies includes all supported <code>Content-Type</code> values: 
+	Examples for request bodies includes all supported <c>Content-Type</c> values: 
 </p>
 <img class='bordered w900' src='doc-files/juneau-rest-server.Swagger.Parameters.3.png'> 
 <p>
@@ -87,7 +87,7 @@
 	<li>
 		{@link oaj.http.annotation.Body#examples() @Body(examples)} annotation.
 	<li>
-		Defining an <js>"x-examples"</js> field in the inherited Swagger JSON body field (classpath file or <code><ja>@ResourceSwagger</ja>(value)</code>/<code><ja>@MethodSwagger</ja>(value)</code>).
+		Defining an <js>"x-examples"</js> field in the inherited Swagger JSON body field (classpath file or <c><ja>@ResourceSwagger</ja>(value)</c>/<c><ja>@MethodSwagger</ja>(value)</c>).
 	<li>
 		Defining an <js>"x-examples"</js> field in the Swagger Schema Object for the body (including referenced <js>"$ref"</js> schemas).
 	<li>
@@ -123,7 +123,7 @@
 	)
 </p>
 <p>
-	The Swagger generator uses these to create an <code>x-examples</code> entry in your generated Swagger:
+	The Swagger generator uses these to create an <c>x-examples</c> entry in your generated Swagger:
 </p>
 <p class='bpcode w800'>
 	<jok>"/pet"</jok>: {
diff --git a/juneau-doc/docs/Topics/07.juneau-rest-server/29.Swagger/07.Responses.html b/juneau-doc/docs/Topics/07.juneau-rest-server/29.Swagger/07.Responses.html
index 08b4b07..316c3e7 100644
--- a/juneau-doc/docs/Topics/07.juneau-rest-server/29.Swagger/07.Responses.html
+++ b/juneau-doc/docs/Topics/07.juneau-rest-server/29.Swagger/07.Responses.html
@@ -20,7 +20,7 @@
 </p>
 <img class='bordered w900' src='doc-files/juneau-rest-server.Swagger.Operations.3.png'> 
 <p>
-	The <code>200</code> response is determined by the return type on the method, in this case a collection of <code>Pet</code> objects:
+	The <c>200</c> response is determined by the return type on the method, in this case a collection of <c>Pet</c> objects:
 </p>
 <p class='bpcode w800'>
 	<ja>@RestMethod</ja>(
diff --git a/juneau-doc/docs/Topics/07.juneau-rest-server/29.Swagger/08.ResponseExamples.html b/juneau-doc/docs/Topics/07.juneau-rest-server/29.Swagger/08.ResponseExamples.html
index bc79b0f..d5ddcb9 100644
--- a/juneau-doc/docs/Topics/07.juneau-rest-server/29.Swagger/08.ResponseExamples.html
+++ b/juneau-doc/docs/Topics/07.juneau-rest-server/29.Swagger/08.ResponseExamples.html
@@ -16,12 +16,12 @@
 Response Examples
 
 <p>
-	The <code>model</code> select box in the responses can be expanded to show examples:
+	The <c>model</c> select box in the responses can be expanded to show examples:
 </p>
 <h5 class='figure'>PetStoreResource.getPet()</h5>
 <img class='bordered w900' src='doc-files/juneau-rest-server.Swagger.ResponseExamples.1.png'> 
 <p>
-	Examples are provided for any supported <code>Accept</code> type based on the serializers defined on your
+	Examples are provided for any supported <c>Accept</c> type based on the serializers defined on your
 	servlet/method.
 </p>
 <h5 class='figure'>application/json+simple</h5>
@@ -29,7 +29,7 @@
 <h5 class='figure'>text/uon</h5>
 <img class='bordered w900' src='doc-files/juneau-rest-server.Swagger.ResponseExamples.3.png'> 
 <p>
-	Examples are pulled from the <code>examples</code> attribute in the response object of the generated Swagger JSON:
+	Examples are pulled from the <c>examples</c> attribute in the response object of the generated Swagger JSON:
 </p>
 <p class='bpcode w800'>
 	<jok>"/pet/{petId}"</jok>: {
@@ -72,7 +72,7 @@
 	<li>
 		{@link oaj.http.annotation.Response#examples() @Response(examples)} annotation.
 	<li>
-		Defining an <js>"examples"</js> field in the inherited Swagger JSON response object (classpath file or <code><ja>@ResourceSwagger</ja>(value)</code>/<code><ja>@MethodSwagger</ja>(value)</code>).
+		Defining an <js>"examples"</js> field in the inherited Swagger JSON response object (classpath file or <c><ja>@ResourceSwagger</ja>(value)</c>/<c><ja>@MethodSwagger</ja>(value)</c>).
 	<li>
 		Defining an <js>"examples"</js> field in the Swagger Schema Object for the response object (including referenced <js>"$ref"</js> schemas).
 	<li>
@@ -92,7 +92,7 @@
 <p>
 	This is a Simple JSON representation of the body that is converted to a POJO and then serialized to all the registered serializers on the REST method to produce examples for all
 	supported language types.
-	These values are then used to automatically populate the <code>examples</code> field.
+	These values are then used to automatically populate the <c>examples</c> field.
 </p>
 <p>
 	Direct per-media-type examples can also be defined using the {@link oaj.http.annotation.Response#examples @Response(examples)} annotation:
diff --git a/juneau-doc/docs/Topics/07.juneau-rest-server/29.Swagger/09.Models.html b/juneau-doc/docs/Topics/07.juneau-rest-server/29.Swagger/09.Models.html
index b24ce7e..3b26d05 100644
--- a/juneau-doc/docs/Topics/07.juneau-rest-server/29.Swagger/09.Models.html
+++ b/juneau-doc/docs/Topics/07.juneau-rest-server/29.Swagger/09.Models.html
@@ -17,7 +17,7 @@
 
 <p>
 	The {@link oaj.jsonschema.JsonSchemaGenerator#JSONSCHEMA_useBeanDefs} setting can be used to reduce the size of your
-	generated Swagger JSON files by creating model definitions for beans and referencing those definitions through <code>$ref</code> attributes.
+	generated Swagger JSON files by creating model definitions for beans and referencing those definitions through <c>$ref</c> attributes.
 </p>
 <p>
 	By default, this flag is enabled when extending from {@link oajr.BasicRestServlet}:
@@ -42,7 +42,7 @@
 <h5 class='figure'>Models section with Order bean expanded</h5>
 <img class='bordered w900' src='doc-files/juneau-rest-server.Swagger.Models.2.png'> 
 <p>
-	In the generated Swagger JSON, embedded schema information for beans will be replaced with references such as the one shown below for the <code>Order</code> bean:
+	In the generated Swagger JSON, embedded schema information for beans will be replaced with references such as the one shown below for the <c>Order</c> bean:
 </p>
 <p class='bpcode w800'>
 	{
diff --git a/juneau-doc/docs/Topics/07.juneau-rest-server/29.Swagger/10.Stylesheet.html b/juneau-doc/docs/Topics/07.juneau-rest-server/29.Swagger/10.Stylesheet.html
index ad82f2c..25e875b 100644
--- a/juneau-doc/docs/Topics/07.juneau-rest-server/29.Swagger/10.Stylesheet.html
+++ b/juneau-doc/docs/Topics/07.juneau-rest-server/29.Swagger/10.Stylesheet.html
@@ -16,10 +16,10 @@
 SwaggerUI.css
 
 <p>
-	The look-and-feel of the Swagger UI is controlled via a single CSS file:  <code>SwaggerUI.css</code>.
+	The look-and-feel of the Swagger UI is controlled via a single CSS file:  <c>SwaggerUI.css</c>.
 </p>
 <p>
-	In the microservice template, this file is located in the <code>files/htdocs/styles</code> directory.
+	In the microservice template, this file is located in the <c>files/htdocs/styles</c> directory.
 	It's a simple straightforward file consisting of less than 350 lines.
 	This file can be modified to change the look-and-feel of your Swagger UI.
 </p>
diff --git a/juneau-doc/docs/Topics/07.juneau-rest-server/30.HtmlDocAnnotation/02.Widgets.html b/juneau-doc/docs/Topics/07.juneau-rest-server/30.HtmlDocAnnotation/02.Widgets.html
index 3a83f18..9a22d37 100644
--- a/juneau-doc/docs/Topics/07.juneau-rest-server/30.HtmlDocAnnotation/02.Widgets.html
+++ b/juneau-doc/docs/Topics/07.juneau-rest-server/30.HtmlDocAnnotation/02.Widgets.html
@@ -68,7 +68,7 @@
 <p>
 	The following examples shows how to associate a widget with a REST method and then have it rendered in the links
 	and aside section of the page.
-	It shows an example of a widget that renders an image located in the <code>htdocs</code> static files
+	It shows an example of a widget that renders an image located in the <c>htdocs</c> static files
 	directory in your classpath (see {@link oajr.annotation.RestResource#staticFiles() @RestResource(staticFiles)}):
 </p>
 <p class='bpcode w800'>
diff --git a/juneau-doc/docs/Topics/07.juneau-rest-server/30.HtmlDocAnnotation/03.PredefinedWidgets.html b/juneau-doc/docs/Topics/07.juneau-rest-server/30.HtmlDocAnnotation/03.PredefinedWidgets.html
index df6baa6..d9a9ac7 100644
--- a/juneau-doc/docs/Topics/07.juneau-rest-server/30.HtmlDocAnnotation/03.PredefinedWidgets.html
+++ b/juneau-doc/docs/Topics/07.juneau-rest-server/30.HtmlDocAnnotation/03.PredefinedWidgets.html
@@ -80,7 +80,7 @@
 	The variable it resolves is <js>"$W{ContentTypeMenuItem}"</js>.
 </p>
 <p>
-	An example of this widget can be found in the <code>PetStoreResource</code> in the examples that provides a drop-down menu item for rendering all other supported content types in plain text:
+	An example of this widget can be found in the <c>PetStoreResource</c> in the examples that provides a drop-down menu item for rendering all other supported content types in plain text:
 </p>
 <p class='bpcode w800'>
 	<ja>@RestMethod</ja>(
@@ -120,7 +120,7 @@
 	method to retrieve the arguments and process the data themselves.
 </p>
 <p>
-	An example of this widget can be found in the <code>PetStoreResource</code> in the examples that provides
+	An example of this widget can be found in the <c>PetStoreResource</c> in the examples that provides
 	search/view/sort capabilities against the collection of POJOs:
 <p class='bpcode w800'>
 	<ja>@RestMethod</ja>(
@@ -166,7 +166,7 @@
 	The variable it resolves is <js>"$W{ThemeMenuItem}"</js>.
 </p>
 <p>
-	An example of this widget can be found in the <code>PetStoreResource</code> in the examples that provides
+	An example of this widget can be found in the <c>PetStoreResource</c> in the examples that provides
 	a drop-down menu item for rendering all other supported content types in plain text:
 </p>
 <p class='bpcode w800'>
@@ -199,7 +199,7 @@
 </p>
 <p>
 	It produces a simple Apache Juneau icon floating on the right.
-	Typically it's used in the footer of the page, as shown below in the <code>AddressBookResource</code> from the examples:
+	Typically it's used in the footer of the page, as shown below in the <c>AddressBookResource</c> from the examples:
 </p>
 <p class='bpcode w800'>
 	<ja>@RestResource</ja>(
diff --git a/juneau-doc/docs/Topics/07.juneau-rest-server/30.HtmlDocAnnotation/05.Stylesheets.html b/juneau-doc/docs/Topics/07.juneau-rest-server/30.HtmlDocAnnotation/05.Stylesheets.html
index 0c02fe5..ec660f7 100644
--- a/juneau-doc/docs/Topics/07.juneau-rest-server/30.HtmlDocAnnotation/05.Stylesheets.html
+++ b/juneau-doc/docs/Topics/07.juneau-rest-server/30.HtmlDocAnnotation/05.Stylesheets.html
@@ -56,7 +56,7 @@
 <p>
 	The <js>"$C{REST/stylesheet,servlet:/styles/devops.css}"</js> variable says to use the URI defined
 	in your servlet's config file, if there is one, and to default to serving up the file
-	<code>org/apache/juneau/rest/styles/devops.css</code>.
+	<c>org/apache/juneau/rest/styles/devops.css</c>.
 </p>
 <p>
 	To provide your own stylesheet, simply override the stylesheet attribute and point to a different
@@ -72,7 +72,7 @@
 	<jk>public class</jk> MyResourceBaseClass <jk>extends</jk> BasicRestServlet {...}
 </p>
 <p>
-	You can try out different stylesheets by passing in a <code>stylesheet</code> attribute in the request
+	You can try out different stylesheets by passing in a <c>stylesheet</c> attribute in the request
 	URL.
 	The example above show this in use.
 </p>
diff --git a/juneau-doc/docs/Topics/07.juneau-rest-server/38.Injection.html b/juneau-doc/docs/Topics/07.juneau-rest-server/38.Injection.html
index 14b0e6e..c9fa476 100644
--- a/juneau-doc/docs/Topics/07.juneau-rest-server/38.Injection.html
+++ b/juneau-doc/docs/Topics/07.juneau-rest-server/38.Injection.html
@@ -72,7 +72,7 @@
 	}
 </p>
 <p>
-	Finally, define your <code>Root</code> resource with a constructor that takes in our rest resource resolver and
+	Finally, define your <c>Root</c> resource with a constructor that takes in our rest resource resolver and
 	sets it on the config object during initialization.
 </p>
 <p class='bpcode w800'>
diff --git a/juneau-doc/docs/Topics/08.juneau-rest-server-jaxrs.html b/juneau-doc/docs/Topics/08.juneau-rest-server-jaxrs.html
index 7d3d911..91691ef 100644
--- a/juneau-doc/docs/Topics/08.juneau-rest-server-jaxrs.html
+++ b/juneau-doc/docs/Topics/08.juneau-rest-server-jaxrs.html
@@ -35,7 +35,7 @@
 </p>	
 
 <p>
-	The <code>juneau-rest-server-jaxrs</code> library provides an implementation of a <code>MessageBodyReader</code>
-	and <code>MessageBodyWriter</code> to allow any of the Juneau serializers and parsers to be used in a 
+	The <c>juneau-rest-server-jaxrs</c> library provides an implementation of a <c>MessageBodyReader</c>
+	and <c>MessageBodyWriter</c> to allow any of the Juneau serializers and parsers to be used in a 
 	JAX/RS environment. 
 </p>
diff --git a/juneau-doc/docs/Topics/08.juneau-rest-server-jaxrs/01.BaseProvider.html b/juneau-doc/docs/Topics/08.juneau-rest-server-jaxrs/01.BaseProvider.html
index dcefa95..c8ae3c2 100644
--- a/juneau-doc/docs/Topics/08.juneau-rest-server-jaxrs/01.BaseProvider.html
+++ b/juneau-doc/docs/Topics/08.juneau-rest-server-jaxrs/01.BaseProvider.html
@@ -63,9 +63,9 @@
 <ul class='spaced-list'>
 	<li class='jc'>
 		{@link oajr.jaxrs.BaseProvider} - The base provider class that implements the JAX-RS 
-		<code>MessageBodyReader</code> and <code>MessageBodyWriter</code> interfaces.
+		<c>MessageBodyReader</c> and <c>MessageBodyWriter</c> interfaces.
 	<li class='jc'>
-		{@link oajr.jaxrs.JuneauProvider} - Annotation that is applied to subclasses of <code>BaseProvider</code>
+		{@link oajr.jaxrs.JuneauProvider} - Annotation that is applied to subclasses of <c>BaseProvider</c>
 		to specify the serializers/parsers associated with a provider, and optionally filters and properties to 
 		apply to those serializers and parsers.
 	<li class='jc'>
diff --git a/juneau-doc/docs/Topics/09.juneau-rest-server-springboot.html b/juneau-doc/docs/Topics/09.juneau-rest-server-springboot.html
index aa1c9aa..f7e9355 100644
--- a/juneau-doc/docs/Topics/09.juneau-rest-server-springboot.html
+++ b/juneau-doc/docs/Topics/09.juneau-rest-server-springboot.html
@@ -35,6 +35,6 @@
 </p>	
 
 <p>
-	The <code>juneau-rest-server-springboot</code> library provides classes to make it easy to integrate
+	The <c>juneau-rest-server-springboot</c> library provides classes to make it easy to integrate
 	Juneau REST resources with Spring and Spring Boot.
 </p>
diff --git a/juneau-doc/docs/Topics/09.juneau-rest-server-springboot/02.ChildResources.html b/juneau-doc/docs/Topics/09.juneau-rest-server-springboot/02.ChildResources.html
index 7d72a9c..44f3975 100644
--- a/juneau-doc/docs/Topics/09.juneau-rest-server-springboot/02.ChildResources.html
+++ b/juneau-doc/docs/Topics/09.juneau-rest-server-springboot/02.ChildResources.html
@@ -41,9 +41,9 @@
 	}
 </p>
 <p>
-	The root resource class must extend from <code>HttpServlet</code> so that it can be registered as a normal
+	The root resource class must extend from <c>HttpServlet</c> so that it can be registered as a normal
 	servlet using the Spring Boot architecture.  The {@link oajr.BasicRestServletGroup} class is our router class
-	that extends from <code>HttpServlet</code>:
+	that extends from <c>HttpServlet</c>:
 </p>
 <p class='bpcode w800'>
 	<ja>@RestResource</ja>(
@@ -57,8 +57,8 @@
 	}
 </p>
 <p>
-	Because Spring Boot will automatically register any beans that extend from <code>HttpServlet</code>, we
-	DON'T want the child classes to extend from <code>HttpServlet</code>.  Instead, we extend from
+	Because Spring Boot will automatically register any beans that extend from <c>HttpServlet</c>, we
+	DON'T want the child classes to extend from <c>HttpServlet</c>.  Instead, we extend from
 	{@link oajr.BasicRestGroup} and {@link oajr.BasicRest} instead:
 </p>
 
diff --git a/juneau-doc/docs/Topics/10.juneau-rest-client.html b/juneau-doc/docs/Topics/10.juneau-rest-client.html
index 045ad58..e99a94f 100644
--- a/juneau-doc/docs/Topics/10.juneau-rest-client.html
+++ b/juneau-doc/docs/Topics/10.juneau-rest-client.html
@@ -94,9 +94,9 @@
 	At a minimum, the following jars are required:
 </p>
 <ul>
-	<li><code>httpclient-4.5.jar</code>
-	<li><code>httpcore-4.4.1.jar</code>
-	<li><code>httpmime-4.5.jar</code>
+	<li><c>httpclient-4.5.jar</c>
+	<li><c>httpcore-4.4.1.jar</c>
+	<li><c>httpmime-4.5.jar</c>
 </ul>
 
 <h5 class='figure'>Example:</h5>
diff --git a/juneau-doc/docs/Topics/10.juneau-rest-client/01.RestProxies.html b/juneau-doc/docs/Topics/10.juneau-rest-client/01.RestProxies.html
index eca97fc..bb3d439 100644
--- a/juneau-doc/docs/Topics/10.juneau-rest-client/01.RestProxies.html
+++ b/juneau-doc/docs/Topics/10.juneau-rest-client/01.RestProxies.html
@@ -16,7 +16,7 @@
 REST Proxies
 
 <p>
-	The <code>juneau-rest-client</code> library can also be used to define interface proxies against 3rd-party REST interfaces.
+	The <c>juneau-rest-client</c> library can also be used to define interface proxies against 3rd-party REST interfaces.
 	This is an extremely powerful feature that allows you to quickly define easy-to-use interfaces against 
 	virtually any REST interface.
 </p>
diff --git a/juneau-doc/docs/Topics/10.juneau-rest-client/01.RestProxies/01.RemoteResource.html b/juneau-doc/docs/Topics/10.juneau-rest-client/01.RestProxies/01.RemoteResource.html
index 6f7f26f..1d9ebe7 100644
--- a/juneau-doc/docs/Topics/10.juneau-rest-client/01.RestProxies/01.RemoteResource.html
+++ b/juneau-doc/docs/Topics/10.juneau-rest-client/01.RestProxies/01.RemoteResource.html
@@ -46,7 +46,7 @@
 	PetStore p = client.getRemoteResource(PetStore.<jk>class</jk>);
 </p>
 <p>
-	When a relative path is specified, it's relative to the root-url defined on the <code>RestClient</code> used to instantiate the interface.
+	When a relative path is specified, it's relative to the root-url defined on the <c>RestClient</c> used to instantiate the interface.
 </p>
 <h5 class='figure'>Example:</h5>
 <p class='bpcode w800'>	
@@ -58,7 +58,7 @@
 	PetStore p = client.getRemoteResource(PetStore.<jk>class</jk>);
 </p>
 <p>
-	When no path is specified, the root-url defined on the <code>RestClient</code> is used.
+	When no path is specified, the root-url defined on the <c>RestClient</c> is used.
 </p>
 <h5 class='figure'>Example:</h5>
 <p class='bpcode w800'>	
diff --git a/juneau-doc/docs/Topics/10.juneau-rest-client/01.RestProxies/02.RemoteMethod.html b/juneau-doc/docs/Topics/10.juneau-rest-client/01.RestProxies/02.RemoteMethod.html
index 00c3e22..14f08cf 100644
--- a/juneau-doc/docs/Topics/10.juneau-rest-client/01.RestProxies/02.RemoteMethod.html
+++ b/juneau-doc/docs/Topics/10.juneau-rest-client/01.RestProxies/02.RemoteMethod.html
@@ -29,7 +29,7 @@
 </ul>
 <h5 class='topic'>@RemoteMethod(method/path)</h5>
 <p>
-	The HTTP method and path are mapped to a Java method using the <code>method</code> and <code>path</code> annotations.
+	The HTTP method and path are mapped to a Java method using the <c>method</c> and <c>path</c> annotations.
 </p>
 <h5 class='figure'>Example:</h5>
 <p class='bpcode w800'>	
@@ -47,11 +47,11 @@
 
 <h5 class='topic'>Inferred method/path</h5>
 <p>
-	In such cases, <code>method</code> and <code>path</code> annotations are optional if you follow certain naming
+	In such cases, <c>method</c> and <c>path</c> annotations are optional if you follow certain naming
 	conventions on your method that identify the method and path.
 </p>
 <p>
-	For example, the <code>getPet</code> method below defaults to <code>GET /pet</code>:
+	For example, the <c>getPet</c> method below defaults to <c>GET /pet</c>:
 </p>
 <p class='bpcode w800'>	
 	<ja>@RemoteResource</ja>
@@ -131,12 +131,12 @@
 	<li>
 		Any {@doc PojoCategories parsable} POJO 
 		- The body of the response will be converted to the POJO using the parser defined on the 
-		<code>RestClient</code> based on the <code>Content-Type</code> of the response.
+		<c>RestClient</c> based on the <c>Content-Type</c> of the response.
 	<li>
 		Any {@link oaj.http.annotation.Response @Response}-annotated type. (described later)
 	<li>
-		<code>HttpResponse</code> 
-		- Returns the raw <code>HttpResponse</code> returned by the inner <code>HttpClient</code>.
+		<c>HttpResponse</c> 
+		- Returns the raw <c>HttpResponse</c> returned by the inner <c>HttpClient</c>.
 	<li>
 		{@link java.io.Reader} 
 		- Returns access to the raw reader of the response.
@@ -161,6 +161,6 @@
 	}
 </p>
 <p>
-	If your <code>RestClient</code> does not have a parser associated with it, then the value is converted directly from a String using
+	If your <c>RestClient</c> does not have a parser associated with it, then the value is converted directly from a String using
 	the rules defined in {@doc PojosConveribleToStrings}. 
 </p>
diff --git a/juneau-doc/docs/Topics/10.juneau-rest-client/01.RestProxies/03.Body.html b/juneau-doc/docs/Topics/10.juneau-rest-client/01.RestProxies/03.Body.html
index d52f532..2c042de 100644
--- a/juneau-doc/docs/Topics/10.juneau-rest-client/01.RestProxies/03.Body.html
+++ b/juneau-doc/docs/Topics/10.juneau-rest-client/01.RestProxies/03.Body.html
@@ -55,19 +55,19 @@
 </p>
 <ul class='spaced-list'>
 	<li>
-		Any serializable POJO - Converted to output using the {@link oaj.serializer.Serializer} registered with the <code>RestClient</code>.
-		<br><code>Content-Type</code> is set to that of the <code>Serializer</code>.
+		Any serializable POJO - Converted to output using the {@link oaj.serializer.Serializer} registered with the <c>RestClient</c>.
+		<br><c>Content-Type</c> is set to that of the <c>Serializer</c>.
 	<li>
 		{@link java.io.Reader} - Raw contents of {@code Reader} will be serialized to remote resource.
-		<br><code>Content-Type</code> is set to <js>"text/plain"</js>.
+		<br><c>Content-Type</c> is set to <js>"text/plain"</js>.
 	<li>
 		{@link java.io.InputStream} - Raw contents of {@code InputStream} will be serialized to remote resource.
-		<br><code>Content-Type</code> is set to <js>"application/octet-stream"</js>.
+		<br><c>Content-Type</c> is set to <js>"application/octet-stream"</js>.
 	<li>
-		<code>NameValuePairs</code> - Converted to a URL-encoded FORM post.
-		<br><code>Content-Type</code> is set to <js>"aplication/x-www-form-urlencoded"</js>.
+		<c>NameValuePairs</c> - Converted to a URL-encoded FORM post.
+		<br><c>Content-Type</c> is set to <js>"aplication/x-www-form-urlencoded"</js>.
 	<li>
-		<code>HttpEntity</code> - Bypass Juneau serialization and pass HttpEntity directly to HttpClient.
+		<c>HttpEntity</c> - Bypass Juneau serialization and pass HttpEntity directly to HttpClient.
 </ul>
  
 <p>
@@ -101,7 +101,7 @@
 </p>
 
 <p>
-	If your <code>RestClient</code> class does not have a serializer associated with it, the body will automatically be serialized to a 
+	If your <c>RestClient</c> class does not have a serializer associated with it, the body will automatically be serialized to a 
 	string using the rules defined in {@doc PojosConveribleToStrings}.
 </p>
 
diff --git a/juneau-doc/docs/Topics/10.juneau-rest-client/01.RestProxies/04.FormData.html b/juneau-doc/docs/Topics/10.juneau-rest-client/01.RestProxies/04.FormData.html
index 0a21ecc..ec36452 100644
--- a/juneau-doc/docs/Topics/10.juneau-rest-client/01.RestProxies/04.FormData.html
+++ b/juneau-doc/docs/Topics/10.juneau-rest-client/01.RestProxies/04.FormData.html
@@ -88,7 +88,7 @@
 <ul class='spaced-list'>
 	<li>
 		Any serializable POJO - Converted to a string using the {@link oaj.httppart.HttpPartSerializer} registered with the
-		<code>RestClient</code> ({@link oaj.oapi.OpenApiSerializer} by default) or associated via the {@link oaj.http.annotation.FormData#serializer() @FormData(serializer)} annotation.
+		<c>RestClient</c> ({@link oaj.oapi.OpenApiSerializer} by default) or associated via the {@link oaj.http.annotation.FormData#serializer() @FormData(serializer)} annotation.
 </ul>
 <p>
 	Multi-part arguments (i.e. those with name == <js>"*"</js> or empty) can be any of the following types:
@@ -99,15 +99,15 @@
 	<li>
 		{@link java.io.InputStream} - Raw contents of {@code InputStream} will be serialized to remote resource.
 	<li>
-		<code>NameValuePairs</code> - Converted to a URL-encoded FORM post.
+		<c>NameValuePairs</c> - Converted to a URL-encoded FORM post.
 	<li>
-		<code>Map</code> - Converted to key-value pairs.
+		<c>Map</c> - Converted to key-value pairs.
 			<br>Values serialized using the registered {@link oaj.httppart.HttpPartSerializer} ({@link oaj.oapi.OpenApiSerializer} by default).
 	<li>
 		Bean - Converted to key-value pairs.
 			<br>Values serialized using the registered {@link oaj.httppart.HttpPartSerializer} ({@link oaj.oapi.OpenApiSerializer} by default).
 	<li>
-		<code>CharSequence</code> - Used directly as am <js>"application/x-www-form-urlencoded"</js> entity.
+		<c>CharSequence</c> - Used directly as am <js>"application/x-www-form-urlencoded"</js> entity.
 </ul>
 <p>
 	See the link below for information about supported data types in OpenAPI serialization.
diff --git a/juneau-doc/docs/Topics/10.juneau-rest-client/01.RestProxies/05.Query.html b/juneau-doc/docs/Topics/10.juneau-rest-client/01.RestProxies/05.Query.html
index c61144f..f5011e5 100644
--- a/juneau-doc/docs/Topics/10.juneau-rest-client/01.RestProxies/05.Query.html
+++ b/juneau-doc/docs/Topics/10.juneau-rest-client/01.RestProxies/05.Query.html
@@ -91,7 +91,7 @@
 <ul class='spaced-list'>
 	<li>
 		Any serializable POJO - Converted to a string using the {@link oaj.httppart.HttpPartSerializer} registered with the
-		<code>RestClient</code> ({@link oaj.oapi.OpenApiSerializer} by default) or associated via the {@link oaj.http.annotation.Query#serializer() @Query(serializer)} annotation.
+		<c>RestClient</c> ({@link oaj.oapi.OpenApiSerializer} by default) or associated via the {@link oaj.http.annotation.Query#serializer() @Query(serializer)} annotation.
 </ul>
 
 <p>
@@ -101,15 +101,15 @@
 	<li>
 		{@link java.io.Reader} - Raw contents of {@code Reader} will be serialized directly a query string.
 	<li>
-		<code>NameValuePairs</code> - Serialized as individual query parameters.
+		<c>NameValuePairs</c> - Serialized as individual query parameters.
 	<li>
-		<code>Map</code> - Converted to key-value pairs.
+		<c>Map</c> - Converted to key-value pairs.
 			<br>Values serialized using the registered {@link oaj.httppart.HttpPartSerializer} ({@link oaj.oapi.OpenApiSerializer} by default).
 	<li>
 		Bean - Converted to key-value pairs.
 			<br>Values serialized using the registered {@link oaj.httppart.HttpPartSerializer} ({@link oaj.oapi.OpenApiSerializer} by default).
 	<li>
-		<code>CharSequence</code> - Serialized directly a query string.
+		<c>CharSequence</c> - Serialized directly a query string.
 </ul>
 
 <p>
diff --git a/juneau-doc/docs/Topics/10.juneau-rest-client/01.RestProxies/06.Header.html b/juneau-doc/docs/Topics/10.juneau-rest-client/01.RestProxies/06.Header.html
index 47c5efd..7691872 100644
--- a/juneau-doc/docs/Topics/10.juneau-rest-client/01.RestProxies/06.Header.html
+++ b/juneau-doc/docs/Topics/10.juneau-rest-client/01.RestProxies/06.Header.html
@@ -81,7 +81,7 @@
 <ul class='spaced-list'>
 	<li>
 		Any serializable POJO - Converted to a string using the {@link oaj.httppart.HttpPartSerializer} registered with the
-		<code>RestClient</code> ({@link oaj.oapi.OpenApiSerializer} by default) or associated via the {@link oaj.http.annotation.Header#serializer() @Header(serializer)} annotation.
+		<c>RestClient</c> ({@link oaj.oapi.OpenApiSerializer} by default) or associated via the {@link oaj.http.annotation.Header#serializer() @Header(serializer)} annotation.
 </ul>
 
 <p>
@@ -89,9 +89,9 @@
 </p>
 <ul class='spaced-list'>
 	<li>
-		<code>NameValuePairs</code> - Serialized as individual headers.
+		<c>NameValuePairs</c> - Serialized as individual headers.
 	<li>
-		<code>Map</code> - Converted to key-value pairs.
+		<c>Map</c> - Converted to key-value pairs.
 			<br>Values serialized using the registered {@link oaj.httppart.HttpPartSerializer} ({@link oaj.oapi.OpenApiSerializer} by default).
 	<li>
 		Bean - Converted to key-value pairs.
diff --git a/juneau-doc/docs/Topics/10.juneau-rest-client/01.RestProxies/07.Path.html b/juneau-doc/docs/Topics/10.juneau-rest-client/01.RestProxies/07.Path.html
index 63032bf..75d15c4 100644
--- a/juneau-doc/docs/Topics/10.juneau-rest-client/01.RestProxies/07.Path.html
+++ b/juneau-doc/docs/Topics/10.juneau-rest-client/01.RestProxies/07.Path.html
@@ -74,7 +74,7 @@
 <ul class='spaced-list'>
 	<li>
 		Any serializable POJO - Converted to a string using the {@link oaj.httppart.HttpPartSerializer} registered with the
-		<code>RestClient</code> ({@link oaj.oapi.OpenApiSerializer} by default) or associated via the {@link oaj.http.annotation.Path#serializer() @Path(serializer)} annotation.
+		<c>RestClient</c> ({@link oaj.oapi.OpenApiSerializer} by default) or associated via the {@link oaj.http.annotation.Path#serializer() @Path(serializer)} annotation.
 </ul>
 
 <p>
@@ -82,9 +82,9 @@
 </p>
 <ul class='spaced-list'>
 	<li>
-		<code>NameValuePairs</code> - Serialized as individual query parameters.
+		<c>NameValuePairs</c> - Serialized as individual query parameters.
 	<li>
-		<code>Map</code> - Converted to key-value pairs.
+		<c>Map</c> - Converted to key-value pairs.
 			<br>Values serialized using the registered {@link oaj.httppart.HttpPartSerializer} ({@link oaj.oapi.OpenApiSerializer} by default).
 	<li>
 		Bean - Converted to key-value pairs.
diff --git a/juneau-doc/docs/Topics/10.juneau-rest-client/03.Authentication/02.FORM.html b/juneau-doc/docs/Topics/10.juneau-rest-client/03.Authentication/02.FORM.html
index 3bd07e0..872c9fa 100644
--- a/juneau-doc/docs/Topics/10.juneau-rest-client/03.Authentication/02.FORM.html
+++ b/juneau-doc/docs/Topics/10.juneau-rest-client/03.Authentication/02.FORM.html
@@ -24,7 +24,7 @@
 	authenticated client.
 </p>
 <p>
-	The following example shows how the <code>JazzRestClient</code> class provides FORM-based 
+	The following example shows how the <c>JazzRestClient</c> class provides FORM-based 
 	authentication support.
 </p>
 <p class='bpcode w800'>
diff --git a/juneau-doc/docs/Topics/10.juneau-rest-client/03.Authentication/03.OIDC.html b/juneau-doc/docs/Topics/10.juneau-rest-client/03.Authentication/03.OIDC.html
index afde190..ec1e021 100644
--- a/juneau-doc/docs/Topics/10.juneau-rest-client/03.Authentication/03.OIDC.html
+++ b/juneau-doc/docs/Topics/10.juneau-rest-client/03.Authentication/03.OIDC.html
@@ -16,7 +16,7 @@
 OIDC Authentication
 
 <p>
-	The following example shows how the <code>JazzRestClient</code> class provides OIDC authentication 
+	The following example shows how the <c>JazzRestClient</c> class provides OIDC authentication 
 	support.
 </p>
 <p class='bpcode w800'>
diff --git a/juneau-doc/docs/Topics/10.juneau-rest-client/05.PipingOutput.html b/juneau-doc/docs/Topics/10.juneau-rest-client/05.PipingOutput.html
index 7602dac..58999a8 100644
--- a/juneau-doc/docs/Topics/10.juneau-rest-client/05.PipingOutput.html
+++ b/juneau-doc/docs/Topics/10.juneau-rest-client/05.PipingOutput.html
@@ -16,7 +16,7 @@
 Piping Response Output
 
 <p>
-	The {@link oajrc.RestCall} class provides various convenience <code>pipeTo()</code> 
+	The {@link oajrc.RestCall} class provides various convenience <c>pipeTo()</c> 
 	methods to pipe output to output streams and writers.
 </p>
 <p>
diff --git a/juneau-doc/docs/Topics/10.juneau-rest-client/06.Debugging.html b/juneau-doc/docs/Topics/10.juneau-rest-client/06.Debugging.html
index 5ea9dc1..9e98ddb 100644
--- a/juneau-doc/docs/Topics/10.juneau-rest-client/06.Debugging.html
+++ b/juneau-doc/docs/Topics/10.juneau-rest-client/06.Debugging.html
@@ -22,7 +22,7 @@
 <p>
 	Under-the-covers, this is simply a shortcut for adding the {@link oajrc.RestCallLogger#DEFAULT} 
 	interceptor to the client.  
-	This causes the following output to be generated by the Java <code>org.apache.juneau.rest.client</code> 
+	This causes the following output to be generated by the Java <c>org.apache.juneau.rest.client</c> 
 	logger at <jsf>WARNING</jsf> level:
 </p>
 <p class='bpcode w800 console'>
@@ -48,7 +48,7 @@
 	=== END ========================================================================
 </p>
 <p>
-	This setting also causes a <code>Debug: true</code> header value to trigger logging of the request on the 
+	This setting also causes a <c>Debug: true</c> header value to trigger logging of the request on the 
 	server side as well.
 </p>
 <p class='bpcode w800 console'>
diff --git a/juneau-doc/docs/Topics/11.juneau-rest-mock.html b/juneau-doc/docs/Topics/11.juneau-rest-mock.html
index c64a1c8..58ea3af 100644
--- a/juneau-doc/docs/Topics/11.juneau-rest-mock.html
+++ b/juneau-doc/docs/Topics/11.juneau-rest-mock.html
@@ -35,7 +35,7 @@
 </p>	
 
 <p>
-	The <code>juneau-rest-mock</code> module contains convenience APIs for performing serverless unit
+	The <c>juneau-rest-mock</c> module contains convenience APIs for performing serverless unit
 	testing of your REST APIs.
 	Each of the APIs provide the ability to fully test your server and client REST interfaces without the
 	need for a running servlet container.
diff --git a/juneau-doc/docs/Topics/11.juneau-rest-mock/01.MockRest.html b/juneau-doc/docs/Topics/11.juneau-rest-mock/01.MockRest.html
index 897751e..89e9fb6 100644
--- a/juneau-doc/docs/Topics/11.juneau-rest-mock/01.MockRest.html
+++ b/juneau-doc/docs/Topics/11.juneau-rest-mock/01.MockRest.html
@@ -98,7 +98,7 @@
 	actually having to run in a servlet container.
 </p>
 <p>
-	The <code>create(Object)</code> method can take in either <code>Class</code> objects or pre-instantiated beans.
+	The <c>create(Object)</c> method can take in either <c>Class</c> objects or pre-instantiated beans.
 	The latter is particularly useful for testing Spring beans.
 </p>
 <hr>
@@ -127,8 +127,8 @@
 <ul class='doctree'>
 	<li class='jm'>{@link oajr.mock2.MockRest#build(Object,Marshall) build(Object,Marshall)} - Use media types defined on a marshall.
 	<li class='jm'>{@link oajr.mock2.MockRest#build(Object,Serializer,Parser) build(Object,Serializer,Parser)} - Use media types defined on a serializer and parser.
-	<li class='jm'>{@link oajr.mock2.MockRest.Builder#accept(String) accept(String)} - Explicitly set the <code>Accept</code> header.
-	<li class='jm'>{@link oajr.mock2.MockRest.Builder#contentType(String) contentType(String)} - Explicitly set the <code>Content-Type</code> header.
+	<li class='jm'>{@link oajr.mock2.MockRest.Builder#accept(String) accept(String)} - Explicitly set the <c>Accept</c> header.
+	<li class='jm'>{@link oajr.mock2.MockRest.Builder#contentType(String) contentType(String)} - Explicitly set the <c>Content-Type</c> header.
 </ul>
 <p>
 	Various other convenience methods for common media types are also provided.
@@ -169,19 +169,19 @@
 	</ul>
 </ul>
 <p>
-	For HTTP methods that pass a request body (i.e. <code>PUT</code>,<code>POST</code><code>PATCH</code>), the body object can be any of the following types:
+	For HTTP methods that pass a request body (i.e. <c>PUT</c>,<c>POST</c><c>PATCH</c>), the body object can be any of the following types:
 </p>
 <ul>
-	<li><code><jk>byte</jk>[]</code>
+	<li><c><jk>byte</jk>[]</c>
 	<li>{@link java.io.Reader}
 	<li>{@link java.io.InputStream}
 	<li>{@link java.lang.CharSequence}
 </ul>
 <p>
-	All other body object types are converted to strings using the <code>toString()</code> method.
+	All other body object types are converted to strings using the <c>toString()</c> method.
 </p>
 <p>
-	A common tactic is to override a bean's <code>toString()</code> method to return Simple JSON so that
+	A common tactic is to override a bean's <c>toString()</c> method to return Simple JSON so that
 	instances can be passed to the methods above.
 </p>
 <p class='bpcode w800'>
@@ -200,7 +200,7 @@
 	on the {@link javax.servlet.http.HttpServletRequest} in addition to many convenience methods.
 </p>
 <p>
-	The following fluent convenience methods are provided for setting common <code>Accept</code> and <code>Content-Type</code> headers.
+	The following fluent convenience methods are provided for setting common <c>Accept</c> and <c>Content-Type</c> headers.
 </p>
 <ul class='doctree'>
 	<li class='jc'>{@link oajr.mock2.MockServletRequest}
diff --git a/juneau-doc/docs/Topics/11.juneau-rest-mock/02.MockRemoteResource.html b/juneau-doc/docs/Topics/11.juneau-rest-mock/02.MockRemoteResource.html
index ad12529..232e889 100644
--- a/juneau-doc/docs/Topics/11.juneau-rest-mock/02.MockRemoteResource.html
+++ b/juneau-doc/docs/Topics/11.juneau-rest-mock/02.MockRemoteResource.html
@@ -54,8 +54,8 @@
 </p>
 <p>
 	Remote resource interfaces are normally created through the {@link oajrc.RestClient#getRemoteResource(Class)} method.
-	The {@link oajr.mock2.MockRemoteResource} will create a {@link oajrc.RestClient} using a specialized <code>HttpClientConnectionManager</code>
-	designed to transform client-side <code>HttpRequest</code>/<code>HttpResponse</code> objects into server-side 
+	The {@link oajr.mock2.MockRemoteResource} will create a {@link oajrc.RestClient} using a specialized <c>HttpClientConnectionManager</c>
+	designed to transform client-side <c>HttpRequest</c>/<c>HttpResponse</c> objects into server-side 
 	{@link oajr.mock2.MockServletRequest}/{@link oajr.mock2.MockServletResponse} objects and then pass those to the {@link oajr.mock2.MockRest} 
 	object described in the previous section.
 </p>
diff --git a/juneau-doc/docs/Topics/12.juneau-microservice-core/05.Config.html b/juneau-doc/docs/Topics/12.juneau-microservice-core/05.Config.html
index 0e36fb4..00dcf4c 100644
--- a/juneau-doc/docs/Topics/12.juneau-microservice-core/05.Config.html
+++ b/juneau-doc/docs/Topics/12.juneau-microservice-core/05.Config.html
@@ -36,7 +36,7 @@
 			<li>
 				The <js>"configFile"</js> argument in the command line arguments passed in through the constructor.
 			<li>
-				The value of the <code>Main-Config</code> entry in the manifest file.
+				The value of the <c>Main-Config</c> entry in the manifest file.
 			<li>
 				A config file in the same location and with the same name as the executable jar file.
 				(e.g. <js>"java -jar myjar.jar"</js> will look for <js>"myjar.cfg"</js>).
@@ -46,11 +46,11 @@
 	<li>
 		Resolve any of the following files in the classpath:
 		<ol>
-			<li><code>juneau.cfg</code>
-			<li><code>default.cfg</code>
-			<li><code>application.cfg</code>
-			<li><code>app.cfg</code>
-			<li><code>settings.cfg</code>
+			<li><c>juneau.cfg</c>
+			<li><c>default.cfg</c>
+			<li><c>application.cfg</c>
+			<li><c>app.cfg</c>
+			<li><c>settings.cfg</c>
 		</ol>
 </ol>
 <p>
diff --git a/juneau-doc/docs/Topics/12.juneau-microservice-core/06.SystemProperties.html b/juneau-doc/docs/Topics/12.juneau-microservice-core/06.SystemProperties.html
index 2996fee..da750c4 100644
--- a/juneau-doc/docs/Topics/12.juneau-microservice-core/06.SystemProperties.html
+++ b/juneau-doc/docs/Topics/12.juneau-microservice-core/06.SystemProperties.html
@@ -16,7 +16,7 @@
 System properties
 
 <p>
-	As a convenience, the <code>SystemProperties</code> section of your configuration file can be used to define system
+	As a convenience, the <c>SystemProperties</c> section of your configuration file can be used to define system
 	properties to set during initialization of your microservice:
 </p>
 <p class='bpcode w800'>
diff --git a/juneau-doc/docs/Topics/12.juneau-microservice-core/07.VarResolver.html b/juneau-doc/docs/Topics/12.juneau-microservice-core/07.VarResolver.html
index 7424cbe..57e70ff 100644
--- a/juneau-doc/docs/Topics/12.juneau-microservice-core/07.VarResolver.html
+++ b/juneau-doc/docs/Topics/12.juneau-microservice-core/07.VarResolver.html
@@ -44,17 +44,17 @@
 	By default, support for the following variables are provided:
 </p>
 <ul>
-	<li><code>$S{key[,default]}</code> - {@link oaj.svl.vars.SystemPropertiesVar}
-	<li><code>$E{key[,default]}</code> - {@link oaj.svl.vars.EnvVariablesVar}
-	<li><code>$A{key[,default]}</code> - {@link oaj.svl.vars.ArgsVar}
-	<li><code>$C{key[,default]}</code> - {@link oaj.config.vars.ConfigVar}
-	<li><code>$MF{key[,default]}</code> - {@link oaj.svl.vars.ManifestFileVar}
-	<li><code>$IF{arg,then[,else]}</code> - {@link oaj.svl.vars.IfVar}
-	<li><code>$SW{arg,pattern1:then1[,pattern2:then2...]}</code> - {@link oaj.svl.vars.SwitchVar}
-	<li><code>$CO{arg[,arg2...]}</code> - {@link oaj.svl.vars.CoalesceVar}
-	<li><code>$PM{arg,pattern}</code> - {@link oaj.svl.vars.PatternMatchVar}
-	<li><code>$UC{arg}</code> - {@link oaj.svl.vars.UpperCaseVar}
-	<li><code>$LC{arg}</code> - {@link oaj.svl.vars.LowerCaseVar}
-	<li><code>$NE{arg}</code> - {@link oaj.svl.vars.NotEmptyVar}
+	<li><c>$S{key[,default]}</c> - {@link oaj.svl.vars.SystemPropertiesVar}
+	<li><c>$E{key[,default]}</c> - {@link oaj.svl.vars.EnvVariablesVar}
+	<li><c>$A{key[,default]}</c> - {@link oaj.svl.vars.ArgsVar}
+	<li><c>$C{key[,default]}</c> - {@link oaj.config.vars.ConfigVar}
+	<li><c>$MF{key[,default]}</c> - {@link oaj.svl.vars.ManifestFileVar}
+	<li><c>$IF{arg,then[,else]}</c> - {@link oaj.svl.vars.IfVar}
+	<li><c>$SW{arg,pattern1:then1[,pattern2:then2...]}</c> - {@link oaj.svl.vars.SwitchVar}
+	<li><c>$CO{arg[,arg2...]}</c> - {@link oaj.svl.vars.CoalesceVar}
+	<li><c>$PM{arg,pattern}</c> - {@link oaj.svl.vars.PatternMatchVar}
+	<li><c>$UC{arg}</c> - {@link oaj.svl.vars.UpperCaseVar}
+	<li><c>$LC{arg}</c> - {@link oaj.svl.vars.LowerCaseVar}
+	<li><c>$NE{arg}</c> - {@link oaj.svl.vars.NotEmptyVar}
 </ul>
 	 
\ No newline at end of file
diff --git a/juneau-doc/docs/Topics/13.juneau-microservice-jetty/01.Overview.html b/juneau-doc/docs/Topics/13.juneau-microservice-jetty/01.Overview.html
index 7fe33e8..5bc08b0 100644
--- a/juneau-doc/docs/Topics/13.juneau-microservice-jetty/01.Overview.html
+++ b/juneau-doc/docs/Topics/13.juneau-microservice-jetty/01.Overview.html
@@ -24,7 +24,7 @@
 	easy-to-use microservices in a standard Java 1.8+ environment.
 </p>
 <p>
-	The <code>juneau-microservice-jetty</code> library consists of the following classes:
+	The <c>juneau-microservice-jetty</c> library consists of the following classes:
 </p>
 <ul class='doctree'>
 	<li class='jp'>{@link oaj.microservice.jetty}
diff --git a/juneau-doc/docs/Topics/13.juneau-microservice-jetty/03.ResourceClasses.html b/juneau-doc/docs/Topics/13.juneau-microservice-jetty/03.ResourceClasses.html
index 18c97d9..85e724b 100644
--- a/juneau-doc/docs/Topics/13.juneau-microservice-jetty/03.ResourceClasses.html
+++ b/juneau-doc/docs/Topics/13.juneau-microservice-jetty/03.ResourceClasses.html
@@ -134,7 +134,7 @@
 		}</cv>
 	</cv>	
 	<li>
-		Directly in the <code>jetty.xml</code> file.
+		Directly in the <c>jetty.xml</c> file.
 		<p class='bcode w800'>
 	<xt>&lt;Configure</xt> <xa>id</xa>=<xs>"ExampleServer"</xs> <xa>class</xa>=<xs>"org.eclipse.jetty.server.Server"</xs><xt>&gt;</xt>
 		...
diff --git a/juneau-doc/docs/Topics/13.juneau-microservice-jetty/05.Config.html b/juneau-doc/docs/Topics/13.juneau-microservice-jetty/05.Config.html
index fae8126..26f06ae 100644
--- a/juneau-doc/docs/Topics/13.juneau-microservice-jetty/05.Config.html
+++ b/juneau-doc/docs/Topics/13.juneau-microservice-jetty/05.Config.html
@@ -24,7 +24,7 @@
 <p>
 	The most common usage for the configuration file is to reference values using the {@link oaj.config.vars.ConfigVar $C} variable in annotations.
 	For example, the {@link oajr.BasicRestConfig} interface that defines the annotations that control the look-and-feel of
-	classes that extend from {@link oajr.BasicRestServlet} use several <code>$C</code> variables to externalize values:
+	classes that extend from {@link oajr.BasicRestServlet} use several <c>$C</c> variables to externalize values:
 </p>
 <p class='bpcode w800'>
 	<ja>@RestResource</ja>(
@@ -66,7 +66,7 @@
 </p>
 <p>
 	These values in turn are pulled from the external configuration file shown below.
-	Note that the configuration file can also contain <code>$C</code> variables.
+	Note that the configuration file can also contain <c>$C</c> variables.
 </p>
 <p class='bpcode w800'>
 	<cc>#=======================================================================================================================
diff --git a/juneau-doc/docs/Topics/13.juneau-microservice-jetty/06.JettyXml.html b/juneau-doc/docs/Topics/13.juneau-microservice-jetty/06.JettyXml.html
index 873acfc..3c55baa 100644
--- a/juneau-doc/docs/Topics/13.juneau-microservice-jetty/06.JettyXml.html
+++ b/juneau-doc/docs/Topics/13.juneau-microservice-jetty/06.JettyXml.html
@@ -16,10 +16,10 @@
 Jetty.xml file
 
 <p>
-	The Jetty microservice comes with a bare-bones <code>jetty.xml</code> file which can be modified to suite any needs. 
+	The Jetty microservice comes with a bare-bones <c>jetty.xml</c> file which can be modified to suite any needs. 
 </p>	
 <p>
-	The <code>jetty.xml</code> can be located in either the <js>"."</js> or <js>"files"</js> working directory or classpath.
+	The <c>jetty.xml</c> can be located in either the <js>"."</js> or <js>"files"</js> working directory or classpath.
 	It can also be specified in any of the following ways:
 </p>
 <ul class='spaced-list'>
@@ -27,7 +27,7 @@
 		Using the {@link oaj.microservice.jetty.JettyMicroserviceBuilder#jettyXml(Object,boolean)} method to specify the location or contents
 		of the file.
 	<li>
-		Specifying the location using a <code>Jetty-Config</code> value in the <code>MANIFEST.MF</code> file.
+		Specifying the location using a <c>Jetty-Config</c> value in the <c>MANIFEST.MF</c> file.
 		<p class='bcode w800'>
 	<mk>Jetty-Config:</mk> <mv>files/jetty.xml</mv>
 		</p>
@@ -44,8 +44,8 @@
 		</p>
 </ul>
 <p>
-	SVL variables in the <code>jetty.xml</code> file are automatically resolved by the microservice.
-	This allows you to reference values in your configuration file from the <code>jetty.xml</code> file.
+	SVL variables in the <c>jetty.xml</c> file are automatically resolved by the microservice.
+	This allows you to reference values in your configuration file from the <c>jetty.xml</c> file.
 </p>
 <p>
 	The HTTP port used is controlled via the following:
@@ -77,7 +77,7 @@
 </ul>
 <p>
 	The first available port is then made available through the system property <js>"availablePort"</js> so that it
-	can be referenced in our <code>jetty.xml</code> file.
+	can be referenced in our <c>jetty.xml</c> file.
 </p>
 <p class='bpcode w800'>
 	<xt>&lt;Set</xt> <xa>name</xa>=<xs>"connectors"</xs><xt>&gt;</xt>
diff --git a/juneau-doc/docs/Topics/13.juneau-microservice-jetty/07.UiCustomization.html b/juneau-doc/docs/Topics/13.juneau-microservice-jetty/07.UiCustomization.html
index ffdb5bd..575bdd5 100644
--- a/juneau-doc/docs/Topics/13.juneau-microservice-jetty/07.UiCustomization.html
+++ b/juneau-doc/docs/Topics/13.juneau-microservice-jetty/07.UiCustomization.html
@@ -16,7 +16,7 @@
 UI Customization
 
 <p>
-	The Microservice project contains a <code>files/htdocs</code> folder with predefined stylesheets and
+	The Microservice project contains a <c>files/htdocs</c> folder with predefined stylesheets and
 	images.
 </p>
 <img style='width:200px' src='doc-files/juneau-microservice-jetty.UiCustomization.1.png'>
@@ -100,12 +100,12 @@
 	<jk>public interface</jk> BasicRestConfig {}
 </p>
 <p>
-	Note that the <code>files/htdocs</code> directory is mapped to <js>"servlet:/htdocs"</js> using the <code>staticFiles</code>
+	Note that the <c>files/htdocs</c> directory is mapped to <js>"servlet:/htdocs"</js> using the <c>staticFiles</c>
 	setting.  This allows those files to be served up through the servlet through the URL <js>"/[servlet-path]/htdocs"</js>
 </p>
 <p>
 	The theme files are externally accessible and can be modified to produce any look-and-feel you desire.
-	The microservice still works without the files directory.  An embedded <code>devops.css</code> is included in the jar as a default spreadsheet.
+	The microservice still works without the files directory.  An embedded <c>devops.css</c> is included in the jar as a default spreadsheet.
 </p>
 <p>
 	If you're testing out changes in the theme stylesheets, you may want to set the following system property that prevents caching of those files so 
diff --git a/juneau-doc/docs/Topics/14.my-jetty-microservice/01.Installing.html b/juneau-doc/docs/Topics/14.my-jetty-microservice/01.Installing.html
index 3a3bbff..9b869ff 100644
--- a/juneau-doc/docs/Topics/14.my-jetty-microservice/01.Installing.html
+++ b/juneau-doc/docs/Topics/14.my-jetty-microservice/01.Installing.html
@@ -20,7 +20,7 @@
 </p>		
 <ol class='spaced-list'>
 	<li>
-		Download the <code>my-jetty-microservice-{@property juneauVersion}.zip</code> file from the downloads page
+		Download the <c>my-jetty-microservice-{@property juneauVersion}.zip</c> file from the downloads page
 		(located in the binaries) and import it into your workspace as an existing project:
 		<br><br>
 		<img class='bordered' src='doc-files/my-jetty-microservice.Installing.1.png' style='width:524px'>
diff --git a/juneau-doc/docs/Topics/14.my-jetty-microservice/02.Running.html b/juneau-doc/docs/Topics/14.my-jetty-microservice/02.Running.html
index 081d34e..9fae09c 100644
--- a/juneau-doc/docs/Topics/14.my-jetty-microservice/02.Running.html
+++ b/juneau-doc/docs/Topics/14.my-jetty-microservice/02.Running.html
@@ -43,5 +43,5 @@
 </p>			
 <img class='bordered w400' src='doc-files/my-jetty-microservice.Running.1.png'>
 <p>
-	You can enter the command <code>exit</code> to shut it down.
+	You can enter the command <c>exit</c> to shut it down.
 </p>
diff --git a/juneau-doc/docs/Topics/14.my-jetty-microservice/03.Building.html b/juneau-doc/docs/Topics/14.my-jetty-microservice/03.Building.html
index abded94..f587265 100644
--- a/juneau-doc/docs/Topics/14.my-jetty-microservice/03.Building.html
+++ b/juneau-doc/docs/Topics/14.my-jetty-microservice/03.Building.html
@@ -26,14 +26,14 @@
 	mvn clean install
 </p>
 <p>
-	Your <code>target</code> directory should now contain the following files:
+	Your <c>target</c> directory should now contain the following files:
 </p>
 <ul>
-	<li><code>my-jetty-microservice-1.0.jar</code>
-	<li><code>my-jetty-microservice.cfg</code>
+	<li><c>my-jetty-microservice-1.0.jar</c>
+	<li><c>my-jetty-microservice.cfg</c>
 </ul>
 <p>
-	To start from a command line, run the following command from inside your <code>target</code> directory:
+	To start from a command line, run the following command from inside your <c>target</c> directory:
 </p>
 <p class='bpcode w800'>
 	java -jar my-jetty-microservice-1.0.jar
diff --git a/juneau-doc/docs/Topics/15.my-springboot-microservice/01.Installing.html b/juneau-doc/docs/Topics/15.my-springboot-microservice/01.Installing.html
index 6026f7a..758a182 100644
--- a/juneau-doc/docs/Topics/15.my-springboot-microservice/01.Installing.html
+++ b/juneau-doc/docs/Topics/15.my-springboot-microservice/01.Installing.html
@@ -20,7 +20,7 @@
 </p>		
 <ol class='spaced-list'>
 	<li>
-		Download the <code>my-springboot-microservice-{@property juneauVersion}.zip</code> file from the downloads page
+		Download the <c>my-springboot-microservice-{@property juneauVersion}.zip</c> file from the downloads page
 		(located in the binaries) and import it into your workspace as an existing project:
 		<br><br>
 		<img class='bordered' src='doc-files/my-springboot-microservice.Installing.1.png' style='width:524px'>
diff --git a/juneau-doc/docs/Topics/15.my-springboot-microservice/03.Building.html b/juneau-doc/docs/Topics/15.my-springboot-microservice/03.Building.html
index 863c796..57455fa 100644
--- a/juneau-doc/docs/Topics/15.my-springboot-microservice/03.Building.html
+++ b/juneau-doc/docs/Topics/15.my-springboot-microservice/03.Building.html
@@ -26,13 +26,13 @@
 	mvn clean install
 </p>
 <p>
-	Your <code>target</code> directory should now contain the following files:
+	Your <c>target</c> directory should now contain the following files:
 </p>
 <ul>
-	<li><code>my-springboot-microservice-1.0.jar</code>
+	<li><c>my-springboot-microservice-1.0.jar</c>
 </ul>
 <p>
-	To start from a command line, run the following command from inside your <code>target</code> directory:
+	To start from a command line, run the following command from inside your <c>target</c> directory:
 </p>
 <p class='bpcode w800'>
 	java -jar my-springboot-microservice-1.0.jar
diff --git a/juneau-doc/docs/Topics/16.juneau-examples-core.html b/juneau-doc/docs/Topics/16.juneau-examples-core.html
index 81db306..9016584 100644
--- a/juneau-doc/docs/Topics/16.juneau-examples-core.html
+++ b/juneau-doc/docs/Topics/16.juneau-examples-core.html
@@ -21,5 +21,5 @@
 </p>	
 
 <p>
-	The <code>juneau-examples-core</code> project contains various code examples for using the core APIs. 
+	The <c>juneau-examples-core</c> project contains various code examples for using the core APIs. 
 </p>
diff --git a/juneau-doc/docs/Topics/16.juneau-examples-core/01.Installing.html b/juneau-doc/docs/Topics/16.juneau-examples-core/01.Installing.html
index 89f5f1b..6d014e7 100644
--- a/juneau-doc/docs/Topics/16.juneau-examples-core/01.Installing.html
+++ b/juneau-doc/docs/Topics/16.juneau-examples-core/01.Installing.html
@@ -20,7 +20,7 @@
 </p>		
 <ol class='spaced-list'>
 	<li>
-		Download the <code>juneau-examples-core-{@property juneauVersion}.zip</code> file from the downloads page
+		Download the <c>juneau-examples-core-{@property juneauVersion}.zip</c> file from the downloads page
 		(located in the binaries) and import it into your workspace as an existing project:
 		<br><br>
 		<img class='bordered' src='doc-files/juneau-examples-core.Installing.1.png' style='width:524px'>
diff --git a/juneau-doc/docs/Topics/17.juneau-examples-rest.html b/juneau-doc/docs/Topics/17.juneau-examples-rest.html
index 145ec49..1aa96ea 100644
--- a/juneau-doc/docs/Topics/17.juneau-examples-rest.html
+++ b/juneau-doc/docs/Topics/17.juneau-examples-rest.html
@@ -35,7 +35,7 @@
 </p>	
 
 <p>
-	The <code>juneau-examples-rest</code> project includes various examples of REST resources written
+	The <c>juneau-examples-rest</c> project includes various examples of REST resources written
 	using Juneau.
 </p>
 <p>
diff --git a/juneau-doc/docs/Topics/17.juneau-examples-rest/01.RootResources.html b/juneau-doc/docs/Topics/17.juneau-examples-rest/01.RootResources.html
index df61165..1f24cb0 100644
--- a/juneau-doc/docs/Topics/17.juneau-examples-rest/01.RootResources.html
+++ b/juneau-doc/docs/Topics/17.juneau-examples-rest/01.RootResources.html
@@ -36,7 +36,7 @@
 								{@link oaj.rest.BasicRestServletJenaGroup} - Group resource with added RDF support.
 								<ul>
 									<li class='jc'>
-										<code>RootResources</code>
+										<c>RootResources</c>
 								</ul>
 							</li>
 						</ul>
diff --git a/juneau-doc/docs/Topics/17.juneau-examples-rest/03.PetStoreResource.html b/juneau-doc/docs/Topics/17.juneau-examples-rest/03.PetStoreResource.html
index 2c8c468..e0d9a18 100644
--- a/juneau-doc/docs/Topics/17.juneau-examples-rest/03.PetStoreResource.html
+++ b/juneau-doc/docs/Topics/17.juneau-examples-rest/03.PetStoreResource.html
@@ -16,7 +16,7 @@
 PetStore
 
 <p>
-	The <code>PetStore</code> application is an functional application meant to demonstrate the following:
+	The <c>PetStore</c> application is an functional application meant to demonstrate the following:
 </p>
 <ul class='spaced-list'>
 	<li>
@@ -129,20 +129,20 @@
 	The application itself is defined in 3 packages:
 </p>
 <ul class='doctree'>
-	<li class='jp'><code>org.apache.juneau.rest.examples.rest.petstore</code>
+	<li class='jp'><c>org.apache.juneau.rest.examples.rest.petstore</c>
 		<br>Defines the service for storing and retrieving Petstore data.
 		<br><img class='bordered' style='width:250px' src='doc-files/juneau-examples-rest.PetStoreResource.2a.png'>
-	<li class='jp'><code>org.apache.juneau.rest.examples.rest.petstore.dto</code>
+	<li class='jp'><c>org.apache.juneau.rest.examples.rest.petstore.dto</c>
 		<br>Data transfer objects.
 		<br>These are JPA beans that are used both to store data in our database and are serialized
 		directly by our REST interface.
 		<br><img class='bordered' style='width:250px' src='doc-files/juneau-examples-rest.PetStoreResource.2b.png'>
-	<li class='jp'><code>org.apache.juneau.rest.examples.rest.petstore.rest</code>
+	<li class='jp'><c>org.apache.juneau.rest.examples.rest.petstore.rest</c>
 		<br>The classes used for our REST interface.
 		<br><img class='bordered' style='width:250px' src='doc-files/juneau-examples-rest.PetStoreResource.2c.png'>
 </ul>
 <p>
-	We also define some static files in the <code>org.apache.juneau.rest.examples.rest.petstore</code> package:
+	We also define some static files in the <c>org.apache.juneau.rest.examples.rest.petstore</c> package:
 </p>
 <img class='bordered' style='width:250px' src='doc-files/juneau-examples-rest.PetStoreResource.2d.png'>
 <hr>
@@ -570,7 +570,7 @@
 <img class='bordered w800' src='doc-files/juneau-examples-rest.PetStoreResource.4b.png'>
 <p>
 	You'll notice the details page shows <l>tags</l> and <l>photo</l> fields not shown on the summary page.
-	This was accomplished with the <code>bpx=<js>"Pet: tags,photo"</js></code> annotation on the <l>getPets()</l>
+	This was accomplished with the <c>bpx=<js>"Pet: tags,photo"</js></c> annotation on the <l>getPets()</l>
 	method which excludes those two properties from the view. 
 	This is a common way of defining summary and details views for POJOs.
 </p>
@@ -660,7 +660,7 @@
 </p>			
 <img class='bordered w800' src='doc-files/juneau-examples-rest.PetStoreResource.5b.png'>
 <p>
-	Note that we're using the convenience feature for specifying an <code>Accept</code> header via a query parameter.
+	Note that we're using the convenience feature for specifying an <c>Accept</c> header via a query parameter.
 </p>
 <p>
 	The <l>THEME</l> menu items allows you to quickly change the stylesheet used on the page:
diff --git a/juneau-doc/docs/Topics/18.juneau-examples-rest-jetty.html b/juneau-doc/docs/Topics/18.juneau-examples-rest-jetty.html
index 03e5dac..cecc824 100644
--- a/juneau-doc/docs/Topics/18.juneau-examples-rest-jetty.html
+++ b/juneau-doc/docs/Topics/18.juneau-examples-rest-jetty.html
@@ -21,6 +21,6 @@
 </p>	
 
 <p>
-	The <code>juneau-examples-rest-jetty</code> project includes everything you need create a Samples REST 
+	The <c>juneau-examples-rest-jetty</c> project includes everything you need create a Samples REST 
 	microservice in an Eclipse workspace and build it as an executable jar.
 </p>
diff --git a/juneau-doc/docs/Topics/18.juneau-examples-rest-jetty/01.Installing.html b/juneau-doc/docs/Topics/18.juneau-examples-rest-jetty/01.Installing.html
index 896ac67..6d4d318 100644
--- a/juneau-doc/docs/Topics/18.juneau-examples-rest-jetty/01.Installing.html
+++ b/juneau-doc/docs/Topics/18.juneau-examples-rest-jetty/01.Installing.html
@@ -20,7 +20,7 @@
 </p>		
 <ol class='spaced-list'>
 	<li>
-		Download the <code>juneau-examples-rest-jetty-{@property juneauVersion}.zip</code> file from the downloads page
+		Download the <c>juneau-examples-rest-jetty-{@property juneauVersion}.zip</c> file from the downloads page
 		(located in the binaries) and import it into your workspace as an existing project:
 		<br><br>
 		<img class='bordered' src='doc-files/juneau-examples-rest-jetty.Installing.1.png' style='width:524px'>
diff --git a/juneau-doc/docs/Topics/18.juneau-examples-rest-jetty/02.Running.html b/juneau-doc/docs/Topics/18.juneau-examples-rest-jetty/02.Running.html
index 6560cd5..59de253 100644
--- a/juneau-doc/docs/Topics/18.juneau-examples-rest-jetty/02.Running.html
+++ b/juneau-doc/docs/Topics/18.juneau-examples-rest-jetty/02.Running.html
@@ -43,5 +43,5 @@
 </p>			
 <img class='bordered w400' src='doc-files/juneau-examples-rest-jetty.Running.1.png'>
 <p>
-	You can enter the command <code>exit</code> to shut it down.
+	You can enter the command <c>exit</c> to shut it down.
 </p>
diff --git a/juneau-doc/docs/Topics/18.juneau-examples-rest-jetty/03.Building.html b/juneau-doc/docs/Topics/18.juneau-examples-rest-jetty/03.Building.html
index f162a65..9daa8a1 100644
--- a/juneau-doc/docs/Topics/18.juneau-examples-rest-jetty/03.Building.html
+++ b/juneau-doc/docs/Topics/18.juneau-examples-rest-jetty/03.Building.html
@@ -26,14 +26,14 @@
 	mvn clean install
 </p>
 <p>
-	Your <code>target</code> directory should now contain the following files:
+	Your <c>target</c> directory should now contain the following files:
 </p>
 <ul>
-	<li><code>juneau-examples-rest-jetty-1.0.jar</code>
-	<li><code>juneau-examples-rest-jetty.cfg</code>
+	<li><c>juneau-examples-rest-jetty-1.0.jar</c>
+	<li><c>juneau-examples-rest-jetty.cfg</c>
 </ul>
 <p>
-	To start from a command line, run the following command from inside your <code>target</code> directory:
+	To start from a command line, run the following command from inside your <c>target</c> directory:
 </p>
 <p class='bpcode w800'>
 	java -jar juneau-examples-rest-jetty-1.0.jar
diff --git a/juneau-doc/docs/Topics/19.juneau-examples-rest-springboot.html b/juneau-doc/docs/Topics/19.juneau-examples-rest-springboot.html
index 7e7dbc9..0f4a519 100644
--- a/juneau-doc/docs/Topics/19.juneau-examples-rest-springboot.html
+++ b/juneau-doc/docs/Topics/19.juneau-examples-rest-springboot.html
@@ -21,7 +21,7 @@
 </p>	
 
 <p>
-	The <code>juneau-examples-rest-springboot</code> library contains the same examples as <code>juneau-examples-rest</code>
+	The <c>juneau-examples-rest-springboot</c> library contains the same examples as <c>juneau-examples-rest</c>
 	but also includes the following:
 </p>
 <ul class='spaced-list'>
@@ -30,7 +30,7 @@
 	<li>
 		A resource resolver for resolving REST resources as injectable beans.
 	<li>
-		A POM that extends from <code>spring-boot-starter-parent</code> that allows you to build a fully-shaded executable jar.
+		A POM that extends from <c>spring-boot-starter-parent</c> that allows you to build a fully-shaded executable jar.
 	<li>
 		Configuration files for deploying the microservice to Heroku.
 </ul>
diff --git a/juneau-doc/docs/Topics/19.juneau-examples-rest-springboot/01.Installing.html b/juneau-doc/docs/Topics/19.juneau-examples-rest-springboot/01.Installing.html
index 1904fe9..6a9d9cd 100644
--- a/juneau-doc/docs/Topics/19.juneau-examples-rest-springboot/01.Installing.html
+++ b/juneau-doc/docs/Topics/19.juneau-examples-rest-springboot/01.Installing.html
@@ -20,7 +20,7 @@
 </p>		
 <ol class='spaced-list'>
 	<li>
-		Download the <code>juneau-examples-rest-springboot-{@property juneauVersion}.zip</code> file from the downloads page
+		Download the <c>juneau-examples-rest-springboot-{@property juneauVersion}.zip</c> file from the downloads page
 		(located in the binaries) and import it into your workspace as an existing project:
 		<br><br>
 		<img class='bordered' src='doc-files/juneau-examples-rest-springboot.Installing.1.png' style='width:524px'>
diff --git a/juneau-doc/docs/Topics/19.juneau-examples-rest-springboot/03.Building.html b/juneau-doc/docs/Topics/19.juneau-examples-rest-springboot/03.Building.html
index 689c1a2..7377d4f 100644
--- a/juneau-doc/docs/Topics/19.juneau-examples-rest-springboot/03.Building.html
+++ b/juneau-doc/docs/Topics/19.juneau-examples-rest-springboot/03.Building.html
@@ -26,13 +26,13 @@
 	mvn clean install
 </p>
 <p>
-	Your <code>target</code> directory should now contain the following files:
+	Your <c>target</c> directory should now contain the following files:
 </p>
 <ul>
-	<li><code>juneau-examples-rest-springboot-1.0.jar</code>
+	<li><c>juneau-examples-rest-springboot-1.0.jar</c>
 </ul>
 <p>
-	To start from a command line, run the following command from inside your <code>target</code> directory:
+	To start from a command line, run the following command from inside your <c>target</c> directory:
 </p>
 <p class='bpcode w800'>
 	java -jar juneau-examples-rest-springboot-1.0.jar
diff --git a/juneau-doc/docs/Topics/20.Security/01.juneau-marshall.html b/juneau-doc/docs/Topics/20.Security/01.juneau-marshall.html
index 66cc5fa..6644cda 100644
--- a/juneau-doc/docs/Topics/20.Security/01.juneau-marshall.html
+++ b/juneau-doc/docs/Topics/20.Security/01.juneau-marshall.html
@@ -25,8 +25,8 @@
 	Fortunately, Juneau does not support an open-ended <js>"class</js> attribute.  
 	As a rule, it should not be possible to create arbitrary POJOs by any of the parsers.
 	The demarshalled object types are inferred via reflection of the class objects passed in through the parser 
-	method (e.g. <code>JsonParser.<jsf>DEFAULT</jsf>.parse(input, MyBean.<jk>class</jk>)</code>).
-	As long as the <code>Class</code> object passed into this method is not constructed from user-generated input,
+	method (e.g. <c>JsonParser.<jsf>DEFAULT</jsf>.parse(input, MyBean.<jk>class</jk>)</c>).
+	As long as the <c>Class</c> object passed into this method is not constructed from user-generated input,
 	it should be free from demarshalling vulnerabilities.   
 </p> 
 <p>
@@ -68,7 +68,7 @@
 	top of plain-old Java Object Serialization which itself is vulnerable to demarshalling issues.  
 	Due to this, the JSO parser is not included in any of the default REST servlet implementations. 
 	Be especially careful when using this parser, particularly if you want to use it for handing 
-	<code>application/x-java-serialized-object</code> input through REST servlets. 
+	<c>application/x-java-serialized-object</c> input through REST servlets. 
 </p>
 <p>
 	All other parsers (JSON, URL-Encoding, MessagePack, etc...) work the same way in determining POJO types, so
@@ -85,5 +85,5 @@
 	<li>The XML and HTML parsers uses the built-in Java StAX parser.
 		This *should* be free from vulnerabilities.    
 	<li>The RDF parsers rely on Apache Jena 2.7.1.  
-		As of <code>7.0.1</code>, no known security vulnerabilities exist that affect Juneau at this time.
+		As of <c>7.0.1</c>, no known security vulnerabilities exist that affect Juneau at this time.
 </ul>
diff --git a/juneau-doc/docs/Topics/20.Security/02.juneau-svl.html b/juneau-doc/docs/Topics/20.Security/02.juneau-svl.html
index 3c748b4..4a833f3 100644
--- a/juneau-doc/docs/Topics/20.Security/02.juneau-svl.html
+++ b/juneau-doc/docs/Topics/20.Security/02.juneau-svl.html
@@ -35,10 +35,10 @@
 	}
 </p>
 <p>
-	This code is simply echoing the value of the <code>foo</code> query parameter.
+	This code is simply echoing the value of the <c>foo</c> query parameter.
 	Now say for example that a bad actor passes in the query string <js>"foo=$F{/some/file/on/file/system}"</js>.
-	The <code>$F</code> variable allows you to resolve the contents of files using SVL, and is provided
-	by default using the built-in variable resolver returned by the <code>RestRequest</code> object.
+	The <c>$F</c> variable allows you to resolve the contents of files using SVL, and is provided
+	by default using the built-in variable resolver returned by the <c>RestRequest</c> object.
 	You've potentially just exposed the contents of that file through your REST interface.
 </p>
 <p>
@@ -46,12 +46,12 @@
 </p>
 <ul class='spaced-list'>
 	<li>
-		<code>Vars</code> have two methods {@link oaj.svl.Var#allowNested()} and 
+		<c>Vars</c> have two methods {@link oaj.svl.Var#allowNested()} and 
 		{@link oaj.svl.Var#allowRecurse()} that can be overridden to prevent recursive processing
-		of string variables.  These are both <jk>false</jk> for the <code>$R</code> variable, so the <code>$F</code>
+		of string variables.  These are both <jk>false</jk> for the <c>$R</c> variable, so the <c>$F</c>
 		variable in the result will never get processed and instead be treated as plain text. 
 	<li>
-		The <code>$F</code> variable only allows you to retrieve files within the JVM starting directory. 
+		The <c>$F</c> variable only allows you to retrieve files within the JVM starting directory. 
 </ul>
 <p>
 	Even though the built-in Juneau variables are safe, special care is needed when defining your own custom
diff --git a/juneau-doc/src/main/java/org/apache/juneau/doc/internal/DocTag.java b/juneau-doc/src/main/java/org/apache/juneau/doc/internal/DocTag.java
index ebd89df..8303d08 100644
--- a/juneau-doc/src/main/java/org/apache/juneau/doc/internal/DocTag.java
+++ b/juneau-doc/src/main/java/org/apache/juneau/doc/internal/DocTag.java
@@ -21,7 +21,7 @@
 import java.util.Map;
 
 /**
- * Implements the <code>{@doc link}</code> tag.
+ * Implements the <c>{@doc link}</c> tag.
  */
 public class DocTag implements Taglet {
 
diff --git a/juneau-doc/src/main/java/org/apache/juneau/doc/internal/FragmentTag.java b/juneau-doc/src/main/java/org/apache/juneau/doc/internal/FragmentTag.java
index ca6d2aa..4158c12 100644
--- a/juneau-doc/src/main/java/org/apache/juneau/doc/internal/FragmentTag.java
+++ b/juneau-doc/src/main/java/org/apache/juneau/doc/internal/FragmentTag.java
@@ -20,7 +20,7 @@
 import java.util.Map;
 
 /**
- * Implements the <code>{@fragment name}</code> tag that resolves to a fragment file located in the resources/fragments folder.
+ * Implements the <c>{@fragment name}</c> tag that resolves to a fragment file located in the resources/fragments folder.
  */
 public class FragmentTag implements Taglet {
 
diff --git a/juneau-doc/src/main/java/org/apache/juneau/doc/internal/PropertyTag.java b/juneau-doc/src/main/java/org/apache/juneau/doc/internal/PropertyTag.java
index 340b706..de08ce1 100644
--- a/juneau-doc/src/main/java/org/apache/juneau/doc/internal/PropertyTag.java
+++ b/juneau-doc/src/main/java/org/apache/juneau/doc/internal/PropertyTag.java
@@ -19,7 +19,7 @@
 import java.util.Map;
 
 /**
- * Implements the <code>{@property link}</code> tag that simply resolves system properties.
+ * Implements the <c>{@property link}</c> tag that simply resolves system properties.
  */
 public class PropertyTag implements Taglet {
 
diff --git a/juneau-doc/src/main/java/org/apache/juneau/doc/internal/SourceTag.java b/juneau-doc/src/main/java/org/apache/juneau/doc/internal/SourceTag.java
index 622c675..6db3b31 100644
--- a/juneau-doc/src/main/java/org/apache/juneau/doc/internal/SourceTag.java
+++ b/juneau-doc/src/main/java/org/apache/juneau/doc/internal/SourceTag.java
@@ -19,7 +19,7 @@
 import java.util.Map;
 
 /**
- * Implements the <code>{@doc source}</code> tag.
+ * Implements the <c>{@doc source}</c> tag.
  */
 public class SourceTag implements Taglet {
 
diff --git a/juneau-doc/src/main/javadoc/overview.html b/juneau-doc/src/main/javadoc/overview.html
index ee3b1ae..de1f0bc 100644
--- a/juneau-doc/src/main/javadoc/overview.html
+++ b/juneau-doc/src/main/javadoc/overview.html
@@ -354,6 +354,9 @@
 		</ol>
 		<li><p class=''><a class='doclink' href='#juneau-rest-server.DefaultHeaders'>Default Headers</a></p>
 		<li><p class=''><a class='doclink' href='#juneau-rest-server.LoggingAndErrorHandling'>Logging and Error Handling</a></p>
+		<ol>
+			<li><p class='new'><a class='doclink' href='#juneau-rest-server.LoggingAndErrorHandling.LOG4J'>Using LOG4J for logging</a></p>
+		</ol>
 		<li><p class=''><a class='doclink' href='#juneau-rest-server.HttpStatusCodes'>HTTP Status Codes</a></p>
 		<li><p class=''><a class='doclink' href='#juneau-rest-server.OverloadingHttpMethods'>Overloading HTTP Methods</a></p>
 		<li><p class=''><a class='doclink' href='#juneau-rest-server.BuiltInParameters'>Built-in Parameters</a></p>
@@ -548,7 +551,7 @@
 	We've strived to keep prerequisites to an absolute minimum in order to make adoption as easy as possible.
 </p>
 <p>
-	The library consists of the following artifacts found in the Maven group <code>"org.apache.juneau"</code>:
+	The library consists of the following artifacts found in the Maven group <c>"org.apache.juneau"</c>:
 </p>
 <table class='styled w800'>
 	<tr>
@@ -755,7 +758,7 @@
 	</tr>
 	<tr class='dark bb'>
 		<td rowspan="1" style='text-align:center;font-weight:bold;padding:20px;' class='code'>juneau-all</td>
-		<td class='code'><code>juneau-all</code></td>
+		<td class='code'><c>juneau-all</c></td>
 		<td>
 			Combination of the following:
 			<ul style='margin:0px 10px;'>
@@ -778,7 +781,7 @@
 </table>
 
 <p>
-	The current version of Juneau is <code>{@property juneauVersion}</code>.
+	The current version of Juneau is <c>{@property juneauVersion}</c>.
 	The easiest way to pull in the library is through the following maven dependency:
 </p>
 <p class='bpcode w800'>
@@ -789,7 +792,7 @@
 	<xt>&lt;/dependency&gt;</xt>
 </p>	
 <p>
-	If you would like to work with the bleeding-edge code, you can access the <code>{@property juneauVersionNext}-SNAPSHOT</code>
+	If you would like to work with the bleeding-edge code, you can access the <c>{@property juneauVersionNext}-SNAPSHOT</c>
 	version through the following repository:
 </p>
 <p class='bpcode w800'>
@@ -834,7 +837,7 @@
 </p>	
 
 <p>
-	The <code>juneau-marshall</code> artifact contains the API for defining serializers and parsers, and
+	The <c>juneau-marshall</c> artifact contains the API for defining serializers and parsers, and
 	marshalling support for JSON, XML, HTML, URL-Encoding, UON and others.
 </p>
 <p>
@@ -923,10 +926,10 @@
 	String json = serializer.serialize(someObject);
 </p>
 <p>
-	Default serialization support is provided for Java primitives, <code>Maps</code>, <code>Collections</code>, 
+	Default serialization support is provided for Java primitives, <c>Maps</c>, <c>Collections</c>, 
 	beans, and arrays. 
-	Extensible support for other data types such as <code>Calendars</code>, <code>Dates</code>, 
-	<code>Iterators</code> is available through the use of POJO swaps (described later).
+	Extensible support for other data types such as <c>Calendars</c>, <c>Dates</c>, 
+	<c>Iterators</c> is available through the use of POJO swaps (described later).
 </p>
 <p>
 	The class hierarchy for the serializers (excluding specialized subclasses) are:
@@ -1329,7 +1332,7 @@
 </p>
 <p>
 	For performance reasons, serializers and parsers are immutable.
-	However, they can be 'copied' and modified using the <code>builder()</code> method.
+	However, they can be 'copied' and modified using the <c>builder()</c> method.
 </p>
 <p class='bpcode w800'>
 	<jc>// Clone and customize an existing serializer.</jc>
@@ -1541,7 +1544,7 @@
 	json = m.toString();
 </p>
 <p>
-	The <code>ObjectMap</code> and <code>ObjectList</code> classes have many convenience features:
+	The <c>ObjectMap</c> and <c>ObjectList</c> classes have many convenience features:
 </p>
 <p class='bpcode w800'>	
 	<jc>// Convert the map to a bean.</jc>		
@@ -1584,8 +1587,8 @@
 <p>
 	Above the serializers and parsers are the {@link org.apache.juneau.serializer.SerializerGroup} and 
 	{@link org.apache.juneau.parser.ParserGroup} classes.
-	These classes allow serializers and parsers to be retrieved by W3C-compliant HTTP <code>Accept</code> 
-	and <code>Content-Type</code> values...
+	These classes allow serializers and parsers to be retrieved by W3C-compliant HTTP <c>Accept</c> 
+	and <c>Content-Type</c> values...
 </p>
 <p class='bpcode w800'>
 	<jc>// Construct a new serializer group with configuration parameters that get applied to all serializers.</jc>
@@ -1608,7 +1611,7 @@
 	Person p = pg.getParser(<js>"text/json"</js>).parse(myReader, Person.<jk>class</jk>);
 </p>
 <p>
-	The REST servlet API builds upon the <code>SerializerGroup</code> and <code>ParserGroup</code> classes 
+	The REST servlet API builds upon the <c>SerializerGroup</c> and <c>ParserGroup</c> classes 
 	to provide annotated REST servlets that automatically negotiate the HTTP media types and allow the developer
 	to work with requests and responses as POJOs.
 </p>
@@ -1627,29 +1630,29 @@
 		<ul>
 			<li>Heavy to construct and designed to be cached and reused.
 			<li>Created by <l>ContextBuilder</l> classes.
-			<li>Examples:  <code>BeanContext</code>, <code>JsonSerializer</code>
+			<li>Examples:  <c>BeanContext</c>, <c>JsonSerializer</c>
 		</ul>
 	<li>
 		<l>Session</l> - A non-thread-safe single-use object with configuration combined from context and 
 		runtime args such as locale/timezone.
 		<ul>
 			<li>Lightweight objects that take a minimum amount of time to instantiate and are not typically reused.
-			<li>Created by <code>Context</code> objects.
-			<li>Examples:  <code>BeanSession</code>, <code>JsonSerializerSession</code>
+			<li>Created by <c>Context</c> objects.
+			<li>Examples:  <c>BeanSession</c>, <c>JsonSerializerSession</c>
 		</ul>
 	<li>
 		<l>PropertyStore</l> - A thread-safe read-only set of configuration properties.
 		<ul>
-			<li>Heavier to create than <code>Sessions</code> but lighter than <code>Contexts</code>.
-			<li>Each <code>Context</code> contains one <code>PropertyStore</code> that defines all the configuration about that object.
+			<li>Heavier to create than <c>Sessions</c> but lighter than <c>Contexts</c>.
+			<li>Each <c>Context</c> contains one <c>PropertyStore</c> that defines all the configuration about that object.
 			<li>Created by <l>PropertyStoreBuilder</l> classes.
 		</ul>
 </ul>	
 <p>
-	For example, the class hierarchy for <code>JsonSerializer</code> is:
+	For example, the class hierarchy for <c>JsonSerializer</c> is:
 </p>
 <ul class='doctree'>
-	<li class='jc'><code>Object</code>
+	<li class='jc'><c>Object</c>
 	<ul>
 		<li class='jac'>{@link org.apache.juneau.Context}
 		<ul>
@@ -1667,14 +1670,14 @@
 	</ul>
 </ul>
 <p>
-	Each context object in the hierarchy define properties that can be stored in a <code>PropertyStore</code>
+	Each context object in the hierarchy define properties that can be stored in a <c>PropertyStore</c>
 	such as <jsf>WSERIALIZER_useWhitespace</jsf> or <jsf>JSON_simpleMode</jsf>.
 </p>
 <p>
-	The class hierarchy for <code>JsonSerializerBuilder</code> is:
+	The class hierarchy for <c>JsonSerializerBuilder</c> is:
 </p>
 <ul class='doctree'>
-	<li class='jc'><code>Object</code>
+	<li class='jc'><c>Object</c>
 	<ul>
 		<li class='jac'>{@link org.apache.juneau.ContextBuilder}
 		<ul>
@@ -1692,10 +1695,10 @@
 	</ul>
 </ul>
 <p>
-	The class hierarchy for <code>JsonSerializerSession</code> is:
+	The class hierarchy for <c>JsonSerializerSession</c> is:
 </p>
 <ul class='doctree'>
-	<li class='jc'><code>Object</code>
+	<li class='jc'><c>Object</c>
 	<ul>
 		<li class='jac'>{@link org.apache.juneau.Session}
 		<ul>
@@ -1732,7 +1735,7 @@
 </p>
 <p>
 	The {@link org.apache.juneau.PropertyStoreBuilder} class is used to build up and instantiate immutable 
-	<code>PropertyStore</code> objects.
+	<c>PropertyStore</c> objects.
 </p>
 <p>
 	In the example above, the property store being built looks like the following:
@@ -1828,13 +1831,13 @@
 	non-serializable ones during serialization, and vis-versa during parsing.
 </p>
 <p>
-	Some examples of non-serializable POJOs are <code>File</code>, <code>Reader</code>, 
-	<code>Iterable</code>, etc...
+	Some examples of non-serializable POJOs are <c>File</c>, <c>Reader</c>, 
+	<c>Iterable</c>, etc...
 	These are classes that aren't beans and cannot be represented as simple maps, collections, or primitives.
 </p>
 <p>
-	In the following example, we introduce a <code>PojoSwap</code> that will swap in ISO8601 strings for 
-	<code>Date</code> objects:
+	In the following example, we introduce a <c>PojoSwap</c> that will swap in ISO8601 strings for 
+	<c>Date</c> objects:
 </p>
 <p class='bpcode w800'>
 	<jc>// Sample swap for converting Dates to ISO8601 strings.</jc>
@@ -1898,7 +1901,7 @@
 	<jk>int</jk> year = myBean.<jf>date</jf>.getYear(); 								<jc>// == 113</jc>
 </p>
 <p>
-	Another example of a <code>PojoSwap</code> is one that converts <code><jk>byte</jk>[]</code> arrays to
+	Another example of a <c>PojoSwap</c> is one that converts <c><jk>byte</jk>[]</c> arrays to
 	BASE64-encoded strings:
 </p>
 <p class='bpcode w800'>
@@ -1943,7 +1946,7 @@
 	bytes2d = p.parse(json, <jk>byte</jk>[][].<jk>class</jk>);		<jc>// Reproduces {{1,2,3},{4,5,6},null}</jc>
 </p>
 <p>
-	Several <code>PojoSwaps</code> are already provided for common Java objects:
+	Several <c>PojoSwaps</c> are already provided for common Java objects:
 </p>
 <ul class='doctree'>
 	<li class='jp'><jk>org.apache.juneau.transforms</jk>
@@ -1976,8 +1979,8 @@
 	This allows you to specify localized swap values when needed.
 </p>
 <p>
-	If using the REST server API, the locale and timezone are set based on the <code>Accept-Language</code> and
-	<code>Time-Zone</code> headers on the request.
+	If using the REST server API, the locale and timezone are set based on the <c>Accept-Language</c> and
+	<c>Time-Zone</c> headers on the request.
 </p>
 
 <ul class='doctree'>
@@ -2146,7 +2149,7 @@
 <p>
 	{@link org.apache.juneau.annotation.Swap @Swap} can be used to associate a swap class using an 
 	annotation.
-	This is often cleaner than using the builder <code>pojoSwaps()</code> method since you can keep
+	This is often cleaner than using the builder <c>pojoSwaps()</c> method since you can keep
 	your swap class near your POJO class. 
 </p>
 <p class='bpcode w800'>
@@ -2178,7 +2181,7 @@
 	<jk>public class</jk> MyPojo {}
 </p>
 <p>
-	<code>Readers</code> get serialized directly to the output of a serializer.
+	<c>Readers</c> get serialized directly to the output of a serializer.
 	Therefore it's possible to implement a swap that provides fully-customized output.
 </p>
 <p class='bpcode w800'>
@@ -2277,71 +2280,71 @@
 <div class='topic'><!-- START: 2.11.6 - juneau-marshall.Transforms.SwapMethods -->
 <p>
 	Various methods can be defined on a class directly to affect how it gets serialized.
-	This can often be simpler than using <code>PojoSwaps</code>.
+	This can often be simpler than using <c>PojoSwaps</c>.
 </p>
 <p>
-	Objects serialized as <code>Strings</code> can be parsed back into their original objects by 
+	Objects serialized as <c>Strings</c> can be parsed back into their original objects by 
 	implementing one of the following methods on the class:
 </p>		
 <ul class='spaced-list'>
 	<li>
-		<code><jk>public static</jk> T fromString(String)</code> method.
+		<c><jk>public static</jk> T fromString(String)</c> method.
 		<br>Any of the following method names also work: 
 		<ul>
-			<li><code>valueOf(String)</code>
-			<li><code>parse(String)</code>
-			<li><code>parseString(String)</code>
-			<li><code>forName(String)</code>
-			<li><code>forString(String)</code>
+			<li><c>valueOf(String)</c>
+			<li><c>parse(String)</c>
+			<li><c>parseString(String)</c>
+			<li><c>forName(String)</c>
+			<li><c>forString(String)</c>
 		</ul>
 	<li>
-		<code><jk>public</jk> T(String)</code> constructor.
+		<c><jk>public</jk> T(String)</c> constructor.
 </ul>
 <p>
 	Note that these methods cover conversion from several built-in Java types, meaning the parsers can 
 	automatically construct these objects from strings:
 </p>
 <ul>
-	<li><code>fromString(String)</code> - {@link java.util.UUID}
-	<li><code>valueOf(String)</code> - {@link java.lang.Boolean}, {@link java.lang.Byte}, 
+	<li><c>fromString(String)</c> - {@link java.util.UUID}
+	<li><c>valueOf(String)</c> - {@link java.lang.Boolean}, {@link java.lang.Byte}, 
 		{@link java.lang.Double}, {@link java.lang.Float}, 
 		{@link java.lang.Integer}, {@link java.lang.Long}, {@link java.lang.Short}, {@link java.sql.Date}, 
 		{@link java.sql.Time}, {@link java.sql.Timestamp}
-	<li><code>parse(String)</code> - {@link java.text.DateFormat}, {@link java.text.MessageFormat}, 
+	<li><c>parse(String)</c> - {@link java.text.DateFormat}, {@link java.text.MessageFormat}, 
 		{@link java.text.NumberFormat}, {@link java.util.Date}, {@link java.util.logging.Level}
-	<li><code>parseString(String)</code> - {@link javax.xml.bind.DatatypeConverter}
-	<li><code>forName(String)</code> - {@link java.lang.Class}
+	<li><c>parseString(String)</c> - {@link javax.xml.bind.DatatypeConverter}
+	<li><c>forName(String)</c> - {@link java.lang.Class}
 </ul>
 <p>
 	If you want to force a bean-like class to be serialized as a string, you can use the 
 	{@link org.apache.juneau.annotation.BeanIgnore @BeanIgnore} annotation on the class to force it to be 
-	serialized to a string using the <code>toString()</code> method.
+	serialized to a string using the <c>toString()</c> method.
 </p>
 <p>
 	Serializing to other intermediate objects can be accomplished by defining a swap method directly on the 
 	class:
 </p>			
 <ul>
-	<li><code><jk>public</jk> X swap()</code> method, where <code>X</code> is any serializable object.
-	<li><code><jk>public</jk> X swap(BeanSession)</code> method, where <code>X</code> is any serializable object.
-	<li><code><jk>public static</jk> MyPojo unswap(X)</code> method, where <code>X</code> is any serializable object.
-	<li><code><jk>public static</jk> MyPojo swap(X,BeanSession)</code> method, where <code>X</code> is any serializable object.
+	<li><c><jk>public</jk> X swap()</c> method, where <c>X</c> is any serializable object.
+	<li><c><jk>public</jk> X swap(BeanSession)</c> method, where <c>X</c> is any serializable object.
+	<li><c><jk>public static</jk> MyPojo unswap(X)</c> method, where <c>X</c> is any serializable object.
+	<li><c><jk>public static</jk> MyPojo swap(X,BeanSession)</c> method, where <c>X</c> is any serializable object.
 </ul>
 <p>
 	Serializing to and from Maps can be accomplished by defining any of the following methods:
 </p>			
 <ul>
-	<li><code><jk>public</jk> Map toMap()</code> method.  Can be any type of map with string keys and object vals. 
-	<li><code><jk>public</jk> ObjectMap toMap()</code> method. 
-	<li><code><jk>public</jk> Map toMap(BeanSession)</code> method.  Can be any type of map with string keys and object vals. 
-	<li><code><jk>public</jk> ObjectMap toMap(BeanSession)</code> method.
-	<li><code><jk>public static</jk> MyPojo fromMap(Map)</code> method.  Can be any type of map with string keys and object vals. 
-	<li><code><jk>public static</jk> MyPojo fromMap(ObjectMap)</code> method.
-	<li><code><jk>public static</jk> MyPojo fromMap(Map,BeanSession)</code> method.  Can be any type of map with string keys and object vals. 
-	<li><code><jk>public static</jk> MyPojo fromMap(ObjectMap,BeanSession)</code> method.
+	<li><c><jk>public</jk> Map toMap()</c> method.  Can be any type of map with string keys and object vals. 
+	<li><c><jk>public</jk> ObjectMap toMap()</c> method. 
+	<li><c><jk>public</jk> Map toMap(BeanSession)</c> method.  Can be any type of map with string keys and object vals. 
+	<li><c><jk>public</jk> ObjectMap toMap(BeanSession)</c> method.
+	<li><c><jk>public static</jk> MyPojo fromMap(Map)</c> method.  Can be any type of map with string keys and object vals. 
+	<li><c><jk>public static</jk> MyPojo fromMap(ObjectMap)</c> method.
+	<li><c><jk>public static</jk> MyPojo fromMap(Map,BeanSession)</c> method.  Can be any type of map with string keys and object vals. 
+	<li><c><jk>public static</jk> MyPojo fromMap(ObjectMap,BeanSession)</c> method.
 </ul>
 <p>
-	The <code>BeanSession</code> parameter allows you access to various information about the current 
+	The <c>BeanSession</c> parameter allows you access to various information about the current 
 	serialization session.
 	For example, you could provide customized results based on the media type being produced 
 	({@link org.apache.juneau.BeanSession#getMediaType()}).
@@ -2383,9 +2386,9 @@
 	following methods:
 </p>
 <ul>
-	<li><code><jk>public static</jk> T unswap(BeanSession, X)</code> method where <code>X</code> is the 
+	<li><c><jk>public static</jk> T unswap(BeanSession, X)</c> method where <c>X</c> is the 
 		swap class type.
-	<li><code><jk>public</jk> T(X)</code> constructor where <code>X</code> is the swap class type.
+	<li><c><jk>public</jk> T(X)</c> constructor where <c>X</c> is the swap class type.
 </ul>
 <p>
 	The following shows how our form template class can be modified to allow the parsers to reconstruct our 
@@ -2436,7 +2439,7 @@
 <div class='topic'><!-- START: 2.11.7 - juneau-marshall.Transforms.SurrogateClasses -->
 <p>
 <p>
-	Surrogate classes are very similar in concept to <code>PojoSwaps</code> except they're simpler to define.
+	Surrogate classes are very similar in concept to <c>PojoSwaps</c> except they're simpler to define.
 </p>
 <p>
 	For example, let's say we want to be able to serialize the following class, but it's not serializable for 
@@ -2448,7 +2451,7 @@
 	}
 </p>
 <p>
-	This could be solved with the following <code>PojoSwap</code>.
+	This could be solved with the following <c>PojoSwap</c>.
 </p>
 <p class='bpcode w800'>
 	<jc>// A serializable bean with 1 property.</jc>
@@ -2483,7 +2486,7 @@
 	}
 </p>
 <p>
-	The surrogate class is registered in the same way as a <code>PojoSwap</code>:
+	The surrogate class is registered in the same way as a <c>PojoSwap</c>:
 </p>
 <p class='bpcode w800'>
 	<jc>// Create a JSON serializer that can serialize Iterators.</jc>
@@ -2587,8 +2590,8 @@
 	Any properties in the stop class or in its base classes will be ignored during analysis.
 </p>
 <p>
-	For example, in the following class hierarchy, instances of <code>C3</code> will include property 
-	<code>p3</code>, but not <code>p1</code> or <code>p2</code>.
+	For example, in the following class hierarchy, instances of <c>C3</c> will include property 
+	<c>p3</c>, but not <c>p1</c> or <c>p2</c>.
 </p>
 <p class='bpcode w800'>
 	<jk>public class</jk> C1 {
@@ -2884,7 +2887,7 @@
 	Beans can also be defined with a combination of read-only and read-write properties.
 </p>
 <p>
-	The {@link org.apache.juneau.annotation.Name @Name} annotation can also be used instead of <code><ja>@BeanConstructor</ja>(properties)</code>:
+	The {@link org.apache.juneau.annotation.Name @Name} annotation can also be used instead of <c><ja>@BeanConstructor</ja>(properties)</c>:
 </p>
 <p class='bpcode w800'>
 	<ja>@BeanConstructor</ja>
@@ -2894,7 +2897,7 @@
 	}
 </p>
 <p>
-	If neither <code><ja>@BeanConstructor</ja>(properties)</code> or <ja>@Name</ja> is used to identify the bean property names, 
+	If neither <c><ja>@BeanConstructor</ja>(properties)</c> or <ja>@Name</ja> is used to identify the bean property names, 
 	we will try to use the parameter names if they are available in the bytecode.
 </p>
 </div><!-- END: 2.11.10 - juneau-marshall.Transforms.BeanConstructorAnnotation -->
@@ -3074,7 +3077,7 @@
 	The first can be accomplished through any of the following:
 </p>
 <ul class='spaced-list'>
-	<li>A static <code>create()</code> method on the POJO class that returns a builder instance.
+	<li>A static <c>create()</c> method on the POJO class that returns a builder instance.
 		<p class='bcode w800'>
 	<jk>public static</jk> MyBuilder <jsm>create</jsm>() {...}
 		</p>
@@ -3094,7 +3097,7 @@
 	The second can be accomplished through any of the following:
 </p>
 <ul class='spaced-list'>
-	<li>The existence of a <code>build()</code> method on the builder class.
+	<li>The existence of a <c>build()</c> method on the builder class.
 		<p class='bcode w800'>
 	<jk>public</jk> MyPojo build() {...}
 		</p>
@@ -3260,9 +3263,9 @@
 </p>	
 <p>
 	The {@link org.apache.juneau.BeanContextBuilder#beanFilters(Object...)} method will automatically interpret any 
-	non-<code>BeanFilter</code> classes passed in as meaning interface classes. 
-	So in the previous example, the <code>BeanFilter</code> class could have been avoided altogether by just 
-	passing in <code>MyInterface.<jk>class</jk></code> to the serializer, like so:
+	non-<c>BeanFilter</c> classes passed in as meaning interface classes. 
+	So in the previous example, the <c>BeanFilter</c> class could have been avoided altogether by just 
+	passing in <c>MyInterface.<jk>class</jk></c> to the serializer, like so:
 </p>
 <p class='bpcode w800'>
 	WriterSerializer s = JsonSerializer
@@ -3323,8 +3326,8 @@
 	Any properties in the stop class or in its base classes will be ignored during serialization.
 </p>
 <p>
-	For example, in the following class hierarchy, instances of <code>C3</code> will include property <code>p3</code>,
-	but not <code>p1</code> or <code>p2</code>.
+	For example, in the following class hierarchy, instances of <c>C3</c> will include property <c>p3</c>,
+	but not <c>p1</c> or <c>p2</c>.
 </p>
 <p class='bpcode w800'>
 	<jk>public class</jk> C1 {
@@ -3350,7 +3353,7 @@
 <h4 class='topic ' onclick='toggle(this)'><a href='#juneau-marshall.Transforms.BypassSerialization' id='juneau-marshall.Transforms.BypassSerialization'>2.11.18 - Bypass Serialization using Readers and InputStreams</a></h4>
 <div class='topic'><!-- START: 2.11.18 - juneau-marshall.Transforms.BypassSerialization -->
 <p>
-	Juneau serializers treat instances of <code>Readers</code> and <code>InputStreams</code> special by 
+	Juneau serializers treat instances of <c>Readers</c> and <c>InputStreams</c> special by 
 	simply serializing their contents directly to the output stream or writer.
 	This allows you to embed fully customized serializer output.
 </p>
@@ -3424,7 +3427,7 @@
 	On the parsing side, these type names are resolved to classes through the use of bean dictionaries.
 </p>
 <p>
-	For example, if a bean property is of type <code>Object</code>, then the serializer will add 
+	For example, if a bean property is of type <c>Object</c>, then the serializer will add 
 	<js>"_type"</js> attributes so that the class can be determined during parsing.
 </p>
 <p class='bpcode w800'>
@@ -3456,7 +3459,7 @@
 <p>
 	Type names can be represented slightly differently in different languages.
 	For example, the dictionary name is used as element names when serialized to XML.
-	This allows the <code>typeName</code> annotation to be used as a shortcut for defining element names for 
+	This allows the <c>typeName</c> annotation to be used as a shortcut for defining element names for 
 	beans.
 </p>
 <p>
@@ -3548,7 +3551,7 @@
 		However, they must be unique within a dictionary.
 	<li class='info'>
 		The following reserved words cannot be used as type names:  
-		<code>object, array, number, boolean, null</code>.
+		<c>object, array, number, boolean, null</c>.
 	<li class='info'>
 		Serialized type names are DISABLED by default.
 		They must be enabled on the serializer using the 
@@ -3658,12 +3661,12 @@
 	Getter and setter values can be any {@doc PojoCategories parsable} values, even other virtual beans.
 </p>
 <p>
-	Under-the-covers, a virtual bean is simply a proxy interface on top of an existing <code>BeanMap</code>
+	Under-the-covers, a virtual bean is simply a proxy interface on top of an existing <c>BeanMap</c>
 	instance.  From a programmatic point-of-view, they're indistinguishable from real beans, and can be 
 	manipulated and serialized like any other bean.
 </p>	
 <p>
-	Virtual beans can also be created programmatically using the <code>BeanContext</code> class:
+	Virtual beans can also be created programmatically using the <c>BeanContext</c> class:
 </p>
 <p class='bpcode w800'>
 	Address address = BeanContext.<jsf>DEFAULT</jsf>.createSession().newBean(Address.<jk>class</jk>);
@@ -3677,7 +3680,7 @@
 <p>
 	The Juneau Serializer API is designed to be used against POJO tree structures. 
 	It expects that there not be loops in the POJO model (e.g. children with references to parents, etc...).
-	If you try to serialize models with loops, you will usually cause a <code>StackOverflowError</code> to 
+	If you try to serialize models with loops, you will usually cause a <c>StackOverflowError</c> to 
 	be thrown (if {@link org.apache.juneau.BeanTraverseContext#BEANTRAVERSE_maxDepth} is not reached 
 	first).
 </p>
@@ -3720,7 +3723,7 @@
 	String json = s.serialize(a);
 </p>
 <p>
-	What we end up with is the following, which does not serialize the contents of the <code>c</code> field:
+	What we end up with is the following, which does not serialize the contents of the <c>c</c> field:
 </p>
 <p class='bpcode w800'>
 	{
@@ -3746,20 +3749,20 @@
 <p>
 	The Juneau parsers are not limited to parsing back into the original bean classes.
 	If the bean classes are not available on the parsing side, the parser can also be used to 
-	parse into a generic model consisting of <code>Maps</code>, <code>Collections</code>, and primitive
+	parse into a generic model consisting of <c>Maps</c>, <c>Collections</c>, and primitive
 	objects.
 </p>
 <p>
-	You can parse into any <code>Map</code> type (e.g. <code>HashMap</code>, <code>TreeMap</code>), but
+	You can parse into any <c>Map</c> type (e.g. <c>HashMap</c>, <c>TreeMap</c>), but
 	using {@link org.apache.juneau.ObjectMap} is recommended since it has many convenience methods
 	for converting values to various types.
-	The same is true when parsing collections.  You can use any Collection (e.g. <code>HashSet</code>, 
-	<code>LinkedList</code>) or array (e.g. <code>Object[]</code>, <code>String[]</code>, 
-	<code>String[][]</code>), but using {@link org.apache.juneau.ObjectList} is recommended.
+	The same is true when parsing collections.  You can use any Collection (e.g. <c>HashSet</c>, 
+	<c>LinkedList</c>) or array (e.g. <c>Object[]</c>, <c>String[]</c>, 
+	<c>String[][]</c>), but using {@link org.apache.juneau.ObjectList} is recommended.
 </p>
 <p>
-	When the map or list type is not specified, or is the abstract <code>Map</code>, <code>Collection</code>, 
-	or <code>List</code> types, the parser will use <code>ObjectMap</code> and <code>ObjectList</code> by 
+	When the map or list type is not specified, or is the abstract <c>Map</c>, <c>Collection</c>, 
+	or <c>List</c> types, the parser will use <c>ObjectMap</c> and <c>ObjectList</c> by 
 	default.
 </p>
 <p>
@@ -3787,7 +3790,7 @@
 	}
 </p>
 <p>
-	We can parse this into a generic <code>ObjectMap</code>:
+	We can parse this into a generic <c>ObjectMap</c>:
 </p>
 <p class='bpcode w800'>	
 	<jc>// Parse JSON into a generic POJO model.</jc>
@@ -3798,8 +3801,8 @@
 </p>
 <p>
 	What we end up with is the exact same output.
-	Even the numbers and booleans are preserved because they are parsed into <code>Number</code> and 
-	<code>Boolean</code> objects when parsing into generic models.
+	Even the numbers and booleans are preserved because they are parsed into <c>Number</c> and 
+	<c>Boolean</c> objects when parsing into generic models.
 </p>
 <p class='bpcode w800'>
 	{
@@ -3823,8 +3826,8 @@
 	}
 </p>
 <p>
-	Once parsed into a generic model, various convenience methods are provided on the <code>ObjectMap</code>
-		and <code>ObjectList</code> classes to retrieve values:
+	Once parsed into a generic model, various convenience methods are provided on the <c>ObjectMap</c>
+		and <c>ObjectList</c> classes to retrieve values:
 </p>
 <p class='bpcode w800'>
 	<jc>// Parse JSON into a generic POJO model.</jc>
@@ -3890,7 +3893,7 @@
 </p>
 <p>
 	Note that this isn't perfect in all cases since you can't combine two JSON numbers into a single
-	reader (e.g. <code>"123" + "456" = "123456"</code>).
+	reader (e.g. <c>"123" + "456" = "123456"</c>).
 </p>
 <p>
 	For obvious reasons, do not use the following properties when reading continuous streams:
@@ -4093,13 +4096,13 @@
 		</td>
 	</tr>
 	<tr>
-		<td><code><ja>@JsonIgnoreProperties</ja>({...})</code></td>
+		<td><c><ja>@JsonIgnoreProperties</ja>({...})</c></td>
 		<td>
 			{@link org.apache.juneau.annotation.Bean#excludeProperties @Bean(excludeProperties="...")}
 		</td>
 	</tr>
 	<tr>
-		<td><code><ja>@JsonAutoDetect</ja>(fieldVisibility=...)</code></td>
+		<td><c><ja>@JsonAutoDetect</ja>(fieldVisibility=...)</c></td>
 		<td>
 			No equivalent annotation, but can be controlled via: 
 			<br>{@link org.apache.juneau.BeanContext#BEAN_beanFieldVisibility}
@@ -4156,7 +4159,7 @@
 			<br><ja>@JsonRawValue</ja>
 		</td>
 		<td>
-			Can be replicated using swaps with <code>Reader</code> swapped values.
+			Can be replicated using swaps with <c>Reader</c> swapped values.
 		</td>
 	</tr>
 </table>
@@ -4202,10 +4205,10 @@
 		</td>
 		<td>
 			<ul class='normal'>
-				<li><code>HashSet&lt;String,Integer&gt;</code>
-				<li><code>TreeMap&lt;Integer,Bean&gt;</code>
-				<li><code>List&lt;<jk>int</jk>[][]&gt;</code>
-				<li><code>Bean[]</code>
+				<li><c>HashSet&lt;String,Integer&gt;</c>
+				<li><c>TreeMap&lt;Integer,Bean&gt;</c>
+				<li><c>List&lt;<jk>int</jk>[][]&gt;</c>
+				<li><c>Bean[]</c>
 			</ul>
 		</td>
 		<td style='background-color:lightgreen;text-align:center'><b>yes</b></td>
@@ -4220,8 +4223,8 @@
 		</td>
 		<td>
 			<ul class='normal'>
-				<li><code>HashSet&lt;Bean,Integer&gt;</code>
-				<li><code>TreeMap&lt;Integer,Reader&gt;</code>
+				<li><c>HashSet&lt;Bean,Integer&gt;</c>
+				<li><c>TreeMap&lt;Integer,Reader&gt;</c>
 			</ul>
 		</td>
 		<td style='background-color:lightgreen;text-align:center'><b>yes</b></td>
@@ -4305,8 +4308,8 @@
 		</td>
 		<td>
 			<ul class='normal'>
-				<li><code>java.util.Date</code>
-				<li><code>java.util.GregorianCalendar</code>
+				<li><c>java.util.Date</c>
+				<li><c>java.util.GregorianCalendar</c>
 			</ul>
 		</td>
 		<td style='background-color:lightgreen;text-align:center'><b>yes</b></td>
@@ -4321,7 +4324,7 @@
 		</td>
 		<td>
 			<ul class='normal'>
-				<li><code>java.util.Iterator</code>
+				<li><c>java.util.Iterator</c>
 			</ul>
 		</td>
 		<td style='background-color:lightgreen;text-align:center'><b>yes</b></td>
@@ -4359,34 +4362,34 @@
 		<td>
 			Classes with a method that converts it to a serializable form:
 			<ul>
-				<li><code><jk>public</jk> X swap(BeanSession);</code> where <code>X</code> is in groups 
+				<li><c><jk>public</jk> X swap(BeanSession);</c> where <c>X</c> is in groups 
 					[1, 2a, 3ac].
-				<li><code><jk>public</jk> String toString();</code> where the string is any meaningful data.
+				<li><c><jk>public</jk> String toString();</c> where the string is any meaningful data.
 			</ul>
 			And a method that converts it back into the original object:
 			<ul>
-				<li><code><jk>public static</jk> T fromString(String);</code>		
-				<li><code><jk>public static</jk> T valueOf(String);</code>		
-				<li><code><jk>public static</jk> T parse(String);</code>		
-				<li><code><jk>public static</jk> T parseString(String);</code>		
-				<li><code><jk>public static</jk> T forName(String);</code>		
-				<li><code><jk>public static</jk> T forString(String);</code>		
-				<li><code><jk>public</jk> T(X);</code> where <code>X</code> is in groups [1, 2a, 3ac].
-				<li><code><jk>public static</jk> T unswap(BeanSession,X);</code> where <code>X</code> is in 
+				<li><c><jk>public static</jk> T fromString(String);</c>		
+				<li><c><jk>public static</jk> T valueOf(String);</c>		
+				<li><c><jk>public static</jk> T parse(String);</c>		
+				<li><c><jk>public static</jk> T parseString(String);</c>		
+				<li><c><jk>public static</jk> T forName(String);</c>		
+				<li><c><jk>public static</jk> T forString(String);</c>		
+				<li><c><jk>public</jk> T(X);</c> where <c>X</c> is in groups [1, 2a, 3ac].
+				<li><c><jk>public static</jk> T unswap(BeanSession,X);</c> where <c>X</c> is in 
 					groups [1, 2a, 3ac].		
 			</ul>
 		</td>
 		<td>
 			<ul class='normal'>
-				<li><code>java.lang.Class</code>
-				<li><code>java.sql.Time</code>
-				<li><code>java.sql.Timestamp</code>
-				<li><code>java.text.MessageFormat</code>
-				<li><code>java.text.NumberFormat</code>
-				<li><code>java.util.Date</code>
-				<li><code>java.util.UUID</code>
-				<li><code>java.util.logging.Level</code>
-				<li><code>javax.xml.bind.DatatypeConverter</code>
+				<li><c>java.lang.Class</c>
+				<li><c>java.sql.Time</c>
+				<li><c>java.sql.Timestamp</c>
+				<li><c>java.text.MessageFormat</c>
+				<li><c>java.text.NumberFormat</c>
+				<li><c>java.util.Date</c>
+				<li><c>java.util.UUID</c>
+				<li><c>java.util.logging.Level</c>
+				<li><c>javax.xml.bind.DatatypeConverter</c>
 			</ul>
 		</td>
 		<td style='background-color:lightgreen;text-align:center'><b>yes</b></td>
@@ -4397,9 +4400,9 @@
 		<td>
 			Classes that only have a method to convert to a serializable form:
 			<ul>
-				<li><code><jk>public</jk> X swap(BeanSession);</code> where <code>X</code> is in groups 
+				<li><c><jk>public</jk> X swap(BeanSession);</c> where <c>X</c> is in groups 
 					[1, 2, 3].
-				<li><code><jk>public</jk> String toString();</code> where the string is any meaningful data.
+				<li><c><jk>public</jk> String toString();</c> where the string is any meaningful data.
 			</ul>
 		</td>
 		<td>&nbsp;</td>
@@ -4440,7 +4443,7 @@
 </ul>
 
 <p>
-	As a general rule, all POJOs are converted to Strings using the <code>toString()</code> method.
+	As a general rule, all POJOs are converted to Strings using the <c>toString()</c> method.
 	However, there is one exception:
 </p>
 <ul class='spaced-list'>
@@ -4453,16 +4456,16 @@
 <ul class='spaced-list'>
 	<li>Any any of the following public static non-deprecated methods:
 	<ul>
-		<li><code>create(String)</code>
-		<li><code>fromString(String)</code>
-		<li><code>fromValue(String)</code>
-		<li><code>valueOf(String)</code>
-		<li><code>parse(String)</code>
-		<li><code>parseString(String)</code>
-		<li><code>forName(String)</code>
-		<li><code>forString(String)</code>
+		<li><c>create(String)</c>
+		<li><c>fromString(String)</c>
+		<li><c>fromValue(String)</c>
+		<li><c>valueOf(String)</c>
+		<li><c>parse(String)</c>
+		<li><c>parseString(String)</c>
+		<li><c>forName(String)</c>
+		<li><c>forString(String)</c>
 	</ul>
-	<li>Has a public constructor that takes in a <code>String</code>.
+	<li>Has a public constructor that takes in a <c>String</c>.
 </ul>
 <p>
 	Exceptions exist for the following classes:
@@ -4471,13 +4474,13 @@
 	<li>{@link java.util.TimeZone} - Uses {@link java.util.TimeZone#getTimeZone(String)}
 	<li>{@link java.util.Locale} - Uses {@link java.util.Locale#forLanguageTag(String)} after replacing <js>'_'</js> with <js>'-'</js>.
 	<li>{@link java.lang.Boolean} - Blank and <js>"null"</js> are interpreted as null values.
-	<li>Primitives (except for <code><jk>void</jk>.<jk>class</jk></code>) - Uses the primitive wrapper classes for instantiating from Strings.
+	<li>Primitives (except for <c><jk>void</jk>.<jk>class</jk></c>) - Uses the primitive wrapper classes for instantiating from Strings.
 </ul>
 
 <h5 class='topic' id='PojosConveribleToOtherTypes'>POJOs convertible to/from other types</h5>
 <p>
 	POJOs are also converted to various other types in places such as the Open-API serializers and parsers. 
-	In this section, the type being converted to will be referred to as <code>X</code>.
+	In this section, the type being converted to will be referred to as <c>X</c>.
 </p>
 <p>
 	POJOs are considered convertible from X if it has any of the following (matched in the specified order):
@@ -4485,11 +4488,11 @@
 <ul class='spaced-list'>
 	<li>Any any of the following public static non-deprecated methods:
 	<ul>
-		<li><code>create(X)</code>
-		<li><code>from*(X)</code>
+		<li><c>create(X)</c>
+		<li><c>from*(X)</c>
 	</ul>
-	<li>Has a public constructor that takes in an <code>X</code>.
-	<li>The X class has a public non-static no-arg non-deprecated method called <code>to*()</code>.
+	<li>Has a public constructor that takes in an <c>X</c>.
+	<li>The X class has a public non-static no-arg non-deprecated method called <c>to*()</c>.
 </ul>
 <p>
 	POJOs are considered convertible from X if any of the reverse of above are true.
@@ -4608,49 +4611,49 @@
 	<tr>
 		<td>String</td>
 		<td>String</td>
-		<td><code>serialize(<js>"foobar"</js>);</code></td>
-		<td><code><js>'foobar'</js></code>
+		<td><c>serialize(<js>"foobar"</js>);</c></td>
+		<td><c><js>'foobar'</js></c>
 	</tr>
 	<tr>
 		<td>Number</td>
 		<td>Number</td>
-		<td><code>serialize(123);</code></td>
-		<td><code>123</code>
+		<td><c>serialize(123);</c></td>
+		<td><c>123</c>
 	</tr>
 	<tr>
 		<td>Boolean</td>
 		<td>Boolean</td>
-		<td><code>serialize(<jk>true</jk>);</code></td>
-		<td><code><jk>true</jk></code>
+		<td><c>serialize(<jk>true</jk>);</c></td>
+		<td><c><jk>true</jk></c>
 	</tr>
 	<tr>
 		<td>Null</td>
 		<td>Null</td>
-		<td><code>serialize(<jk>null</jk>);</code></td>
-		<td><code><jk>null</jk></code>
+		<td><c>serialize(<jk>null</jk>);</c></td>
+		<td><c><jk>null</jk></c>
 	</tr>
 	<tr>
 		<td>Beans with properties of any type on this list</td>
 		<td>Object</td>
-		<td><code>serialize(<jk>new</jk> MyBean());</code></td>
-		<td><code>{p1:<js>'val1'</js>,p2:<jk>true</jk>}</code>
+		<td><c>serialize(<jk>new</jk> MyBean());</c></td>
+		<td><c>{p1:<js>'val1'</js>,p2:<jk>true</jk>}</c>
 	</tr>
 	<tr>
 		<td>Maps with values of any type on this list</td>
 		<td>Object</td>
-		<td><code>serialize(<jk>new</jk> TreeMap());</code></td>
-		<td><code>{key1:<js>'val1'</js>,key2:<jk>true</jk>}</code>
+		<td><c>serialize(<jk>new</jk> TreeMap());</c></td>
+		<td><c>{key1:<js>'val1'</js>,key2:<jk>true</jk>}</c>
 	</tr>
 	<tr>
 		<td>Collections and arrays of any type on this list</td>
 		<td>Array</td>
-		<td><code>serialize(<jk>new</jk> Object[]{1,<js>"foo"</js>,<jk>true</jk>});</code></td>
-		<td><code>[1,<js>'foo'</js>,<jk>true</jk>]</code>
+		<td><c>serialize(<jk>new</jk> Object[]{1,<js>"foo"</js>,<jk>true</jk>});</c></td>
+		<td><c>[1,<js>'foo'</js>,<jk>true</jk>]</c>
 	</tr>
 </table>
 <p>
 	In addition, swaps can be used to convert non-serializable POJOs into serializable forms, such as converting 
-	<code>Calendar</code> object to ISO8601 strings, or <code><jk>byte</jk>[]</code> arrays to Base-64 
+	<c>Calendar</c> object to ISO8601 strings, or <c><jk>byte</jk>[]</c> arrays to Base-64 
 	encoded strings.
 </p>
 </div><!-- END: 2.20.1 - juneau-marshall.JsonDetails.Methodology -->
@@ -4859,7 +4862,7 @@
 <p>
 	Juneau provides the {@link org.apache.juneau.json.JsonSchemaSerializer} class for generating JSON-Schema 
 	documents that describe the output generated by the {@link org.apache.juneau.json.JsonSerializer} class.
-	This class shares the same properties as <code>JsonSerializer</code>.
+	This class shares the same properties as <c>JsonSerializer</c>.
 	For convenience the {@link org.apache.juneau.json.JsonSerializer#getSchemaSerializer()} method has been 
 	added for creating instances of schema serializers from the regular serializer instance.
 </p>
@@ -5080,7 +5083,7 @@
 </p>
 <p>
 	<xa>_type</xa> attributes are added to bean properties or map entries if the type cannot be inferred 
-	through reflection (e.g. an <code>Object</code> or superclass/interface value type).
+	through reflection (e.g. an <c>Object</c> or superclass/interface value type).
 </p>
 <table class='styled w800'>
 	<tr>
@@ -5571,7 +5574,7 @@
 </p>
 <p>
 	In the following example, a type attribute is used on property 'b' but not property 'a' since
-	'b' is of type <code>Object</code> and therefore the bean class cannot be inferred.
+	'b' is of type <c>Object</c> and therefore the bean class cannot be inferred.
 </p>
 
 <h5 class='figure'>Example</h5>
@@ -5618,8 +5621,8 @@
 </table>
 <ul class='doctree'>
 	<li class='info'>
-		<code>string</code>, <code>number</code>, <code>boolean</code>, <code>object</code>, 
-		<code>array</code>, and <code>null</code> are reserved keywords that cannot be used as type names.
+		<c>string</c>, <c>number</c>, <c>boolean</c>, <c>object</c>, 
+		<c>array</c>, and <c>null</c> are reserved keywords that cannot be used as type names.
 </ul>
 <p>
 	Beans with type names are often used in conjunction with the 
@@ -6216,7 +6219,7 @@
 </table>
 <p>
 	The {@link org.apache.juneau.xml.annotation.XmlFormat#ATTRS} format can be applied to a single bean 
-	property of type <code>Map&lt;String,Object&gt;</code> to denote arbitrary XML attribute values on the 
+	property of type <c>Map&lt;String,Object&gt;</c> to denote arbitrary XML attribute values on the 
 	element.
 	These can be mixed with other {@link org.apache.juneau.xml.annotation.XmlFormat#ATTR} annotated 
 	properties, but there must not be an overlap in bean property names and map keys. 
@@ -6730,7 +6733,7 @@
 	The {@link org.apache.juneau.xml.annotation.XmlFormat#TEXT} format is similar to 
 	{@link org.apache.juneau.xml.annotation.XmlFormat#MIXED} except it's meant for solitary objects that 
 	get serialized as simple child text nodes.
-	Any object that can be serialize to a <code>String</code> can be used.
+	Any object that can be serialize to a <c>String</c> can be used.
 	The {@link org.apache.juneau.xml.annotation.XmlFormat#TEXT_PWS} is the same except whitespace is 
 	preserved in the output.
 </p>
@@ -6767,7 +6770,7 @@
 	The {@link org.apache.juneau.xml.annotation.XmlFormat#XMLTEXT} format is similar to 
 	{@link org.apache.juneau.xml.annotation.XmlFormat#TEXT} except it's meant for strings containing XML 
 	that should be serialized as-is to the document.
-	Any object that can be serialize to a <code>String</code> can be used.
+	Any object that can be serialize to a <c>String</c> can be used.
 	During parsing, the element content gets parsed with the rest of the document and then re-serialized to 
 	XML before being set as the property value.  
 	This process may not be perfect (e.g. double quotes may be replaced by single quotes, etc...).
@@ -6806,7 +6809,7 @@
 <h4 class='topic ' onclick='toggle(this)'><a href='#juneau-marshall.XmlDetails.Namespaces' id='juneau-marshall.XmlDetails.Namespaces'>2.21.7 - Namespaces</a></h4>
 <div class='topic'><!-- START: 2.21.7 - juneau-marshall.XmlDetails.Namespaces -->
 <p>
-	Let's go back to the example of our original <code>Person</code> bean class, but add some namespace annotations:
+	Let's go back to the example of our original <c>Person</c> bean class, but add some namespace annotations:
 </p>
 <h5 class='figure'>Sample Beans</h5>
 <p class='bpcode w800'>
@@ -6979,7 +6982,7 @@
 <p>
 	Juneau provides the {@link org.apache.juneau.xmlschema.XmlSchemaSerializer} class for generating XML-Schema 
 	documents that describe the output generated by the {@link org.apache.juneau.xml.XmlSerializer} class.
-	This class shares the same properties as <code>XmlSerializer</code>.
+	This class shares the same properties as <c>XmlSerializer</c>.
 	Since the XML output differs based on settings on the XML serializer class, the XML-Schema serializer
 	class must have the same property values as the XML serializer class it's describes.
 	To help facilitate creating an XML Schema serializer with the same properties as the corresponding 
@@ -7885,7 +7888,7 @@
 </p>
 <p>
 	The {@link org.apache.juneau.html.annotation.Html#format @Html(format)} annotation is used to specify what format to use for HTML elements.
-	For example, the HTML beans defined in the {@link org.apache.juneau.dto.html5} package use <code>format=<jsf>XML</jsf></code> so that
+	For example, the HTML beans defined in the {@link org.apache.juneau.dto.html5} package use <c>format=<jsf>XML</jsf></c> so that
 	the beans get serialized as standard XML:
 </p>
 <h5 class='figure'>Example:</h5>
@@ -7911,8 +7914,8 @@
 	Using this class, you can alter the CSS style and HTML content of the bean property.
 </p>
 <p>
-	The following example shows two render classes that customize the appearance of the <code>pctFull</code> and
-	<code>status</code> columns in the code below:
+	The following example shows two render classes that customize the appearance of the <c>pctFull</c> and
+	<c>status</c> columns in the code below:
 </p>
 <p class='bpcode w800'>
 	<jk>import static</jk> org.apache.juneau.dto.html5.HtmlBuilder.*;	
@@ -8840,25 +8843,25 @@
 <div class='topic'><!-- START: 2.26.1 - juneau-marshall.OpenApiDetails.Methodology -->
 <p>
 	Unlike the other Juneau serializers and parsers that convert input and output directly to-and-from POJOs,
-	the OpenAPI serializers and parsers use intermediate objects based on the <code>type</code> and <code>format</code>
+	the OpenAPI serializers and parsers use intermediate objects based on the <c>type</c> and <c>format</c>
 	of the schema.
 </p>
 <p>
-	The following table shows the "natural" intermediate type of the object based on the <code>type/format</code>:
+	The following table shows the "natural" intermediate type of the object based on the <c>type/format</c>:
 </p>
 <table class='styled w800'>
 	<tr><th>Type</th><th>Format</th><th>Intermediate Java Type</th></tr>
 	<tr class='dark bb'>
-		<td rowspan='4'><code>string</code> or empty</td>
-		<td><code>byte<br>binary<br>binary-spaced</code></td>
-		<td><code><jk>byte</jk>[]</code></td>
+		<td rowspan='4'><c>string</c> or empty</td>
+		<td><c>byte<br>binary<br>binary-spaced</c></td>
+		<td><c><jk>byte</jk>[]</c></td>
 	</tr>
 	<tr class='dark bb'>
-		<td><code>date<br>date-time</code></td>
+		<td><c>date<br>date-time</c></td>
 		<td>{@link java.util.Calendar}</td>
 	</tr>
 	<tr class='dark bb'>
-		<td><code>uon</code></td>
+		<td><c>uon</c></td>
 		<td>No intermediate type.<br>(serialized directly to/from POJO)</td>
 	</tr>
 	<tr class='dark bb'>
@@ -8866,44 +8869,44 @@
 		<td>{@link java.lang.String}</td>
 	</tr>
 	<tr class='light bb'>
-		<td rowspan='1'><code>boolean</code></td>
+		<td rowspan='1'><c>boolean</c></td>
 		<td>empty</td>
 		<td>{@link java.lang.Boolean}</td>
 	</tr>
 	<tr class='dark bb'>
-		<td rowspan='2'><code>integer</code></td>
-		<td><code>int32</code></td>
+		<td rowspan='2'><c>integer</c></td>
+		<td><c>int32</c></td>
 		<td>{@link java.lang.Integer}</td>
 	</tr>
 	<tr class='dark bb'>
-		<td><code>int64</code></td>
+		<td><c>int64</c></td>
 		<td>{@link java.lang.Long}</td>
 	</tr>
 	<tr class='light bb'>
-		<td rowspan='2'><code>number</code></td>
-		<td><code>float</code></td>
+		<td rowspan='2'><c>number</c></td>
+		<td><c>float</c></td>
 		<td>{@link java.lang.Float}</td>
 	</tr>
 	<tr class='light bb'>
-		<td><code>double</code></td>
+		<td><c>double</c></td>
 		<td>{@link java.lang.Double}</td>
 	</tr>
 	<tr class='dark bb'>
-		<td rowspan='2'><code>array</code></td>
+		<td rowspan='2'><c>array</c></td>
 		<td>empty</td>
 		<td>Arrays of intermediate types on this list.</td>
 	</tr>
 	<tr class='dark bb'>
-		<td><code>uon</code></td>
+		<td><c>uon</c></td>
 		<td>No intermediate type.<br>(serialized directly to/from POJO)</td>
 	</tr>
 	<tr class='light bb'>
-		<td rowspan='2'><code>object</code></td>
+		<td rowspan='2'><c>object</c></td>
 		<td>empty</td>
-		<td><code>Map&lt;String,Object&gt;</code></td>
+		<td><c>Map&lt;String,Object&gt;</c></td>
 	</tr>
 	<tr class='light bb'>
-		<td><code>uon</code></td>
+		<td><c>uon</c></td>
 		<td>No intermediate type.<br>(serialized directly to/from POJO)</td>
 	</tr>
 </table>
@@ -9057,47 +9060,47 @@
 	}
 </p>
 <p>
-	As a general rule, any POJO convertible to the intermediate type for the <code>type/format</code> of the schema can
+	As a general rule, any POJO convertible to the intermediate type for the <c>type/format</c> of the schema can
 	be serialized using the OpenAPI serializer.
 	Here are the rules of POJO types allowed for various type/format combinations:
 </p>
 <table class='styled w800'>
 	<tr><th>Type</th><th>Format</th><th>Valid parameter types</th></tr>
 	<tr class='dark bb'>
-		<td rowspan='4'><code>string</code> or empty</td>
-		<td><code>byte<br>binary<br>binary-spaced</code></td>
+		<td rowspan='4'><c>string</c> or empty</td>
+		<td><c>byte<br>binary<br>binary-spaced</c></td>
 		<td>
 			<ul>
-				<li><code><jk>byte</jk>[]</code> (default)
+				<li><c><jk>byte</jk>[]</c> (default)
 				<li>{@link java.io.InputStream}
 				<li>{@link java.io.Reader} - Read into String and then converted using {@link java.lang.String#getBytes()}.
 				<li>{@link java.lang.Object} - Converted to String and then converted using {@link java.lang.String#getBytes()}.
-				<li>Any POJO transformable to a <code><jk>byte</jk>[]</code> via the following methods:
+				<li>Any POJO transformable to a <c><jk>byte</jk>[]</c> via the following methods:
 					<ul>
-						<li><code><jk>public byte</jk>[] toBytes() {...}</code>
-						<li><code><jk>public byte</jk>[]</jk> toFoo() {...}</code> (any method name starting with "to")
+						<li><c><jk>public byte</jk>[] toBytes() {...}</c>
+						<li><c><jk>public byte</jk>[]</jk> toFoo() {...}</c> (any method name starting with "to")
 					</ul>
-				<li>Any POJO transformable to a <code><jk>byte</jk>[]</code> via a {@link org.apache.juneau.transform.PojoSwap}.
+				<li>Any POJO transformable to a <c><jk>byte</jk>[]</c> via a {@link org.apache.juneau.transform.PojoSwap}.
 			</ul>
 		</td>
 	</tr>
 	<tr class='dark bb'>
-		<td><code>date<br>date-time</code></td>
+		<td><c>date<br>date-time</c></td>
 		<td>
 			<ul>
 				<li>{@link java.util.Calendar} (default)
 				<li>{@link java.util.Date}
 				<li>Any POJO transformable to a {@link java.util.Calendar} via the following methods:
 					<ul>
-						<li><code><jk>public</jk> Calendar toCalendar() {...}</code>
-						<li><code><jk>public</jk> Calendar toFoo() {...}</code> (any method name starting with "to")
+						<li><c><jk>public</jk> Calendar toCalendar() {...}</c>
+						<li><c><jk>public</jk> Calendar toFoo() {...}</c> (any method name starting with "to")
 					</ul>
 				<li>Any POJO transformable to a {@link java.util.Calendar} via a {@link org.apache.juneau.transform.PojoSwap}.
 			</ul>
 		</td>
 	</tr>
 	<tr class='dark bb'>
-		<td><code>uon</code></td>
+		<td><c>uon</c></td>
 		<td>
 			<ul>
 				<li>Any {@doc PojoCategories Serializable POJO} type.
@@ -9111,14 +9114,14 @@
 				<li>{@link java.lang.String} (default)
 				<li>Any POJO transformable to a {@link java.lang.String} via the following methods:
 					<ul>
-						<li><code><jk>public</jk> String toString() {...}</code>
+						<li><c><jk>public</jk> String toString() {...}</c>
 					</ul>
 				<li>Any POJO transformable to a {@link java.lang.String} via a {@link org.apache.juneau.transform.PojoSwap}.
 			</ul>
 		</td>
 	</tr>
 	<tr class='light bb'>
-		<td rowspan='1'><code>boolean</code></td>
+		<td rowspan='1'><c>boolean</c></td>
 		<td>empty</td>
 		<td>
 			<ul>
@@ -9127,16 +9130,16 @@
 				<li>{@link java.lang.String} - Converted to a {@link java.lang.Boolean}.
 				<li>Any POJO transformable to a {@link java.lang.Boolean} via the following methods:
 					<ul>
-						<li><code><jk>public</jk> Boolean toBoolean() {...}</code>
-						<li><code><jk>public</jk> Boolean toFoo() {...}</code> (any method name starting with "to")
+						<li><c><jk>public</jk> Boolean toBoolean() {...}</c>
+						<li><c><jk>public</jk> Boolean toFoo() {...}</c> (any method name starting with "to")
 					</ul>
 				<li>Any POJO transformable to a {@link java.lang.Boolean} via a {@link org.apache.juneau.transform.PojoSwap}.
 			</ul>
 		</td>
 	</tr>
 	<tr class='dark bb'>
-		<td rowspan='2'><code>integer</code></td>
-		<td><code>int32</code></td>
+		<td rowspan='2'><c>integer</c></td>
+		<td><c>int32</c></td>
 		<td>
 			<ul>
 				<li>{@link java.lang.Integer} (default)
@@ -9144,15 +9147,15 @@
 				<li>{@link java.lang.String} - Converted to an {@link java.lang.String}.
 				<li>Any POJO transformable to an {@link java.lang.Integer} via the following methods:
 					<ul>
-						<li><code><jk>public</jk> Integer toInteger() {...}</code>
-						<li><code><jk>public</jk> Integer toFoo() {...}</code> (any method name starting with "to")
+						<li><c><jk>public</jk> Integer toInteger() {...}</c>
+						<li><c><jk>public</jk> Integer toFoo() {...}</c> (any method name starting with "to")
 					</ul>
 				<li>Any POJO transformable to an {@link java.lang.Integer} via a {@link org.apache.juneau.transform.PojoSwap}.
 			</ul>
 		</td>
 	</tr>
 	<tr class='dark bb'>
-		<td><code>int64</code></td>
+		<td><c>int64</c></td>
 		<td>
 			<ul>
 				<li>{@link java.lang.Long} (default)
@@ -9160,16 +9163,16 @@
 				<li>{@link java.lang.String} - Converted to a {@link java.lang.Long}.
 				<li>Any POJO transformable to a {@link java.lang.Long} via the following methods:
 					<ul>
-						<li><code><jk>public</jk> Long toLong() {...}</code>
-						<li><code><jk>public</jk> Long toFoo() {...}</code> (any method name starting with "to")
+						<li><c><jk>public</jk> Long toLong() {...}</c>
+						<li><c><jk>public</jk> Long toFoo() {...}</c> (any method name starting with "to")
 					</ul>
 				<li>Any POJO transformable to a {@link java.lang.Long} via a {@link org.apache.juneau.transform.PojoSwap}.
 			</ul>
 		</td>
 	</tr>
 	<tr class='light bb'>
-		<td rowspan='2'><code>number</code></td>
-		<td><code>float</code></td>
+		<td rowspan='2'><c>number</c></td>
+		<td><c>float</c></td>
 		<td>
 			<ul>
 				<li>{@link java.lang.Float} (default)
@@ -9177,15 +9180,15 @@
 				<li>{@link java.lang.String} - Converted to a {@link java.lang.Float}.
 				<li>Any POJO transformable to a {@link java.lang.Float} via the following methods:
 					<ul>
-						<li><code><jk>public</jk> Float toFloat() {...}</code>
-						<li><code><jk>public</jk> Float toFoo() {...}</code> (any method name starting with "to")
+						<li><c><jk>public</jk> Float toFloat() {...}</c>
+						<li><c><jk>public</jk> Float toFoo() {...}</c> (any method name starting with "to")
 					</ul>
 				<li>Any POJO transformable to a {@link java.lang.Float} via a {@link org.apache.juneau.transform.PojoSwap}.
 			</ul>
 		</td>
 	</tr>
 	<tr class='light bb'>
-		<td><code>double</code></td>
+		<td><c>double</c></td>
 		<td>
 			<ul>
 				<li>{@link java.lang.Double} (default)
@@ -9193,30 +9196,30 @@
 				<li>{@link java.lang.String} - Converted to a {@link java.lang.Double}.
 				<li>Any POJO transformable to a {@link java.lang.Double} via the following methods:
 					<ul>
-						<li><code><jk>public</jk> Double toDouble() {...}</code>
-						<li><code><jk>public</jk> Double toFoo() {...}</code> (any method name starting with "to")
+						<li><c><jk>public</jk> Double toDouble() {...}</c>
+						<li><c><jk>public</jk> Double toFoo() {...}</c> (any method name starting with "to")
 					</ul>
 				<li>Any POJO transformable to a {@link java.lang.Double} via a {@link org.apache.juneau.transform.PojoSwap}.
 			</ul>
 		</td>
 	</tr>
 	<tr class='dark bb'>
-		<td rowspan='2'><code>array</code></td>
+		<td rowspan='2'><c>array</c></td>
 		<td>empty</td>
 		<td>
 			<ul>
 				<li>Arrays or Collections of any defaults on this list.
-				<li>Any POJO transformable to arrays of the default types (e.g. <code>Integer[]</code>, <code>Boolean[][]</code>, etc...).
+				<li>Any POJO transformable to arrays of the default types (e.g. <c>Integer[]</c>, <c>Boolean[][]</c>, etc...).
 					<br>For example:
 					<ul>
-						<li><code><jk>public</jk> Boolean[][] toFoo() {...}</code> (any method name starting with "to")
+						<li><c><jk>public</jk> Boolean[][] toFoo() {...}</c> (any method name starting with "to")
 					</ul>
 				<li>Any POJO transformable to arrays of the default types via a {@link org.apache.juneau.transform.PojoSwap}
 			</ul>
 		</td>
 	</tr>
 	<tr class='dark bb'>
-		<td><code>uon</code></td>
+		<td><c>uon</c></td>
 		<td>
 			<ul>
 				<li>Any {@doc PojoCategories Serializable POJO} type.
@@ -9224,18 +9227,18 @@
 		</td>
 	</tr>
 	<tr class='light bb'>
-		<td rowspan='2'><code>object</code></td>
+		<td rowspan='2'><c>object</c></td>
 		<td>empty</td>
 		<td>
 			<ul>
-				<li><code>Map&lt;String,Object&gt;</code> (default)
+				<li><c>Map&lt;String,Object&gt;</c> (default)
 				<li>Beans with properties of anything on this list.
 				<li>Any POJO transformable to a map via a {@link org.apache.juneau.transform.PojoSwap}
 			</ul>
 		</td>
 	</tr>
 	<tr class='light bb'>
-		<td><code>uon</code></td>
+		<td><c>uon</c></td>
 		<td>
 			<ul>
 				<li>Any {@doc PojoCategories Serializable POJO} type.
@@ -9272,7 +9275,7 @@
 	}
 </p>
 <p>
-	The <code>object</code> type is not officially part of the OpenAPI standard.  
+	The <c>object</c> type is not officially part of the OpenAPI standard.  
 	However, Juneau supports serializing Maps and beans to HTTP parts using UON notation.
 </p>
 <p>
@@ -9414,7 +9417,7 @@
 		They can be skipped or partially defined.
 	<li>
 		We make our best attempt to convert the input to the matching type.  
-		However, you will get <code>SerializeExceptions</code> if you attempt an impossible conversion.
+		However, you will get <c>SerializeExceptions</c> if you attempt an impossible conversion.
 		(e.g. trying to serialize the string "foo" as a boolean). 
 </ul>
 </div><!-- END: 2.26.2 - juneau-marshall.OpenApiDetails.Serializers -->
@@ -9467,28 +9470,28 @@
 	}
 </p>
 <p>
-	As a general rule, any POJO convertible from the intermediate type for the <code>type/format</code> of the schema can
+	As a general rule, any POJO convertible from the intermediate type for the <c>type/format</c> of the schema can
 	be parsed using the OpenAPI parser.
 	Here are the rules of POJO types allowed for various type/format combinations:
 </p>
 <table class='styled w800'>
 	<tr><th>Type</th><th>Format</th><th>Valid parameter types</th></tr>
 	<tr class='dark bb'>
-		<td rowspan='4'><code>string</code> or empty</td>
-		<td><code>byte<br>binary<br>binary-spaced</code></td>
+		<td rowspan='4'><c>string</c> or empty</td>
+		<td><c>byte<br>binary<br>binary-spaced</c></td>
 		<td>
 			<ul>
-				<li><code><jk>byte</jk>[]</code> (default)
+				<li><c><jk>byte</jk>[]</c> (default)
 				<li>{@link java.io.InputStream} - Returns a {@link java.io.ByteArrayInputStream}.
 				<li>{@link java.io.Reader} - Returns a {@link java.io.InputStreamReader} wrapped around a {@link java.io.ByteArrayInputStream}.
 				<li>{@link java.lang.String} - Constructed using {@link java.lang.String#String(byte[])}.
-				<li>{@link java.lang.Object} - Returns the default <code><jk>byte</jk>[]</code>.
-				<li>Any POJO transformable from a <code><jk>byte</jk>[]</code> (via constructors or static create methods).
+				<li>{@link java.lang.Object} - Returns the default <c><jk>byte</jk>[]</c>.
+				<li>Any POJO transformable from a <c><jk>byte</jk>[]</c> (via constructors or static create methods).
 			</ul>
 		</td>
 	</tr>
 	<tr class='dark bb'>
-		<td><code>date<br>date-time</code></td>
+		<td><c>date<br>date-time</c></td>
 		<td>
 			<ul>
 				<li>{@link java.util.Calendar} (default)
@@ -9501,7 +9504,7 @@
 		</td>
 	</tr>
 	<tr class='dark bb'>
-		<td><code>uon</code></td>
+		<td><c>uon</c></td>
 		<td>
 			<ul>
 				<li>Any {@doc PojoCategories Parsable POJO} type.
@@ -9519,7 +9522,7 @@
 		</td>
 	</tr>
 	<tr class='light bb'>
-		<td rowspan='1'><code>boolean</code></td>
+		<td rowspan='1'><c>boolean</c></td>
 		<td>empty</td>
 		<td>
 			<ul>
@@ -9532,8 +9535,8 @@
 		</td>
 	</tr>
 	<tr class='dark bb'>
-		<td rowspan='2'><code>integer</code></td>
-		<td><code>int32</code></td>
+		<td rowspan='2'><c>integer</c></td>
+		<td><c>int32</c></td>
 		<td>
 			<ul>
 				<li>{@link java.lang.Integer} (default)
@@ -9546,7 +9549,7 @@
 		</td>
 	</tr>
 	<tr class='dark bb'>
-		<td><code>int64</code></td>
+		<td><c>int64</c></td>
 		<td>
 			<ul>
 				<li>{@link java.lang.Long} (default)
@@ -9559,8 +9562,8 @@
 		</td>
 	</tr>
 	<tr class='light bb'>
-		<td rowspan='2'><code>number</code></td>
-		<td><code>float</code></td>
+		<td rowspan='2'><c>number</c></td>
+		<td><c>float</c></td>
 		<td>
 			<ul>
 				<li>{@link java.lang.Float} (default)
@@ -9573,7 +9576,7 @@
 		</td>
 	</tr>
 	<tr class='light bb'>
-		<td><code>double</code></td>
+		<td><c>double</c></td>
 		<td>
 			<ul>
 				<li>{@link java.lang.Double} (default)
@@ -9586,17 +9589,17 @@
 		</td>
 	</tr>
 	<tr class='dark bb'>
-		<td rowspan='2'><code>array</code></td>
+		<td rowspan='2'><c>array</c></td>
 		<td>empty</td>
 		<td>
 			<ul>
 				<li>Arrays or Collections of anything on this list.
-				<li>Any POJO transformable from arrays of the default types (e.g. <code>Integer[]</code>, <code>Boolean[][]</code>, etc...).
+				<li>Any POJO transformable from arrays of the default types (e.g. <c>Integer[]</c>, <c>Boolean[][]</c>, etc...).
 			</ul>
 		</td>
 	</tr>
 	<tr class='dark bb'>
-		<td><code>uon</code></td>
+		<td><c>uon</c></td>
 		<td>
 			<ul>
 				<li>Any {@doc PojoCategories Parsable POJO} type.
@@ -9604,18 +9607,18 @@
 		</td>
 	</tr>
 	<tr class='light bb'>
-		<td rowspan='2'><code>object</code></td>
+		<td rowspan='2'><c>object</c></td>
 		<td>empty</td>
 		<td>
 			<ul>
-				<li><code>Map&lt;String,Object&gt;</code> (default)
+				<li><c>Map&lt;String,Object&gt;</c> (default)
 				<li>Beans with properties of anything on this list.
 				<li>Maps with string keys.
 			</ul>
 		</td>
 	</tr>
 	<tr class='light bb'>
-		<td><code>uon</code></td>
+		<td><c>uon</c></td>
 		<td>
 			<ul>
 				<li>Any {@doc PojoCategories Parsable POJO} type.
@@ -9652,7 +9655,7 @@
 	}
 </p>
 <p>
-	Just like serialization, the <code>object</code> type is not officially part of the OpenAPI standard, but
+	Just like serialization, the <c>object</c> type is not officially part of the OpenAPI standard, but
 	Juneau supports parsing HTTP parts in UON notation to Maps and beans.
 </p>
 <p>
@@ -9707,7 +9710,7 @@
 	MyBean b = p.parse(schema, input, MyBean.<jk>class</jk>);
 </p>
 <p>
-	Note that serializing into generic <code>Object</code> properties would have produced similar results:
+	Note that serializing into generic <c>Object</c> properties would have produced similar results:
 </p>
 <p class='bpcode w800'>
 	<jk>public class</jk> MyBean {
@@ -9748,7 +9751,7 @@
 		They can be skipped or partially defined.
 	<li>
 		We make our best attempt to convert the output to the matching type.  
-		However, you will get <code>ParseExceptions</code> if you attempt an impossible conversion.
+		However, you will get <c>ParseExceptions</c> if you attempt an impossible conversion.
 		(e.g. trying to parse the string "foo" into a boolean). 
 </ul>
 </div><!-- END: 2.26.3 - juneau-marshall.OpenApiDetails.Parsers -->
@@ -9805,7 +9808,7 @@
 	org.apache.juneau.marshall.rdf_{@property juneauVersion}.jar 
 </p>	
 <p>
-	The <code>juneau-marshall-rdf</code> library provides additional serializers and parsers for RDF.
+	The <c>juneau-marshall-rdf</c> library provides additional serializers and parsers for RDF.
 	These rely on the Apache Jena library to provide support for the following languages:
 </p>
 <ul>
@@ -9832,7 +9835,7 @@
 </ul>
 
 <p>
-	The serializers and parsers work identically to those in <code>juneau-marshall</code>, but are
+	The serializers and parsers work identically to those in <c>juneau-marshall</c>, but are
 	packaged separately so that you don't need to pull in the Jena dependency unless you need it.
 </p>
 
@@ -9877,7 +9880,7 @@
 <div class='topic'><!-- START: 3.1.1 - juneau-marshall-rdf.RdfDetails.Serializers -->
 <p>
 	The {@link org.apache.juneau.jena.RdfSerializer} class is the top-level class for all Jena-based serializers.
-	Language-specific serializers are defined as inner subclasses of the <code>RdfSerializer</code> class:
+	Language-specific serializers are defined as inner subclasses of the <c>RdfSerializer</c> class:
 </p>	
 <ul class='doctree'>
 	<li class='jc'>{@link org.apache.juneau.jena.RdfSerializer}
@@ -9976,7 +9979,7 @@
 <div class='topic'><!-- START: 3.1.2 - juneau-marshall-rdf.RdfDetails.Parsers -->
 <p>
 	The {@link org.apache.juneau.jena.RdfParser} class is the top-level class for all Jena-based parsers.
-	Language-specific parsers are defined as inner subclasses of the <code>RdfParser</code> class:
+	Language-specific parsers are defined as inner subclasses of the <c>RdfParser</c> class:
 </p>	
 <ul class='doctree'>
 	<li class='jc'>{@link org.apache.juneau.jena.RdfParser}
@@ -9988,7 +9991,7 @@
 	</ul>
 </ul>
 <p>
-	The <code>RdfParser.Xml</code> parser handles both regular and abbreviated RDF/XML.
+	The <c>RdfParser.Xml</c> parser handles both regular and abbreviated RDF/XML.
 </p>
 <p>
 	The RDF parser provides the following settings:
@@ -10088,16 +10091,16 @@
 	These are used by default when namespaces are not explicitly specified.
 </p>
 <p>
-	The <code>juneau</code> namespace is used for generic names for objects that don't have namespaces 
+	The <c>juneau</c> namespace is used for generic names for objects that don't have namespaces 
 	associated with them.
 </p>
 <p>
-	The <code>juneaubp</code> namespace is used on bean properties that don't have namespaces associated with 
+	The <c>juneaubp</c> namespace is used on bean properties that don't have namespaces associated with 
 	them.
 </p>
 <p>
 	The easiest way to specify namespaces is through annotations.
-	In this example, we're going to associate the prefix <code>'per'</code> to our bean class and all properties 
+	In this example, we're going to associate the prefix <c>'per'</c> to our bean class and all properties 
 	of this class.
 	We do this by adding the following annotation to our class:
 </p>
@@ -10107,7 +10110,7 @@
 </p>
 <p>
 	In general, the best approach is to define the namespace URIs at the package level using a 
-	<code>package-info.java</code> class, like so:
+	<c>package-info.java</c> class, like so:
 </p>
 <p class='bpcode w800'>
 	<jc>// RDF namespaces used in this package</jc>
@@ -10169,7 +10172,7 @@
 <h4 class='topic ' onclick='toggle(this)'><a href='#juneau-marshall-rdf.RdfDetails.UriProperties' id='juneau-marshall-rdf.RdfDetails.UriProperties'>3.1.5 - URI Properties</a></h4>
 <div class='topic'><!-- START: 3.1.5 - juneau-marshall-rdf.RdfDetails.UriProperties -->
 <p>
-	Bean properties of type <code>java.net.URI</code> or <code>java.net.URL</code> have special meaning to the 
+	Bean properties of type <c>java.net.URI</c> or <c>java.net.URL</c> have special meaning to the 
 	RDF serializer.
 	They are interpreted as resource identifiers.
 </p>
@@ -10225,8 +10228,8 @@
 </p>
 <p>
 	The {@link org.apache.juneau.annotation.URI @URI} annotation can also be used on classes and properties 
-	to identify them as URLs when they're not instances of <code>java.net.URI</code> or <code>java.net.URL</code> 
-	(not needed if <code><ja>@Rdf</ja>(beanUri=<jk>true</jk>)</code> is already specified).
+	to identify them as URLs when they're not instances of <c>java.net.URI</c> or <c>java.net.URL</c> 
+	(not needed if <c><ja>@Rdf</ja>(beanUri=<jk>true</jk>)</c> is already specified).
 </p>
 <p>
 	The following properties would have produced the same output as before.  
@@ -10279,7 +10282,7 @@
 	For all RDF languages, the POJO objects get broken down into simple triplets.
 	Unfortunately, for tree-structured data like the POJOs shown above, this causes the root node of the tree 
 	to become lost.
-	There is no easy way to identify that <code>person/1</code> is the root node in our tree once in triplet 
+	There is no easy way to identify that <c>person/1</c> is the root node in our tree once in triplet 
 	form, and in some cases it's impossible.
 </p>
 <p>
@@ -10292,7 +10295,7 @@
 <p>
 	To resolve this issue, the property {@link org.apache.juneau.jena.RdfSerializer#RDF_addRootProperty} 
 	was introduced.
-	When enabled, this adds a special <code>root</code> attribute to the root node to make it easy to locate 
+	When enabled, this adds a special <c>root</c> attribute to the root node to make it easy to locate 
 	by the parser.
 </p>
 <p>
@@ -10307,7 +10310,7 @@
 		.build();
 </p>	
 <p>
-	Now when we rerun the sample code, we'll see the added <code>root</code> attribute on the root resource.
+	Now when we rerun the sample code, we'll see the added <c>root</c> attribute on the root resource.
 </p>
 <p class='bpcode w800'>
 	<xt>&lt;rdf:RDF</xt>
@@ -10347,7 +10350,7 @@
 <h4 class='topic ' onclick='toggle(this)'><a href='#juneau-marshall-rdf.RdfDetails.TypedLiterals' id='juneau-marshall-rdf.RdfDetails.TypedLiterals'>3.1.7 - Typed Literals</a></h4>
 <div class='topic'><!-- START: 3.1.7 - juneau-marshall-rdf.RdfDetails.TypedLiterals -->
 <p>
-	XML-Schema data-types can be added to non-<code>String</code> literals through the 
+	XML-Schema data-types can be added to non-<c>String</c> literals through the 
 	{@link org.apache.juneau.jena.RdfSerializer#RDF_addLiteralTypes} setting.
 </p>
 <p>
@@ -10362,7 +10365,7 @@
 		.build();
 </p>	
 <p>
-	Now when we rerun the sample code, we'll see the added <code>root</code> attribute on the root resource.
+	Now when we rerun the sample code, we'll see the added <c>root</c> attribute on the root resource.
 </p>
 <p class='bpcode w800'>
 	<xt>&lt;rdf:RDF</xt>
@@ -10419,7 +10422,7 @@
 	org.apache.juneau.dto_{@property juneauVersion}.jar 
 </p>	
 <p>
-	The <code>juneau-dto</code> library contains several predefined POJOs for generating commonly-used document types.
+	The <c>juneau-dto</c> library contains several predefined POJOs for generating commonly-used document types.
 	This section describes support for these POJOs.
 </p>
 
@@ -10848,7 +10851,7 @@
 	from {@link org.apache.juneau.dto.swagger.Swagger} beans.
 </p>
 <p>
-	The <code>PetStore</code> example described later provides an example of auto-generated Swagger JSON:
+	The <c>PetStore</c> example described later provides an example of auto-generated Swagger JSON:
 </p>
 <img class='bordered w900' src='doc-files/SwaggerUI.json.png'>
 <p>
@@ -10965,24 +10968,24 @@
 	configured with the following basic variables:
 </p>
 <ul class='doctree'>
-	<li class='jc'>{@link org.apache.juneau.svl.vars.SystemPropertiesVar} - <code>$S{key[,default]}</code>
-		<li class='jc'>{@link org.apache.juneau.svl.vars.EnvVariablesVar} - <code>$E{key[,default]}</code>
+	<li class='jc'>{@link org.apache.juneau.svl.vars.SystemPropertiesVar} - <c>$S{key[,default]}</c>
+		<li class='jc'>{@link org.apache.juneau.svl.vars.EnvVariablesVar} - <c>$E{key[,default]}</c>
 </ul>
 <p>
 	The following logic variables are also provided:
 </p>
 <ul class='doctree'>
-		<li class='jc'>{@link org.apache.juneau.svl.vars.IfVar} - <code>$IF{arg,then[,else]}</code>
-		<li class='jc'>{@link org.apache.juneau.svl.vars.SwitchVar} - <code>$SW{arg,pattern1:then1[,pattern2:then2...]}</code>
-		<li class='jc'>{@link org.apache.juneau.svl.vars.CoalesceVar} - <code>$CO{arg1[,arg2...]}</code>
-		<li class='jc'>{@link org.apache.juneau.svl.vars.PatternMatchVar} - <code>$PM{arg,pattern}</code> 
-		<li class='jc'>{@link org.apache.juneau.svl.vars.PatternReplaceVar} - <code>$PR{arg,pattern,replace}</code> 
-		<li class='jc'>{@link org.apache.juneau.svl.vars.PatternExtractVar} - <code>$PE{arg,pattern,groupIndex}</code> 
-		<li class='jc'>{@link org.apache.juneau.svl.vars.NotEmptyVar} - <code>$NE{arg}</code>
-		<li class='jc'>{@link org.apache.juneau.svl.vars.UpperCaseVar} - <code>$UC{arg}</code>
-		<li class='jc'>{@link org.apache.juneau.svl.vars.LowerCaseVar} - <code>$LC{arg}</code>
-		<li class='jc'>{@link org.apache.juneau.svl.vars.LenVar} - <code>$LN{arg[,delimiter]}</code>
-		<li class='jc'>{@link org.apache.juneau.svl.vars.SubstringVar} - <code>$ST{arg,start[,end]}</code>
+		<li class='jc'>{@link org.apache.juneau.svl.vars.IfVar} - <c>$IF{arg,then[,else]}</c>
+		<li class='jc'>{@link org.apache.juneau.svl.vars.SwitchVar} - <c>$SW{arg,pattern1:then1[,pattern2:then2...]}</c>
+		<li class='jc'>{@link org.apache.juneau.svl.vars.CoalesceVar} - <c>$CO{arg1[,arg2...]}</c>
+		<li class='jc'>{@link org.apache.juneau.svl.vars.PatternMatchVar} - <c>$PM{arg,pattern}</c> 
+		<li class='jc'>{@link org.apache.juneau.svl.vars.PatternReplaceVar} - <c>$PR{arg,pattern,replace}</c> 
+		<li class='jc'>{@link org.apache.juneau.svl.vars.PatternExtractVar} - <c>$PE{arg,pattern,groupIndex}</c> 
+		<li class='jc'>{@link org.apache.juneau.svl.vars.NotEmptyVar} - <c>$NE{arg}</c>
+		<li class='jc'>{@link org.apache.juneau.svl.vars.UpperCaseVar} - <c>$UC{arg}</c>
+		<li class='jc'>{@link org.apache.juneau.svl.vars.LowerCaseVar} - <c>$LC{arg}</c>
+		<li class='jc'>{@link org.apache.juneau.svl.vars.LenVar} - <c>$LN{arg[,delimiter]}</c>
+		<li class='jc'>{@link org.apache.juneau.svl.vars.SubstringVar} - <c>$ST{arg,start[,end]}</c>
 </ul>
 <h5 class='figure'>Example:</h5>
 <p class='bpcode w800'>
@@ -11266,21 +11269,21 @@
 	{@link org.apache.juneau.svl.VarResolver#DEFAULT} is a reusable variable resolver with default support for the following variables:
 </p>
 <ul>
-	<li><code>$S{key[,default]}</code> - {@link org.apache.juneau.svl.vars.SystemPropertiesVar}
-	<li><code>$E{key[,default]}</code> - {@link org.apache.juneau.svl.vars.EnvVariablesVar}
-	<li><code>$A{key[,default]}</code> - {@link org.apache.juneau.svl.vars.ArgsVar}
-	<li><code>$MF{key[,default]}</code> - {@link org.apache.juneau.svl.vars.ManifestFileVar}
-	<li><code>$SW{stringArg,pattern:thenValue[,pattern:thenValue...]}</code> - {@link org.apache.juneau.svl.vars.SwitchVar}
-	<li><code>$IF{arg,then[,else]}</code> - {@link org.apache.juneau.svl.vars.IfVar}
-	<li><code>$CO{arg[,arg2...]}</code> - {@link org.apache.juneau.svl.vars.CoalesceVar}
-	<li><code>$PM{arg,pattern}</code> - {@link org.apache.juneau.svl.vars.PatternMatchVar}
-	<li><code>$PR{stringArg,pattern,replace}</code>- {@link org.apache.juneau.svl.vars.PatternReplaceVar}
-	<li><code>$PE{arg,pattern,groupIndex}</code> - {@link org.apache.juneau.svl.vars.PatternExtractVar}
-	<li><code>$UC{arg}</code> - {@link org.apache.juneau.svl.vars.UpperCaseVar}
-	<li><code>$LC{arg}</code> - {@link org.apache.juneau.svl.vars.LowerCaseVar}
-	<li><code>$NE{arg}</code> - {@link org.apache.juneau.svl.vars.NotEmptyVar}
-	<li><code>$LN{arg[,delimiter]}</code> - {@link org.apache.juneau.svl.vars.LenVar}
-	<li><code>$ST{arg,start[,end]}</code> - {@link org.apache.juneau.svl.vars.SubstringVar}
+	<li><c>$S{key[,default]}</c> - {@link org.apache.juneau.svl.vars.SystemPropertiesVar}
+	<li><c>$E{key[,default]}</c> - {@link org.apache.juneau.svl.vars.EnvVariablesVar}
+	<li><c>$A{key[,default]}</c> - {@link org.apache.juneau.svl.vars.ArgsVar}
+	<li><c>$MF{key[,default]}</c> - {@link org.apache.juneau.svl.vars.ManifestFileVar}
+	<li><c>$SW{stringArg,pattern:thenValue[,pattern:thenValue...]}</c> - {@link org.apache.juneau.svl.vars.SwitchVar}
+	<li><c>$IF{arg,then[,else]}</c> - {@link org.apache.juneau.svl.vars.IfVar}
+	<li><c>$CO{arg[,arg2...]}</c> - {@link org.apache.juneau.svl.vars.CoalesceVar}
+	<li><c>$PM{arg,pattern}</c> - {@link org.apache.juneau.svl.vars.PatternMatchVar}
+	<li><c>$PR{stringArg,pattern,replace}</c>- {@link org.apache.juneau.svl.vars.PatternReplaceVar}
+	<li><c>$PE{arg,pattern,groupIndex}</c> - {@link org.apache.juneau.svl.vars.PatternExtractVar}
+	<li><c>$UC{arg}</c> - {@link org.apache.juneau.svl.vars.UpperCaseVar}
+	<li><c>$LC{arg}</c> - {@link org.apache.juneau.svl.vars.LowerCaseVar}
+	<li><c>$NE{arg}</c> - {@link org.apache.juneau.svl.vars.NotEmptyVar}
+	<li><c>$LN{arg[,delimiter]}</c> - {@link org.apache.juneau.svl.vars.LenVar}
+	<li><c>$ST{arg,start[,end]}</c> - {@link org.apache.juneau.svl.vars.SubstringVar}
 </ul>
 </div><!-- END: 5.4 - juneau-svl.DefaultVarResolver -->
 
@@ -11291,17 +11294,17 @@
 <ul class='spaced-list'>
 	<li>
 		The escape character <js>'\'</js> can be used when necessary to escape the following characters: 
-		<code>$ , { }</code>
+		<c>$ , { }</c>
 	<li>
 		<b>WARNING:</b>  It is possible to cause {@link java.lang.StackOverflowError StackOverflowErrors} if 
 		your nested variables result in a recursive loop (e.g. the environment variable 
-		<code>'MYPROPERTY'</code> has the value <code>'$E{MYPROPERTY}'</code>).
+		<c>'MYPROPERTY'</c> has the value <c>'$E{MYPROPERTY}'</c>).
 		So don't do that!
 	<li>
 		As a general rule, this class tries to be as efficient as possible by not creating new strings when not 
 		needed.
 		<br>For example, calling the resolve method on a string that doesn't contain variables (e.g. 
-		<code>resolver.resolve(<js>"foobar"</js>)</code>) will simply be a no-op and return the same string.
+		<c>resolver.resolve(<js>"foobar"</js>)</c>) will simply be a no-op and return the same string.
 </ul>
 </div><!-- END: 5.5 - juneau-svl.OtherNotes -->
 </div><!-- END: 5 - juneau-svl -->
@@ -11334,7 +11337,7 @@
 <h3 class='topic ' onclick='toggle(this)'><a href='#juneau-config.Overview' id='juneau-config.Overview'>6.1 - Overview</a></h3>
 <div class='topic'><!-- START: 6.1 - juneau-config.Overview -->
 <p>
-	The <code>juneau-config</code> library contains a powerful API for creating and using INI-style config files.
+	The <c>juneau-config</c> library contains a powerful API for creating and using INI-style config files.
 </p>
 <h5 class='figure'>Example configuration file:</h5>
 <p class='bpcode w800'>
@@ -11356,7 +11359,7 @@
 <p>
 	Config files are accessed through the {@link org.apache.juneau.config.Config} class which
 	are created through the {@link org.apache.juneau.config.ConfigBuilder} class.
-	Builder creator methods are provided on the <code>Config</code> class:
+	Builder creator methods are provided on the <c>Config</c> class:
 </p>
 <p class='bpcode w800'>
 	<jc>// Create a Config object</jc>
@@ -11686,7 +11689,7 @@
 	</ul>
 </ul>
 <p>
-	The <code>getStringArray()</code> methods allow you to retrieve comma-delimited lists of values:
+	The <c>getStringArray()</c> methods allow you to retrieve comma-delimited lists of values:
 <p class='bpcode w800'>
 	<ck>key1</ck> = <cv>foo, bar, baz</cv>
 </p>
@@ -11694,7 +11697,7 @@
 	String[] key1 = c.getStringArray(<js>"key1"</js>);
 </p>
 <p>
-	String arrays can also be represented in JSON when using the <code>getObject()</code> methods:
+	String arrays can also be represented in JSON when using the <c>getObject()</c> methods:
 </p>
 <p class='bpcode w800'>
 	<ck>key1</ck> = <cv>['foo','bar','baz']</cv>
@@ -11703,7 +11706,7 @@
 	String[] key1 = c.getObject(<js>"key1"</js>, String[].<jk>class</jk>);
 </p>
 <p>
-	Primitive arrays can also be retrieved using the <code>getObject()</code> methods:
+	Primitive arrays can also be retrieved using the <c>getObject()</c> methods:
 </p>
 <p class='bpcode w800'>
 	<ck>key1</ck> = <cv>[1,2,3]</cv>
@@ -11712,7 +11715,7 @@
 	<jk>int</jk>[] key1 = c.getObject(<js>"key1"</js>, <jk>int</jk>[].<jk>class</jk>);
 </p>
 <p>
-	Arrays of POJOs can also be retrieved using the <code>getObject()</code> methods:
+	Arrays of POJOs can also be retrieved using the <c>getObject()</c> methods:
 </p>
 <p class='bpcode w800'>
 	<ck>addresses</ck> = 
@@ -11753,29 +11756,29 @@
 	</ul>
 </ul>
 <p>
-	The <code>Type,Type...</code> arguments allow you to specify the component types for maps and collections.
-	<code>List</code> class arguments can be followed by zero or one arguments representing the entry types.
-	<code>Map</code> class arguments can be followed by zero or two arguments representing the key and value types.
+	The <c>Type,Type...</c> arguments allow you to specify the component types for maps and collections.
+	<c>List</c> class arguments can be followed by zero or one arguments representing the entry types.
+	<c>Map</c> class arguments can be followed by zero or two arguments representing the key and value types.
 	The arguments can be chained to produce any data structure consisting of maps, collections, or POJOs.
 </p>
 <p>
 	Examples are shown below:
 </p>
 <ul class='spaced-list'>
-	<li><code>getObject(<js>"..."</js>, List.<jk>class</jk>)</code>
-		<br>Produces: <code>List&lt;?&gt;</code>
-	<li><code>getObject(<js>"..."</js>, LinkedList.<jk>class</jk>)</code>
-		<br>Produces: <code>LinkedList&lt;?&gt;</code>
-	<li><code>getObject(<js>"..."</js>, HashSet.<jk>class</jk>, Integer.<jk>class</jk>)</code>
-		<br>Produces: <code>HashSet&lt;Integer&gt;</code>
-	<li><code>getObject(<js>"..."</js>, Map.<jk>class</jk>)</code>
-		<br>Produces: <code>Map&lt;?,?&gt;</code>
-	<li><code>getObject(<js>"..."</js>, HashMap.<jk>class</jk>)</code>
-		<br>Produces: <code>HashMap&lt;?,?&gt;</code>
-	<li><code>getObject(<js>"..."</js>, LinkedHashMap.<jk>class</jk>, String.<jk>class</jk>, MyBean.<jk>class</jk>)</code>
-		<br>Produces: <code>LinkedHashMap&lt;String,MyBean&gt;</code> 
-	<li><code>getObject(<js>"..."</js>, HashMap.<jk>class</jk>, Integer.<jk>class</jk>, ArrayList.<jk>class</jk>, MyBean[].<jk>class</jk>)</code>
-		<br>Produces: <code>LinkedHashMap&lt;Integer,ArrayList&lt;MyBean[]&gt;&gt;</code> 
+	<li><c>getObject(<js>"..."</js>, List.<jk>class</jk>)</c>
+		<br>Produces: <c>List&lt;?&gt;</c>
+	<li><c>getObject(<js>"..."</js>, LinkedList.<jk>class</jk>)</c>
+		<br>Produces: <c>LinkedList&lt;?&gt;</c>
+	<li><c>getObject(<js>"..."</js>, HashSet.<jk>class</jk>, Integer.<jk>class</jk>)</c>
+		<br>Produces: <c>HashSet&lt;Integer&gt;</c>
+	<li><c>getObject(<js>"..."</js>, Map.<jk>class</jk>)</c>
+		<br>Produces: <c>Map&lt;?,?&gt;</c>
+	<li><c>getObject(<js>"..."</js>, HashMap.<jk>class</jk>)</c>
+		<br>Produces: <c>HashMap&lt;?,?&gt;</c>
+	<li><c>getObject(<js>"..."</js>, LinkedHashMap.<jk>class</jk>, String.<jk>class</jk>, MyBean.<jk>class</jk>)</c>
+		<br>Produces: <c>LinkedHashMap&lt;String,MyBean&gt;</c> 
+	<li><c>getObject(<js>"..."</js>, HashMap.<jk>class</jk>, Integer.<jk>class</jk>, ArrayList.<jk>class</jk>, MyBean[].<jk>class</jk>)</c>
+		<br>Produces: <c>LinkedHashMap&lt;Integer,ArrayList&lt;MyBean[]&gt;&gt;</c> 
 </ul>
 <h5 class='figure'>Example:</h5>
 <p class='bpcode w800'>
@@ -11827,11 +11830,11 @@
 </p>
 <ul class='spaced-list'>
 	<li>BASE-64 (default)
-		<br>Example: <code><js>"Zm9vYmFycw=="</js></code>
+		<br>Example: <c><js>"Zm9vYmFycw=="</js></c>
 	<li>Hexadecimal
-		<br>Example: <code><js>"666F6F62617273"</js></code>
+		<br>Example: <c><js>"666F6F62617273"</js></c>
 	<li>Spaced hexadecimal
-		<br>Example: <code><js>"66 6F 6F 62 61 72 73"</js></code>
+		<br>Example: <c><js>"66 6F 6F 62 61 72 73"</js></c>
 </ul>
 <p>
 	The binary data format is controlled via the following setting:
@@ -11903,13 +11906,13 @@
 	ABean bean = cf.getObject(<js>"MySection/aBean"</js>, ABean.<jk>class</jk>); 
 </p>
 <p>
-	By default, <code>Configs</code> use the {@link org.apache.juneau.svl.VarResolver#DEFAULT} variable resolver
+	By default, <c>Configs</c> use the {@link org.apache.juneau.svl.VarResolver#DEFAULT} variable resolver
 	which provides support for the following variables and constructs:
 </p>
 <ul class='doctree'>
-	<li class='jc'>{@link org.apache.juneau.svl.vars.SystemPropertiesVar} - <code>$S{key[,default]}</code>
-		<li class='jc'>{@link org.apache.juneau.svl.vars.EnvVariablesVar} - <code>$E{key[,default]}</code>
-		<li class='jc'>{@link org.apache.juneau.config.vars.ConfigVar} - <code>$C{key[,default]}</code>
+	<li class='jc'>{@link org.apache.juneau.svl.vars.SystemPropertiesVar} - <c>$S{key[,default]}</c>
+		<li class='jc'>{@link org.apache.juneau.svl.vars.EnvVariablesVar} - <c>$E{key[,default]}</c>
+		<li class='jc'>{@link org.apache.juneau.config.vars.ConfigVar} - <c>$C{key[,default]}</c>
 </ul>
 <p>
 	The variable resolver is controlled via the following setting:
@@ -11918,7 +11921,7 @@
 	<li class='jf'>{@link org.apache.juneau.config.Config#CONFIG_varResolver}
 </ul>
 <p>
-	Additionally, the following method can be used to retrieve a <code>Config</code> with a different variable resolver:
+	Additionally, the following method can be used to retrieve a <c>Config</c> with a different variable resolver:
 </p>
 <ul class='doctree'>
 	<li class='jm'>{@link org.apache.juneau.config.Config#resolving(VarResolverSession)}
@@ -11932,16 +11935,16 @@
 	The default variable resolver also provides the following logic variables for performing simple logical operations:
 </p>
 <ul class='doctree'>
-		<li class='jc'>{@link org.apache.juneau.svl.vars.IfVar} - <code>$IF{arg,then[,else]}</code>
-		<li class='jc'>{@link org.apache.juneau.svl.vars.SwitchVar} - <code>$SW{arg,pattern1:then1[,pattern2:then2...]}</code>
-		<li class='jc'>{@link org.apache.juneau.svl.vars.CoalesceVar} - <code>$CO{arg1[,arg2...]}</code>
-		<li class='jc'>{@link org.apache.juneau.svl.vars.PatternMatchVar} - <code>$PM{arg,pattern}</code> 
-		<li class='jc'>{@link org.apache.juneau.svl.vars.NotEmptyVar} - <code>$NE{arg}</code>
-		<li class='jc'>{@link org.apache.juneau.svl.vars.UpperCaseVar} - <code>$UC{arg}</code>
-		<li class='jc'>{@link org.apache.juneau.svl.vars.LowerCaseVar} - <code>$LC{arg}</code>
+		<li class='jc'>{@link org.apache.juneau.svl.vars.IfVar} - <c>$IF{arg,then[,else]}</c>
+		<li class='jc'>{@link org.apache.juneau.svl.vars.SwitchVar} - <c>$SW{arg,pattern1:then1[,pattern2:then2...]}</c>
+		<li class='jc'>{@link org.apache.juneau.svl.vars.CoalesceVar} - <c>$CO{arg1[,arg2...]}</c>
+		<li class='jc'>{@link org.apache.juneau.svl.vars.PatternMatchVar} - <c>$PM{arg,pattern}</c> 
+		<li class='jc'>{@link org.apache.juneau.svl.vars.NotEmptyVar} - <c>$NE{arg}</c>
+		<li class='jc'>{@link org.apache.juneau.svl.vars.UpperCaseVar} - <c>$UC{arg}</c>
+		<li class='jc'>{@link org.apache.juneau.svl.vars.LowerCaseVar} - <c>$LC{arg}</c>
 </ul>
 <p>
-	The <code>$IF</code> variable can be used for simple if/else logic:
+	The <c>$IF</c> variable can be used for simple if/else logic:
 </p>
 <p class='bpcode w800'>
 	<cc># Value set to 'foo' if myBooleanProperty is true</cc>
@@ -11968,7 +11971,7 @@
 		}</cv>		
 </p>
 <p>
-	The <code>$SW</code> variable can be used for switch blocks based on pattern matching:
+	The <c>$SW</c> variable can be used for switch blocks based on pattern matching:
 </p>
 <p class='bpcode w800'>
 	<cc># Shell command depends on the OS</cc>
@@ -11981,7 +11984,7 @@
 		}</cv>		
 </p>
 <p>
-	The <code>$CO</code> variable can be used for coalescing of values (finding the first non-null/empty match):
+	The <c>$CO</c> variable can be used for coalescing of values (finding the first non-null/empty match):
 </p>
 <p class='bpcode w800'>
 	<cc># Debug flag can be enabled by system property or environment variable.</cc>
@@ -11993,7 +11996,7 @@
 		}</cv>		
 </p>
 <p>
-	The <code>$PM</code> variable can be used for calculating boolean values:
+	The <c>$PM</c> variable can be used for calculating boolean values:
 </p>
 <p class='bpcode w800'>
 	<cc># Debug flag can be enabled by system property or environment variable.</cc>
@@ -12243,7 +12246,7 @@
 	To remove pre-lines, you should pass in an empty list.
 </p>	
 <p>
-	Sections can be added with optional pre-lines using the <code>setSection</code> methods:
+	Sections can be added with optional pre-lines using the <c>setSection</c> methods:
 </p>
 <p class='bpcode w800'>
 	<jc>// Set an encoded value with some comments.</jc>
@@ -12274,19 +12277,19 @@
 <h4 class='topic ' onclick='toggle(this)'><a href='#juneau-config.SettingValues.FileSystemChanges' id='juneau-config.SettingValues.FileSystemChanges'>6.8.1 - File System Changes</a></h4>
 <div class='topic'><!-- START: 6.8.1 - juneau-config.SettingValues.FileSystemChanges -->
 <p>
-	In general, external file modifications will be detected immediately in the <code>Config</code>
+	In general, external file modifications will be detected immediately in the <c>Config</c>
 	object when a watcher thread is enabled (explained later).
 	Otherwise, they are detected when a commit is performed.
 </p>
 <p>
-	The <code>Config</code> object maintains an in-memory record of all changes that have been applied to it
+	The <c>Config</c> object maintains an in-memory record of all changes that have been applied to it
 	through getters and setters.
 	When the underlying file changes, the new contents are loaded and the in-memory changes are then 
 	applied to the new configuration.
 	This provides the benefits of real-time updates of configurations while not losing any changes made in the JVM.
 </p>
 <p>
-	If the <code>commit()</code> method is called on the <code>Config</code> objects after the file system
+	If the <c>commit()</c> method is called on the <c>Config</c> objects after the file system
 	contents have been modified, we will then reload the configuration from the file system, apply the
 	changes, and then try to save to the file system again (up to 10 times).
 </p>
@@ -12301,7 +12304,7 @@
 <h4 class='topic ' onclick='toggle(this)'><a href='#juneau-config.SettingValues.CustomEntrySerialization' id='juneau-config.SettingValues.CustomEntrySerialization'>6.8.2 - Custom Entry Serialization</a></h4>
 <div class='topic'><!-- START: 6.8.2 - juneau-config.SettingValues.CustomEntrySerialization -->
 <p>
-	Setter methods that take in a <code>Serializer</code> can be used to provide custom serialization of entries
+	Setter methods that take in a <c>Serializer</c> can be used to provide custom serialization of entries
 	instead of using the predefined serializer.
 </p>
 <p class='bpcode w800'>
@@ -12430,7 +12433,7 @@
 <h3 class='topic ' onclick='toggle(this)'><a href='#juneau-config.Serializing' id='juneau-config.Serializing'>6.10 - Serializing</a></h3>
 <div class='topic'><!-- START: 6.10 - juneau-config.Serializing -->
 <p>
-	The following methods are used for serializing <code>Config</code> objects back into INI files:
+	The following methods are used for serializing <c>Config</c> objects back into INI files:
 </p>
 <ul class='doctree'>
 	<li class='jc'>{@link org.apache.juneau.config.Config}
@@ -12443,7 +12446,7 @@
 	Both methods are thread safe.
 </p>
 <p>
-	The <code>Config</code> class implements the {@link org.apache.juneau.Writable} which means it can be 
+	The <c>Config</c> class implements the {@link org.apache.juneau.Writable} which means it can be 
 	returned as-is by REST methods to be serialized as INI text.
 </p>
 </div><!-- END: 6.10 - juneau-config.Serializing -->
@@ -12629,7 +12632,7 @@
 	<li class='jc'>{@link org.apache.juneau.config.store.ConfigMemoryStore} - In-memory storage.
 </ul>
 <p>
-	The store is defined on the <code>Config</code> object via the following setting:
+	The store is defined on the <c>Config</c> object via the following setting:
 </p>
 <ul>
 	<li class='jf'>{@link org.apache.juneau.config.Config#CONFIG_store}
@@ -12732,7 +12735,7 @@
 <h4 class='topic ' onclick='toggle(this)'><a href='#juneau-config.ConfigStores.CustomConfigStores' id='juneau-config.ConfigStores.CustomConfigStores'>6.12.3 - Custom ConfigStores</a></h4>
 <div class='topic'><!-- START: 6.12.3 - juneau-config.ConfigStores.CustomConfigStores -->
 <p>
-	The <code>ConfigStore</code> API has been written to allow easy development of custom configuration storage classes.
+	The <c>ConfigStore</c> API has been written to allow easy development of custom configuration storage classes.
 </p>
 <p>
 	The example below shows a starting point for an implementation based on polling a relational database.
@@ -12844,7 +12847,7 @@
 </p>
 <p>
 	The purpose of the builder class is to simply set values in the {@link org.apache.juneau.PropertyStore}
-	that's passed to the <code>ConfigStore</code>:
+	that's passed to the <c>ConfigStore</c>:
 </p>
 <h5 class='figure'>Example Builder Class:</h5>
 <p class='bpcode w800'>
@@ -12896,7 +12899,7 @@
 <h4 class='topic ' onclick='toggle(this)'><a href='#juneau-config.ConfigStores.ConfigStoreListeners' id='juneau-config.ConfigStores.ConfigStoreListeners'>6.12.4 - ConfigStore Listeners</a></h4>
 <div class='topic'><!-- START: 6.12.4 - juneau-config.ConfigStores.ConfigStoreListeners -->
 <p>
-	The <code>ConfigStore</code> class has the following listener methods:
+	The <c>ConfigStore</c> class has the following listener methods:
 </p>
 <ul class='doctree'>
 	<li class='jac'>{@link org.apache.juneau.config.store.ConfigStore}
@@ -12916,7 +12919,7 @@
 	</ul>
 </ul>
 <p>
-	This listener is used by the <code>Config</code> class to listen for changes on the file system so that it can be
+	This listener is used by the <c>Config</c> class to listen for changes on the file system so that it can be
 	updated in real-time.
 </p>
 </div><!-- END: 6.12.4 - juneau-config.ConfigStores.ConfigStoreListeners -->
@@ -12927,7 +12930,7 @@
 <h3 class='topic ' onclick='toggle(this)'><a href='#juneau-config.ReadOnlyConfigs' id='juneau-config.ReadOnlyConfigs'>6.13 - Read-only Configs</a></h3>
 <div class='topic'><!-- START: 6.13 - juneau-config.ReadOnlyConfigs -->
 <p>
-	The following settings can be used to create read-only <code>Config</code> objects:
+	The following settings can be used to create read-only <c>Config</c> objects:
 </p>
 <ul class='doctree'>
 	<li class='jf'>{@link org.apache.juneau.config.Config#CONFIG_readOnly}
@@ -12988,25 +12991,25 @@
 	<li>
 		In the home directory:
 		<ol>
-			<li><code>&lt;jar-name&gt;.cfg</code>
-			<li>Any file that end with <code>.cfg</code>.  First one matched alphabetically is used.
+			<li><c>&lt;jar-name&gt;.cfg</c>
+			<li>Any file that end with <c>.cfg</c>.  First one matched alphabetically is used.
 		</ol>
 	<li>
 		In the context classpath root package (i.e. inside the jar itself):
 		<ol>
-			<li><code>&lt;jar-name&gt;.cfg</code>
-			<li><code>juneau.cfg</code>
-			<li><code>default.cfg</code>
-			<li><code>application.cfg</code>
-			<li><code>app.cfg</code>
-			<li><code>settings.cfg</code>
-			<li><code>application.properties</code>
+			<li><c>&lt;jar-name&gt;.cfg</c>
+			<li><c>juneau.cfg</c>
+			<li><c>default.cfg</c>
+			<li><c>application.cfg</c>
+			<li><c>app.cfg</c>
+			<li><c>settings.cfg</c>
+			<li><c>application.properties</c>
 		</ol>
 </ol>
 <p>
 	Later in the section on REST resources, we describe how to associate configurations with REST resources
 	using the {@link org.apache.juneau.rest.annotation.RestResource#config() @RestResource(config)} annotation.
-	The system default configuration can be referenced with the keyword <code>SYSTEM_DEFAULT</code> like so:
+	The system default configuration can be referenced with the keyword <c>SYSTEM_DEFAULT</c> like so:
 </p>
 <p class='bpcode w800'>
 	<jc>// Always use system default.</jc>
@@ -13251,7 +13254,7 @@
 </p>
 <p>
 	For child resources, you can either extend from one of the classes above, or extend from one of the following
-	that provides identical support but does not extent from <code>HttpServlet</code>:
+	that provides identical support but does not extent from <c>HttpServlet</c>:
 </p>
 <ul class='doctree'>
 	<li class='jic'>
@@ -13308,8 +13311,8 @@
 	The only requirement is that the class be annotated with <ja>@RestResource</ja> and have one of the following constructors:
 </p>
 <ul>
-	<li class='jm'><code><jk>public</jk> T()</code>
-	<li class='jm'><code><jk>public</jk> T(RestContextBuilder)</code>
+	<li class='jm'><c><jk>public</jk> T()</c>
+	<li class='jm'><c><jk>public</jk> T(RestContextBuilder)</c>
 </ul>
 <p>
 	And even that requirement is relaxed if you implement your own REST resource resolver (described later).
@@ -13362,7 +13365,7 @@
 	However, the class does provide a couple of convenience methods to be aware of:
 </p>
 <ul class='doctree'>
-	<li class='jac'><code>{@link org.apache.juneau.rest.RestServlet} <jk>extends</jk> HttpServlet</code>
+	<li class='jac'><c>{@link org.apache.juneau.rest.RestServlet} <jk>extends</jk> HttpServlet</c>
 	<ul>
 		<li class='jm'>{@link org.apache.juneau.rest.RestServlet#init(ServletConfig) init(ServletConfig)} - Can override to provide custom initialization.
 		<li class='jm'>{@link org.apache.juneau.rest.RestServlet#service(HttpServletRequest,HttpServletResponse) service(HttpServletRequest,HttpServletResponse)} - Can override to provide custom request handling.
@@ -13569,7 +13572,7 @@
 <div class='topic'><!-- START: 7.3.3 - juneau-rest-server.Instantiation.BasicRest -->
 <p>
 	The {@link org.apache.juneau.rest.BasicRest} class is identical to the {@link org.apache.juneau.rest.BasicRestServlet} class except that
-	it does not extend from <code>HttpServlet</code>.
+	it does not extend from <c>HttpServlet</c>.
 	It defines the exact same set of serializers, parsers, etc., but it cannot be deployed as a top-level
 	servlet.  It can however be used for child resources registered via the {@link org.apache.juneau.rest.annotation.RestResource#children() @RestResource(children)} 
 	annotation. 
@@ -13748,7 +13751,7 @@
 <div class='topic'><!-- START: 7.3.6 - juneau-rest-server.Instantiation.BasicRestGroup -->
 <p>
 	The {@link org.apache.juneau.rest.BasicRestGroup} class is identical to the {@link org.apache.juneau.rest.BasicRestServletGroup} class except that
-	it does not extend from <code>HttpServlet</code>.
+	it does not extend from <c>HttpServlet</c>.
 	It defines the exact same set of serializers, parsers, etc., but it cannot be deployed as a top-level
 	servlet.  It can however be used for child resources registered via the {@link org.apache.juneau.rest.annotation.RestResource#children() @RestResource(children)} 
 	annotation. 
@@ -13775,8 +13778,8 @@
 	to any class as long as it has one of the following constructors:
 </p>
 <ul>
-	<li class='jm'><code><jk>public</jk> T()</code>
-	<li class='jm'><code><jk>public</jk> T(RestContextBuilder)</code>
+	<li class='jm'><c><jk>public</jk> T()</c>
+	<li class='jm'><c><jk>public</jk> T(RestContextBuilder)</c>
 </ul>
 <p>
 	The latter constructor can be used to get access to the {@link org.apache.juneau.rest.RestContextBuilder} object to make
@@ -14099,24 +14102,24 @@
 </p>
 
 <p>
-	When the <code>name</code> and/or <code>path</code> values are not specified, their values are inferred
+	When the <c>name</c> and/or <c>path</c> values are not specified, their values are inferred
 	from the Java method name. 
 </p>
 <p>
 	The HTTP method can be inferred from the Java method by starting the method name with any of the following:
 </p>
 <ul>
-	<li><code>get</code>
-	<li><code>put</code>
-	<li><code>post</code>
-	<li><code>delete</code>
-	<li><code>options</code>
-	<li><code>head</code>
-	<li><code>trace</code>
-	<li><code>patch</code>
+	<li><c>get</c>
+	<li><c>put</c>
+	<li><c>post</c>
+	<li><c>delete</c>
+	<li><c>options</c>
+	<li><c>head</c>
+	<li><c>trace</c>
+	<li><c>patch</c>
 </ul>
 <p>
-	If <code>path</code> is not defined, it's inferred from the Java method name (minus the prefix above).
+	If <c>path</c> is not defined, it's inferred from the Java method name (minus the prefix above).
 </p>
 
 <h5 class='figure'>Examples:</h5>
@@ -14153,7 +14156,7 @@
 </p>
 
 <p>
-	If <code>name</code> and <code>path</code> are both specified, the Java method name can be anything.
+	If <c>name</c> and <c>path</c> are both specified, the Java method name can be anything.
 </p>
 
 <!-- ==================================================================================================== -->
@@ -14170,9 +14173,9 @@
 			<li><b>Request/response objects:</b>
 				<ul>
 					<li class='jc'>{@link org.apache.juneau.rest.RestRequest} - The request object.
-					<li class='jc'>{@link javax.servlet.http.HttpServletRequest} - The superclass of <code>RestRequest</code>.
+					<li class='jc'>{@link javax.servlet.http.HttpServletRequest} - The superclass of <c>RestRequest</c>.
 					<li class='jc'>{@link org.apache.juneau.rest.RestResponse} - The response object.
-					<li class='jc'>{@link javax.servlet.http.HttpServletResponse} - The superclass of <code>RestResponse</code>.
+					<li class='jc'>{@link javax.servlet.http.HttpServletResponse} - The superclass of <c>RestResponse</c>.
 				</ul>
 			<li><b>Parsed request header values:</b>
 				<ul>
@@ -14231,7 +14234,7 @@
 				</ul>
 			<li><b>Other:</b>
 				<ul>
-					<li class='jc'>{@link org.apache.juneau.http.HttpMethod} - The method name matched (when using <code><ja>@RestMethod</ja>(name=<js>"*"</js>)</code>)
+					<li class='jc'>{@link org.apache.juneau.http.HttpMethod} - The method name matched (when using <c><ja>@RestMethod</ja>(name=<js>"*"</js>)</c>)
 					<li class='jc'>{@link org.apache.juneau.rest.RestLogger} - Logger with additional features.
 					<li class='jc'>{@link org.apache.juneau.rest.RestContext} - The resource read-only context.
 					<li class='jc'>{@link org.apache.juneau.parser.Parser} - The parser matching the request content type.
@@ -14309,7 +14312,7 @@
 	There are many useful methods on this object, but the main ones are shown below:
 </p>
 <ul class='doctree'>
-	<li class='jc'><code>{@link org.apache.juneau.rest.RestRequest} <jk>extends</jk> HttpServletRequest</code>
+	<li class='jc'><c>{@link org.apache.juneau.rest.RestRequest} <jk>extends</jk> HttpServletRequest</c>
 	<ul>
 		<li class='jm'>{@link org.apache.juneau.rest.RestRequest#getHeaders() getHeaders()} - HTTP request headers.
 		<li class='jm'>{@link org.apache.juneau.rest.RestRequest#getQuery() getQuery()} - Query parameters.
@@ -14345,7 +14348,7 @@
 	Some important methods on this class are:
 </p>
 <ul class='doctree'>
-	<li class='jc'><code>{@link org.apache.juneau.rest.RestResponse} <jk>extends</jk> HttpServletResponse</code>
+	<li class='jc'><c>{@link org.apache.juneau.rest.RestResponse} <jk>extends</jk> HttpServletResponse</c>
 	<ul>
 		<li class='jm'>{@link org.apache.juneau.rest.RestResponse#setOutput(Object) setOutput(Object)} - Set response output programmatically.
 		<li class='jm'>{@link org.apache.juneau.rest.RestResponse#getHtmlDocBuilder() getHtmlDocBuilder()} - Set HTTP page contents programmatically.
@@ -14428,7 +14431,7 @@
 	Some important methods on this class are:
 </p>
 <ul class='doctree'>
-	<li class='jc'><code>{@link org.apache.juneau.rest.RequestHeaders} <jk>extends</jk> TreeMap&lt;String,String[]&gt;</code>
+	<li class='jc'><c>{@link org.apache.juneau.rest.RequestHeaders} <jk>extends</jk> TreeMap&lt;String,String[]&gt;</c>
 	<ul>
 		<li class='jm'>{@link org.apache.juneau.rest.RequestHeaders#get(String,Class) get(String,Class)} - Get header value converted to a POJO.
 		<li class='jm'>{@link org.apache.juneau.rest.RequestHeaders#get(String,Type,Type...) get(String,Type,Type)} - Get header value converted to a map or collection of POJOs.
@@ -14488,7 +14491,7 @@
 	Some important methods on this class are:
 </p>
 <ul class='doctree'>
-	<li class='jc'><code>{@link org.apache.juneau.rest.RequestQuery} <jk>extends</jk> LinkedHashMap&lt;String,String[]&gt;</code>
+	<li class='jc'><c>{@link org.apache.juneau.rest.RequestQuery} <jk>extends</jk> LinkedHashMap&lt;String,String[]&gt;</c>
 	<ul>
 		<li class='jm'>{@link org.apache.juneau.rest.RequestQuery#get(String,Class) get(String,Class)} - Get query parameter value converted to a POJO.
 		<li class='jm'>{@link org.apache.juneau.rest.RequestQuery#get(String,Type,Type...) get(String,Type,Type)} - Get query parameter value converted to a map or collection of POJOs.
@@ -14537,7 +14540,7 @@
 	Some important methods on this class are:
 </p>
 <ul class='doctree'>
-	<li class='jc'><code>{@link org.apache.juneau.rest.RequestFormData} <jk>extends</jk> LinkedHashMap&lt;String,String[]&gt;</code>
+	<li class='jc'><c>{@link org.apache.juneau.rest.RequestFormData} <jk>extends</jk> LinkedHashMap&lt;String,String[]&gt;</c>
 	<ul>
 		<li class='jm'>{@link org.apache.juneau.rest.RequestFormData#get(String,Class) get(String,Class)} - Get form-data parameter values converted to a POJO.
 		<li class='jm'>{@link org.apache.juneau.rest.RequestFormData#get(String,Type,Type...) get(String,Type,Type)} - Get form-data parameter value converted to a map or collection of POJOs.
@@ -14628,7 +14631,7 @@
 	Paths that end with <js>"/*"</js> will do a prefix match on the incoming URL.  
 	Any remainder after the match can be accessed through 
 	{@link org.apache.juneau.rest.RequestPath#getRemainder()} or parameters with the 
-	<code><ja>@Path</ja>(<js>"/*"</js>)</code> annotation.
+	<c><ja>@Path</ja>(<js>"/*"</js>)</c> annotation.
 	On the other hand, paths that don't end with <js>"/*"</js> (e.g. <js>"/"</js> or <js>"/foo"</js>) will 
 	require an exact URL match, and if any remainder exists, a 404 (not found) error will be thrown.
 </p>
@@ -14693,7 +14696,7 @@
 	Some important methods on this class are:
 </p>
 <ul class='doctree'>
-	<li class='jc'><code>{@link org.apache.juneau.rest.RequestPath} <jk>extends</jk> TreeMap&lt;String,String&gt;</code>
+	<li class='jc'><c>{@link org.apache.juneau.rest.RequestPath} <jk>extends</jk> TreeMap&lt;String,String&gt;</c>
 	<ul>
 		<li class='jm'>{@link org.apache.juneau.rest.RequestPath#get(String,Class) get(String,Class)} - Get path match variable converted to a POJO.
 		<li class='jm'>{@link org.apache.juneau.rest.RequestPath#get(String,Type,Type...) get(String,Type,Type)} - Get path match variable converted to a map or collection of POJOs.
@@ -15271,11 +15274,11 @@
 	page using reflection against the resource class.
 </p>
 <p>
-	For example, the <code>RootResources</code> page in the REST examples renders the child resources attached to the root resource:
+	For example, the <c>RootResources</c> page in the REST examples renders the child resources attached to the root resource:
 </p>
 <img class='bordered' src='doc-files/juneau-rest-server.PredefinedLabelBeans.4.png' style='width:800px'/>
 <p>
-	The <code>RootResources</code> page consists of the following and extends from the {@link org.apache.juneau.rest.BasicRestServletGroup} class:
+	The <c>RootResources</c> page consists of the following and extends from the {@link org.apache.juneau.rest.BasicRestServletGroup} class:
 </p>
 <p class='bpcode w800'>
 	<ja>@RestResource</ja>(
@@ -15373,7 +15376,7 @@
 	<li>
 		Can return a {@doc PojoCategories serializable and parsable} value.
 	<li>
-		Can throw any <code>Throwables</code>.
+		Can throw any <c>Throwables</c>.
 </ul>
 <p>
 	Throwables with public no-arg or single-arg-string constructors are automatically recreated on the client side
@@ -15393,9 +15396,9 @@
 	</ul>
 </ul>
 <p>
-	Since we build upon the existing <code>RestClient</code> API, we inherit all of it's features.
+	Since we build upon the existing <c>RestClient</c> API, we inherit all of it's features.
 	For example, convenience methods for setting POJO filters and properties to customize the behavior of the 
-	serializers and parsers, and the ability to provide your own customized Apache <code>HttpClient</code> for 
+	serializers and parsers, and the ability to provide your own customized Apache <c>HttpClient</c> for 
 	handling various scenarios involving authentication and Internet proxies.
 </p>
 <p>
@@ -15458,7 +15461,7 @@
 	<li>
 		Extending from {@link org.apache.juneau.rest.remote.RrpcServlet}.
 	<li>
-		Using a <code><ja>@RestMethod</ja>(name=<jsf>RRPC</jsf>)</code> annotation on a Java method.
+		Using a <c><ja>@RestMethod</ja>(name=<jsf>RRPC</jsf>)</c> annotation on a Java method.
 </ol>
 <p>
 	In either case, the proxy communications layer is pure REST.
@@ -15471,7 +15474,7 @@
 <h5 class='topic'>RrpcServlet</h5>
 <p>
 	The {@link org.apache.juneau.rest.remote.RrpcServlet} class is a simple specialized servlet with an abstract 
-	<code>getServiceMap()</code> method to define the server-side POJOs:
+	<c>getServiceMap()</c> method to define the server-side POJOs:
 </p>
 <p class='bpcode w800'>
 	<ja>@RestResource</ja>(
@@ -15498,7 +15501,7 @@
 
 <h5 class='topic'>@RestMethod(name=RRPC)</h5>
 <p>
-	The <code><ja>@RestMethod</ja>(name=<jsf>RRPC</jsf>)</code> approach is easier if you only have a single 
+	The <c><ja>@RestMethod</ja>(name=<jsf>RRPC</jsf>)</c> approach is easier if you only have a single 
 	interface you want to expose.  
 	You simply define a Java method whose return type is an interface, and return the implementation of that 
 	interface:
@@ -15521,8 +15524,8 @@
 <img class='bordered w800' src='doc-files/juneau-rest-server.restRPC.1.png'>
 <p>
 	Clicking the hyperlinks on each shows you the list of methods that can be invoked on that service.
-	Note that the <code>IAddressBook</code> link shows that you can only invoke methods defined on that
-	interface, whereas the <code>AddressBook</code> link shows ALL public methods defined on that class.
+	Note that the <c>IAddressBook</c> link shows that you can only invoke methods defined on that
+	interface, whereas the <c>AddressBook</c> link shows ALL public methods defined on that class.
 </p>
 <h5 class='figure'>IAddressBook</h5>
 <p class='bpcode w800'>
@@ -15530,7 +15533,7 @@
 </p>
 <img class='bordered w800' src='doc-files/juneau-rest-server.restRPC.2.png'>
 <p>
-	Since <code>AddressBook</code> extends from <code>LinkedList</code>, you may notice familiar collections
+	Since <c>AddressBook</c> extends from <c>LinkedList</c>, you may notice familiar collections
 	framework methods listed.
 </p>
 <h5 class='figure'>AddressBook</h5>
@@ -15587,14 +15590,14 @@
 	http://localhost:10000/remote/org.apache.juneau.examples.addressbook.IAddressBook/createPerson(org.apache.juneau.examples.addressbook.CreatePerson)
 </p>
 <p>
-	Make sure that we specify the <code>Content-Type</code> of the body as <code>text/json</code>.
-	We also want the results to be returned as JSON, so we set the <code>Accept</code> header to 
-	<code>text/json</code> as well.
+	Make sure that we specify the <c>Content-Type</c> of the body as <c>text/json</c>.
+	We also want the results to be returned as JSON, so we set the <c>Accept</c> header to 
+	<c>text/json</c> as well.
 </p>
 <img class='bordered w400' src='doc-files/juneau-rest-server.restRPC.4.png'>
 <p>
 	When we execute the POST, we should see the following successful response whose body contains the returned 
-	<code>Person</code> bean serialized to JSON:
+	<c>Person</c> bean serialized to JSON:
 </p>
 <img class='bordered w400' src='doc-files/juneau-rest-server.restRPC.5.png'>
 <p>
@@ -15618,15 +15621,15 @@
 	<jk>public class</jk> SampleRrpcServlet <jk>extends</jk> RrpcServlet {
 </p>
 <p>
-	For example, to invoke the <code>getPeople()</code> method on our bean:
+	For example, to invoke the <c>getPeople()</c> method on our bean:
 </p>
 <p class='bpcode w800'>
 	http://localhost:10000/remote/org.apache.juneau.examples.addressbook.IAddressBook/getPeople?method=POST
 </p>			
 <img class='bordered w800' src='doc-files/juneau-rest-server.restRPC.6.png'>
 <p>
-	Here we call the <code>findPerson(<jk>int</jk>)</code> method to retrieve a person and get the 
-	returned POJO (in this case as HTML since that's what's in the <code>Accept</code> header when calling from a 
+	Here we call the <c>findPerson(<jk>int</jk>)</c> method to retrieve a person and get the 
+	returned POJO (in this case as HTML since that's what's in the <c>Accept</c> header when calling from a 
 	browser):
 </p>
 <p class='bpcode w800'>
@@ -15634,10 +15637,10 @@
 </p>			
 <img class='bordered w800' src='doc-files/juneau-rest-server.restRPC.7.png'>
 <p>
-	When specifying the POST body as a <code>&amp;body</code> parameter, the method arguments should be in UON 
+	When specifying the POST body as a <c>&amp;body</c> parameter, the method arguments should be in UON 
 	notation.
 	See {@link org.apache.juneau.uon.UonSerializer} for more information about this encoding.
-	Usually you can also pass in JSON if you specify <code>&amp;Content-Type=text/json</code> in the URL parameters
+	Usually you can also pass in JSON if you specify <c>&amp;Content-Type=text/json</c> in the URL parameters
 	but passing in unencoded JSON in a URL may not work in all browsers.  
 	Therefore, UON is preferred.
 </p>
@@ -15664,10 +15667,10 @@
 	<li class='ja'>{@link org.apache.juneau.http.annotation.Query}
 	<li class='ja'>{@link org.apache.juneau.http.annotation.FormData}
 	<li class='ja'>{@link org.apache.juneau.http.annotation.Path}
-	<li class='ja'>{@link org.apache.juneau.http.annotation.Body} (<code>Content-Type</code> must match <js>"text/openapi"</js>)
+	<li class='ja'>{@link org.apache.juneau.http.annotation.Body} (<c>Content-Type</c> must match <js>"text/openapi"</js>)
 </ul>
 <p>
-	For example, the following shows how a pipe-delimited list of comma-delimited numbers (e.g. <js>"1,2,3|4,5,6|7,8,9"</js>) in a query parameter can be converted to a 2-dimensional array of <code>Longs</code>:
+	For example, the following shows how a pipe-delimited list of comma-delimited numbers (e.g. <js>"1,2,3|4,5,6|7,8,9"</js>) in a query parameter can be converted to a 2-dimensional array of <c>Longs</c>:
 </p>
 <p class='bpcode w800'>
 	<ja>@RestMethod</ja>(method=<js>"GET"</js>, path=<js>"/testQuery"</js>)	
@@ -15692,7 +15695,7 @@
 </p>
 <p>
 	Input will be converted based on the types and formats defined in the schema definition.
-	Input validations such as <code>minLength/maxLength</code> that don't match the input will result in automatic <code>400 Bad Request</code> responses.
+	Input validations such as <c>minLength/maxLength</c> that don't match the input will result in automatic <c>400 Bad Request</c> responses.
 </p>
 <p>
 	The following shows the same for a request body:
@@ -15725,7 +15728,7 @@
 </p>
 <p>
 	The list of valid POJO types for parameters depends on type and format of the value or items/entries of the value.
-	For example, instead of <code>Longs</code> in the example above, we could also define a 2-dimensional array of POJOs convertible from <code>Longs</code>:
+	For example, instead of <c>Longs</c> in the example above, we could also define a 2-dimensional array of POJOs convertible from <c>Longs</c>:
 </p>
 <p class='bpcode w800'>
 	<ja>@RestMethod</ja>(method=<js>"POST"</js>, path=<js>"/2dLongArray"</js>)	
@@ -15737,7 +15740,7 @@
 	}
 </p>
 <p>
-	Or even POJOs that take in arrays of <code>Longs[]</code>:
+	Or even POJOs that take in arrays of <c>Longs[]</c>:
 </p>
 <p class='bpcode w800'>
 	<ja>@RestMethod</ja>(method=<js>"POST"</js>, path=<js>"/2dLongArray"</js>)	
@@ -15776,10 +15779,10 @@
 </p>
 <ul class='doctree'>
 	<li class='ja'>{@link org.apache.juneau.http.annotation.ResponseHeader}
-	<li class='ja'>{@link org.apache.juneau.http.annotation.Response} (<code>Accept</code> must match <js>"text/openapi"</js>)
+	<li class='ja'>{@link org.apache.juneau.http.annotation.Response} (<c>Accept</c> must match <js>"text/openapi"</js>)
 </ul>
 <p>
-	For example, the following shows how a pipe-delimited list of comma-delimited numbers (e.g. <js>"1,2,3|4,5,6|7,8,9"</js>) in a response header can be converted to a 2-dimensional array of <code>Longs</code>:
+	For example, the following shows how a pipe-delimited list of comma-delimited numbers (e.g. <js>"1,2,3|4,5,6|7,8,9"</js>) in a response header can be converted to a 2-dimensional array of <c>Longs</c>:
 </p>
 <p class='bpcode w800'>
 	<ja>@RestMethod</ja>(method=<js>"GET"</js>, path=<js>"/testResponseHeader"</js>)	
@@ -15933,40 +15936,40 @@
 	<li>
 		{@link java.io.Reader}
 		<br><ja>@Body</ja> annotation is optional.
-		<br><code>Content-Type</code> is ignored.
+		<br><c>Content-Type</c> is ignored.
 	<li>
 		{@link java.io.InputStream}
 		<br><ja>@Body</ja> annotation is optional.
-		<br><code>Content-Type</code> is ignored.
+		<br><c>Content-Type</c> is ignored.
 	<li>
 		Any {@doc PojoCategories Parsable POJO} type.
-		<br><code>Content-Type</code> is required to identify correct parser.
+		<br><c>Content-Type</c> is required to identify correct parser.
 	<li>
 		Objects convertible from {@link java.io.Reader} by having one of the following non-deprecated methods:
 		<ul>
-			<li><code><jk>public</jk> T(Reader in) {...}</code>
-			<li><code><jk>public static</jk> T <jsm>create</jsm>(Reader in) {...}</code>
-			<li><code><jk>public static</jk> T <jsm>fromReader</jsm>(Reader in) {...}</code>
+			<li><c><jk>public</jk> T(Reader in) {...}</c>
+			<li><c><jk>public static</jk> T <jsm>create</jsm>(Reader in) {...}</c>
+			<li><c><jk>public static</jk> T <jsm>fromReader</jsm>(Reader in) {...}</c>
 		</ul>
-		<code>Content-Type</code> must not be present or match an existing parser so that it's not parsed as a POJO.
+		<c>Content-Type</c> must not be present or match an existing parser so that it's not parsed as a POJO.
 	<li>
 		Objects convertible from {@link java.io.InputStream} by having one of the following non-deprecated methods:
 		<ul>
-			<li><code><jk>public</jk> T(InputStream in) {...}</code>
-			<li><code><jk>public static</jk> T <jsm>create</jsm>(InputStream in) {...}</code>
-			<li><code><jk>public static</jk> T <jsm>fromInputStream</jsm>(InputStream in) {...}</code>
+			<li><c><jk>public</jk> T(InputStream in) {...}</c>
+			<li><c><jk>public static</jk> T <jsm>create</jsm>(InputStream in) {...}</c>
+			<li><c><jk>public static</jk> T <jsm>fromInputStream</jsm>(InputStream in) {...}</c>
 		</ul>
-		<code>Content-Type</code> must not be present or match an existing parser so that it's not parsed as a POJO.
+		<c>Content-Type</c> must not be present or match an existing parser so that it's not parsed as a POJO.
 	<li>
 		Objects convertible from {@link java.lang.String} by having one of the following non-deprecated methods:
 		<ul>
-			<li><code><jk>public</jk> T(String in) {...}</code>
-			<li><code><jk>public static</jk> T <jsm>create</jsm>(String in) {...}</code>
-			<li><code><jk>public static</jk> T <jsm>fromString</jsm>(String in) {...}</code>
-			<li><code><jk>public static</jk> T <jsm>parse</jsm>(String in) {...}</code>
-			<li><code><jk>public static</jk> T <jsm>parseString</jsm>(String in) {...}</code>
-			<li><code><jk>public static</jk> T <jsm>forName</jsm>(String in) {...}</code>
-			<li><code><jk>public static</jk> T <jsm>forString</jsm>(String in) {...}</code>
+			<li><c><jk>public</jk> T(String in) {...}</c>
+			<li><c><jk>public static</jk> T <jsm>create</jsm>(String in) {...}</c>
+			<li><c><jk>public static</jk> T <jsm>fromString</jsm>(String in) {...}</c>
+			<li><c><jk>public static</jk> T <jsm>parse</jsm>(String in) {...}</c>
+			<li><c><jk>public static</jk> T <jsm>parseString</jsm>(String in) {...}</c>
+			<li><c><jk>public static</jk> T <jsm>forName</jsm>(String in) {...}</c>
+			<li><c><jk>public static</jk> T <jsm>forString</jsm>(String in) {...}</c>
 		</ul>
 		Note that this also includes all enums.
 </ol>
@@ -15974,7 +15977,7 @@
 	The {@link org.apache.juneau.oapi.OpenApiSerializer} class can be used to serialize HTTP bodies to OpenAPI-based output.
 </p>
 <p>
-	For example, the following shows how a pipe-delimited list of comma-delimited numbers (e.g. <js>"1,2,3|4,5,6|7,8,9"</js>) can be converted to a 2-dimensional array of <code>Longs</code>:
+	For example, the following shows how a pipe-delimited list of comma-delimited numbers (e.g. <js>"1,2,3|4,5,6|7,8,9"</js>) can be converted to a 2-dimensional array of <c>Longs</c>:
 </p>
 <p class='bpcode w800'>
 	<jc>// Body is a pipe-delimited list of comma-delimited lists of longs.</jc>
@@ -16008,7 +16011,7 @@
 </p>
 <p>
 	Input will be converted based on the types and formats defined in the schema definition.
-	Input validations such as <code>minLength/maxLength</code> that don't match the input will result in automatic <code>400 Bad Request</code> responses.
+	Input validations such as <c>minLength/maxLength</c> that don't match the input will result in automatic <c>400 Bad Request</c> responses.
 </p>
 <p>
 	For more information about valid parameter types when using OpenAPI parsing, see {@doc juneau-marshall.OpenApiDetails.Parsers OpenAPI Parsers}
@@ -16105,7 +16108,7 @@
 </ul>
 
 <p>
-	The most typical scenario is to simply use the <code>value</code> field to define form data parameter names:
+	The most typical scenario is to simply use the <c>value</c> field to define form data parameter names:
 </p>
 <h5 class='figure'>Example:</h5>
 <p class='bpcode w800'>	
@@ -16130,7 +16133,7 @@
 
 <p>
 	The special name <js>"*"</js> (or blank) can be used to represent all values.
-	When used, the data type must be a <code>Map</code> or bean.
+	When used, the data type must be a <c>Map</c> or bean.
 </p>
 <h5 class='figure'>Examples:</h5>
 <p class='bpcode w800'>
@@ -16155,7 +16158,7 @@
 	By default, this is the {@link org.apache.juneau.oapi.OpenApiParser} which supports the standard Swagger-based rules for parsing.
 </p>
 <p>
-	For example, the following shows how a pipe-delimited list of comma-delimited numbers (e.g. <js>"1,2,3|4,5,6|7,8,9"</js>) can be converted to a 2-dimensional array of <code>Longs</code>:
+	For example, the following shows how a pipe-delimited list of comma-delimited numbers (e.g. <js>"1,2,3|4,5,6|7,8,9"</js>) can be converted to a 2-dimensional array of <c>Longs</c>:
 </p>
 <p class='bpcode w800'>
 	<ja>@RestMethod</ja>(method=<js>"POST"</js>, path=<js>"/testFormData"</js>)	
@@ -16180,7 +16183,7 @@
 </p>
 <p>
 	Input will be converted based on the types and formats defined in the schema definition.
-	Input validations such as <code>minLength/maxLength</code> that don't match the input will result in automatic <code>400 Bad Request</code> responses.
+	Input validations such as <c>minLength/maxLength</c> that don't match the input will result in automatic <c>400 Bad Request</c> responses.
 </p>
 <p>
 	For more information about valid parameter types, see {@doc juneau-marshall.OpenApiDetails.Parsers OpenAPI Parsers}
@@ -16228,7 +16231,7 @@
 <ul class='doctree'>
 	<li class='warn'>
 			This annotation should not be combined with the {@link org.apache.juneau.http.annotation.Body @Body} annotation or {@link org.apache.juneau.rest.RestRequest#getBody()} method
-			for <code>application/x-www-form-urlencoded POST</code> posts, since it will trigger the underlying servlet
+			for <c>application/x-www-form-urlencoded POST</c> posts, since it will trigger the underlying servlet
 		API to parse the body content as key-value pairs resulting in empty content.
 		<br>The {@link org.apache.juneau.http.annotation.Query @Query} annotation can be used to retrieve a URL parameter in the URL string without triggering the
 		servlet to drain the body content.
@@ -16274,27 +16277,27 @@
 </p>
 <table class='styled w400'>
 	<tr>
-		<th><code>Body content</code></th>
-		<th><code><ja>@HasFormData</ja>(<js>"a"</js>)</code></th>
-		<th><code><ja>@FormData</ja>(<js>"a"</js>)</code></th>
+		<th><c>Body content</c></th>
+		<th><c><ja>@HasFormData</ja>(<js>"a"</js>)</c></th>
+		<th><c><ja>@FormData</ja>(<js>"a"</js>)</c></th>
 	</tr>
 	<tr>
-		<td><code>a=foo</code></td>
+		<td><c>a=foo</c></td>
 		<td><jk>true</jk></td>
 		<td><js>"foo"</js></td>
 	</tr>
 	<tr>
-		<td><code>a=</code></td>
+		<td><c>a=</c></td>
 		<td><jk>true</jk></td>
 		<td><js>""</js></td>
 	</tr>
 	<tr>
-		<td><code>a</code></td>
+		<td><c>a</c></td>
 		<td><jk>true</jk></td>
 		<td><jk>null</jk></td>
 	</tr>
 	<tr>
-		<td><code>b=foo</code></td>
+		<td><c>b=foo</c></td>
 		<td><jk>false</jk></td>
 		<td><jk>null</jk></td>
 	</tr>
@@ -16303,7 +16306,7 @@
 <h5 class='topic'>Important note concerning FORM posts</h5>
 <p>
 	This annotation should not be combined with the {@link org.apache.juneau.http.annotation.Body @Body} annotation or {@link org.apache.juneau.rest.RestRequest#getBody()} method
-	for <code>application/x-www-form-urlencoded POST</code> posts, since it will trigger the underlying servlet API to
+	for <c>application/x-www-form-urlencoded POST</c> posts, since it will trigger the underlying servlet API to
 	parse the body content as key-value pairs, resulting in empty content.
 </p>
 <p>
@@ -16355,10 +16358,10 @@
 	Unlike {@link org.apache.juneau.http.annotation.FormData @FormData}, using this annotation does not result in the servlet reading the contents of
 	URL-encoded form posts.
 	Therefore, this annotation can be used in conjunction with the {@link org.apache.juneau.http.annotation.Body @Body} annotation or
-	{@link org.apache.juneau.rest.RestRequest#getBody()} method for <code>application/x-www-form-urlencoded POST</code> calls.
+	{@link org.apache.juneau.rest.RestRequest#getBody()} method for <c>application/x-www-form-urlencoded POST</c> calls.
 </p>
 <p>
-	The most typical scenario is to simply use the <code>value</code> field to define query parameter names:
+	The most typical scenario is to simply use the <c>value</c> field to define query parameter names:
 </p>
 <h5 class='figure'>Example:</h5>
 <p class='bpcode w800'>
@@ -16384,7 +16387,7 @@
 
 <p>
 	The special name <js>"*"</js> (or blank) can be used to represent all values.
-	When used, the data type must be a <code>Map</code> or bean.
+	When used, the data type must be a <c>Map</c> or bean.
 </p>
 <h5 class='figure'>Examples:</h5>
 <p class='bpcode w800'>
@@ -16409,7 +16412,7 @@
 	By default, this is the {@link org.apache.juneau.oapi.OpenApiParser} which supports the standard Swagger-based rules for parsing.
 </p>
 <p>
-	For example, the following shows how a pipe-delimited list of comma-delimited numbers (e.g. <js>"1,2,3|4,5,6|7,8,9"</js>) can be converted to a 2-dimensional array of <code>Longs</code>:
+	For example, the following shows how a pipe-delimited list of comma-delimited numbers (e.g. <js>"1,2,3|4,5,6|7,8,9"</js>) can be converted to a 2-dimensional array of <c>Longs</c>:
 </p>
 <p class='bpcode w800'>
 	<ja>@RestMethod</ja>(method=<js>"GET"</js>, path=<js>"/testQuery"</js>)	
@@ -16434,7 +16437,7 @@
 </p>
 <p>
 	Input will be converted based on the types and formats defined in the schema definition.
-	Input validations such as <code>minLength/maxLength</code> that don't match the input will result in automatic <code>400 Bad Request</code> responses.
+	Input validations such as <c>minLength/maxLength</c> that don't match the input will result in automatic <c>400 Bad Request</c> responses.
 </p>
 <p>
 	For more information about valid parameter types, see {@doc juneau-marshall.OpenApiDetails.Parsers OpenAPI Parsers}
@@ -16501,7 +16504,7 @@
 	Unlike {@link org.apache.juneau.http.annotation.HasFormData @HasFormData}, using this annotation does not result in the servlet reading the contents
 	of URL-encoded form posts.
 	Therefore, this annotation can be used in conjunction with the {@link org.apache.juneau.http.annotation.Body @Body} annotation or
-	{@link org.apache.juneau.rest.RestRequest#getBody()} method for <code>application/x-www-form-urlencoded POST</code> calls.
+	{@link org.apache.juneau.rest.RestRequest#getBody()} method for <c>application/x-www-form-urlencoded POST</c> calls.
  </p>
 <h5 class='figure'>Example:</h5>
 <p class='bpcode w800'>
@@ -16526,27 +16529,27 @@
 </p>
 <table class='styled w400'>
 	<tr>
-		<th><code>Query content</code></th>
-		<th><code><ja>@HasQuery</ja>(<js>"a"</js>)</code></th>
-		<th><code><ja>@Query</ja>(<js>"a"</js>)</code></th>
+		<th><c>Query content</c></th>
+		<th><c><ja>@HasQuery</ja>(<js>"a"</js>)</c></th>
+		<th><c><ja>@Query</ja>(<js>"a"</js>)</c></th>
 	</tr>
 	<tr>
-		<td><code>?a=foo</code></td>
+		<td><c>?a=foo</c></td>
 		<td><jk>true</jk></td>
 		<td><js>"foo"</js></td>
 	</tr>
 	<tr>
-		<td><code>?a=</code></td>
+		<td><c>?a=</c></td>
 		<td><jk>true</jk></td>
 		<td><js>""</js></td>
 	</tr>
 	<tr>
-		<td><code>?a</code></td>
+		<td><c>?a</c></td>
 		<td><jk>true</jk></td>
 		<td><jk>null</jk></td>
 	</tr>
 	<tr>
-		<td><code>?b=foo</code></td>
+		<td><c>?b=foo</c></td>
 		<td><jk>false</jk></td>
 		<td><jk>null</jk></td>
 	</tr>
@@ -16591,7 +16594,7 @@
 	</ul>
 </ul>
 <p>
-	The most typical scenario is to simply use the <code>value</code> field to define header parameter names:
+	The most typical scenario is to simply use the <c>value</c> field to define header parameter names:
 </p>
 <h5 class='figure'>Example:</h5>
 <p class='bpcode w800'>
@@ -16611,7 +16614,7 @@
 
 <p>
 	The special name <js>"*"</js> (or blank) can be used to represent all values.
-	When used, the data type must be a <code>Map</code> or bean.
+	When used, the data type must be a <c>Map</c> or bean.
 </p>
 <h5 class='figure'>Examples:</h5>
 <p class='bpcode w800'>
@@ -16636,7 +16639,7 @@
 	By default, this is the {@link org.apache.juneau.oapi.OpenApiParser} which supports the standard Swagger-based rules for parsing.
 </p>
 <p>
-	For example, the following shows how a pipe-delimited list of comma-delimited numbers (e.g. <js>"1,2,3|4,5,6|7,8,9"</js>) can be converted to a 2-dimensional array of <code>Longs</code>:
+	For example, the following shows how a pipe-delimited list of comma-delimited numbers (e.g. <js>"1,2,3|4,5,6|7,8,9"</js>) can be converted to a 2-dimensional array of <c>Longs</c>:
 </p>
 <p class='bpcode w800'>
 	<ja>@RestMethod</ja>(method=<js>"GET"</js>, path=<js>"/testHeader"</js>)	
@@ -16661,7 +16664,7 @@
 </p>
 <p>
 	Input will be converted based on the types and formats defined in the schema definition.
-	Input validations such as <code>minLength/maxLength</code> that don't match the input will result in automatic <code>400 Bad Request</code> responses.
+	Input validations such as <c>minLength/maxLength</c> that don't match the input will result in automatic <c>400 Bad Request</c> responses.
 </p>
 <p>
 	For more information about valid parameter types, see {@doc juneau-marshall.OpenApiDetails.Parsers OpenAPI Parsers}
@@ -16745,7 +16748,7 @@
 	</ul>
 </ul>
 <p>
-	The most typical scenario is to simply use the <code>value</code> field to define path parameter names:
+	The most typical scenario is to simply use the <c>value</c> field to define path parameter names:
 </p>
 <h5 class='figure'>Example:</h5>
 <p class='bpcode w800'>
@@ -16776,7 +16779,7 @@
 
 <p>
 	The special name <js>"*"</js> (or blank) can be used to represent all values.
-	When used, the data type must be a <code>Map</code> or bean.
+	When used, the data type must be a <c>Map</c> or bean.
 </p>
 <h5 class='figure'>Examples:</h5>
 <p class='bpcode w800'>
@@ -16802,7 +16805,7 @@
 </p>
 
 <p>
-	For example, the following shows how a pipe-delimited list of comma-delimited numbers (e.g. <js>"1,2,3|4,5,6|7,8,9"</js>) can be converted to a 2-dimensional array of <code>Longs</code>:
+	For example, the following shows how a pipe-delimited list of comma-delimited numbers (e.g. <js>"1,2,3|4,5,6|7,8,9"</js>) can be converted to a 2-dimensional array of <c>Longs</c>:
 </p>
 <p class='bpcode w800'>
 	<ja>@RestMethod</ja>(method=<js>"POST"</js>, path=<js>"/testPath/{pathParam}"</js>)	
@@ -16827,7 +16830,7 @@
 </p>
 <p>
 	Input will be converted based on the types and formats defined in the schema definition.
-	Input validations such as <code>minLength/maxLength</code> that don't match the input will result in automatic <code>400 Bad Request</code> responses.
+	Input validations such as <c>minLength/maxLength</c> that don't match the input will result in automatic <c>400 Bad Request</c> responses.
 </p>
 <p>
 	For more information about valid parameter types, see {@doc juneau-marshall.OpenApiDetails.Parsers OpenAPI Parsers}
@@ -17063,7 +17066,7 @@
 	When applied type classes returned by a Java method, this annotation defines schema and Swagger information on the body of responses.
 </p>
 <p>
-	In the example above, we're using the <code>Ok</code> class which is defined like so:
+	In the example above, we're using the <c>Ok</c> class which is defined like so:
 </p>
 <p class='bpcode w800'>
 	<ja>@Response</ja>(
@@ -17190,7 +17193,7 @@
 <p>
 	The {@link org.apache.juneau.http.annotation.ResponseStatus @ResponseStatus} annotation can be used on 
 	the method of a <ja>@Response</ja>-annotated class to identify HTTP response
-	statuses other than <code>200</code> (the default).	
+	statuses other than <c>200</c> (the default).	
 </p>
 
 <h5 class='figure'>Example:</h5>
@@ -17253,13 +17256,13 @@
 
 <p>
 	If a <ja>@Response</ja> class does not have a <ja>@ResponseBody</ja>-annotated method, then the response
-	object itself is serialized in the response (typically using <code>toString()</code>).
+	object itself is serialized in the response (typically using <c>toString()</c>).
 </p>
 
 <h5 class='topic'>Notes about OpenAPI part serialization</h5>
 <p>
 	By default, POJOs representing the body of the request are serialized using the Juneau serializer
-	matching the requesting <code>Accept</code> header.
+	matching the requesting <c>Accept</c> header.
 	The {@link org.apache.juneau.oapi.OpenApiSerializer} class can be used to serialize response bodies using OpenAPI rules.
 </p>
 <p>
@@ -17294,7 +17297,7 @@
 	}
 </p>
 <p>
-	The <code><ja>@Response</ja>(schema)</code> annotation can be used to define the format of the output using OpenAPI-based rules.
+	The <c><ja>@Response</ja>(schema)</c> annotation can be used to define the format of the output using OpenAPI-based rules.
 </p>
 <p class='bpcode w800'>
 	<ja>@RestResource</ja>
@@ -17315,7 +17318,7 @@
 <h5 class='topic'>Swagger documentation</h5>
 <p>
 	The attributes on this annotation are also used to populate the generated Swagger for the method.
-	For example, in the case of the <code>InvalidLogin</code> example above, the following Swagger is generated:
+	For example, in the case of the <c>InvalidLogin</c> example above, the following Swagger is generated:
 </p>
 <p class='bpcode w800'>
 	<jok>'/user/login'</jok>: {
@@ -17454,7 +17457,7 @@
 <h5 class='topic'>Swagger documentation</h5>
 <p>
 	The attributes on this annotation are also used to populate the generated Swagger for the method.
-	For example, in the case of the <code>X-Rate-Limit</code> example above, the following Swagger is generated:
+	For example, in the case of the <c>X-Rate-Limit</c> example above, the following Swagger is generated:
 </p>
 <p class='bpcode w800'>
 	<jok>'/user/login'</jok>: {
@@ -17871,7 +17874,7 @@
 	Properties set via {@link org.apache.juneau.rest.RequestProperties} are session-override
 	properties that are passed in through {@link org.apache.juneau.serializer.SerializerSessionArgs}
 	and {@link org.apache.juneau.parser.ParserSessionArgs} and can only be used on configuration settings
-	marked as <code>Session property: <jk>true</jk></code>.
+	marked as <c>Session property: <jk>true</jk></c>.
 </p>			
 <p>
 	Properties are open-ended and can be used for other purposes.
@@ -19001,7 +19004,7 @@
 	(i.e. REST interfaces that document themselves).
 </p>
 <p>
-	As described previously, the <code>PetStore</code> example provides an example of auto-generated Swagger JSON:
+	As described previously, the <c>PetStore</c> example provides an example of auto-generated Swagger JSON:
 </p>
 <img class='bordered w900' src='doc-files/juneau-rest-server.Swagger.1.png'>
 <p>
@@ -19014,8 +19017,8 @@
 <h4 class='topic updated' onclick='toggle(this)'><a href='#juneau-rest-server.Swagger.BasicRestServlet' id='juneau-rest-server.Swagger.BasicRestServlet'>7.29.1 - BasicRestServlet</a></h4>
 <div class='topic'><!-- START: 7.29.1 - juneau-rest-server.Swagger.BasicRestServlet -->
 <p>
-	Any subclass of {@link org.apache.juneau.rest.BasicRestServlet} gets an auto-generated Swagger UI when performing an <code>OPTIONS</code>
-	request with <code>Accept:text/html</code>.
+	Any subclass of {@link org.apache.juneau.rest.BasicRestServlet} gets an auto-generated Swagger UI when performing an <c>OPTIONS</c>
+	request with <c>Accept:text/html</c>.
 </p>
 <p>
 	The underlying mechanics are simple.  
@@ -19094,7 +19097,7 @@
 <h4 class='topic ' onclick='toggle(this)'><a href='#juneau-rest-server.Swagger.BasicSwaggerInfo' id='juneau-rest-server.Swagger.BasicSwaggerInfo'>7.29.2 - Basic Swagger Info</a></h4>
 <div class='topic'><!-- START: 7.29.2 - juneau-rest-server.Swagger.BasicSwaggerInfo -->
 <p>
-	Let's look at the various parts of the <code>Petstore</code> application Swagger UI to see how they are defined.
+	Let's look at the various parts of the <c>Petstore</c> application Swagger UI to see how they are defined.
 </p>
 <p>
 	The top part of the page shows general information about the REST interface:
@@ -19116,7 +19119,7 @@
 </p>
 <p>
 	In this particular case, the Swagger is pulled in from a localized Swagger JSON file located in the 
-	<code>org.apache.juneau.examples.rest.petstore</code> package using the {@link org.apache.juneau.rest.vars.FileVar $F} variable.
+	<c>org.apache.juneau.examples.rest.petstore</c> package using the {@link org.apache.juneau.rest.vars.FileVar $F} variable.
 </p>
 <h5 class='figure'>PetStoreResource.json</h5>
 <p class='bpcode w800'>
@@ -19262,8 +19265,8 @@
 <p>
 	Tags allow you to group operations into general categories.
 	In the user interface, these can be expanded/collapsed by clicking on the tag sections.
-	In the example below, the <code>pet</code> and <code>store</code> tag sections are collapsed
-	and the <code>user</code> section is not:
+	In the example below, the <c>pet</c> and <c>store</c> tag sections are collapsed
+	and the <c>user</c> section is not:
 </p>
 <img class='bordered w900' src='doc-files/juneau-rest-server.Swagger.4.png'>
 <p>
@@ -19349,8 +19352,8 @@
 	Operations not mapped to tags are listed in the UI before tagged operations.
 </p>
 <p>
-	For example, the <code>getTopPage()</code> method in <code>PetStoreResource</code> is not tagged, 
-	as well as the <code>getOptions()</code> method inherited from <code>BaseRestServlet</code>, so these
+	For example, the <c>getTopPage()</c> method in <c>PetStoreResource</c> is not tagged, 
+	as well as the <c>getOptions()</c> method inherited from <c>BaseRestServlet</c>, so these
 	show up at the top of the page:
 </p>
 <img class='bordered w900' src='doc-files/juneau-rest-server.Swagger.5.png'>
@@ -19365,7 +19368,7 @@
 </p>
 <img class='bordered w900' src='doc-files/juneau-rest-server.Swagger.Operations.1.png'>
 <p>
-	The following shows the annotations defined on the <code>GET /pet</code> operation:
+	The following shows the annotations defined on the <c>GET /pet</c> operation:
 </p>
 <h5 class='figure'>PetStoreResource.getPets()</h5>
 <p class='bpcode w800'>
@@ -19449,13 +19452,13 @@
 	}
 </p>
 <p>
-	<b>Note:</b>  The <code>type</code> and <code>collectionFormat</code> values above are optional and auto-detected based on the
+	<b>Note:</b>  The <c>type</c> and <c>collectionFormat</c> values above are optional and auto-detected based on the
 	parameter class type if omitted.  They're included here for clarity.
 	The examples will be explained in the next section.
 </p>
 <p>
-	Another option is to specify your parameter information in the <code>parameters</code> annotation as free-form Simple JSON.
-	In the case of the <code>PetStoreResource.getPets()</code> method, we pull this information from a static field
+	Another option is to specify your parameter information in the <c>parameters</c> annotation as free-form Simple JSON.
+	In the case of the <c>PetStoreResource.getPets()</c> method, we pull this information from a static field
 	defined in the {@link org.apache.juneau.rest.converters.Queryable} class:
 </p>
 <h5 class='figure'>PetStoreResource.getPets()</h5>
@@ -19546,11 +19549,11 @@
 <h4 class='topic updated' onclick='toggle(this)'><a href='#juneau-rest-server.Swagger.ParameterExamples' id='juneau-rest-server.Swagger.ParameterExamples'>7.29.6 - Parameter Examples</a></h4>
 <div class='topic'><!-- START: 7.29.6 - juneau-rest-server.Swagger.ParameterExamples -->
 <p>
-	The <code>model</code> select box in the parameters can be expanded to show examples:
+	The <c>model</c> select box in the parameters can be expanded to show examples:
 </p>
 <img class='bordered w900' src='doc-files/juneau-rest-server.Swagger.Parameters.1.png'>
 <p>
-	The examples for query/form-data/path/header parameters can be defined using the <code>example</code> attribute on your annotated parameters as shown here:
+	The examples for query/form-data/path/header parameters can be defined using the <c>example</c> attribute on your annotated parameters as shown here:
 </p>
 <p class='bpcode w800'>
 	<ja>@RestMethod</ja>(
@@ -19576,7 +19579,7 @@
 	}
 </p>
 <p>
-	This value gets converted to an <code>x-examples</code> attribute in your parameter information:
+	This value gets converted to an <c>x-examples</c> attribute in your parameter information:
 </p>
 <p class='bpcode w800'>
 	{
@@ -19598,7 +19601,7 @@
 	...
 </p>
 <p>
-	Examples for request bodies includes all supported <code>Content-Type</code> values: 
+	Examples for request bodies includes all supported <c>Content-Type</c> values: 
 </p>
 <img class='bordered w900' src='doc-files/juneau-rest-server.Swagger.Parameters.3.png'> 
 <p>
@@ -19617,7 +19620,7 @@
 	<li>
 		{@link org.apache.juneau.http.annotation.Body#examples() @Body(examples)} annotation.
 	<li>
-		Defining an <js>"x-examples"</js> field in the inherited Swagger JSON body field (classpath file or <code><ja>@ResourceSwagger</ja>(value)</code>/<code><ja>@MethodSwagger</ja>(value)</code>).
+		Defining an <js>"x-examples"</js> field in the inherited Swagger JSON body field (classpath file or <c><ja>@ResourceSwagger</ja>(value)</c>/<c><ja>@MethodSwagger</ja>(value)</c>).
 	<li>
 		Defining an <js>"x-examples"</js> field in the Swagger Schema Object for the body (including referenced <js>"$ref"</js> schemas).
 	<li>
@@ -19653,7 +19656,7 @@
 	)
 </p>
 <p>
-	The Swagger generator uses these to create an <code>x-examples</code> entry in your generated Swagger:
+	The Swagger generator uses these to create an <c>x-examples</c> entry in your generated Swagger:
 </p>
 <p class='bpcode w800'>
 	<jok>"/pet"</jok>: {
@@ -19777,7 +19780,7 @@
 </p>
 <img class='bordered w900' src='doc-files/juneau-rest-server.Swagger.Operations.3.png'> 
 <p>
-	The <code>200</code> response is determined by the return type on the method, in this case a collection of <code>Pet</code> objects:
+	The <c>200</c> response is determined by the return type on the method, in this case a collection of <c>Pet</c> objects:
 </p>
 <p class='bpcode w800'>
 	<ja>@RestMethod</ja>(
@@ -19818,12 +19821,12 @@
 <h4 class='topic ' onclick='toggle(this)'><a href='#juneau-rest-server.Swagger.ResponseExamples' id='juneau-rest-server.Swagger.ResponseExamples'>7.29.8 - Response Examples</a></h4>
 <div class='topic'><!-- START: 7.29.8 - juneau-rest-server.Swagger.ResponseExamples -->
 <p>
-	The <code>model</code> select box in the responses can be expanded to show examples:
+	The <c>model</c> select box in the responses can be expanded to show examples:
 </p>
 <h5 class='figure'>PetStoreResource.getPet()</h5>
 <img class='bordered w900' src='doc-files/juneau-rest-server.Swagger.ResponseExamples.1.png'> 
 <p>
-	Examples are provided for any supported <code>Accept</code> type based on the serializers defined on your
+	Examples are provided for any supported <c>Accept</c> type based on the serializers defined on your
 	servlet/method.
 </p>
 <h5 class='figure'>application/json+simple</h5>
@@ -19831,7 +19834,7 @@
 <h5 class='figure'>text/uon</h5>
 <img class='bordered w900' src='doc-files/juneau-rest-server.Swagger.ResponseExamples.3.png'> 
 <p>
-	Examples are pulled from the <code>examples</code> attribute in the response object of the generated Swagger JSON:
+	Examples are pulled from the <c>examples</c> attribute in the response object of the generated Swagger JSON:
 </p>
 <p class='bpcode w800'>
 	<jok>"/pet/{petId}"</jok>: {
@@ -19874,7 +19877,7 @@
 	<li>
 		{@link org.apache.juneau.http.annotation.Response#examples() @Response(examples)} annotation.
 	<li>
-		Defining an <js>"examples"</js> field in the inherited Swagger JSON response object (classpath file or <code><ja>@ResourceSwagger</ja>(value)</code>/<code><ja>@MethodSwagger</ja>(value)</code>).
+		Defining an <js>"examples"</js> field in the inherited Swagger JSON response object (classpath file or <c><ja>@ResourceSwagger</ja>(value)</c>/<c><ja>@MethodSwagger</ja>(value)</c>).
 	<li>
 		Defining an <js>"examples"</js> field in the Swagger Schema Object for the response object (including referenced <js>"$ref"</js> schemas).
 	<li>
@@ -19894,7 +19897,7 @@
 <p>
 	This is a Simple JSON representation of the body that is converted to a POJO and then serialized to all the registered serializers on the REST method to produce examples for all
 	supported language types.
-	These values are then used to automatically populate the <code>examples</code> field.
+	These values are then used to automatically populate the <c>examples</c> field.
 </p>
 <p>
 	Direct per-media-type examples can also be defined using the {@link org.apache.juneau.http.annotation.Response#examples @Response(examples)} annotation:
@@ -20042,7 +20045,7 @@
 <div class='topic'><!-- START: 7.29.9 - juneau-rest-server.Swagger.Models -->
 <p>
 	The {@link org.apache.juneau.jsonschema.JsonSchemaGenerator#JSONSCHEMA_useBeanDefs} setting can be used to reduce the size of your
-	generated Swagger JSON files by creating model definitions for beans and referencing those definitions through <code>$ref</code> attributes.
+	generated Swagger JSON files by creating model definitions for beans and referencing those definitions through <c>$ref</c> attributes.
 </p>
 <p>
 	By default, this flag is enabled when extending from {@link org.apache.juneau.rest.BasicRestServlet}:
@@ -20067,7 +20070,7 @@
 <h5 class='figure'>Models section with Order bean expanded</h5>
 <img class='bordered w900' src='doc-files/juneau-rest-server.Swagger.Models.2.png'> 
 <p>
-	In the generated Swagger JSON, embedded schema information for beans will be replaced with references such as the one shown below for the <code>Order</code> bean:
+	In the generated Swagger JSON, embedded schema information for beans will be replaced with references such as the one shown below for the <c>Order</c> bean:
 </p>
 <p class='bpcode w800'>
 	{
@@ -20139,10 +20142,10 @@
 <h4 class='topic ' onclick='toggle(this)'><a href='#juneau-rest-server.Swagger.Stylesheet' id='juneau-rest-server.Swagger.Stylesheet'>7.29.10 - SwaggerUI.css</a></h4>
 <div class='topic'><!-- START: 7.29.10 - juneau-rest-server.Swagger.Stylesheet -->
 <p>
-	The look-and-feel of the Swagger UI is controlled via a single CSS file:  <code>SwaggerUI.css</code>.
+	The look-and-feel of the Swagger UI is controlled via a single CSS file:  <c>SwaggerUI.css</c>.
 </p>
 <p>
-	In the microservice template, this file is located in the <code>files/htdocs/styles</code> directory.
+	In the microservice template, this file is located in the <c>files/htdocs/styles</c> directory.
 	It's a simple straightforward file consisting of less than 350 lines.
 	This file can be modified to change the look-and-feel of your Swagger UI.
 </p>
@@ -20369,7 +20372,7 @@
 <p>
 	The following examples shows how to associate a widget with a REST method and then have it rendered in the links
 	and aside section of the page.
-	It shows an example of a widget that renders an image located in the <code>htdocs</code> static files
+	It shows an example of a widget that renders an image located in the <c>htdocs</c> static files
 	directory in your classpath (see {@link org.apache.juneau.rest.annotation.RestResource#staticFiles() @RestResource(staticFiles)}):
 </p>
 <p class='bpcode w800'>
@@ -20501,7 +20504,7 @@
 	The variable it resolves is <js>"$W{ContentTypeMenuItem}"</js>.
 </p>
 <p>
-	An example of this widget can be found in the <code>PetStoreResource</code> in the examples that provides a drop-down menu item for rendering all other supported content types in plain text:
+	An example of this widget can be found in the <c>PetStoreResource</c> in the examples that provides a drop-down menu item for rendering all other supported content types in plain text:
 </p>
 <p class='bpcode w800'>
 	<ja>@RestMethod</ja>(
@@ -20541,7 +20544,7 @@
 	method to retrieve the arguments and process the data themselves.
 </p>
 <p>
-	An example of this widget can be found in the <code>PetStoreResource</code> in the examples that provides
+	An example of this widget can be found in the <c>PetStoreResource</c> in the examples that provides
 	search/view/sort capabilities against the collection of POJOs:
 <p class='bpcode w800'>
 	<ja>@RestMethod</ja>(
@@ -20587,7 +20590,7 @@
 	The variable it resolves is <js>"$W{ThemeMenuItem}"</js>.
 </p>
 <p>
-	An example of this widget can be found in the <code>PetStoreResource</code> in the examples that provides
+	An example of this widget can be found in the <c>PetStoreResource</c> in the examples that provides
 	a drop-down menu item for rendering all other supported content types in plain text:
 </p>
 <p class='bpcode w800'>
@@ -20620,7 +20623,7 @@
 </p>
 <p>
 	It produces a simple Apache Juneau icon floating on the right.
-	Typically it's used in the footer of the page, as shown below in the <code>AddressBookResource</code> from the examples:
+	Typically it's used in the footer of the page, as shown below in the <c>AddressBookResource</c> from the examples:
 </p>
 <p class='bpcode w800'>
 	<ja>@RestResource</ja>(
@@ -20870,7 +20873,7 @@
 <p>
 	The <js>"$C{REST/stylesheet,servlet:/styles/devops.css}"</js> variable says to use the URI defined
 	in your servlet's config file, if there is one, and to default to serving up the file
-	<code>org/apache/juneau/rest/styles/devops.css</code>.
+	<c>org/apache/juneau/rest/styles/devops.css</c>.
 </p>
 <p>
 	To provide your own stylesheet, simply override the stylesheet attribute and point to a different
@@ -20886,7 +20889,7 @@
 	<jk>public class</jk> MyResourceBaseClass <jk>extends</jk> BasicRestServlet {...}
 </p>
 <p>
-	You can try out different stylesheets by passing in a <code>stylesheet</code> attribute in the request
+	You can try out different stylesheets by passing in a <c>stylesheet</c> attribute in the request
 	URL.
 	The example above show this in use.
 </p>
@@ -21050,6 +21053,29 @@
 	<li class='jm'>{@link org.apache.juneau.rest.RestServlet#log(Level,String,Object...)}
 	<li class='jm'>{@link org.apache.juneau.rest.RestServlet#log(Level,Throwable,String,Object...)}
 </ul>
+
+<!-- ==================================================================================================== -->
+
+<h4 class='topic new' onclick='toggle(this)'><a href='#juneau-rest-server.LoggingAndErrorHandling.LOG4J' id='juneau-rest-server.LoggingAndErrorHandling.LOG4J'>7.32.1 - Using LOG4J for logging</a></h4>
+<div class='topic'><!-- START: 7.32.1 - juneau-rest-server.LoggingAndErrorHandling.LOG4J -->
+<p>
+	The REST API uses Java logging by default.  If you wish to use LOG4J logging, you simple need to add the following
+	to your JVM arguments and maven dependencies:
+</p>
+
+<h5 class='figure'>Command-line argument</h5>
+<p class='bpcode'>
+	-Djava.util.logging.manager=org.apache.logging.log4j.jul.LogManager
+</p>
+
+<h5 class='figure'>Maven dependency</h5>
+<p class='bpcode'>
+	<xt>&lt;dependency&gt;</xt>
+	    <xt>&lt;groupId&gt;</xt>org.apache.logging.log4j<xt>&lt;/groupId&gt;</xt>
+	    <xt>&lt;artifactId&gt;</xt>log4j-jul<xt>&lt;/artifactId&gt;</xt>
+	<xt>&lt;/dependency&gt;</xt>
+</p>
+</div><!-- END: 7.32.1 - juneau-rest-server.LoggingAndErrorHandling.LOG4J -->
 </div><!-- END: 7.32 - juneau-rest-server.LoggingAndErrorHandling -->
 
 <!-- ==================================================================================================== -->
@@ -21468,7 +21494,7 @@
 	}
 </p>
 <p>
-	Finally, define your <code>Root</code> resource with a constructor that takes in our rest resource resolver and
+	Finally, define your <c>Root</c> resource with a constructor that takes in our rest resource resolver and
 	sets it on the config object during initialization.
 </p>
 <p class='bpcode w800'>
@@ -21567,8 +21593,8 @@
 </p>	
 
 <p>
-	The <code>juneau-rest-server-jaxrs</code> library provides an implementation of a <code>MessageBodyReader</code>
-	and <code>MessageBodyWriter</code> to allow any of the Juneau serializers and parsers to be used in a 
+	The <c>juneau-rest-server-jaxrs</c> library provides an implementation of a <c>MessageBodyReader</c>
+	and <c>MessageBodyWriter</c> to allow any of the Juneau serializers and parsers to be used in a 
 	JAX/RS environment. 
 </p>
 
@@ -21624,9 +21650,9 @@
 <ul class='spaced-list'>
 	<li class='jc'>
 		{@link org.apache.juneau.rest.jaxrs.BaseProvider} - The base provider class that implements the JAX-RS 
-		<code>MessageBodyReader</code> and <code>MessageBodyWriter</code> interfaces.
+		<c>MessageBodyReader</c> and <c>MessageBodyWriter</c> interfaces.
 	<li class='jc'>
-		{@link org.apache.juneau.rest.jaxrs.JuneauProvider} - Annotation that is applied to subclasses of <code>BaseProvider</code>
+		{@link org.apache.juneau.rest.jaxrs.JuneauProvider} - Annotation that is applied to subclasses of <c>BaseProvider</c>
 		to specify the serializers/parsers associated with a provider, and optionally filters and properties to 
 		apply to those serializers and parsers.
 	<li class='jc'>
@@ -21664,7 +21690,7 @@
 </p>	
 
 <p>
-	The <code>juneau-rest-server-springboot</code> library provides classes to make it easy to integrate
+	The <c>juneau-rest-server-springboot</c> library provides classes to make it easy to integrate
 	Juneau REST resources with Spring and Spring Boot.
 </p>
 
@@ -21763,9 +21789,9 @@
 	}
 </p>
 <p>
-	The root resource class must extend from <code>HttpServlet</code> so that it can be registered as a normal
+	The root resource class must extend from <c>HttpServlet</c> so that it can be registered as a normal
 	servlet using the Spring Boot architecture.  The {@link org.apache.juneau.rest.BasicRestServletGroup} class is our router class
-	that extends from <code>HttpServlet</code>:
+	that extends from <c>HttpServlet</c>:
 </p>
 <p class='bpcode w800'>
 	<ja>@RestResource</ja>(
@@ -21779,8 +21805,8 @@
 	}
 </p>
 <p>
-	Because Spring Boot will automatically register any beans that extend from <code>HttpServlet</code>, we
-	DON'T want the child classes to extend from <code>HttpServlet</code>.  Instead, we extend from
+	Because Spring Boot will automatically register any beans that extend from <c>HttpServlet</c>, we
+	DON'T want the child classes to extend from <c>HttpServlet</c>.  Instead, we extend from
 	{@link org.apache.juneau.rest.BasicRestGroup} and {@link org.apache.juneau.rest.BasicRest} instead:
 </p>
 
@@ -21889,9 +21915,9 @@
 	At a minimum, the following jars are required:
 </p>
 <ul>
-	<li><code>httpclient-4.5.jar</code>
-	<li><code>httpcore-4.4.1.jar</code>
-	<li><code>httpmime-4.5.jar</code>
+	<li><c>httpclient-4.5.jar</c>
+	<li><c>httpcore-4.4.1.jar</c>
+	<li><c>httpmime-4.5.jar</c>
 </ul>
 
 <h5 class='figure'>Example:</h5>
@@ -22000,7 +22026,7 @@
 <h3 class='topic ' onclick='toggle(this)'><a href='#juneau-rest-client.RestProxies' id='juneau-rest-client.RestProxies'>10.1 - REST Proxies</a></h3>
 <div class='topic'><!-- START: 10.1 - juneau-rest-client.RestProxies -->
 <p>
-	The <code>juneau-rest-client</code> library can also be used to define interface proxies against 3rd-party REST interfaces.
+	The <c>juneau-rest-client</c> library can also be used to define interface proxies against 3rd-party REST interfaces.
 	This is an extremely powerful feature that allows you to quickly define easy-to-use interfaces against 
 	virtually any REST interface.
 </p>
@@ -22108,7 +22134,7 @@
 	PetStore p = client.getRemoteResource(PetStore.<jk>class</jk>);
 </p>
 <p>
-	When a relative path is specified, it's relative to the root-url defined on the <code>RestClient</code> used to instantiate the interface.
+	When a relative path is specified, it's relative to the root-url defined on the <c>RestClient</c> used to instantiate the interface.
 </p>
 <h5 class='figure'>Example:</h5>
 <p class='bpcode w800'>	
@@ -22120,7 +22146,7 @@
 	PetStore p = client.getRemoteResource(PetStore.<jk>class</jk>);
 </p>
 <p>
-	When no path is specified, the root-url defined on the <code>RestClient</code> is used.
+	When no path is specified, the root-url defined on the <c>RestClient</c> is used.
 </p>
 <h5 class='figure'>Example:</h5>
 <p class='bpcode w800'>	
@@ -22151,7 +22177,7 @@
 </ul>
 <h5 class='topic'>@RemoteMethod(method/path)</h5>
 <p>
-	The HTTP method and path are mapped to a Java method using the <code>method</code> and <code>path</code> annotations.
+	The HTTP method and path are mapped to a Java method using the <c>method</c> and <c>path</c> annotations.
 </p>
 <h5 class='figure'>Example:</h5>
 <p class='bpcode w800'>	
@@ -22169,11 +22195,11 @@
 
 <h5 class='topic'>Inferred method/path</h5>
 <p>
-	In such cases, <code>method</code> and <code>path</code> annotations are optional if you follow certain naming
+	In such cases, <c>method</c> and <c>path</c> annotations are optional if you follow certain naming
 	conventions on your method that identify the method and path.
 </p>
 <p>
-	For example, the <code>getPet</code> method below defaults to <code>GET /pet</code>:
+	For example, the <c>getPet</c> method below defaults to <c>GET /pet</c>:
 </p>
 <p class='bpcode w800'>	
 	<ja>@RemoteResource</ja>
@@ -22253,12 +22279,12 @@
 	<li>
 		Any {@doc PojoCategories parsable} POJO 
 		- The body of the response will be converted to the POJO using the parser defined on the 
-		<code>RestClient</code> based on the <code>Content-Type</code> of the response.
+		<c>RestClient</c> based on the <c>Content-Type</c> of the response.
 	<li>
 		Any {@link org.apache.juneau.http.annotation.Response @Response}-annotated type. (described later)
 	<li>
-		<code>HttpResponse</code> 
-		- Returns the raw <code>HttpResponse</code> returned by the inner <code>HttpClient</code>.
+		<c>HttpResponse</c> 
+		- Returns the raw <c>HttpResponse</c> returned by the inner <c>HttpClient</c>.
 	<li>
 		{@link java.io.Reader} 
 		- Returns access to the raw reader of the response.
@@ -22283,7 +22309,7 @@
 	}
 </p>
 <p>
-	If your <code>RestClient</code> does not have a parser associated with it, then the value is converted directly from a String using
+	If your <c>RestClient</c> does not have a parser associated with it, then the value is converted directly from a String using
 	the rules defined in {@doc PojosConveribleToStrings}. 
 </p>
 </div><!-- END: 10.1.2 - juneau-rest-client.RestProxies.RemoteMethod -->
@@ -22332,19 +22358,19 @@
 </p>
 <ul class='spaced-list'>
 	<li>
-		Any serializable POJO - Converted to output using the {@link org.apache.juneau.serializer.Serializer} registered with the <code>RestClient</code>.
-		<br><code>Content-Type</code> is set to that of the <code>Serializer</code>.
+		Any serializable POJO - Converted to output using the {@link org.apache.juneau.serializer.Serializer} registered with the <c>RestClient</c>.
+		<br><c>Content-Type</c> is set to that of the <c>Serializer</c>.
 	<li>
 		{@link java.io.Reader} - Raw contents of {@code Reader} will be serialized to remote resource.
-		<br><code>Content-Type</code> is set to <js>"text/plain"</js>.
+		<br><c>Content-Type</c> is set to <js>"text/plain"</js>.
 	<li>
 		{@link java.io.InputStream} - Raw contents of {@code InputStream} will be serialized to remote resource.
-		<br><code>Content-Type</code> is set to <js>"application/octet-stream"</js>.
+		<br><c>Content-Type</c> is set to <js>"application/octet-stream"</js>.
 	<li>
-		<code>NameValuePairs</code> - Converted to a URL-encoded FORM post.
-		<br><code>Content-Type</code> is set to <js>"aplication/x-www-form-urlencoded"</js>.
+		<c>NameValuePairs</c> - Converted to a URL-encoded FORM post.
+		<br><c>Content-Type</c> is set to <js>"aplication/x-www-form-urlencoded"</js>.
 	<li>
-		<code>HttpEntity</code> - Bypass Juneau serialization and pass HttpEntity directly to HttpClient.
+		<c>HttpEntity</c> - Bypass Juneau serialization and pass HttpEntity directly to HttpClient.
 </ul>
  
 <p>
@@ -22378,7 +22404,7 @@
 </p>
 
 <p>
-	If your <code>RestClient</code> class does not have a serializer associated with it, the body will automatically be serialized to a 
+	If your <c>RestClient</c> class does not have a serializer associated with it, the body will automatically be serialized to a 
 	string using the rules defined in {@doc PojosConveribleToStrings}.
 </p>
 </div><!-- END: 10.1.3 - juneau-rest-client.RestProxies.Body -->
@@ -22460,7 +22486,7 @@
 <ul class='spaced-list'>
 	<li>
 		Any serializable POJO - Converted to a string using the {@link org.apache.juneau.httppart.HttpPartSerializer} registered with the
-		<code>RestClient</code> ({@link org.apache.juneau.oapi.OpenApiSerializer} by default) or associated via the {@link org.apache.juneau.http.annotation.FormData#serializer() @FormData(serializer)} annotation.
+		<c>RestClient</c> ({@link org.apache.juneau.oapi.OpenApiSerializer} by default) or associated via the {@link org.apache.juneau.http.annotation.FormData#serializer() @FormData(serializer)} annotation.
 </ul>
 <p>
 	Multi-part arguments (i.e. those with name == <js>"*"</js> or empty) can be any of the following types:
@@ -22471,15 +22497,15 @@
 	<li>
 		{@link java.io.InputStream} - Raw contents of {@code InputStream} will be serialized to remote resource.
 	<li>
-		<code>NameValuePairs</code> - Converted to a URL-encoded FORM post.
+		<c>NameValuePairs</c> - Converted to a URL-encoded FORM post.
 	<li>
-		<code>Map</code> - Converted to key-value pairs.
+		<c>Map</c> - Converted to key-value pairs.
 			<br>Values serialized using the registered {@link org.apache.juneau.httppart.HttpPartSerializer} ({@link org.apache.juneau.oapi.OpenApiSerializer} by default).
 	<li>
 		Bean - Converted to key-value pairs.
 			<br>Values serialized using the registered {@link org.apache.juneau.httppart.HttpPartSerializer} ({@link org.apache.juneau.oapi.OpenApiSerializer} by default).
 	<li>
-		<code>CharSequence</code> - Used directly as am <js>"application/x-www-form-urlencoded"</js> entity.
+		<c>CharSequence</c> - Used directly as am <js>"application/x-www-form-urlencoded"</js> entity.
 </ul>
 <p>
 	See the link below for information about supported data types in OpenAPI serialization.
@@ -22571,7 +22597,7 @@
 <ul class='spaced-list'>
 	<li>
 		Any serializable POJO - Converted to a string using the {@link org.apache.juneau.httppart.HttpPartSerializer} registered with the
-		<code>RestClient</code> ({@link org.apache.juneau.oapi.OpenApiSerializer} by default) or associated via the {@link org.apache.juneau.http.annotation.Query#serializer() @Query(serializer)} annotation.
+		<c>RestClient</c> ({@link org.apache.juneau.oapi.OpenApiSerializer} by default) or associated via the {@link org.apache.juneau.http.annotation.Query#serializer() @Query(serializer)} annotation.
 </ul>
 
 <p>
@@ -22581,15 +22607,15 @@
 	<li>
 		{@link java.io.Reader} - Raw contents of {@code Reader} will be serialized directly a query string.
 	<li>
-		<code>NameValuePairs</code> - Serialized as individual query parameters.
+		<c>NameValuePairs</c> - Serialized as individual query parameters.
 	<li>
-		<code>Map</code> - Converted to key-value pairs.
+		<c>Map</c> - Converted to key-value pairs.
 			<br>Values serialized using the registered {@link org.apache.juneau.httppart.HttpPartSerializer} ({@link org.apache.juneau.oapi.OpenApiSerializer} by default).
 	<li>
 		Bean - Converted to key-value pairs.
 			<br>Values serialized using the registered {@link org.apache.juneau.httppart.HttpPartSerializer} ({@link org.apache.juneau.oapi.OpenApiSerializer} by default).
 	<li>
-		<code>CharSequence</code> - Serialized directly a query string.
+		<c>CharSequence</c> - Serialized directly a query string.
 </ul>
 
 <p>
@@ -22672,7 +22698,7 @@
 <ul class='spaced-list'>
 	<li>
 		Any serializable POJO - Converted to a string using the {@link org.apache.juneau.httppart.HttpPartSerializer} registered with the
-		<code>RestClient</code> ({@link org.apache.juneau.oapi.OpenApiSerializer} by default) or associated via the {@link org.apache.juneau.http.annotation.Header#serializer() @Header(serializer)} annotation.
+		<c>RestClient</c> ({@link org.apache.juneau.oapi.OpenApiSerializer} by default) or associated via the {@link org.apache.juneau.http.annotation.Header#serializer() @Header(serializer)} annotation.
 </ul>
 
 <p>
@@ -22680,9 +22706,9 @@
 </p>
 <ul class='spaced-list'>
 	<li>
-		<code>NameValuePairs</code> - Serialized as individual headers.
+		<c>NameValuePairs</c> - Serialized as individual headers.
 	<li>
-		<code>Map</code> - Converted to key-value pairs.
+		<c>Map</c> - Converted to key-value pairs.
 			<br>Values serialized using the registered {@link org.apache.juneau.httppart.HttpPartSerializer} ({@link org.apache.juneau.oapi.OpenApiSerializer} by default).
 	<li>
 		Bean - Converted to key-value pairs.
@@ -22762,7 +22788,7 @@
 <ul class='spaced-list'>
 	<li>
 		Any serializable POJO - Converted to a string using the {@link org.apache.juneau.httppart.HttpPartSerializer} registered with the
-		<code>RestClient</code> ({@link org.apache.juneau.oapi.OpenApiSerializer} by default) or associated via the {@link org.apache.juneau.http.annotation.Path#serializer() @Path(serializer)} annotation.
+		<c>RestClient</c> ({@link org.apache.juneau.oapi.OpenApiSerializer} by default) or associated via the {@link org.apache.juneau.http.annotation.Path#serializer() @Path(serializer)} annotation.
 </ul>
 
 <p>
@@ -22770,9 +22796,9 @@
 </p>
 <ul class='spaced-list'>
 	<li>
-		<code>NameValuePairs</code> - Serialized as individual query parameters.
+		<c>NameValuePairs</c> - Serialized as individual query parameters.
 	<li>
-		<code>Map</code> - Converted to key-value pairs.
+		<c>Map</c> - Converted to key-value pairs.
 			<br>Values serialized using the registered {@link org.apache.juneau.httppart.HttpPartSerializer} ({@link org.apache.juneau.oapi.OpenApiSerializer} by default).
 	<li>
 		Bean - Converted to key-value pairs.
@@ -23169,7 +23195,7 @@
 	authenticated client.
 </p>
 <p>
-	The following example shows how the <code>JazzRestClient</code> class provides FORM-based 
+	The following example shows how the <c>JazzRestClient</c> class provides FORM-based 
 	authentication support.
 </p>
 <p class='bpcode w800'>
@@ -23250,7 +23276,7 @@
 <h4 class='topic ' onclick='toggle(this)'><a href='#juneau-rest-client.Authentication.OIDC' id='juneau-rest-client.Authentication.OIDC'>10.3.3 - OIDC Authentication</a></h4>
 <div class='topic'><!-- START: 10.3.3 - juneau-rest-client.Authentication.OIDC -->
 <p>
-	The following example shows how the <code>JazzRestClient</code> class provides OIDC authentication 
+	The following example shows how the <c>JazzRestClient</c> class provides OIDC authentication 
 	support.
 </p>
 <p class='bpcode w800'>
@@ -23474,7 +23500,7 @@
 <h3 class='topic ' onclick='toggle(this)'><a href='#juneau-rest-client.PipingOutput' id='juneau-rest-client.PipingOutput'>10.5 - Piping Response Output</a></h3>
 <div class='topic'><!-- START: 10.5 - juneau-rest-client.PipingOutput -->
 <p>
-	The {@link org.apache.juneau.rest.client.RestCall} class provides various convenience <code>pipeTo()</code> 
+	The {@link org.apache.juneau.rest.client.RestCall} class provides various convenience <c>pipeTo()</c> 
 	methods to pipe output to output streams and writers.
 </p>
 <p>
@@ -23503,7 +23529,7 @@
 <p>
 	Under-the-covers, this is simply a shortcut for adding the {@link org.apache.juneau.rest.client.RestCallLogger#DEFAULT} 
 	interceptor to the client.  
-	This causes the following output to be generated by the Java <code>org.apache.juneau.rest.client</code> 
+	This causes the following output to be generated by the Java <c>org.apache.juneau.rest.client</c> 
 	logger at <jsf>WARNING</jsf> level:
 </p>
 <p class='bpcode w800 console'>
@@ -23529,7 +23555,7 @@
 	=== END ========================================================================
 </p>
 <p>
-	This setting also causes a <code>Debug: true</code> header value to trigger logging of the request on the 
+	This setting also causes a <c>Debug: true</c> header value to trigger logging of the request on the 
 	server side as well.
 </p>
 <p class='bpcode w800 console'>
@@ -23746,7 +23772,7 @@
 </p>	
 
 <p>
-	The <code>juneau-rest-mock</code> module contains convenience APIs for performing serverless unit
+	The <c>juneau-rest-mock</c> module contains convenience APIs for performing serverless unit
 	testing of your REST APIs.
 	Each of the APIs provide the ability to fully test your server and client REST interfaces without the
 	need for a running servlet container.
@@ -23850,7 +23876,7 @@
 	actually having to run in a servlet container.
 </p>
 <p>
-	The <code>create(Object)</code> method can take in either <code>Class</code> objects or pre-instantiated beans.
+	The <c>create(Object)</c> method can take in either <c>Class</c> objects or pre-instantiated beans.
 	The latter is particularly useful for testing Spring beans.
 </p>
 <hr>
@@ -23879,8 +23905,8 @@
 <ul class='doctree'>
 	<li class='jm'>{@link org.apache.juneau.rest.mock2.MockRest#build(Object,Marshall) build(Object,Marshall)} - Use media types defined on a marshall.
 	<li class='jm'>{@link org.apache.juneau.rest.mock2.MockRest#build(Object,Serializer,Parser) build(Object,Serializer,Parser)} - Use media types defined on a serializer and parser.
-	<li class='jm'>{@link org.apache.juneau.rest.mock2.MockRest.Builder#accept(String) accept(String)} - Explicitly set the <code>Accept</code> header.
-	<li class='jm'>{@link org.apache.juneau.rest.mock2.MockRest.Builder#contentType(String) contentType(String)} - Explicitly set the <code>Content-Type</code> header.
+	<li class='jm'>{@link org.apache.juneau.rest.mock2.MockRest.Builder#accept(String) accept(String)} - Explicitly set the <c>Accept</c> header.
+	<li class='jm'>{@link org.apache.juneau.rest.mock2.MockRest.Builder#contentType(String) contentType(String)} - Explicitly set the <c>Content-Type</c> header.
 </ul>
 <p>
 	Various other convenience methods for common media types are also provided.
@@ -23921,19 +23947,19 @@
 	</ul>
 </ul>
 <p>
-	For HTTP methods that pass a request body (i.e. <code>PUT</code>,<code>POST</code><code>PATCH</code>), the body object can be any of the following types:
+	For HTTP methods that pass a request body (i.e. <c>PUT</c>,<c>POST</c><c>PATCH</c>), the body object can be any of the following types:
 </p>
 <ul>
-	<li><code><jk>byte</jk>[]</code>
+	<li><c><jk>byte</jk>[]</c>
 	<li>{@link java.io.Reader}
 	<li>{@link java.io.InputStream}
 	<li>{@link java.lang.CharSequence}
 </ul>
 <p>
-	All other body object types are converted to strings using the <code>toString()</code> method.
+	All other body object types are converted to strings using the <c>toString()</c> method.
 </p>
 <p>
-	A common tactic is to override a bean's <code>toString()</code> method to return Simple JSON so that
+	A common tactic is to override a bean's <c>toString()</c> method to return Simple JSON so that
 	instances can be passed to the methods above.
 </p>
 <p class='bpcode w800'>
@@ -23952,7 +23978,7 @@
 	on the {@link javax.servlet.http.HttpServletRequest} in addition to many convenience methods.
 </p>
 <p>
-	The following fluent convenience methods are provided for setting common <code>Accept</code> and <code>Content-Type</code> headers.
+	The following fluent convenience methods are provided for setting common <c>Accept</c> and <c>Content-Type</c> headers.
 </p>
 <ul class='doctree'>
 	<li class='jc'>{@link org.apache.juneau.rest.mock2.MockServletRequest}
@@ -24068,8 +24094,8 @@
 </p>
 <p>
 	Remote resource interfaces are normally created through the {@link org.apache.juneau.rest.client.RestClient#getRemoteResource(Class)} method.
-	The {@link org.apache.juneau.rest.mock2.MockRemoteResource} will create a {@link org.apache.juneau.rest.client.RestClient} using a specialized <code>HttpClientConnectionManager</code>
-	designed to transform client-side <code>HttpRequest</code>/<code>HttpResponse</code> objects into server-side 
+	The {@link org.apache.juneau.rest.mock2.MockRemoteResource} will create a {@link org.apache.juneau.rest.client.RestClient} using a specialized <c>HttpClientConnectionManager</c>
+	designed to transform client-side <c>HttpRequest</c>/<c>HttpResponse</c> objects into server-side 
 	{@link org.apache.juneau.rest.mock2.MockServletRequest}/{@link org.apache.juneau.rest.mock2.MockServletResponse} objects and then pass those to the {@link org.apache.juneau.rest.mock2.MockRest} 
 	object described in the previous section.
 </p>
@@ -24456,7 +24482,7 @@
 			<li>
 				The <js>"configFile"</js> argument in the command line arguments passed in through the constructor.
 			<li>
-				The value of the <code>Main-Config</code> entry in the manifest file.
+				The value of the <c>Main-Config</c> entry in the manifest file.
 			<li>
 				A config file in the same location and with the same name as the executable jar file.
 				(e.g. <js>"java -jar myjar.jar"</js> will look for <js>"myjar.cfg"</js>).
@@ -24466,11 +24492,11 @@
 	<li>
 		Resolve any of the following files in the classpath:
 		<ol>
-			<li><code>juneau.cfg</code>
-			<li><code>default.cfg</code>
-			<li><code>application.cfg</code>
-			<li><code>app.cfg</code>
-			<li><code>settings.cfg</code>
+			<li><c>juneau.cfg</c>
+			<li><c>default.cfg</c>
+			<li><c>application.cfg</c>
+			<li><c>app.cfg</c>
+			<li><c>settings.cfg</c>
 		</ol>
 </ol>
 <p>
@@ -24567,7 +24593,7 @@
 <h3 class='topic ' onclick='toggle(this)'><a href='#juneau-microservice-core.SystemProperties' id='juneau-microservice-core.SystemProperties'>12.6 - System properties</a></h3>
 <div class='topic'><!-- START: 12.6 - juneau-microservice-core.SystemProperties -->
 <p>
-	As a convenience, the <code>SystemProperties</code> section of your configuration file can be used to define system
+	As a convenience, the <c>SystemProperties</c> section of your configuration file can be used to define system
 	properties to set during initialization of your microservice:
 </p>
 <p class='bpcode w800'>
@@ -24625,18 +24651,18 @@
 	By default, support for the following variables are provided:
 </p>
 <ul>
-	<li><code>$S{key[,default]}</code> - {@link org.apache.juneau.svl.vars.SystemPropertiesVar}
-	<li><code>$E{key[,default]}</code> - {@link org.apache.juneau.svl.vars.EnvVariablesVar}
-	<li><code>$A{key[,default]}</code> - {@link org.apache.juneau.svl.vars.ArgsVar}
-	<li><code>$C{key[,default]}</code> - {@link org.apache.juneau.config.vars.ConfigVar}
-	<li><code>$MF{key[,default]}</code> - {@link org.apache.juneau.svl.vars.ManifestFileVar}
-	<li><code>$IF{arg,then[,else]}</code> - {@link org.apache.juneau.svl.vars.IfVar}
-	<li><code>$SW{arg,pattern1:then1[,pattern2:then2...]}</code> - {@link org.apache.juneau.svl.vars.SwitchVar}
-	<li><code>$CO{arg[,arg2...]}</code> - {@link org.apache.juneau.svl.vars.CoalesceVar}
-	<li><code>$PM{arg,pattern}</code> - {@link org.apache.juneau.svl.vars.PatternMatchVar}
-	<li><code>$UC{arg}</code> - {@link org.apache.juneau.svl.vars.UpperCaseVar}
-	<li><code>$LC{arg}</code> - {@link org.apache.juneau.svl.vars.LowerCaseVar}
-	<li><code>$NE{arg}</code> - {@link org.apache.juneau.svl.vars.NotEmptyVar}
+	<li><c>$S{key[,default]}</c> - {@link org.apache.juneau.svl.vars.SystemPropertiesVar}
+	<li><c>$E{key[,default]}</c> - {@link org.apache.juneau.svl.vars.EnvVariablesVar}
+	<li><c>$A{key[,default]}</c> - {@link org.apache.juneau.svl.vars.ArgsVar}
+	<li><c>$C{key[,default]}</c> - {@link org.apache.juneau.config.vars.ConfigVar}
+	<li><c>$MF{key[,default]}</c> - {@link org.apache.juneau.svl.vars.ManifestFileVar}
+	<li><c>$IF{arg,then[,else]}</c> - {@link org.apache.juneau.svl.vars.IfVar}
+	<li><c>$SW{arg,pattern1:then1[,pattern2:then2...]}</c> - {@link org.apache.juneau.svl.vars.SwitchVar}
+	<li><c>$CO{arg[,arg2...]}</c> - {@link org.apache.juneau.svl.vars.CoalesceVar}
+	<li><c>$PM{arg,pattern}</c> - {@link org.apache.juneau.svl.vars.PatternMatchVar}
+	<li><c>$UC{arg}</c> - {@link org.apache.juneau.svl.vars.UpperCaseVar}
+	<li><c>$LC{arg}</c> - {@link org.apache.juneau.svl.vars.LowerCaseVar}
+	<li><c>$NE{arg}</c> - {@link org.apache.juneau.svl.vars.NotEmptyVar}
 </ul>
 </div><!-- END: 12.7 - juneau-microservice-core.VarResolver -->
 
@@ -24974,7 +25000,7 @@
 	easy-to-use microservices in a standard Java 1.8+ environment.
 </p>
 <p>
-	The <code>juneau-microservice-jetty</code> library consists of the following classes:
+	The <c>juneau-microservice-jetty</c> library consists of the following classes:
 </p>
 <ul class='doctree'>
 	<li class='jp'>{@link org.apache.juneau.microservice.jetty}
@@ -25229,7 +25255,7 @@
 		}</cv>
 	</cv>	
 	<li>
-		Directly in the <code>jetty.xml</code> file.
+		Directly in the <c>jetty.xml</c> file.
 		<p class='bcode w800'>
 	<xt>&lt;Configure</xt> <xa>id</xa>=<xs>"ExampleServer"</xs> <xa>class</xa>=<xs>"org.eclipse.jetty.server.Server"</xs><xt>&gt;</xt>
 		...
@@ -25282,7 +25308,7 @@
 <p>
 	The most common usage for the configuration file is to reference values using the {@link org.apache.juneau.config.vars.ConfigVar $C} variable in annotations.
 	For example, the {@link org.apache.juneau.rest.BasicRestConfig} interface that defines the annotations that control the look-and-feel of
-	classes that extend from {@link org.apache.juneau.rest.BasicRestServlet} use several <code>$C</code> variables to externalize values:
+	classes that extend from {@link org.apache.juneau.rest.BasicRestServlet} use several <c>$C</c> variables to externalize values:
 </p>
 <p class='bpcode w800'>
 	<ja>@RestResource</ja>(
@@ -25324,7 +25350,7 @@
 </p>
 <p>
 	These values in turn are pulled from the external configuration file shown below.
-	Note that the configuration file can also contain <code>$C</code> variables.
+	Note that the configuration file can also contain <c>$C</c> variables.
 </p>
 <p class='bpcode w800'>
 	<cc>#=======================================================================================================================
@@ -25483,10 +25509,10 @@
 <h3 class='topic ' onclick='toggle(this)'><a href='#juneau-microservice-jetty.JettyXml' id='juneau-microservice-jetty.JettyXml'>13.6 - Jetty.xml file</a></h3>
 <div class='topic'><!-- START: 13.6 - juneau-microservice-jetty.JettyXml -->
 <p>
-	The Jetty microservice comes with a bare-bones <code>jetty.xml</code> file which can be modified to suite any needs. 
+	The Jetty microservice comes with a bare-bones <c>jetty.xml</c> file which can be modified to suite any needs. 
 </p>	
 <p>
-	The <code>jetty.xml</code> can be located in either the <js>"."</js> or <js>"files"</js> working directory or classpath.
+	The <c>jetty.xml</c> can be located in either the <js>"."</js> or <js>"files"</js> working directory or classpath.
 	It can also be specified in any of the following ways:
 </p>
 <ul class='spaced-list'>
@@ -25494,7 +25520,7 @@
 		Using the {@link org.apache.juneau.microservice.jetty.JettyMicroserviceBuilder#jettyXml(Object,boolean)} method to specify the location or contents
 		of the file.
 	<li>
-		Specifying the location using a <code>Jetty-Config</code> value in the <code>MANIFEST.MF</code> file.
+		Specifying the location using a <c>Jetty-Config</c> value in the <c>MANIFEST.MF</c> file.
 		<p class='bcode w800'>
 	<mk>Jetty-Config:</mk> <mv>files/jetty.xml</mv>
 		</p>
@@ -25511,8 +25537,8 @@
 		</p>
 </ul>
 <p>
-	SVL variables in the <code>jetty.xml</code> file are automatically resolved by the microservice.
-	This allows you to reference values in your configuration file from the <code>jetty.xml</code> file.
+	SVL variables in the <c>jetty.xml</c> file are automatically resolved by the microservice.
+	This allows you to reference values in your configuration file from the <c>jetty.xml</c> file.
 </p>
 <p>
 	The HTTP port used is controlled via the following:
@@ -25544,7 +25570,7 @@
 </ul>
 <p>
 	The first available port is then made available through the system property <js>"availablePort"</js> so that it
-	can be referenced in our <code>jetty.xml</code> file.
+	can be referenced in our <c>jetty.xml</c> file.
 </p>
 <p class='bpcode w800'>
 	<xt>&lt;Set</xt> <xa>name</xa>=<xs>"connectors"</xs><xt>&gt;</xt>
@@ -25571,7 +25597,7 @@
 <h3 class='topic ' onclick='toggle(this)'><a href='#juneau-microservice-jetty.UiCustomization' id='juneau-microservice-jetty.UiCustomization'>13.7 - UI Customization</a></h3>
 <div class='topic'><!-- START: 13.7 - juneau-microservice-jetty.UiCustomization -->
 <p>
-	The Microservice project contains a <code>files/htdocs</code> folder with predefined stylesheets and
+	The Microservice project contains a <c>files/htdocs</c> folder with predefined stylesheets and
 	images.
 </p>
 <img style='width:200px' src='doc-files/juneau-microservice-jetty.UiCustomization.1.png'>
@@ -25655,12 +25681,12 @@
 	<jk>public interface</jk> BasicRestConfig {}
 </p>
 <p>
-	Note that the <code>files/htdocs</code> directory is mapped to <js>"servlet:/htdocs"</js> using the <code>staticFiles</code>
+	Note that the <c>files/htdocs</c> directory is mapped to <js>"servlet:/htdocs"</js> using the <c>staticFiles</c>
 	setting.  This allows those files to be served up through the servlet through the URL <js>"/[servlet-path]/htdocs"</js>
 </p>
 <p>
 	The theme files are externally accessible and can be modified to produce any look-and-feel you desire.
-	The microservice still works without the files directory.  An embedded <code>devops.css</code> is included in the jar as a default spreadsheet.
+	The microservice still works without the files directory.  An embedded <c>devops.css</c> is included in the jar as a default spreadsheet.
 </p>
 <p>
 	If you're testing out changes in the theme stylesheets, you may want to set the following system property that prevents caching of those files so 
@@ -25787,7 +25813,7 @@
 </p>		
 <ol class='spaced-list'>
 	<li>
-		Download the <code>my-jetty-microservice-{@property juneauVersion}.zip</code> file from the downloads page
+		Download the <c>my-jetty-microservice-{@property juneauVersion}.zip</c> file from the downloads page
 		(located in the binaries) and import it into your workspace as an existing project:
 		<br><br>
 		<img class='bordered' src='doc-files/my-jetty-microservice.Installing.1.png' style='width:524px'>
@@ -26067,7 +26093,7 @@
 </p>			
 <img class='bordered w400' src='doc-files/my-jetty-microservice.Running.1.png'>
 <p>
-	You can enter the command <code>exit</code> to shut it down.
+	You can enter the command <c>exit</c> to shut it down.
 </p>
 </div><!-- END: 14.2 - my-jetty-microservice.Running -->
 
@@ -26086,14 +26112,14 @@
 	mvn clean install
 </p>
 <p>
-	Your <code>target</code> directory should now contain the following files:
+	Your <c>target</c> directory should now contain the following files:
 </p>
 <ul>
-	<li><code>my-jetty-microservice-1.0.jar</code>
-	<li><code>my-jetty-microservice.cfg</code>
+	<li><c>my-jetty-microservice-1.0.jar</c>
+	<li><c>my-jetty-microservice.cfg</c>
 </ul>
 <p>
-	To start from a command line, run the following command from inside your <code>target</code> directory:
+	To start from a command line, run the following command from inside your <c>target</c> directory:
 </p>
 <p class='bpcode w800'>
 	java -jar my-jetty-microservice-1.0.jar
@@ -26149,7 +26175,7 @@
 </p>		
 <ol class='spaced-list'>
 	<li>
-		Download the <code>my-springboot-microservice-{@property juneauVersion}.zip</code> file from the downloads page
+		Download the <c>my-springboot-microservice-{@property juneauVersion}.zip</c> file from the downloads page
 		(located in the binaries) and import it into your workspace as an existing project:
 		<br><br>
 		<img class='bordered' src='doc-files/my-springboot-microservice.Installing.1.png' style='width:524px'>
@@ -26323,13 +26349,13 @@
 	mvn clean install
 </p>
 <p>
-	Your <code>target</code> directory should now contain the following files:
+	Your <c>target</c> directory should now contain the following files:
 </p>
 <ul>
-	<li><code>my-springboot-microservice-1.0.jar</code>
+	<li><c>my-springboot-microservice-1.0.jar</c>
 </ul>
 <p>
-	To start from a command line, run the following command from inside your <code>target</code> directory:
+	To start from a command line, run the following command from inside your <c>target</c> directory:
 </p>
 <p class='bpcode w800'>
 	java -jar my-springboot-microservice-1.0.jar
@@ -26363,7 +26389,7 @@
 </p>	
 
 <p>
-	The <code>juneau-examples-core</code> project contains various code examples for using the core APIs. 
+	The <c>juneau-examples-core</c> project contains various code examples for using the core APIs. 
 </p>
 
 <!-- ==================================================================================================== -->
@@ -26375,7 +26401,7 @@
 </p>		
 <ol class='spaced-list'>
 	<li>
-		Download the <code>juneau-examples-core-{@property juneauVersion}.zip</code> file from the downloads page
+		Download the <c>juneau-examples-core-{@property juneauVersion}.zip</c> file from the downloads page
 		(located in the binaries) and import it into your workspace as an existing project:
 		<br><br>
 		<img class='bordered' src='doc-files/juneau-examples-core.Installing.1.png' style='width:524px'>
@@ -26461,7 +26487,7 @@
 </p>	
 
 <p>
-	The <code>juneau-examples-rest</code> project includes various examples of REST resources written
+	The <c>juneau-examples-rest</c> project includes various examples of REST resources written
 	using Juneau.
 </p>
 <p>
@@ -26498,7 +26524,7 @@
 								{@link org.apache.juneau.rest.BasicRestServletJenaGroup} - Group resource with added RDF support.
 								<ul>
 									<li class='jc'>
-										<code>RootResources</code>
+										<c>RootResources</c>
 								</ul>
 							</li>
 						</ul>
@@ -26691,7 +26717,7 @@
 <h3 class='topic ' onclick='toggle(this)'><a href='#juneau-examples-rest.PetStoreResource' id='juneau-examples-rest.PetStoreResource'>17.3 - PetStore</a></h3>
 <div class='topic'><!-- START: 17.3 - juneau-examples-rest.PetStoreResource -->
 <p>
-	The <code>PetStore</code> application is an functional application meant to demonstrate the following:
+	The <c>PetStore</c> application is an functional application meant to demonstrate the following:
 </p>
 <ul class='spaced-list'>
 	<li>
@@ -26804,20 +26830,20 @@
 	The application itself is defined in 3 packages:
 </p>
 <ul class='doctree'>
-	<li class='jp'><code>org.apache.juneau.rest.examples.rest.petstore</code>
+	<li class='jp'><c>org.apache.juneau.rest.examples.rest.petstore</c>
 		<br>Defines the service for storing and retrieving Petstore data.
 		<br><img class='bordered' style='width:250px' src='doc-files/juneau-examples-rest.PetStoreResource.2a.png'>
-	<li class='jp'><code>org.apache.juneau.rest.examples.rest.petstore.dto</code>
+	<li class='jp'><c>org.apache.juneau.rest.examples.rest.petstore.dto</c>
 		<br>Data transfer objects.
 		<br>These are JPA beans that are used both to store data in our database and are serialized
 		directly by our REST interface.
 		<br><img class='bordered' style='width:250px' src='doc-files/juneau-examples-rest.PetStoreResource.2b.png'>
-	<li class='jp'><code>org.apache.juneau.rest.examples.rest.petstore.rest</code>
+	<li class='jp'><c>org.apache.juneau.rest.examples.rest.petstore.rest</c>
 		<br>The classes used for our REST interface.
 		<br><img class='bordered' style='width:250px' src='doc-files/juneau-examples-rest.PetStoreResource.2c.png'>
 </ul>
 <p>
-	We also define some static files in the <code>org.apache.juneau.rest.examples.rest.petstore</code> package:
+	We also define some static files in the <c>org.apache.juneau.rest.examples.rest.petstore</c> package:
 </p>
 <img class='bordered' style='width:250px' src='doc-files/juneau-examples-rest.PetStoreResource.2d.png'>
 <hr>
@@ -27245,7 +27271,7 @@
 <img class='bordered w800' src='doc-files/juneau-examples-rest.PetStoreResource.4b.png'>
 <p>
 	You'll notice the details page shows <l>tags</l> and <l>photo</l> fields not shown on the summary page.
-	This was accomplished with the <code>bpx=<js>"Pet: tags,photo"</js></code> annotation on the <l>getPets()</l>
+	This was accomplished with the <c>bpx=<js>"Pet: tags,photo"</js></c> annotation on the <l>getPets()</l>
 	method which excludes those two properties from the view. 
 	This is a common way of defining summary and details views for POJOs.
 </p>
@@ -27335,7 +27361,7 @@
 </p>			
 <img class='bordered w800' src='doc-files/juneau-examples-rest.PetStoreResource.5b.png'>
 <p>
-	Note that we're using the convenience feature for specifying an <code>Accept</code> header via a query parameter.
+	Note that we're using the convenience feature for specifying an <c>Accept</c> header via a query parameter.
 </p>
 <p>
 	The <l>THEME</l> menu items allows you to quickly change the stylesheet used on the page:
@@ -28458,7 +28484,7 @@
 </p>	
 
 <p>
-	The <code>juneau-examples-rest-jetty</code> project includes everything you need create a Samples REST 
+	The <c>juneau-examples-rest-jetty</c> project includes everything you need create a Samples REST 
 	microservice in an Eclipse workspace and build it as an executable jar.
 </p>
 
@@ -28471,7 +28497,7 @@
 </p>		
 <ol class='spaced-list'>
 	<li>
-		Download the <code>juneau-examples-rest-jetty-{@property juneauVersion}.zip</code> file from the downloads page
+		Download the <c>juneau-examples-rest-jetty-{@property juneauVersion}.zip</c> file from the downloads page
 		(located in the binaries) and import it into your workspace as an existing project:
 		<br><br>
 		<img class='bordered' src='doc-files/juneau-examples-rest-jetty.Installing.1.png' style='width:524px'>
@@ -28772,7 +28798,7 @@
 </p>			
 <img class='bordered w400' src='doc-files/juneau-examples-rest-jetty.Running.1.png'>
 <p>
-	You can enter the command <code>exit</code> to shut it down.
+	You can enter the command <c>exit</c> to shut it down.
 </p>
 </div><!-- END: 18.2 - juneau-examples-rest-jetty.Running -->
 
@@ -28791,14 +28817,14 @@
 	mvn clean install
 </p>
 <p>
-	Your <code>target</code> directory should now contain the following files:
+	Your <c>target</c> directory should now contain the following files:
 </p>
 <ul>
-	<li><code>juneau-examples-rest-jetty-1.0.jar</code>
-	<li><code>juneau-examples-rest-jetty.cfg</code>
+	<li><c>juneau-examples-rest-jetty-1.0.jar</c>
+	<li><c>juneau-examples-rest-jetty.cfg</c>
 </ul>
 <p>
-	To start from a command line, run the following command from inside your <code>target</code> directory:
+	To start from a command line, run the following command from inside your <c>target</c> directory:
 </p>
 <p class='bpcode w800'>
 	java -jar juneau-examples-rest-jetty-1.0.jar
@@ -28834,7 +28860,7 @@
 </p>	
 
 <p>
-	The <code>juneau-examples-rest-springboot</code> library contains the same examples as <code>juneau-examples-rest</code>
+	The <c>juneau-examples-rest-springboot</c> library contains the same examples as <c>juneau-examples-rest</c>
 	but also includes the following:
 </p>
 <ul class='spaced-list'>
@@ -28843,7 +28869,7 @@
 	<li>
 		A resource resolver for resolving REST resources as injectable beans.
 	<li>
-		A POM that extends from <code>spring-boot-starter-parent</code> that allows you to build a fully-shaded executable jar.
+		A POM that extends from <c>spring-boot-starter-parent</c> that allows you to build a fully-shaded executable jar.
 	<li>
 		Configuration files for deploying the microservice to Heroku.
 </ul>
@@ -28857,7 +28883,7 @@
 </p>		
 <ol class='spaced-list'>
 	<li>
-		Download the <code>juneau-examples-rest-springboot-{@property juneauVersion}.zip</code> file from the downloads page
+		Download the <c>juneau-examples-rest-springboot-{@property juneauVersion}.zip</c> file from the downloads page
 		(located in the binaries) and import it into your workspace as an existing project:
 		<br><br>
 		<img class='bordered' src='doc-files/juneau-examples-rest-springboot.Installing.1.png' style='width:524px'>
@@ -29042,13 +29068,13 @@
 	mvn clean install
 </p>
 <p>
-	Your <code>target</code> directory should now contain the following files:
+	Your <c>target</c> directory should now contain the following files:
 </p>
 <ul>
-	<li><code>juneau-examples-rest-springboot-1.0.jar</code>
+	<li><c>juneau-examples-rest-springboot-1.0.jar</c>
 </ul>
 <p>
-	To start from a command line, run the following command from inside your <code>target</code> directory:
+	To start from a command line, run the following command from inside your <c>target</c> directory:
 </p>
 <p class='bpcode w800'>
 	java -jar juneau-examples-rest-springboot-1.0.jar
@@ -29238,8 +29264,8 @@
 	Fortunately, Juneau does not support an open-ended <js>"class</js> attribute.  
 	As a rule, it should not be possible to create arbitrary POJOs by any of the parsers.
 	The demarshalled object types are inferred via reflection of the class objects passed in through the parser 
-	method (e.g. <code>JsonParser.<jsf>DEFAULT</jsf>.parse(input, MyBean.<jk>class</jk>)</code>).
-	As long as the <code>Class</code> object passed into this method is not constructed from user-generated input,
+	method (e.g. <c>JsonParser.<jsf>DEFAULT</jsf>.parse(input, MyBean.<jk>class</jk>)</c>).
+	As long as the <c>Class</c> object passed into this method is not constructed from user-generated input,
 	it should be free from demarshalling vulnerabilities.   
 </p> 
 <p>
@@ -29281,7 +29307,7 @@
 	top of plain-old Java Object Serialization which itself is vulnerable to demarshalling issues.  
 	Due to this, the JSO parser is not included in any of the default REST servlet implementations. 
 	Be especially careful when using this parser, particularly if you want to use it for handing 
-	<code>application/x-java-serialized-object</code> input through REST servlets. 
+	<c>application/x-java-serialized-object</c> input through REST servlets. 
 </p>
 <p>
 	All other parsers (JSON, URL-Encoding, MessagePack, etc...) work the same way in determining POJO types, so
@@ -29298,7 +29324,7 @@
 	<li>The XML and HTML parsers uses the built-in Java StAX parser.
 		This *should* be free from vulnerabilities.    
 	<li>The RDF parsers rely on Apache Jena 2.7.1.  
-		As of <code>7.0.1</code>, no known security vulnerabilities exist that affect Juneau at this time.
+		As of <c>7.0.1</c>, no known security vulnerabilities exist that affect Juneau at this time.
 </ul>
 </div><!-- END: 20.1 - Security.juneau-marshall -->
 
@@ -29326,10 +29352,10 @@
 	}
 </p>
 <p>
-	This code is simply echoing the value of the <code>foo</code> query parameter.
+	This code is simply echoing the value of the <c>foo</c> query parameter.
 	Now say for example that a bad actor passes in the query string <js>"foo=$F{/some/file/on/file/system}"</js>.
-	The <code>$F</code> variable allows you to resolve the contents of files using SVL, and is provided
-	by default using the built-in variable resolver returned by the <code>RestRequest</code> object.
+	The <c>$F</c> variable allows you to resolve the contents of files using SVL, and is provided
+	by default using the built-in variable resolver returned by the <c>RestRequest</c> object.
 	You've potentially just exposed the contents of that file through your REST interface.
 </p>
 <p>
@@ -29337,12 +29363,12 @@
 </p>
 <ul class='spaced-list'>
 	<li>
-		<code>Vars</code> have two methods {@link org.apache.juneau.svl.Var#allowNested()} and 
+		<c>Vars</c> have two methods {@link org.apache.juneau.svl.Var#allowNested()} and 
 		{@link org.apache.juneau.svl.Var#allowRecurse()} that can be overridden to prevent recursive processing
-		of string variables.  These are both <jk>false</jk> for the <code>$R</code> variable, so the <code>$F</code>
+		of string variables.  These are both <jk>false</jk> for the <c>$R</c> variable, so the <c>$F</c>
 		variable in the result will never get processed and instead be treated as plain text. 
 	<li>
-		The <code>$F</code> variable only allows you to retrieve files within the JVM starting directory. 
+		The <c>$F</c> variable only allows you to retrieve files within the JVM starting directory. 
 </ul>
 <p>
 	Even though the built-in Juneau variables are safe, special care is needed when defining your own custom
@@ -29481,16 +29507,16 @@
 	</li>
 	<li>
 		Simplified Filter API for handling non-standard POJOs.<br>
-		The API for handling non-standard POJOs has been simplified by introducing the concept of a <code><del>Transform</del></code> class, which is associated with the <code>BeanContext</code> class (and thus the Serializer and Parser classes too) through the <code>BeanContext.addTransforms(Class[])</code> method.<br>
-		Two new subclasses of <code><del>Transform</del></code>:
+		The API for handling non-standard POJOs has been simplified by introducing the concept of a <dc>Transform</dc> class, which is associated with the <c>BeanContext</c> class (and thus the Serializer and Parser classes too) through the <c>BeanContext.addTransforms(Class[])</c> method.<br>
+		Two new subclasses of <dc>Transform</dc>:
 		<ul>
 			<li>{@link org.apache.juneau.transform.BeanFilter} - Filter POJO beans.</li>
 			<li>{@link org.apache.juneau.transform.PojoSwap} - Filter POJOs that aren't beans.</li>
 		</ul>
-		This new API replaces the previous separate <code>Cast</code> and <code>BeanFilter</code> APIs which were considerably more complicated and puts them under a common API. 
+		This new API replaces the previous separate <c>Cast</c> and <c>BeanFilter</c> APIs which were considerably more complicated and puts them under a common API. 
 	</li>
 	<li>
-		Elimination of <code>_class</code> attributes in parsable output.<br>
+		Elimination of <c>_class</c> attributes in parsable output.<br>
 		One of the complaints about the previous version of JJSON was that if you wanted to have the resulting JSON or XML be parsable back into beans, you had to enable the <js>"addClassAttrs"</js> property on the bean map factory class so that <js>"_class"</js> attributes could be added to the output.<br>
 		This requirement is virtually eliminated in v5.  In many cases, the parsers are able to determine through reflection what the correct target type is based on the top-level class passed in on the parse method. 
 	</li>
@@ -29508,13 +29534,13 @@
 				The old XML parser was based on DOM.  The new XML parser uses a StAX parser which significantly reduces memory consumption.
 			</li>
 			<li>
-				Caching of reflection data in the <code>BeanMap</code> API.<br>
-				The number of reflection calls have been significantly reduced in the <code>BeanMap</code> API code.  
+				Caching of reflection data in the <c>BeanMap</c> API.<br>
+				The number of reflection calls have been significantly reduced in the <c>BeanMap</c> API code.  
 				Reflection is used to determine the class types of property values on beans.  
 				This information is now cached and persisted so that the reflection API calls to determine class types are only performed the first time a bean type is encountered.
    				</li>
    				<li>
-				Automatic support for GZIP compression/decompression in <code>RestServlets</code>.<br>
+				Automatic support for GZIP compression/decompression in <c>RestServlets</c>.<br>
 				This is completely transparent to the developer.  
 				The output writer is negotiated by the framework to automatically handle compression and charset requests without the developer needing to know anything about it.
 			</li>
@@ -29541,17 +29567,17 @@
 			</li>
 			<li>
 				Other improvments have been made in the area of automatic negotiation of input and output type streams.  
-				For example, automatic support is provided for GZIP (<code>Accept-Encoding: gzip</code>) and charsets (e.g <code>Accept-Charset: SJIS</code>) on both incoming and outgoing data.  
+				For example, automatic support is provided for GZIP (<c>Accept-Encoding: gzip</c>) and charsets (e.g <c>Accept-Charset: SJIS</c>) on both incoming and outgoing data.  
 				It's all transparent from a developers perspective.  
 				The developer simply working with POJOs, and all details about content types, encoding, charsets, and so forth are handled by the framework.
 			</li>
 			<li>
-				Support for generating complex <code>OPTIONS</code> pages for resources.
+				Support for generating complex <c>OPTIONS</c> pages for resources.
 			</li>
 		</ul>
 	</li>
 	<li>
-		Automatic support for SOAP XML output on <js>"text/soap+xml"</js> requests against <code>RestServlet</code>.
+		Automatic support for SOAP XML output on <js>"text/soap+xml"</js> requests against <c>RestServlet</c>.
 	</li>
 	<li>
 		Support for XML namespaces. 
@@ -29563,10 +29589,10 @@
 		Support for loading beans directly from Readers and Strings. 
 	</li>
 	<li>
-		Parsing support for POJOs of type <code>Enum</code>.
+		Parsing support for POJOs of type <c>Enum</c>.
 	</li>
 		<li>
-		Significant improved support for various flavors of parameterized types, such as subclasses of parameterized types (e.g. <code>MyBeanList <jk>extends</jk> LinkedList&lt;MyBean&gt;</code>).
+		Significant improved support for various flavors of parameterized types, such as subclasses of parameterized types (e.g. <c>MyBeanList <jk>extends</jk> LinkedList&lt;MyBean&gt;</c>).
 		</li>
 		<li>
 		Improved ordering of bean properties (should now be ordered as they are defined in the class).
@@ -29621,14 +29647,14 @@
 		Support for defining default XML namespaces on packages and classes for the XML and RDF serializers.
 	</li>
 	<li>
-		Restructured the packages along content type support (e.g. all JSON support moved to <code>org.apache.juneau.json</code>).
+		Restructured the packages along content type support (e.g. all JSON support moved to <c>org.apache.juneau.json</c>).
 	</li>
 	<li>
-		Automatic support for parsing maps with <code>Enum</code> keys, and parsing <code>Enum</code> strings.<br>
+		Automatic support for parsing maps with <c>Enum</c> keys, and parsing <c>Enum</c> strings.<br>
 		This was previously possible using filters, but now it's built-in for all the parsers.
 	</li>
 	<li> 
-		Replaced the <code>ObjectList.toXArray()</code> methods with a new <code>elements(Class&lt;T&gt; type)</code> method that's more efficient and avoids creating an unnecessary array.
+		Replaced the <c>ObjectList.toXArray()</c> methods with a new <c>elements(Class&lt;T&gt; type)</c> method that's more efficient and avoids creating an unnecessary array.
 	</li>
 	<li> 
 		Support for parsing into beans with read-only properties.<br>
@@ -29676,8 +29702,8 @@
 		See {@link org.apache.juneau.rest.RestServlet} for more information.
 	</li>
 	<li>
-		Enhancements to <code><del>BeanContext.convertToType(Object,Class)</del></code> to be able to convert <code>Strings</code> to classes with 
-		<code>fromString(String)</code>/<code>valueOf(String)</code> static methods or <code>T(String)</code> constructors.
+		Enhancements to <dc>BeanContext.convertToType(Object,Class)</dc> to be able to convert <c>Strings</c> to classes with 
+		<c>fromString(String)</c>/<c>valueOf(String)</c> static methods or <c>T(String)</c> constructors.
 	</li>	
 </ul>
 </div><!-- END: 5.0.0.4 -->
@@ -29690,10 +29716,10 @@
 	Juno 5.0.0.5 is a major update.
 </p>
 <ul class='spaced-list'>
-	<li>New <code><ja>@RestChild</ja></code> annotation for identifying child resources.</li>
+	<li>New <c><ja>@RestChild</ja></c> annotation for identifying child resources.</li>
 	<li>
-		New <code>traversable</code> and <code>filterable</code> attributes added to {@link org.apache.juneau.rest.annotation.RestMethod @RestMethod} annotation.<br>
-		Eliminates the need for <code>PojoResource</code> and <code>FilteredRestResource</code> classes.
+		New <c>traversable</c> and <c>filterable</c> attributes added to {@link org.apache.juneau.rest.annotation.RestMethod @RestMethod} annotation.<br>
+		Eliminates the need for <c>PojoResource</c> and <c>FilteredRestResource</c> classes.
 	</li>
 	<li>Simplified client API.  Easier to use when making multiple connections to the same server.</li>
 	<li>Support for pluggable authentication in the client API.</li>
@@ -29702,11 +29728,11 @@
 	<li>Support for parsing of header values into specific object types.</li>
 	<li>Changed default XML representation to not include JSON-type attributes.  Produces cleaner XML.</li>
 	<li>
-		New <code>resourceUri</code> attributed added to <ja>@Bean</ja> annotation to associate beans with resource URIs.
+		New <c>resourceUri</c> attributed added to <ja>@Bean</ja> annotation to associate beans with resource URIs.
 		<ul>
 			<li>Used for automatically creating hyperlinks in {@link org.apache.juneau.html.HtmlSerializer}.</li>
 			<li>Used for automatically creating <xa>uri</xa> attributes in {@link org.apache.juneau.xml.XmlSerializer}.</li>
-			<li>Used for automatically creating <xa>rdf:about</xa> attributes in <code>RdfXmlSerializer</code>.</li>
+			<li>Used for automatically creating <xa>rdf:about</xa> attributes in <c>RdfXmlSerializer</c>.</li>
 		</ul>
 	</li>	
 </ul>
@@ -29755,15 +29781,15 @@
 				Also allows you to collapse collections and arrays.
 			</li>
 			<li>
-				New <code>@Xml.namespaces</code> annotation.<br>
+				New <c>@Xml.namespaces</c> annotation.<br>
 				Namespaces can be defined at package, class, method, or field levels.
 			</li>
 			<li>
-				New <code>@Xml.nsUri</code> annotation.<br>
+				New <c>@Xml.nsUri</c> annotation.<br>
 				Shortcut for specifying namespace URIs.
 			</li>
 			<li>
-				New <code>@Xml.valAttr</code> annotation.<br>
+				New <c>@Xml.valAttr</c> annotation.<br>
 			Serializes a bean property value as an attribute.
 			</li>
 			<li>Ability to override XS and XSI namespaces on XML and RDF/XML serializers.</li>
@@ -29775,33 +29801,33 @@
 		New configurable property classes for everything are now structured better and easier to locate and identify through the following new classes:
 		<ul>
 			<li>{@link org.apache.juneau.BeanContext}</li>
-			<li><code><del>SerializerContext</del></code></li>
-			<li><code><del>ParserContext</del></code></li>
+			<li><dc>SerializerContext</dc></li>
+			<li><dc>ParserContext</dc></li>
 		</ul>		
 	</li>
 	<li>
 		Enhancements to {@link org.apache.juneau.BeanContext}:
 		<ul>
 			<li>
-				Ability to mark bean properties as hidden using <code>@BeanProperty(hidden)</code> so that they don't get serialized.
+				Ability to mark bean properties as hidden using <c>@BeanProperty(hidden)</c> so that they don't get serialized.
 			</li>
 			<li>
-				Simplified <code>ClassType</code> {@link org.apache.juneau.ClassMeta} API.<br>
+				Simplified <c>ClassType</c> {@link org.apache.juneau.ClassMeta} API.<br>
 				Combined 4 classes into a single class.
 			</li>
 			<li>
-				New <code><del>@Bean.filter</del></code> and <code><del>@BeanProperty.filter</del></code> annotations.<br>
-				Used for defining filters on bean classes and bean properties instead of just globally through <code>BeanContext.addTransforms(Class[])</code>.
+				New <dc>@Bean.filter</dc> and <dc>@BeanProperty.filter</dc> annotations.<br>
+				Used for defining filters on bean classes and bean properties instead of just globally through <c>BeanContext.addTransforms(Class[])</c>.
 			</li>
 			<li>
 				New {@link org.apache.juneau.PropertyNamer} API / {@link org.apache.juneau.annotation.Bean#propertyNamer() @Bean.propertyNamer} annotation.<br>
 				Used for customizing bean property names.
 			</li>
 			<li>
-				New <code><del>@BeanProperty.beanUri</del></code> and <code><del>@BeanProperty.id</del></code> annotations.<br>
+				New <dc>@BeanProperty.beanUri</dc> and <dc>@BeanProperty.id</dc> annotations.<br>
 				Used for associating beans with URLs and IDs.<br>
 				Used by XML serializer to add a url attribute on a bean element.<br>
-				Used by RDF/XML serializer to construct <code>rdf:resource</code> attributes.
+				Used by RDF/XML serializer to construct <c>rdf:resource</c> attributes.
 			</li>
 			<li>
 				New {@link org.apache.juneau.annotation.BeanProperty#properties() @BeanProperty(properties)} annotation.
@@ -29832,13 +29858,13 @@
 <h5 class='topic w800'>REST server updates</h5>
 <ul class='spaced-list'>
 		<li>
-		Support for overriding bean context and serializer properties in a REST method call through new <code><del>RestResponse.setProperty(String,Object)</del></code> method.<br>
+		Support for overriding bean context and serializer properties in a REST method call through new <dc>RestResponse.setProperty(String,Object)</dc> method.<br>
 		For example, allows you to control whitespace options on a per-request basis.
 	</li>
 	<li>
 		Several new annotations on REST servlets:
 		<ul>
-			<li><code>@RestResource(filters)</code> - Associate post-formatting filters on a resource level.</li>
+			<li><c>@RestResource(filters)</c> - Associate post-formatting filters on a resource level.</li>
 			<li>{@link org.apache.juneau.rest.annotation.RestResource#guards() @RestResource.guards} - Associate resource-level guards.</li>
 			<li>{@link org.apache.juneau.rest.annotation.RestResource#messages() @RestResource.messages} - Associate a resource bundle with a REST servlet.  Comes with several convenience methods for looking up messages for the client locale.</li>
 			<li>{@link org.apache.juneau.rest.annotation.RestResource#properties() @RestResource.properties} - Override default bean context, serializer, and parser properties though an annotation.</li>
@@ -29847,18 +29873,18 @@
 	<li>
 		Several new annotations on REST methods:
 		<ul>
-			<li><code>@RestMethod(filters)</code> - Associate post-formatting filters on a method level.</li>
+			<li><c>@RestMethod(filters)</c> - Associate post-formatting filters on a method level.</li>
 			<li>{@link org.apache.juneau.rest.annotation.RestMethod#guards() @RestMethod(guards)} - Associate method-level guards.</li>
 		</ul>
 	</li>
 	<li>				
 		New annotations on REST method parameters with automatic conversion:
 		<ul>
-			<li><code><del>@Attr</del></code> - A parameter or URL variable value as a parsed POJO.</li>
-			<li><code><del>@Param</del></code> - A query parameter value as a parsed POJO.</li>
-			<li><code><del>@PathRemainder</del></code>- The remainder after a URL pattern match as a String.</li>
-			<li><code><del>@Header</del></code> - An HTTP header value as a parsed POJO.</li>
-			<li><code><del>@Content</del></code> - The HTTP content as a parsed POJO.</li>
+			<li><dc>@Attr</dc> - A parameter or URL variable value as a parsed POJO.</li>
+			<li><dc>@Param</dc> - A query parameter value as a parsed POJO.</li>
+			<li><dc>@PathRemainder</dc>- The remainder after a URL pattern match as a String.</li>
+			<li><dc>@Header</dc> - An HTTP header value as a parsed POJO.</li>
+			<li><dc>@Content</dc> - The HTTP content as a parsed POJO.</li>
 			<li>{@link org.apache.juneau.rest.annotation.Method @Method} - The HTTP method name as a String.</li>
 		</ul>
 	</li>
@@ -29907,19 +29933,19 @@
 	</li>
 	<li>Support for fluent-style bean setters (setters that return the bean itself).</li>
 	<li>Ability to use {@link org.apache.juneau.annotation.Bean @Bean} annotation to override bean identification settings.</li>
-	<li>New {@link org.apache.juneau.ObjectMap#cast(Class)} method to convert <code>ObjectMaps</code> directly to beans.</li>
+	<li>New {@link org.apache.juneau.ObjectMap#cast(Class)} method to convert <c>ObjectMaps</c> directly to beans.</li>
 </ul>
 <h5 class='topic w800'>REST server API changes</h5>
 <ul class='spaced-list'>
-	<li>Build-in default <code>OPTIONS</code> pages.</li>
+	<li>Build-in default <c>OPTIONS</c> pages.</li>
 	<li>New {@link org.apache.juneau.rest.annotation.RestResource#defaultRequestHeaders() @RestResource.defaultRequestHeaders} and {@link org.apache.juneau.rest.annotation.RestResource#defaultResponseHeaders() @RestResource.defaultResponseHeaders} annotations.</li>
 	<li>New {@link org.apache.juneau.rest.annotation.RestMethod#serializers() @RestMethod(serializers)} and {@link org.apache.juneau.rest.annotation.RestMethod#parsers() @RestMethod(parsers)} annotations.</li>
 	<li>New {@link org.apache.juneau.rest.annotation.RestMethod#properties() @RestMethod(properties)} annotation.</li>
 	<li>New {@link org.apache.juneau.rest.annotation.RestMethod#defaultRequestHeaders() @RestMethod(defaultRequestHeaders)} annotation.</li>
 	<li>New {@link org.apache.juneau.rest.annotation.RestMethod#matchers() @RestMethod(matchers)} annotation and {@link org.apache.juneau.rest.RestMatcher} class.</li>
-	<li><code>Readers</code> and <code>InputStreams</code> can be specified on <code><del>@Content</del></code> annotated parameters.</li>
-	<li>New <code><del>@HasParam</del></code> annotation.</li>
-	<li>Full RFC2616 support for matching <code>Accept</code> headers to serializers.</li>		
+	<li><c>Readers</c> and <c>InputStreams</c> can be specified on <dc>@Content</dc> annotated parameters.</li>
+	<li>New <dc>@HasParam</dc> annotation.</li>
+	<li>Full RFC2616 support for matching <c>Accept</c> headers to serializers.</li>		
 </ul>
 <h5 class='topic w800'>Other notes</h5>
 <ul class='spaced-list'>
@@ -29941,13 +29967,13 @@
 </ul>
 <h5 class='topic w800'>REST server API changes</h5>
 <ul class='spaced-list'>
-	<li>New <code>RestServletProperties</code> class that defines all the class-level properties that can be set on the servlet.</li>
-	<li>Properties can be set through {@link org.apache.juneau.rest.annotation.RestResource#properties() @RestResource.properties} annotation, or new <code><del>RestServlet.setProperty(String,Object)</del></code> method.</li>
+	<li>New <c>RestServletProperties</c> class that defines all the class-level properties that can be set on the servlet.</li>
+	<li>Properties can be set through {@link org.apache.juneau.rest.annotation.RestResource#properties() @RestResource.properties} annotation, or new <dc>RestServlet.setProperty(String,Object)</dc> method.</li>
 	<li>New <js>"?noTrace"</js> URL parameter to prevent stack traces from being logged (for JUnit testing of error conditions).</li>
-	<li>New <code>RestServletProperties.REST_useStackTraceHashes</code> property to prevent the same stack trace from being logged multiple times.</li>
-	<li>New <code>RestServletProperties.REST_renderResponseStackTraces</code> property for preventing stack traces in responses for security reasons.</li>
-	<li>New overridable <code>RestServlet.onError(HttpServletRequest,HttpServletResponse,RestException,boolean)</code> and <code><del>RestServlet.onSuccess(RestRequest,RestResponse,long)</del></code> methods for plugging in your own logging and peformance monitoring.</li>
-	<li>Eliminated <code>RestServlet.getInitParams()</code> method, since it's now redundant with <code><del>RestServlet.getProperties()</del></code>.</li>
+	<li>New <c>RestServletProperties.REST_useStackTraceHashes</c> property to prevent the same stack trace from being logged multiple times.</li>
+	<li>New <c>RestServletProperties.REST_renderResponseStackTraces</c> property for preventing stack traces in responses for security reasons.</li>
+	<li>New overridable <c>RestServlet.onError(HttpServletRequest,HttpServletResponse,RestException,boolean)</c> and <dc>RestServlet.onSuccess(RestRequest,RestResponse,long)</dc> methods for plugging in your own logging and peformance monitoring.</li>
+	<li>Eliminated <c>RestServlet.getInitParams()</c> method, since it's now redundant with <dc>RestServlet.getProperties()</dc>.</li>
 	<li>Header parameters passed as URL parameters are now case-insensitive.</li>			
 </ul>
 </div><!-- END: 5.0.0.10 -->
@@ -29962,14 +29988,14 @@
 <h5 class='topic w800'>REST server API changes</h5>
 <ul class='spaced-list'>
 	<li>	
-		New <code>UrlEncodingRestSerializer</code> and <code>UrlEncodingRestParser</code> classes.<br>
+		New <c>UrlEncodingRestSerializer</c> and <c>UrlEncodingRestParser</c> classes.<br>
 		Allows parsing form posts directly to POJOs.
 	</li>
 	<li>
-		Support for <code>Accept</code> and <code>Content-Type</code> <js>"application/x-www-form-urlencoded"</js> added by default on {@link org.apache.juneau.rest.BasicRestServlet}.
+		Support for <c>Accept</c> and <c>Content-Type</c> <js>"application/x-www-form-urlencoded"</js> added by default on {@link org.apache.juneau.rest.BasicRestServlet}.
 	</li>
 	<li>
-		New <code><del>RestServlet.renderError(HttpServletRequest,HttpServletResponse,RestException)</del></code> method to allow customized handling of response errors.
+		New <dc>RestServlet.renderError(HttpServletRequest,HttpServletResponse,RestException)</dc> method to allow customized handling of response errors.
 	</li>
 </ul>
 </div><!-- END: 5.0.0.11 -->
@@ -29986,7 +30012,7 @@
 	<li>
 		Relaxed method naming conventions when using {@link org.apache.juneau.annotation.BeanProperty @BeanProperty} annotation.<br>
 		Methods with zero parameters are interpreted as getters, and methods with one parameter are interpreted as setters.<br>
-		Eliminated the <code>BeanProperty.method</code> annotation, since it's now unnecessary.
+		Eliminated the <c>BeanProperty.method</c> annotation, since it's now unnecessary.
 			</li>
 </ul>		
 <h5 class='topic w800'>REST server API changes</h5>
@@ -29996,15 +30022,15 @@
 		Older messages were rather cryptic.   Error conditions should be much easier to debug now.
 	</li>
 	<li>
-		New <code>PlainTextRestSerializer</code> class for serializing <js>"plain/text"</js> requests.<br>
+		New <c>PlainTextRestSerializer</c> class for serializing <js>"plain/text"</js> requests.<br>
 		Useful for debugging purposes.
 	</li>
    		<li>
-		<code>Readers</code> and <code>InputStreams</code> can now be passed in as <code><del>@Content</del></code> parameters if you need direct access to the HTTP body content without involving the parsers.<br> 
+		<c>Readers</c> and <c>InputStreams</c> can now be passed in as <dc>@Content</dc> parameters if you need direct access to the HTTP body content without involving the parsers.<br> 
 		Equivalent to previously calling {@link org.apache.juneau.rest.RestRequest#getInputStream()} and {@link org.apache.juneau.rest.RestRequest#getReader()}.
    		</li>
    		<li>
-		Improved support for the <code>?debug</code> parameter.<br>
+		Improved support for the <c>?debug</c> parameter.<br>
 		Dumps better information to the log file, such as all header parameters.
 	</li>
 </ul>
@@ -30027,19 +30053,19 @@
 		</ul>
 	</li>
 	<li>
-		New <code>SerializerContext.SERIALIZER_uriContext</code> and <code>SerializerContext.SERIALIZER_uriAuthority</code> serializer properties for specifying values for relative URIs.
+		New <c>SerializerContext.SERIALIZER_uriContext</c> and <c>SerializerContext.SERIALIZER_uriAuthority</c> serializer properties for specifying values for relative URIs.
    		</li>
    		<li>
-		New {@link org.apache.juneau.annotation.URI @URI} annotation that allows you to specify classes and bean properties as URLs that aren't <code>java.net.URI</code> or <code>java.net.URL</code>.
+		New {@link org.apache.juneau.annotation.URI @URI} annotation that allows you to specify classes and bean properties as URLs that aren't <c>java.net.URI</c> or <c>java.net.URL</c>.
 	</li>
 	<li>
 		New {@link org.apache.juneau.html.HtmlSerializer#HTML_uriAnchorText} HTML serializer property for tailoring how anchor text is rendered.
 	</li>
 	<li>
-		Renamed <code>BeanProperty#uri</code> annotation to <code>BeanProperty#beanUri</code> to make it clear that this property represents the URI of the bean itself instead of an arbitrary property containing a URI.
+		Renamed <c>BeanProperty#uri</c> annotation to <c>BeanProperty#beanUri</c> to make it clear that this property represents the URI of the bean itself instead of an arbitrary property containing a URI.
    		</li>
    		<li>
-		Removed <code>BeanProperty#id</code> annotation.
+		Removed <c>BeanProperty#id</c> annotation.
 	</li>
 </ul>
 <h5 class='topic w800'>REST server API changes</h5>
@@ -30047,13 +30073,13 @@
 	<li>
 		Improvements to {@link org.apache.juneau.rest.RestServlet} to automatically handle relative URIs in POJOs.
 		<ul>
-      			<li><code>SerializerContext.SERIALIZER_uriContext</code> property set by default to web app context root.</li>
-			<li><code>SerializerContext.SERIALIZER_uriAuthority</code> property set by default to the request scheme+hostname+port.</li>
+      			<li><c>SerializerContext.SERIALIZER_uriContext</c> property set by default to web app context root.</li>
+			<li><c>SerializerContext.SERIALIZER_uriAuthority</c> property set by default to the request scheme+hostname+port.</li>
        		</ul>
        	</li>
        	<li>
-		Fixed bug involving <code>Accept-Charset</code> header in Chrome that prevented HTML output from rendering correctly in that browser.<br>
-		<code>Accept-Charset</code> handling should now be fully W3C compliant.
+		Fixed bug involving <c>Accept-Charset</c> header in Chrome that prevented HTML output from rendering correctly in that browser.<br>
+		<c>Accept-Charset</c> handling should now be fully W3C compliant.
 	</li>
 </ul>
 </div><!-- END: 5.0.0.13 -->
@@ -30066,7 +30092,7 @@
 	Juno 5.0.0.14 is a major update.
 </p>
 <p>
-	The biggest change is that the <code>RestSerializer</code>, <code>RestParser</code>, <code>RestSerializerGroup</code>, and <code>RestParserGroup</code> classes have been eliminated entirely.<br>  
+	The biggest change is that the <c>RestSerializer</c>, <c>RestParser</c>, <c>RestSerializerGroup</c>, and <c>RestParserGroup</c> classes have been eliminated entirely.<br>  
 	Instead, the existing {@link org.apache.juneau.serializer.Serializer}, {@link org.apache.juneau.parser.Parser}, {@link org.apache.juneau.serializer.SerializerGroup}, and {@link org.apache.juneau.parser.ParserGroup} classes of the core API have been augmented to replace them.
 </p>
 <p>
@@ -30075,17 +30101,17 @@
 <h5 class='topic w800'>Core API changes</h5>
 <ul class='spaced-list'>
 	<li>
-		New <code>org.apache.juneau.serializer</code> package.
+		New <c>org.apache.juneau.serializer</c> package.
 		<ul>
 			<li>Entirely reworked class hierarchy to make it easier to define new serializers.</li>
 			<li>New {@link org.apache.juneau.serializer.WriterSerializer} base class for defining character-based serializers.</li>
 			<li>New {@link org.apache.juneau.serializer.OutputStreamSerializer} base class for defining byte-based serializers.</li>
-			<li>Updated {@link org.apache.juneau.serializer.SerializerGroup} class with full support for RFC2616 <code>Accept-Content</code> headers.</li>
+			<li>Updated {@link org.apache.juneau.serializer.SerializerGroup} class with full support for RFC2616 <c>Accept-Content</c> headers.</li>
 			<li>Improved cloning support on serializers and serializer groups.</li>
 		</ul>
        	</li>
        	<li>
-       		New <code>org.apache.juneau.parser</code> package.
+       		New <c>org.apache.juneau.parser</c> package.
        		<ul>
        			<li>Entirely reworked class hierarchy to make it easier to define new parsers.</li>
 			<li>New {@link org.apache.juneau.parser.ReaderParser} base class for defining character-based parsers.</li>
@@ -30094,38 +30120,38 @@
        		</ul>
        	</li>
        	<li>
-		New <code>org.apache.juneau.transform</code> package.
+		New <c>org.apache.juneau.transform</c> package.
 		<ul>
 			<li>Cleaner class structure.</li>
 			<li>Improved {@link org.apache.juneau.transform.BeanFilter} class for defining property filters on beans.</li>
-			<li>Improved {@link org.apache.juneau.utils.PojoQuery} class for defining filters on objects (previously called <code>ObjectFilter</code>).</li>
+			<li>Improved {@link org.apache.juneau.utils.PojoQuery} class for defining filters on objects (previously called <c>ObjectFilter</c>).</li>
        		</ul>
        	</li>
        	<li>
-		New <code>org.apache.juneau.encoders</code> package.
+		New <c>org.apache.juneau.encoders</c> package.
 		<ul>
 			<li>Defines API for {@link org.apache.juneau.encoders.Encoder Encoders} for enabling compression in REST servlets and clients.</li>
 			<li>Previously, gzip compression was enabled by default.  This new API allows you to plug in your own compression algorithms.</li>
 			<li>New {@link org.apache.juneau.encoders.GzipEncoder} class for enabling gzip compression.</li>
-			<li>New {@link org.apache.juneau.encoders.EncoderGroup} class for managing multiple encoders and finding them based on RFC2616 <code>Accept-Encoding</code> header values.</li>
+			<li>New {@link org.apache.juneau.encoders.EncoderGroup} class for managing multiple encoders and finding them based on RFC2616 <c>Accept-Encoding</c> header values.</li>
 		</ul>
 	</li>
 	<li>
-		New <code>org.apache.juneau.plaintext</code> package.
+		New <c>org.apache.juneau.plaintext</c> package.
 		<ul>
 			<li>New {@link org.apache.juneau.plaintext.PlainTextSerializer} and {@link org.apache.juneau.plaintext.PlainTextParser} classes for serializing/parsing text/plain content.</li>
 		</ul>
 	</li>
 	<li>
-		New <code>org.apache.juneau.jso</code> package.
+		New <c>org.apache.juneau.jso</c> package.
 		<ul>
-			<li>New {@link org.apache.juneau.jso.JsoSerializer} class for serializing <code>application/x-java-serialized-object</code> content.</li>
+			<li>New {@link org.apache.juneau.jso.JsoSerializer} class for serializing <c>application/x-java-serialized-object</c> content.</li>
 		</ul>
 	</li>
 	<li>
-		New <code>org.apache.juneau.soap</code> package.
+		New <c>org.apache.juneau.soap</c> package.
 		<ul>
-			<li>New {@link org.apache.juneau.soap.SoapXmlSerializer} class for serializing <code>text/xml+soap</code> content.</li>
+			<li>New {@link org.apache.juneau.soap.SoapXmlSerializer} class for serializing <c>text/xml+soap</c> content.</li>
 		</ul>
 	</li>
 	<li>
@@ -30135,16 +30161,16 @@
 		</ul>
 	</li>
        	<li>
-		<code>JsonMap</code> and <code>JsonList</code> changed to {@link org.apache.juneau.ObjectMap} and {@link org.apache.juneau.ObjectList} to better reflect that they're not limited to just JSON support.
+		<c>JsonMap</c> and <c>JsonList</c> changed to {@link org.apache.juneau.ObjectMap} and {@link org.apache.juneau.ObjectList} to better reflect that they're not limited to just JSON support.
    		</li>
    		<li>
-		Renamed <code>PojoSwap</code> to {@link org.apache.juneau.utils.PojoQuery} to not confuse it with the new Filter API.
+		Renamed <c>PojoSwap</c> to {@link org.apache.juneau.utils.PojoQuery} to not confuse it with the new Filter API.
 	</li>
 </ul>
 <h5 class='topic w800'>REST server API changes</h5>
 <ul class='spaced-list'>
 	<li>
-		Eliminated <code>org.apache.juneau.rest.serializers</code> and <code>org.apache.juneau.rest.parsers</code> packages.
+		Eliminated <c>org.apache.juneau.rest.serializers</c> and <c>org.apache.juneau.rest.parsers</c> packages.
 		<ul>
 			<li>All existing REST serializers and parsers merged into the core API.</li>
 		</ul>
@@ -30160,7 +30186,7 @@
 		</ul>
 	</li>
 	<li>
-		Eliminated <code>RestCmdLine</code> (since it's essentially redundant with CURL).
+		Eliminated <c>RestCmdLine</c> (since it's essentially redundant with CURL).
 	</li>
 </ul>
 </div><!-- END: 5.0.0.14 -->
@@ -30178,11 +30204,11 @@
 		Refer to <del>org.apache.juneau.rest.jaxrs</del> for information.
 	</li>
 	<li>
-		New <code><del>@Produces</del></code> annotation in place of <code>ISerializer.getMediaTypes()</code> for specifying what media types a serializer produces.<br>
+		New <dc>@Produces</dc> annotation in place of <c>ISerializer.getMediaTypes()</c> for specifying what media types a serializer produces.<br>
 		Available when subclassing from {@link org.apache.juneau.serializer.Serializer}.
 	</li>
 	<li>
-		New <code><del>@Consumes</del></code> annotation in place of <code>IParser.getMediaTypes()</code> for specifying what media types a parser consumes.<br>
+		New <dc>@Consumes</dc> annotation in place of <c>IParser.getMediaTypes()</c> for specifying what media types a parser consumes.<br>
 		Available when subclassing from {@link org.apache.juneau.parser.Parser}.
 	</li>
 </ul>
@@ -30197,7 +30223,7 @@
 </p>
 <ul class='spaced-list'>
 	<li>
-		New <code><del>@Properties</del></code> REST method parameter annotation that can be used to get the runtime properties map through a parameter instead of through {@link org.apache.juneau.rest.RestResponse}. 
+		New <dc>@Properties</dc> REST method parameter annotation that can be used to get the runtime properties map through a parameter instead of through {@link org.apache.juneau.rest.RestResponse}. 
 	</li>
 </ul>
 </div><!-- END: 5.0.0.16 -->
@@ -30211,7 +30237,7 @@
 </p>
 <ul class='spaced-list'>
 	<li>
-		Charset now passed as a parameter to <code>IOutputStreamSerializer.serialize()</code> and <code>IInputStreamParser.parse()</code>. 
+		Charset now passed as a parameter to <c>IOutputStreamSerializer.serialize()</c> and <c>IInputStreamParser.parse()</c>. 
 	</li>
 </ul>
 </div><!-- END: 5.0.0.17 -->
@@ -30228,10 +30254,10 @@
 </p>
 <p>
 	This code should be considered prototype-quality, and subject to change in the future.<br>  
-	There are plans of adding an equivalent <code>RdfParser</code> class in the future, so the serializer logic may need to be tweaked to allow POJOs to be reconstituted correctly in the parser.
+	There are plans of adding an equivalent <c>RdfParser</c> class in the future, so the serializer logic may need to be tweaked to allow POJOs to be reconstituted correctly in the parser.
 </p>
 <p>
-	The <code>RdfXmlSerializer</code> class should be considered deprecated for now.<br>  
+	The <c>RdfXmlSerializer</c> class should be considered deprecated for now.<br>  
 	However, I'm keeping it around, since it's considerably faster and uses far less memory than the Jena-based serializer since it serializes directly from POJOs to RDF/XML.<br> 
 	It may or may not be removed in the future depending on demand.
 </p>
@@ -30254,12 +30280,12 @@
 	<li>
 		New methods on {@link org.apache.juneau.rest.RestServlet}:
 		<ul>
-			<li><code><del>RestServlet.onPreCall(RestRequest)</del></code></li>
-			<li><code><del>RestServlet.onPostCall(RestRequest,RestResponse)</del></code></li>
+			<li><dc>RestServlet.onPreCall(RestRequest)</dc></li>
+			<li><dc>RestServlet.onPostCall(RestRequest,RestResponse)</dc></li>
 		</ul>
 	</li>
 	<li>
-		<jsf>TRIM_NULLS</jsf> setting changed to <code><del>SerializerContext.SERIALIZER_trimNullProperties</del></code>.<br>
+		<jsf>TRIM_NULLS</jsf> setting changed to <dc>SerializerContext.SERIALIZER_trimNullProperties</dc>.<br>
 		New property default is <jk>true</jk>. 
 		Only applies to bean properties, not map or collection entries.
 	</li>
@@ -30283,8 +30309,8 @@
 		New Jena-based {@link org.apache.juneau.jena.RdfParser} for parsing RDF/XML, RDF/XML-ABBREV, N3, Turtle, and N-Triple back into POJOs.
 	</li>
 	<li>
-		<code><del>XmlSerializerContext.XML_autoDetectNamespaces</del></code> default changed to <jk>true</jk>.<br>
-		The old default value would cause XML with unmapped namespaces if you didn't manually specify them via the <code><del>XmlSerializerContext.XML_namespaces</del></code> annotation.<br>
+		<dc>XmlSerializerContext.XML_autoDetectNamespaces</dc> default changed to <jk>true</jk>.<br>
+		The old default value would cause XML with unmapped namespaces if you didn't manually specify them via the <dc>XmlSerializerContext.XML_namespaces</dc> annotation.<br>
 		While setting the default to <jk>true</jk> is somewhat slower (since the serializer must crawl the POJO tree to find namespaces), the benefits of having it work out-of-the-box outweighs the performance concerns.<br>
 		For developers concerned about performance, they can always change it back to false and specify the namespaces themselves.	
 	</li>
@@ -30299,37 +30325,37 @@
 		Enhancements to {@link org.apache.juneau.rest.annotation.RestMethod @RestMethod} annotation:
 		<ul>
 			<li>
-				New <code>RestMethod.filters()</code> annotation for defining POJO filters at the method level.
+				New <c>RestMethod.filters()</c> annotation for defining POJO filters at the method level.
 			</li>
 			<li>
-				New <code><del>RestMethod.serializersInherit()</del></code> and <code><del>RestMethod.parsersInherit()</del></code> annotations for controlling how serializers and parsers (and associated filters and properties) are inherited from the class.<br>
-				This replaces the previous <code>addSerializers</code> and <code>addParsers</code> annotations.
+				New <dc>RestMethod.serializersInherit()</dc> and <dc>RestMethod.parsersInherit()</dc> annotations for controlling how serializers and parsers (and associated filters and properties) are inherited from the class.<br>
+				This replaces the previous <c>addSerializers</c> and <c>addParsers</c> annotations.
 		</ul>
 	</li>
 	<li>
-		New <code><del>RestServletJenaDefault</del></code> servlet that includes serialization/parsing support for all Jena-based serializers and parsers.
+		New <dc>RestServletJenaDefault</dc> servlet that includes serialization/parsing support for all Jena-based serializers and parsers.
 	</li>
 	<li>
-		New <code><del>DefaultJenaProvider</del></code> JAX-RS provider that includes serialization/parsing support for all Jena-based serializers and parsers.
+		New <dc>DefaultJenaProvider</dc> JAX-RS provider that includes serialization/parsing support for all Jena-based serializers and parsers.
 	</li>
 	<li>
-		Eliminated <code>RestServletChild</code> class.<br>  
+		Eliminated <c>RestServletChild</c> class.<br>  
 		It's redundant with the introduction of inheritable annotations.
 	</li>
 	<li>
 		New methods on {@link org.apache.juneau.rest.RestServlet}:
 		<ul>
-			<li><code>RestServlet.createConfigFactory()</code></li>
-			<li><code>RestServlet.createSerializers()</code></li>
-			<li><code>RestServlet.createParsers()</code></li>
+			<li><c>RestServlet.createConfigFactory()</c></li>
+			<li><c>RestServlet.createSerializers()</c></li>
+			<li><c>RestServlet.createParsers()</c></li>
 		</ul>
-		These augment the existing <code>getBeanContext()</code> / <code>getSerializers()</code> / <code>getParsers()</code> methods.		
+		These augment the existing <c>getBeanContext()</c> / <c>getSerializers()</c> / <c>getParsers()</c> methods.		
 	</li>
 </ul>
 <h5 class='topic w800'>REST client API changes</h5>
 <ul class='spaced-list'>
 	<li>
-		New <code>RestCall.setDateHeader(String,Object)</code> method for setting ISO8601 datetime headers.
+		New <c>RestCall.setDateHeader(String,Object)</c> method for setting ISO8601 datetime headers.
 	</li>
 </ul>
 </div><!-- END: 5.0.0.20 -->
@@ -30344,28 +30370,28 @@
 <h5 class='topic w800'>Core API changes</h5>
 <ul class='spaced-list'>
 	<li>
-		New <code><del>HtmlDocSerializerContext.HTMLDOC_navlinks</del></code> annotation for addint links to HTML page views.
+		New <dc>HtmlDocSerializerContext.HTMLDOC_navlinks</dc> annotation for addint links to HTML page views.
 	</li>
 	<li>
-		Renamed the properties in <code><del>HtmlDocSerializerContext</del></code> for clarity.
+		Renamed the properties in <dc>HtmlDocSerializerContext</dc> for clarity.
 	</li>
 </ul>		
 <h5 class='topic w800'>Servlet API changes</h5>
 <ul class='spaced-list'>
 	<li>
-		Added new <code>RestServlet.addDefaultProperties(ObjectMap,RestRequest)</code> method for programatically adding properties to the property map per request.
+		Added new <c>RestServlet.addDefaultProperties(ObjectMap,RestRequest)</c> method for programatically adding properties to the property map per request.
 	</li>
 	<li>
 		Added the following new properties in the properties map to make them easily available to serializers and parsers (since they don't have access to the HTTP request object).<br>  
-		Note that the <code>SerializerContext.SERIALIZER_uriAuthority</code> and <code>SerializerContext.SERIALIZER_uriContext</code> properties were previously available.
+		Note that the <c>SerializerContext.SERIALIZER_uriAuthority</c> and <c>SerializerContext.SERIALIZER_uriContext</c> properties were previously available.
 		<ul>
-			<li><code>RestServletProperties.REST_servletPath</code></li>
-			<li><code>RestServletProperties.REST_pathInfo</code></li>
-			<li><code>RestServletProperties.REST_method</code></li>
+			<li><c>RestServletProperties.REST_servletPath</c></li>
+			<li><c>RestServletProperties.REST_pathInfo</c></li>
+			<li><c>RestServletProperties.REST_method</c></li>
 		</ul>
 	</li>
 	<li>
-		Path variables annotated with <code><del>@Attr</del></code> are now automatically URL-decoded.
+		Path variables annotated with <dc>@Attr</dc> are now automatically URL-decoded.
 	</li>
 </ul>
 </div><!-- END: 5.0.0.21 -->
@@ -30380,14 +30406,14 @@
 <h5 class='topic w800'>Core API changes</h5>
 <ul class='spaced-list'>
 	<li>
-    	New <code><ja>@Property</ja>.nls()</code> annotation for specifying localized property values.<br>
+    	New <c><ja>@Property</ja>.nls()</c> annotation for specifying localized property values.<br>
     	For example, allows you to set the <jsf>HTMLDOC_title</jsf> and <jsf>HTMLDOC_description</jsf> properties to localized values pulled from a resource bundle.<br>
-    	See the <code>AddressBookResource</code> class for an example.
+    	See the <c>AddressBookResource</c> class for an example.
     </li>
 </ul>
 <h5 class='topic w800'>REST Servlet API changes</h5>
 <ul class='spaced-list'>
-	<li>Fix a bug where the <code>&amp;Content</code> query parameter was not always parsed correctly.</li>
+	<li>Fix a bug where the <c>&amp;Content</c> query parameter was not always parsed correctly.</li>
 </ul>
 </div><!-- END: 5.0.0.22 -->
 
@@ -30403,7 +30429,7 @@
 		Simplified {@link org.apache.juneau.dto.cognos Cognos} support.
 	</li>
 	<li>
-		Fixed bug where <code><ja>@Xml</ja></code> annotation was not being inherited by inner classes.
+		Fixed bug where <c><ja>@Xml</ja></c> annotation was not being inherited by inner classes.
 	</li>
 	<li>
 		Javadoc stylesheet improvements.
@@ -30423,15 +30449,15 @@
 	<li>
 		New support for {@link org.apache.juneau.dto.atom ATOM}.
 		<ul>
-			<li>New <code>AtomFeedResource</code> class added to sample war.
+			<li>New <c>AtomFeedResource</c> class added to sample war.
 		</ul>
 	</li>
 	<li>
-		New <code><del>XmlFormat.CONTENT</del></code> enum value.<br>
+		New <dc>XmlFormat.CONTENT</dc> enum value.<br>
 		Allows bean properties to be persisted as XML element text.
 	</li>
 	<li>
-		New <code><del>XmlContentHandler</del></code> class and <code><del>@Xml.contentHandler</del></code> annotation.<br>
+		New <dc>XmlContentHandler</dc> class and <dc>@Xml.contentHandler</dc> annotation.<br>
 		Allows customized serialization and parsing of beans to XML element text.<br>
 		Added for support of ATOM text content that must support both plain text and embedded XHTML.
 	</li>
@@ -30439,13 +30465,13 @@
 		New {@link org.apache.juneau.xml.annotation.XmlSchema @XmlSchema} and updated {@link org.apache.juneau.xml.annotation.XmlNs @XmlNs} annotations to better mimic JAXB.
 	</li>
 	<li>
-		Removed <code><ja>@Xml</ja>.valAttr</code> annotation since it's now redundant with <code><ja>@Xml</ja>(format=<jsf>CONTENT</jsf>)</code>.
+		Removed <c><ja>@Xml</ja>.valAttr</c> annotation since it's now redundant with <c><ja>@Xml</ja>(format=<jsf>CONTENT</jsf>)</c>.
 		</li>
 		<li>
 		Fixed timezone bug in {@link org.apache.juneau.transforms.CalendarSwap}.
 	</li>
 		<li>
-		Simplified <code>Serializer.serialize(Object,Object,SerializerContext)</code> method.
+		Simplified <c>Serializer.serialize(Object,Object,SerializerContext)</c> method.
 	</li>
 	<li>
 		Fixed bug where lists returned by {@link org.apache.juneau.ObjectMap#getObjectList(String)} were not updatable.
@@ -30476,7 +30502,7 @@
 		New {@link org.apache.juneau.dto.ResultSetList} DTO for serializing SQL result sets to JSON/XML/HTML and so forth.
 	</li>
 	<li>
-		New <code>SqlQueryResource</code> class in the sample war for demonstrating the <code>ResultSetList</code> DTO.
+		New <c>SqlQueryResource</c> class in the sample war for demonstrating the <c>ResultSetList</c> DTO.
 	</li>
 </ul>
 <h5 class='topic w800'>Server API updates</h5>
@@ -30485,10 +30511,10 @@
 		Fixed issue with media type for CSS files being reported as <js>"text/plain"</js> instead of <js>"text/css"</js>.
 	</li>
 	<li>
-		Moved initialization of class properties to before the call to <code>Servlet.init()</code> so that <code>getProperties()</code> can be called during servlet initialization.
+		Moved initialization of class properties to before the call to <c>Servlet.init()</c> so that <c>getProperties()</c> can be called during servlet initialization.
 	</li>
    		<li>
-  			New <code><ja>@Property</ja>.type</code> annotation with support for using system properties as resource properties.
+  			New <c><ja>@Property</ja>.type</c> annotation with support for using system properties as resource properties.
   		</li>
 </ul>
 </div><!-- END: 5.0.0.25 -->
@@ -30510,10 +30536,10 @@
 		Child resource paths are specified through {@link org.apache.juneau.rest.annotation.RestResource#path() @RestResource(path)}.
    		</li>
    		<li>
-   			New <code><del>ChildResourceDescriptions</del></code> bean for automatically generating the contents of router resource pages.
+   			New <dc>ChildResourceDescriptions</dc> bean for automatically generating the contents of router resource pages.
    		</li>
    		<li>
-		Changed <code><ja>@RestMethod</ja>.pattern()</code> to {@link org.apache.juneau.rest.annotation.RestMethod#path() @RestMethod(path)} for naming consistency.
+		Changed <c><ja>@RestMethod</ja>.pattern()</c> to {@link org.apache.juneau.rest.annotation.RestMethod#path() @RestMethod(path)} for naming consistency.
 	</li>
 </ul>
 </div><!-- END: 5.0.0.26 -->
@@ -30533,7 +30559,7 @@
   			{@link org.apache.juneau.rest.BasicRestServlet} now includes {@link org.apache.juneau.plaintext.PlainTextSerializer} and {@link org.apache.juneau.plaintext.PlainTextParser} for plain-text support.
   		</li>
   		<li>
-		Child resources now render on default <code>OPTIONS</code> pages through new method <code><del>ResourceOptions.getChildren()</del></code>.
+		Child resources now render on default <c>OPTIONS</c> pages through new method <dc>ResourceOptions.getChildren()</dc>.
 	</li>
 	<li>
 		Changes to {@link org.apache.juneau.urlencoding.UrlEncodingSerializer}/{@link org.apache.juneau.urlencoding.UrlEncodingParser} to reduce the need for quoted string values.<br>
@@ -30554,10 +30580,10 @@
 </p>
 <ul class='spaced-list'>
 	<li>
-		Fixes an <code>OutOfMemoryError</code> and performance issue caused by incorrect caching of class metadata. 
+		Fixes an <c>OutOfMemoryError</c> and performance issue caused by incorrect caching of class metadata. 
 	</li>
 	<li>
-		Added <code>WriterSerializer.serialize(Object,Writer)</code> convenience method for serializing directly to a writer.<br> 
+		Added <c>WriterSerializer.serialize(Object,Writer)</c> convenience method for serializing directly to a writer.<br> 
 		Applies to all serializers.
 	</li>
 </ul>
@@ -30575,8 +30601,8 @@
 		Revamped the API for filter support:
 		<ul>
 			<li>Updated {@link org.apache.juneau.transform.BeanFilter} class to mirror the {@link org.apache.juneau.annotation.Bean @Bean} annotation.</li>
-			<li>Introduced support for bean <code><del>Bean.subTypeProperty() subtypes</del></code>. </li>
-			<li>Replaced <code><ja>@Bean</ja>(filter=xxx)</code> with new <code><del>@Transform</del></code> annotation.</li>
+			<li>Introduced support for bean <dc>Bean.subTypeProperty() subtypes</dc>. </li>
+			<li>Replaced <c><ja>@Bean</ja>(filter=xxx)</c> with new <dc>@Transform</dc> annotation.</li>
 		</ul>
 	</li>
 	<li>
@@ -30594,8 +30620,8 @@
 	<li>
 		New predefined DateFilters with millisecond precision:
 		<ul>
-			<li><code>org.apache.juneau.transforms.DateSwap.ISO8601DTP</code></li>
-			<li><code>org.apache.juneau.transforms.DateSwap.ISO8601DTZP</code></li>
+			<li><c>org.apache.juneau.transforms.DateSwap.ISO8601DTP</c></li>
+			<li><c>org.apache.juneau.transforms.DateSwap.ISO8601DTZP</c></li>
 		</ul>
 	</li>
 </ul>
@@ -30610,7 +30636,7 @@
 </p>
 <ul class='spaced-list'>
 	<li> 
-		Fixed bug involving beans using <code><del>Bean.subTypes()</del></code> annotation in addition to <code>subTypes</code> property.
+		Fixed bug involving beans using <dc>Bean.subTypes()</dc> annotation in addition to <c>subTypes</c> property.
 	</li>
 	<li>
 		Modified the JSON parser to handle non-existent JSON values to get around an issue where Cognos was generating invalid JSON.
@@ -30653,21 +30679,21 @@
 <ul class='spaced-list'>
 	<li>
 		New support for generating and consuming fully-compliant JSON-Schema documents.<br>
-		See <code><del>org.apache.juneau.dto.jsonschema</del></code> for information.
+		See <dc>org.apache.juneau.dto.jsonschema</dc> for information.
 	</li>
 	<li>
 		New methods added to {@link org.apache.juneau.parser.Parser}:
 		<ul>
-			<li><code>org.apache.juneau.parser.Parser.parseMap(Object,int,Class,Class,Class)</code></li>
-			<li><code>org.apache.juneau.parser.Parser.parseCollection(Object,int,Class,Class)</code></li>
+			<li><c>org.apache.juneau.parser.Parser.parseMap(Object,int,Class,Class,Class)</c></li>
+			<li><c>org.apache.juneau.parser.Parser.parseCollection(Object,int,Class,Class)</c></li>
 		</ul>
 	</li>
 		<li>
 		{@link org.apache.juneau.annotation.Bean @Bean} annotation can now be defined on interfaces and inherited by subclasses.
 	</li>
 	<li>
-			Support for customizing serialized values for <code>Enums</code> through overriding <code>toString()</code> and <code>fromString()</code> on the enum class.<br>
-		Previously used <code>Enum.valueOf()</code> to convert strings back into <code>Enums</code>.<br>
+			Support for customizing serialized values for <c>Enums</c> through overriding <c>toString()</c> and <c>fromString()</c> on the enum class.<br>
+		Previously used <c>Enum.valueOf()</c> to convert strings back into <c>Enums</c>.<br>
 		Used for JSON-Schema support to allow {@link org.apache.juneau.dto.jsonschema.JsonType} enum to be serialized to lowercase per the specification (e.g. <js>"string"</js> instead of <js>"STRING"</js>).
 		</li>
 		<li>
@@ -30676,18 +30702,18 @@
 		<li>
 		Support for generic bean objects whose type was erased at compile time.<br> 
 		Previous behavior gave you an error message that the type could not be determined.<br>
-		New behavior assumes a type of <code>Object</code> when the type is erased.
+		New behavior assumes a type of <c>Object</c> when the type is erased.
 		</li>
 		<li>
 			Bug fixes:
 			<ul>
 				<li>
-				When duplicate fluent-style setters were defined with different parameter types (e.g. <code>setFoo(Foo f)</code>, <code>setFoo(Bar b)</code>), the {@link org.apache.juneau.BeanMap} API would sometime choose the wrong setter as the bean property setter. <br>
+				When duplicate fluent-style setters were defined with different parameter types (e.g. <c>setFoo(Foo f)</c>, <c>setFoo(Bar b)</c>), the {@link org.apache.juneau.BeanMap} API would sometime choose the wrong setter as the bean property setter. <br>
 				Now validates that the setter being chosen is the one whose return type matches the property getter.
 			</li>
 			<li>
-				Passing in <code>Accept</code> GET parameters with <js>'+'</js> (e.g. <code>&amp;Accept=text/json+simple</code>) wasn't working anymore.<br>
-				The <code>Accept</code> parameter is supposed to interpret spaces as <js>'+'</js> to allow you to not have to write <code>&amp;Accept=text/json%2Bsimple</code>.
+				Passing in <c>Accept</c> GET parameters with <js>'+'</js> (e.g. <c>&amp;Accept=text/json+simple</c>) wasn't working anymore.<br>
+				The <c>Accept</c> parameter is supposed to interpret spaces as <js>'+'</js> to allow you to not have to write <c>&amp;Accept=text/json%2Bsimple</c>.
 				</li>
 				<li>
 				Parsers would not set bean properties of abstract type {@link java.lang.Number}.<br> 
@@ -30711,7 +30737,7 @@
 		<ul>
 			<li>
 				Many of the examples in the documentation were written as follows, which resulted in "unchecked" compile warnings:<br>
-				<code>WriterSerializer s = <jk>new</jk> JsonSerializer();</code><br>
+				<c>WriterSerializer s = <jk>new</jk> JsonSerializer();</c><br>
 				These compile warnings will now go away.
 			</li>
 		</ul>
@@ -30726,36 +30752,36 @@
 		</ul>
 	</li>
 	<li>
-		Eliminated <code>addNotBeanClassPatterns(String...)</code> methods throughout API since these are now controlled by {@link org.apache.juneau.BeanContext#BEAN_notBeanPackages_add} / {@link org.apache.juneau.BeanContext#BEAN_notBeanPackages_remove} properties.
+		Eliminated <c>addNotBeanClassPatterns(String...)</c> methods throughout API since these are now controlled by {@link org.apache.juneau.BeanContext#BEAN_notBeanPackages_add} / {@link org.apache.juneau.BeanContext#BEAN_notBeanPackages_remove} properties.
 	</li>
 	<li>
-		New settings in <code>RestServletProperties</code>.
+		New settings in <c>RestServletProperties</c>.
 		<ul>
-			<li><code>RestServletProperties.REST_trimTrailingUriSlashes</code><br>
-				Also removed <code>RestRequest.getRequestURI(boolean trimTrailingSlashes)</code> method which is now redundant with this property.
-			<li><code>RestServletProperties.REST_pathInfoBlankForNull</code><br>
-				Also removed <code>RestRequest.getPathInfo(boolean returnBlankForNull)</code> method which is now redundant with this property.
+			<li><c>RestServletProperties.REST_trimTrailingUriSlashes</c><br>
+				Also removed <c>RestRequest.getRequestURI(boolean trimTrailingSlashes)</c> method which is now redundant with this property.
+			<li><c>RestServletProperties.REST_pathInfoBlankForNull</c><br>
+				Also removed <c>RestRequest.getPathInfo(boolean returnBlankForNull)</c> method which is now redundant with this property.
 		</ul>
 	</li>
 	<li>
 		New JSON-Schema {@link org.apache.juneau.dto.jsonschema.JsonSchemaMap} class for supporting linked schemas.
 	</li>
 	<li>
-		Serializers will no longer throw an exception when <code>maxDepth</code> setting is reached, and will instead simply ignore content below the specified depth.<br>
+		Serializers will no longer throw an exception when <c>maxDepth</c> setting is reached, and will instead simply ignore content below the specified depth.<br>
 		While the old behavior was as-designed, the new behavior is more in-line with expected behavior.
 	</li>
 	<li>
 		Added support for HTTP header <js>"X-Response-Headers"</js> to {@link org.apache.juneau.rest.RestServlet}. <br>
 		Allows you to specify one or more headers that should be returned on the response from the servlet.<br>
-		For example, to get a page to automatically refresh every 1 second, you can append the following to a URL:  <code>?x-response-headers={Refresh=1}</code>
+		For example, to get a page to automatically refresh every 1 second, you can append the following to a URL:  <c>?x-response-headers={Refresh=1}</c>
 	</li>
 	<li>
-		Removed <code>HtmlDocSerializerContext.<jsf>HTML_REFRESH</jsf></code> setting that added a Refresh meta tag to HTML documents, since this can now be controlled through <code>X-Response-Headers</code>.
+		Removed <c>HtmlDocSerializerContext.<jsf>HTML_REFRESH</jsf></c> setting that added a Refresh meta tag to HTML documents, since this can now be controlled through <c>X-Response-Headers</c>.
 	</li>
 	<li>
 		Small improvements to samples.
 		<ul>
-			<li><code>PhotosResource</code> now includes a default entry.
+			<li><c>PhotosResource</c> now includes a default entry.
 		</ul>
 	</li>
 </ul>
@@ -30784,7 +30810,7 @@
 		}
 	)
 		</p>
-		See <code>RestServlet.createRequestVarResolver(RestRequest)</code> for more information.
+		See <c>RestServlet.createRequestVarResolver(RestRequest)</c> for more information.
 	</li>
 	<li>
 		 Eliminated <ja>@Property.type</ja> annotation which was the old way of specifying NLS variables that got resolved at runtime.
@@ -30792,42 +30818,42 @@
 	<li>
 		New methods on {@link org.apache.juneau.rest.RestRequest}:
 		<ul>
-			<li><code><del>RestRequest.getVarResolver()</del></code></li>
-			<li><code><del>RestRequest.getServletURI()</del></code></li>
-			<li><code><del>RestRequest.getRequestParentURI()</del></code></li>
+			<li><dc>RestRequest.getVarResolver()</dc></li>
+			<li><dc>RestRequest.getServletURI()</dc></li>
+			<li><dc>RestRequest.getRequestParentURI()</dc></li>
 		</ul>
 	</li>
 	<li>
 		New methods on {@link org.apache.juneau.rest.RestResponse}:
 		<ul>
-			<li><code>RestResponse.sendRedirect(CharSequence)</code>
+			<li><c>RestResponse.sendRedirect(CharSequence)</c>
 		</ul>
 	</li>
 	<li>
 		New methods on {@link org.apache.juneau.rest.RestServlet} that allow easier customization by subclasses:
 		<ul>
-			<li><code><del>RestServlet.createConfigFactory()</del></code></li>
-			<li><code><del>RestServlet.createConverters()</del></code></li>
-			<li><code><del>RestServlet.createDefaultRequestHeaders()</del></code></li>
-			<li><code><del>RestServlet.createDefaultResponseHeaders()</del></code></li>
-			<li><code><del>RestServlet.createEncoders()</del></code></li>
-			<li><code><del>RestServlet.createFilters()</del></code></li>
-			<li><code><del>RestServlet.createGuards()</del></code></li>
-			<li><code><del>RestServlet.createMimetypesFileTypeMap()</del></code></li>
-			<li><code><del>RestServlet.createParsers()</del></code></li>
-			<li><code><del>RestServlet.createProperties()</del></code></li>
-			<li><code><del>RestServlet.createRequestProperties(ObjectMap,RestRequest)</del></code></li>
-			<li><code><del>RestServlet.createRequestVarResolver(RestRequest)</del></code></li>
-			<li><code><del>RestServlet.createSerializers()</del></code></li>
-			<li><code><del>RestServlet.createUrlEncodingParser()</del></code></li>
+			<li><dc>RestServlet.createConfigFactory()</dc></li>
+			<li><dc>RestServlet.createConverters()</dc></li>
+			<li><dc>RestServlet.createDefaultRequestHeaders()</dc></li>
+			<li><dc>RestServlet.createDefaultResponseHeaders()</dc></li>
+			<li><dc>RestServlet.createEncoders()</dc></li>
+			<li><dc>RestServlet.createFilters()</dc></li>
+			<li><dc>RestServlet.createGuards()</dc></li>
+			<li><dc>RestServlet.createMimetypesFileTypeMap()</dc></li>
+			<li><dc>RestServlet.createParsers()</dc></li>
+			<li><dc>RestServlet.createProperties()</dc></li>
+			<li><dc>RestServlet.createRequestProperties(ObjectMap,RestRequest)</dc></li>
+			<li><dc>RestServlet.createRequestVarResolver(RestRequest)</dc></li>
+			<li><dc>RestServlet.createSerializers()</dc></li>
+			<li><dc>RestServlet.createUrlEncodingParser()</dc></li>
 		</ul>
 	</li>
 	<li>
-		Changed <code>RestServletNls</code> to use <code>ResourceDescription/MethodDescription</code>
-			instead of <code>RestResource/RestMethod</code>
+		Changed <c>RestServletNls</c> to use <c>ResourceDescription/MethodDescription</c>
+			instead of <c>RestResource/RestMethod</c>
 	</li>
 	<li>
-		New property <code>RestServletProperties.REST_htDocsFolder</code>.<br>
+		New property <c>RestServletProperties.REST_htDocsFolder</c>.<br>
 		New support for serving up static documents from classpath through REST interface.
 	</li>
 	<li>
@@ -30837,13 +30863,13 @@
 		New {@link org.apache.juneau.annotation.Bean#stopClass @Bean.stopClass} annotation for specifying stop classes for bean properties.
 	</li>
 	<li>
-		New <code><del>BeanFilter.setStopClass(Class)</del></code> which is the program equivalent to the annotation above.
+		New <dc>BeanFilter.setStopClass(Class)</dc> which is the program equivalent to the annotation above.
 	</li>
 	<li>
 		New methods on {@link org.apache.juneau.dto.ResultSetList}:
 		<ul>
-			<li><code>ResultSetList.handleBlob(Blob)</code></li>
-			<li><code>ResultSetList.handleClob(Clob)</code></li>
+			<li><c>ResultSetList.handleBlob(Blob)</c></li>
+			<li><c>ResultSetList.handleClob(Clob)</c></li>
 		</ul>
 </ul>
 </div><!-- END: 5.0.0.34 -->
@@ -30869,13 +30895,13 @@
 	Juno 5.0.0.36 is a minor update.
 </p>
 <ul class='spaced-list'>
-	<li>Implemented <code>org.apache.juneau.urlencoding.UrlEncodingParser.parseArgs(Reader,int,ClassMeta[])</code>.
-	<li><code>name</code> parameter of <code><del>ResourceDescription#ResourceDescription(String,String,String)</del></code>. 
+	<li>Implemented <c>org.apache.juneau.urlencoding.UrlEncodingParser.parseArgs(Reader,int,ClassMeta[])</c>.
+	<li><c>name</c> parameter of <dc>ResourceDescription#ResourceDescription(String,String,String)</dc>. 
 		is now automatically URL-encoded so that the name can contain special characters (e.g. <js>"foo/bar(baz)"</js>).
 	<li>Support for URL-matching and path info containing encoded characters (e.g. <js>'/'</js>) now supported.	
 	<li>Removed some lazy-initialization of bean information in {@link org.apache.juneau.ClassMeta} that allowed the removal of
 		some synchronized blocks.
-	<li>Improved support of <code><del>BeanContext.getClassMetaFromString(String)</del></code>.
+	<li>Improved support of <dc>BeanContext.getClassMetaFromString(String)</dc>.
 		Now supports primitive arrays such as <js>"long[]"</js> in addition to the previous support for the equivalent <js>"[J"</js>.
 	<li>Various new convenience methods added to {@link org.apache.juneau.internal.StringUtils} and {@link org.apache.juneau.internal.ClassUtils}.
 </ul>
@@ -30891,48 +30917,48 @@
 <h5 class='topic w800'>Major changes</h5>
 <ul class='spaced-list'>
 	<li>Brand new REST client API that uses Apache HttpClient for HTTP communication.<br>
-		The new client API is simply a thin layer on top of <code>HttpClient</code> that performs 
+		The new client API is simply a thin layer on top of <c>HttpClient</c> that performs 
 		serialization and parsing using Juno parsers, but leaves all the details of the HTTP connection
 		to the Apache code. <br>
 		See the <del>org.apache.juneau.rest.client</del> package for details.
-	<li>New <code>org.apache.juneau.rest.client.jazz</code> package and <code>org.apache.juneau.rest.client.jazz.JazzRestClient</code> class
+	<li>New <c>org.apache.juneau.rest.client.jazz</c> package and <c>org.apache.juneau.rest.client.jazz.JazzRestClient</c> class
 		for performing REST operations against Jazz servers.<br>
 		Includes improved support for FORM authentication, and better SSL certificate validation.
 	<li>Completely redesigned URL-Encoding support.<br>
-		See <code><del>org.apache.juneau.urlencoding</del></code> package for details. 
+		See <dc>org.apache.juneau.urlencoding</dc> package for details. 
 	<li>Changes to Parser API.
 	<ul>
-		<li>Removal of <code>ExtendedReaderParser</code> abstract class and moved methods into 
+		<li>Removal of <c>ExtendedReaderParser</c> abstract class and moved methods into 
 			{@link org.apache.juneau.parser.ReaderParser} class.  
-		<li>Removal of <code>DataFormat</code> class from API since it was no longer necessary
+		<li>Removal of <c>DataFormat</c> class from API since it was no longer necessary
 			due to API change above.
-		<li>Removal of <code>ParserStringReader</code> class.<br>
-			This was a reader optimized to work with <code>String</code> input.<br>
+		<li>Removal of <c>ParserStringReader</c> class.<br>
+			This was a reader optimized to work with <c>String</c> input.<br>
 			However, it could interfere with garbage collection of the original string object.<br>
 			Instead, the existing {@link org.apache.juneau.parser.ParserReader} was enhanced to work
-			well with <code>String</code> input, and tests show no significant performance differences.
-		<li>New <code>org.apache.juneau.parser.Parser.parse(Object,int,ClassMeta)</code> convenience method added.
+			well with <c>String</c> input, and tests show no significant performance differences.
+		<li>New <c>org.apache.juneau.parser.Parser.parse(Object,int,ClassMeta)</c> convenience method added.
 	</ul>
 </ul>	
 <h5 class='topic w800'>Other changes</h5>
 <ul class='spaced-list'>
 	<li>Various new methods added to {@link org.apache.juneau.internal.StringUtils} and {@link org.apache.juneau.internal.ClassUtils}.
-	<li>Improved support on <code><del>BeanContext.getClassMetaFromString(String)</del></code>.<br>
-		Now supports resolving <code>"long[]"</code>, and so forth.
-	<li><code><del>ResourceDescription</del></code> name parameter is now automatically URL-encoded in links.
+	<li>Improved support on <dc>BeanContext.getClassMetaFromString(String)</dc>.<br>
+		Now supports resolving <c>"long[]"</c>, and so forth.
+	<li><dc>ResourceDescription</dc> name parameter is now automatically URL-encoded in links.
 	<li>{@link org.apache.juneau.rest.RestRequest} now correctly handles cases involving URL-encoded characters in the 
-		path info portion of URLs (e.g. <code>http://host/contextRoot/foo%2Fbar</code>).
+		path info portion of URLs (e.g. <c>http://host/contextRoot/foo%2Fbar</c>).
 	<li>Removed lazy-initialization that required locking in {@link org.apache.juneau.ClassMeta}.  
-	<li>New <code>BeanContext.setDefaultParser(ReaderParser)</code> method added for specifying 
-		a default parser to use in a bean context (used when converting beans to <code>Strings</code> using 
-		<code><del>BeanContext.convertToType(Object,Class)</del></code>.
+	<li>New <c>BeanContext.setDefaultParser(ReaderParser)</c> method added for specifying 
+		a default parser to use in a bean context (used when converting beans to <c>Strings</c> using 
+		<dc>BeanContext.convertToType(Object,Class)</dc>.
 		Old behavior simply used the default JSON serializer in these cases.
 	<li>More consistent handling of exceptions across all parsers.
 	<li>Minor changes to {@link org.apache.juneau.rest.RestRequest} class.
 	<ul>
-		<li>Changed the order of parameters on <code><del>RestRequest#getParameter(String,Class)</del></code>.
-		<li>Added <code>RestRequest.getMapParameter(String,Class,Class,Class)</code> and 
-			<code>RestRequest.getCollectionParameter(String,Class,Class)}</code> methods.
+		<li>Changed the order of parameters on <dc>RestRequest#getParameter(String,Class)</dc>.
+		<li>Added <c>RestRequest.getMapParameter(String,Class,Class,Class)</c> and 
+			<c>RestRequest.getCollectionParameter(String,Class,Class)}</c> methods.
 	</ul>
 </ul>
 </div><!-- END: 5.1.0.0 -->
@@ -30953,8 +30979,8 @@
 	<li>Fixed bug involving incorrect resolution of overlapping URL match patterns.
 	<li>Overall improvements in HTTP request parameter and header value resolution.  
 	<li>Made workspace changes so as not to be dependent on the WAS test environment being loaded.
-	<li>Renamed <ja>@Remainder</ja> annotation to <code><del>@PathRemainder</del></code>.
-	<li>Fixed bug involving incorrect calculation of <code>pathInfo</code> on child resources.
+	<li>Renamed <ja>@Remainder</ja> annotation to <dc>@PathRemainder</dc>.
+	<li>Fixed bug involving incorrect calculation of <c>pathInfo</c> on child resources.
 </ul>
 </div><!-- END: 5.1.0.1 -->
 
@@ -30966,11 +30992,11 @@
 	Juno 5.1.0.2 is a minor update.
 </p>
 <ul class='spaced-list'>
-	<li>Fixed issue preventing <code>&amp;Accept-Language</code> from being used as a GET parameter.  
+	<li>Fixed issue preventing <c>&amp;Accept-Language</c> from being used as a GET parameter.  
 	<li>Minor XSS vulnerability fix.
 	<li>Empty results on HTML pages now shows <js>"no results"</js> instead of a blank page.
 	<li>Fixed issues preventing REST pages from rendering HTML in newer versions of Internet Explorer.
-	<li>Changed <code>RestServletProperties.REST_allowMethodParam</code> to be disabled by default.  
+	<li>Changed <c>RestServletProperties.REST_allowMethodParam</c> to be disabled by default.  
 </ul>
 </div><!-- END: 5.1.0.2 -->
 
@@ -30991,16 +31017,16 @@
 			<li>{@link org.apache.juneau.BeanContext#BEAN_beanFieldVisibility} - Control which fields are visible to Juno as bean properties.
 			<li>{@link org.apache.juneau.BeanContext#BEAN_beanMethodVisibility} - Control which getters/setters are visible to Juno as bean properties.
 		</ul>
-		Removed <code>BeanContext.<jsf>INCLUDE_BEAN_FIELD_PROPERTIES</jsf></code> and <code>BeanContext.<jsf>INCLUDE_BEAN_METHOD_PROPERTIES</jsf></code> properties, since ignoring fields and methods
+		Removed <c>BeanContext.<jsf>INCLUDE_BEAN_FIELD_PROPERTIES</jsf></c> and <c>BeanContext.<jsf>INCLUDE_BEAN_METHOD_PROPERTIES</jsf></c> properties, since ignoring fields and methods
 		can be accomplished by setting the appropriate properties above to {@link org.apache.juneau.Visibility#NONE NONE}.
 		Also, the {@link org.apache.juneau.annotation.BeanProperty @BeanProperty} annotation can now be used on non-public fields/getters/setters to override
-		the default behavior defined by the <code>VISIBILITY</code> properties identified above.  This is a convenient way of identifying protected or
+		the default behavior defined by the <c>VISIBILITY</c> properties identified above.  This is a convenient way of identifying protected or
 		private fields or methods as bean properties.  Previously, you could only identify public fields/getters/setters using this annotation.
 	</li>
-	<li>New {@link org.apache.juneau.BeanContext#BEAN_useJavaBeanIntrospector} property that lets Juno use the Java bean <code>Introspector</code>
+	<li>New {@link org.apache.juneau.BeanContext#BEAN_useJavaBeanIntrospector} property that lets Juno use the Java bean <c>Introspector</c>
 		class to determine bean properties.  In the previous release, the method for determining bean properties was a mixture of Juno-based and Introspector-based.
 		Now it's either pure Juno-based or pure Introspector-based.  The result is considerably cleaner code and consistent behavior.
-	<li>New {@link org.apache.juneau.annotation.BeanIgnore @BeanIgnore} annotation.  Replaces the previous <code><ja>@BeanProperty</ja>(hidden=<jk>true</jk>)</code> annotation
+	<li>New {@link org.apache.juneau.annotation.BeanIgnore @BeanIgnore} annotation.  Replaces the previous <c><ja>@BeanProperty</ja>(hidden=<jk>true</jk>)</c> annotation
 		for ignoring bean properties.  Can also be used on classes that look like beans so that they're not treated as beans.
 	<li>Support for parsing into non-static member classes.  This applies to all parsers.
 	<li>New {@link org.apache.juneau.json.annotation.Json#wrapperAttr() @Json(wrapperAttr)}	annotation that automatically wraps beans and objects in a wrapper
@@ -31008,11 +31034,11 @@
 	<li>Changed the default ordering of bean properties to be in parent-to-child class order.
 	<li>New {@link org.apache.juneau.transform.BeanFilter#readProperty(Object,String,Object) readProperty()} and {@link org.apache.juneau.transform.BeanFilter#writeProperty(Object,String,Object) writeProperty()}
 		methods added to {@link org.apache.juneau.transform.BeanFilter} class to allow individualized serialization and parsing behavior on a class-by-class basis.
-	<li>Eliminated previous restriction where bean subtype attributes had to be listed first in JSON objects when using the <code><del>Bean.subTypeProperty()</del></code> annotation.
+	<li>Eliminated previous restriction where bean subtype attributes had to be listed first in JSON objects when using the <dc>Bean.subTypeProperty()</dc> annotation.
 		The previous behavior was not strictly JSON-compliant since JSON objects are supposed to consist of unordered lists of key/value pairs.
 		While targeted for JSON, the restriction is also lifted for all other parsers.  	
 	<li>New fluent-style {@link org.apache.juneau.BeanMap#load(String) BeanMap.load()} methods for initializing bean maps.
-	<li>{@link org.apache.juneau.html.HtmlDocSerializer} will now embed the data portion of the output in a <code><xt>&lt;div</xt> <xa>id</xa>=<xs>'data'</xs><xt>&gt;</xt></code> element to make it easier to extract the data portion of the page in Javascript in browsers.
+	<li>{@link org.apache.juneau.html.HtmlDocSerializer} will now embed the data portion of the output in a <c><xt>&lt;div</xt> <xa>id</xa>=<xs>'data'</xs><xt>&gt;</xt></c> element to make it easier to extract the data portion of the page in Javascript in browsers.
 </ul>
 
 <h5 class='topic w800'>REST Server API updates</h5>
@@ -31020,7 +31046,7 @@
 	<li>New {@link org.apache.juneau.rest.RestRequest#getJavaMethod()} method for getting access to the method used to handle a request.
 		Useful for accessing the method name or annotations during requests, such as in calls to {@link org.apache.juneau.rest.RestGuard#guard(RestRequest,RestResponse)}.
 	<li>Fixed bug when using Jetty where you tried to read text input after a header was written.
-	<li>Added new string variables <code><del>$A{...}</del></code> (request attributes) and <code><del>$P{...}</del></code> (request parameters) to <code>RestServlet.createRequestVarResolver(RestRequest)</code>.
+	<li>Added new string variables <dc>$A{...}</dc> (request attributes) and <dc>$P{...}</dc> (request parameters) to <c>RestServlet.createRequestVarResolver(RestRequest)</c>.
 </ul>
 </div><!-- END: 5.1.0.3 -->
 
@@ -31033,15 +31059,15 @@
 </p>
 
 <ul class='spaced-list'>
-	<li>New <code><del>RestServlet.getPath()</del></code> method.
-	<li>New <code>SerializerContext.getJavaMethod()</code> and <code>ParserContext.getJavaMethod()</code>
+	<li>New <dc>RestServlet.getPath()</dc> method.
+	<li>New <c>SerializerContext.getJavaMethod()</c> and <c>ParserContext.getJavaMethod()</c>
 			to allow access to REST methods that invoked the serializers or parsers.
 		For example, can be used to access additional annotations on REST methods to perform special handing
 			during serialization or parsing.
-	<li>Better behavior on overriding of filters in <code>BeanContext.addTransforms(Class[])</code>.
+	<li>Better behavior on overriding of filters in <c>BeanContext.addTransforms(Class[])</c>.
 		Previously, adding multiple conflicting filters resulted in random behavior.  
 		Now filters are overridden when multiple matching filters are applied.
-	<li>Allow <code><del>HtmlDocSerializerContext</del></code> properties to be set via <code><del>Serializer.setProperty(String,Object)</del></code>.
+	<li>Allow <dc>HtmlDocSerializerContext</dc> properties to be set via <dc>Serializer.setProperty(String,Object)</dc>.
 		Previously, these could only be defined through override properties (e.g. through REST class and method annotations).
 	<li>Fixed memory leak in XML parser.	
 </ul>
@@ -31055,20 +31081,20 @@
 	Juno 5.1.0.5 is a moderate update.
 </p>
 <ul class='spaced-list'>
-	<li>New <code><del>Redirect</del></code> class that simplifies performing redirections in REST methods.
+	<li>New <dc>Redirect</dc> class that simplifies performing redirections in REST methods.
 	<li>New pluggable {@link org.apache.juneau.rest.ResponseHandler} class and {@link org.apache.juneau.rest.annotation.RestResource#responseHandlers() @RestResource(responseHandlers)} annotation
 		for defining customer response handlers for special kinds of POJOs.
-	<li>New method <code><del>UrlEncodingSerializer.serializeUrlPart(Object)</del></code> method.
-	<li>New method <code><del>RestRequest.getServletURIBuilder()</del></code> for construcing servlet-based URLs more efficiently.
+	<li>New method <dc>UrlEncodingSerializer.serializeUrlPart(Object)</dc> method.
+	<li>New method <dc>RestRequest.getServletURIBuilder()</dc> for construcing servlet-based URLs more efficiently.
 	<li>New method {@link org.apache.juneau.rest.RestResponse#getNegotiatedOutputStream()} that uses encoders if a match is found, 
 		and {@link org.apache.juneau.rest.RestResponse#getOutputStream()} that just return the underlying output stream without any modifications.
-	<li>Fixed bug where some properties were not being propagated correctly when using <code><del>CoreObject.setProperties(ObjectMap)</del></code>
+	<li>Fixed bug where some properties were not being propagated correctly when using <dc>CoreObject.setProperties(ObjectMap)</dc>
 		on serializer and parser subclasses.
 	<li>Fixed bug in {@link org.apache.juneau.html.HtmlSerializer} where URL keys in Maps were not being serialized as hyperlinks.
 	<li>Fixed bug in {@link org.apache.juneau.json.JsonSerializer} where <js>"_class"</js> and <js>"items"</js> attributes were not quoted in strict mode when using SERIALIZER_addClassAttrs feature.	
-	<li>Fixed bug where <code>Content-Encoding</code> and<code>Character-Encoding</code> headers were being set when calling {@link org.apache.juneau.rest.RestResponse#getOutputStream()}.
+	<li>Fixed bug where <c>Content-Encoding</c> and<c>Character-Encoding</c> headers were being set when calling {@link org.apache.juneau.rest.RestResponse#getOutputStream()}.
 		These should not be set if interacting with the output streams at a low level.
-	<li>Eliminated various convenience <code>RestResponse.sendRedirect(...)</code> methods due to the introduction of the <code><del>Redirect</del></code> class.
+	<li>Eliminated various convenience <c>RestResponse.sendRedirect(...)</c> methods due to the introduction of the <dc>Redirect</dc> class.
 </ul>
 </div><!-- END: 5.1.0.5 -->
 
@@ -31081,16 +31107,16 @@
 </p>
 <ul class='spaced-list'>
 	<li>Simplified API for {@link org.apache.juneau.transform.PojoSwap}.  
-		Since it's rarely used, the <code>beanContext</code> parameter was replaced with a <code><del>PojoSwap#getBeanContext()</del></code> method on
+		Since it's rarely used, the <c>beanContext</c> parameter was replaced with a <dc>PojoSwap#getBeanContext()</dc> method on
 		the class.
 	<li>New simplified way of defining POJO filters without needing to extend {@link org.apache.juneau.transform.PojoSwap}.
 		See {@link org.apache.juneau.transform.SurrogateSwap} for details.
 	<li>New {@link org.apache.juneau.html.annotation.Html @Html} annotation.
 		Will allow the definition of standard XHTML DTOs in future releases.  
-		For now, <code><del>Img</del></code> is an example of defining an XHTML element using Juno DTOs.
-	<li>{@link org.apache.juneau.json.JsonParser} now ignores trailing <code>';'</code> characters in input so that it can 
+		For now, <dc>Img</dc> is an example of defining an XHTML element using Juno DTOs.
+	<li>{@link org.apache.juneau.json.JsonParser} now ignores trailing <c>';'</c> characters in input so that it can 
 		parse strings of the form <js>"var x = {'foo':'bar'};"</js>.
-	<li>New <code>TumblrParserResource</code> in the samples war file showing how to combine the REST client and server APIs into a single
+	<li>New <c>TumblrParserResource</c> in the samples war file showing how to combine the REST client and server APIs into a single
 		resource in order to download Tumblr blogs and convert the response into any supported response content type.
 </ul>
 </div><!-- END: 5.1.0.6 -->
@@ -31104,19 +31130,19 @@
 </p>
 <ul class='spaced-list'>
 	<li>Improved error handling.  
-	<li>New <code><del>ParserContext.PARSER_debug</del></code> and <code><del>SerializerContext.SERIALIZER_debug</del></code>.
+	<li>New <dc>ParserContext.PARSER_debug</dc> and <dc>SerializerContext.SERIALIZER_debug</dc>.
 		settings for logging additional information for debugging problems.
-	<li>New <code><del>SERIALIZER_ignoreRecursions</del></code> setting for explicitly ignoring recursions when 
+	<li>New <dc>SERIALIZER_ignoreRecursions</dc> setting for explicitly ignoring recursions when 
 		serializing models.  Previously, the <jsf>SERIALIZER_detectRecursions</jsf> setting did this, but now it simply looks for recursions 
 		and throws exceptions when they occur.
-	<li>Improved handling of <code>StackOverflowErrors</code>.  When <jsf>SERIALIZER_detectRecursions</jsf> is enabled, a useful error message
+	<li>Improved handling of <c>StackOverflowErrors</c>.  When <jsf>SERIALIZER_detectRecursions</jsf> is enabled, a useful error message
 		is displayed showing the exact chain of objects that resulted in the stack overflow.
 	<li>Bug fixes in {@link org.apache.juneau.dto.ResultSetList} for Oracle and SQL Server.
-	<li>Serializers and parsers can now access HTTP request attributes, parameters, and headers through <code>SerializerContext.getProperties()</code> and
-		<code>ParserContext.getProperties()</code>.		
-	<li>Removed media-type and encoding attributes from <code><del>SerializerContext</del></code> and <code><del>ParserContext</del></code>	
+	<li>Serializers and parsers can now access HTTP request attributes, parameters, and headers through <c>SerializerContext.getProperties()</c> and
+		<c>ParserContext.getProperties()</c>.		
+	<li>Removed media-type and encoding attributes from <dc>SerializerContext</dc> and <dc>ParserContext</dc>	
 		since these are now available through context properties, and are typically not used.
-	<li>{@link org.apache.juneau.xml.XmlParser} now accepts <code>application/xml</code>.		
+	<li>{@link org.apache.juneau.xml.XmlParser} now accepts <c>application/xml</c>.		
 	<li>Improved handling of bean property serialization when multiple matching pojo filters for the bean property class exist.
 	<li>Improved concurrency on BeanContext class.
 	<li>Fixed bug in {@link org.apache.juneau.rest.converters.Traversable} that was causing it to be executed even if the servlet extra path info was empty.
@@ -31137,23 +31163,23 @@
 			<li>Rewrote {@link org.apache.juneau.parser.ParserReader} class to handle it's own buffering.
 				The change allowed several optimizations to be made when dealing with JSON and URL-Encoding
 				text by avoiding char array copies.  
-			<li>Added a <code>estimatedSize</code> parameter to the {@link org.apache.juneau.parser.Parser} parse methods to 
+			<li>Added a <c>estimatedSize</c> parameter to the {@link org.apache.juneau.parser.Parser} parse methods to 
 				optimize buffering when the input size is known beforehand.
 		</ul>
 	</li>
 	<li>Revamped the {@link org.apache.juneau.BeanContext} API to perform better in multi-threaded environments.
 		<ul>
-			<li>Introduced a new <code>BeanPropertyStore</code> class that handles creation of {@link org.apache.juneau.BeanContext} objects.
-				This allows <code>BeanContext</code> objects to be considered immutable, and therefore cacheable/reusable by the framework.
+			<li>Introduced a new <c>BeanPropertyStore</c> class that handles creation of {@link org.apache.juneau.BeanContext} objects.
+				This allows <c>BeanContext</c> objects to be considered immutable, and therefore cacheable/reusable by the framework.
 				While this was technically possible to cache these objects beforehand, it relied on a locking mechanism to prevent bean contexts
 					from being modified after being created.  The new mechanism is much more straightforward.
 		</ul>
 	</li>
 	<li>Modifications to the <del>org.apache.juneau.rest.client</del> APIs to make it easier to work with custom Apache HTTP clients.
 		<ul>
-			<li>Added overridable <code><del>RestClient#createHttpClient()</del></code> to allow customized subclasses to construct customized HTTP clients.
-			<li>Removed the <code>DefaultRestClient</code> class since it's now fully redundant with <code>RestClient</code>.
-			<li>Added <code>RestClient.shutdown()</code> method for cleaning up the internal HTTP client when you're done using a REST client.
+			<li>Added overridable <dc>RestClient#createHttpClient()</dc> to allow customized subclasses to construct customized HTTP clients.
+			<li>Removed the <c>DefaultRestClient</c> class since it's now fully redundant with <c>RestClient</c>.
+			<li>Added <c>RestClient.shutdown()</c> method for cleaning up the internal HTTP client when you're done using a REST client.
 		</ul>
 	</li>
 </ul>
@@ -31173,20 +31199,20 @@
 <ul class='spaced-list'>
 	<li>Project split up into 3 separate bundles:
 		<ul>
-			<li><code>org.apache.juneau</code> - Core serializers and parsers.
-			<li><code>org.apache.juneau.rest</code> - REST server component.
-			<li><code>org.apache.juneau.rest.client</code> - REST client component.
+			<li><c>org.apache.juneau</c> - Core serializers and parsers.
+			<li><c>org.apache.juneau.rest</c> - REST server component.
+			<li><c>org.apache.juneau.rest.client</c> - REST client component.
 		</ul>
 	<li>Code changes to facilitate breaking up bundles:
 		<ul>
-			<li><code>org.apache.juneau.rest.labels.Link</code> class moved to <code><del>Link</del></code>.
-			<li>References to <code>org.apache.juneau.rest.RestException</code> in {@link org.apache.juneau.encoders.Encoder} class changed to <code>IOException</code>.
+			<li><c>org.apache.juneau.rest.labels.Link</c> class moved to <dc>Link</dc>.
+			<li>References to <c>org.apache.juneau.rest.RestException</c> in {@link org.apache.juneau.encoders.Encoder} class changed to <c>IOException</c>.
 		</ul>
 	<li>Changed configuration names for consistency with Jazz Framework.
 	<li>New {@link org.apache.juneau.rest.client.RestClient#execute(HttpUriRequest)} method that allows subclasses to handle their own HTTP request execution.
-	<li>Changes in <code>JazzRestClient</code> to handle introduction of SSO support in v6.
-	<li><code>&amp;plainText</code> debug feature was broken.
-	<li>Removed double-buffering in <code>RestRequest</code>.
+	<li>Changes in <c>JazzRestClient</c> to handle introduction of SSO support in v6.
+	<li><c>&amp;plainText</c> debug feature was broken.
+	<li>Removed double-buffering in <c>RestRequest</c>.
 	<li>Metadata cleanup, Find Bug fixes.
 </ul>
 </div><!-- END: 5.1.0.9 -->
@@ -31207,50 +31233,50 @@
 			<li>Logic for serializing and parsing URL-Encoded values moved to new {@link org.apache.juneau.uon.UonSerializer} and {@link org.apache.juneau.uon.UonParser} classes.
 		</ul>
 	</li>
-	<li>Fix bug where <code>BeanRuntimeExceptions</code> weren't being thrown on subsequent calls to {@link org.apache.juneau.BeanContext#getClassMeta(Class)}.
-	<li>Moved logic for <code>BeanContext.getPrimitiveDefault(Class)</code> to new {@link org.apache.juneau.ClassMeta#getPrimitiveDefault()} method for performance reasons.
-	<li>Fixed bug in <code><del>BeanContext.addTransforms(Class[])</del></code> that would cause filter order to get messed up.
+	<li>Fix bug where <c>BeanRuntimeExceptions</c> weren't being thrown on subsequent calls to {@link org.apache.juneau.BeanContext#getClassMeta(Class)}.
+	<li>Moved logic for <c>BeanContext.getPrimitiveDefault(Class)</c> to new {@link org.apache.juneau.ClassMeta#getPrimitiveDefault()} method for performance reasons.
+	<li>Fixed bug in <dc>BeanContext.addTransforms(Class[])</dc> that would cause filter order to get messed up.
 	<li>{@link org.apache.juneau.ClassMeta#newInstance()} can now create array instances.
 	<li>Fixed indentation bugs in {@link org.apache.juneau.html.HtmlSerializer}.
 	<li>Fixed issue in {@link org.apache.juneau.html.HtmlSerializer} where newlines were not being converted into line breaks.
-	<li>New {@link org.apache.juneau.serializer.WriterSerializer#toString(Object)} method that's identical to the serialize method but throws <code>RuntimeExceptions</code> to make the serializer easier to use for debugging.
+	<li>New {@link org.apache.juneau.serializer.WriterSerializer#toString(Object)} method that's identical to the serialize method but throws <c>RuntimeExceptions</c> to make the serializer easier to use for debugging.
 </ul>
 
 <h5 class='topic w800'>Server</h5>		
 <ul class='spaced-list'>
 	<li>Fixed major issue that prevented parsing URL-Encoded form posts into POJOs.
-		Calling <code><del>HttpServlet.getParameter(String)</del></code> was forcing the underlying servlet code to process the HTTP body itself, preventing the <code>UrlEncodingSerializer</code>
+		Calling <dc>HttpServlet.getParameter(String)</dc> was forcing the underlying servlet code to process the HTTP body itself, preventing the <c>UrlEncodingSerializer</c>
 		class from being able to parse the content.  Updated code no longer inadvertantly calls this method.
-	<li>New <code><del>RestRequest.getQueryParameter(String)</del></code>, <code><del>RestRequest.hasQueryParameter(String)</del></code>, and <code><del>RestRequest.hasAnyQueryParameters(String[])</del></code>
+	<li>New <dc>RestRequest.getQueryParameter(String)</dc>, <dc>RestRequest.hasQueryParameter(String)</dc>, and <dc>RestRequest.hasAnyQueryParameters(String[])</dc>
 		methods that only look for parameters in the URL query string to prevent loading and parsing of URL-Encoded form posts.
-	<li>New <code><del>@QParam</del></code> and <code><del>@HasQParam</del></code> annotations for accessing query parameters from the URL query string.
-	<li><code>&amp;plainText</code> parameter can now specify a false value.
-	<li>Removed properties parameters from <code><del>RestServlet.onPreCall(RestRequest)</del></code> and <code><del>RestServlet#onPostCall(RestRequest,RestResponse)</del></code> methods
-		since the properties are already accessible through <code>RestRequest.getProperties()</code>.
+	<li>New <dc>@QParam</dc> and <dc>@HasQParam</dc> annotations for accessing query parameters from the URL query string.
+	<li><c>&amp;plainText</c> parameter can now specify a false value.
+	<li>Removed properties parameters from <dc>RestServlet.onPreCall(RestRequest)</dc> and <dc>RestServlet#onPostCall(RestRequest,RestResponse)</dc> methods
+		since the properties are already accessible through <c>RestRequest.getProperties()</c>.
 	<li>Added {@link org.apache.juneau.uon.UonSerializer} and {@link org.apache.juneau.uon.UonParser} to serializer and parser lists on 
-		{@link org.apache.juneau.rest.BasicRestServlet} and <code><del>RestServletJenaDefault</del></code>.
+		{@link org.apache.juneau.rest.BasicRestServlet} and <dc>RestServletJenaDefault</dc>.
 </ul>
 
 <h5 class='topic w800'>Client</h5>		
 <ul class='spaced-list'>
 	<li>Moved to Apache HttpClient 4.3 to match Jazz 6.0.
-	<li>Renamed <code>RestResponseEntity</code> to {@link org.apache.juneau.rest.client.RestRequestEntity}.
+	<li>Renamed <c>RestResponseEntity</c> to {@link org.apache.juneau.rest.client.RestRequestEntity}.
 	<li>Improved performance on URL-Encoded form posts by serializing directly to output stream instead of serialized to string first.
 	<li>New methods on {@link org.apache.juneau.rest.client.RestClient} class that makes it easier to associate serializer and parser attributes with registered serializer and parser:
 		<ul>
-			<li><code><del>RestClient#setProperty(String,Object)</del></code>			
-			<li><code><del>RestClient#setProperties(ObjectMap)</del></code>	
-			<li><code><del>RestClient#addNotBeanClasses(Class[])</del></code>		
-			<li><code><del>RestClient.addTransforms(Class[])</del></code>		
-			<li><code><del>RestClient#addImplClass(Class,Class)</del></code>	
+			<li><dc>RestClient#setProperty(String,Object)</dc>			
+			<li><dc>RestClient#setProperties(ObjectMap)</dc>	
+			<li><dc>RestClient#addNotBeanClasses(Class[])</dc>		
+			<li><dc>RestClient.addTransforms(Class[])</dc>		
+			<li><dc>RestClient#addImplClass(Class,Class)</dc>	
 		</ul>
-	<li>Renamed <code>RestClient.shutdown()</code> to {@link org.apache.juneau.rest.client.RestClient#close()} to mirror change in Apache API.		
+	<li>Renamed <c>RestClient.shutdown()</c> to {@link org.apache.juneau.rest.client.RestClient#close()} to mirror change in Apache API.		
 </ul>
 
 <h5 class='topic w800'>Samples</h5>		
 <ul class='spaced-list'>
-	<li>New <code>CodeFormatterResource</code> for quickly formatting Java and XML code samples in Javadocs.
-	<li>New <code>UrlEncodedFormResource</code> for showing how to work with URL-Encoded form posts.
+	<li>New <c>CodeFormatterResource</c> for quickly formatting Java and XML code samples in Javadocs.
+	<li>New <c>UrlEncodedFormResource</c> for showing how to work with URL-Encoded form posts.
 </ul>
 </div><!-- END: 5.1.0.10 -->
 
@@ -31275,19 +31301,19 @@
 	<li>Several improvements to URL-Encoding support.
 		<ul>
 			<li>Improved whitespace handling in {@link org.apache.juneau.uon.UonParser}.
-			<li>New <code><del>UonParserContext.UON_whitespaceAware</del></code> property for controlling whether whitespace is ignored.
-			<li>New <code><del>UrlEncodingContext.URLENC_expandedParams</del></code> property for controlling whether arrays/Collections 
+			<li>New <dc>UonParserContext.UON_whitespaceAware</dc> property for controlling whether whitespace is ignored.
+			<li>New <dc>UrlEncodingContext.URLENC_expandedParams</dc> property for controlling whether arrays/Collections 
 				should be serialized/parsed as multi-part parameters.
 			<li>New {@link org.apache.juneau.urlencoding.annotation.UrlEncoding#expandedParams() @UrlEncoding(expandedParams)}
-				annotation that specifies that bean properties of type array/Collection be serialized as multi-part parameters (e.g. <code>&amp;key=val1&amp;key=val2</code>).
+				annotation that specifies that bean properties of type array/Collection be serialized as multi-part parameters (e.g. <c>&amp;key=val1&amp;key=val2</c>).
 		</ul>
 	</li>
-	<li>New <code><del>JsonSerializerContext.JSON_escapeSolidus</del></code> property for controlling whether slash characters should be escaped.
+	<li>New <dc>JsonSerializerContext.JSON_escapeSolidus</dc> property for controlling whether slash characters should be escaped.
 	<li>New {@link org.apache.juneau.internal.TeeOutputStream} and {@link org.apache.juneau.internal.TeeWriter} classes.
 	<li>New {@link org.apache.juneau.ClassMeta#isInstance(Object)} method.
 	<li>Performance improvements when using the {@link org.apache.juneau.BeanMap#add(String,Object)} method.  
 		Array properties are stored in a temporary list cache until {@link org.apache.juneau.BeanMap#getBean()} is called.
-	<li>New <code><del>BeanPropertyMeta.add(BeanMap,Object)</del></code> method for adding values to Collection and array properties.
+	<li>New <dc>BeanPropertyMeta.add(BeanMap,Object)</dc> method for adding values to Collection and array properties.
 	<li>Config INI files now support keys with name <js>"*"</js>.
 </ul>
 
@@ -31295,50 +31321,50 @@
 <ul class='spaced-list'>
 	<li>REST method parameters can now be generic types (e.g. <del><ja>@Param</ja>(<js>"foo"</js>) Map&lt;String,Integer&gt; foo</del>).
 		This applies to headers, attributes, and parameters.
-	<li>New <code><del>@Param(multipart)</del></code>
-		and <code><del>@Query(multipart)</del></code> annotations
+	<li>New <dc>@Param(multipart)</dc>
+		and <dc>@Query(multipart)</dc> annotations
 		for handling multi-part GET and POST parameters.	
 	<li>GET parameters are now CASE-SENSITIVE per W3C standards.
 		<ul>
 			<li>
-			<li><code>&amp;Content</code> must now be specified as <code>&amp;content</code>.
-			<li><code>&amp;Method</code> must now be specified as <code>&amp;method</code>.
-			<li><code>&amp;debug</code> must now be specified as <code>&amp;debug=true</code>.
-			<li><code>&amp;plainText</code> must now be specified as <code>&amp;plainText=true</code>.
-			<li><code>&amp;notrace</code> must now be specified as <code>&amp;noTrace=true</code>.
+			<li><c>&amp;Content</c> must now be specified as <c>&amp;content</c>.
+			<li><c>&amp;Method</c> must now be specified as <c>&amp;method</c>.
+			<li><c>&amp;debug</c> must now be specified as <c>&amp;debug=true</c>.
+			<li><c>&amp;plainText</c> must now be specified as <c>&amp;plainText=true</c>.
+			<li><c>&amp;notrace</c> must now be specified as <c>&amp;noTrace=true</c>.
 		</ul>
 	</li>
 	<li>Performance improvements around query parameters.
 	<li>New methods on {@link org.apache.juneau.rest.RestRequest} for handling multi-part parameters:
 		<ul>
-			<li><code><del>RestRequest.getParameters(String,Class)</del></code>
-			<li><code><del>RestRequest#getQueryParameters(String,Class)</del></code>
+			<li><dc>RestRequest.getParameters(String,Class)</dc>
+			<li><dc>RestRequest#getQueryParameters(String,Class)</dc>
 		</ul>
 	</li>
 	<li>Fixed Jetty issue in {@link org.apache.juneau.rest.RestResponse#setHeader(String,String)} where setting 
-		the <code>Content-Type</code> through this method was inconsistent with the behavior in WAS/Tomcat.
-	<li><code>&amp;noTrace=true</code> now prevents any errors from being logged in log file.
-	<li>Workaround for Jetty issue where <code>ServletContext.getContextPath()</code> always ends with <js>"null"</js>.
-	<li><code>RestServletProperties.REST_allowMethodParam</code> is now <jk>true</jk> by default on all subclasses 
-		of {@link org.apache.juneau.rest.BasicRestServlet} and <code><del>RestServletJenaDefault</del></code>.
+		the <c>Content-Type</c> through this method was inconsistent with the behavior in WAS/Tomcat.
+	<li><c>&amp;noTrace=true</c> now prevents any errors from being logged in log file.
+	<li>Workaround for Jetty issue where <c>ServletContext.getContextPath()</c> always ends with <js>"null"</js>.
+	<li><c>RestServletProperties.REST_allowMethodParam</c> is now <jk>true</jk> by default on all subclasses 
+		of {@link org.apache.juneau.rest.BasicRestServlet} and <dc>RestServletJenaDefault</dc>.
 </ul>
 		
 <h5 class='topic w800'>Client</h5>		
 <ul class='spaced-list'>
 	<li>New method {@link org.apache.juneau.rest.client.RestCall#allowRedirectsOnPosts(boolean)}.
-	<li>New method <code>RestCall.peekInputStream()</code> allows you to read response bodies without interrupting execution flow.
+	<li>New method <c>RestCall.peekInputStream()</c> allows you to read response bodies without interrupting execution flow.
 	<li>New method {@link org.apache.juneau.rest.client.RestCall#toString()} now useful for debugging purposes.  
 		Shows all request/response headers and bodies.
-	<li>{@link org.apache.juneau.rest.client.RestCallException} now includes <code>HttpResponse</code> object for easier debugging.
-	<li>New method <code>RestClient.addListener(RestClientListener)</code> for registering request/response listeners.
-	<li>New <code><del>RestClient.setClassLoader(ClassLoader)</del></code> method.
-	<li>TLS support in <code>JazzRestClient</code>.
+	<li>{@link org.apache.juneau.rest.client.RestCallException} now includes <c>HttpResponse</c> object for easier debugging.
+	<li>New method <c>RestClient.addListener(RestClientListener)</c> for registering request/response listeners.
+	<li>New <dc>RestClient.setClassLoader(ClassLoader)</dc> method.
+	<li>TLS support in <c>JazzRestClient</c>.
 </ul>
 
 <h5 class='topic w800'>Other changes</h5>	
 <ul class='spaced-list'>
-	<li><code>samples.ear</code> and <code>samples.war</code> projects
-		have been replaced with an OSGi bundle with activated servlets in <code>juno.samples</code>.
+	<li><c>samples.ear</c> and <c>samples.war</c> projects
+		have been replaced with an OSGi bundle with activated servlets in <c>juno.samples</c>.
 </ul>
 </div><!-- END: 5.1.0.11 -->
 
@@ -31352,16 +31378,16 @@
 
 <h5 class='topic w800'>Core</h5>		
 <ul class='spaced-list'>
-	<li>Fixed <code><del>ConfigFile.isEmpty()</del></code> method.
+	<li>Fixed <dc>ConfigFile.isEmpty()</dc> method.
 	<li>Changed behavior on {@link org.apache.juneau.uon.UonParser} to not treat <js>'~'</js> characters as escapes
-		unless followed by one of the following characters:  <code>( ) , $ = ~</code>.
+		unless followed by one of the following characters:  <c>( ) , $ = ~</c>.
 </ul>
 
 <h5 class='topic w800'>Client</h5>		
 <ul class='spaced-list'>
 	<li>New class {@link org.apache.juneau.rest.client.RestCallInterceptor}.  
 		Allows responses to be inspected and modified before being processed.  
-		Replaces <code>RestClientListener</code> class.
+		Replaces <c>RestClientListener</c> class.
 	<li>Minor connection cleanup fixes.
 </ul>
 </div><!-- END: 5.1.0.12 -->
@@ -31377,13 +31403,13 @@
 <h5 class='topic w800'>Core</h5>		
 <ul class='spaced-list'>
 	<li>{@link org.apache.juneau.ClassMeta#newInstance()} method can now create new instances of arrays.
-	<li>Arguments passed to <code><del>Link</del></code> are now serialized using {@link org.apache.juneau.urlencoding.UrlEncodingSerializer}, so arbitrary POJOs can now be passed as arguments.
-	<li>New date filters:  <code>org.apache.juneau.transforms.Datefilter.ISO8601DTZP</code> and <code>org.apache.juneau.transforms.Datefilter.SimpleP</code>.
-	<li>New <code><del>HtmlDocSerializerContext.HTMLDOC_nowrap</del></code> setting for {@link org.apache.juneau.html.HtmlDocSerializer} class.  
+	<li>Arguments passed to <dc>Link</dc> are now serialized using {@link org.apache.juneau.urlencoding.UrlEncodingSerializer}, so arbitrary POJOs can now be passed as arguments.
+	<li>New date filters:  <c>org.apache.juneau.transforms.Datefilter.ISO8601DTZP</c> and <c>org.apache.juneau.transforms.Datefilter.SimpleP</c>.
+	<li>New <dc>HtmlDocSerializerContext.HTMLDOC_nowrap</dc> setting for {@link org.apache.juneau.html.HtmlDocSerializer} class.  
 		Adds <js>"* {white-space:nowrap}"</js> to the style header to prevent word wrapping.
-	<li>Fixed bug in {@link org.apache.juneau.uon.UonParser} where passing in a blank value on an array or collection type in a form post would cause a <code>ClassCastException</code>.  
-		New behavior creates an empty array or <code>Collection</code>.
-	<li>Improved implementation of <code><del>UrlEncodingSerializer.serializeUrlPart(Object)</del></code> method.
+	<li>Fixed bug in {@link org.apache.juneau.uon.UonParser} where passing in a blank value on an array or collection type in a form post would cause a <c>ClassCastException</c>.  
+		New behavior creates an empty array or <c>Collection</c>.
+	<li>Improved implementation of <dc>UrlEncodingSerializer.serializeUrlPart(Object)</dc> method.
 </ul>
 
 <h5 class='topic w800'>Server</h5>		
@@ -31391,15 +31417,15 @@
 	<li>{@link org.apache.juneau.rest.RestConverter} API fixed to handle the existence of POJO filters.
 		{@link org.apache.juneau.rest.converters.Introspectable}/{@link org.apache.juneau.rest.converters.Queryable}/{@link org.apache.juneau.rest.converters.Traversable} classes can now work with filtered POJOs.  
 	<li>{@link org.apache.juneau.rest.annotation.RestResource#messages() @RestResource(messages)} annotation can now be defined on super and subclasses so that NLS messages can be defined in multiple resource bundles.
-	<li>Performance improvements in <code>RestServletNls</code> class. 
+	<li>Performance improvements in <c>RestServletNls</c> class. 
 	<li>Fixed bug where two REST java methods mapped to the same path pattern wasn't triggering an exception when it was supposed to.
 </ul>
 
 <h5 class='topic w800'>Client</h5>		
 <ul class='spaced-list'>	
-	<li>New <code><del>RestCall.setRedirectMaxAttempts(int)</del></code> method to prevent endless redirection loops.
-	<li>New <code><del>RestCall#setRetryable(int,long,RetryOn)</del></code> method to automatically retry on failed connection attempts.
-	<li>New <code>RestCallInterceptor.onRetry(RestCall,int,HttpRequest,HttpResponse)</code> method for listening in on retry attempts.		
+	<li>New <dc>RestCall.setRedirectMaxAttempts(int)</dc> method to prevent endless redirection loops.
+	<li>New <dc>RestCall#setRetryable(int,long,RetryOn)</dc> method to automatically retry on failed connection attempts.
+	<li>New <c>RestCallInterceptor.onRetry(RestCall,int,HttpRequest,HttpResponse)</c> method for listening in on retry attempts.		
 </ul>
 </div><!-- END: 5.1.0.13 -->
 
@@ -31411,34 +31437,34 @@
 	Juno 5.1.0.14 is a moderate update.
 </p>
 <p>
-	The major addition is support for <code><del>Remoteable Services</del></code>, the ability
+	The major addition is support for <dc>Remoteable Services</dc>, the ability
 		to invoke server-side POJO methods through client-side proxy interfaces.
 </p>
 
 <h5 class='topic w800'>Core</h5>		
 <ul class='spaced-list'>
 	<li>Simplified {@link org.apache.juneau.utils.PojoIntrospector} class.
-	<li>New <code><del>ClassUtils.getMethodSignature(Method)</del></code> method.
+	<li>New <dc>ClassUtils.getMethodSignature(Method)</dc> method.
 </ul>
 
 <h5 class='topic w800'>Client</h5>		
 <ul class='spaced-list'>
 	<li>New methods in {@link org.apache.juneau.rest.client.RestClient} for working with remoteable services:
 	<ul>
-		<li><code><del>RestClient.setRemoteableServletUri(String)</del></code>
-		<li><code><del>RestClient#getRemoteableProxy(Class)</del></code>
+		<li><dc>RestClient.setRemoteableServletUri(String)</dc>
+		<li><dc>RestClient#getRemoteableProxy(Class)</dc>
 	</ul>
 </ul>
 
 <h5 class='topic w800'>Server</h5>		
 <ul class='spaced-list'>
-	<li>Added a default OPTIONS page to {@link org.apache.juneau.rest.BasicRestServlet} and <code><del>RestServletJenaDefault</del></code>.
-	<li><code>RestServletProperties.REST_allowMethodParam</code> has been enhanced to allow you to
-		explicitly specify which HTTP methods can be used in the <code>&amp;method</code> parameter.
+	<li>Added a default OPTIONS page to {@link org.apache.juneau.rest.BasicRestServlet} and <dc>RestServletJenaDefault</dc>.
+	<li><c>RestServletProperties.REST_allowMethodParam</c> has been enhanced to allow you to
+		explicitly specify which HTTP methods can be used in the <c>&amp;method</c> parameter.
 	<li>New methods added to {@link org.apache.juneau.rest.RestRequest}:
 	<ul>
-		<li><code><del>RestRequest.getParser()</del></code>
-		<li><code><del>RestRequest.getReaderParser()</del></code>
+		<li><dc>RestRequest.getParser()</dc>
+		<li><dc>RestRequest.getReaderParser()</dc>
 	</ul>
 </ul>
 </div><!-- END: 5.1.0.14 -->
@@ -31453,23 +31479,23 @@
 
 <h5 class='topic w800'>Core</h5>
 <ul class='spaced-list'>
-	<li>New properties in <code><del>SerializerContext</del></code>:
+	<li>New properties in <dc>SerializerContext</dc>:
 		<ol>
-			<li><code><del>SerializerContext.SERIALIZER_relativeUriBase</del></code>
-			<li><code><del>SerializerContext.SERIALIZER_absolutePathUriBase</del></code>
+			<li><dc>SerializerContext.SERIALIZER_relativeUriBase</dc>
+			<li><dc>SerializerContext.SERIALIZER_absolutePathUriBase</dc>
 		</ol>
-		These replace the <code>SERIALIZER_uriAuthority</code> and <code>SERIALIZER_uriContext</code> properties.
+		These replace the <c>SERIALIZER_uriAuthority</c> and <c>SERIALIZER_uriContext</c> properties.
 	</li>
 	<li>Improvements in {@link org.apache.juneau.csv.CsvSerializer}.
 </ul>
 
 <h5 class='topic w800'>Server</h5>
 <ul class='spaced-list'>
-	<li>New properties in <code>RestServletProperties</code>:
+	<li>New properties in <c>RestServletProperties</c>:
 		<ol>
-			<li><code>REST_defaultCharset</code>
-			<li><code>REST_servletURI</code>
-			<li><code>REST_relativeServletURI</code>
+			<li><c>REST_defaultCharset</c>
+			<li><c>REST_servletURI</c>
+			<li><c>REST_relativeServletURI</c>
 		</ol>
 	<li>Improvements involving path calculations when servlets deployed outside of a war file with a context root.
 </ul>
@@ -31478,24 +31504,24 @@
 <ul class='spaced-list'>
 	<li>New methods in {@link org.apache.juneau.rest.client.RestCall}:
 		<ol>
-			<li><code><del>RestRequest.getHeader(String,Class)</del></code>
-			<li><code><del>RestRequest.getHeader(String,Object,Class)</del></code>
-			<li><code><del>RestRequest.getHeader(String,Type,Type...)</del></code>
-			<li><code><del>RestRequest.getQueryParameter(String,Class)</del></code>
-			<li><code><del>RestRequest.getQueryParameter(String,Object,Class)</del></code>
-			<li><code><del>RestRequest.getQueryParameter(String,Type,Type...)</del></code>
-			<li><code><del>RestRequest.getQueryParameter(String,Object,Type,Type...)</del></code>
-			<li><code><del>RestRequest.getQueryParameters(String,Class)</del></code>
-			<li><code><del>RestRequest.getQueryParameters(String,Type,Type...)</del></code>
-			<li><code><del>RestRequest.getFormDataParameter(String,Class)</del></code>
-			<li><code><del>RestRequest.getFormDataParameter(String,Object,Class)</del></code>
-			<li><code><del>RestRequest.getFormDataParameters(String,Class)</del></code>
-			<li><code><del>RestRequest.getFormDataParameter(String,Type,Type...)</del></code>
-			<li><code><del>RestRequest.getFormDataParameters(String,Type,Type...)</del></code>
-			<li><code><del>RestRequest.getPathParameter(String,Class)</del></code>
-			<li><code><del>RestRequest.getPathParameter(String,Type,Type...)</del></code>
-			<li><code><del>RestRequest.getBody(Class)</del></code>
-			<li><code><del>RestRequest.getBody(Type,Type...)</del></code>
+			<li><dc>RestRequest.getHeader(String,Class)</dc>
+			<li><dc>RestRequest.getHeader(String,Object,Class)</dc>
+			<li><dc>RestRequest.getHeader(String,Type,Type...)</dc>
+			<li><dc>RestRequest.getQueryParameter(String,Class)</dc>
+			<li><dc>RestRequest.getQueryParameter(String,Object,Class)</dc>
+			<li><dc>RestRequest.getQueryParameter(String,Type,Type...)</dc>
+			<li><dc>RestRequest.getQueryParameter(String,Object,Type,Type...)</dc>
+			<li><dc>RestRequest.getQueryParameters(String,Class)</dc>
+			<li><dc>RestRequest.getQueryParameters(String,Type,Type...)</dc>
+			<li><dc>RestRequest.getFormDataParameter(String,Class)</dc>
+			<li><dc>RestRequest.getFormDataParameter(String,Object,Class)</dc>
+			<li><dc>RestRequest.getFormDataParameters(String,Class)</dc>
+			<li><dc>RestRequest.getFormDataParameter(String,Type,Type...)</dc>
+			<li><dc>RestRequest.getFormDataParameters(String,Type,Type...)</dc>
+			<li><dc>RestRequest.getPathParameter(String,Class)</dc>
+			<li><dc>RestRequest.getPathParameter(String,Type,Type...)</dc>
+			<li><dc>RestRequest.getBody(Class)</dc>
+			<li><dc>RestRequest.getBody(Type,Type...)</dc>
 		</ol>
 	</li>
 </ul>
@@ -31514,15 +31540,15 @@
 	<li>New methods on {@link org.apache.juneau.ClassMeta} that eliminates language-specific code in 
 		the general class metadata.
 		<ul>
-			<li><code><del>ClassMeta.getXmlMeta()</del></code>
-			<li><code><del>ClassMeta.getJsonMeta()</del></code>
-			<li><code><del>ClassMeta.getHtmlMeta()</del></code>
-			<li><code><del>ClassMeta.getUrlEncodingMeta()</del></code>
-			<li><code><del>ClassMeta.getRdfMeta()</del></code>
+			<li><dc>ClassMeta.getXmlMeta()</dc>
+			<li><dc>ClassMeta.getJsonMeta()</dc>
+			<li><dc>ClassMeta.getHtmlMeta()</dc>
+			<li><dc>ClassMeta.getUrlEncodingMeta()</dc>
+			<li><dc>ClassMeta.getRdfMeta()</dc>
 		</ul>
 	<li>New {@link org.apache.juneau.dto.jsonschema.JsonType#ANY} enum.
-	<li>New <code><del>@Html(asPlainText)</del></code> annotation.
-	<li>New <code><del>HtmlDocSerializerContext.HTMLDOC_cssImports</del></code> property.
+	<li>New <dc>@Html(asPlainText)</dc> annotation.
+	<li>New <dc>HtmlDocSerializerContext.HTMLDOC_cssImports</dc> property.
 	<li>Significant changes to RDF support.
 		<ul>
 			<li>New {@link org.apache.juneau.jena.annotation.Rdf @Rdf} and {@link org.apache.juneau.jena.annotation.RdfSchema @RdfSchema}
@@ -31531,16 +31557,16 @@
 			<li>Support for serializing arrays/collections as RDF bags, RDF lists, and multi-valued properties.   
 			<li>Fixed warning message about <js>"tab"</js> setting when using the N3/Turtle serializers.
 		</ul>
-	<li>New <code><del>SerializerContext.SERIALIZER_sortCollections</del></code> and 
-		<code><del>SerializerContext.SERIALIZER_sortMaps</del></code> properties.
+	<li>New <dc>SerializerContext.SERIALIZER_sortCollections</dc> and 
+		<dc>SerializerContext.SERIALIZER_sortMaps</dc> properties.
 	<li>FindBug fixes.
 </ul>
 
 <h5 class='topic w800'>Server</h5>
 <ul class='spaced-list'>
-	<li>New <code><del>RestRequest.getServletParentURI()</del></code> method.
-	<li>New <code>$R{servletParentURI}</code> variable.
-	<li>Removed final modifier from <code><del>ChildResourceDescriptions</del></code>.
+	<li>New <dc>RestRequest.getServletParentURI()</dc> method.
+	<li>New <c>$R{servletParentURI}</c> variable.
+	<li>Removed final modifier from <dc>ChildResourceDescriptions</dc>.
 </ul>
 
 <h5 class='topic w800'>Samples</h5>
@@ -31564,104 +31590,104 @@
 		<ul>
 			<li>Deleted the following methods which are now unnecessary:
 				<ul>
-					<li><code>BeanMap.getFiltered(String)</code>
-					<li><code>BeanMap.putFiltered(String,Object)</code>
-					<li><code>BeanMapEntry.getFiltered(String)</code>
-					<li><code>BeanMapEntry.putFiltered(String,Object)</code>
-					<li><code>BeanMapEntry.putFiltered(String,Object)</code>
-					<li><code>BeanPropertyMeta.getFiltered()</code>
-					<li><code>BeanPropertyMeta.setFiltered(Object)</code>
-					<li><code>BeanPropertyMeta.getTransformedClassMeta()</code>
+					<li><c>BeanMap.getFiltered(String)</c>
+					<li><c>BeanMap.putFiltered(String,Object)</c>
+					<li><c>BeanMapEntry.getFiltered(String)</c>
+					<li><c>BeanMapEntry.putFiltered(String,Object)</c>
+					<li><c>BeanMapEntry.putFiltered(String,Object)</c>
+					<li><c>BeanPropertyMeta.getFiltered()</c>
+					<li><c>BeanPropertyMeta.setFiltered(Object)</c>
+					<li><c>BeanPropertyMeta.getTransformedClassMeta()</c>
 				</ul>
 			<li>{@link org.apache.juneau.BeanPropertyMeta#getClassMeta()} now returns the filtered type of the property.
 		</ul> 
-	<li><code><del>StringVarResolver</del></code> now has support for chained resolvers.
-	<li><code><del>StringVarResolver</del></code>  now resolves variables inside resolved values.
+	<li><dc>StringVarResolver</dc> now has support for chained resolvers.
+	<li><dc>StringVarResolver</dc>  now resolves variables inside resolved values.
 		i.e. if a resolved variable value itself contains a variable, it now resolves that variable too.
-	<li>Fixed bug where inner interface classes being used in <code>RestResource.filters()</code> were being
+	<li>Fixed bug where inner interface classes being used in <c>RestResource.filters()</c> were being
 		interpreted as surrogate classes because they have hidden 1-arg constructors due to being inner classes.
 	<li>Fixed bug in {@link org.apache.juneau.internal.MultiSet} where exception was being thrown if last set was empty.
 	<li>New {@link org.apache.juneau.utils.ZipFileList} class for providing efficiently zipped directories through the REST interface.
-	<li>New <code>RdfProperties.RDF_useXmlNamespaces</code> property.			
-	<li>New <code><del>XmlParserContext.XML_preserveRootElement</del></code> property.
+	<li>New <c>RdfProperties.RDF_useXmlNamespaces</c> property.			
+	<li>New <dc>XmlParserContext.XML_preserveRootElement</dc> property.
 	<li>Worked around bug in Sun VM on OS/X where XML parser was throwing an exception when trying to set a reporter.			
 </ul>
 
 
 <h5 class='topic w800'>Server</h5>
 <ul class='spaced-list'>
-	<li>New <code><del>ZipFileListResponseHandler</del></code> class.
+	<li>New <dc>ZipFileListResponseHandler</dc> class.
 	<li>Simplified labels in servlet resource bundles:
 		<ul>
-			<li><code>"[ClassName].ResourceDescription"</code> is now <code>"[ClassName].label"</code>.
-			<li><code>"[ClassName].MethodDescription.[methodName]"</code> is now <code>"[ClassName].[methodName]"</code>.
+			<li><c>"[ClassName].ResourceDescription"</c> is now <c>"[ClassName].label"</c>.
+			<li><c>"[ClassName].MethodDescription.[methodName]"</c> is now <c>"[ClassName].[methodName]"</c>.
 		</ul>
 	<li>Several changes to {@link org.apache.juneau.rest.RestRequest}:
 		<ul>
 			<li>Added new methods:
 				<ul>
-					<li><code><del>RestRequest.getQueryParameterMap()</del></code>
-					<li><code><del>RestRequest.getQueryParameterNames()</del></code>
-					<li><code><del>RestRequest.getPathInfoUndecoded()</del></code>
-					<li><code><del>RestRequest.getPathRemainderUndecoded()</del></code>
-					<li><code><del>RestRequest.getTrimmedRequestURI()</del></code>
-					<li><code><del>RestRequest.getTrimmedRequestURL()</del></code>
-					<li><code><del>RestRequest.getServletTitle()</del></code>
-					<li><code><del>RestRequest.getServletDescription()</del></code>
+					<li><dc>RestRequest.getQueryParameterMap()</dc>
+					<li><dc>RestRequest.getQueryParameterNames()</dc>
+					<li><dc>RestRequest.getPathInfoUndecoded()</dc>
+					<li><dc>RestRequest.getPathRemainderUndecoded()</dc>
+					<li><dc>RestRequest.getTrimmedRequestURI()</dc>
+					<li><dc>RestRequest.getTrimmedRequestURL()</dc>
+					<li><dc>RestRequest.getServletTitle()</dc>
+					<li><dc>RestRequest.getServletDescription()</dc>
 					<li>{@link org.apache.juneau.rest.RestRequest#getMethodDescription()}
 				</ul>
 			<li>Behavior changes to {@link org.apache.juneau.rest.RestRequest#getPathInfo()} to follow Servlet specs.
 				Returns <jk>null</jk> instead of blank for no path info.
-			<li><code><del>RestRequest.getPathRemainder()</del></code> now automatically decodes the path remainder. 
-				Use <code><del>RestRequest.getPathRemainderUndecoded()</del></code> to get the unencoded path remainder.
-			<li>Bug fixes in <code><del>RestRequest.getRequestParentURI()</del></code> when servlet is mapped to <js>"/*"</js>.
-			<li>Bug fixes in <code><del>RestRequest.getServletURI()</del></code> when servlet is mapped to <js>"/*"</js>.
+			<li><dc>RestRequest.getPathRemainder()</dc> now automatically decodes the path remainder. 
+				Use <dc>RestRequest.getPathRemainderUndecoded()</dc> to get the unencoded path remainder.
+			<li>Bug fixes in <dc>RestRequest.getRequestParentURI()</dc> when servlet is mapped to <js>"/*"</js>.
+			<li>Bug fixes in <dc>RestRequest.getServletURI()</dc> when servlet is mapped to <js>"/*"</js>.
 		</ul>
 	<li>New string replacement variables:
 		<ul>
-			<li><code>$R{contextPath}</code> - Returns value from {@link org.apache.juneau.rest.RestRequest#getContextPath()}
-			<li><code>$R{methodDescription}</code> - Returns value from {@link org.apache.juneau.rest.RestRequest#getMethodDescription()}
-			<li><code>$R{resourceTitle}</code> - Returns value from <code><del>RestRequest.getServletTitle()</del></code>
-			<li><code>$R{resourceDescription}</code> - Returns value from <code><del>RestRequest.getServletDescription()</del></code>
-			<li><code>$R{trimmedRequestURI}</code> - Returns value from <code><del>RestRequest.getTrimmedRequestURI()</del></code>
-			<li><code>$E{var}</code> - Environment variables.
+			<li><c>$R{contextPath}</c> - Returns value from {@link org.apache.juneau.rest.RestRequest#getContextPath()}
+			<li><c>$R{methodDescription}</c> - Returns value from {@link org.apache.juneau.rest.RestRequest#getMethodDescription()}
+			<li><c>$R{resourceTitle}</c> - Returns value from <dc>RestRequest.getServletTitle()</dc>
+			<li><c>$R{resourceDescription}</c> - Returns value from <dc>RestRequest.getServletDescription()</dc>
+			<li><c>$R{trimmedRequestURI}</c> - Returns value from <dc>RestRequest.getTrimmedRequestURI()</dc>
+			<li><c>$E{var}</c> - Environment variables.
 		</ul>
-	<li>Added methods <code><del>RestServlet.getDescription(RestRequest)</del></code> and <code><del>RestServlet.getLabel(RestRequest)</del></code>.
-	<li>{@link org.apache.juneau.rest.BasicRestServlet} and <code><del>RestServletJenaDefault</del></code> now provide default HTML titles
+	<li>Added methods <dc>RestServlet.getDescription(RestRequest)</dc> and <dc>RestServlet.getLabel(RestRequest)</dc>.
+	<li>{@link org.apache.juneau.rest.BasicRestServlet} and <dc>RestServletJenaDefault</dc> now provide default HTML titles
 		and descriptions:
 		<p class='bcode w800'>
 	<ja>@Property</ja>(name=<jsf>HTMLDOC_title</jsf>, value=<js>"$R{resourceTitle}"</js>),
 	<ja>@Property</ja>(name=<jsf>HTMLDOC_description</jsf>, value=<js>"$R{resourceDescription}"</js>)
 		</p>
-	<li>Options pages on {@link org.apache.juneau.rest.BasicRestServlet} and <code><del>RestServletJenaDefault</del></code> now provide default descriptions and back links:
+	<li>Options pages on {@link org.apache.juneau.rest.BasicRestServlet} and <dc>RestServletJenaDefault</dc> now provide default descriptions and back links:
 		and descriptions:
 		<p class='bcode w800'>
 	<ja>@Property</ja>(name=<jsf>HTMLDOC_navlinks</jsf>, value=<js>"{back:'$R{servletURI}"</js>),
 	<ja>@Property</ja>(name=<jsf>HTMLDOC_description</jsf>, value=<js>"Resource options"</js>)
 		</p>
 	<li>New {@link org.apache.juneau.rest.BasicRestServletGroup} class.
-	<li>Removed <code>RestServletProperties.REST_trimTrailingUriSlashes</code> and <code>RestServletProperties.REST_pathInfoBlankForNull</code>. 
+	<li>Removed <c>RestServletProperties.REST_trimTrailingUriSlashes</c> and <c>RestServletProperties.REST_pathInfoBlankForNull</c>. 
 	<li>New annotations for providing labels and descriptions.  Useful if you don't plan on having to support other languages, so you don't 
 		want to provide labels in resource bundles.
 		<ul>
-			<li><code><del>RestResource.label()</del></code>
+			<li><dc>RestResource.label()</dc>
 			<li>{@link org.apache.juneau.rest.annotation.RestResource#description() @RestResource(description)}
 			<li>{@link org.apache.juneau.rest.annotation.RestMethod#description() @RestMethod(description)}
-			<li><code><del>RestMethod#responses()</del></code>
-			<li><code><del>Attr.description()</del></code>
-			<li><code><del>Content.description()</del></code>
-			<li><code><del>HasParam.description()</del></code>
-			<li><code><del>HasQParam.description()</del></code>
-			<li><code><del>Header.description()</del></code>
-			<li><code><del>Param.description()</del></code>
-			<li><code><del>QParam.description()</del></code>
+			<li><dc>RestMethod#responses()</dc>
+			<li><dc>Attr.description()</dc>
+			<li><dc>Content.description()</dc>
+			<li><dc>HasParam.description()</dc>
+			<li><dc>HasQParam.description()</dc>
+			<li><dc>Header.description()</dc>
+			<li><dc>Param.description()</dc>
+			<li><dc>QParam.description()</dc>
 		</ul>
-	<li>Support for sorting resources by name in <code><del>ChildResourceDescriptions</del></code>.
+	<li>Support for sorting resources by name in <dc>ChildResourceDescriptions</dc>.
 </ul>
 
 <h5 class='topic w800'>Samples</h5>
 <ul class='spaced-list'>
-	<li>Added <code>/tempDir/upload</code> showing how to use <code>ServletFileUpload</code> with multipart form posts.
+	<li>Added <c>/tempDir/upload</c> showing how to use <c>ServletFileUpload</c> with multipart form posts.
 </ul>
 </div><!-- END: 5.1.0.17 -->
 
@@ -31677,19 +31703,19 @@
 <ul class='spaced-list'>
 	<li>Fixed bug where localized strings weren't resolving when using chained resource bundles.
 	<li>Servlet and method labels and descriptions can now contain embedded string variables.
-	<li>New <code><del>RestMethod.input()</del></code> and <code><del>RestMethod.responses()</del></code>
+	<li>New <dc>RestMethod.input()</dc> and <dc>RestMethod.responses()</dc>
 		annotations.
-		These replace the various <code>description</code> annotations added 2 days ago with a simpler design.
+		These replace the various <c>description</c> annotations added 2 days ago with a simpler design.
 	<li>New methods on {@link org.apache.juneau.rest.RestServlet}:
 		<ul>
-			<li><code><del>RestServlet.getMethodDescription(String,RestRequest)</del></code> so that subclasses
+			<li><dc>RestServlet.getMethodDescription(String,RestRequest)</dc> so that subclasses
 				can override the method description in the OPTIONS page.
-			<li><code><del>RestServlet.createRequestVarResolver(RestRequest)</del></code> so that subclasses
+			<li><dc>RestServlet.createRequestVarResolver(RestRequest)</dc> so that subclasses
 				can override and augment the variable resolver.
-			<li><code><del>RestServlet.resolveChild(Class)</del></code> and <code><del>RestServlet.replaceChild(RestServlet)</del></code>
+			<li><dc>RestServlet.resolveChild(Class)</dc> and <dc>RestServlet.replaceChild(RestServlet)</dc>
 				classes that allows customized resolution of servlet instances (e.g. if services are defined in OSGi).
 		</ul> 
-	<li>Reverted the <code><del>MethodDescription</del></code> back to 5.1.0.16 since it was being used by someone.
+	<li>Reverted the <dc>MethodDescription</dc> back to 5.1.0.16 since it was being used by someone.
 </ul>
 </div><!-- END: 5.1.0.18 -->
 
@@ -31699,7 +31725,7 @@
 <div class='topic'><!-- START: 5.1.0.19 -->
 <p>
 	Juno 5.1.0.19 is a minor update in terms of core functionality.
-	But it introduces a <code><del>Microservices</del></code> project for building REST microservices and docker containers.
+	But it introduces a <dc>Microservices</dc> project for building REST microservices and docker containers.
 </p>
 
 <h5 class='topic w800'>Core</h5>
@@ -31709,7 +31735,7 @@
 	<li>New {@link org.apache.juneau.ObjectMap#include(String[])} and {@link org.apache.juneau.ObjectMap#exclude(String[])} methods.
 	<li>{@link org.apache.juneau.html.annotation.Html @Html} annotations can now be applied to bean properties.
 	<li>New {@link org.apache.juneau.utils.IOPipe} utility class.
-	<li>Behavior change on <code><del>StringVarResolver</del></code>.  <jk>null</jk> input now results in blank strings instead of <jk>null</jk>.
+	<li>Behavior change on <dc>StringVarResolver</dc>.  <jk>null</jk> input now results in blank strings instead of <jk>null</jk>.
 </ul>
 
 <h5 class='topic w800'>Client</h5>
@@ -31720,14 +31746,14 @@
 <h5 class='topic w800'>Server</h5>
 <ul class='spaced-list'>
 	<li>New {@link org.apache.juneau.rest.RestRequest#getHeaders()} method.
-	<li>New <code>RestResponse.getUnbufferedWriter()</code> method.
-	<li>Fixed bug that was preventing <code>x-response-headers</code> parameter from working correctly.
+	<li>New <c>RestResponse.getUnbufferedWriter()</c> method.
+	<li>Fixed bug that was preventing <c>x-response-headers</c> parameter from working correctly.
 	<li>Added {@link org.apache.juneau.annotation.Bean#properties() @Bean.properties} annotations to the various 
-		classes in <code>org.apache.juneau.rest.labels</code> so that the order of the bean properties are consistent
+		classes in <c>org.apache.juneau.rest.labels</c> so that the order of the bean properties are consistent
 		on all JVMs.  On IBM JVMs this is unnecessary because the order of the properties as defined in the class
 		are stored in the bytecode.  Other JVMs such as OpenJRE do not implement this feature causing the bean
 		properties to be in random order.
-	<li>New <code><del>ResourceDescription.ResourceDescription(RestRequest,String,String)</del></code> constructor.
+	<li>New <dc>ResourceDescription.ResourceDescription(RestRequest,String,String)</dc> constructor.
 </ul>
 </div><!-- END: 5.1.0.19 -->
 
@@ -31737,15 +31763,15 @@
 <div class='topic'><!-- START: 5.1.0.20 -->
 <p>
 	Juno 5.1.0.20 is a moderate update.
-	The biggest improvement is the ability to associate external INI config files with REST servlets using the <code><del>ConfigFile</del></code> functionality.
+	The biggest improvement is the ability to associate external INI config files with REST servlets using the <dc>ConfigFile</dc> functionality.
 </p>
 
 <h5 class='topic w800'>Core</h5>
 <ul class='spaced-list'>
-	<li>Significant API changes to <code>org.apache.juneau.config</code> API.
+	<li>Significant API changes to <c>org.apache.juneau.config</c> API.
 		<ul>
-			<li><code><del>ConfigFile</del></code> is now thread safe and can be shared across multiple threads.
-			<li>New <code><del>ConfigMgr</del></code> class for managing configuration files.
+			<li><dc>ConfigFile</dc> is now thread safe and can be shared across multiple threads.
+			<li>New <dc>ConfigMgr</dc> class for managing configuration files.
 			<li>Serializers and parsers can be associated with config files for storing and retrieving POJOs.  
 				Default support provided for JSON.
 		</ul>
@@ -31753,18 +31779,18 @@
 	<li>New {@link org.apache.juneau.html.SimpleHtmlWriter} class.  
 		Can be used for simple HTML DOM construction.
 	<li>New {@link org.apache.juneau.utils.ProcBuilder} class for calling external processes.
-	<li>New <code><del>ObjectMap.remove(Class,String,Object)</del></code> method.
+	<li>New <dc>ObjectMap.remove(Class,String,Object)</dc> method.
 	<li><js>"class='link'"</js> added to links generated by {@link org.apache.juneau.html.HtmlDocSerializer}.
-	<li>New <code><del>EncoderGroup#append(EncoderGroup)</del></code> method.
-	<li>New <code>HtmlDocSerializerContext.HTMLDOC_addLinks</code> configuration property.
-	<li>Modified the <code>Parser.createContext(ObjectMap,Method,Object)</code> method.  
+	<li>New <dc>EncoderGroup#append(EncoderGroup)</dc> method.
+	<li>New <c>HtmlDocSerializerContext.HTMLDOC_addLinks</c> configuration property.
+	<li>Modified the <c>Parser.createContext(ObjectMap,Method,Object)</c> method.  
 		Outer context objects can be passed in to create instances of non-static inner classes.
 	<li>Fixed bug in {@link org.apache.juneau.html.HtmlStrippedDocSerializer} where exception was thrown when trying to serialize primitive arrays.
 	<li>{@link org.apache.juneau.json.JsonParser} now handles parsing JSON boolean/numeric values as strings to bean properties of type boolean or number. 
 	<li>{@link org.apache.juneau.urlencoding.UrlEncodingSerializer} and {@link org.apache.juneau.urlencoding.UrlEncodingParser} now 
 		represent arrays and collections as key-value pairs where the keys are numbers (e.g. <js>"?0=foo&amp;1=bar"</js>).
 	<li>Various internal improvements to {@link org.apache.juneau.utils.IOPipe}.
-	<li>New <code><del>ReflectionUtils.getResource(Class,String)</del></code> method.
+	<li>New <dc>ReflectionUtils.getResource(Class,String)</dc> method.
 	<li>{@link org.apache.juneau.internal.StringUtils#parseNumber(String,Class)} now returns zero for empty strings. 
 		This affects the way most parsers handle blank values.
 </ul>
@@ -31776,39 +31802,39 @@
 	<li>Changes to {@link org.apache.juneau.rest.RestServlet}:
 		<ul>
 			<li>New methods for accessing external INI config files:<br>  
-				<code><del>RestServlet.getConfig()</del></code><br>
-				<code><del>RestServlet.createConfigFile()</del></code>
+				<dc>RestServlet.getConfig()</dc><br>
+				<dc>RestServlet.createConfigFile()</dc>
 			<li>New <js>"$C{...}"</js> variable that resolve to INI config file values.
 			<li>New <js>"$UE{...}"</js> variable that  URL-encodes the value inside the variable.
 			<li>New convenience methods for retrieving classpath resource files:<br>  
-				<code><del>RestServlet.getResource(String)</del></code><br>
-				<code><del>RestServlet.getResourceAsString(String)</del></code><br>
-				<code><del>RestServlet.getResource(Class,String,String)</del></code>.
+				<dc>RestServlet.getResource(String)</dc><br>
+				<dc>RestServlet.getResourceAsString(String)</dc><br>
+				<dc>RestServlet.getResource(Class,String,String)</dc>.
 					Useful if you want to load predefined POJOs from JSON files in your classpath.
-			<li>New <code><del>RestServlet.handleNotFound(int,RestRequest,RestResponse)</del></code> method for customized handling
+			<li>New <dc>RestServlet.handleNotFound(int,RestRequest,RestResponse)</dc> method for customized handling
 				of when a resource or method was not found.  
 		</ul>
 	<li>{@link org.apache.juneau.rest.BasicRestServlet}  now automatically processes <js>"/favicon.ico"</js> requests by 
-		overriding the new <code><del>RestServlet.handleNotFound(int,RestRequest,RestResponse)</del></code> method.
+		overriding the new <dc>RestServlet.handleNotFound(int,RestRequest,RestResponse)</dc> method.
 	<li>New {@link org.apache.juneau.rest.RestRequest} methods: 
 		<ul>
-			<li><code><del>RestRequest.resolveVars(String)</del></code>
-			<li><code>RestRequest.getVarResource(String)</code>
-			<li><code><del>RestRequest.getConfig()</del></code>
+			<li><dc>RestRequest.resolveVars(String)</dc>
+			<li><c>RestRequest.getVarResource(String)</c>
+			<li><dc>RestRequest.getConfig()</dc>
 		</ul>
 	<li>New {@link org.apache.juneau.rest.RestResponse} methods: 
 		<ul>
 			<li>{@link org.apache.juneau.rest.RestResponse#getDirectWriter(String)}.
 			<li>{@link org.apache.juneau.rest.RestResponse#getNegotiatedWriter()}.  
-				<code>getWriter()</code> now returns an unnegotiated writer.  
-				<code>getUnbufferedWriter()</code> has been removed.
+				<c>getWriter()</c> now returns an unnegotiated writer.  
+				<c>getUnbufferedWriter()</c> has been removed.
 		</ul>
 	<li>New {@link org.apache.juneau.rest.annotation.RestMethod#encoders() @RestMethod(encoders)} and 
-		<code><del>RestMethod.inheritEncoders()</del></code> annotations.  
+		<dc>RestMethod.inheritEncoders()</dc> annotations.  
 		Allows encoders to be fine-tuned at the method level.
-	<li>New {@link org.apache.juneau.rest.annotation.RestResource#config() @RestResource(config)} annotation for associating external <code><del>ConfigFile</del></code> config files with servlets.
-	<li><code><del>ResourceLink</del></code>.
-	<li>New <code>org.apache.juneau.rest.matchers</code> package for commonly-used {@link org.apache.juneau.rest.RestMatcher RestMatchers}:
+	<li>New {@link org.apache.juneau.rest.annotation.RestResource#config() @RestResource(config)} annotation for associating external <dc>ConfigFile</dc> config files with servlets.
+	<li><dc>ResourceLink</dc>.
+	<li>New <c>org.apache.juneau.rest.matchers</c> package for commonly-used {@link org.apache.juneau.rest.RestMatcher RestMatchers}:
 		<ul>
 			<li>{@link org.apache.juneau.rest.matchers#MultipartFormDataMatcher}
 			<li>{@link org.apache.juneau.rest.matchers#UrlEncodedFormMatcher}
@@ -31839,80 +31865,80 @@
 
 <h5 class='topic w800'>Core</h5>
 <ul class='spaced-list'>
-	<li>Significant changes and enhancements to the <code>org.apache.juneau.config</code> API.
+	<li>Significant changes and enhancements to the <c>org.apache.juneau.config</c> API.
 		<ul>
 			<li>More consistent handling of comma-delimited lists of objects.
-			<li>New methods in <code><del>ConfigFile</del></code>:
+			<li>New methods in <dc>ConfigFile</dc>:
 				<ul>
-					<li><code><del>ConfigFile.getStringArray(String)</del></code>,<code><del>ConfigFile.getStringArray(String,String[])</del></code>
-					<li><code><del>ConfigFile.getSectionAsBean(String,Class)</del></code> - Instantiate a new bean with property values in the specified section..
-					<li><code><del>ConfigFile.writeProperties(String,Object,boolean,Class[])</del></code> - Copy the properties in a config file section into properties on an existing bean or POJO.
-					<li><code><del>ConfigFile.getSectionMap(String)</del></code> - Get all the resolved values in a section.
-					<li><code><del>ConfigFile.containsNonEmptyValue(String)</del></code> 
-					<li><code><del>ConfigFile.isEncoded(String)</del></code> 
-					<li><code><del>ConfigFile.addListener(ConfigFileListener)</del></code> - Listen for modification events on the config file.
-					<li><code><del>ConfigFile.merge(ConfigFile)</del></code> - Merge the contents of another config file into this config file.
-					<li><code><del>ConfigFile.getResolving()</del></code>, <code><del>ConfigFile.getResolving(StringVarResolver)</del></code> - Return an instance of the config file that resolves string variables.
+					<li><dc>ConfigFile.getStringArray(String)</dc>,<dc>ConfigFile.getStringArray(String,String[])</dc>
+					<li><dc>ConfigFile.getSectionAsBean(String,Class)</dc> - Instantiate a new bean with property values in the specified section..
+					<li><dc>ConfigFile.writeProperties(String,Object,boolean,Class[])</dc> - Copy the properties in a config file section into properties on an existing bean or POJO.
+					<li><dc>ConfigFile.getSectionMap(String)</dc> - Get all the resolved values in a section.
+					<li><dc>ConfigFile.containsNonEmptyValue(String)</dc> 
+					<li><dc>ConfigFile.isEncoded(String)</dc> 
+					<li><dc>ConfigFile.addListener(ConfigFileListener)</dc> - Listen for modification events on the config file.
+					<li><dc>ConfigFile.merge(ConfigFile)</dc> - Merge the contents of another config file into this config file.
+					<li><dc>ConfigFile.getResolving()</dc>, <dc>ConfigFile.getResolving(StringVarResolver)</dc> - Return an instance of the config file that resolves string variables.
 						Much more efficient than the previous design since the same underlying config file object is shared.
-					<li><code><del>ConfigFile.toWritable()</del></code> - Wraps the config file in a {@link org.apache.juneau.Writable} interface so that it can be serialized by the REST interface as a plain-text INI file instead of as a serialized POJO.
-					<li><code><del>ConfigFile.getInt(String)</del></code> - Now supports <js>"M"</js> and <js>"K"</js> to identify millions and thousands.
+					<li><dc>ConfigFile.toWritable()</dc> - Wraps the config file in a {@link org.apache.juneau.Writable} interface so that it can be serialized by the REST interface as a plain-text INI file instead of as a serialized POJO.
+					<li><dc>ConfigFile.getInt(String)</dc> - Now supports <js>"M"</js> and <js>"K"</js> to identify millions and thousands.
 				</ul>
-			<li>New methods in <code><del>ConfigMgr</del></code>:
+			<li>New methods in <dc>ConfigMgr</dc>:
 				<ul>
-					<li><code><del>ConfigMgr.create()</del></code>, <code><del>ConfigMgr.create(Reader)</del></code>, <code><del>ConfigMgr.create(File)</del></code>
-					<li><code><del>ConfigMgr.deleteAll()</del></code>	
+					<li><dc>ConfigMgr.create()</dc>, <dc>ConfigMgr.create(Reader)</dc>, <dc>ConfigMgr.create(File)</dc>
+					<li><dc>ConfigMgr.deleteAll()</dc>	
 				</ul>
-			<li>New methods in <code><del>Section</del></code>:
+			<li>New methods in <dc>Section</dc>:
 				<ul>
-					<li><code><del>Section.setParent(ConfigFileImpl)</del></code> - Used by parsers to set the config file for this section.
-					<li><code><del>Section.setName(String)</del></code> - Used by parsers to set the name for this section.
+					<li><dc>Section.setParent(ConfigFileImpl)</dc> - Used by parsers to set the config file for this section.
+					<li><dc>Section.setName(String)</dc> - Used by parsers to set the name for this section.
 				</ul>
 			<li>New interfaces:
 				<ul>
-					<li><code><del>org.apache.juneau.config.ConfigFileListener</del></code>
-					<li><code><del>org.apache.juneau.config.SectionListener</del></code>
-					<li><code><del>org.apache.juneau.config.EntryListener</del></code> 
+					<li><dc>org.apache.juneau.config.ConfigFileListener</dc>
+					<li><dc>org.apache.juneau.config.SectionListener</dc>
+					<li><dc>org.apache.juneau.config.EntryListener</dc> 
 				</ul>
-			<li><code><del>org.apache.juneau.config.Encoder</del></code> methods have access to field names to use them as salt values.
+			<li><dc>org.apache.juneau.config.Encoder</dc> methods have access to field names to use them as salt values.
 			<li>The name of the default section is now <js>"default"</js>.  Before it was just <jk>null</jk>.
-			<li><code><del>org.apache.juneau.config.XorEncoder</del></code> XOR key can be overridden through the <js>"org.apache.juneau.config.XorEncoder.key"</js> system property.
+			<li><dc>org.apache.juneau.config.XorEncoder</dc> XOR key can be overridden through the <js>"org.apache.juneau.config.XorEncoder.key"</js> system property.
 		</ul> 
 	<li>Support for converting Strings to POJOs if the POJO class has any of the following static methods: 
 		<ul>
-			<li><code>fromString(String)</code>
-			<li><code>valueOf(String)</code> (e.g. enums)
-			<li><code>parse(String)</code> (e.g. logging <code>Level</code> class)
-			<li><code>parseString(String)</code>
-			<li><code>forName(String)</code> (e.g. <code>Class</code> and <code>Charset</code> classes)
+			<li><c>fromString(String)</c>
+			<li><c>valueOf(String)</c> (e.g. enums)
+			<li><c>parse(String)</c> (e.g. logging <c>Level</c> class)
+			<li><c>parseString(String)</c>
+			<li><c>forName(String)</c> (e.g. <c>Class</c> and <c>Charset</c> classes)
 		</ul>
 	<li>Support for parsing into objects with unbound type variables.
-		For example, if you have a class <code>Pair&lt;S,T&gt;</code> and you try to parse into this
-		class (e.g. <code>parser.parse(in, Pair.<jk>class</jk>)</code>), the unbound type variables
-		is interpreted as <code>Object</code> instead of throwing an exception.
+		For example, if you have a class <c>Pair&lt;S,T&gt;</c> and you try to parse into this
+		class (e.g. <c>parser.parse(in, Pair.<jk>class</jk>)</c>), the unbound type variables
+		is interpreted as <c>Object</c> instead of throwing an exception.
 	<li>Support for serializing/parsing the following new types:
 		<ul>
-			<li><code>AtomicInteger</code>
-			<li><code>AtomicLong</code>
-			<li><code>BigInteger</code>
-			<li><code>BigDecimal</code>
+			<li><c>AtomicInteger</c>
+			<li><c>AtomicLong</c>
+			<li><c>BigInteger</c>
+			<li><c>BigDecimal</c>
 		</ul>
 	<li>Parsers have been enhanced to allow parent POJOs and field names to be passed into child POJOs.
 		New {@link org.apache.juneau.annotation.NameProperty @NameProperty} and {@link org.apache.juneau.annotation.ParentProperty @ParentProperty}
 			annotations are provided for identifying methods for setting names and parent POJOs on child POJOs.
-		For example, the config file <code><del>Section</del></code> class represents a section
-		in a config file.  It needs to know it's own name and have a link to the <code><del>ConfigFile</del></code> 
+		For example, the config file <dc>Section</dc> class represents a section
+		in a config file.  It needs to know it's own name and have a link to the <dc>ConfigFile</dc> 
 		that it belongs to.  With these new annotations, config files can be reconstructed using any of the parsers.
 	<li>New classes and interfaces:
 		<ul>
 			<li>{@link org.apache.juneau.Streamable} interface for identifying objects that can be serialized directly to an output stream.
 			<li>{@link org.apache.juneau.Writable} interface for identifying objects that can be serialized directly to a writer.
-			<li><code><del>StringObject</del></code> class that can be used for delayed object serialization.
-			<li><code><del>ByteArrayCache</del></code>
+			<li><dc>StringObject</dc> class that can be used for delayed object serialization.
+			<li><dc>ByteArrayCache</dc>
 			<li>{@link org.apache.juneau.internal.ByteArrayInOutStream} 
 			<li>{@link org.apache.juneau.internal.FileUtils}
 			<li>{@link org.apache.juneau.internal.ThrowableUtils}
-			<li><code><del>StringVarMultipart</del></code>
-			<li><code><del>StringVarWithDefault</del></code>
+			<li><dc>StringVarMultipart</dc>
+			<li><dc>StringVarWithDefault</dc>
 		</ul> 
 	<li>New fields on {@link org.apache.juneau.ObjectList}:
 		<ul>
@@ -31934,14 +31960,14 @@
 		</ul>	
 	<li>New methods in {@link org.apache.juneau.internal.IOUtils}:
 		<ul>
-			<li><code><del>IOUtils.pipe(Reader,Writer)</del></code>
+			<li><dc>IOUtils.pipe(Reader,Writer)</dc>
 			<li>{@link org.apache.juneau.internal.IOUtils#read(File)}
 			<li>{@link org.apache.juneau.internal.IOUtils#readFile(String)}
 			<li>{@link org.apache.juneau.internal.IOUtils#write(File,Reader)}
 		</ul>
 	<li>New methods on {@link org.apache.juneau.utils.PojoRest}:
 		<ul>
-			<li><code><del>PojoRest.get(Class,String,Object)</del></code>
+			<li><dc>PojoRest.get(Class,String,Object)</dc>
 			<li>{@link org.apache.juneau.utils.PojoRest#getString(String)}
 			<li>{@link org.apache.juneau.utils.PojoRest#getString(String,String)}
 			<li>{@link org.apache.juneau.utils.PojoRest#getInt(String)}
@@ -31978,47 +32004,47 @@
 			<li>{@link org.apache.juneau.internal.StringUtils#base64Decode(String)}
 			<li>{@link org.apache.juneau.internal.StringUtils#generateUUID(int)}
 			<li>{@link org.apache.juneau.internal.StringUtils#trim(String)}
-			<li><code><del>StringUtils.parseISO8601Date(String)</del></code>
+			<li><dc>StringUtils.parseISO8601Date(String)</dc>
 			<li>{@link org.apache.juneau.internal.StringUtils#replaceVars(String,Map)}
 			<li>{@link org.apache.juneau.internal.StringUtils#pathStartsWith(String,String)}
 			<li>{@link org.apache.juneau.internal.StringUtils#pathStartsWith(String,String[])}
 		</ul>
-	<li>New <code><del>StringVar.doResolve(String)</del></code> method.
-	<li>New <code><del>StringVarResolver.DEFAULT</del></code> field.
-	<li>Eliminated dependency on <code>javax.mail.internet.MimeUtility</code> by implementing our own {@link org.apache.juneau.internal.StringUtils#base64Encode(byte[])} method.
+	<li>New <dc>StringVar.doResolve(String)</dc> method.
+	<li>New <dc>StringVarResolver.DEFAULT</dc> field.
+	<li>Eliminated dependency on <c>javax.mail.internet.MimeUtility</c> by implementing our own {@link org.apache.juneau.internal.StringUtils#base64Encode(byte[])} method.
 	<li>{@link org.apache.juneau.transforms.CalendarSwap} and {@link org.apache.juneau.transforms.DateSwap} classes now handle blank input better.  Returns <jk>null</jk> instead of throwing an exception.
-	<li>{@link org.apache.juneau.html.HtmlDocSerializer} specifies the default CSS location as <code>/servletPath/style.css</code> instead of <code>/servletPath/htdocs/juneau.css</code>.  
+	<li>{@link org.apache.juneau.html.HtmlDocSerializer} specifies the default CSS location as <c>/servletPath/style.css</c> instead of <c>/servletPath/htdocs/juneau.css</c>.  
 		This coincides with enhancements made in the server code for specifying styles.
-	<li>{@link org.apache.juneau.html.HtmlDocSerializer} wraps output in two div tags instead of one (e.g. <code>&lt;div class='outerdata'&gt;&lt;div class='data' id='data'&gt;...&lt;/div&gt;&lt;/div&gt;</code>).
+	<li>{@link org.apache.juneau.html.HtmlDocSerializer} wraps output in two div tags instead of one (e.g. <c>&lt;div class='outerdata'&gt;&lt;div class='data' id='data'&gt;...&lt;/div&gt;&lt;/div&gt;</c>).
 		Needed for supporting the new devops look-and-feel.
 	<li>Fixed indentation inconsistencies in {@link org.apache.juneau.html.HtmlDocSerializer}.
 	<li>Renamed <del>HtmlSchemaSerializer</del> to <del>HtmlSchemaDocSerializer</del>.
-	<li>RDF serializers and parsers now support <code>RdfProperties.RDF_looseCollection</code> loose collections.
+	<li>RDF serializers and parsers now support <c>RdfProperties.RDF_looseCollection</c> loose collections.
 	<li>RDF parser handles case where resources point to themselves (an unfortunate behavior in JFS RDF documents).
 	<li>JSON parser with throw an exception in strict mode if it encounters numbers that are valid in Java but invalid in JSON (e.g. octal, hexadecimal numbers).
 	<li>{@link org.apache.juneau.parser.Parser} methods now check for <jk>null</jk> input.
-	<li>{@link org.apache.juneau.serializer.SerializerGroup} and {@link org.apache.juneau.parser.ParserGroup} ignores serializers and parsers if they throw <code>NoClassDefFoundErrors</code>.
+	<li>{@link org.apache.juneau.serializer.SerializerGroup} and {@link org.apache.juneau.parser.ParserGroup} ignores serializers and parsers if they throw <c>NoClassDefFoundErrors</c>.
 	<li>{@link org.apache.juneau.urlencoding.UrlEncodingParser} creates lists if the same attribute name is encountered more than once.  Before it would just replace the previous value with the new value.
-	<li>New <code><del>UrlEncodingSerializer.DEFAULT_SIMPLE_EXPANDED</del></code> serializer.
+	<li>New <dc>UrlEncodingSerializer.DEFAULT_SIMPLE_EXPANDED</dc> serializer.
 	<li>Changes to {@link org.apache.juneau.utils.Args}:
 		<ul>
-			<li><code>getMainArg(int)</code> changed to {@link org.apache.juneau.utils.Args#getArg(int)}.  
+			<li><c>getMainArg(int)</c> changed to {@link org.apache.juneau.utils.Args#getArg(int)}.  
 				Non-existent arguments are returned as <jk>null</jk> instead of blank strings.  
 				This is more inline with the behavior of the rest of the library.
 			<li>New {@link org.apache.juneau.utils.Args#hasArg(int)} method.
 		</ul> 
-	<li>Removed <code>org.apache.juneau.utils.CharsetUtils</code> class.
-	<li>Removed <code>org.apache.juneau.utils.ConcurrentIdentityList</code> class.
+	<li>Removed <c>org.apache.juneau.utils.CharsetUtils</c> class.
+	<li>Removed <c>org.apache.juneau.utils.ConcurrentIdentityList</c> class.
 	<li>Fixed bug in {@link org.apache.juneau.internal.MultiIterable} class.
-	<li>{@link org.apache.juneau.utils.PojoIntrospector} must now be instantiated with a <code>ReaderParser</code>.
+	<li>{@link org.apache.juneau.utils.PojoIntrospector} must now be instantiated with a <c>ReaderParser</c>.
 		Simplifies the API on the class.
-	<li>{@link org.apache.juneau.utils.PojoRest} must now be instantiated with a <code>ReaderParser</code>.
+	<li>{@link org.apache.juneau.utils.PojoRest} must now be instantiated with a <c>ReaderParser</c>.
 		Simplifies the API on the class.
-	<li>{@link org.apache.juneau.utils.MessageBundle} and <code>SafeResourceMultiBundle</code> moved from server component.
-	<li>Several bug fixes and performance improvements in <code><del>StringVarResolver</del></code>.
+	<li>{@link org.apache.juneau.utils.MessageBundle} and <c>SafeResourceMultiBundle</c> moved from server component.
+	<li>Several bug fixes and performance improvements in <dc>StringVarResolver</dc>.
 	<li>Various enhancements to {@link org.apache.juneau.internal.TeeWriter} and {@link org.apache.juneau.internal.TeeOutputStream}.
 	<li>Renamed <del>CharSet</del> to {@link org.apache.juneau.internal.AsciiSet}.
-	<li>{@link org.apache.juneau.serializer.SerializerGroup} and {@link org.apache.juneau.parser.ParserGroup} now ignores <code>NoClassDefFoundErrors</code>
+	<li>{@link org.apache.juneau.serializer.SerializerGroup} and {@link org.apache.juneau.parser.ParserGroup} now ignores <c>NoClassDefFoundErrors</c>
 		so that resources that include Jena support can continue to operate even if the Jena libraries are not present.
 	<li>New {@link org.apache.juneau.internal.FileUtils#createTempFile(String)} method.
 	<li>New {@link org.apache.juneau.utils.PojoQuery} modified to handle bean getters that throw exceptions.
@@ -32033,12 +32059,12 @@
 			<li>{@link org.apache.juneau.rest.client.HttpMethod}
 			<li>{@link org.apache.juneau.rest.client.ResponsePattern}
 			<li>{@link org.apache.juneau.rest.client.SimpleX509TrustManager}
-			<li><code><del>SSLOpts</del></code>
+			<li><dc>SSLOpts</dc>
 		</ul>
-	<li>Removed <code>org.apache.juneau.rest.client.LaxRedirectStrategy</code>.  Use HTTP Client equivalent.
+	<li>Removed <c>org.apache.juneau.rest.client.LaxRedirectStrategy</c>.  Use HTTP Client equivalent.
 	<li>New methods on {@link org.apache.juneau.rest.client.RestCall}:
 		<ul>
-			<li><code><del>RestCall#addInterceptor(RestCallInterceptor)</del></code>
+			<li><dc>RestCall#addInterceptor(RestCallInterceptor)</dc>
 			<li>{@link org.apache.juneau.rest.client.RestCall#pipeTo(Writer)}
 			<li>{@link org.apache.juneau.rest.client.RestCall#pipeTo(Writer,boolean)}
 			<li>{@link org.apache.juneau.rest.client.RestCall#pipeTo(String,Writer,boolean)}
@@ -32051,8 +32077,8 @@
 			<li>{@link org.apache.juneau.rest.client.RestCall#captureResponse()}
 			<li>{@link org.apache.juneau.rest.client.RestCall#successPattern(String)}
 			<li>{@link org.apache.juneau.rest.client.RestCall#failurePattern(String)}
-			<li><code><del>RestCall#addResponsePattern(ResponsePattern)</del></code>
-			<li>{@link org.apache.juneau.rest.client.RestCall#run()} - Renamed from <code>execute()</code>.
+			<li><dc>RestCall#addResponsePattern(ResponsePattern)</dc>
+			<li>{@link org.apache.juneau.rest.client.RestCall#run()} - Renamed from <c>execute()</c>.
 			<li>{@link org.apache.juneau.rest.client.RestCall#getCapturedResponse()}
 			<li>{@link org.apache.juneau.rest.client.RestCall#getResponsePojoRest(Class)}
 			<li>{@link org.apache.juneau.rest.client.RestCall#getResponsePojoRest()}
@@ -32066,134 +32092,134 @@
 		</ul>
 	<li>New methods on {@link org.apache.juneau.rest.client.RestClient}:
 		<ul>
-			<li><code><del>RestClient.setBasicAuth(String,int,String,String)</del></code>
-			<li><code><del>RestClient.logTo(Level,Logger)</del></code>
-			<li><code><del>RestClient.setRootUrl(String)</del></code>
-			<li><code><del>RestClient.enableSSL(SSLOpts)</del></code>
-			<li><code><del>RestClient.enableLaxSSL()</del></code>
+			<li><dc>RestClient.setBasicAuth(String,int,String,String)</dc>
+			<li><dc>RestClient.logTo(Level,Logger)</dc>
+			<li><dc>RestClient.setRootUrl(String)</dc>
+			<li><dc>RestClient.enableSSL(SSLOpts)</dc>
+			<li><dc>RestClient.enableLaxSSL()</dc>
 			<li>{@link org.apache.juneau.rest.client.RestClient#doCall(HttpMethod,Object,Object)}
-			<li><code><del>RestClient.createHttpClientBuilder()</del></code>
+			<li><dc>RestClient.createHttpClientBuilder()</dc>
 		</ul>
-	<li>New passthrough methods on {@link org.apache.juneau.rest.client.RestClient} defined on <code>HttpClientBuilder</code>:
+	<li>New passthrough methods on {@link org.apache.juneau.rest.client.RestClient} defined on <c>HttpClientBuilder</c>:
 		<ul>
-			<li><code><del>RestClient.setRedirectStrategy(RedirectStrategy)</del></code>
-			<li><code><del>RestClient.setDefaultCookieSpecRegistry(Lookup)</del></code>
-			<li><code><del>RestClient.setRequestExecutor(HttpRequestExecutor)</del></code>
-			<li><code><del>RestClient.setSSLHostnameVerifier(HostnameVerifier)</del></code>
-			<li><code><del>RestClient.setPublicSuffixMatcher(PublicSuffixMatcher)</del></code>
-			<li><code><del>RestClient.setSSLContext(SSLContext)</del></code>
-			<li><code><del>RestClient.setSSLSocketFactory(LayeredConnectionSocketFactory)</del></code>
-			<li><code><del>RestClient.setMaxConnTotal(int)</del></code>
-			<li><code><del>RestClient.setMaxConnPerRoute(int)</del></code>
-			<li><code><del>RestClient.setDefaultSocketConfig(SocketConfig)</del></code>
-			<li><code><del>RestClient.setDefaultConnectionConfig(ConnectionConfig)</del></code>
-			<li><code><del>RestClient.setConnectionTimeToLive(long,TimeUnit)</del></code>
-			<li><code><del>RestClient.setConnectionManager(HttpClientConnectionManager)</del></code>
-			<li><code><del>RestClient.setConnectionManagerShared(boolean)</del></code>
-			<li><code><del>RestClient.setConnectionReuseStrategy(ConnectionReuseStrategy)</del></code>
-			<li><code><del>RestClient.setKeepAliveStrategy(ConnectionKeepAliveStrategy)</del></code>
-			<li><code><del>RestClient.setTargetAuthenticationStrategy(AuthenticationStrategy)</del></code>
-			<li><code><del>RestClient.setProxyAuthenticationStrategy(AuthenticationStrategy)</del></code>
-			<li><code><del>RestClient.setUserTokenHandler(UserTokenHandler)</del></code>
-			<li><code><del>RestClient.disableConnectionState()</del></code>
-			<li><code><del>RestClient.setSchemePortResolver(SchemePortResolver)</del></code>
-			<li><code><del>RestClient.setUserAgent(String userAgent)</del></code>
-			<li><code><del>RestClient.setDefaultHeaders(Collection)</del></code>
-			<li><code><del>RestClient.addInterceptorFirst(HttpResponseInterceptor)</del></code>
-			<li><code><del>RestClient.addInterceptorLast(HttpResponseInterceptor)</del></code>
-			<li><code><del>RestClient.addInterceptorFirst(HttpRequestInterceptor)</del></code>
-			<li><code><del>RestClient.addInterceptorLast(HttpRequestInterceptor)</del></code>
-			<li><code><del>RestClient.disableCookieManagement()</del></code>
-			<li><code><del>RestClient.disableContentCompression()</del></code>
-			<li><code><del>RestClient.disableAuthCaching()</del></code>
-			<li><code><del>RestClient.setHttpProcessor(HttpProcessor)</del></code>
-			<li><code><del>RestClient.setRetryHandler(HttpRequestRetryHandler)</del></code>
-			<li><code><del>RestClient.disableAutomaticRetries()</del></code>
-			<li><code><del>RestClient.setProxy(HttpHost)</del></code>
-			<li><code><del>RestClient.setRoutePlanner(HttpRoutePlanner)</del></code>
-			<li><code><del>RestClient.disableRedirectHandling()</del></code>
-			<li><code><del>RestClient.setConnectionBackoffStrategy(ConnectionBackoffStrategy)</del></code>
-			<li><code><del>RestClient.setBackoffManager(BackoffManager)</del></code>
-			<li><code><del>RestClient.setServiceUnavailableRetryStrategy(ServiceUnavailableRetryStrategy)</del></code>
-			<li><code><del>RestClient.setDefaultCookieStore(CookieStore)</del></code>
-			<li><code><del>RestClient.setDefaultCredentialsProvider(CredentialsProvider)</del></code>
-			<li><code><del>RestClient.setDefaultAuthSchemeRegistry(Lookup)</del></code>
-			<li><code><del>RestClient.setContentDecoderRegistry(Map)</del></code>
-			<li><code><del>RestClient.setDefaultRequestConfig(RequestConfig)</del></code>
-			<li><code><del>RestClient.useSystemProperties()</del></code>
-			<li><code><del>RestClient.evictExpiredConnections()</del></code>
-			<li><code><del>RestClient.evictIdleConnections(long,TimeUnit)</del></code>
+			<li><dc>RestClient.setRedirectStrategy(RedirectStrategy)</dc>
+			<li><dc>RestClient.setDefaultCookieSpecRegistry(Lookup)</dc>
+			<li><dc>RestClient.setRequestExecutor(HttpRequestExecutor)</dc>
+			<li><dc>RestClient.setSSLHostnameVerifier(HostnameVerifier)</dc>
+			<li><dc>RestClient.setPublicSuffixMatcher(PublicSuffixMatcher)</dc>
+			<li><dc>RestClient.setSSLContext(SSLContext)</dc>
+			<li><dc>RestClient.setSSLSocketFactory(LayeredConnectionSocketFactory)</dc>
+			<li><dc>RestClient.setMaxConnTotal(int)</dc>
+			<li><dc>RestClient.setMaxConnPerRoute(int)</dc>
+			<li><dc>RestClient.setDefaultSocketConfig(SocketConfig)</dc>
+			<li><dc>RestClient.setDefaultConnectionConfig(ConnectionConfig)</dc>
+			<li><dc>RestClient.setConnectionTimeToLive(long,TimeUnit)</dc>
+			<li><dc>RestClient.setConnectionManager(HttpClientConnectionManager)</dc>
+			<li><dc>RestClient.setConnectionManagerShared(boolean)</dc>
+			<li><dc>RestClient.setConnectionReuseStrategy(ConnectionReuseStrategy)</dc>
+			<li><dc>RestClient.setKeepAliveStrategy(ConnectionKeepAliveStrategy)</dc>
+			<li><dc>RestClient.setTargetAuthenticationStrategy(AuthenticationStrategy)</dc>
+			<li><dc>RestClient.setProxyAuthenticationStrategy(AuthenticationStrategy)</dc>
+			<li><dc>RestClient.setUserTokenHandler(UserTokenHandler)</dc>
+			<li><dc>RestClient.disableConnectionState()</dc>
+			<li><dc>RestClient.setSchemePortResolver(SchemePortResolver)</dc>
+			<li><dc>RestClient.setUserAgent(String userAgent)</dc>
+			<li><dc>RestClient.setDefaultHeaders(Collection)</dc>
+			<li><dc>RestClient.addInterceptorFirst(HttpResponseInterceptor)</dc>
+			<li><dc>RestClient.addInterceptorLast(HttpResponseInterceptor)</dc>
+			<li><dc>RestClient.addInterceptorFirst(HttpRequestInterceptor)</dc>
+			<li><dc>RestClient.addInterceptorLast(HttpRequestInterceptor)</dc>
+			<li><dc>RestClient.disableCookieManagement()</dc>
+			<li><dc>RestClient.disableContentCompression()</dc>
+			<li><dc>RestClient.disableAuthCaching()</dc>
+			<li><dc>RestClient.setHttpProcessor(HttpProcessor)</dc>
+			<li><dc>RestClient.setRetryHandler(HttpRequestRetryHandler)</dc>
+			<li><dc>RestClient.disableAutomaticRetries()</dc>
+			<li><dc>RestClient.setProxy(HttpHost)</dc>
+			<li><dc>RestClient.setRoutePlanner(HttpRoutePlanner)</dc>
+			<li><dc>RestClient.disableRedirectHandling()</dc>
+			<li><dc>RestClient.setConnectionBackoffStrategy(ConnectionBackoffStrategy)</dc>
+			<li><dc>RestClient.setBackoffManager(BackoffManager)</dc>
+			<li><dc>RestClient.setServiceUnavailableRetryStrategy(ServiceUnavailableRetryStrategy)</dc>
+			<li><dc>RestClient.setDefaultCookieStore(CookieStore)</dc>
+			<li><dc>RestClient.setDefaultCredentialsProvider(CredentialsProvider)</dc>
+			<li><dc>RestClient.setDefaultAuthSchemeRegistry(Lookup)</dc>
+			<li><dc>RestClient.setContentDecoderRegistry(Map)</dc>
+			<li><dc>RestClient.setDefaultRequestConfig(RequestConfig)</dc>
+			<li><dc>RestClient.useSystemProperties()</dc>
+			<li><dc>RestClient.evictExpiredConnections()</dc>
+			<li><dc>RestClient.evictIdleConnections(long,TimeUnit)</dc>
 		</ul>
-	<li><code>JazzRestClient</code> now supports OIDC authentication.
+	<li><c>JazzRestClient</c> now supports OIDC authentication.
 	<li>These classes are now deprecated and will be removed in a future release:
 		<ul>
-			<li><code>org.apache.juneau.rest.client.jazz.CertificateStore</code>
-			<li><code>org.apache.juneau.rest.client.jazz.ICertificateValidator</code>
-			<li><code>org.apache.juneau.rest.client.jazz.ITrustStoreProvider</code>
-			<li><code>org.apache.juneau.rest.client.jazz.LenientCertificateValidator</code>
-			<li><code>org.apache.juneau.rest.client.jazz.SharedTrustStoreProvider</code>
-			<li><code>org.apache.juneau.rest.client.jazz.ValidatingX509TrustManager</code>
+			<li><c>org.apache.juneau.rest.client.jazz.CertificateStore</c>
+			<li><c>org.apache.juneau.rest.client.jazz.ICertificateValidator</c>
+			<li><c>org.apache.juneau.rest.client.jazz.ITrustStoreProvider</c>
+			<li><c>org.apache.juneau.rest.client.jazz.LenientCertificateValidator</c>
+			<li><c>org.apache.juneau.rest.client.jazz.SharedTrustStoreProvider</c>
+			<li><c>org.apache.juneau.rest.client.jazz.ValidatingX509TrustManager</c>
 		</ul>
 </ul>
 
 <h5 class='topic w800'>Server</h5>
 <ul class='spaced-list'>
-	<li>New <code><del>ReaderResource</del></code> class.   
+	<li>New <dc>ReaderResource</dc> class.   
 		Represents the contents of a text file with convenience methods for resolving
-		<code><del>StringVar</del></code> variables and adding HTTP response headers.	
-		REST Java methods can return instances of these to serialize <code>Readers</code>
-			containing text with <code><del>StringVarResolver</del></code> variables in them.
-	<li>New <code><del>StreamResource</del></code> class.   
-		REST Java methods can return instances of these to serialize <code>OutputStreams</code>.
+		<dc>StringVar</dc> variables and adding HTTP response headers.	
+		REST Java methods can return instances of these to serialize <c>Readers</c>
+			containing text with <dc>StringVarResolver</dc> variables in them.
+	<li>New <dc>StreamResource</dc> class.   
+		REST Java methods can return instances of these to serialize <c>OutputStreams</c>.
 	<li>Fixed a bug in the stack trace hash algorithm in {@link org.apache.juneau.rest.RestException}.
 	<li>New methods in {@link org.apache.juneau.rest.RestRequest}:
 		<ul>
-			<li><code><del>RestRequest.getReaderResource(String)</del></code> - Replaces <code>getVarResource(String)</code>.
-			<li><code><del>RestRequest.getReaderResource(String,boolean)</del></code> 
-			<li><code><del>RestRequest.getReaderResource(String,boolean,String)</del></code>
+			<li><dc>RestRequest.getReaderResource(String)</dc> - Replaces <c>getVarResource(String)</c>.
+			<li><dc>RestRequest.getReaderResource(String,boolean)</dc> 
+			<li><dc>RestRequest.getReaderResource(String,boolean,String)</dc>
 		</ul>
 	<li>Changes in {@link org.apache.juneau.rest.RestResponse}:
 		<ul>
-			<li>Don't set <code>Content-Encoding: identity</code> when no encoding is used.  Some clients don't interpret it correctly.
+			<li>Don't set <c>Content-Encoding: identity</c> when no encoding is used.  Some clients don't interpret it correctly.
 		</ul>
 	<li>New methods in {@link org.apache.juneau.rest.RestServlet}:
 		<ul>
-			<li><code><del>RestServlet.getChildClasses()</del></code>  - Programmatic equivalent to {@link org.apache.juneau.rest.annotation.RestResource#children() @RestResource(children)} annotation.
-			<li><code><del>RestServlet.shouldLog(HttpServletRequest,HttpServletResponse,RestException)</del></code> 
-			<li><code><del>RestServlet.shouldLogStackTrace(HttpServletRequest,HttpServletResponse,RestException)</del></code> 
-			<li><code><del>RestServlet.logObjects(Level,String,Object[])</del></code> 
-			<li><code><del>RestServlet.resolveStaticFile(String)</del></code> 
-			<li><code><del>RestServlet.createStyleSheet()</del></code> 
-			<li><code><del>RestServlet.createFavIcon()</del></code> 
-			<li><code><del>RestServlet.createStaticFilesMap()</del></code> 
-			<li><code><del>RestServlet.getConfigMgr()</del></code>
+			<li><dc>RestServlet.getChildClasses()</dc>  - Programmatic equivalent to {@link org.apache.juneau.rest.annotation.RestResource#children() @RestResource(children)} annotation.
+			<li><dc>RestServlet.shouldLog(HttpServletRequest,HttpServletResponse,RestException)</dc> 
+			<li><dc>RestServlet.shouldLogStackTrace(HttpServletRequest,HttpServletResponse,RestException)</dc> 
+			<li><dc>RestServlet.logObjects(Level,String,Object[])</dc> 
+			<li><dc>RestServlet.resolveStaticFile(String)</dc> 
+			<li><dc>RestServlet.createStyleSheet()</dc> 
+			<li><dc>RestServlet.createFavIcon()</dc> 
+			<li><dc>RestServlet.createStaticFilesMap()</dc> 
+			<li><dc>RestServlet.getConfigMgr()</dc>
 		</ul>
 	<li>Removed {@link org.apache.juneau.jso.JsoParser}
-		from {@link org.apache.juneau.rest.BasicRestServlet} and <code><del>RestServletJenaDefault</del></code>.  
+		from {@link org.apache.juneau.rest.BasicRestServlet} and <dc>RestServletJenaDefault</dc>.  
 		These may represent a security risk if not handled correctly, so removed
 		them as a precaution.
-	<li>Removed <code>RestServletProperties.REST_htDocsFolder</code>.  Replaced with {@link org.apache.juneau.rest.annotation.RestResource#staticFiles() @RestResource(staticFiles)}.
+	<li>Removed <c>RestServletProperties.REST_htDocsFolder</c>.  Replaced with {@link org.apache.juneau.rest.annotation.RestResource#staticFiles() @RestResource(staticFiles)}.
 	<li>New annotations on {@link org.apache.juneau.rest.annotation.RestResource @RestResource}.
 		<ul>
-			<li><code><del>RestResource.stylesheet()</del></code>
-			<li><code><del>RestResource.favicon()</del></code>
+			<li><dc>RestResource.stylesheet()</dc>
+			<li><dc>RestResource.favicon()</dc>
 			<li>{@link org.apache.juneau.rest.annotation.RestResource#staticFiles() @RestResource(staticFiles)}
 		</ul>
-	<li>Eliminated <code>org.apache.juneau.rest.jaxrs.JsonProvider</code> class.  
-		Some JAX-RS implementations use code scanning to find providers, so if you were using <code>DefaultJenaProvider</code>, it would
-		pick up <code>JsonProvider</code> as well.  It's easy enough to create your own implementation if needed.
-	<li>OPTIONS pages now specify <code>consumes</code> and <code>produces</code> fields instead of <code>accept</code> and <code>contentType</code> which was confusing.  
-	<li>Eliminated <code>properties</code> from OPTIONS pages. 
-	<li>New <code><del>ResourceLink.ResourceLink(String,RestRequest,String,Object[])</del></code> constructor.
+	<li>Eliminated <c>org.apache.juneau.rest.jaxrs.JsonProvider</c> class.  
+		Some JAX-RS implementations use code scanning to find providers, so if you were using <c>DefaultJenaProvider</c>, it would
+		pick up <c>JsonProvider</c> as well.  It's easy enough to create your own implementation if needed.
+	<li>OPTIONS pages now specify <c>consumes</c> and <c>produces</c> fields instead of <c>accept</c> and <c>contentType</c> which was confusing.  
+	<li>Eliminated <c>properties</c> from OPTIONS pages. 
+	<li>New <dc>ResourceLink.ResourceLink(String,RestRequest,String,Object[])</dc> constructor.
 	<li>New response handlers:
 		<ul>
-			<li><code><del>StreamableHandler</del></code> - Allows REST Java methods to return instances of {@link org.apache.juneau.Streamable}.
-			<li><code><del>WritableHandler</del></code> - Allows REST Java methods to return instances of {@link org.apache.juneau.Writable}.
+			<li><dc>StreamableHandler</dc> - Allows REST Java methods to return instances of {@link org.apache.juneau.Streamable}.
+			<li><dc>WritableHandler</dc> - Allows REST Java methods to return instances of {@link org.apache.juneau.Writable}.
 		</ul>
 	<li>New DevOps stylesheet.
 	<li>Servlet initialization and HTTP requests are now logged at <JSF>FINE</JSF> level.
 	<li>Added <jk>abstract</jk> modifier on various <l>RestServlet</l> subclasses to indicate that they're meant to be subclassed.
-	<li>New <code><del>RestUtils.trimPathInfo(StringBuffer,String,String)</del></code> method.
+	<li>New <dc>RestUtils.trimPathInfo(StringBuffer,String,String)</dc> method.
 </ul>
 
 <h5 class='topic w800'>Microservice</h5>
@@ -32201,7 +32227,7 @@
 	<li>Completely revamped API.
 	<li>New {@link org.apache.juneau.microservice.Microservice} class that serves as a generic
 		interface for microservices and their lifecycles.
-	<li>New <code><del>RestMicroservice</del></code> class that implements a microservice
+	<li>New <dc>RestMicroservice</dc> class that implements a microservice
 		consisting of a REST interface.
 		<ul>
 			<li>REST resources and configuration settings can be defined through either manifest files
@@ -32211,20 +32237,20 @@
 			<li>BASIC auth support.
 			<li>Automatic restartability if the config file changes.
 		</ul>
-	<li>Eliminated <code>org.apache.juneau.microservice.Main</code> class.  This is replaced by
+	<li>Eliminated <c>org.apache.juneau.microservice.Main</c> class.  This is replaced by
 		the microservice classes defined above.
-	<li><code><del>Resource</del></code> and <code><del>ResourceGroup</del></code>
+	<li><dc>Resource</dc> and <dc>ResourceGroup</dc>
 		classes now support the following new string variables:
 		<ul>
 			<li><js>"$A{key,default}""</js> - Command line arguments.
 			<li><js>"$MF{key,default}""</js> - Manifest file entries.
 		</ul> 
 	<li>CSS stylesheet now configurable through config file entry <js>"REST/stylesheet"</js>.
-	<li>New <code><del>BasicRestServletJena</del></code> class if you want your REST interface to support RDF.
+	<li>New <dc>BasicRestServletJena</dc> class if you want your REST interface to support RDF.
 	<li>Eliminated the following classes:
 		<ul>
-			<li><code>org.apache.juneau.microservice.RootResource</code>
-			<li><code>org.apache.juneau.microservice.SampleResource</code>
+			<li><c>org.apache.juneau.microservice.RootResource</c>
+			<li><c>org.apache.juneau.microservice.SampleResource</c>
 		</ul> 
 	<li>New predefined reusable resources:
 		<ul>
@@ -32245,9 +32271,9 @@
 <ul class='spaced-list'>
 	<li><del>org.apache.juneau.microservice</del> - New package-level javadoc.
 	<li><del>org.apache.juneau.config</del> - New package-level javadoc.
-	<li><code><del>StringVarResolver</del></code> - New documentation.
+	<li><dc>StringVarResolver</dc> - New documentation.
 	<li><del>org.apache.juneau.rest.client</del> - New package-level javadoc.
-	<li><code><del>Overview / Samples</del></code> - New section.
+	<li><dc>Overview / Samples</dc> - New section.
 	<li><del>org.apache.juneau.transform / Stop Classes</del> - New section.
 	<li><del>org.apache.juneau.rest</del> - Extensive updates.
 </ul>
@@ -32269,31 +32295,31 @@
 	<li>Fixed issue in {@link org.apache.juneau.xml.XmlSerializer} where <js>'\r'</js> and <js>'\n'</js> characters were not being handled per XML specs.
 	<li>New methods on {@link org.apache.juneau.ObjectList}:  
 		<ul>
-			<li><code><del>ObjectList.getAt(Class,String)</del></code>
+			<li><dc>ObjectList.getAt(Class,String)</dc>
 			<li>{@link org.apache.juneau.ObjectList#putAt(String,Object)}
 			<li>{@link org.apache.juneau.ObjectList#postAt(String,Object)}
 			<li>{@link org.apache.juneau.ObjectList#deleteAt(String)}
 		</ul>
 	<li>New methods on {@link org.apache.juneau.ObjectMap}:  
 		<ul>
-			<li><code><del>ObjectMap.getAt(Class,String)</del></code>
+			<li><dc>ObjectMap.getAt(Class,String)</dc>
 			<li>{@link org.apache.juneau.ObjectMap#putAt(String,Object)}
 			<li>{@link org.apache.juneau.ObjectMap#postAt(String,Object)}
 			<li>{@link org.apache.juneau.ObjectMap#deleteAt(String)}
 		</ul>
-	<li><code><del>@ThreadSafe</del></code> annotation.
-	<li>New <code>ClassFilter</code> class.
-	<li><code><del>ConfigFile.getResolving(StringVarResolver,boolean)</del></code> method.
-	<li><code><del>ConfigFile.getStringVar()</del></code> method.
-	<li>New <code><del>ParserContext.PARSER_trimStrings</del></code> property.
-	<li>New <code><del>SerializerContext.SERIALIZER_trimStrings</del></code> property.
-	<li><code><del>Args.getStringVar()}</del></code> method.
+	<li><dc>@ThreadSafe</dc> annotation.
+	<li>New <c>ClassFilter</c> class.
+	<li><dc>ConfigFile.getResolving(StringVarResolver,boolean)</dc> method.
+	<li><dc>ConfigFile.getStringVar()</dc> method.
+	<li>New <dc>ParserContext.PARSER_trimStrings</dc> property.
+	<li>New <dc>SerializerContext.SERIALIZER_trimStrings</dc> property.
+	<li><dc>Args.getStringVar()}</dc> method.
 	<li>New {@link org.apache.juneau.utils.ManifestFile} class
 	<li>New {@link org.apache.juneau.utils.MessageBundle} class.  Replaces <l>SafeResourceBundle</l>/<l>SafeResourceMultiBundle</l>/<l>RestNls</l>.
-	<li>New <code><del>StringMapVar</del></code> class.
-	<li>New <code><del>StringVars</del></code> class with reusable common <code><del>StringVar</del></code> instances.
+	<li>New <dc>StringMapVar</dc> class.
+	<li>New <dc>StringVars</dc> class with reusable common <dc>StringVar</dc> instances.
 	<li>New {@link org.apache.juneau.internal.JuneauLogger} class.
-	<li>Default value for <code><del>XmlParserContext.XML_trimWhitespace</del></code> changed to <jk>true</jk>.			
+	<li>Default value for <dc>XmlParserContext.XML_trimWhitespace</dc> changed to <jk>true</jk>.			
 </ul>
 
 <h5 class='topic w800'>Server</h5>
@@ -32341,7 +32367,7 @@
 			<li>More consistent handling of exceptions.
 			<li>More consistent method declarations.
 		</ul>
-	<li>Refactored var resolver API and added them to a new package - <code>org.apache.juneau.svl</code>.
+	<li>Refactored var resolver API and added them to a new package - <c>org.apache.juneau.svl</c>.
 		<ul>
 			<li>Support for stream-based variables - {@link org.apache.juneau.svl.StreamedVar}.
 			<li>Added support for context and session objects.
@@ -32360,47 +32386,47 @@
 			<li>{@link org.apache.juneau.BeanContext#BEAN_beanTypePropertyName} - The overridable type property name.  Default is <js>"_type"</js>.
 			<li>{@link org.apache.juneau.annotation.BeanProperty#beanDictionary() @BeanProperty(beanDictionary)} - Define a type dictionary
 				for a particular bean property value.  This overrides the value specified using {@link org.apache.juneau.BeanContext#BEAN_beanDictionary}.
-			<li><code><del>SerializerContext.SERIALIZER_addBeanTypeProperties</del></code> - Controls whether type properties are serialized.
+			<li><dc>SerializerContext.SERIALIZER_addBeanTypeProperties</dc> - Controls whether type properties are serialized.
 		</ul>
-		In addition, the {@link org.apache.juneau.annotation.Bean#typeName() @Bean(typeName)} value replaces the <code>@Xml(name)</code> annotation, and the 
+		In addition, the {@link org.apache.juneau.annotation.Bean#typeName() @Bean(typeName)} value replaces the <c>@Xml(name)</c> annotation, and the 
 		<js>"type"</js> and <js>"_class"</js> attributes in the XML and HTML serializers have been standardized on a single <js>"_type"</js> attribute.
 	<li>Refactor bean filter support to use {@link org.apache.juneau.transform.BeanFilterBuilder} class.
-		Allows the <code>BeanFilter</code> class to use final fields.
+		Allows the <c>BeanFilter</c> class to use final fields.
 	<li>{@link org.apache.juneau.msgpack MessagePack} support.
 	<li>Serializers can now serialize directly to {@link java.io.File Files}.
 		See {@link org.apache.juneau.serializer.Serializer#serialize(Object,Object)}
 	<li>Parsers can now parse directly from {@link java.io.File Files} and other types.
 		See {@link org.apache.juneau.parser.Parser#parse(Object,ClassMeta)}
-	<li>Parsers will automatically covert numeric input to POJOs that have numeric constructors (e.g. <code>java.util.Date</code>).
+	<li>Parsers will automatically covert numeric input to POJOs that have numeric constructors (e.g. <c>java.util.Date</c>).
 	<li>Renamed 'Filters' to 'BeanFilters' and 'PojoSwaps'.  Filters is just too overloaded a term.
-	<li>Internal utility classes moved to a new <code>org.apache.juneau.internal</code> package.
+	<li>Internal utility classes moved to a new <c>org.apache.juneau.internal</c> package.
 		These internal utility classes are not meant for consumption outside the Juneau codebase.
 	<li>New methods on {@link org.apache.juneau.parser.Parser}:
 		<ul>
-			<li><code>org.apache.juneau.parser.Parser.createSession(ObjectMap,Method,Object)</code>
-			<li><code><del>Parser.getMediaRanges()</del></code>
+			<li><c>org.apache.juneau.parser.Parser.createSession(ObjectMap,Method,Object)</c>
+			<li><dc>Parser.getMediaRanges()</dc>
 		</ul>
 	</li>
 	<li>New methods on {@link org.apache.juneau.serializer.Serializer}:
 		<ul>
-			<li><code>org.apache.juneau.serializer.Serializer.createSession(ObjectMap,Method)</code>
-			<li><code><del>Serializer.getMediaRanges()</del></code>
+			<li><c>org.apache.juneau.serializer.Serializer.createSession(ObjectMap,Method)</c>
+			<li><dc>Serializer.getMediaRanges()</dc>
 		</ul>
 	</li>
 	<li>New {@link org.apache.juneau.annotation.Bean#sort() @Bean(sort)} annotation.
 	<li>Added <ja>@Bean.properties</ja> annotations on various DTO beans to make the ordering consistent
 		between IBM and Oracle JVMs.<br>
 		IBM JVMs maintain the order of methods in a class, whereas Oracle JVMs do not.
-	<li>Serializers and parsers now automatically convert {@link java.lang.Class} objects to readable names via <code><del>ClassUtils.getReadableClassName(Class)</del></code>.
-	<li>Eliminated the <code>ClassFilter</code> class since it's no longer needed.
+	<li>Serializers and parsers now automatically convert {@link java.lang.Class} objects to readable names via <dc>ClassUtils.getReadableClassName(Class)</dc>.
+	<li>Eliminated the <c>ClassFilter</c> class since it's no longer needed.
 	<li>Code and concurrency improvements to {@link org.apache.juneau.serializer.SerializerGroup} and {@link org.apache.juneau.parser.ParserGroup}.
-	<li>Various enhancements to <code><del>BeanContext.convertToType(Object,Class)</del></code>.
+	<li>Various enhancements to <dc>BeanContext.convertToType(Object,Class)</dc>.
 	<li>New properties on {@link org.apache.juneau.html.HtmlSerializer}:
 		<ul>
-			<li><code><del>HtmlSerializerContext.HTML_detectLinksInStrings</del></code> - Automatically detect hyperlinks in strings.
-			<li><code><del>HtmlSerializerContext.HTML_lookForLabelParameters</del></code> - Specify anchor text by appending <code>&amp;label=MyLabel</code> to URL.
-			<li><code><del>HtmlSerializerContext.HTML_labelParameter</del></code> - Specify what URL parameter to use as the anchor text label.
-			<li><code><del>HtmlSerializerContext.URI_ANCHOR</del></code> option for <code><del>HtmlSerializerContext.HTML_uriAnchorText</del></code>.				
+			<li><dc>HtmlSerializerContext.HTML_detectLinksInStrings</dc> - Automatically detect hyperlinks in strings.
+			<li><dc>HtmlSerializerContext.HTML_lookForLabelParameters</dc> - Specify anchor text by appending <c>&amp;label=MyLabel</c> to URL.
+			<li><dc>HtmlSerializerContext.HTML_labelParameter</dc> - Specify what URL parameter to use as the anchor text label.
+			<li><dc>HtmlSerializerContext.URI_ANCHOR</dc> option for <dc>HtmlSerializerContext.HTML_uriAnchorText</dc>.				
 		</ul>
 	</li>
 	<li>Removed generics from {@link org.apache.juneau.BeanPropertyMeta}.
@@ -32411,7 +32437,7 @@
 			<li>{@link org.apache.juneau.BeanPropertyMetaExtended} / {@link org.apache.juneau.BeanPropertyMeta#getExtendedMeta(Class)} 
 		</ul>
 	</li>
-	<li>Renamed <code>@Transform</code> annotation to <code><del>@Pojo</del></code> so that it can be used for various POJO-related behavior, not just associating transforms.  
+	<li>Renamed <c>@Transform</c> annotation to <dc>@Pojo</dc> so that it can be used for various POJO-related behavior, not just associating transforms.  
 	<li>Introduced {@link org.apache.juneau.dto.swagger Swagger DTOs}.
 </ul>		
 
@@ -32421,44 +32447,44 @@
 		Lots of changes related to supporting Swagger.
 		<ul>
 			<li>Annotation name changes to conform to Swagger specs:  <ja>@Attr</ja>-&gt;<ja>@Path</ja>, <ja>@QParam</ja>-&gt;<ja>@Query</ja>, <ja>@Param</ja>-&gt;<ja>@FormData</ja>, <ja>@Content</ja>-&gt;<ja>@Body</ja>
-			<li>Eliminated <code>ResourceOptions</code> and related code.
+			<li>Eliminated <c>ResourceOptions</c> and related code.
 			<li>New annotations and related methods:
 				<ul>
 					<li>{@link org.apache.juneau.rest.annotation.RestResource#title() @RestResource(title)} / {@link org.apache.juneau.rest.RestInfoProvider#getTitle(RestRequest)}
 					<li>{@link org.apache.juneau.rest.annotation.RestResource#description() @RestResource(description)} / {@link org.apache.juneau.rest.RestInfoProvider#getDescription(RestRequest)}
-					<li><code><del>@RestResource(termsOfService)</del></code> / <code><del>RestInfoProvider.getTermsOfService(RestRequest)</del></code>
-					<li><code><del>@RestResource(contact)</del></code> / <code><del>RestInfoProvider.getContact(RestRequest)</del></code>
-					<li><code><del>@RestResource(license)</del></code> / <code><del>RestInfoProvider.getLicense(RestRequest)</del></code>
-					<li><code><del>@RestResource(version)</del></code> / <code><del>RestInfoProvider.getVersion(RestRequest)</del></code>
-					<li><code><del>@RestResource(tags)</del></code> / <code><del>RestInfoProvider.getTags(RestRequest)</del></code>
-					<li><code><del>@RestResource(externalDocs)</del></code> / <code><del>RestInfoProvidergetExternalDocs(RestRequest)</del></code>
-					<li>{@link org.apache.juneau.rest.annotation.RestMethod#summary() @RestMethod(summary)} / <code><del>RestInfoProvider.getMethodSummary(String,RestRequest)</del></code>
-					<li>{@link org.apache.juneau.rest.annotation.RestMethod#description() @RestMethod(description)} /<code><del>RestInfoProvider.getMethodDescription(String,RestRequest)</del></code>
-					<li><code><del>@RestMethod(externalDocs)</del></code>
-					<li><code><del>@RestMethod(tags)</del></code>
-					<li><code><del>@RestMethod(deprecated)</del></code> 
-					<li><code><del>@RestMethod(parameters)</del></code> 
-					<li><code><del>@RestMethod(responses)</del></code>
+					<li><dc>@RestResource(termsOfService)</dc> / <dc>RestInfoProvider.getTermsOfService(RestRequest)</dc>
+					<li><dc>@RestResource(contact)</dc> / <dc>RestInfoProvider.getContact(RestRequest)</dc>
+					<li><dc>@RestResource(license)</dc> / <dc>RestInfoProvider.getLicense(RestRequest)</dc>
+					<li><dc>@RestResource(version)</dc> / <dc>RestInfoProvider.getVersion(RestRequest)</dc>
+					<li><dc>@RestResource(tags)</dc> / <dc>RestInfoProvider.getTags(RestRequest)</dc>
+					<li><dc>@RestResource(externalDocs)</dc> / <dc>RestInfoProvidergetExternalDocs(RestRequest)</dc>
+					<li>{@link org.apache.juneau.rest.annotation.RestMethod#summary() @RestMethod(summary)} / <dc>RestInfoProvider.getMethodSummary(String,RestRequest)</dc>
+					<li>{@link org.apache.juneau.rest.annotation.RestMethod#description() @RestMethod(description)} /<dc>RestInfoProvider.getMethodDescription(String,RestRequest)</dc>
+					<li><dc>@RestMethod(externalDocs)</dc>
+					<li><dc>@RestMethod(tags)</dc>
+					<li><dc>@RestMethod(deprecated)</dc> 
+					<li><dc>@RestMethod(parameters)</dc> 
+					<li><dc>@RestMethod(responses)</dc>
 				</ul>
 			</li>					
 		</ul>
-	<li>New <code><del>RestServletContext.paramFormat</del></code> context property.
+	<li>New <dc>RestServletContext.paramFormat</dc> context property.
 	<li>New/updated methods on {@link org.apache.juneau.rest.RestServlet}:
 		<ul>
-			<li><code><del>RestServlet.createProperties()</del></code>
-			<li><code><del>RestServlet.createBeanContext(ObjectMap,Class[],Class[])</del></code>
-			<li><code><del>RestServlet.createBeanFilters()</del></code>
-			<li><code><del>RestServlet.createPojoSwaps()</del></code>
-			<li><code><del>RestServlet.createParsers(ObjectMap,Class[],Class[])</del></code>
-			<li><code><del>RestServlet.createUrlEncodingSerializer(ObjectMap,Class[],Class[])</del></code>
-			<li><code><del>RestServlet.createUrlEncodingParser(ObjectMap,Class[],Class[])</del></code>
-			<li><code><del>RestServlet.createConverters(ObjectMap)</del></code>
-			<li><code><del>RestServlet.createDefaultRequestHeaders(ObjectMap)</del></code>
-			<li><code><del>RestServlet.createDefaultResponseHeaders(ObjectMap)</del></code>
-			<li><code><del>RestServlet.createEncoders(ObjectMap)</del></code>
-			<li><code><del>RestServlet.createGuards(ObjectMap)</del></code>
-			<li><code><del>RestServlet.createMimetypesFileTypeMap(ObjectMap)</del></code>
-			<li><code><del>RestServlet.createResponseHandlers(ObjectMap)</del></code>
+			<li><dc>RestServlet.createProperties()</dc>
+			<li><dc>RestServlet.createBeanContext(ObjectMap,Class[],Class[])</dc>
+			<li><dc>RestServlet.createBeanFilters()</dc>
+			<li><dc>RestServlet.createPojoSwaps()</dc>
+			<li><dc>RestServlet.createParsers(ObjectMap,Class[],Class[])</dc>
+			<li><dc>RestServlet.createUrlEncodingSerializer(ObjectMap,Class[],Class[])</dc>
+			<li><dc>RestServlet.createUrlEncodingParser(ObjectMap,Class[],Class[])</dc>
+			<li><dc>RestServlet.createConverters(ObjectMap)</dc>
+			<li><dc>RestServlet.createDefaultRequestHeaders(ObjectMap)</dc>
+			<li><dc>RestServlet.createDefaultResponseHeaders(ObjectMap)</dc>
+			<li><dc>RestServlet.createEncoders(ObjectMap)</dc>
+			<li><dc>RestServlet.createGuards(ObjectMap)</dc>
+			<li><dc>RestServlet.createMimetypesFileTypeMap(ObjectMap)</dc>
+			<li><dc>RestServlet.createResponseHandlers(ObjectMap)</dc>
 		</ul>
 	</li>
 	<li>New client-version annotations:
@@ -32471,8 +32497,8 @@
 
 <h5 class='topic w800'>org.apache.juneau.rest.client</h5>
 <ul class='spaced-list'>
-	<li>Removed the <code>JazzRestClient</code> class.
-	<li>New method <code><del>RestClient.setClientVersion(String)</del></code>.
+	<li>Removed the <c>JazzRestClient</c> class.
+	<li>New method <dc>RestClient.setClientVersion(String)</dc>.
 </ul>
 </div><!-- END: 6.0.0 -->
 
@@ -32490,14 +32516,14 @@
 		<ul>
 			<li>Several fixes to handle obscure edge cases.
 		</ul>
-	<li>New properties in <code><del>ParserContext</del></code>.
+	<li>New properties in <dc>ParserContext</dc>.
 		<ul>
-			<li><code><del>ParserContext.PARSER_strict</del></code>
-			<li><code><del>ParserContext.PARSER_inputStreamCharset</del></code>
-			<li><code><del>ParserContext.PARSER_fileCharset</del></code>
+			<li><dc>ParserContext.PARSER_strict</dc>
+			<li><dc>ParserContext.PARSER_inputStreamCharset</dc>
+			<li><dc>ParserContext.PARSER_fileCharset</dc>
 		</ul>
-	<li>Removed <code>JsonParserContext.JSON_strictMode</code>.  Replaced by <code>PARSER_strict</code>.		
-	<li><code><jk>byte[]</jk></code> arrays can now be passed to {@link org.apache.juneau.parser.Parser#parse(Object,Class)} for reader-based parsers.	
+	<li>Removed <c>JsonParserContext.JSON_strictMode</c>.  Replaced by <c>PARSER_strict</c>.		
+	<li><c><jk>byte[]</jk></c> arrays can now be passed to {@link org.apache.juneau.parser.Parser#parse(Object,Class)} for reader-based parsers.	
 </ul>
 </div><!-- END: 6.0.1 -->
 
@@ -32533,28 +32559,28 @@
 				<li>New {@link org.apache.juneau.xml.annotation.XmlFormat#XMLTEXT} format that's identical to {@link org.apache.juneau.xml.annotation.XmlFormat#TEXT} except 
 					XML content is not escaped and serialized directly as the child content.  The parser will reconvert this to the original XML text during parsing.
 			</ul>
-			<li>New support methodology and other improvements to <code><del>org.apache.juneau.xml</del></code> documentation.
+			<li>New support methodology and other improvements to <dc>org.apache.juneau.xml</dc> documentation.
 			<li>Eliminated unnecessary <xt>&lt;string&gt;</xt> elements.
-			<li>Eliminated <code><del>XmlContentHandler</del></code> class.
+			<li>Eliminated <dc>XmlContentHandler</dc> class.
 			<li>Parser efficiency improvements through reuse of string builders.
 			<li>Reworked and simplified the default XML serializers.  The {@link org.apache.juneau.xml.XmlSerializer#DEFAULT} serializer now has namespaces disabled,
 				and {@link org.apache.juneau.xml.XmlSerializer#DEFAULT_NS} has namespaces enabled.  The 'XML-JSON' serializers have been eliminated.
-			<li>Eliminated the <code>addJsonTypeAttrs</code> and <code>addJsonStringTypeAttrs</code> settings.
+			<li>Eliminated the <c>addJsonTypeAttrs</c> and <c>addJsonStringTypeAttrs</c> settings.
 			<li>Namespace support is now disabled by default.
 		</ul>
 	<li>Significant modifications and improvements to HTML serialization support.
 		<ul>
-			<li>Parser converted from <code>XMLEventReader</code>-based to <code>XMLStreamReader</code>.
+			<li>Parser converted from <c>XMLEventReader</c>-based to <c>XMLStreamReader</c>.
 			<li>Eliminated many unnecessary type tags and <xt>&lt;string&gt;</xt> elements and improved the readable layout.  
 				The new format is much leaner.
-			<li>New exhaustive support methodology section added to <code><del>org.apache.juneau.html</del></code> documentation.
+			<li>New exhaustive support methodology section added to <dc>org.apache.juneau.html</dc> documentation.
 		</ul>
-	<li>New HTML5 DTO support:  <code><del>org.apache.juneau.dto.html5</del></code>.
+	<li>New HTML5 DTO support:  <dc>org.apache.juneau.dto.html5</dc>.
 	<li>{@link org.apache.juneau.BeanContext} class split into separate {@link org.apache.juneau.BeanContext} and {@link org.apache.juneau.BeanSession} classes.
 	<ul>
 		<li>Session object meant to be single-use that can be discarded after use and contains session-level object cache and overridable Locale and TimeZone.
 	</ul>  
-	<li><code><del>SerializerContext</del></code> and <code><del>ParserContext</del></code>
+	<li><dc>SerializerContext</dc> and <dc>ParserContext</dc>
 		now extend directly from {@link org.apache.juneau.BeanContext}.
 	<li>{@link org.apache.juneau.serializer.SerializerSession} and {@link org.apache.juneau.parser.ParserSession}
 		now extend directly from {@link org.apache.juneau.BeanSession}.
@@ -32567,14 +32593,14 @@
 	</ul>
 	<li>Improvements to Parser class:  
 	<ul>
-		<li>Simplified the parse methods (e.g. <code>parseMap()</code>, <code>parseCollection()</code>)
+		<li>Simplified the parse methods (e.g. <c>parseMap()</c>, <c>parseCollection()</c>)
 		by replacing them with two simple methods: 
 		<ul>
 			<li>{@link org.apache.juneau.parser.Parser#parse(Object,Class)} - Normal method.
 			<li>{@link org.apache.juneau.parser.Parser#parse(Object,Type,Type...)} - Method for parsing into parameterized maps and collections.
 		</ul>
 		Using these methods, you can construct arbitrarily complex objects consisting of maps and collections.
-		You could do this before, but it required constructing a <code>ClassMeta</code> object.  
+		You could do this before, but it required constructing a <c>ClassMeta</c> object.  
 		<br>For example:
 			<p class='bcode w800'>
 	<jc>// Old way:</jc>
@@ -32591,9 +32617,9 @@
 	<jc>// New way:</jc>
 	Map&lt;String,List&lt;MyBean&gt;&gt; map = parser.parse(input, HashMap.<jk>class</jk>, String.<jk>class</jk>, LinkedList.<jk>class</jk>, MyBean.<jk>class</jk>);
 			</p>
-		<li>Arbitrarily-complex parameterized maps and collections can now be parsed without the need for creating intermediate <code>ClassMeta</code> objects.
-		<li>No need for casting anymore if you were using the old <code>parseMap()</code> and <code>parseCollection()</code> methods!
-		<li>Changes allow me to eliminate <code>BeanContext.normalizeClassMeta()</code> method.
+		<li>Arbitrarily-complex parameterized maps and collections can now be parsed without the need for creating intermediate <c>ClassMeta</c> objects.
+		<li>No need for casting anymore if you were using the old <c>parseMap()</c> and <c>parseCollection()</c> methods!
+		<li>Changes allow me to eliminate <c>BeanContext.normalizeClassMeta()</c> method.
 		<li>Convenience methods added for setting parser properties:
 			<p class='bcode w800'>
 	<jc>// Old way:</jc>
@@ -32622,9 +32648,9 @@
 	<li>General code improvements made to {@link org.apache.juneau.ClassMeta} class.
 	<ul>
 		<li>All fields are now final which should improve overall performance.
-		<li>Replaced support for <code>toObjectMap()</code> and <code>fromObjectMap()/T(ObjectMap)</code> methods with
-			generalized <code>swap(BeanSession)</code>/<code>unswap(BeanSession,X)</code>/<code>T(BeanSession,X)</code> methods.<br>
-			See new section <code><del>Swap methods</del></code> for information.
+		<li>Replaced support for <c>toObjectMap()</c> and <c>fromObjectMap()/T(ObjectMap)</c> methods with
+			generalized <c>swap(BeanSession)</c>/<c>unswap(BeanSession,X)</c>/<c>T(BeanSession,X)</c> methods.<br>
+			See new section <dc>Swap methods</dc> for information.
 	</ul>
 	<li>Session-level media type now available through {@link org.apache.juneau.BeanSession#getMediaType()} method.
 		Allows for swaps and serializer/parser behavior to be tailored to individual media types.
@@ -32670,67 +32696,67 @@
 		<ul>
 			<li>New {@link org.apache.juneau.dto.atom.AtomBuilder} class.
 			<li>New setter method names for a better fluent design.
-			<li>Updated <code><del>org.apache.juneau.dto.atom</del></code> documentation.
+			<li>Updated <dc>org.apache.juneau.dto.atom</dc> documentation.
 		</ul>
 	<li>New {@link org.apache.juneau.transform.MapSwap} and {@link org.apache.juneau.transform.StringSwap} classes.
 	<li>New {@link org.apache.juneau.serializer.WriterSerializer#println(Object)} method.  Useful for debugging purposes.
 	<li>New {@link org.apache.juneau.BeanContext#getClassMeta(Type,Type...)} and {@link org.apache.juneau.BeanSession#getClassMeta(Type,Type...)}
 		methods for retrieving Map and Collection class metas.  
-		Replaces the various <code>getMapClassMeta()</code>/<code>getCollectionClassMeta()</code> methods.  
-	<li>New section added to this document:	<code><del>Juneau Data Transfer Objects (org.apache.juneau.dto)</del></code>
+		Replaces the various <c>getMapClassMeta()</c>/<c>getCollectionClassMeta()</c> methods.  
+	<li>New section added to this document:	<dc>Juneau Data Transfer Objects (org.apache.juneau.dto)</dc>
 	<li>Modified the UON specification to work with mixed content.
 	<ul>
 		<li>The new specification is considerably cleaner and eliminates the need for separate normal/simple modes.
 			<br>It also allows for arbitrary whitespace to be added to the output without any confusion.
-		<li>Eliminated the <code>UonParser.<jsf>DEFAULT_WS_AWARE</jsf></code> and <code>UrlEncodingParser.<jsf>DEFAULT_WS_AWARE</jsf></code> parsers.
+		<li>Eliminated the <c>UonParser.<jsf>DEFAULT_WS_AWARE</jsf></c> and <c>UrlEncodingParser.<jsf>DEFAULT_WS_AWARE</jsf></c> parsers.
 			<br>The normal {@link org.apache.juneau.uon.UonParser#DEFAULT} and {@link org.apache.juneau.urlencoding.UrlEncodingParser#DEFAULT} parsers will now handle whitespace.
-		<li>Eliminated the <code>UonParserContext.<jsf>UON_whitespaceAware</jsf></code> configuration setting.
-		<li>Eliminated the <code>UonSerializer.<jsf>DEFAULT_SIMPLE</jsf></code>, <code>UonSerializer.<jsf>DEFAULT_SIMPLE_ENCODING</jsf></code>
-			and <code>UrlEncodingSerializer.<jsf>DEFAULT_SIMPLE</jsf></code>
+		<li>Eliminated the <c>UonParserContext.<jsf>UON_whitespaceAware</jsf></c> configuration setting.
+		<li>Eliminated the <c>UonSerializer.<jsf>DEFAULT_SIMPLE</jsf></c>, <c>UonSerializer.<jsf>DEFAULT_SIMPLE_ENCODING</jsf></c>
+			and <c>UrlEncodingSerializer.<jsf>DEFAULT_SIMPLE</jsf></c>
 			serializers since there is no separate simple mode anymore.
-		<li>Eliminated the <code>UonParserContext.<jsf>UON_simpleMode</jsf></code> configuration setting.
+		<li>Eliminated the <c>UonParserContext.<jsf>UON_simpleMode</jsf></c> configuration setting.
 	</ul>
-	<li>Added new <code><del>OutputStreamSerializer.serializeToHex(Object)</del></code> method. 
+	<li>Added new <dc>OutputStreamSerializer.serializeToHex(Object)</dc> method. 
 		<br>Useful mostly for testing purposes.
 		<br>Equivalently, the {@link org.apache.juneau.parser.InputStreamParser#parse(Object,Class)} method can now 
 			read the output from this method.
-	<li>Eliminated the <code><ja>@Bean</ja>(subTypeProperty)</code> and <code><ja>@Bean</ja>(subTypes)</code> annotations
+	<li>Eliminated the <c><ja>@Bean</ja>(subTypeProperty)</c> and <c><ja>@Bean</ja>(subTypes)</c> annotations
 		and replaced them with the ability to define subtypes using the existing {@link org.apache.juneau.annotation.Bean#beanDictionary() @Bean(beanDictionary)}
 		annotation on parent classes and interfaces.
 		<br>This has the added benefit of simplifying the overall code.
-	<li>The <code><del>SerializerContext.SERIALIZER_addBeanTypeProperties</del></code> setting is now enabled by default.
-	<li>Combined the <code>SERIALIZER_addIndentation</code>/<code>JSON_addWhitespace</code>/<code>UON_addWhitespace</code>
-		properties into a single <code><del>SerializerContext.SERIALIZER_useWhitespace</del></code> setting.
+	<li>The <dc>SerializerContext.SERIALIZER_addBeanTypeProperties</dc> setting is now enabled by default.
+	<li>Combined the <c>SERIALIZER_addIndentation</c>/<c>JSON_addWhitespace</c>/<c>UON_addWhitespace</c>
+		properties into a single <dc>SerializerContext.SERIALIZER_useWhitespace</dc> setting.
 </ul>
 
 <h5 class='topic w800'>org.apache.juneau.rest</h5>
 <ul class='spaced-list'>
 	<li>{@link org.apache.juneau.rest.RestRequest} now passes locale and timezone to serializers/parsers/transforms.
-	<li><code><del>RestRequest.getTimeZone()</del></code> method.
-	<li>Standardized the following methods in {@link org.apache.juneau.rest.RestRequest} to remove dependency on <code>ClassMeta</code>
+	<li><dc>RestRequest.getTimeZone()</dc> method.
+	<li>Standardized the following methods in {@link org.apache.juneau.rest.RestRequest} to remove dependency on <c>ClassMeta</c>
 		objects and eliminate the need for casts:
 		<ul>
-			<li><code><del>RestRequest.getHeader(String,Class)</del></code>
-			<li><code><del>RestRequest.getHeader(String,Object,Class)</del></code>
-			<li><code><del>RestRequest.getHeader(String,Type,Type...)</del></code>
-			<li><code><del>RestRequest.getQueryParameter(String,Class)</del></code>
-			<li><code><del>RestRequest.getQueryParameter(String,Object,Class)</del></code>
-			<li><code><del>RestRequest.getQueryParameter(String,Type,Type...)</del></code>
-			<li><code><del>RestRequest.getQueryParameter(String,Object,Type,Type...)</del></code>
-			<li><code><del>RestRequest.getQueryParameters(String,Class)</del></code>
-			<li><code><del>RestRequest.getQueryParameters(String,Type,Type...)</del></code>
-			<li><code><del>RestRequest.getFormDataParameter(String,Class)</del></code>
-			<li><code><del>RestRequest.getFormDataParameter(String,Object,Class)</del></code>
-			<li><code><del>RestRequest.getFormDataParameters(String,Class)</del></code>
-			<li><code><del>RestRequest.getFormDataParameter(String,Type,Type...)</del></code>
-			<li><code><del>RestRequest.getFormDataParameters(String,Type,Type...)</del></code>
-			<li><code><del>RestRequest.getPathParameter(String,Class)</del></code>
-			<li><code><del>RestRequest.getPathParameter(String,Type,Type...)</del></code>
-			<li><code><del>RestRequest.getBody(Class)</del></code>
-			<li><code><del>RestRequest.getBody(Type,Type...)</del></code>
+			<li><dc>RestRequest.getHeader(String,Class)</dc>
+			<li><dc>RestRequest.getHeader(String,Object,Class)</dc>
+			<li><dc>RestRequest.getHeader(String,Type,Type...)</dc>
+			<li><dc>RestRequest.getQueryParameter(String,Class)</dc>
+			<li><dc>RestRequest.getQueryParameter(String,Object,Class)</dc>
+			<li><dc>RestRequest.getQueryParameter(String,Type,Type...)</dc>
+			<li><dc>RestRequest.getQueryParameter(String,Object,Type,Type...)</dc>
+			<li><dc>RestRequest.getQueryParameters(String,Class)</dc>
+			<li><dc>RestRequest.getQueryParameters(String,Type,Type...)</dc>
+			<li><dc>RestRequest.getFormDataParameter(String,Class)</dc>
+			<li><dc>RestRequest.getFormDataParameter(String,Object,Class)</dc>
+			<li><dc>RestRequest.getFormDataParameters(String,Class)</dc>
+			<li><dc>RestRequest.getFormDataParameter(String,Type,Type...)</dc>
+			<li><dc>RestRequest.getFormDataParameters(String,Type,Type...)</dc>
+			<li><dc>RestRequest.getPathParameter(String,Class)</dc>
+			<li><dc>RestRequest.getPathParameter(String,Type,Type...)</dc>
+			<li><dc>RestRequest.getBody(Class)</dc>
+			<li><dc>RestRequest.getBody(Type,Type...)</dc>
 		</ul>
 	<li>New methods on {@link org.apache.juneau.rest.client.NameValuePairs}
-	<li>Fixed issue where whitespace was not added to UON/URL-Encoding output when <code>&amp;plainText=true</code> specified.
+	<li>Fixed issue where whitespace was not added to UON/URL-Encoding output when <c>&amp;plainText=true</c> specified.
 </ul>
 </div><!-- END: 6.1.0 -->
 
@@ -32773,36 +32799,36 @@
 			<li>{@link org.apache.juneau.parser.ParserGroupBuilder}
 			<li>{@link org.apache.juneau.encoders.EncoderGroupBuilder}
 		</ul>
-	<li>Revamped the config file API to use a build:  <code><del>ConfigFileBuilder</del></code>.
-	<li>Removed the <code><del>Lockable</del></code> interface.
-	<li>New <code>addBeanTypeProperties</code> setting added to serializers to override the 
-		<code><del>SerializerContext.SERIALIZER_addBeanTypeProperties</del></code> setting
+	<li>Revamped the config file API to use a build:  <dc>ConfigFileBuilder</dc>.
+	<li>Removed the <dc>Lockable</dc> interface.
+	<li>New <c>addBeanTypeProperties</c> setting added to serializers to override the 
+		<dc>SerializerContext.SERIALIZER_addBeanTypeProperties</dc> setting
 		for individual serializers in a serializer group:
 		<ul>
-			<li><code><del>HtmlSerializerContext.HTML_addBeanTypeProperties</del></code>
-			<li><code><del>JsonSerializerContext.JSON_addBeanTypeProperties</del></code>
-			<li><code><del>MsgPackSerializerContext.MSGPACK_addBeanTypeProperties</del></code>
-			<li><code><del>UonSerializerContext.UON_addBeanTypeProperties</del></code>
-			<li><code><del>XmlSerializerContext.#XML_addBeanTypeProperties</del></code>
-			<li><code><del>RdfSerializerContext.RDF_addBeanTypeProperties</del></code>
+			<li><dc>HtmlSerializerContext.HTML_addBeanTypeProperties</dc>
+			<li><dc>JsonSerializerContext.JSON_addBeanTypeProperties</dc>
+			<li><dc>MsgPackSerializerContext.MSGPACK_addBeanTypeProperties</dc>
+			<li><dc>UonSerializerContext.UON_addBeanTypeProperties</dc>
+			<li><dc>XmlSerializerContext.#XML_addBeanTypeProperties</dc>
+			<li><dc>RdfSerializerContext.RDF_addBeanTypeProperties</dc>
 		</ul>
-	<li>UON notation serializers and parsers moved into the new <code>org.apache.juneau.uon</code> package.
+	<li>UON notation serializers and parsers moved into the new <c>org.apache.juneau.uon</c> package.
 	<li>New {@link org.apache.juneau.xml.annotation.XmlFormat#VOID} format to identify HTML void elements.
 	<li>Tweaks to HTML5 support.
 		<ul>
 			<li>Fixed handling of empty non-void elements in HTML serializer.
-			<li>Added <code>style()</code> override methods to all elements.
+			<li>Added <c>style()</c> override methods to all elements.
 		</ul>
 	<li>Improvements to Swagger support.
 		<ul>
 			<li>New {@link org.apache.juneau.dto.swagger.SwaggerBuilder} class.
 			<li>Fluent-style setters added to the Swagger beans.
-			<li>Added Swagger examples <code><del>here</del></code> and in the <del>org.apache.juneau.dto.swagger</del> javadocs.
+			<li>Added Swagger examples <dc>here</dc> and in the <del>org.apache.juneau.dto.swagger</del> javadocs.
 		</ul>
 	<li>Improvements to {@link org.apache.juneau.svl.VarResolver}.
 		<ul>
 			<li>New {@link org.apache.juneau.svl.vars.IfVar $IF} variable for if-else block logic.
-			<li><code><del>$SWITCH</del></code> variable for switch block logic.
+			<li><dc>$SWITCH</dc> variable for switch block logic.
 			<li>Whitespace wasn't being ignored in some cases.
 		</ul>
 	<li>{@link org.apache.juneau.html.HtmlParser} can now parse full body contents generated by {@link org.apache.juneau.html.HtmlDocSerializer}. 
@@ -32820,17 +32846,17 @@
 			<li>{@link org.apache.juneau.dto.html5.HtmlElementContainer#getChild(int...)}
 			<li>{@link org.apache.juneau.dto.html5.HtmlElementMixed#getChild(int...)}
 		</ul>
-	<li>New common serializer setting: <code><del>SerializerContext.SERIALIZER_abridged</del></code>.
+	<li>New common serializer setting: <dc>SerializerContext.SERIALIZER_abridged</dc>.
 	<li>Support for defining interface proxies against 3rd-party REST interfaces.
-		<br>New package <code><del>org.apache.juneau.remoteable</del></code> for all remoteable proxy interface annotations.
+		<br>New package <dc>org.apache.juneau.remoteable</dc> for all remoteable proxy interface annotations.
 		<br><ja>@Remoteable</ja> annotation has been moved to this package.
-	<li>Updated doc: <code><del>6 - Remoteable Services</del></code>
-	<li>New doc: <code><del>6.1 -  Interface proxies against 3rd-party REST interfaces</del></code>
-	<li>New URL-encoding serializer setting: <code><del>UrlEncodingSerializerContext.URLENC_paramFormat</del></code>.
+	<li>Updated doc: <dc>6 - Remoteable Services</dc>
+	<li>New doc: <dc>6.1 -  Interface proxies against 3rd-party REST interfaces</dc>
+	<li>New URL-encoding serializer setting: <dc>UrlEncodingSerializerContext.URLENC_paramFormat</dc>.
 	<li>New methods on {@link org.apache.juneau.urlencoding.UrlEncodingSerializerBuilder}:
 	<ul>
-		<li><code><del>UrlEncodingSerializerBuilder.paramFormat(String)</del></code>	
-		<li><code><del>UrlEncodingSerializerBuilder.plainTextParams()</del></code>	
+		<li><dc>UrlEncodingSerializerBuilder.paramFormat(String)</dc>	
+		<li><dc>UrlEncodingSerializerBuilder.plainTextParams()</dc>	
 	</ul> 		
 </ul>
 
@@ -32838,36 +32864,36 @@
 <ul class='spaced-list'>
 	<li>{@link org.apache.juneau.rest.annotation.RestResource @RestResource} annotation can now be applied to 
 		any class!  You're no longer restricted to subclassing your resources from {@link org.apache.juneau.rest.RestServlet}.
-		<br>This is a major enhancement in the API.  Anything you could do by subclassing from <code>RestServlet</code>
-		should have an equivalent for non-<code>RestServlet</code> classes.
-		<br>The only restriction is that the top-level resource must subclass from <code>RestServlet</code>.
+		<br>This is a major enhancement in the API.  Anything you could do by subclassing from <c>RestServlet</c>
+		should have an equivalent for non-<c>RestServlet</c> classes.
+		<br>The only restriction is that the top-level resource must subclass from <c>RestServlet</c>.
 		Child resources do not.
 		<br><br>
 		The majority of code has been split up into two separate classes:
 		<ul>
-			<li><code><del>RestConfig</del></code> - A modifiable configuration of a resource.  Subclasses from {@link javax.servlet.ServletConfig}.
+			<li><dc>RestConfig</dc> - A modifiable configuration of a resource.  Subclasses from {@link javax.servlet.ServletConfig}.
 			<li>{@link org.apache.juneau.rest.RestContext} - A read-only configuration that's the result of a snapshot of the config.
 		</ul>
 		<br><br>
 		The {@link org.apache.juneau.rest.RestServlet} class now has the following initialization method that allows you to override
 		the config settings define via annotations:
 		<ul>
-			<li><code><del>RestServlet.init(RestConfig)</del></code> - A modifiable configuration of a resource.
+			<li><dc>RestServlet.init(RestConfig)</dc> - A modifiable configuration of a resource.
 		</ul>
-		Non-<code>RestServlet</code> classes must have one of the following to allow it to be instantiated:
+		Non-<c>RestServlet</c> classes must have one of the following to allow it to be instantiated:
 		<ul>
-			<li>A <code><jk>public</jk> T(RestConfig)</code> constructor.
-			<li>A <code><jk>public</jk> T()</code> constructor.
+			<li>A <c><jk>public</jk> T(RestConfig)</c> constructor.
+			<li>A <c><jk>public</jk> T()</c> constructor.
 			<li>The parent resource must have a customized {@link org.apache.juneau.rest.RestResourceResolver} for instantiating it.
 		</ul>
 		<br>
-		Non-<code>RestServlet</code> classes can optionally include the following init methods to gain access to the config and context:
+		Non-<c>RestServlet</c> classes can optionally include the following init methods to gain access to the config and context:
 		<ul>
-			<li><code><del><jk>public</jk> init(RestConfig)</del></code>
-			<li><code><del><jk>public</jk> init(RestContext)</del></code>
+			<li><dc><jk>public</jk> init(RestConfig)</dc>
+			<li><dc><jk>public</jk> init(RestContext)</dc>
 		</ul>
-	<li>New annotations added to {@link org.apache.juneau.rest.annotation.RestResource @RestResource} to allow non-<code>RestServlet</code>
-		resources to do the same as subclassing directly from <code>RestServlet</code>:
+	<li>New annotations added to {@link org.apache.juneau.rest.annotation.RestResource @RestResource} to allow non-<c>RestServlet</c>
+		resources to do the same as subclassing directly from <c>RestServlet</c>:
 		<ul>
 			<li>{@link org.apache.juneau.rest.annotation.RestResource#resourceResolver() resourceResolver()} 
 				- Specify a {@link org.apache.juneau.rest.RestResourceResolver} class for resolving child resources.
@@ -32881,12 +32907,12 @@
 	<li>New annotations added to {@link org.apache.juneau.rest.annotation.RestResource @RestResource} and {@link org.apache.juneau.rest.annotation.RestMethod @RestMethod}
 		to simplify defining page title, text, and links on HTML views:
 		<ul>
-			<li><code><del>@RestResource(pageTitle)</del></code>
-			<li><code><del>@RestMethod(pageTitle)</del></code> 
-			<li><code><del>@RestResource(pageText)</del></code> 
-			<li><code><del>@RestMethod(pageText)</del></code> 
-			<li><code><del>@RestResource(pageLinks)</del></code> 
-			<li><code><del>@RestMethod(pageLinks)</del></code> 
+			<li><dc>@RestResource(pageTitle)</dc>
+			<li><dc>@RestMethod(pageTitle)</dc> 
+			<li><dc>@RestResource(pageText)</dc> 
+			<li><dc>@RestMethod(pageText)</dc> 
+			<li><dc>@RestResource(pageLinks)</dc> 
+			<li><dc>@RestMethod(pageLinks)</dc> 
 		</ul>				
 		<p class='bcode w800'>
 	<jc>// Old method</jc>
@@ -32906,7 +32932,7 @@
 	)
 		</p>		
 		<p>
-			Typically you're going to simply want to use the <code>title</code> and <code>description</code> annotations
+			Typically you're going to simply want to use the <c>title</c> and <c>description</c> annotations
 			which apply to both the page title/text and the swagger doc:		
 		</p>
 		<p class='bcode w800'>
@@ -32916,11 +32942,11 @@
 		pageLinks=<js>"{up:'$R{requestParentURI}',options:'?method=OPTIONS'}"</js>
 	)
 		</p>
-	<li><code><del>RestResource.stylesheet()</del></code> can now take in a comma-delimited list of stylesheet paths.
-	<li><code><del>StreamResource</del></code> can now contain multiple sources from a variety of source types (e.g. <code><jk>byte</jk>[]</code> arrays, <code>InputStreams</code>, <code>Files</code>, etc...)
-		and is now immutable.  It also includes a new <code><del>StreamResourceBuilder</del></code> class.
-	<li>Simplified remoteable proxies using the <code><ja>@RestMethod</ja>(name=<js>"PROXY"</js>)</code> annotation on REST methods.
-		Used to expose interface proxies without the need for <code><del>RemoteableServlet</del></code>.
+	<li><dc>RestResource.stylesheet()</dc> can now take in a comma-delimited list of stylesheet paths.
+	<li><dc>StreamResource</dc> can now contain multiple sources from a variety of source types (e.g. <c><jk>byte</jk>[]</c> arrays, <c>InputStreams</c>, <c>Files</c>, etc...)
+		and is now immutable.  It also includes a new <dc>StreamResourceBuilder</dc> class.
+	<li>Simplified remoteable proxies using the <c><ja>@RestMethod</ja>(name=<js>"PROXY"</js>)</c> annotation on REST methods.
+		Used to expose interface proxies without the need for <dc>RemoteableServlet</dc>.
 	<p class='bcode w800'>
 	<jc>// Server side</jc>
 	<ja>@RestMethod</ja>(name=<js>"PROXY"</js>, path=<js>"/myproxy/*"</js>)
@@ -32942,11 +32968,11 @@
 <ul class='spaced-list'>
 	<li>Revamped the client API to use builders.
 	<li>New doc: <del>1.5 - Debugging</del>
-	<li>The <code>RestClient</code> class <code>doX(Object url)</code> methods now handle HttpClient <code>URIBuilder</code> instances.
+	<li>The <c>RestClient</c> class <c>doX(Object url)</c> methods now handle HttpClient <c>URIBuilder</c> instances.
 	<li>New methods added/updated to {@link org.apache.juneau.rest.client.RestClient}:
 	<ul>
-		<li><code><del>RestClient.getRemoteableProxy(Class,Object)</del></code> - For interface proxies defined using <code><ja>@RestMethod</ja>(name=<js>"PROXY"</js>)</code>.
-		<li><code><del>RestClient.getRemoteableProxy(Class,Object,Serializer,Parser)</del></code> - Same as above, but overrides the serializer and parser defined on the client.
+		<li><dc>RestClient.getRemoteableProxy(Class,Object)</dc> - For interface proxies defined using <c><ja>@RestMethod</ja>(name=<js>"PROXY"</js>)</c>.
+		<li><dc>RestClient.getRemoteableProxy(Class,Object,Serializer,Parser)</dc> - Same as above, but overrides the serializer and parser defined on the client.
 		<li>{@link org.apache.juneau.rest.client.RestClient#doPost(Object) doPost(Object)} 
 		<li>{@link org.apache.juneau.rest.client.RestClient#doCall(HttpMethod,Object,Object) doCall(HttpMethod,Object,Object)} - Can now pass in instances of {@link org.apache.juneau.rest.client.NameValuePairs} for easy form posts.
 			<br>This extends to all methods that take in the input.
@@ -32954,18 +32980,18 @@
 	<li>New methods on {@link org.apache.juneau.rest.client.RestCall}:
 		<ul>
 			<li>{@link org.apache.juneau.rest.client.RestCall#uri(Object) uri(Object)}
-			<li><code><del>query(String,Object,boolean,PartSerializer)</del></code>
+			<li><dc>query(String,Object,boolean,PartSerializer)</dc>
 			<li>{@link org.apache.juneau.rest.client.RestCall#query(String,Object) query(String,Object)}
 			<li>{@link org.apache.juneau.rest.client.RestCall#queryIfNE(String,Object) queryIfNE(String,Object)}
 			<li>{@link org.apache.juneau.rest.client.RestCall#query(Map) query(Map)}
 			<li>{@link org.apache.juneau.rest.client.RestCall#queryIfNE(Map) queryIfNE(Map)}
 			<li>{@link org.apache.juneau.rest.client.RestCall#query(String) query(String)}
-			<li><code><del>formData(String,Object,boolean,PartSerializer)</del></code>
+			<li><dc>formData(String,Object,boolean,PartSerializer)</dc>
 			<li>{@link org.apache.juneau.rest.client.RestCall#formData(String,Object) formData(String,Object)}
 			<li>{@link org.apache.juneau.rest.client.RestCall#formDataIfNE(String,Object) formDataIfNE(String,Object)}
 			<li>{@link org.apache.juneau.rest.client.RestCall#formData(Map) formData(Map)}
 			<li>{@link org.apache.juneau.rest.client.RestCall#formDataIfNE(Map) formDataIfNE(Map)}
-			<li><code><del>header(String,Object,boolean,PartSerializer)</del></code>
+			<li><dc>header(String,Object,boolean,PartSerializer)</dc>
 			<li>{@link org.apache.juneau.rest.client.RestCall#header(String,Object) header(String,Object)}
 			<li>{@link org.apache.juneau.rest.client.RestCall#headerIfNE(String,Object) headerIfNE(String,Object)}
 			<li>{@link org.apache.juneau.rest.client.RestCall#headers(Map) headers(Map)}
@@ -32980,11 +33006,11 @@
 		<ul>
 			<li>{@link org.apache.juneau.rest.client.RestClientBuilder#executorService(ExecutorService,boolean) executorService(ExecutorService,boolean)}
 			<li>{@link org.apache.juneau.rest.client.RestClientBuilder#paramFormat(String) paramFormat(ExecutorService,boolean)}
-			<li><code><del>RestClientBuilder.plainTextParams()</del></code>
-			<li>{@link org.apache.juneau.rest.client.RestClientBuilder#noTrace() noTrace()} - Adds a <code>No-Trace: true</code> header on all requests to prevent
+			<li><dc>RestClientBuilder.plainTextParams()</dc>
+			<li>{@link org.apache.juneau.rest.client.RestClientBuilder#noTrace() noTrace()} - Adds a <c>No-Trace: true</c> header on all requests to prevent
 				the servlet from logging errors.
 				<br>Useful for testing scenarios when you don't want the console to end up showing errors done on purpose.
-			<li>{@link org.apache.juneau.rest.client.RestClientBuilder#debug() debug()} now adds a <code>Debug: true</code> header on all requests.
+			<li>{@link org.apache.juneau.rest.client.RestClientBuilder#debug() debug()} now adds a <c>Debug: true</c> header on all requests.
 		</ul>
 	<li>New methods added/updated to {@link org.apache.juneau.rest.client.RestCall}:
 		<ul>
@@ -32994,10 +33020,10 @@
 			<li>{@link org.apache.juneau.rest.client.RestCall#getResponseAsStringFuture() getResponseAsStringFuture()}
 			<li>{@link org.apache.juneau.rest.client.RestCall#serializer(Serializer) serializer(Serializer)} - Override the serializer defined on the client for a single call.
 			<li>{@link org.apache.juneau.rest.client.RestCall#parser(Parser) parser(Parser)} - Override the parser defined on the client for a single call.
-			<li><code><del>input(Object)</del></code> - Now accepts instances of {@link org.apache.juneau.rest.client.NameValuePairs}.
+			<li><dc>input(Object)</dc> - Now accepts instances of {@link org.apache.juneau.rest.client.NameValuePairs}.
 			<li>{@link org.apache.juneau.rest.client.RestCall#getResponse(Class) getResponse(Class)} - Can now pass in any of the following:
 				<ul>
-					<li>{@link org.apache.http.HttpResponse} - Returns the raw <code>HttpResponse</code> returned by the inner <code>HttpClient</code>.
+					<li>{@link org.apache.http.HttpResponse} - Returns the raw <c>HttpResponse</c> returned by the inner <c>HttpClient</c>.
 					<li>{@link java.io.Reader} - Returns access to the raw reader of the response.
 					<li>{@link java.io.InputStream} - Returns access to the raw input stream of the response.
 				</ul>
@@ -33005,7 +33031,7 @@
 	<li>New methods added to {@link org.apache.juneau.rest.client.NameValuePairs}:
 		<ul>
 			<li>{@link org.apache.juneau.rest.client.NameValuePairs#append(String,Object) append(String,Object)}
-			<li><code><del>append(String,Object,PartSerializer)</del></code>
+			<li><dc>append(String,Object,PartSerializer)</dc>
 		</ul>
 	<li>{@link org.apache.juneau.rest.client.RetryOn} is now an abstract class with an additional method:
 		<ul>
@@ -33016,11 +33042,11 @@
 <h5 class='topic w800'>org.apache.juneau.microservice</h5>
 <ul class='spaced-list'>
 	<li><js>"REST/port"</js> configuration setting can now be a comma-limited list of port numbers to try.
-		<br>You can also specify one or more <code>0</code>s to try a random port.
-	<li>Methods added to <code><del>RestMicroservice</del></code> class:
+		<br>You can also specify one or more <c>0</c>s to try a random port.
+	<li>Methods added to <dc>RestMicroservice</dc> class:
 	<ul>
-		<li><code><del>getPort()</del></code>
-		<li><code><del>getURI()</del></code>
+		<li><dc>getPort()</dc>
+		<li><dc>getURI()</dc>
 		<li>Override methods added from {@link org.apache.juneau.microservice.Microservice} class for easier method chaining.
 	</ul>
 </ul>
@@ -33042,9 +33068,9 @@
 	<li>
 		Support for dynamic beans.  See {@link org.apache.juneau.annotation.BeanProperty#name() @BeanProperty(name)}.
 	<li>
-		New doc: <code><del>2.8 - Virtual Beans</del></code>
+		New doc: <dc>2.8 - Virtual Beans</dc>
 	<li>
-		New doc: <code><del>2.13 - Comparison with Jackson</del></code>
+		New doc: <dc>2.13 - Comparison with Jackson</dc>
 	<li>
 		All parsers now allow for numeric types with <js>'K'</js>/<js>'M'</js>/<js>'G'</js> suffixes to represent
 		kilobytes, megabytes, and gigabytes.
@@ -33052,47 +33078,47 @@
 	<jc>// Example</jc>
 	<jk>int</jk> i = JsonParser.<jsf>DEFAULT</jsf>.parse(<js>"123M"</js>);  <jc>// 123MB</jc>
 		</p>
-	<li>New/modified methods on <code><del>ConfigFile</del></code>:
+	<li>New/modified methods on <dc>ConfigFile</dc>:
 		<ul>
-			<li><code><del>ConfigFile.put(String,String,String,boolean)</del></code>
-			<li><code><del>ConfigFile.put(String,String,Object,Serializer,boolean,boolean)</del></code>
-			<li><code><del>ConfigFile.getObject(String,Type,Type...)</del></code>
-			<li><code><del>ConfigFile.getObject(String,Parser,Type,Type...)</del></code>
-			<li><code><del>ConfigFile.getObject(String,Class)</del></code>
-			<li><code><del>ConfigFile.getObject(String,Parser,Class)</del></code>
-			<li><code><del>ConfigFile.getObject(String,String,Type,Type...)</del></code>
-			<li><code><del>ConfigFile.getObject(String,String,Parser,Type,Type...)</del></code>
-			<li><code><del>ConfigFile.getObject(String,String,Class)</del></code>
-			<li><code><del>ConfigFile.getObject(String,String,Parser,Class)</del></code>
-			<li><code><del>ConfigFile.getObjectWithDefault(String,Object,Type,Type...)</del></code> 
-			<li><code><del>ConfigFile.getObjectWithDefault(String,Parser,Object,Type,Type...)</del></code>
-			<li><code><del>ConfigFile.getObjectWithDefault(String,Object,Class)</del></code>
-			<li><code><del>ConfigFile.getObjectWithDefault(String,Parser,Object,Class)</del></code> 
+			<li><dc>ConfigFile.put(String,String,String,boolean)</dc>
+			<li><dc>ConfigFile.put(String,String,Object,Serializer,boolean,boolean)</dc>
+			<li><dc>ConfigFile.getObject(String,Type,Type...)</dc>
+			<li><dc>ConfigFile.getObject(String,Parser,Type,Type...)</dc>
+			<li><dc>ConfigFile.getObject(String,Class)</dc>
+			<li><dc>ConfigFile.getObject(String,Parser,Class)</dc>
+			<li><dc>ConfigFile.getObject(String,String,Type,Type...)</dc>
+			<li><dc>ConfigFile.getObject(String,String,Parser,Type,Type...)</dc>
+			<li><dc>ConfigFile.getObject(String,String,Class)</dc>
+			<li><dc>ConfigFile.getObject(String,String,Parser,Class)</dc>
+			<li><dc>ConfigFile.getObjectWithDefault(String,Object,Type,Type...)</dc> 
+			<li><dc>ConfigFile.getObjectWithDefault(String,Parser,Object,Type,Type...)</dc>
+			<li><dc>ConfigFile.getObjectWithDefault(String,Object,Class)</dc>
+			<li><dc>ConfigFile.getObjectWithDefault(String,Parser,Object,Class)</dc> 
 		</ul>
-	<li>New ability to interact with config file sections with proxy interfaces with new method <code><del>ConfigFile.getSectionAsInterface(String,Class)</del></code>.
+	<li>New ability to interact with config file sections with proxy interfaces with new method <dc>ConfigFile.getSectionAsInterface(String,Class)</dc>.
 	<li>{@link org.apache.juneau.annotation.BeanProperty @BeanProperty} annotation can now be applied to getters
 		and setters defined on interfaces.
 	<li>New methods on {@link org.apache.juneau.serializer.SerializerSession} and {@link org.apache.juneau.parser.ParserSession}
 		for retrieving context and runtime-override properties:
 		<ul>
-			<li><code><del>Session.getProperty(String)</del></code>
-			<li><code><del>Session.getProperty(String,String)</del></code>
-			<li><code><del>Session.getProperty(Class,String)</del></code>
-			<li><code><del>Session.getProperty(Class,String,Object)</del></code>
+			<li><dc>Session.getProperty(String)</dc>
+			<li><dc>Session.getProperty(String,String)</dc>
+			<li><dc>Session.getProperty(Class,String)</dc>
+			<li><dc>Session.getProperty(Class,String,Object)</dc>
 		</ul>	
-	<li>New <code><del>org.apache.juneau.serializer.PartSerializer</del></code> interface particularly tailored to HTTP
+	<li>New <dc>org.apache.juneau.serializer.PartSerializer</dc> interface particularly tailored to HTTP
 		headers, query parameters, form-data parameters, and path variables.  
 		<br>Allows easy user-defined serialization of these objects.
 		<br>The interface can be used in the following locations:
 		<ul>
-			<li><code><del>org.apache.juneau.rest.client.RestClientBuilder.partSerializer(Class)</del></code> 
-			<li><code><del>org.apache.juneau.remoteable.Path.serializer</del></code> 
-			<li><code><del>org.apache.juneau.remoteable.Query.serializer</del></code> 
-			<li><code><del>org.apache.juneau.remoteable.QueryIfNE.serializer</del></code> 
-			<li><code><del>org.apache.juneau.remoteable.FormData.serializer</del></code> 
-			<li><code><del>org.apache.juneau.remoteable.FormDataIfNE.serializer</del></code> 
-			<li><code><del>org.apache.juneau.remoteable.Header.serializer</del></code> 
-			<li><code><del>org.apache.juneau.remoteable.HeaderIfNE.serializer</del></code> 
+			<li><dc>org.apache.juneau.rest.client.RestClientBuilder.partSerializer(Class)</dc> 
+			<li><dc>org.apache.juneau.remoteable.Path.serializer</dc> 
+			<li><dc>org.apache.juneau.remoteable.Query.serializer</dc> 
+			<li><dc>org.apache.juneau.remoteable.QueryIfNE.serializer</dc> 
+			<li><dc>org.apache.juneau.remoteable.FormData.serializer</dc> 
+			<li><dc>org.apache.juneau.remoteable.FormDataIfNE.serializer</dc> 
+			<li><dc>org.apache.juneau.remoteable.Header.serializer</dc> 
+			<li><dc>org.apache.juneau.remoteable.HeaderIfNE.serializer</dc> 
 		</ul>
 	<li>Across-the-board improvements to the URI-resolution support (i.e. how URIs get serialized).
 		<ul>
@@ -33123,10 +33149,10 @@
 					<li>{@link org.apache.juneau.UriResolver}
 				</ul>
 			<li>New configuration properties:
-				<li><code><del>SerializerContext.SERIALIZER_uriContext</del></code>
-				<li><code><del>SerializerContext.SERIALIZER_uriRelativity</del></code>
-				<li><code><del>SerializerContext.SERIALIZER_uriResolution</del></code>
-				<li><code><del>SerializerContext.SERIALIZER_maxIndent</del></code>
+				<li><dc>SerializerContext.SERIALIZER_uriContext</dc>
+				<li><dc>SerializerContext.SERIALIZER_uriRelativity</dc>
+				<li><dc>SerializerContext.SERIALIZER_uriResolution</dc>
+				<li><dc>SerializerContext.SERIALIZER_maxIndent</dc>
 		</ul>
 	<li>New annotation property: {@link org.apache.juneau.annotation.BeanProperty#value() @BeanProperty(value)}.
 		<br>The following two annotations are considered equivalent:
@@ -33136,7 +33162,7 @@
 	<ja>@BeanProperty</ja>(<js>"foo"</js>)
 		</p>
 	<li>Fixed a race condition in ClassMeta.
-	<li><jsf>URLENC_paramFormat</jsf> has been moved to <code><del>UonSerializer.UON_paramFormat</del></code>, 
+	<li><jsf>URLENC_paramFormat</jsf> has been moved to <dc>UonSerializer.UON_paramFormat</dc>, 
 		and the UON/URL-Encoding serializers will now always serialize all values as plain text.
 		<br>This means that arrays and maps are converted to simple comma-delimited lists.
 	<li>Listener APIs added to serializers and parsers:
@@ -33144,15 +33170,15 @@
 			<li>{@link org.apache.juneau.serializer.SerializerListener}
 			<li>{@link org.apache.juneau.serializer.SerializerBuilder#listener(Class)}
 			<li>{@link org.apache.juneau.rest.annotation.RestResource#serializerListener() @RestResource(serializerListener)}
-			<li><code><del>RestConfig.serializerListener(Class)</del></code>
+			<li><dc>RestConfig.serializerListener(Class)</dc>
 			<li>{@link org.apache.juneau.parser.ParserListener}
 			<li>{@link org.apache.juneau.parser.ParserBuilder#listener(Class)}
 			<li>{@link org.apache.juneau.rest.annotation.RestResource#parserListener() @RestResource(parserListener)}
-			<li><code><del>RestConfig.parserListener(Class)</del></code>
-			<li><code><del>RestClientBuilder.listeners(Class,Class)</del></code>
+			<li><dc>RestConfig.parserListener(Class)</dc>
+			<li><dc>RestClientBuilder.listeners(Class,Class)</dc>
 		</ul>juneau-examples-core.import1.pngjuneau-examples-core.import1.png
 	<li>The {@link org.apache.juneau.BeanContext#BEAN_debug} flag will now capture parser input and make it
-		available through the <code><del>ParserSession.getInputAsString()</del></code> method so that it can be used
+		available through the <dc>ParserSession.getInputAsString()</dc> method so that it can be used
 		in the listeners.
 	<li>Significant new functionality introduced to the HTML serializer.  
 		<br>Lots of new options for customizing the HTML output.
@@ -33163,17 +33189,17 @@
 				<br>Annotation can be applied to POJO classes and bean properties.
 			<li>Several new properties for customizing parts of the HTML page:
 				<ul>
-					<li><code><del>HtmlDocSerializerContext.HTMLDOC_title</del></code>
-					<li><code><del>HtmlDocSerializerContext.HTMLDOC_description</del></code>
-					<li><code><del>HtmlDocSerializerContext.HTMLDOC_branding</del></code>
-					<li><code><del>HtmlDocSerializerContext.HTMLDOC_header</del></code>
-					<li><code><del>HtmlDocSerializerContext.HTMLDOC_nav</del></code>
-					<li><code><del>HtmlDocSerializerContext.HTMLDOC_aside</del></code>
-					<li><code><del>HtmlDocSerializerContext.HTMLDOC_footer</del></code>
-					<li><code><del>HtmlDocSerializerContext.HTMLDOC_noResultsMessage</del></code>
-					<li><code><del>HtmlDocSerializerContext.HTMLDOC_cssUrl</del></code>
-					<li><code><del>HtmlDocSerializerContext.HTMLDOC_css</del></code>
-					<li><code><del>HtmlDocSerializerContext.HTMLDOC_template</del></code>
+					<li><dc>HtmlDocSerializerContext.HTMLDOC_title</dc>
+					<li><dc>HtmlDocSerializerContext.HTMLDOC_description</dc>
+					<li><dc>HtmlDocSerializerContext.HTMLDOC_branding</dc>
+					<li><dc>HtmlDocSerializerContext.HTMLDOC_header</dc>
+					<li><dc>HtmlDocSerializerContext.HTMLDOC_nav</dc>
+					<li><dc>HtmlDocSerializerContext.HTMLDOC_aside</dc>
+					<li><dc>HtmlDocSerializerContext.HTMLDOC_footer</dc>
+					<li><dc>HtmlDocSerializerContext.HTMLDOC_noResultsMessage</dc>
+					<li><dc>HtmlDocSerializerContext.HTMLDOC_cssUrl</dc>
+					<li><dc>HtmlDocSerializerContext.HTMLDOC_css</dc>
+					<li><dc>HtmlDocSerializerContext.HTMLDOC_template</dc>
 				</ul>
 			<li>New interface {@link org.apache.juneau.html.HtmlDocTemplate} that allows full control over rendering
 				of HTML produced by {@link org.apache.juneau.html.HtmlDocSerializer}.
@@ -33216,9 +33242,9 @@
 		<br>For reference, the previous supported types were:
 		<ul>
 			<li>{@link org.apache.juneau.rest.RestRequest} - The request object.
-			<li>{@link javax.servlet.http.HttpServletRequest} - The superclass of <code>RestRequest</code>.
+			<li>{@link javax.servlet.http.HttpServletRequest} - The superclass of <c>RestRequest</c>.
 			<li>{@link org.apache.juneau.rest.RestResponse} - The response object.
-			<li>{@link javax.servlet.http.HttpServletResponse} - The superclass of <code>RestResponse</code>.
+			<li>{@link javax.servlet.http.HttpServletResponse} - The superclass of <c>RestResponse</c>.
 		</ul>
 		The new supported types are:
 		<ul>
@@ -33265,13 +33291,13 @@
 			<li>{@link org.apache.juneau.rest.RequestFormData} - API for accessing request form data.
 			<li>{@link org.apache.juneau.rest.RequestPath} - API for accessing path variables.
 			<li>{@link org.apache.juneau.rest.RequestBody} - API for accessing request body.
-			<li>{@link org.apache.juneau.http.HttpMethod} - The method name matched (when using <code><ja>@RestMethod</ja>(name=<js>"*"</js>)</code>)
+			<li>{@link org.apache.juneau.http.HttpMethod} - The method name matched (when using <c><ja>@RestMethod</ja>(name=<js>"*"</js>)</c>)
 			<li>{@link java.util.logging.Logger} - The logger to use for logging.
 			<li>{@link org.apache.juneau.internal.JuneauLogger} - Logger with additional features.
 			<li>{@link org.apache.juneau.rest.RestContext} - The resource read-only context.
 			<li>{@link org.apache.juneau.parser.Parser} - The parser matching the request content type.
 			<li>{@link org.apache.juneau.dto.swagger.Swagger} - The auto-generated Swagger doc.
-			<li><code><del>ConfigFile</del></code> - The external config file for the resource.
+			<li><dc>ConfigFile</dc> - The external config file for the resource.
 		</ul>
 		So, for example...
 		<p class='bcode w800'>
@@ -33310,29 +33336,29 @@
 		<ul>
 			<li>{@link org.apache.juneau.rest.annotation.RestMethod#defaultQuery() defaultQuery()}
 			<li>{@link org.apache.juneau.rest.annotation.RestMethod#defaultFormData() defaultFormData()}
-			<li><code><del>bpIncludes()</del></code>
-			<li><code><del>bpExcludes()</del></code>
+			<li><dc>bpIncludes()</dc>
+			<li><dc>bpExcludes()</dc>
 		</ul>
 	<li>
 		Default values on header, query, and form-data annotations:
 		<ul>
-			<li><code><del>@Header(def)</del></code> - Default header value.
-			<li><code><del>@Query(def)</del></code> - Default query parameter value.
-			<li><code><del>@FormData(def)</del></code> - Default form data parameter value.
+			<li><dc>@Header(def)</dc> - Default header value.
+			<li><dc>@Query(def)</dc> - Default query parameter value.
+			<li><dc>@FormData(def)</dc> - Default form data parameter value.
 		</ul>
 	<li>
 		New attributes on {@link org.apache.juneau.rest.annotation.RestResource @RestResource}:
 		<ul>
 			<li>{@link org.apache.juneau.rest.annotation.RestResource#serializerListener() serializerListener()}
 			<li>{@link org.apache.juneau.rest.annotation.RestResource#parserListener() parserListener()}
-			<li><code><del>widgets()</del></code>
+			<li><dc>widgets()</dc>
 			<li>{@link org.apache.juneau.rest.annotation.RestResource#swagger() swagger()}
 			<li>{@link org.apache.juneau.rest.annotation.RestResource#htmldoc() htmldoc()}
 		</ul>
 	<li>
 		New attributes on {@link org.apache.juneau.rest.annotation.RestMethod @RestMethod}:
 		<ul>
-			<li><code><del>widgets()</del></code>
+			<li><dc>widgets()</dc>
 			<li>{@link org.apache.juneau.rest.annotation.RestMethod#swagger() swagger()}
 			<li>{@link org.apache.juneau.rest.annotation.RestMethod#htmldoc() htmldoc()}
 		</ul>
@@ -33343,55 +33369,55 @@
 			<li>{@link org.apache.juneau.rest.vars.WidgetVar} - Resolve <js>"$W{...}"</js> variables to widget contents.
 		</ul>
 	<li>
-		New methods on <code><del>RestConfig</del></code>:
+		New methods on <dc>RestConfig</dc>:
 		<ul>
-			<li><code><del>setHtmlTitle(String)</del></code>
-			<li><code><del>setHtmlDescription(String)</del></code>
-			<li><code><del>setHtmlBranding(String)</del></code>
-			<li><code><del>setHtmlHeader(String)</del></code>
-			<li><code><del>setHtmlLinks(String)</del></code>
-			<li><code><del>setHtmlNav(String)</del></code>
-			<li><code><del>setHtmlAside(String)</del></code>
-			<li><code><del>setHtmlFooter(String)</del></code>
-			<li><code><del>setHtmlCss(String)</del></code>
-			<li><code><del>setHtmlCssUrl(String)</del></code>
-			<li><code><del>setHtmlNoWrap(boolean)</del></code>
-			<li><code><del>setHtmlNoResultsMessage(String)</del></code>
-			<li><code><del>setHtmlTemplate(Class)</del></code>
-			<li><code><del>setHtmlTemplate(HtmlDocTemplate)</del></code>
-			<li><code><del>addWidget(Class)</del></code>
+			<li><dc>setHtmlTitle(String)</dc>
+			<li><dc>setHtmlDescription(String)</dc>
+			<li><dc>setHtmlBranding(String)</dc>
+			<li><dc>setHtmlHeader(String)</dc>
+			<li><dc>setHtmlLinks(String)</dc>
+			<li><dc>setHtmlNav(String)</dc>
+			<li><dc>setHtmlAside(String)</dc>
+			<li><dc>setHtmlFooter(String)</dc>
+			<li><dc>setHtmlCss(String)</dc>
+			<li><dc>setHtmlCssUrl(String)</dc>
+			<li><dc>setHtmlNoWrap(boolean)</dc>
+			<li><dc>setHtmlNoResultsMessage(String)</dc>
+			<li><dc>setHtmlTemplate(Class)</dc>
+			<li><dc>setHtmlTemplate(HtmlDocTemplate)</dc>
+			<li><dc>addWidget(Class)</dc>
 		</ul>
 	<li>
 		New methods on {@link org.apache.juneau.rest.RestResponse}:
 		<ul>
-			<li><code><del>setHtmlTitle(Object)</del></code>
-			<li><code><del>setHtmlDescription(Object)</del></code>
-			<li><code><del>setHtmlBranding(Object)</del></code>
-			<li><code><del>setHtmlHeader(Object)</del></code>
-			<li><code><del>setHtmlLinks(Object)</del></code>
-			<li><code><del>setHtmlNav(Object)</del></code>
-			<li><code><del>setHtmlAside(Object)</del></code>
-			<li><code><del>setHtmlFooter(Object)</del></code>
-			<li><code><del>setHtmlCss(Object)</del></code>
-			<li><code><del>setHtmlCssUrl(Object)</del></code>
-			<li><code><del>setHtmlNoWrap(boolean)</del></code>
-			<li><code><del>setHtmlNoResultsMessage(Object)</del></code>
-			<li><code><del>setHtmlTemplate(Class)</del></code>
-			<li><code><del>setHtmlTemplate(HtmlDocTemplate)</del></code>
+			<li><dc>setHtmlTitle(Object)</dc>
+			<li><dc>setHtmlDescription(Object)</dc>
+			<li><dc>setHtmlBranding(Object)</dc>
+			<li><dc>setHtmlHeader(Object)</dc>
+			<li><dc>setHtmlLinks(Object)</dc>
+			<li><dc>setHtmlNav(Object)</dc>
+			<li><dc>setHtmlAside(Object)</dc>
+			<li><dc>setHtmlFooter(Object)</dc>
+			<li><dc>setHtmlCss(Object)</dc>
+			<li><dc>setHtmlCssUrl(Object)</dc>
+			<li><dc>setHtmlNoWrap(boolean)</dc>
+			<li><dc>setHtmlNoResultsMessage(Object)</dc>
+			<li><dc>setHtmlTemplate(Class)</dc>
+			<li><dc>setHtmlTemplate(HtmlDocTemplate)</dc>
 		</ul>
 	<li>
-		<code>&amp;plainText=true</code> parameter now works on byte-based serializers by converting the output to hex.
+		<c>&amp;plainText=true</c> parameter now works on byte-based serializers by converting the output to hex.
 	<li>
 		New classes for widget support:
 		<ul>
 			<li>{@link org.apache.juneau.rest.widget.Widget}
-			<li><code><del>PoweredByJuneauWidget</del></code>
-			<li><code><del>ContentTypeLinksColumnWidget</del></code>
-			<li><code><del>ContentTypeLinksRowWidget</del></code>
-			<li><code><del>QueryWidget</del></code>
+			<li><dc>PoweredByJuneauWidget</dc>
+			<li><dc>ContentTypeLinksColumnWidget</dc>
+			<li><dc>ContentTypeLinksRowWidget</dc>
+			<li><dc>QueryWidget</dc>
 		</ul>
 	<li>
-		<code>devops.css</code> cleaned up.
+		<c>devops.css</c> cleaned up.
 	<li>
 		Removed a bunch of URL-related methods from {@link org.apache.juneau.rest.RestRequest}.  
 		These all have equivalents in {@link org.apache.juneau.rest.RestRequest#getUriContext()}.
@@ -33411,16 +33437,16 @@
 <h5 class='topic w800'>org.apache.juneau.rest.client</h5>
 <ul class='spaced-list'>
 	<li>
-		New <code><del>org.apache.juneau.remoteable.Path</del></code> annotation for specifying path variables on remoteable interfaces.
+		New <dc>org.apache.juneau.remoteable.Path</dc> annotation for specifying path variables on remoteable interfaces.
 	<li>
-		New <code><del>@RequestBean</del></code> annotation for specifying beans with remoteable annotations
+		New <dc>@RequestBean</dc> annotation for specifying beans with remoteable annotations
 		defined on properties.
 	<li>
-		The following annotations (and related methods on RestCall) can now take <code>NameValuePairs</code> and beans as input 
+		The following annotations (and related methods on RestCall) can now take <c>NameValuePairs</c> and beans as input 
 		when using <js>"*"</js> as the name.
-		<br><code><del>org.apache.juneau.remoteable.FormData</del></code>,<code><del>org.apache.juneau.remoteable.FormDataIfNE</del></code>,
-		<code><del>org.apache.juneau.remoteable.Query</del></code>,<code><del>org.apache.juneau.remoteable.QueryIfNE</del></code>,
-		<code><del>org.apache.juneau.remoteable.Header</del></code>,<code><del>org.apache.juneau.remoteable.HeaderIfNE</del></code> 
+		<br><dc>org.apache.juneau.remoteable.FormData</dc>,<dc>org.apache.juneau.remoteable.FormDataIfNE</dc>,
+		<dc>org.apache.juneau.remoteable.Query</dc>,<dc>org.apache.juneau.remoteable.QueryIfNE</dc>,
+		<dc>org.apache.juneau.remoteable.Header</dc>,<dc>org.apache.juneau.remoteable.HeaderIfNE</dc> 
 </ul>
 
 <h5 class='topic w800'>org.apache.juneau.microservice</h5>
@@ -33451,23 +33477,23 @@
 	<li>
 		{@link org.apache.juneau.utils.PojoQuery} improvements.
 	<li>
-		New <code><del>RemoteMethod.returns()</del></code> annotation.
+		New <dc>RemoteMethod.returns()</dc> annotation.
 		<br>Allows you to specify whether the remote method returns the HTTP body or status code.
 	<li>
 		Fixed bugs with {@link org.apache.juneau.BeanContext#BEAN_includeProperties} and {@link org.apache.juneau.BeanContext#BEAN_excludeProperties} settings.
 	<li>
-		New/modified settings in <code><del>HtmlDocSerializerContext</del></code>:
+		New/modified settings in <dc>HtmlDocSerializerContext</dc>:
 		<ul>
-			<li><code><del>HTMLDOC_script</del></code>
-			<li><code><del>HTMLDOC_style</del></code> - Was <jsf>HTMLDOC_css</jsf>.
-			<li><code><del>HTMLDOC_stylesheet</del></code> - Was <jsf>HTMLDOC_cssUrl</jsf>.  Now an array.
+			<li><dc>HTMLDOC_script</dc>
+			<li><dc>HTMLDOC_style</dc> - Was <jsf>HTMLDOC_css</jsf>.
+			<li><dc>HTMLDOC_stylesheet</dc> - Was <jsf>HTMLDOC_cssUrl</jsf>.  Now an array.
 		</ul>
 	<li>
-		New <code><del>ResourceFinder</del></code> utility class.
+		New <dc>ResourceFinder</dc> utility class.
 		Allows you to search for resources up the parent hierarchy chain.
 		Also allows you to search for localized resources.
 	<li>
-		Eliminated the following properties from <code><del>HtmlDocSerializerContext</del></code>:
+		Eliminated the following properties from <dc>HtmlDocSerializerContext</dc>:
 		<jsf>HTMLDOC_title</jsf>, <jsf>HTMLDOC_description</jsf>, <jsf>HTMLDOC_description</jsf>
 		<br>See below on changes to simplify HTML headers.
 	<li>
@@ -33537,9 +33563,9 @@
 			<li>
 				You can now add arbitrary CSS and Javascript along with your widgets through new methods:
 				<ul>
-					<li><code><del>Widget#getHtml(RestRequest)</del></code>
-					<li><code><del>Widget#getScript(RestRequest)</del></code>
-					<li><code><del>Widget#getStyle(RestRequest)</del></code>
+					<li><dc>Widget#getHtml(RestRequest)</dc>
+					<li><dc>Widget#getScript(RestRequest)</dc>
+					<li><dc>Widget#getStyle(RestRequest)</dc>
 				</ul>
 			</li>
 			<li>
@@ -33551,8 +33577,8 @@
 			<li>
 				Renamed widgets:
 				<ul>
-					<li><code>PoweredByApacheWidget</code> -&gt; <code>PoweredByApache</code>  
-					<li><code>PoweredByJuneauWidget</code> -&gt; <code>PoweredByJuneau</code>  
+					<li><c>PoweredByApacheWidget</c> -&gt; <c>PoweredByApache</c>  
+					<li><c>PoweredByJuneauWidget</c> -&gt; <c>PoweredByJuneau</c>  
 				</ul>
 			<li>
 				New {@link org.apache.juneau.rest.widget.MenuItemWidget} can be used as a starting point for creatint pull-down menu items.
@@ -33573,8 +33599,8 @@
 	<li>
 		New/modified annotations on {@link org.apache.juneau.rest.annotation.HtmlDoc @HtmlDoc}:
 		<ul>
-			<li>{@link org.apache.juneau.rest.annotation.HtmlDoc#style() style()} - Renamed from <code>css()</code>.
-			<li>{@link org.apache.juneau.rest.annotation.HtmlDoc#stylesheet() stylesheet()} - Renamed from <code>cssUrl()</code>.
+			<li>{@link org.apache.juneau.rest.annotation.HtmlDoc#style() style()} - Renamed from <c>css()</c>.
+			<li>{@link org.apache.juneau.rest.annotation.HtmlDoc#stylesheet() stylesheet()} - Renamed from <c>cssUrl()</c>.
 				<br>Can now be a comma-delimited list of URLs.
 			<li>{@link org.apache.juneau.rest.annotation.HtmlDoc#script() script()} - Add arbitrary Javascript to page header.
 		</ul>
@@ -33598,14 +33624,14 @@
 		</ul>
 	</li>
 	<li>
-		Eliminated the <code>@RestResource(stylesheet)</code> annotation.  
+		Eliminated the <c>@RestResource(stylesheet)</c> annotation.  
 		It's no longer needed now that you can easily specify styles via <ja>@Htmldoc</ja>.
 	<li>
 		Eliminated the following annotations since they are now redundant with {@link org.apache.juneau.rest.annotation.HtmlDoc#header() @HtmlDoc(header)}:
 		<ul>
-			<li><code>title()</code>
-			<li><code>description()</code>
-			<li><code>branding()</code>
+			<li><c>title()</c>
+			<li><c>description()</c>
+			<li><c>branding()</c>
 		</ul>
 		Instead, the {@link org.apache.juneau.rest.BasicRestServlet} class defines the following default header
 		that can be easily overridden: 
@@ -33622,7 +33648,7 @@
 	<li>
 		New {@link org.apache.juneau.rest.vars.FileVar $F} variable resolver for resolving the contents of 
 		files in the classpath.
-		<br>The <code>DockerRegistryResource</code> examples shows how it can be used to pull in a localized
+		<br>The <c>DockerRegistryResource</c> examples shows how it can be used to pull in a localized
 		file from the classpath to populate the aside section of a page.
 		<p class='bcode w800'>
 	htmldoc=<ja>@HtmlDoc</ja>(
@@ -33631,16 +33657,16 @@
 	)
 		</p>
 	<li>
-		New <code><del>ReaderResource.toCommentStrippedString()</del></code> method.
+		New <dc>ReaderResource.toCommentStrippedString()</dc> method.
 	<li>
-		The <code>bpIncludes()</code> and <code>bpExcludes()</code> annotations on <ja>@RestMethod</ja>
+		The <c>bpIncludes()</c> and <c>bpExcludes()</c> annotations on <ja>@RestMethod</ja>
 		has been replaced with the following:
 		<ul>
 			<li>{@link org.apache.juneau.rest.annotation.RestMethod#bpi() bpi()} - Now an array of simplified values instead of LAX JSON.
 			<li>{@link org.apache.juneau.rest.annotation.RestMethod#bpx() bpx()} - Now an array of simplified values instead of LAX JSON.
 		</ul>
 	<li>
-		Two new variables added to <code>$R</code> variable: <js>"$R{servletClass}"</js>, <js>"$R{servletClassSimple}"</js>
+		Two new variables added to <c>$R</c> variable: <js>"$R{servletClass}"</js>, <js>"$R{servletClassSimple}"</js>
 </ul>
 
 <h5 class='topic w800'>org.apache.juneau.rest.examples</h5>
@@ -33660,7 +33686,7 @@
 	The major change in this release is the project structure.
 </p>
 <p>
-	The library now consists of the following artifacts found in the Maven group <code>"org.apache.juneau"</code>:
+	The library now consists of the following artifacts found in the Maven group <c>"org.apache.juneau"</c>:
 </p>
 <table class='styled w800'>
 	<tr>
@@ -33801,14 +33827,14 @@
 	</tr>
 	<tr class='light bb'>
 		<td rowspan='2' style='text-align:center;font-weight:bold;padding:20px;'>Examples</td>
-		<td class='code'><code>juneau-examples-core</code></td>
+		<td class='code'><c>juneau-examples-core</c></td>
 		<td>
 			Core code examples
 		</td>
 		<td></td>
 	</tr>
 	<tr class='light bb'>
-		<td class='code'><code>juneau-examples-rest</code></td>
+		<td class='code'><c>juneau-examples-rest</c></td>
 		<td>
 			REST code examples
 		</td>
@@ -33816,7 +33842,7 @@
 	</tr>
 	<tr class='dark bb'>
 		<td rowspan='1' style='text-align:center;font-weight:bold;padding:20px;'>Juneau All</td>
-		<td class='code'><code>juneau-all</code></td>
+		<td class='code'><c>juneau-all</c></td>
 		<td>
 			Combination of the following:
 			<ul style='margin:0px 10px;'>
@@ -33844,7 +33870,7 @@
 		Improvements to swap support.
 		<ul>
 			<li>New {@link org.apache.juneau.annotation.Swap @Swap} annotation.
-				<br>Replaces the <code>@Pojo</code> and <code>@BeanProperty(swap)</code> annotations.
+				<br>Replaces the <c>@Pojo</c> and <c>@BeanProperty(swap)</c> annotations.
 			<li>Support for per-media-type swaps.
 				<br>Programmatic example:
 				<p class='bcode w800'>
@@ -33911,7 +33937,7 @@
 	<li>
 		Serializers now serialize the contents of {@link java.io.Reader Readers} and {@link java.io.InputStream InputStreams}
 		directly to the output stream or writer.
-		<br>When used with conjunction with <code>PojoSwaps</code>, this can be used to provide customized
+		<br>When used with conjunction with <c>PojoSwaps</c>, this can be used to provide customized
 		output for specific content types.
 		<p class='bcode w800'>
 	<ja>@Pojo</ja>(swap=MyBeanSwap.<jk>class</jk>)
@@ -33952,7 +33978,7 @@
 		This is mostly an internal change and doesn't affect the existing APIs.
 	<li>
 		{@link org.apache.juneau.transform.PojoSwap#swap(BeanSession,Object)} and {@link org.apache.juneau.transform.PojoSwap#unswap(BeanSession,Object,ClassMeta)} 
-		can now throw arbitrary exceptions instead of having to wrap them in <code>SerializeException</code>/<code>ParseException</code>.
+		can now throw arbitrary exceptions instead of having to wrap them in <c>SerializeException</c>/<c>ParseException</c>.
 	<li>
 		New {@link org.apache.juneau.utils.CalendarUtils} class that encapsulates serialization/parsing logic from {@link org.apache.juneau.transforms.CalendarSwap} and 
 		{@link org.apache.juneau.transforms.DateSwap}.
@@ -33995,8 +34021,8 @@
 		Eliminated the <ja>@Consumes</ja> and <ja>@Produces</ja> annotations.
 		<br>The supported media types are now passed in through the constructors.
 		<br>This was changed to eliminate a performance issue where a field could not be set as final because
-		the call to <code>getClass()</code> to retrieve the annotation value could not be called before calling
-		the <code><jk>super</jk>()</code> method.
+		the call to <c>getClass()</c> to retrieve the annotation value could not be called before calling
+		the <c><jk>super</jk>()</c> method.
 	<li>
 		New class: {@link org.apache.juneau.utils.PojoMerge}
 	<li>
@@ -34011,8 +34037,8 @@
 		{@link org.apache.juneau.dto.html5.HtmlElementMixed#children(Object...)} can now take in collections
 		of objects.
 	<li>
-		The DTO beans can now be serialized to strings of their typical language by calling the <code>toString()</code> method.
-		<br>For example, <code>Swagger.toString()</code> produces JSON and the HTML5 <code>Form.toString()</code>
+		The DTO beans can now be serialized to strings of their typical language by calling the <c>toString()</c> method.
+		<br>For example, <c>Swagger.toString()</c> produces JSON and the HTML5 <c>Form.toString()</c>
 		produces HTML.
 </ul>
 
@@ -34029,19 +34055,19 @@
 				{@link org.apache.juneau.rest.annotation.HookEvent#POST_INIT} for initialization.
 			<li>The following methods on {@link org.apache.juneau.rest.RestServlet} have been removed:
 				<ul>
-					<li><code>init(RestConfig)</code> 
+					<li><c>init(RestConfig)</c> 
 						- Use {@link org.apache.juneau.rest.annotation.HookEvent#INIT} instead.
-					<li><code>onSuccess(RestRequest, RestResponse, long)</code>
+					<li><c>onSuccess(RestRequest, RestResponse, long)</c>
 						- Use {@link org.apache.juneau.rest.annotation.HookEvent#END_CALL} instead.
-					<li><code>onPreCall(RestRequest)</code>
+					<li><c>onPreCall(RestRequest)</c>
 						- Use {@link org.apache.juneau.rest.annotation.HookEvent#PRE_CALL} instead.
-					<li><code>onPostCall(RestRequest, RestResponse)</code>
+					<li><c>onPostCall(RestRequest, RestResponse)</c>
 						- Use {@link org.apache.juneau.rest.annotation.HookEvent#POST_CALL} instead.
 				</ul> 	
 		</ul>
 	<li>
 		Simplified {@link org.apache.juneau.rest.widget.MenuItemWidget}.
-		<br>Exposes an abstract method <code><del>getContent(RestRequest)</del></code> that
+		<br>Exposes an abstract method <dc>getContent(RestRequest)</dc> that
 		can return raw HTML via readers or char-sequences, or any other object (such as HTML5 beans) that will
 		get converted to HTML using {@link org.apache.juneau.html.HtmlSerializer#DEFAULT}.
 	<li>
@@ -34053,29 +34079,29 @@
 			<li>{@link org.apache.juneau.rest.annotation.RestResource#resourceResolver() resourceResolver()}
 				<br>Allows you to specify a resource resolver on the servlet context to make it easier to work with
 				dependency injection frameworks.
-			<li><code><del>RestResource.contextPath()</del></code> - 
+			<li><dc>RestResource.contextPath()</dc> - 
 				<br>Allows you to override the context path value inherited from the servlet container.
 			<li>{@link org.apache.juneau.rest.annotation.RestResource#allowHeaderParams() allowHeaderParams()} - 
-				<br>Replaces the <code>RestContext.REST_allowHeaderParams</code> setting.
-			<li><code><del>RestResource.allowMethodParam()</del></code> - 
-				<br>Replaces the <code>RestContext.REST_allowMethodParam</code> setting.
+				<br>Replaces the <c>RestContext.REST_allowHeaderParams</c> setting.
+			<li><dc>RestResource.allowMethodParam()</dc> - 
+				<br>Replaces the <c>RestContext.REST_allowMethodParam</c> setting.
 			<li>{@link org.apache.juneau.rest.annotation.RestResource#allowBodyParam() allowBodyParam()} - 
-				<br>Replaces the <code>RestContext.REST_allowBodyParam</code> setting.
+				<br>Replaces the <c>RestContext.REST_allowBodyParam</c> setting.
 			<li>{@link org.apache.juneau.rest.annotation.RestResource#renderResponseStackTraces() renderResponseStackTraces()} - 
-				<br>Replaces the <code>RestContext.REST_xxx</code> setting.
+				<br>Replaces the <c>RestContext.REST_xxx</c> setting.
 			<li>{@link org.apache.juneau.rest.annotation.RestResource#useStackTraceHashes() useStackTraceHashes()} - 
-				<br>Replaces the <code>RestContext.REST_useStackTraceHashes</code> setting.
+				<br>Replaces the <c>RestContext.REST_useStackTraceHashes</c> setting.
 			<li>{@link org.apache.juneau.rest.annotation.RestResource#defaultCharset() defaultCharset()} - 
-				<br>Replaces the <code>RestContext.REST_defaultCharset</code> setting.
-			<li><code><del>RestResource.paramFormat()</del></code> - 
-				<br>Replaces the <code>RestContext.REST_paramFormat</code> setting.
+				<br>Replaces the <c>RestContext.REST_defaultCharset</c> setting.
+			<li><dc>RestResource.paramFormat()</dc> - 
+				<br>Replaces the <c>RestContext.REST_paramFormat</c> setting.
 		</ul>
 	<li>New annotations on {@link org.apache.juneau.rest.annotation.RestMethod @RestMethod}:
 		<ul>
 			<li>{@link org.apache.juneau.rest.annotation.RestMethod#defaultCharset() defaultCharset()} - 
-				<br>Replaces the <code>RestContext.REST_defaultCharset</code> setting.
-			<li><code><del>RestMethod.paramFormat()</del></code> - 
-				<br>Replaces the <code>RestContext.REST_paramFormat</code> setting.
+				<br>Replaces the <c>RestContext.REST_defaultCharset</c> setting.
+			<li><dc>RestMethod.paramFormat()</dc> - 
+				<br>Replaces the <c>RestContext.REST_paramFormat</c> setting.
 		</ul>
 	<li>
 		The following implementation classes can now be defined as non-static inner classes of servlets/resources:
@@ -34096,33 +34122,33 @@
 		New dark theme:
 		<br><img src='doc-files/ReleaseNotes.632.DarkStyle.png'>
 	<li>
-		Stylesheet selection now stored in HTTP session when passed in via <code>?stylesheet</code> query parameter.
+		Stylesheet selection now stored in HTTP session when passed in via <c>?stylesheet</c> query parameter.
 	<li>
 		New doc: <del>Lifecycle Hooks</del>
 	<li>
-		Eliminated the <code>RestServletJenaDefault</code> class to remove the Jena dependency class on 
-		the <code>juneau-rest-server</code> artifact. 
-		<br>It's simple enough to simply extend <code>BasicRestServlet</code> and add the RDF serializers and
+		Eliminated the <c>RestServletJenaDefault</c> class to remove the Jena dependency class on 
+		the <c>juneau-rest-server</c> artifact. 
+		<br>It's simple enough to simply extend <c>BasicRestServlet</c> and add the RDF serializers and
 		parsers.
 </ul>
 
 <h5 class='topic w800'>juneau-microservice</h5>
 <ul class='spaced-list'>
 	<li>
-		The microservice has been significantly modified to be configured via a <code>jetty.xml</code> file
+		The microservice has been significantly modified to be configured via a <c>jetty.xml</c> file
 		for maximum flexibility instead of the hodge-podge of support in the config file.
-		<br>Top-level servlets should now be defined in the provided <code>jetty.xml</code> file.
+		<br>Top-level servlets should now be defined in the provided <c>jetty.xml</c> file.
 	<li>
-		New methods on <code><del>RestMicroservice</del></code>:
+		New methods on <dc>RestMicroservice</dc>:
 		<ul>
-			<li><code><del>addServlet(Servlet,String)</del></code>
-			<li><code><del>addServletAttribute(String,Object)</del></code>
-			<li><code><del>getServer()</del></code>
-			<li><code><del>getInstance()</del></code>
-			<li><code><del>getPort()</del></code>
-			<li><code><del>getContextPath()</del></code>
-			<li><code><del>getProtocol()</del></code>
-			<li><code><del>getHostName()</del></code>
+			<li><dc>addServlet(Servlet,String)</dc>
+			<li><dc>addServletAttribute(String,Object)</dc>
+			<li><dc>getServer()</dc>
+			<li><dc>getInstance()</dc>
+			<li><dc>getPort()</dc>
+			<li><dc>getContextPath()</dc>
+			<li><dc>getProtocol()</dc>
+			<li><dc>getHostName()</dc>
 		</ul>
 	<li>
 		New methods on {@link org.apache.juneau.microservice.Microservice}:
@@ -34130,10 +34156,10 @@
 			<li>{@link org.apache.juneau.microservice.Microservice#getInstance() getInstance()}
 		</ul>
 	<li>
-		New class <code><del>JettyLogger</del></code> for directing Jetty logging to the
+		New class <dc>JettyLogger</dc> for directing Jetty logging to the
 		java.util.logging framework.
 	<li>
-		New class <code><del>DebugResource</del></code> for viewing and generating
+		New class <dc>DebugResource</dc> for viewing and generating
 		Jetty thread dumps through REST calls.
 </ul>
 
@@ -34162,28 +34188,28 @@
 <h5 class='topic w800'>juneau-dto</h5>
 <ul class='spaced-list'>
 	<li>
-		Class <code>org.apache.juneau.dto.Link</code> renamed to {@link org.apache.juneau.dto.LinkString}.
+		Class <c>org.apache.juneau.dto.Link</c> renamed to {@link org.apache.juneau.dto.LinkString}.
 		Helps avoid confusion since there are other Link classes in the library.
 </ul>
 
 <h5 class='topic w800'>juneau-rest-server</h5>
 <ul class='spaced-list'>
 	<li>
-		Annotation <code><ja>@HtmlDoc</ja>(links)</code> renamed to {@link org.apache.juneau.rest.annotation.HtmlDoc#navlinks() navlinks}.
+		Annotation <c><ja>@HtmlDoc</ja>(links)</c> renamed to {@link org.apache.juneau.rest.annotation.HtmlDoc#navlinks() navlinks}.
 	<li>
 		New annotation {@link org.apache.juneau.rest.annotation.HtmlDoc#head() @HtmlDoc(head)}.
 		<br>Allows you to specify arbitrary HTML content in the <xt>&lt;head&gt;</xt> section of the page.
 	<li>
-		Removed annotation <code><ja>@HtmlDoc</ja>(favIcon)</code>.
+		Removed annotation <c><ja>@HtmlDoc</ja>(favIcon)</c>.
 		<br>This was a discouraged way of defining fav-icons anyway, and with the addition of 
-		<code><ja>@HtmlDoc</ja>(head)</code>, you can define them using:
+		<c><ja>@HtmlDoc</ja>(head)</c>, you can define them using:
 		<p class='bcode w800'>
 	head={
 		<js>"&lt;link rel='icon' href='$U{servlet:/htdocs/juneau.png}'/&gt;"</js>
 	}
 		</p>
 	<li>
-		Removed several of the HTMLDOC-related methods from the <code>RestResponse/RestConfig/RestContext</code>
+		Removed several of the HTMLDOC-related methods from the <c>RestResponse/RestConfig/RestContext</c>
 		classes and moved it into the new {@link org.apache.juneau.rest.HtmlDocBuilder} class.
 </ul>
 </div><!-- END: 7.0.0 -->
@@ -34203,7 +34229,7 @@
 
 <h5 class='topic w800'>juneau-marshall</h5>
 <ul class='spaced-list'>
-	<li>New static <code>create()</code> methods for builders on serializers and parsers.
+	<li>New static <c>create()</c> methods for builders on serializers and parsers.
 		<br>This simplifies the syntax of creation of serializers and parsers by scratch.
 		<p class='bcode w800'>
 	<jc>// Old way</jc>
@@ -34218,7 +34244,7 @@
 			<li>{@link org.apache.juneau.parser.ParserGroup#create()}
 			<li>{@link org.apache.juneau.encoders.EncoderGroup#create()}
 			<li>{@link org.apache.juneau.rest.client.RestClient#create()}
-			<li><code><del>ConfigFile.create()</del></code>
+			<li><dc>ConfigFile.create()</dc>
 		</ul>
 	<li>
 		The order of the parameters in {@link org.apache.juneau.serializer.SerializerSession#serialize(Object,Object)}
@@ -34311,7 +34337,7 @@
 			<li>New methods on {@link org.apache.juneau.microservice.Microservice}
 				<ul>
 					<li>{@link org.apache.juneau.microservice.Microservice#startConsole() startConsole()}
-					<li><code><del>createConsoleCommands()</del></code>
+					<li><dc>createConsoleCommands()</dc>
 					<li>{@link org.apache.juneau.microservice.Microservice#getConsoleReader() getConsoleReader()}
 					<li>{@link org.apache.juneau.microservice.Microservice#getConsoleWriter() getConsoleWriter()}
 				</ul>	
@@ -34342,10 +34368,10 @@
 				<br>The 17000+ JUnit tests now execute in less than 10 seconds and have a cache-reuse hit rate
 				of 98% (164104 serializers/parsers/bean-contexts retrieved, but only 1801 created from scratch).
 			<li>
-				All the various separate <code>Context</code> classes (e.g. <code>JsonSerializerContext</code>) have been folded into
-				their respective serializer or parser classes (e.g. <code>JsonSerializer</code>).
+				All the various separate <c>Context</c> classes (e.g. <c>JsonSerializerContext</c>) have been folded into
+				their respective serializer or parser classes (e.g. <c>JsonSerializer</c>).
 				<br>Additionally, these classes are their own bean contexts.
-				<br>For example, the class hierarchy of <code>JsonSerializer</code> is now:
+				<br>For example, the class hierarchy of <c>JsonSerializer</c> is now:
 				<ul class='doctree'>
 					<li class='jac'>{@link org.apache.juneau.Context}
 					<ul>
@@ -34361,10 +34387,10 @@
 						</ul>
 					</ul>
 				</ul>
-				All <code>Context</code> objects are thread-safe and read-only.
+				All <c>Context</c> objects are thread-safe and read-only.
 			<li>
 				Session objects also now have a consistent class hierarchy.
-				<br>For example, the class hierarchy of <code>JsonSerializerSession</code> is now:
+				<br>For example, the class hierarchy of <c>JsonSerializerSession</c> is now:
 				<ul class='doctree'>
 					<li class='jac'>{@link org.apache.juneau.Session}
 					<ul>
@@ -34383,7 +34409,7 @@
 				Session objects are transient objects that live for the duration of a single parse.
 			<li>
 				Builder objects also now have a consistent class hierarchy.
-				<br>For example, the class hierarchy of <code>JsonSerializerBuilder</code> is now:
+				<br>For example, the class hierarchy of <c>JsonSerializerBuilder</c> is now:
 				<ul class='doctree'>
 					<li class='jac'>{@link org.apache.juneau.ContextBuilder}
 					<ul>
@@ -34396,42 +34422,42 @@
 						</ul>
 					</ul>
 				</ul>
-				Builder objects are used for building up and creating <code>Context</code> objects.
+				Builder objects are used for building up and creating <c>Context</c> objects.
 			<li>
 				The {@link org.apache.juneau.PropertyStore} class has been completely rewritten.
 				It is now a read-only configuration store build using the {@link org.apache.juneau.PropertyStoreBuilder}
 				class.
-				<br>The previous <code>PropertyStore</code> class was overly-complicated with many read/write
+				<br>The previous <c>PropertyStore</c> class was overly-complicated with many read/write
 				locks to ensure thread-safety. 
-				<br>The new design shifts to a builder-based model with read-only <code>PropertyStore</code> objects
+				<br>The new design shifts to a builder-based model with read-only <c>PropertyStore</c> objects
 				that can be used as hash keys.
 		</ul>
 	<li>
 		Improvements to the HTTP-Part APIs.
-		<br>The existing <code>PartSerializer</code>/<code>PartParser</code> classes
-		have been replaced with the following all located in the new <code>org.apache.juneau.httppart</code> package:
+		<br>The existing <c>PartSerializer</c>/<c>PartParser</c> classes
+		have been replaced with the following all located in the new <c>org.apache.juneau.httppart</c> package:
 		<ul class='doctree'>
 			<li class='jp'>{@link org.apache.juneau.httppart}
 			<ul>
 				<li class='jc'>{@link org.apache.juneau.httppart.HttpPartType}
 				<li class='jic'>{@link org.apache.juneau.httppart.HttpPartSerializer}
 				<ul>
-					<li class='jc'><code><del>UonPartSerializer</del></code>
-					<li class='jc'><code><del>SimpleUonPartSerializer</del></code>
+					<li class='jc'><dc>UonPartSerializer</dc>
+					<li class='jc'><dc>SimpleUonPartSerializer</dc>
 					<li class='jc'>{@link org.apache.juneau.httppart.SimplePartSerializer}
 				</ul>
 				<li class='jic'>{@link org.apache.juneau.httppart.HttpPartParser}
 				<ul>
-					<li class='jc'><code><del>UonPartParser</del></code>
-					<li class='jc'><code><del>SimplePartParser</del></code>
+					<li class='jc'><dc>UonPartParser</dc>
+					<li class='jc'><dc>SimplePartParser</dc>
 				</ul>
 			</ul>
 		</ul>
 		Code for marshalling of parts have been removed from the URL-Encoding serializers and parsers.
 	<li>	
-		<code>ContextBuilder.property(String,Object)</code> renamed to {@link org.apache.juneau.ContextBuilder#set(String,Object)}.
+		<c>ContextBuilder.property(String,Object)</c> renamed to {@link org.apache.juneau.ContextBuilder#set(String,Object)}.
 	<li>
-		<code>ResourceFinder</code> class has been replaced with the following:
+		<c>ResourceFinder</c> class has been replaced with the following:
 		<ul>
 			<li>{@link org.apache.juneau.utils.ClasspathResourceFinder}
 			<li>{@link org.apache.juneau.utils.ClasspathResourceFinderSimple}
@@ -34525,13 +34551,13 @@
 <h5 class='topic w800'>juneau-rest-server</h5>
 <ul class='spaced-list'>
 	<li>
-		<code>RestServletDefault</code> renamed to {@link org.apache.juneau.rest.BasicRestServlet}.
+		<c>RestServletDefault</c> renamed to {@link org.apache.juneau.rest.BasicRestServlet}.
 	<li>
-		<code>RestServletGroupDefault</code> renamed to {@link org.apache.juneau.rest.BasicRestServletGroup}.
+		<c>RestServletGroupDefault</c> renamed to {@link org.apache.juneau.rest.BasicRestServletGroup}.
 	<li>
 		The <js>"$R{...}"</js> variable has been split into the following:
 		<ul>
-			<li><js>"$RA{key1[,key2...]}"</js> - {@link org.apache.juneau.rest.vars.RequestAttributeVar}, first non-null value returned by <code>HttpServletRequest.getAttribute(String)</code>.
+			<li><js>"$RA{key1[,key2...]}"</js> - {@link org.apache.juneau.rest.vars.RequestAttributeVar}, first non-null value returned by <c>HttpServletRequest.getAttribute(String)</c>.
 			<li><js>"$RF{key1[,key2...]}"</js> - {@link org.apache.juneau.rest.vars.RequestFormDataVar}, first non-null value returned by {@link org.apache.juneau.rest.RestRequest#getFormData(String)}.
 			<li><js>"$RH{key1[,key2...]}"</js> - {@link org.apache.juneau.rest.vars.RequestHeaderVar}, first non-null value returned by {@link org.apache.juneau.rest.RestRequest#getHeader(String)}.
 			<li><js>"$RI{key1[,key2...]}"</js> - {@link org.apache.juneau.rest.vars.RestInfoVar}, first non-null value returned by {@link org.apache.juneau.rest.RestRequest#getInfoProvider()}.
@@ -34570,7 +34596,7 @@
 				</ul>
 		</ul>
 	<li>
-		Refactored the <code>RestConfig</code> class into {@link org.apache.juneau.rest.RestContextBuilder}.
+		Refactored the <c>RestConfig</c> class into {@link org.apache.juneau.rest.RestContextBuilder}.
 		<br>Settings on {@link org.apache.juneau.rest.RestContext} objects can now be set declaratively through the 
 			following new properties:
 		<ul>
@@ -34595,7 +34621,7 @@
 			<li>{@link org.apache.juneau.rest.RestContext#REST_callHandler REST_callHandler}
 			<li>{@link org.apache.juneau.rest.RestContext#REST_infoProvider REST_infoProvider}
 			<li>{@link org.apache.juneau.rest.RestContext#REST_path REST_path}
-			<li><code><del>REST_contextPath</del></code>
+			<li><dc>REST_contextPath</dc>
 			<li>{@link org.apache.juneau.rest.RestContext#REST_staticFiles REST_staticFiles}
 			<li>{@link org.apache.juneau.rest.RestContext#REST_staticFileResponseHeaders REST_staticFileResponseHeaders}
 			<li>{@link org.apache.juneau.rest.RestContext#REST_classpathResourceFinder REST_classpathResourceFinder}
@@ -34616,57 +34642,57 @@
 				{@link org.apache.juneau.rest.RestContext#REST_classpathResourceFinder REST_classpathResourceFinder}
 		</ul>
 	<li>
-		Eliminated the <code>RestMatcherReflecting</code> class.
+		Eliminated the <c>RestMatcherReflecting</c> class.
 		<br>You can now simply create a {@link org.apache.juneau.rest.RestMatcher} that has a public constructor that 
 		takes in the server and method arguments.
 	<li>
-		<code>@RestResource.allowMethodParam</code> renamed to {@link org.apache.juneau.rest.annotation.RestResource#allowedMethodParams}.
+		<c>@RestResource.allowMethodParam</c> renamed to {@link org.apache.juneau.rest.annotation.RestResource#allowedMethodParams}.
 	<li>
-		<code>@RestMethod.serializersInherit</code> and <code>@RestMethod.parsersInherit</code> replaced with
-		simplified <code><del>@RestMethod(inherit)</del></code>. 
+		<c>@RestMethod.serializersInherit</c> and <c>@RestMethod.parsersInherit</c> replaced with
+		simplified <dc>@RestMethod(inherit)</dc>. 
 	<li>
 		Changes to {@link org.apache.juneau.rest.RequestFormData}:
 		<ul>
 			<li>{@link org.apache.juneau.rest.RequestFormData#addDefault(Map) addDefault(Map)} takes in a 
-				<code>Map&lt;String,Object&gt;</code> instead of <code>Map&lt;String,String&gt;</code>.
+				<c>Map&lt;String,Object&gt;</c> instead of <c>Map&lt;String,String&gt;</c>.
 		</ul>
 	<li>
 		Changes to {@link org.apache.juneau.rest.RequestHeaders}:
 		<ul>
 			<li>{@link org.apache.juneau.rest.RequestHeaders#addDefault(Map) addDefault(Map)} takes in a 
-				<code>Map&lt;String,Object&gt;</code> instead of <code>Map&lt;String,String&gt;</code>.
+				<c>Map&lt;String,Object&gt;</c> instead of <c>Map&lt;String,String&gt;</c>.
 		</ul>
 	<li>
 		Changes to {@link org.apache.juneau.rest.RequestQuery}:
 		<ul>
 			<li>{@link org.apache.juneau.rest.RequestQuery#addDefault(Map) addDefault(Map)} takes in a 
-				<code>Map&lt;String,Object&gt;</code> instead of <code>Map&lt;String,String&gt;</code>.
+				<c>Map&lt;String,Object&gt;</c> instead of <c>Map&lt;String,String&gt;</c>.
 		</ul>
 	<li>
 		Changes to {@link org.apache.juneau.rest.RestContext}:
 		<ul>
-			<li><code>getResource(String,Locale)</code> renamed to {@link org.apache.juneau.rest.RestContext#getClasspathResource(String,Locale) getClasspathResource(String,Locale)}
-			<li><code>getResourceAsString(String,Locale)</code> renamed to {@link org.apache.juneau.rest.RestContext#getClasspathResourceAsString(String,Locale) getClasspathResourceAsString(String,Locale)}
-			<li><code>getResource(Class,MediaType,String,Locale)</code> renamed to {@link org.apache.juneau.rest.RestContext#getClasspathResource(Class,MediaType,String,Locale) getClasspathResourceAsString(Class,MediaType,String,Locale)}
+			<li><c>getResource(String,Locale)</c> renamed to {@link org.apache.juneau.rest.RestContext#getClasspathResource(String,Locale) getClasspathResource(String,Locale)}
+			<li><c>getResourceAsString(String,Locale)</c> renamed to {@link org.apache.juneau.rest.RestContext#getClasspathResourceAsString(String,Locale) getClasspathResourceAsString(String,Locale)}
+			<li><c>getResource(Class,MediaType,String,Locale)</c> renamed to {@link org.apache.juneau.rest.RestContext#getClasspathResource(Class,MediaType,String,Locale) getClasspathResourceAsString(Class,MediaType,String,Locale)}
 			<li>New method {@link org.apache.juneau.rest.RestContext#getClasspathResource(Class,String,Locale) getClasspathResource(Class,String,Locale)}.
 			<li>New method {@link org.apache.juneau.rest.RestContext#getClasspathResourceAsString(Class,String,Locale) getClasspathResourceAsString(Class,String,Locale)}.
 			<li>New method {@link org.apache.juneau.rest.RestContext#getClasspathResource(Class,Class,MediaType,String,Locale) getClasspathResource(Class,Class,MediaType,String,Locale)}.
 			<li>{@link org.apache.juneau.rest.RestContext#getDefaultRequestHeaders() getDefaultRequestHeaders} returns a 
-				<code>Map&lt;String,Object&gt;</code> instead of <code>Map&lt;String,String&gt;</code>.
+				<c>Map&lt;String,Object&gt;</c> instead of <c>Map&lt;String,String&gt;</c>.
 			<li>{@link org.apache.juneau.rest.RestContext#getDefaultResponseHeaders() getDefaultRequestHeaders} returns a 
-				<code>Map&lt;String,Object&gt;</code> instead of <code>Map&lt;String,String&gt;</code>.
+				<c>Map&lt;String,Object&gt;</c> instead of <c>Map&lt;String,String&gt;</c>.
 		</ul>
 	<li>
 		Changes to {@link org.apache.juneau.rest.RestRequest}:
 		<ul>	
-			<li><code>getSupportedMediaTypes()</code> replaced with
+			<li><c>getSupportedMediaTypes()</c> replaced with
 				{@link org.apache.juneau.rest.RestRequest#getConsumes() getConsumes()} and
 				{@link org.apache.juneau.rest.RestRequest#getProduces() getProduces()}.
-			<li><code>getReaderResource(String,boolean,MediaType)</code> renamed to 
-				<code><del>getClasspathReaderResource(String,boolean,MediaType)</del></code>
-			<li><code>getReaderResource(String,boolean)</code> renamed to 
+			<li><c>getReaderResource(String,boolean,MediaType)</c> renamed to 
+				<dc>getClasspathReaderResource(String,boolean,MediaType)</dc>
+			<li><c>getReaderResource(String,boolean)</c> renamed to 
 				{@link org.apache.juneau.rest.RestRequest#getClasspathReaderResource(String,boolean) getClasspathReaderResource(String,boolean)}
-			<li><code>getReaderResource(String)</code> renamed to 
+			<li><c>getReaderResource(String)</c> renamed to 
 				{@link org.apache.juneau.rest.RestRequest#getClasspathReaderResource(String) getClasspathReaderResource(String)}
 		</ul>
 	<li>
@@ -34682,16 +34708,16 @@
 				for overriding the supported media types inferred from the serializers and parsers.
 		</ul>
 	<li>
-		<code>RestCallHandler</code> split up into {@link org.apache.juneau.rest.RestCallHandler} and 
+		<c>RestCallHandler</c> split up into {@link org.apache.juneau.rest.RestCallHandler} and 
 		{@link org.apache.juneau.rest.BasicRestCallHandler}
 	<li>
-		<code>RestInfoProvider</code> split up into {@link org.apache.juneau.rest.RestInfoProvider} and 
+		<c>RestInfoProvider</c> split up into {@link org.apache.juneau.rest.RestInfoProvider} and 
 		{@link org.apache.juneau.rest.BasicRestInfoProvider}
 	<li>
-		<code>RestLogger</code> split up into {@link org.apache.juneau.rest.RestLogger}, 
+		<c>RestLogger</c> split up into {@link org.apache.juneau.rest.RestLogger}, 
 		{@link org.apache.juneau.rest.BasicRestLogger} and {@link org.apache.juneau.rest.NoOpRestLogger}
 	<li>
-		<code>RestResourceResolverSimple</code> renamed to {@link org.apache.juneau.rest.BasicRestResourceResolver}
+		<c>RestResourceResolverSimple</c> renamed to {@link org.apache.juneau.rest.BasicRestResourceResolver}
 	<li>
 		Introduced the following classes that helps make the code more understandable:
 		<ul>
@@ -34700,28 +34726,28 @@
 			<li>{@link org.apache.juneau.rest.RequestProperties}
 		</ul>
 	<li>
-		Eliminated the <code>@Messages</code> and <code>@Properties</code> REST java method parameter
+		Eliminated the <c>@Messages</c> and <c>@Properties</c> REST java method parameter
 		annotations.
-		<br>These aren't needed anymore since you can just pass in <code>MessageBundle</code> and
-		<code>RestRequestProperties</code> as unannotated parameters.
+		<br>These aren't needed anymore since you can just pass in <c>MessageBundle</c> and
+		<c>RestRequestProperties</c> as unannotated parameters.
 	<li>
 		Revamped the {@link org.apache.juneau.rest.RestInfoProvider} class.
 	<li>
 		New builder classes:
 		<ul>
-			<li><code><del>ReaderResourceBuilder</del></code>
-			<li><code><del>StreamResourceBuilder</del></code>
+			<li><dc>ReaderResourceBuilder</dc>
+			<li><dc>StreamResourceBuilder</dc>
 		</ul>
 	<li>
 		{@link org.apache.juneau.rest.RestResponse#getNegotiatedOutputStream()} now returns a 
-		<code><del>FinishableServletOutputStream</del></code> and {@link org.apache.juneau.rest.RestResponse#getNegotiatedWriter()}
-		now returns a <code><del>FinishablePrintWriter</del></code> that allows you to finish the output
+		<dc>FinishableServletOutputStream</dc> and {@link org.apache.juneau.rest.RestResponse#getNegotiatedWriter()}
+		now returns a <dc>FinishablePrintWriter</dc> that allows you to finish the output
 		without closing the stream.
-		<br>The {@link org.apache.juneau.rest.reshandlers.DefaultHandler} class now calls <code>finish()</code>
-		instead of <code>close()</code> on the stream.
+		<br>The {@link org.apache.juneau.rest.reshandlers.DefaultHandler} class now calls <c>finish()</c>
+		instead of <c>close()</c> on the stream.
 	<li>
 		Added the following annotations to the {@link org.apache.juneau.rest.BasicRestServlet} class
-		(which were previously defined on the <code><del>Resource</del></code> class):
+		(which were previously defined on the <dc>Resource</dc> class):
 		<p class='bcode w800'>
 	<ja>@RestResource</ja>(
 		htmldoc=<ja>@HtmlDoc</ja>(
@@ -34744,8 +34770,8 @@
 		New configuration property {@link org.apache.juneau.rest.client.RestClient#RESTCLIENT_query} and
 		builder method {@link org.apache.juneau.rest.client.RestClientBuilder#query(String,Object)}.
 	<li>
-		API changes to replace <code>PartSerializer</code> with {@link org.apache.juneau.httppart.HttpPartSerializer}.
-		<br>The default value is now <code><del>SimpleUonPartSerializer</del></code> which will
+		API changes to replace <c>PartSerializer</c> with {@link org.apache.juneau.httppart.HttpPartSerializer}.
+		<br>The default value is now <dc>SimpleUonPartSerializer</dc> which will
 		serialize strings as plain-text and collections/arrays as comma-delimited lists.
 		<br>We decided to change the default behavior in favor of practicality over purity.
 	<li>
@@ -34756,17 +34782,17 @@
 		</ul>
 	<li>
 		{@link org.apache.juneau.rest.client.RestCall} and {@link org.apache.juneau.rest.client.RestClient}
-		now implement the <code>Closeable</code> interface.
+		now implement the <c>Closeable</c> interface.
 </ul>
 
 <h5 class='topic w800'>juneau-microservice</h5>
 <ul class='spaced-list'>
 	<li>
-		<code>Resource</code> and <code>ResourceGroup</code> classes removed.
+		<c>Resource</c> and <c>ResourceGroup</c> classes removed.
 		<br>{@link org.apache.juneau.rest.BasicRestServlet} and {@link org.apache.juneau.rest.BasicRestServletGroup} can be used instead.
 	<li>
-		<code>ResourceJena</code> and <code>ResourceJenaGroup</code> classes renamed to
-		<code><del>BasicRestServletJena</del></code> and <code><del>BasicRestServletJenaGroup</del></code>.
+		<c>ResourceJena</c> and <c>ResourceJenaGroup</c> classes renamed to
+		<dc>BasicRestServletJena</dc> and <dc>BasicRestServletJenaGroup</dc>.
 </ul>
 </div><!-- END: 7.1.0 -->
 
@@ -34808,18 +34834,18 @@
 			and auto-generated Swagger documentation:
 		<ul class='doctree'>
 			<li class='ja'>{@link org.apache.juneau.http.annotation.Contact}
-			<li class='ja'><code><del>ExternalDocs</del></code>
-			<li class='ja'><code><del>Items</del></code>
+			<li class='ja'><dc>ExternalDocs</dc>
+			<li class='ja'><dc>Items</dc>
 			<li class='ja'>{@link org.apache.juneau.http.annotation.License}
-			<li class='ja'><code><del>Schema</del></code>
-			<li class='ja'><code><del>SubItems</del></code>
+			<li class='ja'><dc>Schema</dc>
+			<li class='ja'><dc>SubItems</dc>
 			<li class='ja'>{@link org.apache.juneau.http.annotation.Tag}
 		</ul>
 		<br>Additionally, the <ja>@Remoteable</ja> annotation has been split into the following two annotations:
 		<ul class='doctree'>
 			<li class='ja'>{@link org.apache.juneau.remote.RemoteInterface} 
 				- Used for remote proxy interfaces served up through 
-				<code><del>RemoteInterfaceServlet</del></code> or REST <js>"PROXY"</js> methods.
+				<dc>RemoteInterfaceServlet</dc> or REST <js>"PROXY"</js> methods.
 				<br>Defaults to <js>"POST"</js> with method signatures as paths.
 			<li class='ja'>{@link org.apache.juneau.rest.client.remote.RemoteResource} 
 				- Used for 3rd-party REST interfaces.
@@ -34827,11 +34853,11 @@
 		</ul>
 	<li>
 		Support for multi-valued parameters as maps or beans on server-side annotations (it was previously supported on client-side):
-		<code><ja>@Query</ja>(<js>"*"</js>)</code>, <code><ja>@FormData</ja>(<js>"*"</js>)</code>, <code><ja>@Header</ja>(<js>"*"</js>)</code>, <code><ja>@Path</ja>(<js>"*"</js>)</code>
+		<c><ja>@Query</ja>(<js>"*"</js>)</c>, <c><ja>@FormData</ja>(<js>"*"</js>)</c>, <c><ja>@Header</ja>(<js>"*"</js>)</c>, <c><ja>@Path</ja>(<js>"*"</js>)</c>
 	<li>
 		Support for server-side use of <ja>@Request</ja> annotation on <ja>@RestMethod</ja> annotations and new {@link org.apache.juneau.rest.RestRequest#getRequest(RequestBeanMeta)} method.
 	<li>
-		Fixed bug where <code><ja>@Bean</ja>(typeName)</code> was not being detected on non-bean POJO classes.
+		Fixed bug where <c><ja>@Bean</ja>(typeName)</c> was not being detected on non-bean POJO classes.
 	<li>
 		Fixed bug where HTML-Schema was not being rendered correctly.
 	<li>
@@ -34843,14 +34869,14 @@
 	<li>
 		Fixed bug where parsers could report the wrong line number when an error occurred.
 	<li>
-		A runtime exception is now thrown if you define a <code><ja>@BeanProperty</ja>(name)</code> but forget to
-		add it to your <code><ja>@Bean</ja>(properties)</code> annotation.
+		A runtime exception is now thrown if you define a <c><ja>@BeanProperty</ja>(name)</c> but forget to
+		add it to your <c><ja>@Bean</ja>(properties)</c> annotation.
 	<li>
-		<code><ja>@Html</ja>(asXml)</code> and <code><ja>@Html</ja>(asPlainText)</code> replaced with
+		<c><ja>@Html</ja>(asXml)</c> and <c><ja>@Html</ja>(asPlainText)</c> replaced with
 		{@link org.apache.juneau.html.annotation.Html#format() @Html(format)}.
 	<li>
 		HTML serializer will now serializers beans and maps as HTML even when those objects are embedded
-		within an object with <code><ja>@Html</ja>(format=<jsf>XML</jsf>)</code>.
+		within an object with <c><ja>@Html</ja>(format=<jsf>XML</jsf>)</c>.
 		<br>The previous behavior was to serialize it as XML.
 	<li>
 		New settings for binary-based serializers and parsers:
@@ -34895,25 +34921,25 @@
 		New property {@link org.apache.juneau.parser.Parser#PARSER_debugOutputLines} for controlling how many input lines are added to the exception message above.
 	<li>
 		New property {@link org.apache.juneau.BeanContext#BEAN_useEnumNames} for controlling whether enums are serialized
-		using their name or the <code>toString()</code> method.
+		using their name or the <c>toString()</c> method.
 	<li>
 		New property {@link org.apache.juneau.BeanContext#BEAN_examples} for defining examples of POJOs.
 	<li>
 		New {@link org.apache.juneau.annotation.Example @Example} annotation for defining examples of POJOs.
 		<br>Used heavily in JSON-Schema support.
 	<li>
-		If a bean has both a <code>getX()</code> and <code>isX()</code> method, the <code>getX()</code> method takes precedence.
+		If a bean has both a <c>getX()</c> and <c>isX()</c> method, the <c>getX()</c> method takes precedence.
 		<br>The previous behavior was arbitrary.
 	<li>
 		Significant improvements to JSON-Schema serialization support.
 		<ul>
-			<li>New <code><del>@JsonSchema</del></code> annotation.
+			<li>New <dc>@JsonSchema</dc> annotation.
 		</ul>
 	<li>
-		Fixed <code>NullPointerException</code> when serializing beans with a dyna-property (i.e. <code><ja>@Bean</ja>(<js>"*"</js>)</code>)
+		Fixed <c>NullPointerException</c> when serializing beans with a dyna-property (i.e. <c><ja>@Bean</ja>(<js>"*"</js>)</c>)
 		which returns a <jk>null</jk> value.
 	<li>
-		New option for dyna-property (i.e. <code><ja>@Bean</ja>(<js>"*"</js>)</code>) using a method that returns a collection of extra keys.
+		New option for dyna-property (i.e. <c><ja>@Bean</ja>(<js>"*"</js>)</c>) using a method that returns a collection of extra keys.
 		<br>See new options #4 on {@link org.apache.juneau.annotation.BeanProperty#name()}
 	<li>
 		New formats for the {@link org.apache.juneau.html.annotation.Html#format() @Html(format)} annotation:
@@ -34923,7 +34949,7 @@
 		</ul> 
 	<li>
 		Serializers now allow for q-values on the media types they handle.
-		<br>For example, the accept media type on <code>JsonSerializer.Simple</code> is <js>"application/json+simple,application/json;q=0.9"</js>.
+		<br>For example, the accept media type on <c>JsonSerializer.Simple</c> is <js>"application/json+simple,application/json;q=0.9"</js>.
 		<br>This means the serializer CAN handle requests for <js>"application/json"</js> if no other serializers provide a better match.
 	<li>
 		New methods for creating unmodifiable {@link org.apache.juneau.ObjectMap ObjectMaps} and {@link org.apache.juneau.ObjectList ObjectLists}.
@@ -34942,19 +34968,19 @@
 			</ul>
 		</ul>
 	<li>
-		The <code>JsonSerializer.Simple</code> class has been moved into the top-level {@link org.apache.juneau.json.SimpleJsonSerializer} class.
+		The <c>JsonSerializer.Simple</c> class has been moved into the top-level {@link org.apache.juneau.json.SimpleJsonSerializer} class.
 	<li>
 		RDF serializer subclasses have been moved into top-level classes:
 		<ul>
-			<li><code>RdfSerializer.Xml</code> -&gt; {@link org.apache.juneau.jena.RdfXmlSerializer}
-			<li><code>RdfSerializer.XmlAbbrev</code> -&gt; {@link org.apache.juneau.jena.RdfXmlAbbrevSerializer}
-			<li><code>RdfSerializer.N3</code> -&gt; {@link org.apache.juneau.jena.N3Serializer}
-			<li><code>RdfSerializer.NTriple</code> -&gt; {@link org.apache.juneau.jena.NTripleSerializer}
-			<li><code>RdfSerializer.Turtle</code> -&gt; {@link org.apache.juneau.jena.TurtleSerializer}
-			<li><code>RdfParser.Xml</code> -&gt; {@link org.apache.juneau.jena.RdfXmlParser}
-			<li><code>RdfParser.N3</code> -&gt; {@link org.apache.juneau.jena.N3Parser}
-			<li><code>RdfParser.NTriple</code> -&gt; {@link org.apache.juneau.jena.NTripleParser}
-			<li><code>RdfParser.Turtle</code> -&gt; {@link org.apache.juneau.jena.TurtleParser}
+			<li><c>RdfSerializer.Xml</c> -&gt; {@link org.apache.juneau.jena.RdfXmlSerializer}
+			<li><c>RdfSerializer.XmlAbbrev</c> -&gt; {@link org.apache.juneau.jena.RdfXmlAbbrevSerializer}
+			<li><c>RdfSerializer.N3</c> -&gt; {@link org.apache.juneau.jena.N3Serializer}
+			<li><c>RdfSerializer.NTriple</c> -&gt; {@link org.apache.juneau.jena.NTripleSerializer}
+			<li><c>RdfSerializer.Turtle</c> -&gt; {@link org.apache.juneau.jena.TurtleSerializer}
+			<li><c>RdfParser.Xml</c> -&gt; {@link org.apache.juneau.jena.RdfXmlParser}
+			<li><c>RdfParser.N3</c> -&gt; {@link org.apache.juneau.jena.N3Parser}
+			<li><c>RdfParser.NTriple</c> -&gt; {@link org.apache.juneau.jena.NTripleParser}
+			<li><c>RdfParser.Turtle</c> -&gt; {@link org.apache.juneau.jena.TurtleParser}
 		</ul>
 	<li>
 		New API for pairing serializers and parsers for simplified syntax:
@@ -35009,7 +35035,7 @@
 		instead of a list of strings.
 	<li>
 		Boolean attributes are now handled correctly for HTML5.
-		<br>For example, calling <code><jk>new</jk> Select().disabled(<jk>true</jk>)</code> will produce <code>&lt;select disabled='disabled'&gt;</code>
+		<br>For example, calling <c><jk>new</jk> Select().disabled(<jk>true</jk>)</c> will produce <c>&lt;select disabled='disabled'&gt;</c>
 </ul>
 
 <h5 class='topic w800'>juneau-rest-server</h5>
@@ -35020,15 +35046,15 @@
 		Simplified {@link org.apache.juneau.rest.annotation.RestResource#swagger() @RestResource(swagger)}
 		and {@link org.apache.juneau.rest.annotation.RestMethod#swagger() @RestMethod(swagger)} annotations.
 	<li>
-		Fixed bug in <code>UriResolver</code> when request path info had special characters.
+		Fixed bug in <c>UriResolver</c> when request path info had special characters.
 	<li>
-		Fixed bug where incorrect media type was being set on responses (e.g. <code>text/html+schema</code> instead of <code>text/html</code> for schema documents).
+		Fixed bug where incorrect media type was being set on responses (e.g. <c>text/html+schema</c> instead of <c>text/html</c> for schema documents).
 	<li>
-		The <code>RemoteableServlet</code> class has been moved and renamed to <code><del>RemoteInterfaceServlet</del></code>.
+		The <c>RemoteableServlet</c> class has been moved and renamed to <dc>RemoteInterfaceServlet</dc>.
 	<li>
-		<code><del>RemoteInterfaceServlet</del></code> now provides a form page for invoking remote interface methods in a browser.
+		<dc>RemoteInterfaceServlet</dc> now provides a form page for invoking remote interface methods in a browser.
 	<li>
-		Newlines were being stripped from <code><ja>@HtmlDoc</ja>(script)</code> when serialized which could cause script lines to become commented out.
+		Newlines were being stripped from <c><ja>@HtmlDoc</ja>(script)</c> when serialized which could cause script lines to become commented out.
 	<li>
 		New {@link org.apache.juneau.http.annotation.Response @Response} annotation that can be applied to
 		throwables thrown from REST methods and POJOs returned by REST methods to specify non-200 status return codes and descriptions in Swagger documentation.
@@ -35043,7 +35069,7 @@
 		</ul>
 	<li>
 		The <ja>@PathRemainder</ja> annotation has been removed entirely.  
-		<br>Use <code><ja>@Path</ja>(<js>"/*"</js>)</code> to access the path remainder which includes all the new OpenAPI parsing support.
+		<br>Use <c><ja>@Path</ja>(<js>"/*"</js>)</c> to access the path remainder which includes all the new OpenAPI parsing support.
 	<li>
 		"Helper" classes (i.e. reusable beans that can be returned by REST methods) have been moved to the following package with some new additions:
 		<ul class='doctree'>
@@ -35051,12 +35077,12 @@
 			<ul>
 				<li class='jc'>{@link org.apache.juneau.rest.helper.BeanDescription}
 				<li class='jc'>{@link org.apache.juneau.rest.helper.ChildResourceDescriptions}
-				<li class='jc'><code><del>ReaderResource</del></code>
-				<li class='jc'><code><del>ReaderResourceBuilder</del></code>
+				<li class='jc'><dc>ReaderResource</dc>
+				<li class='jc'><dc>ReaderResourceBuilder</dc>
 				<li class='jc'>{@link org.apache.juneau.rest.helper.SeeOtherRoot}
 				<li class='jc'>{@link org.apache.juneau.rest.helper.ResourceDescription}
-				<li class='jc'><code><del>StreamResource</del></code>
-				<li class='jc'><code><del>StreamResourceBuilder</del></code>
+				<li class='jc'><dc>StreamResource</dc>
+				<li class='jc'><dc>StreamResourceBuilder</dc>
 			</ul>
 		</ul>
 	<li>
@@ -35132,7 +35158,7 @@
 	<li>
 		The {@link org.apache.juneau.rest.annotation.HtmlDoc#nav() @HtmlDoc(nav)} and {@link org.apache.juneau.rest.annotation.HtmlDoc#navlinks() @HtmlDoc(navlinks)}
 		can now both be used on the same annotation.
-		<br>The contents of <code>nav()</code> are free-form HTML that gets rendered immediately after the navigation links.
+		<br>The contents of <c>nav()</c> are free-form HTML that gets rendered immediately after the navigation links.
 	<li>
 		The following new parameter types can be used on REST methods:
 		<ul class='doctree'>
@@ -35140,8 +35166,8 @@
 			<li class='jc'>{@link org.apache.juneau.parser.InputStreamParser} - The input stream parser matching the request content type.
 		</ul>
 	<li>
-		The <code>$F</code> variable can now be used as a initialization time variable.
-		<br>For example, the <code>AtomFeedResource</code> example pulls a bean example from a file on the classpath:
+		The <c>$F</c> variable can now be used as a initialization time variable.
+		<br>For example, the <c>AtomFeedResource</c> example pulls a bean example from a file on the classpath:
 		<p class='bcode w800'>
 	<ja>@RestResource</ja>(
 		path=<js>"/atom"</js>,
@@ -35152,20 +35178,20 @@
 		...
 	)
 		</p>
-		<br>It should be noted that you cannot use the <code>$F</code> variable to retrieve localized versions of files (since you're not within
+		<br>It should be noted that you cannot use the <c>$F</c> variable to retrieve localized versions of files (since you're not within
 		the scope of a client request.
 	<li>
-		The <code><del>RestResource.nowrap()</del></code> annotation has been changed to a string with a default value of <js>"true"</js>.
+		The <dc>RestResource.nowrap()</dc> annotation has been changed to a string with a default value of <js>"true"</js>.
 		<br>Having it as a string allows us to differentiate between a set and unset value so that it can be overridden in subclasses.
 	<li>
 		The {@link org.apache.juneau.http.annotation.Path#name()} annotation parameter is now required.
 	<li>
 		New class for mock unit testing of REST resources:
 		<ul class='doctree'>
-			<li class='jc'><code><del>MockRest</del></code>
+			<li class='jc'><dc>MockRest</dc>
 		</ul>
 	<li>
-		<code><ja>@RestMethod</ja>(inherit)</code> annotation has been removed and replaced with the following classes:
+		<c><ja>@RestMethod</ja>(inherit)</c> annotation has been removed and replaced with the following classes:
 		<ul class='doctree'>
 			<li class='jc'>{@link org.apache.juneau.rest.Inherit}
 			<li class='jc'>{@link org.apache.juneau.rest.None}
@@ -35181,9 +35207,9 @@
 			<li class='ja'>{@link org.apache.juneau.rest.annotation.RestMethod#beanFilters()}
 			<li class='ja'>{@link org.apache.juneau.rest.annotation.RestMethod#pojoSwaps()}
 		</ul>
-		<br>One advantage is that you now have control over the precedence of serializers and parsers by where you insert the <code>Inherit</code> class. 
+		<br>One advantage is that you now have control over the precedence of serializers and parsers by where you insert the <c>Inherit</c> class. 
 	<li>
-		<code>RequestPathMatch</code> class has been renamed to {@link org.apache.juneau.rest.RequestPath}.
+		<c>RequestPathMatch</c> class has been renamed to {@link org.apache.juneau.rest.RequestPath}.
 	<li>
 		{@link org.apache.juneau.http.annotation.Request @Request} objects can now be used as parameters in <ja>@RestMethod</ja> methods.
 		<br>Includes new methods on {@link org.apache.juneau.rest.RestRequest}:
@@ -35196,8 +35222,8 @@
 		<ul class='doctree'>
 			<li class='jc'>{@link org.apache.juneau.rest.widget.MenuItemWidget}
 			<ul>
-				<li class='jm'><code><del>getBeforeShowScript(RestRequest)</del></code>
-				<li class='jm'><code><del>getAfterShowScript(RestRequest)</del></code>
+				<li class='jm'><dc>getBeforeShowScript(RestRequest)</dc>
+				<li class='jm'><dc>getAfterShowScript(RestRequest)</dc>
 			</ul>
 		</ul>
 	<li>
@@ -35205,21 +35231,21 @@
 		<ul class='doctree'>
 			<li class='jc'>{@link org.apache.juneau.rest.widget.Widget}
 			<ul>
-				<li class='jm'><code><del>loadHtmlWithVars(RestRequest,String)</del></code>
-				<li class='jm'><code><del>loadScriptWithVars(RestRequest,String)</del></code>
-				<li class='jm'><code><del>loadStyleWithVars(RestRequest,String)</del></code>
+				<li class='jm'><dc>loadHtmlWithVars(RestRequest,String)</dc>
+				<li class='jm'><dc>loadScriptWithVars(RestRequest,String)</dc>
+				<li class='jm'><dc>loadStyleWithVars(RestRequest,String)</dc>
 			</ul>
 		</ul>
 	<li>
 		New/updated documentation: 
-		<br><code><del>juneau-rest-server.UnitTesting</del></code>
+		<br><dc>juneau-rest-server.UnitTesting</dc>
 	<li>
 		The behavior of the default values for {@link org.apache.juneau.rest.annotation.RestMethod#name()} and {@link org.apache.juneau.rest.annotation.RestMethod#path()}
 		have changed.
 		<br>If not specified, the values are inferred from the Java method name.
 		<br>See Also: {@doc juneau-rest-server.RestMethod}
 	<li>
-		<code>RedirectToServletRoot</code> class has been renamed to {@link org.apache.juneau.rest.helper.SeeOtherRoot}.
+		<c>RedirectToServletRoot</c> class has been renamed to {@link org.apache.juneau.rest.helper.SeeOtherRoot}.
 	<li>
 		New REST context settings:
 		<ul class='doctree'>
@@ -35232,7 +35258,7 @@
 			</ul>
 		</ul>
 	<li>
-		New convenience annotations for specifying default <code>Accept</code> and <code>Content-Type</code> headers:
+		New convenience annotations for specifying default <c>Accept</c> and <c>Content-Type</c> headers:
 		<ul class='doctree'>	
 			<li class='jc'>{@link org.apache.juneau.rest.annotation.RestResource}
 			<ul>
@@ -35289,24 +35315,24 @@
 		<ul class='doctree'>
 			<li class='jc'>{@link org.apache.juneau.rest.client.RestClientBuilder}
 			<ul>
-				<li class='jf'><code><del>mockHttpConnection(MockHttpConnection)</del></code>
+				<li class='jf'><dc>mockHttpConnection(MockHttpConnection)</dc>
 			</ul>
 		</ul>
 	<li>
-		Removed the deprecated <code>RestCall.execute()</code> method.
+		Removed the deprecated <c>RestCall.execute()</c> method.
 		<br>Use {@link org.apache.juneau.rest.client.RestCall#run()}.
 	<li>
-		<code>RestCall.input(Object)</code> method renamed to {@link org.apache.juneau.rest.client.RestCall#body(Object)} to match OpenAPI terminology.
+		<c>RestCall.input(Object)</c> method renamed to {@link org.apache.juneau.rest.client.RestCall#body(Object)} to match OpenAPI terminology.
 	<li>
-		Made constructors on <code>RestClient</code> and <code>RestClientBuilder</code> protected so that they can be subclassed.
+		Made constructors on <c>RestClient</c> and <c>RestClientBuilder</c> protected so that they can be subclassed.
 	<li>
-		The <code>RestClient.getRemoteableProxy()</code> methods have been split into separate methods for Remote Interfaces and Remote Resources:
+		The <c>RestClient.getRemoteableProxy()</c> methods have been split into separate methods for Remote Interfaces and Remote Resources:
 		<ul class='doctree'>
 			<li class='jc'>{@link org.apache.juneau.rest.client.RestClient}
 			<ul>
-				<li class='jm'><code><del>RestClient.getRemoteInterface(Class)</del></code>
-				<li class='jm'><code><del>RestClient.getRemoteInterface(Class,Object)</del></code>
-				<li class='jm'><code><del>RestClient.getRemoteInterface(Class,Object,Serializer,Parser)</del></code>
+				<li class='jm'><dc>RestClient.getRemoteInterface(Class)</dc>
+				<li class='jm'><dc>RestClient.getRemoteInterface(Class,Object)</dc>
+				<li class='jm'><dc>RestClient.getRemoteInterface(Class,Object,Serializer,Parser)</dc>
 				<li class='jm'>{@link org.apache.juneau.rest.client.RestClient#getRemoteResource(Class)}
 				<li class='jm'>{@link org.apache.juneau.rest.client.RestClient#getRemoteResource(Class,Object)}
 				<li class='jm'>{@link org.apache.juneau.rest.client.RestClient#getRemoteResource(Class,Object,Serializer,Parser)}
@@ -35318,7 +35344,7 @@
 <ul class='spaced-list'>
 	<li>
 		The look-and-feel of an application is now controlled through the external configuration file and access to
-		CSS stylesheets in the working directory in a new folder called <code>files</code>:
+		CSS stylesheets in the working directory in a new folder called <c>files</c>:
 		<br><img class='bordered' style='width:170px' src='doc-files/ReleaseNotes.711.1.png'>
 		<br><br>
 		The default configuration is this: 
@@ -35343,12 +35369,12 @@
 	<ck>footer</ck> = <cv>&lt;a href='$U{$C{REST/footerLink}}'&gt;&lt;img style='float:right;padding-right:20px;height:32px' src='$U{$C{REST/footerIcon}}'&gt;</cv>	
 		</p>				
 		<br><br>
-		Note that static files can now be served up from the <code>files</code> directory in the working directory, 
+		Note that static files can now be served up from the <c>files</c> directory in the working directory, 
 		and you have access to modify the CSS theme files.
-		<br>The <code>SwaggerUI.css</code> file controls the look-and-feel of the Swagger UI, so you can make
+		<br>The <c>SwaggerUI.css</c> file controls the look-and-feel of the Swagger UI, so you can make
 		modification there as well.
 		<br><br>
-		The <code>BasicRestConfig</code> interface (which defines the default settings for the <code>BasicRestServlet</code> class)
+		The <c>BasicRestConfig</c> interface (which defines the default settings for the <c>BasicRestServlet</c> class)
 		now looks like this...
 		<p class='bcode w800'>
 	<ja>@RestResource</ja>(
@@ -35376,7 +35402,7 @@
 	<jk>public interface</jk> BasicRestConfig {}			
 			</p>	
 			<br><br>
-			The <code>PoweredByApache</code> widget which used to serve as a page footer has been eliminated.
+			The <c>PoweredByApache</c> widget which used to serve as a page footer has been eliminated.
 			<br><br>
 			If you're testing out changes in the theme stylesheets, you may want to set the following system property
 			that prevents caching of those files so that you don't need to restart the microservice each time a change is made:
@@ -35407,7 +35433,7 @@
 <h5 class='topic w800'>juneau-marshall</h5>
 <ul class='spaced-list'>
 	<li>
-		The <code><del>@JsonSchema</del></code> annotation has been merged with the {@link org.apache.juneau.jsonschema.annotation.Schema @Schema} annotation.
+		The <dc>@JsonSchema</dc> annotation has been merged with the {@link org.apache.juneau.jsonschema.annotation.Schema @Schema} annotation.
 	<li>
 		Annotations typically used on bean properties (getters/setters/public fields) can now be used on private fields.
 		This is inline with behavior on JPA-annotated beans.
@@ -35421,22 +35447,22 @@
 		from parent classes and interfaces. 
 		<br>This allows you to define {@doc juneau-rest-client.RestProxies.DualPurposeInterfaces}.
 	<li>
-		The <code>ReaderResource</code> and <code>StreamResource</code> classes have been moved to the <code>org.apache.juneau.http</code>
-		package in <code>juneau-marshall</code>.  This allows them to be used as return types in remote REST interfaces.
+		The <c>ReaderResource</c> and <c>StreamResource</c> classes have been moved to the <c>org.apache.juneau.http</c>
+		package in <c>juneau-marshall</c>.  This allows them to be used as return types in remote REST interfaces.
 		<br>A new {@link org.apache.juneau.rest.helper.ResolvingReaderResource} class has been added that includes the variable-resolving support since
-		this relies on the <code>juneau-svl</code> package.
+		this relies on the <c>juneau-svl</c> package.
 	<li>
-		The <code>RemoteInterfaceServlet</code> class has been renamed to {@link org.apache.juneau.rest.remote.RrpcServlet}.
+		The <c>RemoteInterfaceServlet</c> class has been renamed to {@link org.apache.juneau.rest.remote.RrpcServlet}.
 	<li>
-		<code><ja>@RestMethod</ja>(name=<js>"PROXY"</js>)</code> has been changed to <code><ja>@RestMethod</ja>(name=<js>"RRPC"</js>)</code>.
+		<c><ja>@RestMethod</ja>(name=<js>"PROXY"</js>)</c> has been changed to <c><ja>@RestMethod</ja>(name=<js>"RRPC"</js>)</c>.
 </ul>
 
 <h5 class='topic w800'>juneau-rest-client</h5>
 <ul class='spaced-list'>
 	<li>
-		The <code>RestClient.getRemoteInterface()</code> method has been renamed to {@link org.apache.juneau.rest.client.RestClient#getRrpcInterface(Class)}.
+		The <c>RestClient.getRemoteInterface()</c> method has been renamed to {@link org.apache.juneau.rest.client.RestClient#getRrpcInterface(Class)}.
 	<li>
-		Fixed a bug where <code><ja>@RemoteMethod</ja>(path)</code> values containing '/' characters were erroneously being encoded.
+		Fixed a bug where <c><ja>@RemoteMethod</ja>(path)</c> values containing '/' characters were erroneously being encoded.
 </ul>
 </div><!-- END: 7.2.1 -->
 
@@ -35464,27 +35490,27 @@
 	The structure is now as follows:
 </p>
 <ul>
-	<li><code>juneau-rest</code>
+	<li><c>juneau-rest</c>
 	<ul>
-		<li><code>juneau-rest-client</code>
-		<li><code>juneau-rest-server</code>
-		<li><code>juneau-rest-server-jaxrs</code>
-		<li><code>juneau-rest-server-rdf</code>
-		<li><b><code>juneau-rest-server-springboot</code></b> - New Spring Boot integration support classes. 
+		<li><c>juneau-rest-client</c>
+		<li><c>juneau-rest-server</c>
+		<li><c>juneau-rest-server-jaxrs</c>
+		<li><c>juneau-rest-server-rdf</c>
+		<li><b><c>juneau-rest-server-springboot</c></b> - New Spring Boot integration support classes. 
 	</ul>
-	<li><code>juneau-microservice</code>
+	<li><c>juneau-microservice</c>
 	<ul>
-		<li><b><code>juneau-microservice-core</code></b> - New.  Contains base {@link org.apache.juneau.microservice.Microservice} class.
-		<li><b><code>juneau-microservice-jetty</code></b> - New.  Contains new {@link org.apache.juneau.microservice.jetty.JettyMicroservice} class.
-		<li><b><code>juneau-my-jetty-microservice</code></b> - New.  Template starter project for Jetty-based microservices.
-		<li><b><code>juneau-my-springboot-microservice</code></b> - New.  Template starter project for Spring-Boot-based microservices.
+		<li><b><c>juneau-microservice-core</c></b> - New.  Contains base {@link org.apache.juneau.microservice.Microservice} class.
+		<li><b><c>juneau-microservice-jetty</c></b> - New.  Contains new {@link org.apache.juneau.microservice.jetty.JettyMicroservice} class.
+		<li><b><c>juneau-my-jetty-microservice</c></b> - New.  Template starter project for Jetty-based microservices.
+		<li><b><c>juneau-my-springboot-microservice</c></b> - New.  Template starter project for Spring-Boot-based microservices.
 	</ul>
-	<li><code>juneau-examples</code>
+	<li><c>juneau-examples</c>
 	<ul>
-		<li><code>juneau-core</code>
-		<li><b><code>juneau-microservice-rest</code></b> - Now contains only servlet example classes.  No Jetty configuration.
-		<li><b><code>juneau-microservice-rest-jetty</code></b> - Servlet examples deployed using Jetty.
-		<li><b><code>juneau-microservice-rest-springboot</code></b> - Servlet examples deployed using Spring Boot.
+		<li><c>juneau-core</c>
+		<li><b><c>juneau-microservice-rest</c></b> - Now contains only servlet example classes.  No Jetty configuration.
+		<li><b><c>juneau-microservice-rest-jetty</c></b> - Servlet examples deployed using Jetty.
+		<li><b><c>juneau-microservice-rest-springboot</c></b> - Servlet examples deployed using Spring Boot.
 	</ul>
 </ul>
 
@@ -35567,7 +35593,7 @@
 <h5 class='topic w800'>juneau-microservice-jetty</h5>
 <ul class='spaced-list'>
 	<li>
-		New {@link org.apache.juneau.microservice.jetty.JettyMicroservice} class replaces the previous <code>RestMicroservice</code>.
+		New {@link org.apache.juneau.microservice.jetty.JettyMicroservice} class replaces the previous <c>RestMicroservice</c>.
 </ul>
 
 <h5 class='topic w800'>juneau-my-jetty-microservice</h5>
@@ -35581,7 +35607,7 @@
 	<li>
 		Template starter project for Spring-Boot-based microservices.
 	<li>
-		<code>app.json</code> and <code>Procfile</code> files for deploying examples into Heroku.
+		<c>app.json</c> and <c>Procfile</c> files for deploying examples into Heroku.
 		<br>Includes instructions.
 </ul>
 </div><!-- END: 8.0.0 -->
@@ -35610,23 +35636,23 @@
 		The following POJO methods can be used to convert a POJO to/from a Map before serialization and after parsing.
 		<br>It's a convenient way of defining a POJO transform.
 		<ul class='doctree'>
-			<li class='jm'><code><jk>public</jk> Map toMap()</code> -  Can be any type of map with string keys and object vals. 
-			<li class='jm'><code><jk>public</jk> ObjectMap toMap()</code>
-			<li class='jm'><code><jk>public</jk> Map toMap(BeanSession bs)</code> -  Can be any type of map with string keys and object vals. 
-			<li class='jm'><code><jk>public</jk> ObjectMap toMap(BeanSession bs)</code>
-			<li class='jm'><code><jk>public static</jk> T fromMap(Map m)</code> -  Can be any type of map with string keys and object vals. 
-			<li class='jm'><code><jk>public static</jk> T fromMap(ObjectMap m)</code>
-			<li class='jm'><code><jk>public static</jk> T fromMap(BeanSession bs, Map m)</code> -  Can be any type of map with string keys and object vals. 
-			<li class='jm'><code><jk>public static</jk> T fromMap(BeanSession bs, ObjectMap m)</code>
+			<li class='jm'><c><jk>public</jk> Map toMap()</c> -  Can be any type of map with string keys and object vals. 
+			<li class='jm'><c><jk>public</jk> ObjectMap toMap()</c>
+			<li class='jm'><c><jk>public</jk> Map toMap(BeanSession bs)</c> -  Can be any type of map with string keys and object vals. 
+			<li class='jm'><c><jk>public</jk> ObjectMap toMap(BeanSession bs)</c>
+			<li class='jm'><c><jk>public static</jk> T fromMap(Map m)</c> -  Can be any type of map with string keys and object vals. 
+			<li class='jm'><c><jk>public static</jk> T fromMap(ObjectMap m)</c>
+			<li class='jm'><c><jk>public static</jk> T fromMap(BeanSession bs, Map m)</c> -  Can be any type of map with string keys and object vals. 
+			<li class='jm'><c><jk>public static</jk> T fromMap(BeanSession bs, ObjectMap m)</c>
 		</ul>
 	<li>
 		New convenience debugging methods on Marshall API:
 		<ul class='doctree'>
 			<li class='jc'>{@link org.apache.juneau.marshall.Marshall}
 			<ul>
-				<li class='jm'>{@link org.apache.juneau.marshall.Marshall#format(String,Object...)} - <code>MessageFormat</code>-style formatter.
-				<li class='jm'>{@link org.apache.juneau.marshall.Marshall#out(String,Object...)} - Prints <code>MessageFormat</code>-style messages to STDOUT.
-				<li class='jm'>{@link org.apache.juneau.marshall.Marshall#err(String,Object...)} - Prints <code>MessageFormat</code>-style messages to STDERR.
+				<li class='jm'>{@link org.apache.juneau.marshall.Marshall#format(String,Object...)} - <c>MessageFormat</c>-style formatter.
+				<li class='jm'>{@link org.apache.juneau.marshall.Marshall#out(String,Object...)} - Prints <c>MessageFormat</c>-style messages to STDOUT.
+				<li class='jm'>{@link org.apache.juneau.marshall.Marshall#err(String,Object...)} - Prints <c>MessageFormat</c>-style messages to STDERR.
 			</ul>
 		</ul>
 </ul>
@@ -35659,7 +35685,7 @@
 	<li>
 		Entries in the system config are automatically set as system properties.
 		<br>This mean you can set any of the various serializer and parser settings (e.g. <js>"JsonSerializer.simpleMode.b"</js>)
-		in the default configuration area or <code>application.properties</code>.
+		in the default configuration area or <c>application.properties</c>.
 </ul>
 
 <h5 class='topic w800'>juneau-rest-server</h5>
@@ -35759,7 +35785,7 @@
 			</ul>
 		</ul>
 	<li>
-		Added the following classes that provide the same support as the servlet classes but doesn't extend from <code>HttpServlet</code>.
+		Added the following classes that provide the same support as the servlet classes but doesn't extend from <c>HttpServlet</c>.
 		<br>This fixes an issue where instances of {@link org.apache.juneau.rest.BasicRestServlet} are registered as top-level servlets even though
 		you don't want them to be.  
 		<ul class='doctree'>
@@ -35769,7 +35795,7 @@
 			<li class='jac'>{@link org.apache.juneau.rest.BasicRestJenaGroup} - Non-servlet equivalent to {@link org.apache.juneau.rest.BasicRestServletJenaGroup}
 		</ul>
 	<li>
-		HTML widgets now have access to the <code>RestResponse</code> object if they need access to the output bean.
+		HTML widgets now have access to the <c>RestResponse</c> object if they need access to the output bean.
 	<li>
 		New annotations for simplified role-based guards on classes and methods:
 		<ul class='doctree'>
@@ -35785,6 +35811,16 @@
 			</ul>
 		</ul>
 	<li>
+		New annotations for fine-tuned handling of http-methods/http-headers as query parameters and others:
+		<ul class='doctree'>
+			<li class='ja'>{@link org.apache.juneau.rest.annotation.RestResource} 
+			<ul>
+				<li class='jm'>{@link org.apache.juneau.rest.annotation.RestResource#allowedHeaderParams() allowedHeaderParams()}
+				<li class='jm'>{@link org.apache.juneau.rest.annotation.RestResource#allowedMethodHeaders() allowedMethodHeaders()}
+				<li class='jm'>{@link org.apache.juneau.rest.annotation.RestResource#allowedMethodParams() allowedMethodParams()}
+			</ul>
+		</ul>
+	<li>
 		The {@link org.apache.juneau.rest.annotation.RestResource#path() @RestResource(path)} annotation can now use variables:
 		<p class='bcode'>
 	<ja>@RestResource</ja>(
@@ -35805,6 +35841,19 @@
 			</ul>
 		</ul>
 	<li>
+		New interface method for catching arbitrary thrown objects and converting them to other throwables.
+		<ul class='doctree'>
+			<li class='jc'>{@link org.apache.juneau.rest.RestCallHandler}
+			<ul>
+				<li class='jm'>{@link org.apache.juneau.rest.RestCallHandler#convertThrowable(Throwable) convertThrowable(Throwable)}
+			</ul>
+			<li class='jc'>{@link org.apache.juneau.rest.BasicRestCallHandler}
+			<ul>
+				<li class='jm'>{@link org.apache.juneau.rest.BasicRestCallHandler#convertThrowable(Throwable) convertThrowable(Throwable)}
+			</ul>
+		</ul>
+		
+	<li>
 		Fixed a bug where the HTTP response was returning 405 (method not found) but should really be 404 (not found)
 		when no path patterns match on any of the Java methods.
 </ul>
diff --git a/juneau-doc/src/main/javadoc/resources/docs.txt b/juneau-doc/src/main/javadoc/resources/docs.txt
index 24e5b0c..52bb1aa 100644
--- a/juneau-doc/src/main/javadoc/resources/docs.txt
+++ b/juneau-doc/src/main/javadoc/resources/docs.txt
@@ -306,6 +306,7 @@
 juneau-rest-server.Instantiation.ResourceResolvers = #juneau-rest-server.Instantiation.ResourceResolvers, Overview > juneau-rest-server > Instantiation > Resource Resolvers
 juneau-rest-server.Instantiation.RestServlet = #juneau-rest-server.Instantiation.RestServlet, Overview > juneau-rest-server > Instantiation > RestServlet
 juneau-rest-server.LoggingAndErrorHandling = #juneau-rest-server.LoggingAndErrorHandling, Overview > juneau-rest-server > Logging and Error Handling
+juneau-rest-server.LoggingAndErrorHandling.LOG4J = #juneau-rest-server.LoggingAndErrorHandling.LOG4J, Overview > juneau-rest-server > Logging and Error Handling > Using LOG4J for logging
 juneau-rest-server.Messages = #juneau-rest-server.Messages, Overview > juneau-rest-server > Messages
 juneau-rest-server.OpenApiSchemaPartParsing = #juneau-rest-server.OpenApiSchemaPartParsing, Overview > juneau-rest-server > OpenAPI Schema Part Parsing
 juneau-rest-server.OpenApiSchemaPartSerializing = #juneau-rest-server.OpenApiSchemaPartSerializing, Overview > juneau-rest-server > OpenAPI Schema Part Serializing
diff --git a/juneau-doc/src/main/javadoc/resources/fragments/toc.html b/juneau-doc/src/main/javadoc/resources/fragments/toc.html
index ff1bb30..64fd5ca 100644
--- a/juneau-doc/src/main/javadoc/resources/fragments/toc.html
+++ b/juneau-doc/src/main/javadoc/resources/fragments/toc.html
@@ -297,6 +297,9 @@
 		</ol>
 		<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-rest-server.DefaultHeaders'>Default Headers</a></p>
 		<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-rest-server.LoggingAndErrorHandling'>Logging and Error Handling</a></p>
+		<ol>
+			<li><p class='new'><a class='doclink' href='{OVERVIEW_URL}#juneau-rest-server.LoggingAndErrorHandling.LOG4J'>Using LOG4J for logging</a></p>
+		</ol>
 		<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-rest-server.HttpStatusCodes'>HTTP Status Codes</a></p>
 		<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-rest-server.OverloadingHttpMethods'>Overloading HTTP Methods</a></p>
 		<li><p class=''><a class='doclink' href='{OVERVIEW_URL}#juneau-rest-server.BuiltInParameters'>Built-in Parameters</a></p>
diff --git a/juneau-doc/src/main/javadoc/resources/juneau-code.css b/juneau-doc/src/main/javadoc/resources/juneau-code.css
index 7bb7a46..3f33d90 100644
--- a/juneau-doc/src/main/javadoc/resources/juneau-code.css
+++ b/juneau-doc/src/main/javadoc/resources/juneau-code.css
@@ -50,6 +50,9 @@
  * 	<cs> - Config file section
  * 	<ck> - Config file key
  * 	<cv> - Config file value
+ * 	<c> - Synonym for <code>
+ * 	<dc> - Synonym for <code><del>
+ * 	<bc> - <code><b>
  ***************************************************************************************************************************/
 
 /* Monospaced font size */
@@ -59,7 +62,8 @@
 jc,jd,jt,jk,js,jf,jsf,jsm,ja, 
 xt,xa,xc,xs,
 mc,mk,mv,
-cc,cs,ck,ce {
+cc,cs,ck,ce,
+c,dc,bc {
 	font-size: 9pt;
 	white-space: pre;
 	font-family: monospace;
@@ -68,6 +72,16 @@
 	-o-tab-size: 3;
 }
 
+/* Deleted code */
+dc {
+	text-decoration: line-through;
+}
+
+/* Bold code */
+bc {
+	font-weight: bold;
+}
+
 /*--- Bordered code ---*/
 p.bcode,
 p.bpcode {
diff --git a/juneau-doc/src/main/javadoc/resources/juneau-doc.css b/juneau-doc/src/main/javadoc/resources/juneau-doc.css
index 5afe1de..5ee8f49 100755
--- a/juneau-doc/src/main/javadoc/resources/juneau-doc.css
+++ b/juneau-doc/src/main/javadoc/resources/juneau-doc.css
@@ -41,16 +41,8 @@
  *

  * Available tags:

  * 	<l> - A literal.

- *	<property> - A property.

  ***************************************************************************************************************************/

 

-property {

-	font-size: 9pt;

-	white-space: pre;

-	font-family: monospace;

-	font-weight: bold;

-}

-

 .fixedWidth {

 	max-width: 800px;

 }

diff --git a/juneau-examples/juneau-examples-core/.settings/org.eclipse.wst.html.core.prefs b/juneau-examples/juneau-examples-core/.settings/org.eclipse.wst.html.core.prefs
index f70192e..7de0d38 100644
--- a/juneau-examples/juneau-examples-core/.settings/org.eclipse.wst.html.core.prefs
+++ b/juneau-examples/juneau-examples-core/.settings/org.eclipse.wst.html.core.prefs
@@ -32,7 +32,7 @@
 elemUnclosedStartTag=1
 elemUnknownName=2
 elemUnnecessaryEnd=2
-elementNamesToIgnore=jc,jd,jt,jk,js,jf,jsf,jsm,ja,xt,xa,xc,xs,xv,ua,uk,un,us,mk,mv,cc,cs,ck,cv,l,property
+elementNamesToIgnore=bc,c,cc,ci,ck,cs,cv,dc,del,ja,jc,jd,jf,jk,joc,jok,jov,js,jsf,jsm,jt,l,mk,mv,ua,uk,un,us,xa,xc,xs,xt,xv
 ignoreAttrNames=false
 ignoreElementNames=true
 piInvalidContent=2
diff --git a/juneau-examples/juneau-examples-rest-jetty/src/main/java/org/apache/juneau/examples/rest/jetty/App.java b/juneau-examples/juneau-examples-rest-jetty/src/main/java/org/apache/juneau/examples/rest/jetty/App.java
index df2d05b..3d8fd9f 100644
--- a/juneau-examples/juneau-examples-rest-jetty/src/main/java/org/apache/juneau/examples/rest/jetty/App.java
+++ b/juneau-examples/juneau-examples-rest-jetty/src/main/java/org/apache/juneau/examples/rest/jetty/App.java
@@ -23,7 +23,7 @@
  * However, this is optional and the {@link JettyMicroservice} class can be invoked directly.
  *
  * <p>
- * The {@link JettyMicroservice} class will locate the <code>examples.cfg</code> file in the home directory and initialize
+ * The {@link JettyMicroservice} class will locate the <c>examples.cfg</c> file in the home directory and initialize
  * the resources and commands defined in that file.
  *
  * <h5 class='section'>See Also:</h5>
diff --git a/juneau-examples/juneau-examples-rest-springboot/.settings/org.eclipse.wst.html.core.prefs b/juneau-examples/juneau-examples-rest-springboot/.settings/org.eclipse.wst.html.core.prefs
index f70192e..7de0d38 100644
--- a/juneau-examples/juneau-examples-rest-springboot/.settings/org.eclipse.wst.html.core.prefs
+++ b/juneau-examples/juneau-examples-rest-springboot/.settings/org.eclipse.wst.html.core.prefs
@@ -32,7 +32,7 @@
 elemUnclosedStartTag=1
 elemUnknownName=2
 elemUnnecessaryEnd=2
-elementNamesToIgnore=jc,jd,jt,jk,js,jf,jsf,jsm,ja,xt,xa,xc,xs,xv,ua,uk,un,us,mk,mv,cc,cs,ck,cv,l,property
+elementNamesToIgnore=bc,c,cc,ci,ck,cs,cv,dc,del,ja,jc,jd,jf,jk,joc,jok,jov,js,jsf,jsm,jt,l,mk,mv,ua,uk,un,us,xa,xc,xs,xt,xv
 ignoreAttrNames=false
 ignoreElementNames=true
 piInvalidContent=2
diff --git a/juneau-examples/juneau-examples-rest/.settings/org.eclipse.wst.html.core.prefs b/juneau-examples/juneau-examples-rest/.settings/org.eclipse.wst.html.core.prefs
index f70192e..7de0d38 100644
--- a/juneau-examples/juneau-examples-rest/.settings/org.eclipse.wst.html.core.prefs
+++ b/juneau-examples/juneau-examples-rest/.settings/org.eclipse.wst.html.core.prefs
@@ -32,7 +32,7 @@
 elemUnclosedStartTag=1
 elemUnknownName=2
 elemUnnecessaryEnd=2
-elementNamesToIgnore=jc,jd,jt,jk,js,jf,jsf,jsm,ja,xt,xa,xc,xs,xv,ua,uk,un,us,mk,mv,cc,cs,ck,cv,l,property
+elementNamesToIgnore=bc,c,cc,ci,ck,cs,cv,dc,del,ja,jc,jd,jf,jk,joc,jok,jov,js,jsf,jsm,jt,l,mk,mv,ua,uk,un,us,xa,xc,xs,xt,xv
 ignoreAttrNames=false
 ignoreElementNames=true
 piInvalidContent=2
diff --git a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/RequestEchoResource.java b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/RequestEchoResource.java
index fcf0ebd..1d06ac2 100644
--- a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/RequestEchoResource.java
+++ b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/RequestEchoResource.java
@@ -59,7 +59,7 @@
 	},

 	aside={

 		"<div style='max-width:400px;min-width:200px' class='text'>",

-		"	<p>Shows how even arbitrary POJOs such as <code>HttpServletRequest</code> can be serialized by the framework.</p>",

+		"	<p>Shows how even arbitrary POJOs such as <c>HttpServletRequest</c> can be serialized by the framework.</p>",

 		"	<p>Also shows how to specify serializer properties, filters, and swaps at the servlet level to control how POJOs are serialized.</p>",

 		"	<p>Also provides an example of how to use the Traversable and Queryable APIs.</p>",

 		"</div>"

diff --git a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/petstore/PetStoreService.java b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/petstore/PetStoreService.java
index da3cf0a..8ed7f3c 100644
--- a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/petstore/PetStoreService.java
+++ b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/petstore/PetStoreService.java
@@ -29,7 +29,7 @@
  * Pet store database application.
  * <p>
  * Uses JPA persistence to store and retrieve PetStore DTOs.
- * JPA beans are defined in <code>META-INF/persistence.xml</code>.
+ * JPA beans are defined in <c>META-INF/persistence.xml</c>.
  *
  * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
diff --git a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/petstore/rest/PhotosResource.java b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/petstore/rest/PhotosResource.java
index 7bf2aea..e6ab755 100644
--- a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/petstore/rest/PhotosResource.java
+++ b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/petstore/rest/PhotosResource.java
@@ -72,7 +72,7 @@
 	aside={

 		"<div style='max-width:400px;min-width:200px' class='text'>",

 		"	<p>Shows an example of using custom serializers and parsers to create REST interfaces over binary resources.</p>",

-		"	<p>In this case, our resources are marshalled jpeg and png binary streams and are stored in an in-memory 'database' (also known as a <code>TreeMap</code>).</p>",

+		"	<p>In this case, our resources are marshalled jpeg and png binary streams and are stored in an in-memory 'database' (also known as a <c>TreeMap</c>).</p>",

 		"</div>"

 	},

 	widgets={

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 11a7778..7d3fec4 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
@@ -471,7 +471,7 @@
 	 * 	<li>

 	 * 		The first argument passed to the microservice jar.

 	 * 	<li>

-	 * 		The <code>Main-Config</code> entry in the microservice jar manifest file.

+	 * 		The <c>Main-Config</c> entry in the microservice jar manifest file.

 	 * 	<li>

 	 * 		The name of the microservice jar with a <js>".cfg"</js> suffix (e.g.

 	 * 		<js>"mymicroservice.jar"</js>-&gt;<js>"mymicroservice.cfg"</js>).

@@ -702,7 +702,7 @@
 	}

 

 	/**

-	 * Kill the JVM by calling <code>System.exit(2);</code>.

+	 * Kill the JVM by calling <c>System.exit(2);</c>.

 	 */

 	public void kill() {

 		// This triggers the shutdown hook.

diff --git a/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/MicroserviceBuilder.java b/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/MicroserviceBuilder.java
index 70911cb..e0389e1 100644
--- a/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/MicroserviceBuilder.java
+++ b/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/MicroserviceBuilder.java
@@ -96,7 +96,7 @@
 	 * Specifies the command-line arguments passed into the Java command.
 	 *
 	 * <p>
-	 * This is required if you use {@link Microservice#getArgs()} or <code>$A</code> string variables.
+	 * This is required if you use {@link Microservice#getArgs()} or <c>$A</c> string variables.
 	 *
 	 * @param args
 	 * 	The command-line arguments passed into the Java command as a pre-parsed {@link Args} object.
@@ -111,7 +111,7 @@
 	 * Specifies the command-line arguments passed into the Java command.
 	 *
 	 * <p>
-	 * This is required if you use {@link Microservice#getArgs()} or <code>$A</code> string variables.
+	 * This is required if you use {@link Microservice#getArgs()} or <c>$A</c> string variables.
 	 *
 	 * @param args
 	 * 	The command-line arguments passed into the Java command as the raw command-line arguments.
@@ -127,7 +127,7 @@
 	 *
 	 * <p>
 	 * This is required if you use {@link Microservice#getManifest()}.
-	 * It's also used to locate initialization values such as <code>Main-Config</code>.
+	 * It's also used to locate initialization values such as <c>Main-Config</c>.
 	 *
 	 * <p>
 	 * If you do not specify the manifest file, we attempt to resolve it through the following methods:
@@ -235,7 +235,7 @@
 	 * 			<li>
 	 * 				The <js>"configFile"</js> argument in the command line arguments passed in through the constructor.
 	 * 			<li>
-	 * 				The value of the <code>Main-Config</code> entry in the manifest file.
+	 * 				The value of the <c>Main-Config</c> entry in the manifest file.
 	 * 			<li>
 	 * 				A config file in the same location and with the same name as the executable jar file.
 	 * 				(e.g. <js>"java -jar myjar.jar"</js> will look for <js>"myjar.cfg"</js>).
diff --git a/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/LogEntryFormatter.java b/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/LogEntryFormatter.java
index eb4869e..0080a0e 100644
--- a/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/LogEntryFormatter.java
+++ b/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/LogEntryFormatter.java
@@ -30,11 +30,11 @@
  * Uses three simple parameter for configuring log entry formats:

  * <ul class='spaced-list'>

  * 	<li>

- * 		<code>dateFormat</code> - A {@link SimpleDateFormat} string describing the format for dates.

+ * 		<c>dateFormat</c> - A {@link SimpleDateFormat} string describing the format for dates.

  * 	<li>

- * 		<code>format</code> - A string with <code>{...}</code> replacement variables representing predefined fields.

+ * 		<c>format</c> - A string with <c>{...}</c> replacement variables representing predefined fields.

  * 	<li>

- * 		<code>useStackTraceHashes</code> - A setting that causes duplicate stack traces to be replaced with 8-character

+ * 		<c>useStackTraceHashes</c> - A setting that causes duplicate stack traces to be replaced with 8-character

  * 		 hash strings.

  * </ul>

  *

diff --git a/juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/jetty/JettyMicroservice.java b/juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/jetty/JettyMicroservice.java
index d39a157..24070dd 100644
--- a/juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/jetty/JettyMicroservice.java
+++ b/juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/jetty/JettyMicroservice.java
@@ -46,7 +46,7 @@
  *
  * <h5 class='topic'>Defining REST Resources</h5>
  *
- * Top-level REST resources are defined in the <code>jetty.xml</code> file as normal servlets.
+ * Top-level REST resources are defined in the <c>jetty.xml</c> file as normal servlets.
  */
 public class JettyMicroservice extends Microservice {
 
@@ -200,7 +200,7 @@
 	/**
 	 * Returns the port that this microservice started up on.
 	 * <p>
-	 * The value is determined by looking at the <code>Server/Connectors[ServerConnector]/port</code> value in the
+	 * The value is determined by looking at the <c>Server/Connectors[ServerConnector]/port</c> value in the
 	 * Jetty configuration.
 	 *
 	 * @return The port that this microservice started up on.
@@ -215,7 +215,7 @@
 	/**
 	 * Returns the context path that this microservice is using.
 	 * <p>
-	 * The value is determined by looking at the <code>Server/Handlers[ServletContextHandler]/contextPath</code> value
+	 * The value is determined by looking at the <c>Server/Handlers[ServletContextHandler]/contextPath</c> value
 	 * in the Jetty configuration.
 	 *
 	 * @return The context path that this microservice is using.
@@ -236,7 +236,7 @@
 	 * Returns whether this microservice is using <js>"http"</js> or <js>"https"</js>.
 	 * <p>
 	 * The value is determined by looking for the existence of an SSL Connection Factorie by looking for the
-	 * <code>Server/Connectors[ServerConnector]/ConnectionFactories[SslConnectionFactory]</code> value in the Jetty
+	 * <c>Server/Connectors[ServerConnector]/ConnectionFactories[SslConnectionFactory]</c> value in the Jetty
 	 * configuration.
 	 *
 	 * @return Whether this microservice is using <js>"http"</js> or <js>"https"</js>.
@@ -253,7 +253,7 @@
 	/**
 	 * Returns the hostname of this microservice.
 	 * <p>
-	 * Simply uses <code>InetAddress.getLocalHost().getHostName()</code>.
+	 * Simply uses <c>InetAddress.getLocalHost().getHostName()</c>.
 	 *
 	 * @return The hostname of this microservice.
 	 */
@@ -287,7 +287,7 @@
 	 *
 	 * <p>
 	 * The default implementation is configured by the following values in the config file
-	 * if a jetty.xml is not specified via a <code>REST/jettyXml</code> setting:
+	 * if a jetty.xml is not specified via a <c>REST/jettyXml</c> setting:
 	 * <p class='bcode w800'>
 	 * 	<cc>#================================================================================
 	 * 	# Jetty settings
diff --git a/juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/jetty/JettyMicroserviceBuilder.java b/juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/jetty/JettyMicroserviceBuilder.java
index 11c681d..e8ad2bb 100644
--- a/juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/jetty/JettyMicroserviceBuilder.java
+++ b/juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/jetty/JettyMicroserviceBuilder.java
@@ -72,23 +72,23 @@
 	}
 
 	/**
-	 * Specifies the contents or location of the <code>jetty.xml</code> file used by the Jetty server.
+	 * Specifies the contents or location of the <c>jetty.xml</c> file used by the Jetty server.
 	 *
 	 * <p>
 	 * If you do not specify this value, it is pulled from the following in the specified order:
 	 * <ul class='spaced-list'>
 	 * 	<li>
-	 * 		<code>Jetty/config</code> setting in the config file.
-	 * 		<code>Jetty-Config</code> setting in the manifest file.
+	 * 		<c>Jetty/config</c> setting in the config file.
+	 * 		<c>Jetty-Config</c> setting in the manifest file.
 	 * </ul>
 	 *
 	 * <p>
-	 * By default, we look for the <code>jetty.xml</code> file in the following locations:
+	 * By default, we look for the <c>jetty.xml</c> file in the following locations:
 	 * <ul class='spaced-list'>
-	 * 	<li><code>jetty.xml</code> in home directory.
-	 * 	<li><code>files/jetty.xml</code> in home directory.
-	 * 	<li><code>/jetty.xml</code> in classpath.
-	 * 	<li><code>/files/jetty.xml</code> in classpath.
+	 * 	<li><c>jetty.xml</c> in home directory.
+	 * 	<li><c>files/jetty.xml</c> in home directory.
+	 * 	<li><c>/jetty.xml</c> in classpath.
+	 * 	<li><c>/files/jetty.xml</c> in classpath.
 	 * </ul>
 	 *
 	 * @param jettyXml
@@ -97,7 +97,7 @@
 	 * 	<ul>
 	 * 		<li>{@link String} - Relative path to file on file system or classpath.
 	 * 		<li>{@link File} - File on file system.
-	 * 		<li>{@link InputStream} - Raw contents as <code>UTF-8</code> encoded stream.
+	 * 		<li>{@link InputStream} - Raw contents as <c>UTF-8</c> encoded stream.
 	 * 		<li>{@link Reader} - Raw contents.
 	 * 	</ul>
 	 *
@@ -127,17 +127,17 @@
 	 * <p>
 	 * You can specify multiple ports.  The first available will be used.  <js>'0'</js> indicates to try a random port.
 	 * The resulting available port gets set as the system property <js>"availablePort"</js> which can be referenced in the
-	 * <code>jetty.xml</code> file as <js>"$S{availablePort}"</js> (assuming resolveVars is enabled).
+	 * <c>jetty.xml</c> file as <js>"$S{availablePort}"</js> (assuming resolveVars is enabled).
 	 *
 	 * <p>
 	 * If you do not specify this value, it is pulled from the following in the specified order:
 	 * <ul class='spaced-list'>
 	 * 	<li>
-	 * 		<code>Jetty/port</code> setting in the config file.
+	 * 		<c>Jetty/port</c> setting in the config file.
 	 * 	<li>
-	 * 		<code>Jetty-Port</code> setting in the manifest file.
+	 * 		<c>Jetty-Port</c> setting in the manifest file.
 	 * 	<li>
-	 * 		<code>8000</code>
+	 * 		<c>8000</c>
 	 * </ul>
 	 *
 	 * Jetty/port", mf.getWithDefault("Jetty-Port", new int[]{8000}
diff --git a/juneau-rest/juneau-rest-client/.settings/org.eclipse.wst.html.core.prefs b/juneau-rest/juneau-rest-client/.settings/org.eclipse.wst.html.core.prefs
index f70192e..7de0d38 100644
--- a/juneau-rest/juneau-rest-client/.settings/org.eclipse.wst.html.core.prefs
+++ b/juneau-rest/juneau-rest-client/.settings/org.eclipse.wst.html.core.prefs
@@ -32,7 +32,7 @@
 elemUnclosedStartTag=1
 elemUnknownName=2
 elemUnnecessaryEnd=2
-elementNamesToIgnore=jc,jd,jt,jk,js,jf,jsf,jsm,ja,xt,xa,xc,xs,xv,ua,uk,un,us,mk,mv,cc,cs,ck,cv,l,property
+elementNamesToIgnore=bc,c,cc,ci,ck,cs,cv,dc,del,ja,jc,jd,jf,jk,joc,jok,jov,js,jsf,jsm,jt,l,mk,mv,ua,uk,un,us,xa,xc,xs,xt,xv
 ignoreAttrNames=false
 ignoreElementNames=true
 piInvalidContent=2
diff --git a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/AllowAllRedirects.java b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/AllowAllRedirects.java
index 0c34caa..7c2ab6b 100644
--- a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/AllowAllRedirects.java
+++ b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/AllowAllRedirects.java
@@ -15,13 +15,13 @@
 import org.apache.http.impl.client.*;

 

 /**

- * Redirect strategy that allows for redirects on any request type, not just <code>GET</code> or <code>HEAD</code>.

+ * Redirect strategy that allows for redirects on any request type, not just <c>GET</c> or <c>HEAD</c>.

  *

  * <h5 class='section'>Notes:</h5>

  * <ul class='spaced-list'>

  * 	<li>

- * 		This class is similar to <code>org.apache.http.impl.client.LaxRedirectStrategy</code>

- * 		in Apache HttpClient 4.2, but also allows for redirects on <code>PUTs</code> and <code>DELETEs</code>.

+ * 		This class is similar to <c>org.apache.http.impl.client.LaxRedirectStrategy</c>

+ * 		in Apache HttpClient 4.2, but also allows for redirects on <c>PUTs</c> and <c>DELETEs</c>.

  * </ul>

  */

 public class AllowAllRedirects extends DefaultRedirectStrategy {

diff --git a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/NameValuePairs.java b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/NameValuePairs.java
index 8126846..bd77fbd 100644
--- a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/NameValuePairs.java
+++ b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/NameValuePairs.java
@@ -24,7 +24,7 @@
 import org.apache.juneau.urlencoding.*;

 

 /**

- * Convenience class for constructing instances of <code>List&lt;NameValuePair&gt;</code> for the

+ * Convenience class for constructing instances of <c>List&lt;NameValuePair&gt;</c> for the

  * {@link UrlEncodedFormEntity} class.

  *

  * <p>

@@ -58,7 +58,7 @@
 	 * Appends the specified name/value pair to the end of this list.

 	 *

 	 * <p>

-	 * The value is simply converted to a string using <code>toString()</code>, or <js>"null"</js> if <jk>null</jk>.

+	 * The value is simply converted to a string using <c>toString()</c>, or <js>"null"</js> if <jk>null</jk>.

 	 *

 	 * @param name The pair name.

 	 * @param value The pair value.

diff --git a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestCall.java b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestCall.java
index 6269b72..63b08ab 100644
--- a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestCall.java
+++ b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestCall.java
@@ -68,7 +68,7 @@
  * </p>

  *

  * <p>

- * The actual connection and request/response transaction occurs when calling one of the <code>getResponseXXX()</code>

+ * The actual connection and request/response transaction occurs when calling one of the <c>getResponseXXX()</c>

  * methods.

  *

  * <h5 class='section'>See Also:</h5>

@@ -769,7 +769,7 @@
 	}

 

 	/**

-	 * Sets the value for the <code>Accept</code> request header.

+	 * Sets the value for the <c>Accept</c> request header.

 	 *

 	 * <p>

 	 * This overrides the media type specified on the parser, but is overridden by calling

@@ -784,7 +784,7 @@
 	}

 

 	/**

-	 * Sets the value for the <code>Accept-Charset</code> request header.

+	 * Sets the value for the <c>Accept-Charset</c> request header.

 	 *

 	 * <p>

 	 * This is a shortcut for calling <code>header(<js>"Accept-Charset"</js>, value);</code>

@@ -798,7 +798,7 @@
 	}

 

 	/**

-	 * Sets the value for the <code>Accept-Encoding</code> request header.

+	 * Sets the value for the <c>Accept-Encoding</c> request header.

 	 *

 	 * <p>

 	 * This is a shortcut for calling <code>header(<js>"Accept-Encoding"</js>, value);</code>

@@ -812,7 +812,7 @@
 	}

 

 	/**

-	 * Sets the value for the <code>Accept-Language</code> request header.

+	 * Sets the value for the <c>Accept-Language</c> request header.

 	 *

 	 * <p>

 	 * This is a shortcut for calling <code>header(<js>"Accept-Language"</js>, value);</code>

@@ -826,7 +826,7 @@
 	}

 

 	/**

-	 * Sets the value for the <code>Authorization</code> request header.

+	 * Sets the value for the <c>Authorization</c> request header.

 	 *

 	 * <p>

 	 * This is a shortcut for calling <code>header(<js>"Authorization"</js>, value);</code>

@@ -840,7 +840,7 @@
 	}

 

 	/**

-	 * Sets the value for the <code>Cache-Control</code> request header.

+	 * Sets the value for the <c>Cache-Control</c> request header.

 	 *

 	 * <p>

 	 * This is a shortcut for calling <code>header(<js>"Cache-Control"</js>, value);</code>

@@ -854,7 +854,7 @@
 	}

 

 	/**

-	 * Sets the value for the <code>Connection</code> request header.

+	 * Sets the value for the <c>Connection</c> request header.

 	 *

 	 * <p>

 	 * This is a shortcut for calling <code>header(<js>"Connection"</js>, value);</code>

@@ -868,7 +868,7 @@
 	}

 

 	/**

-	 * Sets the value for the <code>Content-Length</code> request header.

+	 * Sets the value for the <c>Content-Length</c> request header.

 	 *

 	 * <p>

 	 * This is a shortcut for calling <code>header(<js>"Content-Length"</js>, value);</code>

@@ -882,7 +882,7 @@
 	}

 

 	/**

-	 * Sets the value for the <code>Content-Type</code> request header.

+	 * Sets the value for the <c>Content-Type</c> request header.

 	 *

 	 * <p>

 	 * This overrides the media type specified on the serializer, but is overridden by calling

@@ -897,7 +897,7 @@
 	}

 

 	/**

-	 * Sets the value for the <code>Date</code> request header.

+	 * Sets the value for the <c>Date</c> request header.

 	 *

 	 * <p>

 	 * This is a shortcut for calling <code>header(<js>"Date"</js>, value);</code>

@@ -911,7 +911,7 @@
 	}

 

 	/**

-	 * Sets the value for the <code>Expect</code> request header.

+	 * Sets the value for the <c>Expect</c> request header.

 	 *

 	 * <p>

 	 * This is a shortcut for calling <code>header(<js>"Expect"</js>, value);</code>

@@ -925,7 +925,7 @@
 	}

 

 	/**

-	 * Sets the value for the <code>Forwarded</code> request header.

+	 * Sets the value for the <c>Forwarded</c> request header.

 	 *

 	 * <p>

 	 * This is a shortcut for calling <code>header(<js>"Forwarded"</js>, value);</code>

@@ -939,7 +939,7 @@
 	}

 

 	/**

-	 * Sets the value for the <code>From</code> request header.

+	 * Sets the value for the <c>From</c> request header.

 	 *

 	 * <p>

 	 * This is a shortcut for calling <code>header(<js>"From"</js>, value);</code>

@@ -953,7 +953,7 @@
 	}

 

 	/**

-	 * Sets the value for the <code>Host</code> request header.

+	 * Sets the value for the <c>Host</c> request header.

 	 *

 	 * <p>

 	 * This is a shortcut for calling <code>header(<js>"Host"</js>, value);</code>

@@ -967,7 +967,7 @@
 	}

 

 	/**

-	 * Sets the value for the <code>If-Match</code> request header.

+	 * Sets the value for the <c>If-Match</c> request header.

 	 *

 	 * <p>

 	 * This is a shortcut for calling <code>header(<js>"If-Match"</js>, value);</code>

@@ -981,7 +981,7 @@
 	}

 

 	/**

-	 * Sets the value for the <code>If-Modified-Since</code> request header.

+	 * Sets the value for the <c>If-Modified-Since</c> request header.

 	 *

 	 * <p>

 	 * This is a shortcut for calling <code>header(<js>"If-Modified-Since"</js>, value);</code>

@@ -995,7 +995,7 @@
 	}

 

 	/**

-	 * Sets the value for the <code>If-None-Match</code> request header.

+	 * Sets the value for the <c>If-None-Match</c> request header.

 	 *

 	 * <p>

 	 * This is a shortcut for calling <code>header(<js>"If-None-Match"</js>, value);</code>

@@ -1009,7 +1009,7 @@
 	}

 

 	/**

-	 * Sets the value for the <code>If-Range</code> request header.

+	 * Sets the value for the <c>If-Range</c> request header.

 	 *

 	 * <p>

 	 * This is a shortcut for calling <code>header(<js>"If-Range"</js>, value);</code>

@@ -1023,7 +1023,7 @@
 	}

 

 	/**

-	 * Sets the value for the <code>If-Unmodified-Since</code> request header.

+	 * Sets the value for the <c>If-Unmodified-Since</c> request header.

 	 *

 	 * <p>

 	 * This is a shortcut for calling <code>header(<js>"If-Unmodified-Since"</js>, value);</code>

@@ -1037,7 +1037,7 @@
 	}

 

 	/**

-	 * Sets the value for the <code>Max-Forwards</code> request header.

+	 * Sets the value for the <c>Max-Forwards</c> request header.

 	 *

 	 * <p>

 	 * This is a shortcut for calling <code>header(<js>"Max-Forwards"</js>, value);</code>

@@ -1051,7 +1051,7 @@
 	}

 

 	/**

-	 * Sets the value for the <code>Origin</code> request header.

+	 * Sets the value for the <c>Origin</c> request header.

 	 *

 	 * <p>

 	 * This is a shortcut for calling <code>header(<js>"Origin"</js>, value);</code>

@@ -1065,7 +1065,7 @@
 	}

 

 	/**

-	 * Sets the value for the <code>Pragma</code> request header.

+	 * Sets the value for the <c>Pragma</c> request header.

 	 *

 	 * <p>

 	 * This is a shortcut for calling <code>header(<js>"Pragma"</js>, value);</code>

@@ -1079,7 +1079,7 @@
 	}

 

 	/**

-	 * Sets the value for the <code>Proxy-Authorization</code> request header.

+	 * Sets the value for the <c>Proxy-Authorization</c> request header.

 	 *

 	 * <p>

 	 * This is a shortcut for calling <code>header(<js>"Proxy-Authorization"</js>, value);</code>

@@ -1093,7 +1093,7 @@
 	}

 

 	/**

-	 * Sets the value for the <code>Range</code> request header.

+	 * Sets the value for the <c>Range</c> request header.

 	 *

 	 * <p>

 	 * This is a shortcut for calling <code>header(<js>"Range"</js>, value);</code>

@@ -1107,7 +1107,7 @@
 	}

 

 	/**

-	 * Sets the value for the <code>Referer</code> request header.

+	 * Sets the value for the <c>Referer</c> request header.

 	 *

 	 * <p>

 	 * This is a shortcut for calling <code>header(<js>"Referer"</js>, value);</code>

@@ -1121,7 +1121,7 @@
 	}

 

 	/**

-	 * Sets the value for the <code>TE</code> request header.

+	 * Sets the value for the <c>TE</c> request header.

 	 *

 	 * <p>

 	 * This is a shortcut for calling <code>header(<js>"TE"</js>, value);</code>

@@ -1135,7 +1135,7 @@
 	}

 

 	/**

-	 * Sets the value for the <code>User-Agent</code> request header.

+	 * Sets the value for the <c>User-Agent</c> request header.

 	 *

 	 * <p>

 	 * This is a shortcut for calling <code>header(<js>"User-Agent"</js>, value);</code>

@@ -1149,7 +1149,7 @@
 	}

 

 	/**

-	 * Sets the value for the <code>Upgrade</code> request header.

+	 * Sets the value for the <c>Upgrade</c> request header.

 	 *

 	 * <p>

 	 * This is a shortcut for calling <code>header(<js>"Upgrade"</js>, value);</code>

@@ -1163,7 +1163,7 @@
 	}

 

 	/**

-	 * Sets the value for the <code>Via</code> request header.

+	 * Sets the value for the <c>Via</c> request header.

 	 *

 	 * <p>

 	 * This is a shortcut for calling <code>header(<js>"Via"</js>, value);</code>

@@ -1177,7 +1177,7 @@
 	}

 

 	/**

-	 * Sets the value for the <code>Warning</code> request header.

+	 * Sets the value for the <c>Warning</c> request header.

 	 *

 	 * <p>

 	 * This is a shortcut for calling <code>header(<js>"Warning"</js>, value);</code>

@@ -1589,7 +1589,7 @@
 	 * Connects to the REST resource.

 	 *

 	 * <p>

-	 * If this is a <code>PUT</code> or <code>POST</code>, also sends the input to the remote resource.<br>

+	 * If this is a <c>PUT</c> or <c>POST</c>, also sends the input to the remote resource.<br>

 	 *

 	 * <p>

 	 * Typically, you would only call this method if you're not interested in retrieving the body of the HTTP response.

@@ -1597,7 +1597,7 @@
 	 * methods directly which automatically call this method already.

 	 *

 	 * @return This object (for method chaining).

-	 * @throws RestCallException If an exception or <code>400+</code> HTTP status code occurred during the connection attempt.

+	 * @throws RestCallException If an exception or <c>400+</c> HTTP status code occurred during the connection attempt.

 	 */

 	public RestCall connect() throws RestCallException {

 		return connect(null);

@@ -1736,15 +1736,15 @@
 	}

 

 	/**

-	 * Connects to the remote resource (if <code>connect()</code> hasn't already been called) and returns the HTTP

+	 * Connects to the remote resource (if <c>connect()</c> hasn't already been called) and returns the HTTP

 	 * response message body as a reader.

 	 *

 	 * <p>

 	 * If an {@link Encoder} has been registered with the {@link RestClient}, then the underlying input stream will be

-	 * wrapped in the encoded stream (e.g. a <code>GZIPInputStream</code>).

+	 * wrapped in the encoded stream (e.g. a <c>GZIPInputStream</c>).

 	 *

 	 * <p>

-	 * If present, automatically handles the <code>charset</code> value in the <code>Content-Type</code> response header.

+	 * If present, automatically handles the <c>charset</c> value in the <c>Content-Type</c> response header.

 	 *

 	 * <p>

 	 * <b>IMPORTANT:</b>  It is your responsibility to close this reader once you have finished with it.

@@ -1806,9 +1806,9 @@
 	}

 

 	/**

-	 * Returns the value of the <code>Content-Length</code> header.

+	 * Returns the value of the <c>Content-Length</c> header.

 	 *

-	 * @return The value of the <code>Content-Length</code> header, or <code>-1</code> if header is not present.

+	 * @return The value of the <c>Content-Length</c> header, or <c>-1</c> if header is not present.

 	 * @throws IOException

 	 */

 	public int getContentLength() throws IOException {

@@ -1823,12 +1823,12 @@
 	}

 

 	/**

-	 * Connects to the remote resource (if <code>connect()</code> hasn't already been called) and returns the HTTP

+	 * Connects to the remote resource (if <c>connect()</c> hasn't already been called) and returns the HTTP

 	 * response message body as an input stream.

 	 *

 	 * <p>

 	 * If an {@link Encoder} has been registered with the {@link RestClient}, then the underlying input stream will be

-	 * wrapped in the encoded stream (e.g. a <code>GZIPInputStream</code>).

+	 * wrapped in the encoded stream (e.g. a <c>GZIPInputStream</c>).

 	 *

 	 * <p>

 	 * <b>IMPORTANT:</b>  It is your responsibility to close this reader once you have finished with it.

@@ -2040,7 +2040,7 @@
 	 * 	<li>

 	 * 		You can also specify any of the following types:

 	 * 		<ul>

-	 * 			<li>{@link HttpResponse} - Returns the raw <code>HttpResponse</code> returned by the inner <code>HttpClient</code>.

+	 * 			<li>{@link HttpResponse} - Returns the raw <c>HttpResponse</c> returned by the inner <c>HttpClient</c>.

 	 * 			<li>{@link Reader} - Returns access to the raw reader of the response.

 	 * 			<li>{@link InputStream} - Returns access to the raw input stream of the response.

 	 * 		</ul>

@@ -2111,10 +2111,10 @@
 	 * </p>

 	 *

 	 * <p>

-	 * <code>Collection</code> classes are assumed to be followed by zero or one objects indicating the element type.

+	 * <c>Collection</c> classes are assumed to be followed by zero or one objects indicating the element type.

 	 *

 	 * <p>

-	 * <code>Map</code> classes are assumed to be followed by zero or two meta objects indicating the key and value types.

+	 * <c>Map</c> classes are assumed to be followed by zero or two meta objects indicating the key and value types.

 	 *

 	 * <p>

 	 * The array can be arbitrarily long to indicate arbitrarily complex data structures.

@@ -2126,7 +2126,7 @@
 	 * 	<li>

 	 * 		You can also specify any of the following types:

 	 * 		<ul>

-	 * 			<li>{@link HttpResponse} - Returns the raw <code>HttpResponse</code> returned by the inner <code>HttpClient</code>.

+	 * 			<li>{@link HttpResponse} - Returns the raw <c>HttpResponse</c> returned by the inner <c>HttpClient</c>.

 	 * 			<li>{@link Reader} - Returns access to the raw reader of the response.

 	 * 			<li>{@link InputStream} - Returns access to the raw input stream of the response.

 	 * 		</ul>

@@ -2217,7 +2217,7 @@
 	 * @return The parsed output wrapped in a {@link PojoRest}.

 	 * @throws IOException If a connection error occurred.

 	 * @throws ParseException

-	 * 	If the input contains a syntax error or is malformed for the <code>Content-Type</code> header.

+	 * 	If the input contains a syntax error or is malformed for the <c>Content-Type</c> header.

 	 */

 	public PojoRest getResponsePojoRest(Class<?> innerType) throws IOException, ParseException {

 		return new PojoRest(getResponse(innerType));

@@ -2232,7 +2232,7 @@
 	 * @return The parsed output wrapped in a {@link PojoRest}.

 	 * @throws IOException If a connection error occurred.

 	 * @throws ParseException

-	 * 	If the input contains a syntax error or is malformed for the <code>Content-Type</code> header.

+	 * 	If the input contains a syntax error or is malformed for the <c>Content-Type</c> header.

 	 */

 	public PojoRest getResponsePojoRest() throws IOException, ParseException {

 		return getResponsePojoRest(ObjectMap.class);

@@ -2399,7 +2399,7 @@
 	}

 

 	/**

-	 * Shortcut for calling <code>getRequest().setHeader(header)</code>

+	 * Shortcut for calling <c>getRequest().setHeader(header)</c>

 	 *

 	 * @param header The header to set on the request.

 	 * @return This object (for method chaining).

@@ -2443,7 +2443,7 @@
 	}

 

 	/**

-	 * Sets <code>Debug: value</code> header on this request.

+	 * Sets <c>Debug: value</c> header on this request.

 	 *

 	 * @return This object (for method chaining).

 	 * @throws RestCallException

diff --git a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestCallException.java b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestCallException.java
index 6dbdf64..db4f216 100644
--- a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestCallException.java
+++ b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestCallException.java
@@ -30,7 +30,7 @@
 import org.apache.juneau.reflect.*;

 

 /**

- * Exception representing a <code>400+</code> HTTP response code against a remote resource.

+ * Exception representing a <c>400+</c> HTTP response code against a remote resource.

  */

 public final class RestCallException extends IOException {

 

@@ -115,9 +115,9 @@
 	/**

 	 * Sets the server-side exception details.

 	 *

-	 * @param exceptionName The <code>Exception-Name:</code> header specifying the full name of the exception.

+	 * @param exceptionName The <c>Exception-Name:</c> header specifying the full name of the exception.

 	 * @param exceptionMessage

-	 * 	The <code>Exception-Message:</code> header specifying the message returned by {@link Throwable#getMessage()}.

+	 * 	The <c>Exception-Message:</c> header specifying the message returned by {@link Throwable#getMessage()}.

 	 * @param exceptionTrace The stack trace of the exception returned by {@link Throwable#printStackTrace()}.

 	 * @return This object (for method chaining).

 	 */

@@ -137,16 +137,16 @@
 	 * <p>

 	 * The exception is based on the following HTTP response headers:

 	 * <ul>

-	 * 	<li><code>Exception-Name:</code> - The full class name of the exception.

-	 * 	<li><code>Exception-Message:</code> - The message returned by {@link Throwable#getMessage()}.

-	 * 	<li><code>Exception-Trace:</code> - The stack trace of the exception returned by {@link Throwable#printStackTrace()}.

+	 * 	<li><c>Exception-Name:</c> - The full class name of the exception.

+	 * 	<li><c>Exception-Message:</c> - The message returned by {@link Throwable#getMessage()}.

+	 * 	<li><c>Exception-Trace:</c> - The stack trace of the exception returned by {@link Throwable#printStackTrace()}.

 	 * </ul>

 	 *

 	 * <p>

 	 * Does nothing if the server-side exception could not be reconstructed.

 	 *

 	 * <p>

-	 * Currently only supports <code>Throwables</code> with either a public no-arg constructor

+	 * Currently only supports <c>Throwables</c> with either a public no-arg constructor

 	 * or a public constructor that takes in a simple string message.

 	 *

 	 * @param cl The classloader to use to resolve the throwable class name.

@@ -207,7 +207,7 @@
 	/**

 	 * Returns the HTTP response status code.

 	 *

-	 * @return The response status code.  If a connection could not be made at all, returns <code>0</code>.

+	 * @return The response status code.  If a connection could not be made at all, returns <c>0</c>.

 	 */

 	public int getResponseCode() {

 		return responseCode;

diff --git a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestCallLogger.java b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestCallLogger.java
index b625231..c20065d 100644
--- a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestCallLogger.java
+++ b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestCallLogger.java
@@ -37,7 +37,7 @@
 	/**

 	 * Default HTTP request logger.

 	 * <p>

-	 * Logs outgoing HTTP requests to the <code>org.apache.juneau.rest.client</code> logger at <jsf>WARNING</jsf> level.

+	 * Logs outgoing HTTP requests to the <c>org.apache.juneau.rest.client</c> logger at <jsf>WARNING</jsf> level.

 	 */

 	public static final RestCallLogger DEFAULT = new RestCallLogger(Level.WARNING, Logger.getLogger("org.apache.juneau.rest.client"));

 

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 e324916..529bb80 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
@@ -83,7 +83,7 @@
 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"RestClient.debug.b"</js>

-	 * 	<li><b>Data type:</b>  <code>Boolean</code>

+	 * 	<li><b>Data type:</b>  <c>Boolean</c>

 	 * 	<li><b>Default:</b>  <jk>false</jk>

 	 * 	<li><b>Methods:</b>

 	 * 		<ul>

@@ -136,7 +136,7 @@
 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"RestClient.executorServiceShutdownOnClose.b"</js>

-	 * 	<li><b>Data type:</b>  <code>Boolean</code>

+	 * 	<li><b>Data type:</b>  <c>Boolean</c>

 	 * 	<li><b>Default:</b>  <jk>false</jk>

 	 * 	<li><b>Methods:</b>

 	 * 		<ul>

@@ -156,7 +156,7 @@
 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"RestClient.requestHeader.sms"</js>

-	 * 	<li><b>Data type:</b>  <code>Map&lt;String,String&gt;</code>

+	 * 	<li><b>Data type:</b>  <c>Map&lt;String,String&gt;</c>

 	 * 	<li><b>Default:</b>  empty map

 	 * 	<li><b>Methods:</b>

 	 * 		<ul>

@@ -202,7 +202,7 @@
 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"RestClient.keepHttpClientOpen.b"</js>

-	 * 	<li><b>Data type:</b>  <code>Boolean</code>

+	 * 	<li><b>Data type:</b>  <c>Boolean</c>

 	 * 	<li><b>Default:</b>  <jk>false</jk>

 	 * 	<li><b>Methods:</b>

 	 * 		<ul>

@@ -285,7 +285,7 @@
 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"RestClient.query.sms"</js>

-	 * 	<li><b>Data type:</b>  <code>Map&lt;String,String&gt;</code>

+	 * 	<li><b>Data type:</b>  <c>Map&lt;String,String&gt;</c>

 	 * 	<li><b>Default:</b>  empty map

 	 * 	<li><b>Methods:</b>

 	 * 		<ul>

@@ -305,8 +305,8 @@
 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"RestClient.retries.i"</js>

-	 * 	<li><b>Data type:</b>  <code>Integer</code>

-	 * 	<li><b>Default:</b>  <code>1</code>

+	 * 	<li><b>Data type:</b>  <c>Integer</c>

+	 * 	<li><b>Default:</b>  <c>1</c>

 	 * 	<li><b>Methods:</b>

 	 * 		<ul>

 	 * 			<li class='jm'>{@link RestClientBuilder#retryable(int, int, RetryOn)}

@@ -315,7 +315,7 @@
 	 *

 	 * <h5 class='section'>Description:</h5>

 	 * <p>

-	 * The number of retries to attempt when the connection cannot be made or a <code>&gt;400</code> response is received.

+	 * The number of retries to attempt when the connection cannot be made or a <c>&gt;400</c> response is received.

 	 */

 	public static final String RESTCLIENT_retries = PREFIX + "retries.i";

 

@@ -325,8 +325,8 @@
 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"RestClient.retryInterval.i"</js>

-	 * 	<li><b>Data type:</b>  <code>Integer</code>

-	 * 	<li><b>Default:</b>  <code>-1</code>

+	 * 	<li><b>Data type:</b>  <c>Integer</c>

+	 * 	<li><b>Default:</b>  <c>-1</c>

 	 * 	<li><b>Methods:</b>

 	 * 		<ul>

 	 * 			<li class='jm'>{@link RestClientBuilder#retryable(int, int, RetryOn)}

@@ -336,7 +336,7 @@
 	 * <h5 class='section'>Description:</h5>

 	 * <p>

 	 * The time in milliseconds between retry attempts.

-	 * <code>-1</code> means retry immediately.

+	 * <c>-1</c> means retry immediately.

 	 */

 	public static final String RESTCLIENT_retryInterval = PREFIX + "retryInterval.i";

 

@@ -346,7 +346,7 @@
 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"RestClient.retryOn.o"</js>

-	 * 	<li><b>Data type:</b>  <code>Class&lt;? extends {@link RetryOn}</code> or {@link RetryOn}

+	 * 	<li><b>Data type:</b>  <c>Class&lt;? extends {@link RetryOn}</c> or {@link RetryOn}

 	 * 	<li><b>Default:</b>  {@link RetryOn#DEFAULT}

 	 * 	<li><b>Methods:</b>

 	 * 		<ul>

@@ -366,7 +366,7 @@
 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"RestClient.rootUri.s"</js>

-	 * 	<li><b>Data type:</b>  <code>String</code>

+	 * 	<li><b>Data type:</b>  <c>String</c>

 	 * 	<li><b>Default:</b>  <jk>false</jk>

 	 * 	<li><b>Methods:</b>

 	 * 		<ul>

@@ -544,7 +544,7 @@
 	/**

 	 * Returns <jk>true</jk> if specified http method has content.

 	 * <p>

-	 * By default, anything not in this list can have content:  <code>GET, HEAD, DELETE, CONNECT, OPTIONS, TRACE</code>.

+	 * By default, anything not in this list can have content:  <c>GET, HEAD, DELETE, CONNECT, OPTIONS, TRACE</c>.

 	 *

 	 * @param httpMethod The HTTP method.  Must be upper-case.

 	 * @return <jk>true</jk> if specified http method has content.

@@ -602,7 +602,7 @@
 	}

 

 	/**

-	 * Perform a <code>GET</code> request against the specified URL.

+	 * Perform a <c>GET</c> request against the specified URL.

 	 *

 	 * @param url

 	 * 	The URL of the remote REST resource.

@@ -617,7 +617,7 @@
 	}

 

 	/**

-	 * Perform a <code>PUT</code> request against the specified URL.

+	 * Perform a <c>PUT</c> request against the specified URL.

 	 *

 	 * @param url

 	 * 	The URL of the remote REST resource.

@@ -665,11 +665,11 @@
 	}

 

 	/**

-	 * Perform a <code>POST</code> request against the specified URL.

+	 * Perform a <c>POST</c> request against the specified URL.

 	 *

 	 * <h5 class='section'>Notes:</h5>

 	 * <ul class='spaced-list'>

-	 * 	<li>Use {@link #doFormPost(Object, Object)} for <code>application/x-www-form-urlencoded</code> form posts.

+	 * 	<li>Use {@link #doFormPost(Object, Object)} for <c>application/x-www-form-urlencoded</c> form posts.

 	 * </ul>

 	 *

 	 * @param url

@@ -706,7 +706,7 @@
 	 *

 	 * <h5 class='section'>Notes:</h5>

 	 * <ul class='spaced-list'>

-	 * 	<li>Use {@link #doFormPost(Object, Object)} for <code>application/x-www-form-urlencoded</code> form posts.

+	 * 	<li>Use {@link #doFormPost(Object, Object)} for <c>application/x-www-form-urlencoded</c> form posts.

 	 * </ul>

 	 *

 	 * @param url

@@ -722,7 +722,7 @@
 	}

 

 	/**

-	 * Perform a <code>DELETE</code> request against the specified URL.

+	 * Perform a <c>DELETE</c> request against the specified URL.

 	 *

 	 * @param url

 	 * 	The URL of the remote REST resource.

@@ -737,7 +737,7 @@
 	}

 

 	/**

-	 * Perform an <code>OPTIONS</code> request against the specified URL.

+	 * Perform an <c>OPTIONS</c> request against the specified URL.

 	 *

 	 * @param url

 	 * 	The URL of the remote REST resource.

@@ -752,7 +752,7 @@
 	}

 

 	/**

-	 * Perform a <code>POST</code> request with a content type of <code>application/x-www-form-urlencoded</code>

+	 * Perform a <c>POST</c> request with a content type of <c>application/x-www-form-urlencoded</c>

 	 * against the specified URL.

 	 *

 	 * @param url

@@ -772,7 +772,7 @@
 	}

 

 	/**

-	 * Perform a <code>PATCH</code> request against the specified URL.

+	 * Perform a <c>PATCH</c> request against the specified URL.

 	 *

 	 * @param url

 	 * 	The URL of the remote REST resource.

@@ -808,7 +808,7 @@
 	 *

 	 * <h5 class='section'>Notes:</h5>

 	 * <ul class='spaced-list'>

-	 * 	<li>Use {@link #doFormPost(Object, Object)} for <code>application/x-www-form-urlencoded</code> form posts.

+	 * 	<li>Use {@link #doFormPost(Object, Object)} for <c>application/x-www-form-urlencoded</c> form posts.

 	 * </ul>

 	 *

 	 * @param url

@@ -1000,17 +1000,17 @@
 	 * <p>

 	 * The URL to the REST interface is based on the following values:

 	 * <ul>

-	 * 	<li>The {@link RemoteResource#path() @RemoteResource(path)} annotation on the interface (<code>remote-path</code>).

-	 * 	<li>The {@link RestClientBuilder#rootUrl(Object) rootUrl} on the client (<code>root-url</code>).

-	 * 	<li>The fully-qualified class name of the interface (<code>class-name</code>).

+	 * 	<li>The {@link RemoteResource#path() @RemoteResource(path)} annotation on the interface (<c>remote-path</c>).

+	 * 	<li>The {@link RestClientBuilder#rootUrl(Object) rootUrl} on the client (<c>root-url</c>).

+	 * 	<li>The fully-qualified class name of the interface (<c>class-name</c>).

 	 * </ul>

 	 *

 	 * <p>

 	 * The URL calculation is as follows:

 	 * <ul>

-	 * 	<li><code>remote-path</code> - If remote path is absolute.

-	 * 	<li><code>root-url/remote-path</code> - If remote path is relative and root-url has been specified.

-	 * 	<li><code>root-url/class-name</code> - If remote path is not specified.

+	 * 	<li><c>remote-path</c> - If remote path is absolute.

+	 * 	<li><c>root-url/remote-path</c> - If remote path is relative and root-url has been specified.

+	 * 	<li><c>root-url/class-name</c> - If remote path is not specified.

 	 * </ul>

 	 *

 	 * <p>

@@ -1216,23 +1216,23 @@
 	 * Create a new Remote Interface against a {@link RemoteInterface @RemoteInterface}-annotated class.

 	 *

 	 * <p>

-	 * Remote interfaces are interfaces exposed on the server side using either the <code>RrpcServlet</code>

-	 * or <code>RRPC</code> REST methods.

+	 * Remote interfaces are interfaces exposed on the server side using either the <c>RrpcServlet</c>

+	 * or <c>RRPC</c> REST methods.

 	 *

 	 * <p>

 	 * The URL to the REST interface is based on the following values:

 	 * <ul>

-	 * 	<li>The {@link RemoteResource#path() @RemoteResource(path)} annotation on the interface (<code>remote-path</code>).

-	 * 	<li>The {@link RestClientBuilder#rootUrl(Object) rootUrl} on the client (<code>root-url</code>).

-	 * 	<li>The fully-qualified class name of the interface (<code>class-name</code>).

+	 * 	<li>The {@link RemoteResource#path() @RemoteResource(path)} annotation on the interface (<c>remote-path</c>).

+	 * 	<li>The {@link RestClientBuilder#rootUrl(Object) rootUrl} on the client (<c>root-url</c>).

+	 * 	<li>The fully-qualified class name of the interface (<c>class-name</c>).

 	 * </ul>

 	 *

 	 * <p>

 	 * The URL calculation is as follows:

 	 * <ul>

-	 * 	<li><code>remote-path</code> - If remote path is absolute.

-	 * 	<li><code>root-url/remote-path</code> - If remote path is relative and root-url has been specified.

-	 * 	<li><code>root-url/class-name</code> - If remote path is not specified.

+	 * 	<li><c>remote-path</c> - If remote path is absolute.

+	 * 	<li><c>root-url/remote-path</c> - If remote path is relative and root-url has been specified.

+	 * 	<li><c>root-url/class-name</c> - If remote path is not specified.

 	 * </ul>

 	 *

 	 * <p>

diff --git a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClientBuilder.java b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClientBuilder.java
index 5104bfa..dabe32f 100644
--- a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClientBuilder.java
+++ b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClientBuilder.java
@@ -368,7 +368,7 @@
 	 * Supported SSL protocols.
 	 *
 	 * <p>
-	 * This is the value passed to the <code>supportedProtocols</code> parameter of the
+	 * This is the value passed to the <c>supportedProtocols</c> parameter of the
 	 * {@link SSLConnectionSocketFactory#SSLConnectionSocketFactory(SSLContext,String[],String[],HostnameVerifier)}
 	 * constructor.
 	 *
@@ -392,7 +392,7 @@
 	 * Supported cipher suites.
 	 *
 	 * <p>
-	 * This is the value passed to the <code>supportedCipherSuites</code> parameter of the
+	 * This is the value passed to the <c>supportedCipherSuites</c> parameter of the
 	 * {@link SSLConnectionSocketFactory#SSLConnectionSocketFactory(SSLContext,String[],String[],HostnameVerifier)}
 	 * constructor.
 	 *
@@ -415,7 +415,7 @@
 	 * Hostname verifier.
 	 *
 	 * <p>
-	 * This is the value passed to the <code>hostnameVerifier</code> parameter of the
+	 * This is the value passed to the <c>hostnameVerifier</c> parameter of the
 	 * {@link SSLConnectionSocketFactory#SSLConnectionSocketFactory(SSLContext,String[],String[],HostnameVerifier)}
 	 * constructor.
 	 *
@@ -438,7 +438,7 @@
 	 * Key managers.
 	 *
 	 * <p>
-	 * This is the value passed to the <code>keyManagers</code> parameter of the
+	 * This is the value passed to the <c>keyManagers</c> parameter of the
 	 * {@link SSLContext#init(KeyManager[],TrustManager[],SecureRandom)} method.
 	 *
 	 * <p>
@@ -460,7 +460,7 @@
 	 * Trust managers.
 	 *
 	 * <p>
-	 * This is the value passed to the <code>trustManagers</code> parameter of the
+	 * This is the value passed to the <c>trustManagers</c> parameter of the
 	 * {@link SSLContext#init(KeyManager[],TrustManager[],SecureRandom)} method.
 	 *
 	 * <p>
@@ -482,7 +482,7 @@
 	 * Trust managers.
 	 *
 	 * <p>
-	 * This is the value passed to the <code>random</code> parameter of the
+	 * This is the value passed to the <c>random</c> parameter of the
 	 * {@link SSLContext#init(KeyManager[],TrustManager[],SecureRandom)} method.
 	 *
 	 * <p>
@@ -609,7 +609,7 @@
 	}
 
 	/**
-	 * Sets the value for the <code>Accept</code> request header.
+	 * Sets the value for the <c>Accept</c> request header.
 	 *
 	 * <p>
 	 * This overrides the media type specified on the parser, but is overridden by calling
@@ -623,7 +623,7 @@
 	}
 
 	/**
-	 * Sets the value for the <code>Accept-Charset</code> request header.
+	 * Sets the value for the <c>Accept-Charset</c> request header.
 	 *
 	 * <p>
 	 * This is a shortcut for calling <code>header(<js>"Accept-Charset"</js>, value);</code>
@@ -636,7 +636,7 @@
 	}
 
 	/**
-	 * Sets the value for the <code>Accept-Encoding</code> request header.
+	 * Sets the value for the <c>Accept-Encoding</c> request header.
 	 *
 	 * <p>
 	 * This is a shortcut for calling <code>header(<js>"Accept-Encoding"</js>, value);</code>
@@ -649,7 +649,7 @@
 	}
 
 	/**
-	 * Sets the value for the <code>Accept-Language</code> request header.
+	 * Sets the value for the <c>Accept-Language</c> request header.
 	 *
 	 * <p>
 	 * This is a shortcut for calling <code>header(<js>"Accept-Language"</js>, value);</code>
@@ -662,7 +662,7 @@
 	}
 
 	/**
-	 * Sets the value for the <code>Authorization</code> request header.
+	 * Sets the value for the <c>Authorization</c> request header.
 	 *
 	 * <p>
 	 * This is a shortcut for calling <code>header(<js>"Authorization"</js>, value);</code>
@@ -675,7 +675,7 @@
 	}
 
 	/**
-	 * Sets the value for the <code>Cache-Control</code> request header.
+	 * Sets the value for the <c>Cache-Control</c> request header.
 	 *
 	 * <p>
 	 * This is a shortcut for calling <code>header(<js>"Cache-Control"</js>, value);</code>
@@ -688,7 +688,7 @@
 	}
 
 	/**
-	 * Sets the value for the <code>Connection</code> request header.
+	 * Sets the value for the <c>Connection</c> request header.
 	 *
 	 * <p>
 	 * This is a shortcut for calling <code>header(<js>"Connection"</js>, value);</code>
@@ -701,7 +701,7 @@
 	}
 
 	/**
-	 * Sets the value for the <code>Content-Length</code> request header.
+	 * Sets the value for the <c>Content-Length</c> request header.
 	 *
 	 * <p>
 	 * This is a shortcut for calling <code>header(<js>"Content-Length"</js>, value);</code>
@@ -714,7 +714,7 @@
 	}
 
 	/**
-	 * Sets the value for the <code>Content-Type</code> request header.
+	 * Sets the value for the <c>Content-Type</c> request header.
 	 *
 	 * <p>
 	 * This overrides the media type specified on the serializer, but is overridden by calling
@@ -728,7 +728,7 @@
 	}
 
 	/**
-	 * Sets the value for the <code>Date</code> request header.
+	 * Sets the value for the <c>Date</c> request header.
 	 *
 	 * <p>
 	 * This is a shortcut for calling <code>header(<js>"Date"</js>, value);</code>
@@ -741,7 +741,7 @@
 	}
 
 	/**
-	 * Sets the value for the <code>Expect</code> request header.
+	 * Sets the value for the <c>Expect</c> request header.
 	 *
 	 * <p>
 	 * This is a shortcut for calling <code>header(<js>"Expect"</js>, value);</code>
@@ -754,7 +754,7 @@
 	}
 
 	/**
-	 * Sets the value for the <code>Forwarded</code> request header.
+	 * Sets the value for the <c>Forwarded</c> request header.
 	 *
 	 * <p>
 	 * This is a shortcut for calling <code>header(<js>"Forwarded"</js>, value);</code>
@@ -767,7 +767,7 @@
 	}
 
 	/**
-	 * Sets the value for the <code>From</code> request header.
+	 * Sets the value for the <c>From</c> request header.
 	 *
 	 * <p>
 	 * This is a shortcut for calling <code>header(<js>"From"</js>, value);</code>
@@ -780,7 +780,7 @@
 	}
 
 	/**
-	 * Sets the value for the <code>Host</code> request header.
+	 * Sets the value for the <c>Host</c> request header.
 	 *
 	 * <p>
 	 * This is a shortcut for calling <code>header(<js>"Host"</js>, value);</code>
@@ -793,7 +793,7 @@
 	}
 
 	/**
-	 * Sets the value for the <code>If-Match</code> request header.
+	 * Sets the value for the <c>If-Match</c> request header.
 	 *
 	 * <p>
 	 * This is a shortcut for calling <code>header(<js>"If-Match"</js>, value);</code>
@@ -806,7 +806,7 @@
 	}
 
 	/**
-	 * Sets the value for the <code>If-Modified-Since</code> request header.
+	 * Sets the value for the <c>If-Modified-Since</c> request header.
 	 *
 	 * <p>
 	 * This is a shortcut for calling <code>header(<js>"If-Modified-Since"</js>, value);</code>
@@ -819,7 +819,7 @@
 	}
 
 	/**
-	 * Sets the value for the <code>If-None-Match</code> request header.
+	 * Sets the value for the <c>If-None-Match</c> request header.
 	 *
 	 * <p>
 	 * This is a shortcut for calling <code>header(<js>"If-None-Match"</js>, value);</code>
@@ -832,7 +832,7 @@
 	}
 
 	/**
-	 * Sets the value for the <code>If-Range</code> request header.
+	 * Sets the value for the <c>If-Range</c> request header.
 	 *
 	 * <p>
 	 * This is a shortcut for calling <code>header(<js>"If-Range"</js>, value);</code>
@@ -845,7 +845,7 @@
 	}
 
 	/**
-	 * Sets the value for the <code>If-Unmodified-Since</code> request header.
+	 * Sets the value for the <c>If-Unmodified-Since</c> request header.
 	 *
 	 * <p>
 	 * This is a shortcut for calling <code>header(<js>"If-Unmodified-Since"</js>, value);</code>
@@ -858,7 +858,7 @@
 	}
 
 	/**
-	 * Sets the value for the <code>Max-Forwards</code> request header.
+	 * Sets the value for the <c>Max-Forwards</c> request header.
 	 *
 	 * <p>
 	 * This is a shortcut for calling <code>header(<js>"Max-Forwards"</js>, value);</code>
@@ -871,7 +871,7 @@
 	}
 
 	/**
-	 * When called, <code>No-Trace: true</code> is added to requests.
+	 * When called, <c>No-Trace: true</c> is added to requests.
 	 *
 	 * <p>
 	 * This gives the opportunity for the servlet to not log errors on invalid requests.
@@ -885,7 +885,7 @@
 	}
 
 	/**
-	 * Sets the value for the <code>Origin</code> request header.
+	 * Sets the value for the <c>Origin</c> request header.
 	 *
 	 * <p>
 	 * This is a shortcut for calling <code>header(<js>"Origin"</js>, value);</code>
@@ -898,7 +898,7 @@
 	}
 
 	/**
-	 * Sets the value for the <code>Pragma</code> request header.
+	 * Sets the value for the <c>Pragma</c> request header.
 	 *
 	 * <p>
 	 * This is a shortcut for calling <code>header(<js>"Pragma"</js>, value);</code>
@@ -911,7 +911,7 @@
 	}
 
 	/**
-	 * Sets the value for the <code>Proxy-Authorization</code> request header.
+	 * Sets the value for the <c>Proxy-Authorization</c> request header.
 	 *
 	 * <p>
 	 * This is a shortcut for calling <code>header(<js>"Proxy-Authorization"</js>, value);</code>
@@ -924,7 +924,7 @@
 	}
 
 	/**
-	 * Sets the value for the <code>Range</code> request header.
+	 * Sets the value for the <c>Range</c> request header.
 	 *
 	 * <p>
 	 * This is a shortcut for calling <code>header(<js>"Range"</js>, value);</code>
@@ -937,7 +937,7 @@
 	}
 
 	/**
-	 * Sets the value for the <code>Referer</code> request header.
+	 * Sets the value for the <c>Referer</c> request header.
 	 *
 	 * <p>
 	 * This is a shortcut for calling <code>header(<js>"Referer"</js>, value);</code>
@@ -950,7 +950,7 @@
 	}
 
 	/**
-	 * Sets the value for the <code>TE</code> request header.
+	 * Sets the value for the <c>TE</c> request header.
 	 *
 	 * <p>
 	 * This is a shortcut for calling <code>header(<js>"TE"</js>, value);</code>
@@ -963,7 +963,7 @@
 	}
 
 	/**
-	 * Sets the value for the <code>User-Agent</code> request header.
+	 * Sets the value for the <c>User-Agent</c> request header.
 	 *
 	 * <p>
 	 * This is a shortcut for calling <code>header(<js>"User-Agent"</js>, value);</code>
@@ -976,7 +976,7 @@
 	}
 
 	/**
-	 * Sets the value for the <code>Upgrade</code> request header.
+	 * Sets the value for the <c>Upgrade</c> request header.
 	 *
 	 * <p>
 	 * This is a shortcut for calling <code>header(<js>"Upgrade"</js>, value);</code>
@@ -989,7 +989,7 @@
 	}
 
 	/**
-	 * Sets the value for the <code>Via</code> request header.
+	 * Sets the value for the <c>Via</c> request header.
 	 *
 	 * <p>
 	 * This is a shortcut for calling <code>header(<js>"Via"</js>, value);</code>
@@ -1002,7 +1002,7 @@
 	}
 
 	/**
-	 * Sets the value for the <code>Warning</code> request header.
+	 * Sets the value for the <c>Warning</c> request header.
 	 *
 	 * <p>
 	 * This is a shortcut for calling <code>header(<js>"Warning"</js>, value);</code>
@@ -1285,7 +1285,7 @@
 	 * @param value
 	 * 	The root URL to prefix to relative URL strings.
 	 * 	<br>Trailing slashes are trimmed.
-	 * 	<br>Usually a <code>String</code> but you can also pass in <code>URI</code> and <code>URL</code> objects as well.
+	 * 	<br>Usually a <c>String</c> but you can also pass in <c>URI</c> and <c>URL</c> objects as well.
 	 * @return This object (for method chaining).
 	 */
 	public RestClientBuilder rootUrl(Object value) {
@@ -1524,7 +1524,7 @@
 	 *
 	 * @param value
 	 * 	The new value for this property.
-	 * 	<br>The default is <code>0</code>.
+	 * 	<br>The default is <c>0</c>.
 	 * @return This object (for method chaining).
 	 */
 	public RestClientBuilder initialDepth(int value) {
@@ -1565,7 +1565,7 @@
 	 *
 	 * @param value
 	 * 	The new value for this property.
-	 * 	<br>The default is <code>100</code>.
+	 * 	<br>The default is <c>100</c>.
 	 * @return This object (for method chaining).
 	 */
 	public RestClientBuilder maxDepth(int value) {
@@ -1846,7 +1846,7 @@
 	 *
 	 * @param value
 	 * 	The new value for this property.
-	 * 	<br>The default is <code>100</code>.
+	 * 	<br>The default is <c>100</c>.
 	 * @return This object (for method chaining).
 	 */
 	public RestClientBuilder maxIndent(int value) {
@@ -2013,7 +2013,7 @@
 	 *
 	 * @param value
 	 * 	The new value for this property.
-	 * 	<br>The default value is <code>5</code>.
+	 * 	<br>The default value is <c>5</c>.
 	 * @return This object (for method chaining).
 	 */
 	public RestClientBuilder debugOutputLines(int value) {
@@ -2154,7 +2154,7 @@
 	 * Configuration property:  File charset.
 	 *
 	 * <p>
-	 * The character set to use for reading <code>Files</code> from the file system.
+	 * The character set to use for reading <c>Files</c> from the file system.
 	 *
 	 * <h5 class='section'>See Also:</h5>
 	 * <ul>
@@ -2174,7 +2174,7 @@
 	 * Configuration property:  Input stream charset.
 	 *
 	 * <p>
-	 * The character set to use for converting <code>InputStreams</code> and byte arrays to readers.
+	 * The character set to use for converting <c>InputStreams</c> and byte arrays to readers.
 	 *
 	 * <h5 class='section'>See Also:</h5>
 	 * <ul>
diff --git a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RetryOn.java b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RetryOn.java
index 31e56af..7e457ed 100644
--- a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RetryOn.java
+++ b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RetryOn.java
@@ -56,7 +56,7 @@
 	/**

 	 * Subclasses should override this method to determine whether the HTTP response is retryable.

 	 *

-	 * @param httpResponseCode The HTTP response code.  <code>-1</code> if a connection could not be made.

+	 * @param httpResponseCode The HTTP response code.  <c>-1</c> if a connection could not be made.

 	 * @return <jk>true</jk> if the specified response code is retryable.

 	 */

 	protected boolean onCode(int httpResponseCode) {

diff --git a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/mock/MockHttpClientConnection.java b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/mock/MockHttpClientConnection.java
index 33ddfee..acfbdb9 100644
--- a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/mock/MockHttpClientConnection.java
+++ b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/mock/MockHttpClientConnection.java
@@ -26,7 +26,7 @@
  *
  * This implementation is NOT thread safe.
  * 
- * @deprecated Use <code>org.apache.juneau.rest.mock2</code>
+ * @deprecated Use <c>org.apache.juneau.rest.mock2</c>
  */
 @Deprecated
 public class MockHttpClientConnection implements HttpClientConnection {
diff --git a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/mock/MockHttpClientConnectionManager.java b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/mock/MockHttpClientConnectionManager.java
index 57e83d7..83932dd 100644
--- a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/mock/MockHttpClientConnectionManager.java
+++ b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/mock/MockHttpClientConnectionManager.java
@@ -26,7 +26,7 @@
  *
  * This implementation is NOT thread safe.
  * 
- * @deprecated Use <code>org.apache.juneau.rest.mock2</code>
+ * @deprecated Use <c>org.apache.juneau.rest.mock2</c>
  */
 @Deprecated
 public class MockHttpClientConnectionManager implements HttpClientConnectionManager {
diff --git a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/remote/RemoteMethod.java b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/remote/RemoteMethod.java
index 4436650..0d5f9ec 100644
--- a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/remote/RemoteMethod.java
+++ b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/remote/RemoteMethod.java
@@ -41,7 +41,7 @@
 	 * The possible values are:

 	 * <ul class='spaced-list'>

 	 * 	<li>An absolute URL.

-	 * 	<li>A relative URL interpreted as relative to the root URL defined on the <code>RestClient</code> and/or {@link RemoteResource#path()}.

+	 * 	<li>A relative URL interpreted as relative to the root URL defined on the <c>RestClient</c> and/or {@link RemoteResource#path()}.

 	 * 	<li>No path.

 	 * </ul>

 	 *

@@ -89,13 +89,13 @@
 	 * 				error HTTP status is returned.

 	 * 			<li>

 	 * 				Any parsable POJO - The body of the response will be converted to the POJO using the parser defined

-	 * 				on the <code>RestClient</code>.

+	 * 				on the <c>RestClient</c>.

 	 * 			<li>

 	 * 				Any POJO annotated with the {@link Response @Response} annotation.

 	 * 				This allows for response beans to be used which also allows for OpenAPI-based parsing and validation.

 	 * 			<li>

-	 * 				<code>HttpResponse</code> - Returns the raw <code>HttpResponse</code> returned by the inner

-	 * 				<code>HttpClient</code>.

+	 * 				<c>HttpResponse</c> - Returns the raw <c>HttpResponse</c> returned by the inner

+	 * 				<c>HttpClient</c>.

 	 * 			<li>

 	 * 				{@link Reader} - Returns access to the raw reader of the response.

 	 * 			<li>

@@ -105,8 +105,8 @@
 	 * 		{@link RemoteReturn#STATUS} - The HTTP status code on the response.

 	 * 		<br>The return type on the Java method can be any of the following:

 	 * 		<ul>

-	 * 			<li><jk>int</jk>/<code>Integer</code> - The HTTP response code.

-	 * 			<li><jk>boolean</jk>/<code>Boolean</code> - <jk>true</jk> if the response code is <code>&lt;400</code>

+	 * 			<li><jk>int</jk>/<c>Integer</c> - The HTTP response code.

+	 * 			<li><jk>boolean</jk>/<c>Boolean</c> - <jk>true</jk> if the response code is <c>&lt;400</c>

 	 * 		</ul>

 	 * </ul>

 	 */

diff --git a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/remote/RemoteMethodArg.java b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/remote/RemoteMethodArg.java
index 9b5ba5b..27b708d 100644
--- a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/remote/RemoteMethodArg.java
+++ b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/remote/RemoteMethodArg.java
@@ -62,9 +62,9 @@
 	}
 
 	/**
-	 * Returns whether the <code>skipIfEmpty</code> flag was found in the schema.
+	 * Returns whether the <c>skipIfEmpty</c> flag was found in the schema.
 	 *
-	 * @return <jk>true</jk> if the <code>skipIfEmpty</code> flag was found in the schema.
+	 * @return <jk>true</jk> if the <c>skipIfEmpty</c> flag was found in the schema.
 	 */
 	public boolean isSkipIfEmpty() {
 		return skipIfEmpty;
diff --git a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/remote/RemoteResource.java b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/remote/RemoteResource.java
index 223a7ee..50f6cd1 100644
--- a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/remote/RemoteResource.java
+++ b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/remote/RemoteResource.java
@@ -38,7 +38,7 @@
 	 * The possible values are:

 	 * <ul class='spaced-list'>

 	 * 	<li>An absolute URL.

-	 * 	<li>A relative URL interpreted as relative to the root URL defined on the <code>RestClient</code>

+	 * 	<li>A relative URL interpreted as relative to the root URL defined on the <c>RestClient</c>

 	 * 	<li>No path interpreted as the class name (e.g. <js>"http://localhost/root-url/org.foo.MyInterface"</js>)

 	 * </ul>

 	 */

diff --git a/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock2/MockHttpConnection.java b/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock2/MockHttpConnection.java
index 6ee80ba..ae4f896 100644
--- a/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock2/MockHttpConnection.java
+++ b/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock2/MockHttpConnection.java
@@ -18,8 +18,8 @@
  * Represent the basic connection for mock HTTP requests.
  *
  * <p>
- * Used as a shim between the server and client APIs that allow the <code>RestClient</code>
- * class to send and receive mocked requests using the <code>MockRest</code> interface.
+ * Used as a shim between the server and client APIs that allow the <c>RestClient</c>
+ * class to send and receive mocked requests using the <c>MockRest</c> interface.
  */
 public interface MockHttpConnection {
 
diff --git a/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock2/MockHttpRequest.java b/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock2/MockHttpRequest.java
index ab0fb05..ab94b8c 100644
--- a/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock2/MockHttpRequest.java
+++ b/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock2/MockHttpRequest.java
@@ -16,8 +16,8 @@
  * Represent the basic interface for an HTTP request.
  *
  * <p>
- * Used as a shim between the server and client APIs that allow the <code>RestClient</code>
- * class to send and receive mocked requests using the <code>MockRest</code> interface.
+ * Used as a shim between the server and client APIs that allow the <c>RestClient</c>
+ * class to send and receive mocked requests using the <c>MockRest</c> interface.
  */
 public interface MockHttpRequest {
 
diff --git a/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock2/MockHttpResponse.java b/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock2/MockHttpResponse.java
index 75a8b13..ac1ebd3 100644
--- a/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock2/MockHttpResponse.java
+++ b/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock2/MockHttpResponse.java
@@ -18,8 +18,8 @@
  * Represent the basic interface for an HTTP response.
  *
  * <p>
- * Used as a shim between the server and client APIs that allow the <code>RestClient</code>
- * class to send and receive mocked requests using the <code>MockRest</code> interface.
+ * Used as a shim between the server and client APIs that allow the <c>RestClient</c>
+ * class to send and receive mocked requests using the <c>MockRest</c> interface.
  */
 public interface MockHttpResponse {
 
diff --git a/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock2/MockRemoteResource.java b/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock2/MockRemoteResource.java
index ae40a14..3d33383 100644
--- a/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock2/MockRemoteResource.java
+++ b/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock2/MockRemoteResource.java
@@ -102,10 +102,10 @@
 	 * 	<br>If a class, it must have a no-arg constructor.
 	 * @param s
 	 * 	The serializer to use for serializing request bodies.
-	 * 	<br>Can be <jk>null</jk> to force no serializer to be used and no <code>Content-Type</code> header.
+	 * 	<br>Can be <jk>null</jk> to force no serializer to be used and no <c>Content-Type</c> header.
 	 * @param p
 	 * 	The parser to use for parsing response bodies.
-	 * 	<br>Can be <jk>null</jk> to force no parser to be used and no <code>Accept</code> header.
+	 * 	<br>Can be <jk>null</jk> to force no parser to be used and no <c>Accept</c> header.
 	 * @return A new builder.
 	 */
 	public static <T> MockRemoteResource<T> create(Class<T> intf, Object impl, Serializer s, Parser p) {
@@ -164,7 +164,7 @@
 	 * 	<br>If a class, it must have a no-arg constructor.
 	 * @param m
 	 * 	The marshall to use for serializing request bodies and parsing response bodies.
-	 * 	<br>Can be <jk>null</jk> to force no serializer or parser to be used and no <code>Accept</code> or <code>Content-Type</code> header.
+	 * 	<br>Can be <jk>null</jk> to force no serializer or parser to be used and no <c>Accept</c> or <c>Content-Type</c> header.
 	 * @return A new proxy interface.
 	 */
 	public static <T> T build(Class<T> intf, Object impl, Marshall m) {
@@ -190,10 +190,10 @@
 	 * 	<br>If a class, it must have a no-arg constructor.
 	 * @param s
 	 * 	The serializer to use for serializing request bodies.
-	 * 	<br>Can be <jk>null</jk> to force no serializer to be used and no <code>Content-Type</code> header.
+	 * 	<br>Can be <jk>null</jk> to force no serializer to be used and no <c>Content-Type</c> header.
 	 * @param p
 	 * 	The parser to use for parsing response bodies.
-	 * 	<br>Can be <jk>null</jk> to force no parser to be used and no <code>Accept</code> header.
+	 * 	<br>Can be <jk>null</jk> to force no parser to be used and no <c>Accept</c> header.
 	 * @return A new proxy interface.
 	 */
 	public static <T> T build(Class<T> intf, Object impl, Serializer s, Parser p) {
@@ -242,7 +242,7 @@
 	}
 
 	/**
-	 * Adds an <code>Accept</code> header to every request.
+	 * Adds an <c>Accept</c> header to every request.
 	 *
 	 * @param value The <code>Accept/code> header value.
 	 * @return This object (for method chaining).
@@ -254,9 +254,9 @@
 	}
 
 	/**
-	 * Adds a <code>Content-Type</code> header to every request.
+	 * Adds a <c>Content-Type</c> header to every request.
 	 *
-	 * @param value The <code>Content-Type</code> header value.
+	 * @param value The <c>Content-Type</c> header value.
 	 * @return This object (for method chaining).
 	 */
 	public MockRemoteResource<T> contentType(String value) {
@@ -266,7 +266,7 @@
 	}
 
 	/**
-	 * Convenience method for setting <code>Accept</code> and <code>Content-Type</code> headers to <js>"application/json"</js>.
+	 * Convenience method for setting <c>Accept</c> and <c>Content-Type</c> headers to <js>"application/json"</js>.
 	 *
 	 * @return This object (for method chaining).
 	 */
@@ -276,7 +276,7 @@
 	}
 
 	/**
-	 * Convenience method for setting <code>Accept</code> and <code>Content-Type</code> headers to <js>"application/json+simple"</js>.
+	 * Convenience method for setting <c>Accept</c> and <c>Content-Type</c> headers to <js>"application/json+simple"</js>.
 	 *
 	 * @return This object (for method chaining).
 	 */
@@ -286,7 +286,7 @@
 	}
 
 	/**
-	 * Convenience method for setting <code>Accept</code> and <code>Content-Type</code> headers to <js>"text/xml"</js>.
+	 * Convenience method for setting <c>Accept</c> and <c>Content-Type</c> headers to <js>"text/xml"</js>.
 	 *
 	 * @return This object (for method chaining).
 	 */
@@ -296,7 +296,7 @@
 	}
 
 	/**
-	 * Convenience method for setting <code>Accept</code> and <code>Content-Type</code> headers to <js>"text/html"</js>.
+	 * Convenience method for setting <c>Accept</c> and <c>Content-Type</c> headers to <js>"text/html"</js>.
 	 *
 	 * @return This object (for method chaining).
 	 */
@@ -306,7 +306,7 @@
 	}
 
 	/**
-	 * Convenience method for setting <code>Accept</code> and <code>Content-Type</code> headers to <js>"text/plain"</js>.
+	 * Convenience method for setting <c>Accept</c> and <c>Content-Type</c> headers to <js>"text/plain"</js>.
 	 *
 	 * @return This object (for method chaining).
 	 */
@@ -316,7 +316,7 @@
 	}
 
 	/**
-	 * Convenience method for setting <code>Accept</code> and <code>Content-Type</code> headers to <js>"octal/msgpack"</js>.
+	 * Convenience method for setting <c>Accept</c> and <c>Content-Type</c> headers to <js>"octal/msgpack"</js>.
 	 *
 	 * @return This object (for method chaining).
 	 */
@@ -326,7 +326,7 @@
 	}
 
 	/**
-	 * Convenience method for setting <code>Accept</code> and <code>Content-Type</code> headers to <js>"text/uon"</js>.
+	 * Convenience method for setting <c>Accept</c> and <c>Content-Type</c> headers to <js>"text/uon"</js>.
 	 *
 	 * @return This object (for method chaining).
 	 */
@@ -336,7 +336,7 @@
 	}
 
 	/**
-	 * Convenience method for setting <code>Accept</code> and <code>Content-Type</code> headers to <js>"application/x-www-form-urlencoded"</js>.
+	 * Convenience method for setting <c>Accept</c> and <c>Content-Type</c> headers to <js>"application/x-www-form-urlencoded"</js>.
 	 *
 	 * @return This object (for method chaining).
 	 */
@@ -346,7 +346,7 @@
 	}
 
 	/**
-	 * Convenience method for setting <code>Accept</code> and <code>Content-Type</code> headers to <js>"text/openapi"</js>.
+	 * Convenience method for setting <c>Accept</c> and <c>Content-Type</c> headers to <js>"text/openapi"</js>.
 	 *
 	 * @return This object (for method chaining).
 	 */
@@ -359,7 +359,7 @@
 	 * Associates the specified {@link Marshall} with this client.
 	 *
 	 * <p>
-	 * This is shorthand for calling <code>serializer(x)</code> and <code>parser(x)</code> using the inner
+	 * This is shorthand for calling <c>serializer(x)</c> and <c>parser(x)</c> using the inner
 	 * serializer and parser of the marshall object.
 	 *
 	 * @param value
diff --git a/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock2/MockRest.java b/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock2/MockRest.java
index 5498bba..453a893 100644
--- a/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock2/MockRest.java
+++ b/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock2/MockRest.java
@@ -109,7 +109,7 @@
 	 * Creates a new builder with the specified REST implementation bean or bean class.
 	 *
 	 * <p>
-	 * No <code>Accept</code> or <code>Content-Type</code> header is specified by default.
+	 * No <c>Accept</c> or <c>Content-Type</c> header is specified by default.
 	 *
 	 * @param impl
 	 * 	The REST bean or bean class annotated with {@link RestResource @RestResource}.
@@ -124,8 +124,8 @@
 	 * Convenience method for creating a MockRest over the specified REST implementation bean or bean class.
 	 *
 	 * <p>
-	 * <code>Accept</code> header is set to <code>"application/json+simple"</code> by default.
-	 * <code>Content-Type</code> header is set to <code>"application/json"</code> by default.
+	 * <c>Accept</c> header is set to <c>"application/json+simple"</c> by default.
+	 * <c>Content-Type</c> header is set to <c>"application/json"</c> by default.
 	 *
 	 * <p>
 	 * Equivalent to calling:
@@ -146,7 +146,7 @@
 	 * Convenience method for creating a MockRest over the specified REST implementation bean or bean class.
 	 *
 	 * <p>
-	 * <code>Accept</code> and <code>Content-Type</code> headers are set to the primary media types on the specified marshall.
+	 * <c>Accept</c> and <c>Content-Type</c> headers are set to the primary media types on the specified marshall.
 	 *
 	 * <p>
 	 * Note that the marshall itself is not involved in any serialization or parsing.
@@ -161,7 +161,7 @@
 	 * 	The REST bean or bean class annotated with {@link RestResource @RestResource}.
 	 * 	<br>If a class, it must have a no-arg constructor.
 	 * @param m
-	 * 	The marshall to use for specifying the <code>Accept</code> and <code>Content-Type</code> headers.
+	 * 	The marshall to use for specifying the <c>Accept</c> and <c>Content-Type</c> headers.
 	 * 	<br>If <jk>null</jk>, headers will be reset.
 	 * @return A new {@link MockRest} object.
 	 */
@@ -173,7 +173,7 @@
 	 * Convenience method for creating a MockRest over the specified REST implementation bean or bean class.
 	 *
 	 * <p>
-	 * <code>Accept</code> and <code>Content-Type</code> headers are set to the primary media types on the specified serializer and parser.
+	 * <c>Accept</c> and <c>Content-Type</c> headers are set to the primary media types on the specified serializer and parser.
 	 *
 	 * <p>
 	 * Note that the marshall itself is not involved in any serialization or parsing.
@@ -188,10 +188,10 @@
 	 * 	The REST bean or bean class annotated with {@link RestResource @RestResource}.
 	 * 	<br>If a class, it must have a no-arg constructor.
 	 * @param s
-	 * 	The serializer to use for specifying the <code>Content-Type</code> header.
+	 * 	The serializer to use for specifying the <c>Content-Type</c> header.
 	 * 	<br>If <jk>null</jk>, header will be reset.
 	 * @param p
-	 * 	The parser to use for specifying the <code>Accept</code> header.
+	 * 	The parser to use for specifying the <c>Accept</c> header.
 	 * 	<br>If <jk>null</jk>, header will be reset.
 	 * @return A new {@link MockRest} object.
 	 */
@@ -254,7 +254,7 @@
 		}
 
 		/**
-		 * Specifies the <code>Accept</code> header to every request.
+		 * Specifies the <c>Accept</c> header to every request.
 		 *
 		 * @param value The <code>Accept/code> header value.
 		 * @return This object (for method chaining).
@@ -264,9 +264,9 @@
 		}
 
 		/**
-		 * Specifies the  <code>Content-Type</code> header to every request.
+		 * Specifies the  <c>Content-Type</c> header to every request.
 		 *
-		 * @param value The <code>Content-Type</code> header value.
+		 * @param value The <c>Content-Type</c> header value.
 		 * @return This object (for method chaining).
 		 */
 		public Builder contentType(String value) {
@@ -274,7 +274,7 @@
 		}
 
 		/**
-		 * Convenience method for setting the <code>Accept</code> and <code>Content-Type</code> headers to <js>"application/json"</js>.
+		 * Convenience method for setting the <c>Accept</c> and <c>Content-Type</c> headers to <js>"application/json"</js>.
 		 *
 		 * @return This object (for method chaining).
 		 */
@@ -283,7 +283,7 @@
 		}
 
 		/**
-		 * Convenience method for setting the <code>Accept</code> and <code>Content-Type</code> headers to <js>"application/json+simple"</js>.
+		 * Convenience method for setting the <c>Accept</c> and <c>Content-Type</c> headers to <js>"application/json+simple"</js>.
 		 *
 		 * @return This object (for method chaining).
 		 */
@@ -292,7 +292,7 @@
 		}
 
 		/**
-		 * Convenience method for setting the <code>Accept</code> and <code>Content-Type</code> headers to <js>"text/xml"</js>.
+		 * Convenience method for setting the <c>Accept</c> and <c>Content-Type</c> headers to <js>"text/xml"</js>.
 		 *
 		 * @return This object (for method chaining).
 		 */
@@ -301,7 +301,7 @@
 		}
 
 		/**
-		 * Convenience method for setting the <code>Accept</code> and <code>Content-Type</code> headers to <js>"text/html"</js>.
+		 * Convenience method for setting the <c>Accept</c> and <c>Content-Type</c> headers to <js>"text/html"</js>.
 		 *
 		 * @return This object (for method chaining).
 		 */
@@ -310,7 +310,7 @@
 		}
 
 		/**
-		 * Convenience method for setting the <code>Accept</code> and <code>Content-Type</code> headers to <js>"text/plain"</js>.
+		 * Convenience method for setting the <c>Accept</c> and <c>Content-Type</c> headers to <js>"text/plain"</js>.
 		 *
 		 * @return This object (for method chaining).
 		 */
@@ -319,7 +319,7 @@
 		}
 
 		/**
-		 * Convenience method for setting the <code>Accept</code> and <code>Content-Type</code> headers to <js>"octal/msgpack"</js>.
+		 * Convenience method for setting the <c>Accept</c> and <c>Content-Type</c> headers to <js>"octal/msgpack"</js>.
 		 *
 		 * @return This object (for method chaining).
 		 */
@@ -328,7 +328,7 @@
 		}
 
 		/**
-		 * Convenience method for setting the <code>Accept</code> and <code>Content-Type</code> headers to <js>"text/uon"</js>.
+		 * Convenience method for setting the <c>Accept</c> and <c>Content-Type</c> headers to <js>"text/uon"</js>.
 		 *
 		 * @return This object (for method chaining).
 		 */
@@ -337,7 +337,7 @@
 		}
 
 		/**
-		 * Convenience method for setting the <code>Accept</code> and <code>Content-Type</code> headers to <js>"application/x-www-form-urlencoded"</js>.
+		 * Convenience method for setting the <c>Accept</c> and <c>Content-Type</c> headers to <js>"application/x-www-form-urlencoded"</js>.
 		 *
 		 * @return This object (for method chaining).
 		 */
@@ -346,7 +346,7 @@
 		}
 
 		/**
-		 * Convenience method for setting the <code>Accept</code> and <code>Content-Type</code> headers to <js>"text/yaml"</js>.
+		 * Convenience method for setting the <c>Accept</c> and <c>Content-Type</c> headers to <js>"text/yaml"</js>.
 		 *
 		 * @return This object (for method chaining).
 		 */
@@ -355,7 +355,7 @@
 		}
 
 		/**
-		 * Convenience method for setting the <code>Accept</code> and <code>Content-Type</code> headers to <js>"text/openapi"</js>.
+		 * Convenience method for setting the <c>Accept</c> and <c>Content-Type</c> headers to <js>"text/openapi"</js>.
 		 *
 		 * @return This object (for method chaining).
 		 */
@@ -364,7 +364,7 @@
 		}
 
 		/**
-		 * Convenience method for setting the <code>Content-Type</code> header to the primary media type on the specified serializer.
+		 * Convenience method for setting the <c>Content-Type</c> header to the primary media type on the specified serializer.
 		 *
 		 * @param value
 		 * 	The serializer to get the media type from.
@@ -376,7 +376,7 @@
 		}
 
 		/**
-		 * Convenience method for setting the <code>Accept</code> header to the primary media type on the specified parser.
+		 * Convenience method for setting the <c>Accept</c> header to the primary media type on the specified parser.
 		 *
 		 * @param value
 		 * 	The parser to get the media type from.
@@ -388,7 +388,7 @@
 		}
 
 		/**
-		 * Convenience method for setting the <code>Accept</code> and <code>Content-Type</code> headers to the primary media types on the specified marshall.
+		 * Convenience method for setting the <c>Accept</c> and <c>Content-Type</c> headers to the primary media types on the specified marshall.
 		 *
 		 * @param value
 		 * 	The marshall to get the media types from.
@@ -460,7 +460,7 @@
 	 * 		<li>{@link InputStream}
 	 * 		<li>{@link CharSequence}
 	 * 	</ul>
-	 * 	Any other types are converted to a string using the <code>toString()</code> method.
+	 * 	Any other types are converted to a string using the <c>toString()</c> method.
 	 * @return A new servlet request.
 	 * @throws Exception
 	 */
@@ -496,7 +496,7 @@
 	 * 		<li>{@link InputStream}
 	 * 		<li>{@link CharSequence}
 	 * 	</ul>
-	 * 	Any other types are converted to a string using the <code>toString()</code> method.
+	 * 	Any other types are converted to a string using the <c>toString()</c> method.
 	 * @return A new servlet request.
 	 * @throws Exception
 	 */
@@ -551,7 +551,7 @@
 	 * 		<li>{@link InputStream}
 	 * 		<li>{@link CharSequence}
 	 * 	</ul>
-	 * 	Any other types are converted to a string using the <code>toString()</code> method.
+	 * 	Any other types are converted to a string using the <c>toString()</c> method.
 	 * @return A new servlet request.
 	 * @throws Exception
 	 */
@@ -572,7 +572,7 @@
 	 * 		<li>{@link InputStream}
 	 * 		<li>{@link CharSequence}
 	 * 	</ul>
-	 * 	Any other types are converted to a string using the <code>toString()</code> method.
+	 * 	Any other types are converted to a string using the <c>toString()</c> method.
 	 * @return A new servlet request.
 	 * @throws Exception
 	 */
@@ -626,7 +626,7 @@
 	 * 		<li>{@link InputStream}
 	 * 		<li>{@link CharSequence}
 	 * 	</ul>
-	 * 	Any other types are converted to a string using the <code>toString()</code> method.
+	 * 	Any other types are converted to a string using the <c>toString()</c> method.
 	 * @return A new servlet request.
 	 * @throws Exception
 	 */
diff --git a/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock2/MockRestClient.java b/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock2/MockRestClient.java
index d811320..7677027 100644
--- a/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock2/MockRestClient.java
+++ b/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock2/MockRestClient.java
@@ -101,7 +101,7 @@
 	 * 	The REST bean or bean class annotated with {@link RestResource @RestResource}.
 	 * 	<br>If a class, it must have a no-arg constructor.
 	 * @param m
-	 * 	The marshall to use for specifying the <code>Accept</code> and <code>Content-Type</code> headers.
+	 * 	The marshall to use for specifying the <c>Accept</c> and <c>Content-Type</c> headers.
 	 * 	<br>If <jk>null</jk>, headers will be reset.
 	 * @return A new {@link MockRest} object.
 	 */
@@ -152,7 +152,7 @@
 	}
 
 	/**
-	 * Convenience method for setting <code>Accept</code> and <code>Content-Type</code> headers to <js>"application/json"</js>.
+	 * Convenience method for setting <c>Accept</c> and <c>Content-Type</c> headers to <js>"application/json"</js>.
 	 *
 	 * @return This object (for method chaining).
 	 */
@@ -163,7 +163,7 @@
 	}
 
 	/**
-	 * Convenience method for setting <code>Accept</code> and <code>Content-Type</code> headers to <js>"application/json+simple"</js>.
+	 * Convenience method for setting <c>Accept</c> and <c>Content-Type</c> headers to <js>"application/json+simple"</js>.
 	 *
 	 * @return This object (for method chaining).
 	 */
@@ -174,7 +174,7 @@
 	}
 
 	/**
-	 * Convenience method for setting <code>Accept</code> and <code>Content-Type</code> headers to <js>"text/xml"</js>.
+	 * Convenience method for setting <c>Accept</c> and <c>Content-Type</c> headers to <js>"text/xml"</js>.
 	 *
 	 * @return This object (for method chaining).
 	 */
@@ -185,7 +185,7 @@
 	}
 
 	/**
-	 * Convenience method for setting <code>Accept</code> and <code>Content-Type</code> headers to <js>"text/html"</js>.
+	 * Convenience method for setting <c>Accept</c> and <c>Content-Type</c> headers to <js>"text/html"</js>.
 	 *
 	 * @return This object (for method chaining).
 	 */
@@ -196,7 +196,7 @@
 	}
 
 	/**
-	 * Convenience method for setting <code>Accept</code> and <code>Content-Type</code> headers to <js>"text/plain"</js>.
+	 * Convenience method for setting <c>Accept</c> and <c>Content-Type</c> headers to <js>"text/plain"</js>.
 	 *
 	 * @return This object (for method chaining).
 	 */
@@ -207,7 +207,7 @@
 	}
 
 	/**
-	 * Convenience method for setting <code>Accept</code> and <code>Content-Type</code> headers to <js>"octal/msgpack"</js>.
+	 * Convenience method for setting <c>Accept</c> and <c>Content-Type</c> headers to <js>"octal/msgpack"</js>.
 	 *
 	 * @return This object (for method chaining).
 	 */
@@ -218,7 +218,7 @@
 	}
 
 	/**
-	 * Convenience method for setting <code>Accept</code> and <code>Content-Type</code> headers to <js>"text/uon"</js>.
+	 * Convenience method for setting <c>Accept</c> and <c>Content-Type</c> headers to <js>"text/uon"</js>.
 	 *
 	 * @return This object (for method chaining).
 	 */
@@ -229,7 +229,7 @@
 	}
 
 	/**
-	 * Convenience method for setting <code>Accept</code> and <code>Content-Type</code> headers to <js>"application/x-www-form-urlencoded"</js>.
+	 * Convenience method for setting <c>Accept</c> and <c>Content-Type</c> headers to <js>"application/x-www-form-urlencoded"</js>.
 	 *
 	 * @return This object (for method chaining).
 	 */
@@ -240,7 +240,7 @@
 	}
 
 	/**
-	 * Convenience method for setting <code>Accept</code> and <code>Content-Type</code> headers to <js>"text/openapi"</js>.
+	 * Convenience method for setting <c>Accept</c> and <c>Content-Type</c> headers to <js>"text/openapi"</js>.
 	 *
 	 * @return This object (for method chaining).
 	 */
diff --git a/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock2/MockServletRequest.java b/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock2/MockServletRequest.java
index 4fcd5e1..6cb8442 100644
--- a/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock2/MockServletRequest.java
+++ b/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock2/MockServletRequest.java
@@ -82,8 +82,8 @@
 	 *
 	 * Initialized with the following:
 	 * <ul>
-	 * 	<li><code>"Accept: text/json+simple"</code>
-	 * 	<li><code>"Content-Type: text/json"</code>
+	 * 	<li><c>"Accept: text/json+simple"</c>
+	 * 	<li><c>"Content-Type: text/json"</c>
 	 * </ul>
 	 *
 	 * @return A new request.
@@ -98,8 +98,8 @@
 	 *
 	 * Initialized with the following:
 	 * <ul>
-	 * 	<li><code>"Accept: text/json+simple"</code>
-	 * 	<li><code>"Content-Type: text/json"</code>
+	 * 	<li><c>"Accept: text/json+simple"</c>
+	 * 	<li><c>"Content-Type: text/json"</c>
 	 * </ul>
 	 *
 	 * @param method The HTTP method  name.
@@ -115,9 +115,9 @@
 	}
 
 	/**
-	 * Specifies the <code>Accept</code> header value.
+	 * Specifies the <c>Accept</c> header value.
 	 *
-	 * @param value The <code>Accept</code> header value.
+	 * @param value The <c>Accept</c> header value.
 	 * @return This object (for method chaining).
 	 */
 	public MockServletRequest accept(String value) {
@@ -125,9 +125,9 @@
 	}
 
 	/**
-	 * Specifies the <code>Content-Type</code> header value.
+	 * Specifies the <c>Content-Type</c> header value.
 	 *
-	 * @param value The <code>Content-Type</code> header value.
+	 * @param value The <c>Content-Type</c> header value.
 	 * @return This object (for method chaining).
 	 */
 	public MockServletRequest contentType(String value) {
@@ -135,7 +135,7 @@
 	}
 
 	/**
-	 * Convenience method for setting <code>Accept</code> and <code>Content-Type</code> headers to <js>"application/json"</js>.
+	 * Convenience method for setting <c>Accept</c> and <c>Content-Type</c> headers to <js>"application/json"</js>.
 	 *
 	 * @return This object (for method chaining).
 	 */
@@ -144,7 +144,7 @@
 	}
 
 	/**
-	 * Convenience method for setting <code>Accept</code> and <code>Content-Type</code> headers to <js>"application/json+simple"</js>.
+	 * Convenience method for setting <c>Accept</c> and <c>Content-Type</c> headers to <js>"application/json+simple"</js>.
 	 *
 	 * @return This object (for method chaining).
 	 */
@@ -153,7 +153,7 @@
 	}
 
 	/**
-	 * Convenience method for setting <code>Accept</code> and <code>Content-Type</code> headers to <js>"text/xml"</js>.
+	 * Convenience method for setting <c>Accept</c> and <c>Content-Type</c> headers to <js>"text/xml"</js>.
 	 *
 	 * @return This object (for method chaining).
 	 */
@@ -162,7 +162,7 @@
 	}
 
 	/**
-	 * Convenience method for setting <code>Accept</code> and <code>Content-Type</code> headers to <js>"text/html"</js>.
+	 * Convenience method for setting <c>Accept</c> and <c>Content-Type</c> headers to <js>"text/html"</js>.
 	 *
 	 * @return This object (for method chaining).
 	 */
@@ -171,7 +171,7 @@
 	}
 
 	/**
-	 * Convenience method for setting <code>Accept</code> and <code>Content-Type</code> headers to <js>"text/plain"</js>.
+	 * Convenience method for setting <c>Accept</c> and <c>Content-Type</c> headers to <js>"text/plain"</js>.
 	 *
 	 * @return This object (for method chaining).
 	 */
@@ -180,7 +180,7 @@
 	}
 
 	/**
-	 * Convenience method for setting <code>Accept</code> and <code>Content-Type</code> headers to <js>"octal/msgpack"</js>.
+	 * Convenience method for setting <c>Accept</c> and <c>Content-Type</c> headers to <js>"octal/msgpack"</js>.
 	 *
 	 * @return This object (for method chaining).
 	 */
@@ -189,7 +189,7 @@
 	}
 
 	/**
-	 * Convenience method for setting <code>Accept</code> and <code>Content-Type</code> headers to <js>"text/uon"</js>.
+	 * Convenience method for setting <c>Accept</c> and <c>Content-Type</c> headers to <js>"text/uon"</js>.
 	 *
 	 * @return This object (for method chaining).
 	 */
@@ -198,7 +198,7 @@
 	}
 
 	/**
-	 * Convenience method for setting <code>Accept</code> and <code>Content-Type</code> headers to <js>"application/x-www-form-urlencoded"</js>.
+	 * Convenience method for setting <c>Accept</c> and <c>Content-Type</c> headers to <js>"application/x-www-form-urlencoded"</js>.
 	 *
 	 * @return This object (for method chaining).
 	 */
@@ -207,7 +207,7 @@
 	}
 
 	/**
-	 * Convenience method for setting <code>Accept</code> and <code>Content-Type</code> headers to <js>"text/yaml"</js>.
+	 * Convenience method for setting <c>Accept</c> and <c>Content-Type</c> headers to <js>"text/yaml"</js>.
 	 *
 	 * @return This object (for method chaining).
 	 */
@@ -1067,7 +1067,7 @@
 	 * 		<li>{@link InputStream}
 	 * 		<li>{@link CharSequence}
 	 * 	</ul>
-	 * 	Any other types are converted to a string using the <code>toString()</code> method.
+	 * 	Any other types are converted to a string using the <c>toString()</c> method.
 	 * @return This object (for method chaining).
 	 */
 	@Override /* MockHttpRequest */
@@ -1136,7 +1136,7 @@
 	//=================================================================================================================
 
 	/**
-	 * Specifies the <code>Accept</code> header value on the request.
+	 * Specifies the <c>Accept</c> header value on the request.
 	 *
 	 * @param value The new value.
 	 * @return This object (for method chaining).
@@ -1146,7 +1146,7 @@
 	}
 
 	/**
-	 * Specifies the <code>Accept-Charset</code> header value on the request.
+	 * Specifies the <c>Accept-Charset</c> header value on the request.
 	 *
 	 * @param value The new value.
 	 * @return This object (for method chaining).
@@ -1156,7 +1156,7 @@
 	}
 
 	/**
-	 * Specifies the <code>Accept-Encoding</code> header value on the request.
+	 * Specifies the <c>Accept-Encoding</c> header value on the request.
 	 *
 	 * @param value The new value.
 	 * @return This object (for method chaining).
@@ -1166,7 +1166,7 @@
 	}
 
 	/**
-	 * Specifies the <code>Accept-Language</code> header value on the request.
+	 * Specifies the <c>Accept-Language</c> header value on the request.
 	 *
 	 * @param value The new value.
 	 * @return This object (for method chaining).
@@ -1176,7 +1176,7 @@
 	}
 
 	/**
-	 * Specifies the <code>Authorization</code> header value on the request.
+	 * Specifies the <c>Authorization</c> header value on the request.
 	 *
 	 * @param value The new value for the header.
 	 * @return This object (for method chaining).
@@ -1186,7 +1186,7 @@
 	}
 
 	/**
-	 * Specifies the <code>Cache-Control</code> header value on the request.
+	 * Specifies the <c>Cache-Control</c> header value on the request.
 	 *
 	 * @param value The new value for the header.
 	 * @return This object (for method chaining).
@@ -1196,7 +1196,7 @@
 	}
 
 	/**
-	 * Specifies the <code>X-Client-Version</code> header value on the request.
+	 * Specifies the <c>X-Client-Version</c> header value on the request.
 	 *
 	 * @param value The new value.
 	 * @return This object (for method chaining).
@@ -1206,7 +1206,7 @@
 	}
 
 	/**
-	 * Specifies the <code>Connection</code> header value on the request.
+	 * Specifies the <c>Connection</c> header value on the request.
 	 *
 	 * @param value The new value for the header.
 	 * @return This object (for method chaining).
@@ -1216,7 +1216,7 @@
 	}
 
 	/**
-	 * Specifies the <code>Content-Encoding</code> header value on the request.
+	 * Specifies the <c>Content-Encoding</c> header value on the request.
 	 *
 	 * @param value The new value.
 	 * @return This object (for method chaining).
@@ -1226,7 +1226,7 @@
 	}
 
 	/**
-	 * Specifies the <code>Content-Length</code> header value on the request.
+	 * Specifies the <c>Content-Length</c> header value on the request.
 	 *
 	 * @param value The new value for the header.
 	 * @return This object (for method chaining).
@@ -1236,7 +1236,7 @@
 	}
 
 	/**
-	 * Specifies the <code>Content-Type</code> header value on the request.
+	 * Specifies the <c>Content-Type</c> header value on the request.
 	 *
 	 * @param value The new value.
 	 * @return This object (for method chaining).
@@ -1246,7 +1246,7 @@
 	}
 
 	/**
-	 * Specifies the <code>Date</code> header value on the request.
+	 * Specifies the <c>Date</c> header value on the request.
 	 *
 	 * @param value The new value for the header.
 	 * @return This object (for method chaining).
@@ -1256,7 +1256,7 @@
 	}
 
 	/**
-	 * Specifies the <code>Expect</code> header value on the request.
+	 * Specifies the <c>Expect</c> header value on the request.
 	 *
 	 * @param value The new value for the header.
 	 * @return This object (for method chaining).
@@ -1266,7 +1266,7 @@
 	}
 
 	/**
-	 * Specifies the <code>From</code> header value on the request.
+	 * Specifies the <c>From</c> header value on the request.
 	 *
 	 * @param value The new value for the header.
 	 * @return This object (for method chaining).
@@ -1276,7 +1276,7 @@
 	}
 
 	/**
-	 * Specifies the <code>Host</code> header value on the request.
+	 * Specifies the <c>Host</c> header value on the request.
 	 *
 	 * @param value The new value for the header.
 	 * @return This object (for method chaining).
@@ -1286,7 +1286,7 @@
 	}
 
 	/**
-	 * Specifies the <code>If-Match</code> header value on the request.
+	 * Specifies the <c>If-Match</c> header value on the request.
 	 *
 	 * @param value The new value for the header.
 	 * @return This object (for method chaining).
@@ -1296,7 +1296,7 @@
 	}
 
 	/**
-	 * Specifies the <code>If-Modified-Since</code> header value on the request.
+	 * Specifies the <c>If-Modified-Since</c> header value on the request.
 	 *
 	 * @param value The new value for the header.
 	 * @return This object (for method chaining).
@@ -1306,7 +1306,7 @@
 	}
 
 	/**
-	 * Specifies the <code>If-None-Match</code> header value on the request.
+	 * Specifies the <c>If-None-Match</c> header value on the request.
 	 *
 	 * @param value The new value for the header.
 	 * @return This object (for method chaining).
@@ -1316,7 +1316,7 @@
 	}
 
 	/**
-	 * Specifies the <code>If-Range</code> header value on the request.
+	 * Specifies the <c>If-Range</c> header value on the request.
 	 *
 	 * @param value The new value for the header.
 	 * @return This object (for method chaining).
@@ -1326,7 +1326,7 @@
 	}
 
 	/**
-	 * Specifies the <code>If-Unmodified-Since</code> header value on the request.
+	 * Specifies the <c>If-Unmodified-Since</c> header value on the request.
 	 *
 	 * @param value The new value for the header.
 	 * @return This object (for method chaining).
@@ -1336,7 +1336,7 @@
 	}
 
 	/**
-	 * Specifies the <code>Max-Forwards</code> header value on the request.
+	 * Specifies the <c>Max-Forwards</c> header value on the request.
 	 *
 	 * @param value The new value for the header.
 	 * @return This object (for method chaining).
@@ -1346,7 +1346,7 @@
 	}
 
 	/**
-	 * Specifies the <code>Pragma</code> header value on the request.
+	 * Specifies the <c>Pragma</c> header value on the request.
 	 *
 	 * @param value The new value for the header.
 	 * @return This object (for method chaining).
@@ -1356,7 +1356,7 @@
 	}
 
 	/**
-	 * Specifies the <code>Proxy-Authorization</code> header value on the request.
+	 * Specifies the <c>Proxy-Authorization</c> header value on the request.
 	 *
 	 * @param value The new value for the header.
 	 * @return This object (for method chaining).
@@ -1366,7 +1366,7 @@
 	}
 
 	/**
-	 * Specifies the <code>Range</code> header value on the request.
+	 * Specifies the <c>Range</c> header value on the request.
 	 *
 	 * @param value The new value for the header.
 	 * @return This object (for method chaining).
@@ -1376,7 +1376,7 @@
 	}
 
 	/**
-	 * Specifies the <code>Referer</code> header value on the request.
+	 * Specifies the <c>Referer</c> header value on the request.
 	 *
 	 * @param value The new value for the header.
 	 * @return This object (for method chaining).
@@ -1386,7 +1386,7 @@
 	}
 
 	/**
-	 * Specifies the <code>TE</code> header value on the request.
+	 * Specifies the <c>TE</c> header value on the request.
 	 *
 	 * @param value The new value for the header.
 	 * @return This object (for method chaining).
@@ -1396,7 +1396,7 @@
 	}
 
 	/**
-	 * Specifies the <code>Upgrade</code> header value on the request.
+	 * Specifies the <c>Upgrade</c> header value on the request.
 	 *
 	 * @param value The new value for the header.
 	 * @return This object (for method chaining).
@@ -1406,7 +1406,7 @@
 	}
 
 	/**
-	 * Specifies the <code>User-Agent</code> header value on the request.
+	 * Specifies the <c>User-Agent</c> header value on the request.
 	 *
 	 * @param value The new value for the header.
 	 * @return This object (for method chaining).
@@ -1416,7 +1416,7 @@
 	}
 
 	/**
-	 * Specifies the <code>Warning</code> header value on the request.
+	 * Specifies the <c>Warning</c> header value on the request.
 	 *
 	 * @param value The new value for the header.
 	 * @return This object (for method chaining).
diff --git a/juneau-rest/juneau-rest-server-jaxrs/.settings/org.eclipse.wst.html.core.prefs b/juneau-rest/juneau-rest-server-jaxrs/.settings/org.eclipse.wst.html.core.prefs
index f70192e..7de0d38 100644
--- a/juneau-rest/juneau-rest-server-jaxrs/.settings/org.eclipse.wst.html.core.prefs
+++ b/juneau-rest/juneau-rest-server-jaxrs/.settings/org.eclipse.wst.html.core.prefs
@@ -32,7 +32,7 @@
 elemUnclosedStartTag=1
 elemUnknownName=2
 elemUnnecessaryEnd=2
-elementNamesToIgnore=jc,jd,jt,jk,js,jf,jsf,jsm,ja,xt,xa,xc,xs,xv,ua,uk,un,us,mk,mv,cc,cs,ck,cv,l,property
+elementNamesToIgnore=bc,c,cc,ci,ck,cs,cv,dc,del,ja,jc,jd,jf,jk,joc,jok,jov,js,jsf,jsm,jt,l,mk,mv,ua,uk,un,us,xa,xc,xs,xt,xv
 ignoreAttrNames=false
 ignoreElementNames=true
 piInvalidContent=2
diff --git a/juneau-rest/juneau-rest-server/.settings/org.eclipse.wst.html.core.prefs b/juneau-rest/juneau-rest-server/.settings/org.eclipse.wst.html.core.prefs
index f70192e..7de0d38 100644
--- a/juneau-rest/juneau-rest-server/.settings/org.eclipse.wst.html.core.prefs
+++ b/juneau-rest/juneau-rest-server/.settings/org.eclipse.wst.html.core.prefs
@@ -32,7 +32,7 @@
 elemUnclosedStartTag=1
 elemUnknownName=2
 elemUnnecessaryEnd=2
-elementNamesToIgnore=jc,jd,jt,jk,js,jf,jsf,jsm,ja,xt,xa,xc,xs,xv,ua,uk,un,us,mk,mv,cc,cs,ck,cv,l,property
+elementNamesToIgnore=bc,c,cc,ci,ck,cs,cv,dc,del,ja,jc,jd,jf,jk,joc,jok,jov,js,jsf,jsm,jt,l,mk,mv,ua,uk,un,us,xa,xc,xs,xt,xv
 ignoreAttrNames=false
 ignoreElementNames=true
 piInvalidContent=2
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicRestCallHandler.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicRestCallHandler.java
index 3e50937..ca10280 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicRestCallHandler.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicRestCallHandler.java
@@ -378,7 +378,7 @@
 	 * Returns the session objects for the specified request.
 	 *
 	 * <p>
-	 * The default implementation simply returns a single map containing <code>{'req':req}</code>.
+	 * The default implementation simply returns a single map containing <c>{'req':req}</c>.
 	 *
 	 * @param req The REST request.
 	 * @return The session objects for that request.
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicRestLogger.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicRestLogger.java
index 12b7fdb..3a84ba7 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicRestLogger.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicRestLogger.java
@@ -71,7 +71,7 @@
 	 *
 	 * <p>
 	 * Subclasses can provide their own logger.
-	 * The default implementation returns the logger created using <code>Logger.getLogger(getClass())</code>.
+	 * The default implementation returns the logger created using <c>Logger.getLogger(getClass())</c>.
 	 *
 	 * @return The logger used for logging.
 	 */
@@ -147,7 +147,7 @@
 	 * Typically, subclasses will override this method and log errors themselves.
 	 *
 	 * <p>
-	 * The default implementation simply logs errors to the <code>RestServlet</code> logger.
+	 * The default implementation simply logs errors to the <c>RestServlet</c> logger.
 	 *
 	 * <p>
 	 * Here's a typical implementation showing how stack trace hashing can be used to reduce log file sizes...
@@ -201,7 +201,7 @@
 	 *
 	 * <p>
 	 * The default implementation will return <jk>false</jk> if <js>"noTrace=true"</js> is passed in the query string
-	 * or <code>No-Trace: true</code> is specified in the header.
+	 * or <c>No-Trace: true</c> is specified in the header.
 	 *
 	 * @param req The HTTP request.
 	 * @param res The HTTP response.
@@ -222,7 +222,7 @@
 	 *
 	 * <p>
 	 * The default implementation will only log a stack trace if {@link RestException#getOccurrence()} returns
-	 * <code>1</code> and the exception is not one of the following:
+	 * <c>1</c> and the exception is not one of the following:
 	 * <ul>
 	 * 	<li>{@link HttpServletResponse#SC_UNAUTHORIZED}
 	 * 	<li>{@link HttpServletResponse#SC_FORBIDDEN}
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicRestServlet.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicRestServlet.java
index 20d624e..2dbfd0e 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicRestServlet.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicRestServlet.java
@@ -28,7 +28,7 @@
  * Subclass of {@link RestServlet} with default serializers and parsers defined.

  *

  * <p>

- * Supports the following request <code>Accept</code> header values with the resulting response <code>Content-Type</code>:

+ * Supports the following request <c>Accept</c> header values with the resulting response <c>Content-Type</c>:

  * <table class='styled'>

  * 	<tr>

  * 		<th>Accept</th>

@@ -92,7 +92,7 @@
  * 	</tr>

  * </table>

  * <p>

- * Supports the following request <code>Content-Type</code> header values:

+ * Supports the following request <c>Content-Type</c> header values:

  * </p>

  * <table class='styled'>

  * 	<tr>

@@ -150,8 +150,8 @@
  * 	<li>

  * 		Provides a default classpath entry "htdocs" by setting

  * 		{@link RestResource#staticFiles() @RestResource(staticFiles)} to <code>{<js>"htdocs:htdocs"</js>,<js>"styles:styles"</js>}</code>.

- * 		This allows files inside the <code>[servletPackage].htdocs</code> package to be served up under the URL

- * 		<code>/servletPath/htdocs</code>.

+ * 		This allows files inside the <c>[servletPackage].htdocs</c> package to be served up under the URL

+ * 		<c>/servletPath/htdocs</c>.

  * </ul>

  *

  * <h5 class='section'>See Also:</h5>

diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RequestBody.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RequestBody.java
index 878a2b1..1c6a455 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RequestBody.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RequestBody.java
@@ -97,7 +97,7 @@
 	 * Reads the input from the HTTP request parsed into a POJO.
 	 *
 	 * <p>
-	 * The parser used is determined by the matching <code>Content-Type</code> header on the request.
+	 * The parser used is determined by the matching <c>Content-Type</c> header on the request.
 	 *
 	 * <p>
 	 * If type is <jk>null</jk> or <code>Object.<jk>class</jk></code>, then the actual type will be determined
@@ -124,7 +124,7 @@
 	 * 	</tr>
 	 * 	<tr>
 	 * 		<td>number</td>
-	 * 		<td><code>123</code></td>
+	 * 		<td><c>123</c></td>
 	 * 		<td><code><xt>&lt;number&gt;</xt>123<xt>&lt;/number&gt;</xt></code><br><code><xt>&lt;x</xt> <xa>type</xa>=<xs>'number'</xs><xt>&gt;</xt>...<xt>&lt;/x&gt;</xt></code></td>
 	 * 		<td>{@link Number}</td>
 	 * 	</tr>
@@ -204,9 +204,9 @@
 	 * <h5 class='section'>Notes:</h5>
 	 * <ul class='spaced-list'>
 	 * 	<li>
-	 * 		<code>Collections</code> must be followed by zero or one parameter representing the value type.
+	 * 		<c>Collections</c> must be followed by zero or one parameter representing the value type.
 	 * 	<li>
-	 * 		<code>Maps</code> must be followed by zero or two parameters representing the key and value types.
+	 * 		<c>Maps</c> must be followed by zero or two parameters representing the key and value types.
 	 * 	<li>
 	 * 		If {@code allowHeaderParams} init parameter is true, then first looks for {@code &body=xxx} in the URL query string.
 	 * </ul>
@@ -335,10 +335,10 @@
 	}
 
 	/**
-	 * Returns the parser and media type matching the request <code>Content-Type</code> header.
+	 * Returns the parser and media type matching the request <c>Content-Type</c> header.
 	 *
 	 * @return
-	 * 	The parser matching the request <code>Content-Type</code> header, or <jk>null</jk> if no matching parser was
+	 * 	The parser matching the request <c>Content-Type</c> header, or <jk>null</jk> if no matching parser was
 	 * 	found.
 	 * 	Includes the matching media type.
 	 */
@@ -359,10 +359,10 @@
 	}
 
 	/**
-	 * Returns the parser matching the request <code>Content-Type</code> header.
+	 * Returns the parser matching the request <c>Content-Type</c> header.
 	 *
 	 * @return
-	 * 	The parser matching the request <code>Content-Type</code> header, or <jk>null</jk> if no matching parser was
+	 * 	The parser matching the request <c>Content-Type</c> header, or <jk>null</jk> if no matching parser was
 	 * 	found.
 	 */
 	public Parser getParser() {
@@ -371,10 +371,10 @@
 	}
 
 	/**
-	 * Returns the reader parser matching the request <code>Content-Type</code> header.
+	 * Returns the reader parser matching the request <c>Content-Type</c> header.
 	 *
 	 * @return
-	 * 	The reader parser matching the request <code>Content-Type</code> header, or <jk>null</jk> if no matching
+	 * 	The reader parser matching the request <c>Content-Type</c> header, or <jk>null</jk> if no matching
 	 * 	reader parser was found, or the matching parser was an input stream parser.
 	 */
 	public ReaderParser getReaderParser() {
@@ -385,10 +385,10 @@
 	}
 
 	/**
-	 * Returns the input stream parser matching the request <code>Content-Type</code> header.
+	 * Returns the input stream parser matching the request <c>Content-Type</c> header.
 	 *
 	 * @return
-	 * 	The input stream parser matching the request <code>Content-Type</code> header, or <jk>null</jk> if no matching
+	 * 	The input stream parser matching the request <c>Content-Type</c> header, or <jk>null</jk> if no matching
 	 * 	reader parser was found, or the matching parser was a reader parser.
 	 */
 	public InputStreamParser getInputStreamParser() {
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RequestFormData.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RequestFormData.java
index 22e81b7..abce0a1 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RequestFormData.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RequestFormData.java
@@ -99,7 +99,7 @@
 	 * 	The form-data parameter name.
 	 * @param value
 	 * 	The form-data parameter value.
-	 * 	<br>Converted to a String using <code>toString()</code>.
+	 * 	<br>Converted to a String using <c>toString()</c>.
 	 * 	<br>Ignored if value is <jk>null</jk> or blank.
 	 * @return This object (for method chaining).
 	 */
@@ -170,7 +170,7 @@
 	 * Same as {@link #getString(String)} but converts the value to an integer.
 	 *
 	 * @param name The form-data parameter name.
-	 * @return The parameter value, or <code>0</code> if parameter does not exist or is <jk>null</jk> or empty.
+	 * @return The parameter value, or <c>0</c> if parameter does not exist or is <jk>null</jk> or empty.
 	 */
 	public int getInt(String name) {
 		return getInt(name, 0);
@@ -372,9 +372,9 @@
 	 * <h5 class='section'>Notes:</h5>
 	 * <ul class='spaced-list'>
 	 * 	<li>
-	 * 		<code>Collections</code> must be followed by zero or one parameter representing the value type.
+	 * 		<c>Collections</c> must be followed by zero or one parameter representing the value type.
 	 * 	<li>
-	 * 		<code>Maps</code> must be followed by zero or two parameters representing the key and value types.
+	 * 		<c>Maps</c> must be followed by zero or two parameters representing the key and value types.
 	 * </ul>
 	 *
 	 * <h5 class='section'>See Also:</h5>
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RequestHeaders.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RequestHeaders.java
index fe8a3bc..168b1ad 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RequestHeaders.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RequestHeaders.java
@@ -97,7 +97,7 @@
 	 * 	The header name.
 	 * @param value
 	 * 	The header value.
-	 * 	<br>Converted to a String using <code>toString()</code>.
+	 * 	<br>Converted to a String using <c>toString()</c>.
 	 * 	<br>Ignored if value is <jk>null</jk> or blank.
 	 * @return This object (for method chaining).
 	 */
@@ -332,9 +332,9 @@
 	 * <h5 class='section'>Notes:</h5>
 	 * <ul class='spaced-list'>
 	 * 	<li>
-	 * 		<code>Collections</code> must be followed by zero or one parameter representing the value type.
+	 * 		<c>Collections</c> must be followed by zero or one parameter representing the value type.
 	 * 	<li>
-	 * 		<code>Maps</code> must be followed by zero or two parameters representing the key and value types.
+	 * 		<c>Maps</c> must be followed by zero or two parameters representing the key and value types.
 	 * 	<li>
 	 * 		If {@code allowHeaderParams} init parameter is <jk>true</jk>, then first looks for {@code &HeaderName=x} in the URL query string.
 	 * </ul>
@@ -446,7 +446,7 @@
 	}
 
 	/**
-	 * Returns the <code>Accept</code> header on the request.
+	 * Returns the <c>Accept</c> header on the request.
 	 *
 	 * <p>
 	 * Content-Types that are acceptable for the response.
@@ -456,14 +456,14 @@
 	 * 	Accept: text/plain
 	 * </p>
 	 *
-	 * @return The parsed <code>Accept</code> header on the request, or <jk>null</jk> if not found.
+	 * @return The parsed <c>Accept</c> header on the request, or <jk>null</jk> if not found.
 	 */
 	public Accept getAccept() {
 		return Accept.forString(getString("Accept"));
 	}
 
 	/**
-	 * Returns the <code>Accept-Charset</code> header on the request.
+	 * Returns the <c>Accept-Charset</c> header on the request.
 	 *
 	 * <p>
 	 * Character sets that are acceptable.
@@ -473,14 +473,14 @@
 	 * 	Accept-Charset: utf-8
 	 * </p>
 	 *
-	 * @return The parsed <code>Accept-Charset</code> header on the request, or <jk>null</jk> if not found.
+	 * @return The parsed <c>Accept-Charset</c> header on the request, or <jk>null</jk> if not found.
 	 */
 	public AcceptCharset getAcceptCharset() {
 		return AcceptCharset.forString(getString("Accept-Charset"));
 	}
 
 	/**
-	 * Returns the <code>Accept-Encoding</code> header on the request.
+	 * Returns the <c>Accept-Encoding</c> header on the request.
 	 *
 	 * <p>
 	 * List of acceptable encodings.
@@ -490,14 +490,14 @@
 	 * 	Accept-Encoding: gzip, deflate
 	 * </p>
 	 *
-	 * @return The parsed <code>Accept-Encoding</code> header on the request, or <jk>null</jk> if not found.
+	 * @return The parsed <c>Accept-Encoding</c> header on the request, or <jk>null</jk> if not found.
 	 */
 	public AcceptEncoding getAcceptEncoding() {
 		return AcceptEncoding.forString(getString("Accept-Encoding"));
 	}
 
 	/**
-	 * Returns the <code>Accept-Language</code> header on the request.
+	 * Returns the <c>Accept-Language</c> header on the request.
 	 *
 	 * <p>
 	 * List of acceptable human languages for response.
@@ -507,14 +507,14 @@
 	 * 	Accept-Language: en-US
 	 * </p>
 	 *
-	 * @return The parsed <code>Accept-Language</code> header on the request, or <jk>null</jk> if not found.
+	 * @return The parsed <c>Accept-Language</c> header on the request, or <jk>null</jk> if not found.
 	 */
 	public AcceptLanguage getAcceptLanguage() {
 		return AcceptLanguage.forString(getString("Accept-Language"));
 	}
 
 	/**
-	 * Returns the <code>Authorization</code> header on the request.
+	 * Returns the <c>Authorization</c> header on the request.
 	 *
 	 * <p>
 	 * Authentication credentials for HTTP authentication.
@@ -524,14 +524,14 @@
 	 * 	Authorization: Basic QWxhZGRpbjpvcGVuIHNlc2FtZQ==
 	 * </p>
 	 *
-	 * @return The parsed <code>Authorization</code> header on the request, or <jk>null</jk> if not found.
+	 * @return The parsed <c>Authorization</c> header on the request, or <jk>null</jk> if not found.
 	 */
 	public Authorization getAuthorization() {
 		return Authorization.forString(getString("Authorization"));
 	}
 
 	/**
-	 * Returns the <code>Cache-Control</code> header on the request.
+	 * Returns the <c>Cache-Control</c> header on the request.
 	 *
 	 * <p>
 	 * Used to specify directives that must be obeyed by all caching mechanisms along the request-response chain.
@@ -541,14 +541,14 @@
 	 * 	Cache-Control: no-cache
 	 * </p>
 	 *
-	 * @return The parsed <code>Cache-Control</code> header on the request, or <jk>null</jk> if not found.
+	 * @return The parsed <c>Cache-Control</c> header on the request, or <jk>null</jk> if not found.
 	 */
 	public CacheControl getCacheControl() {
 		return CacheControl.forString(getString("Cache-Control"));
 	}
 
 	/**
-	 * Returns the <code>Connection</code> header on the request.
+	 * Returns the <c>Connection</c> header on the request.
 	 *
 	 * <p>
 	 * Control options for the current connection and list of hop-by-hop request fields.
@@ -566,7 +566,7 @@
 	}
 
 	/**
-	 * Returns the <code>Content-Length</code> header on the request.
+	 * Returns the <c>Content-Length</c> header on the request.
 	 *
 	 * <p>
 	 * The length of the request body in octets (8-bit bytes).
@@ -576,14 +576,14 @@
 	 * 	Content-Length: 348
 	 * </p>
 	 *
-	 * @return The parsed <code>Content-Length</code> header on the request, or <jk>null</jk> if not found.
+	 * @return The parsed <c>Content-Length</c> header on the request, or <jk>null</jk> if not found.
 	 */
 	public ContentLength getContentLength() {
 		return ContentLength.forString(getString("Content-Length"));
 	}
 
 	/**
-	 * Returns the <code>Content-Type</code> header on the request.
+	 * Returns the <c>Content-Type</c> header on the request.
 	 *
 	 * <p>
 	 * The MIME type of the body of the request (used with POST and PUT requests).
@@ -593,14 +593,14 @@
 	 * 	Content-Type: application/x-www-form-urlencoded
 	 * </p>
 	 *
-	 * @return The parsed <code>Content-Type</code> header on the request, or <jk>null</jk> if not found.
+	 * @return The parsed <c>Content-Type</c> header on the request, or <jk>null</jk> if not found.
 	 */
 	public ContentType getContentType() {
 		return ContentType.forString(getString("Content-Type"));
 	}
 
 	/**
-	 * Returns the <code>Date</code> header on the request.
+	 * Returns the <c>Date</c> header on the request.
 	 *
 	 * <p>
 	 * The date and time that the message was originated (in "HTTP-date" format as defined by RFC 7231 Date/Time Formats).
@@ -610,14 +610,14 @@
 	 * 	Date: Tue, 15 Nov 1994 08:12:31 GMT
 	 * </p>
 	 *
-	 * @return The parsed <code>Date</code> header on the request, or <jk>null</jk> if not found.
+	 * @return The parsed <c>Date</c> header on the request, or <jk>null</jk> if not found.
 	 */
 	public Date getDate() {
 		return Date.forString(getString("Date"));
 	}
 
 	/**
-	 * Returns the <code>Expect</code> header on the request.
+	 * Returns the <c>Expect</c> header on the request.
 	 *
 	 * <p>
 	 * Indicates that particular server behaviors are required by the client.
@@ -627,14 +627,14 @@
 	 * 	Expect: 100-continue
 	 * </p>
 	 *
-	 * @return The parsed <code>Expect</code> header on the request, or <jk>null</jk> if not found.
+	 * @return The parsed <c>Expect</c> header on the request, or <jk>null</jk> if not found.
 	 */
 	public Expect getExpect() {
 		return Expect.forString(getString("Expect"));
 	}
 
 	/**
-	 * Returns the <code>From</code> header on the request.
+	 * Returns the <c>From</c> header on the request.
 	 *
 	 * <p>
 	 * The email address of the user making the request.
@@ -644,14 +644,14 @@
 	 * 	From: user@example.com
 	 * </p>
 	 *
-	 * @return The parsed <code>From</code> header on the request, or <jk>null</jk> if not found.
+	 * @return The parsed <c>From</c> header on the request, or <jk>null</jk> if not found.
 	 */
 	public From getFrom() {
 		return From.forString(getString("From"));
 	}
 
 	/**
-	 * Returns the <code>Host</code> header on the request.
+	 * Returns the <c>Host</c> header on the request.
 	 *
 	 * <p>
 	 * The domain name of the server (for virtual hosting), and the TCP port number on which the server is listening.
@@ -663,14 +663,14 @@
 	 * 	Host: en.wikipedia.org
 	 * </p>
 	 *
-	 * @return The parsed <code>Host</code> header on the request, or <jk>null</jk> if not found.
+	 * @return The parsed <c>Host</c> header on the request, or <jk>null</jk> if not found.
 	 */
 	public Host getHost() {
 		return Host.forString(getString("Host"));
 	}
 
 	/**
-	 * Returns the <code>If-Match</code> header on the request.
+	 * Returns the <c>If-Match</c> header on the request.
 	 *
 	 * <p>
 	 * Only perform the action if the client supplied entity matches the same entity on the server.
@@ -682,14 +682,14 @@
 	 * 	If-Match: "737060cd8c284d8af7ad3082f209582d"
 	 * </p>
 	 *
-	 * @return The parsed <code>If-Match</code> header on the request, or <jk>null</jk> if not found.
+	 * @return The parsed <c>If-Match</c> header on the request, or <jk>null</jk> if not found.
 	 */
 	public IfMatch getIfMatch() {
 		return IfMatch.forString(getString("If-Match"));
 	}
 
 	/**
-	 * Returns the <code>If-Modified-Since</code> header on the request.
+	 * Returns the <c>If-Modified-Since</c> header on the request.
 	 *
 	 * <p>
 	 * Allows a 304 Not Modified to be returned if content is unchanged.
@@ -699,14 +699,14 @@
 	 * 	If-Modified-Since: Sat, 29 Oct 1994 19:43:31 GMT
 	 * </p>
 	 *
-	 * @return The parsed <code>If-Modified-Since</code> header on the request, or <jk>null</jk> if not found.
+	 * @return The parsed <c>If-Modified-Since</c> header on the request, or <jk>null</jk> if not found.
 	 */
 	public IfModifiedSince getIfModifiedSince() {
 		return IfModifiedSince.forString(getString("If-Modified-Since"));
 	}
 
 	/**
-	 * Returns the <code>If-None-Match</code> header on the request.
+	 * Returns the <c>If-None-Match</c> header on the request.
 	 *
 	 * <p>
 	 * Allows a 304 Not Modified to be returned if content is unchanged, see HTTP ETag.
@@ -716,14 +716,14 @@
 	 * 	If-None-Match: "737060cd8c284d8af7ad3082f209582d"
 	 * </p>
 	 *
-	 * @return The parsed <code>If-None-Match</code> header on the request, or <jk>null</jk> if not found.
+	 * @return The parsed <c>If-None-Match</c> header on the request, or <jk>null</jk> if not found.
 	 */
 	public IfNoneMatch getIfNoneMatch() {
 		return IfNoneMatch.forString(getString("If-None-Match"));
 	}
 
 	/**
-	 * Returns the <code>If-Range</code> header on the request.
+	 * Returns the <c>If-Range</c> header on the request.
 	 *
 	 * <p>
 	 * If the entity is unchanged, send me the part(s) that I am missing; otherwise, send me the entire new entity.
@@ -733,14 +733,14 @@
 	 * 	If-Range: "737060cd8c284d8af7ad3082f209582d"
 	 * </p>
 	 *
-	 * @return The parsed <code>If-Range</code> header on the request, or <jk>null</jk> if not found.
+	 * @return The parsed <c>If-Range</c> header on the request, or <jk>null</jk> if not found.
 	 */
 	public IfRange getIfRange() {
 		return IfRange.forString(getString("If-Range"));
 	}
 
 	/**
-	 * Returns the <code>If-Unmodified-Since</code> header on the request.
+	 * Returns the <c>If-Unmodified-Since</c> header on the request.
 	 *
 	 * <p>
 	 * Only send the response if the entity has not been modified since a specific time.
@@ -750,14 +750,14 @@
 	 * 	If-Unmodified-Since: Sat, 29 Oct 1994 19:43:31 GMT
 	 * </p>
 	 *
-	 * @return The parsed <code>If-Unmodified-Since</code> header on the request, or <jk>null</jk> if not found.
+	 * @return The parsed <c>If-Unmodified-Since</c> header on the request, or <jk>null</jk> if not found.
 	 */
 	public IfUnmodifiedSince getIfUnmodifiedSince() {
 		return IfUnmodifiedSince.forString(getString("If-Unmodified-Since"));
 	}
 
 	/**
-	 * Returns the <code>Max-Forwards</code> header on the request.
+	 * Returns the <c>Max-Forwards</c> header on the request.
 	 *
 	 * <p>
 	 * Limit the number of times the message can be forwarded through proxies or gateways.
@@ -767,14 +767,14 @@
 	 * 	Max-Forwards: 10
 	 * </p>
 	 *
-	 * @return The parsed <code>Max-Forwards</code> header on the request, or <jk>null</jk> if not found.
+	 * @return The parsed <c>Max-Forwards</c> header on the request, or <jk>null</jk> if not found.
 	 */
 	public MaxForwards getMaxForwards() {
 		return MaxForwards.forString(getString("Max-Forwards"));
 	}
 
 	/**
-	 * Returns the <code>Pragma</code> header on the request.
+	 * Returns the <c>Pragma</c> header on the request.
 	 *
 	 * <p>
 	 * Implementation-specific fields that may have various effects anywhere along the request-response chain.
@@ -784,14 +784,14 @@
 	 * 	Pragma: no-cache
 	 * </p>
 	 *
-	 * @return The parsed <code>Pragma</code> header on the request, or <jk>null</jk> if not found.
+	 * @return The parsed <c>Pragma</c> header on the request, or <jk>null</jk> if not found.
 	 */
 	public Pragma getPragma() {
 		return Pragma.forString(getString("Pragma"));
 	}
 
 	/**
-	 * Returns the <code>Proxy-Authorization</code> header on the request.
+	 * Returns the <c>Proxy-Authorization</c> header on the request.
 	 *
 	 * <p>
 	 * Authorization credentials for connecting to a proxy.
@@ -801,14 +801,14 @@
 	 * 	Proxy-Authorization: Basic QWxhZGRpbjpvcGVuIHNlc2FtZQ==
 	 * </p>
 	 *
-	 * @return The parsed <code>Proxy-Authorization</code> header on the request, or <jk>null</jk> if not found.
+	 * @return The parsed <c>Proxy-Authorization</c> header on the request, or <jk>null</jk> if not found.
 	 */
 	public ProxyAuthorization getProxyAuthorization() {
 		return ProxyAuthorization.forString(getString("Proxy-Authorization"));
 	}
 
 	/**
-	 * Returns the <code>Range</code> header on the request.
+	 * Returns the <c>Range</c> header on the request.
 	 *
 	 * <p>
 	 * Request only part of an entity. Bytes are numbered from 0.
@@ -818,14 +818,14 @@
 	 * 	Range: bytes=500-999
 	 * </p>
 	 *
-	 * @return The parsed <code>Range</code> header on the request, or <jk>null</jk> if not found.
+	 * @return The parsed <c>Range</c> header on the request, or <jk>null</jk> if not found.
 	 */
 	public Range getRange() {
 		return Range.forString(getString("Range"));
 	}
 
 	/**
-	 * Returns the <code>Referer</code> header on the request.
+	 * Returns the <c>Referer</c> header on the request.
 	 *
 	 * <p>
 	 * This is the address of the previous web page from which a link to the currently requested page was followed.
@@ -835,14 +835,14 @@
 	 * 	Referer: http://en.wikipedia.org/wiki/Main_Page
 	 * </p>
 	 *
-	 * @return The parsed <code>Referer</code> header on the request, or <jk>null</jk> if not found.
+	 * @return The parsed <c>Referer</c> header on the request, or <jk>null</jk> if not found.
 	 */
 	public Referer getReferer() {
 		return Referer.forString(getString("Referer"));
 	}
 
 	/**
-	 * Returns the <code>TE</code> header on the request.
+	 * Returns the <c>TE</c> header on the request.
 	 *
 	 * <p>
 	 * The transfer encodings the user agent is willing to accept: the same values as for the response header field
@@ -854,19 +854,19 @@
 	 * 	TE: trailers, deflate
 	 * </p>
 	 *
-	 * @return The parsed <code>TE</code> header on the request, or <jk>null</jk> if not found.
+	 * @return The parsed <c>TE</c> header on the request, or <jk>null</jk> if not found.
 	 */
 	public TE getTE() {
 		return TE.forString(getString("TE"));
 	}
 
 	/**
-	 * Returns the <code>Time-Zone</code> header value on the request if there is one.
+	 * Returns the <c>Time-Zone</c> header value on the request if there is one.
 	 *
 	 * <p>
 	 * Example: <js>"GMT"</js>.
 	 *
-	 * @return The <code>Time-Zone</code> header value on the request, or <jk>null</jk> if not present.
+	 * @return The <c>Time-Zone</c> header value on the request, or <jk>null</jk> if not present.
 	 */
 	public TimeZone getTimeZone() {
 		String tz = getString("Time-Zone");
@@ -876,7 +876,7 @@
 	}
 
 	/**
-	 * Returns the <code>User-Agent</code> header on the request.
+	 * Returns the <c>User-Agent</c> header on the request.
 	 *
 	 * <p>
 	 * The user agent string of the user agent.
@@ -886,14 +886,14 @@
 	 * 	User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:12.0) Gecko/20100101 Firefox/21.0
 	 * </p>
 	 *
-	 * @return The parsed <code>User-Agent</code> header on the request, or <jk>null</jk> if not found.
+	 * @return The parsed <c>User-Agent</c> header on the request, or <jk>null</jk> if not found.
 	 */
 	public UserAgent getUserAgent() {
 		return UserAgent.forString(getString("User-Agent"));
 	}
 
 	/**
-	 * Returns the <code>Upgrade</code> header on the request.
+	 * Returns the <c>Upgrade</c> header on the request.
 	 *
 	 * <p>
 	 * Ask the server to upgrade to another protocol.
@@ -903,14 +903,14 @@
 	 * 	Upgrade: HTTP/2.0, HTTPS/1.3, IRC/6.9, RTA/x11, websocket
 	 * </p>
 	 *
-	 * @return The parsed <code>Upgrade</code> header on the request, or <jk>null</jk> if not found.
+	 * @return The parsed <c>Upgrade</c> header on the request, or <jk>null</jk> if not found.
 	 */
 	public Upgrade getUpgrade() {
 		return Upgrade.forString(getString("Upgrade"));
 	}
 
 	/**
-	 * Returns the <code>Via</code> header on the request.
+	 * Returns the <c>Via</c> header on the request.
 	 *
 	 * <p>
 	 * Informs the server of proxies through which the request was sent.
@@ -920,14 +920,14 @@
 	 * 	Via: 1.0 fred, 1.1 example.com (Apache/1.1)
 	 * </p>
 	 *
-	 * @return The parsed <code>Via</code> header on the request, or <jk>null</jk> if not found.
+	 * @return The parsed <c>Via</c> header on the request, or <jk>null</jk> if not found.
 	 */
 	public Via getVia() {
 		return Via.forString(getString("Via"));
 	}
 
 	/**
-	 * Returns the <code>Warning</code> header on the request.
+	 * Returns the <c>Warning</c> header on the request.
 	 *
 	 * <p>
 	 * A general warning about possible problems with the entity body.
@@ -937,7 +937,7 @@
 	 * 	Warning: 199 Miscellaneous warning
 	 * </p>
 	 *
-	 * @return The parsed <code>Warning</code> header on the request, or <jk>null</jk> if not found.
+	 * @return The parsed <c>Warning</c> header on the request, or <jk>null</jk> if not found.
 	 */
 	public Warning getWarning() {
 		return Warning.forString(getString("Warning"));
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RequestPath.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RequestPath.java
index e3b5f0b..aaeb995 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RequestPath.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RequestPath.java
@@ -180,7 +180,7 @@
 	 * Similar to {@link #get(String,Class)} but allows for complex collections of POJOs to be created.
 	 *
 	 * <p>
-	 * Use this method if you want to parse into a parameterized <code>Map</code>/<code>Collection</code> object.
+	 * Use this method if you want to parse into a parameterized <c>Map</c>/<c>Collection</c> object.
 	 *
 	 * <h5 class='section'>Examples:</h5>
 	 * <p class='bcode w800'>
@@ -200,9 +200,9 @@
 	 * <h5 class='section'>Notes:</h5>
 	 * <ul class='spaced-list'>
 	 * 	<li>
-	 * 		<code>Collections</code> must be followed by zero or one parameter representing the value type.
+	 * 		<c>Collections</c> must be followed by zero or one parameter representing the value type.
 	 * 	<li>
-	 * 		<code>Maps</code> must be followed by zero or two parameters representing the key and value types.
+	 * 		<c>Maps</c> must be followed by zero or two parameters representing the key and value types.
 	 * </ul>
 	 *
 	 * <h5 class='section'>See Also:</h5>
@@ -297,31 +297,31 @@
 	 * 		<th>Path Remainder</th>
 	 * 	</tr>
 	 * 	<tr>
-	 * 		<td><code>/foo</code></td>
+	 * 		<td><c>/foo</c></td>
 	 * 		<td><jk>null</jk></td>
 	 * 	</tr>
 	 * 	<tr>
-	 * 		<td><code>/foo/</code></td>
+	 * 		<td><c>/foo/</c></td>
 	 * 		<td><js>""</js></td>
 	 * 	</tr>
 	 * 	<tr>
-	 * 		<td><code>/foo//</code></td>
+	 * 		<td><c>/foo//</c></td>
 	 * 		<td><js>"/"</js></td>
 	 * 	</tr>
 	 * 	<tr>
-	 * 		<td><code>/foo///</code></td>
+	 * 		<td><c>/foo///</c></td>
 	 * 		<td><js>"//"</js></td>
 	 * 	</tr>
 	 * 	<tr>
-	 * 		<td><code>/foo/a/b</code></td>
+	 * 		<td><c>/foo/a/b</c></td>
 	 * 		<td><js>"a/b"</js></td>
 	 * 	</tr>
 	 * 	<tr>
-	 * 		<td><code>/foo//a/b/</code></td>
+	 * 		<td><c>/foo//a/b/</c></td>
 	 * 		<td><js>"/a/b/"</js></td>
 	 * 	</tr>
 	 * 	<tr>
-	 * 		<td><code>/foo/a%2Fb</code></td>
+	 * 		<td><c>/foo/a%2Fb</c></td>
 	 * 		<td><js>"a/b"</js></td>
 	 * 	</tr>
 	 * </table>
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RequestQuery.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RequestQuery.java
index 6170bed..235f414 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RequestQuery.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RequestQuery.java
@@ -101,7 +101,7 @@
 	 * 	The query parameter name.
 	 * @param value
 	 * 	The query parameter value.
-	 * 	<br>Converted to a String using <code>toString()</code>.
+	 * 	<br>Converted to a String using <c>toString()</c>.
 	 * 	<br>Ignored if value is <jk>null</jk> or blank.
 	 * @return This object (for method chaining).
 	 */
@@ -201,7 +201,7 @@
 	 *
 	 * @param name The URL parameter name.
 	 * @return
-	 * 	The parameter value, or <code>0</code> if parameter not specified or has no value (e.g. <js>"&amp;foo"</js>).
+	 * 	The parameter value, or <c>0</c> if parameter not specified or has no value (e.g. <js>"&amp;foo"</js>).
 	 */
 	public int getInt(String name) {
 		return getInt(name, 0);
@@ -365,9 +365,9 @@
 	 * <h5 class='section'>Notes:</h5>
 	 * <ul class='spaced-list'>
 	 * 	<li>
-	 * 		<code>Collections</code> must be followed by zero or one parameter representing the value type.
+	 * 		<c>Collections</c> must be followed by zero or one parameter representing the value type.
 	 * 	<li>
-	 * 		<code>Maps</code> must be followed by zero or two parameters representing the key and value types.
+	 * 		<c>Maps</c> must be followed by zero or two parameters representing the key and value types.
 	 * </ul>
 	 *
 	 * <h5 class='section'>See Also:</h5>
@@ -574,7 +574,7 @@
 	 * 		<br>Example: <js>"&amp;p=100"</js>
 	 * 	<li>
 	 * 		<js>"&amp;l="</js> - The number of rows to return.
-	 * 		<br><code>0</code> implies return all rows.
+	 * 		<br><c>0</c> implies return all rows.
 	 * 		<br>Example: <js>"&amp;l=100"</js>
 	 * 	<li>
 	 * 		<js>"&amp;i="</js> - The case-insensitive search flag.
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/ResponseHandler.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/ResponseHandler.java
index 610513b..bdb89c4 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/ResponseHandler.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/ResponseHandler.java
@@ -52,7 +52,7 @@
  * because it's simply easier to define response handlers for special cases.

  *

  * <p>

- * The following example shows how to create a response handler to handle special <code>Foo</code> objects outside the

+ * The following example shows how to create a response handler to handle special <c>Foo</c> objects outside the

  * normal Juneau architecture.

  * <p class='bcode w800'>

  * 	<ja>@RestResource</ja>(

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 e9ece25..7af357f 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
@@ -99,7 +99,7 @@
 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"RestContext.allowBodyParam.b"</js>

-	 * 	<li><b>Data type:</b>  <code>Boolean</code>

+	 * 	<li><b>Data type:</b>  <c>Boolean</c>

 	 * 	<li><b>Default:</b>  <jk>true</jk>

 	 * 	<li><b>Session property:</b>  <jk>false</jk>

 	 * 	<li><b>Annotations:</b>

@@ -162,7 +162,7 @@
 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"RestContext.allowedHeaderParams.s"</js>

-	 * 	<li><b>Data type:</b>  <code>String</code> (comma-delimited list)

+	 * 	<li><b>Data type:</b>  <c>String</c> (comma-delimited list)

 	 * 	<li><b>Default:</b>  <js>"Accept,Content-Type"</js>

 	 * 	<li><b>Session property:</b>  <jk>false</jk>

 	 * 	<li><b>Annotations:</b>

@@ -230,7 +230,7 @@
 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"RestContext.allowedMethodHeaders.s"</js>

-	 * 	<li><b>Data type:</b>  <code>String</code> (comma-delimited list)

+	 * 	<li><b>Data type:</b>  <c>String</c> (comma-delimited list)

 	 * 	<li><b>Default:</b>  empty string

 	 * 	<li><b>Session property:</b>  <jk>false</jk>

 	 * 	<li><b>Annotations:</b>

@@ -245,13 +245,13 @@
 	 *

 	 * <h5 class='section'>Description:</h5>

 	 * <p>

-	 * A comma-delimited list of HTTP method names that are allowed to be passed as values in an <code>X-Method</code> HTTP header

+	 * A comma-delimited list of HTTP method names that are allowed to be passed as values in an <c>X-Method</c> HTTP header

 	 * to override the real HTTP method name.

 	 * <p>

 	 * Allows you to override the actual HTTP method with a simulated method.

-	 * <br>For example, if an HTTP Client API doesn't support <code>PATCH</code> but does support <code>POST</code> (because

-	 * <code>PATCH</code> is not part of the original HTTP spec), you can add a <code>X-Method: PATCH</code> header on a normal

-	 * <code>HTTP POST /foo</code> request call which will make the HTTP call look like a <code>PATCH</code> request in any of the REST APIs.

+	 * <br>For example, if an HTTP Client API doesn't support <c>PATCH</c> but does support <c>POST</c> (because

+	 * <c>PATCH</c> is not part of the original HTTP spec), you can add a <c>X-Method: PATCH</c> header on a normal

+	 * <c>HTTP POST /foo</c> request call which will make the HTTP call look like a <c>PATCH</c> request in any of the REST APIs.

 	 *

 	 * <h5 class='section'>Example:</h5>

 	 * <p class='bcode w800'>

@@ -295,7 +295,7 @@
 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"RestContext.allowedMethodParams.s"</js>

-	 * 	<li><b>Data type:</b>  <code>String</code> (comma-delimited list)

+	 * 	<li><b>Data type:</b>  <c>String</c> (comma-delimited list)

 	 * 	<li><b>Default:</b>  <js>"HEAD,OPTIONS"</js>

 	 * 	<li><b>Session property:</b>  <jk>false</jk>

 	 * 	<li><b>Annotations:</b>

@@ -319,12 +319,12 @@
 	 * </p>

 	 * <p>

 	 * 	Useful in cases where you want to simulate a non-GET request in a browser by simply adding a parameter.

-	 * 	<br>Also useful if you want to construct hyperlinks to non-GET REST endpoints such as links to <code>OPTIONS</code>

+	 * 	<br>Also useful if you want to construct hyperlinks to non-GET REST endpoints such as links to <c>OPTIONS</c>

 	 * pages.

 	 *

 	 * <p>

 	 * Note that per the {@doc RFC2616.section9 HTTP specification}, special care should

-	 * be taken when allowing non-safe (<code>POST</code>, <code>PUT</code>, <code>DELETE</code>) methods to be invoked through GET requests.

+	 * be taken when allowing non-safe (<c>POST</c>, <c>PUT</c>, <c>DELETE</c>) methods to be invoked through GET requests.

 	 *

 	 *

 	 * <h5 class='section'>Example:</h5>

@@ -371,7 +371,7 @@
 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"RestContext.allowHeaderParams.b"</js>

-	 * 	<li><b>Data type:</b>  <code>Boolean</code>

+	 * 	<li><b>Data type:</b>  <c>Boolean</c>

 	 * 	<li><b>Default:</b>  <jk>true</jk>

 	 * 	<li><b>Session property:</b>  <jk>false</jk>

 	 * 	<li><b>Annotations:</b>

@@ -526,7 +526,7 @@
 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"RestContext.children.lo"</js>

-	 * 	<li><b>Data type:</b>  <code>List&lt;Class | Object | {@link RestChild}&gt;</code>

+	 * 	<li><b>Data type:</b>  <c>List&lt;Class | Object | {@link RestChild}&gt;</c>

 	 * 	<li><b>Default:</b>  empty list

 	 * 	<li><b>Session property:</b>  <jk>false</jk>

 	 * 	<li><b>Annotations:</b>

@@ -549,8 +549,8 @@
 	 * A REST child resource is simply another servlet or object that is initialized as part of the ascendant resource and has a

 	 * servlet path directly under the ascendant resource object path.

 	 * <br>The main advantage to defining servlets as REST children is that you do not need to define them in the

-	 * <code>web.xml</code> file of the web application.

-	 * <br>This can cut down on the number of entries that show up in the <code>web.xml</code> file if you are defining

+	 * <c>web.xml</c> file of the web application.

+	 * <br>This can cut down on the number of entries that show up in the <c>web.xml</c> file if you are defining

 	 * large numbers of servlets.

 	 *

 	 * <p>

@@ -573,13 +573,13 @@
 	 * 	<dt>Runtime behavior:</dt>

 	 * 	<dd>

 	 * 		<p>

-	 * 			As a rule, methods defined on the <code>HttpServletRequest</code> object will behave as if the child

+	 * 			As a rule, methods defined on the <c>HttpServletRequest</c> object will behave as if the child

 	 * 			servlet were deployed as a top-level resource under the child's servlet path.

-	 * 			<br>For example, the <code>getServletPath()</code> and <code>getPathInfo()</code> methods on the

-	 * 			<code>HttpServletRequest</code> object will behave as if the child resource were deployed using the

+	 * 			<br>For example, the <c>getServletPath()</c> and <c>getPathInfo()</c> methods on the

+	 * 			<c>HttpServletRequest</c> object will behave as if the child resource were deployed using the

 	 * 			child's servlet path.

 	 * 			<br>Therefore, the runtime behavior should be equivalent to deploying the child servlet in the

-	 * 			<code>web.xml</code> file of the web application.

+	 * 			<c>web.xml</c> file of the web application.

 	 * 		</p>

 	 * 	</dd>

 	 * </dl>

@@ -741,7 +741,7 @@
 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"RestContext.clientVersionHeader.s"</js>

-	 * 	<li><b>Data type:</b>  <code>String</code>

+	 * 	<li><b>Data type:</b>  <c>String</c>

 	 * 	<li><b>Default:</b>  <js>"X-Client-Version"</js>

 	 * 	<li><b>Session property:</b>  <jk>false</jk>

 	 * 	<li><b>Annotations:</b>

@@ -912,7 +912,7 @@
 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"RestContext.debug.b"</js>

-	 * 	<li><b>Data type:</b>  <code>Boolean</code>

+	 * 	<li><b>Data type:</b>  <c>Boolean</c>

 	 * 	<li><b>Default:</b>  <jk>false</jk>

 	 * 	<li><b>Session property:</b>  <jk>false</jk>

 	 * 	<li><b>Annotations:</b>

@@ -940,7 +940,7 @@
 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"RestContext.defaultCharset.s"</js>

-	 * 	<li><b>Data type:</b>  <code>String</code>

+	 * 	<li><b>Data type:</b>  <c>String</c>

 	 * 	<li><b>Default:</b>  <js>"utf-8"</js>

 	 * 	<li><b>Session property:</b>  <jk>false</jk>

 	 * 	<li><b>Annotations:</b>

@@ -995,7 +995,7 @@
 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"RestContext.attrs.smo"</js>

-	 * 	<li><b>Data type:</b>  <code>Map&lt;String,Object&gt;</code>

+	 * 	<li><b>Data type:</b>  <c>Map&lt;String,Object&gt;</c>

 	 * 	<li><b>Default:</b>  empty map

 	 * 	<li><b>Session property:</b>  <jk>false</jk>

 	 * 	<li><b>Annotations:</b>

@@ -1064,7 +1064,7 @@
 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"RestContext.defaultRequestHeaders.smo"</js>

-	 * 	<li><b>Data type:</b>  <code>Map&lt;String,String&gt;</code>

+	 * 	<li><b>Data type:</b>  <c>Map&lt;String,String&gt;</c>

 	 * 	<li><b>Default:</b>  empty map

 	 * 	<li><b>Session property:</b>  <jk>false</jk>

 	 * 	<li><b>Annotations:</b>

@@ -1090,7 +1090,7 @@
 	 * 	<li>

 	 * 		Affects values returned by {@link RestRequest#getHeader(String)} when the header is not present on the request.

 	 * 	<li>

-	 * 		The most useful reason for this annotation is to provide a default <code>Accept</code> header when one is not

+	 * 		The most useful reason for this annotation is to provide a default <c>Accept</c> header when one is not

 	 * 		specified so that a particular default {@link Serializer} is picked.

 	 * </ul>

 	 *

@@ -1132,7 +1132,7 @@
 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"RestContext.defaultResponseHeaders.omo"</js>

-	 * 	<li><b>Data type:</b>  <code>Map&lt;String,String&gt;</code>

+	 * 	<li><b>Data type:</b>  <c>Map&lt;String,String&gt;</c>

 	 * 	<li><b>Default:</b>  empty map

 	 * 	<li><b>Session property:</b>  <jk>false</jk>

 	 * 	<li><b>Annotations:</b>

@@ -1521,7 +1521,7 @@
 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"RestContext.maxInput.s"</js>

-	 * 	<li><b>Data type:</b>  <code>String</code>

+	 * 	<li><b>Data type:</b>  <c>String</c>

 	 * 	<li><b>Default:</b>  <js>"100M"</js>

 	 * 	<li><b>Session property:</b>  <jk>false</jk>

 	 * 	<li><b>Annotations:</b>

@@ -1587,7 +1587,7 @@
 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"RestContext.messages.lo"</js>

-	 * 	<li><b>Data type:</b>  <code>List&lt;{@link MessageBundleLocation}&gt;</code>

+	 * 	<li><b>Data type:</b>  <c>List&lt;{@link MessageBundleLocation}&gt;</c>

 	 * 	<li><b>Default:</b>  <jk>null</jk>

 	 * 	<li><b>Session property:</b>  <jk>false</jk>

 	 * 	<li><b>Annotations:</b>

@@ -1674,7 +1674,7 @@
 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"RestContext.mimeTypes.ss"</js>

-	 * 	<li><b>Data type:</b>  <code>Set&lt;String&gt;</code>

+	 * 	<li><b>Data type:</b>  <c>Set&lt;String&gt;</c>

 	 * 	<li><b>Default:</b>  empty list

 	 * 	<li><b>Session property:</b>  <jk>false</jk>

 	 * 	<li><b>Annotations:</b>

@@ -1759,11 +1759,11 @@
 	 * <h5 class='section'>Description:</h5>

 	 * <p>

 	 * By default, the Juneau framework will automatically Java method parameters of various types (e.g.

-	 * <code>RestRequest</code>, <code>Accept</code>, <code>Reader</code>).

+	 * <c>RestRequest</c>, <c>Accept</c>, <c>Reader</c>).

 	 * This setting allows you to provide your own resolvers for your own class types that you want resolved.

 	 *

 	 * <p>

-	 * For example, if you want to pass in instances of <code>MySpecialObject</code> to your Java method, define

+	 * For example, if you want to pass in instances of <c>MySpecialObject</c> to your Java method, define

 	 * the following resolver:

 	 * <p class='bcode w800'>

 	 * 	<jc>// Define a parameter resolver for resolving MySpecialObject objects.</jc>

@@ -1855,7 +1855,7 @@
 	 * <p>

 	 * Parsers are used to convert the body of HTTP requests into POJOs.

 	 * <br>Any of the Juneau framework parsers can be used in this setting.

-	 * <br>The parser selected is based on the request <code>Content-Type</code> header matched against the values returned by the following method

+	 * <br>The parser selected is based on the request <c>Content-Type</c> header matched against the values returned by the following method

 	 * using a best-match algorithm:

 	 * <ul>

 	 * 	<li class='jm'>{@link Parser#getMediaTypes()}

@@ -2068,7 +2068,7 @@
 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"RestContext.path.s"</js>

-	 * 	<li><b>Data type:</b>  <code>String</code>

+	 * 	<li><b>Data type:</b>  <c>String</c>

 	 * 	<li><b>Default:</b>  <jk>null</jk>

 	 * 	<li><b>Session property:</b>  <jk>false</jk>

 	 * 	<li><b>Annotations:</b>

@@ -2116,7 +2116,7 @@
 	 * <h5 class='section'>Notes:</h5>

 	 * <ul class='spaced-list'>

 	 * 	<li>

-	 * 		This annotation is ignored on top-level servlets (i.e. servlets defined in <code>web.xml</code> files).

+	 * 		This annotation is ignored on top-level servlets (i.e. servlets defined in <c>web.xml</c> files).

 	 * 		<br>Therefore, implementers can optionally specify a path value for documentation purposes.

 	 * 	<li>

 	 * 		Typically, this setting is only applicable to resources defined as children through the

@@ -2140,7 +2140,7 @@
 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"RestContext.renderResponseStackTraces.b"</js>

-	 * 	<li><b>Data type:</b>  <code>Boolean</code>

+	 * 	<li><b>Data type:</b>  <c>Boolean</c>

 	 * 	<li><b>Default:</b>  <jk>false</jk>

 	 * 	<li><b>Session property:</b>  <jk>false</jk>

 	 * 	<li><b>Annotations:</b>

@@ -2385,7 +2385,7 @@
 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"RestContext.rolesDeclared.ss"</js>

-	 * 	<li><b>Data type:</b>  <code>Set&lt;String&gt;</code>

+	 * 	<li><b>Data type:</b>  <c>Set&lt;String&gt;</c>

 	 * 	<li><b>Default:</b>  empty list

 	 * 	<li><b>Session property:</b>  <jk>false</jk>

 	 * 	<li><b>Annotations:</b>

@@ -2430,7 +2430,7 @@
 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"RestContext.roleGuard.ss"</js>

-	 * 	<li><b>Data type:</b>  <code>Set&lt;String&gt;</code>

+	 * 	<li><b>Data type:</b>  <c>Set&lt;String&gt;</c>

 	 * 	<li><b>Default:</b>  empty set

 	 * 	<li><b>Session property:</b>  <jk>false</jk>

 	 * 	<li><b>Annotations:</b>

@@ -2525,7 +2525,7 @@
 	 * <p>

 	 * Serializer are used to convert POJOs to HTTP response bodies.

 	 * <br>Any of the Juneau framework serializers can be used in this setting.

-	 * <br>The serializer selected is based on the request <code>Accept</code> header matched against the values returned by the following method

+	 * <br>The serializer selected is based on the request <c>Accept</c> header matched against the values returned by the following method

 	 * using a best-match algorithm:

 	 * <ul>

 	 * 	<li class='jm'>{@link Serializer#getMediaTypeRanges()}

@@ -2605,7 +2605,7 @@
 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"RestContext.staticFileResponseHeaders.omo"</js>

-	 * 	<li><b>Data type:</b>  <code>Map&lt;String,String&gt;</code>

+	 * 	<li><b>Data type:</b>  <c>Map&lt;String,String&gt;</c>

 	 * 	<li><b>Default:</b>  <code>{<js>'Cache-Control'</js>: <js>'max-age=86400, public</js>}</code>

 	 * 	<li><b>Session property:</b>  <jk>false</jk>

 	 * 	<li><b>Annotations:</b>

@@ -2671,7 +2671,7 @@
 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"RestContext.staticFiles.lo"</js>

-	 * 	<li><b>Data type:</b>  <code>List&lt;StaticFileMapping&gt;</code>

+	 * 	<li><b>Data type:</b>  <c>List&lt;StaticFileMapping&gt;</c>

 	 * 	<li><b>Default:</b>  <jk>null</jk>

 	 * 	<li><b>Session property:</b>  <jk>false</jk>

 	 * 	<li><b>Annotations:</b>

@@ -2713,10 +2713,10 @@
 	 * <p class='bcode w800'>

 	 *  	/myresource/htdocs/foobar.html

 	 * </p>

-	 * <br>...the servlet will attempt to find the <code>foobar.html</code> file in the following ordered locations:

+	 * <br>...the servlet will attempt to find the <c>foobar.html</c> file in the following ordered locations:

 	 * <ol class='spaced-list'>

-	 * 	<li><code>com.foo.mypackage.docs</code> package.

-	 * 	<li><code>[working-dir]/docs</code> directory.

+	 * 	<li><c>com.foo.mypackage.docs</c> package.

+	 * 	<li><c>[working-dir]/docs</c> directory.

 	 * </ol>

 	 *

 	 * <h5 class='section'>See Also:</h5>

@@ -2744,7 +2744,7 @@
 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"RestContext.produces.ls"</js>

-	 * 	<li><b>Data type:</b>  <code>List&lt;String&gt;</code>

+	 * 	<li><b>Data type:</b>  <c>List&lt;String&gt;</c>

 	 * 	<li><b>Default:</b>  empty list

 	 * 	<li><b>Session property:</b>  <jk>false</jk>

 	 * 	<li><b>Annotations:</b>

@@ -2807,7 +2807,7 @@
 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"RestContext.properties.sms"</js>

-	 * 	<li><b>Data type:</b>  <code>Map&lt;String,String&gt;</code>

+	 * 	<li><b>Data type:</b>  <c>Map&lt;String,String&gt;</c>

 	 * 	<li><b>Default:</b>  empty map

 	 * 	<li><b>Session property:</b>  <jk>false</jk>

 	 * 	<li><b>Annotations:</b>

@@ -2855,7 +2855,7 @@
 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"RestContext.consumes.ls"</js>

-	 * 	<li><b>Data type:</b>  <code>List&lt;String&gt;</code>

+	 * 	<li><b>Data type:</b>  <c>List&lt;String&gt;</c>

 	 * 	<li><b>Default:</b>  empty list

 	 * 	<li><b>Session property:</b>  <jk>false</jk>

 	 * 	<li><b>Annotations:</b>

@@ -2918,7 +2918,7 @@
 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"RestContext.useClasspathResourceCaching.b"</js>

-	 * 	<li><b>Data type:</b>  <code>Boolean</code>

+	 * 	<li><b>Data type:</b>  <c>Boolean</c>

 	 * 	<li><b>Default:</b>  <jk>true</jk>

 	 * 	<li><b>Session property:</b>  <jk>false</jk>

 	 * 	<li><b>Annotations:</b>

@@ -2973,7 +2973,7 @@
 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"RestContext.useStackTraceHashes.b"</js>

-	 * 	<li><b>Data type:</b>  <code>Boolean</code>

+	 * 	<li><b>Data type:</b>  <c>Boolean</c>

 	 * 	<li><b>Default:</b>  <jk>true</jk>

 	 * 	<li><b>Session property:</b>  <jk>false</jk>

 	 * 	<li><b>Annotations:</b>

@@ -3030,7 +3030,7 @@
 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"RestContext.uriAuthority.s"</js>

-	 * 	<li><b>Data type:</b>  <code>String</code>

+	 * 	<li><b>Data type:</b>  <c>String</c>

 	 * 	<li><b>Default:</b>  <jk>null</jk>

 	 * 	<li><b>Session property:</b>  <jk>false</jk>

 	 * 	<li><b>Annotations:</b>

@@ -3100,7 +3100,7 @@
 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"RestContext.uriContext.s"</js>

-	 * 	<li><b>Data type:</b>  <code>String</code>

+	 * 	<li><b>Data type:</b>  <c>String</c>

 	 * 	<li><b>Default:</b>  <jk>null</jk>

 	 * 	<li><b>Session property:</b>  <jk>false</jk>

 	 * 	<li><b>Annotations:</b>

@@ -3163,7 +3163,7 @@
 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"RestContext.uriRelativity.s"</js>

-	 * 	<li><b>Data type:</b>  <code>String</code>

+	 * 	<li><b>Data type:</b>  <c>String</c>

 	 * 	<li><b>Default:</b>  <js>"RESOURCE"</js>

 	 * 	<li><b>Session property:</b>  <jk>false</jk>

 	 * 	<li><b>Annotations:</b>

@@ -3224,7 +3224,7 @@
 	 * <h5 class='section'>Property:</h5>

 	 * <ul>

 	 * 	<li><b>Name:</b>  <js>"RestContext.uriResolution.s"</js>

-	 * 	<li><b>Data type:</b>  <code>String</code>

+	 * 	<li><b>Data type:</b>  <c>String</c>

 	 * 	<li><b>Default:</b>  <js>"ROOT_RELATIVE"</js>

 	 * 	<li><b>Session property:</b>  <jk>false</jk>

 	 * 	<li><b>Annotations:</b>

@@ -4040,7 +4040,7 @@
 	 * If the resource cannot be found in the classpath, then an attempt is made to look in the JVM working directory.

 	 *

 	 * <p>

-	 * If the <code>locale</code> is specified, then we look for resources whose name matches that locale.

+	 * If the <c>locale</c> is specified, then we look for resources whose name matches that locale.

 	 * <br>For example, if looking for the resource <js>"MyResource.txt"</js> for the Japanese locale, we will look for

 	 * files in the following order:

 	 * <ol>

@@ -4468,7 +4468,7 @@
 	 *

 	 * @param e The exception to check.

 	 * @return

-	 * 	The number of times this exception was thrown, or <code>0</code> if {@link #REST_useStackTraceHashes}

+	 * 	The number of times this exception was thrown, or <c>0</c> if {@link #REST_useStackTraceHashes}

 	 * 	setting is not enabled.

 	 */

 	public int getStackTraceOccurrence(Throwable e) {

@@ -4546,7 +4546,7 @@
 	 * </ul>

 	 *

 	 * @return

-	 * 	The method names allowed to be passed as <code>X-Method</code> headers.

+	 * 	The method names allowed to be passed as <c>X-Method</c> headers.

 	 * 	<br>The set is case-insensitive ordered.

 	 */

 	public Set<String> getAllowedMethodHeaders() {

@@ -4562,7 +4562,7 @@
 	 * </ul>

 	 *

 	 * @return

-	 * 	The method names allowed to be passed as <code>method</code> URL parameters.

+	 * 	The method names allowed to be passed as <c>method</c> URL parameters.

 	 * 	<br>The set is case-insensitive ordered.

 	 */

 	public Set<String> getAllowedMethodParams() {

@@ -4601,7 +4601,7 @@
 	}

 

 //	/**

-//	 * Returns <jk>true</jk> if the specified <code>Method</code> GET parameter value can be used to override

+//	 * Returns <jk>true</jk> if the specified <c>Method</c> GET parameter value can be used to override

 //	 * the method name in the HTTP header.

 //	 *

 //	 * <h5 class='section'>See Also:</h5>

@@ -4669,7 +4669,7 @@
 	 * </ul>

 	 *

 	 * @return

-	 * 	The supported <code>Accept</code> header values for this resource.

+	 * 	The supported <c>Accept</c> header values for this resource.

 	 * 	<br>Never <jk>null</jk>.

 	 */

 	public List<MediaType> getProduces() {

@@ -4686,7 +4686,7 @@
 	 * </ul>

 	 *

 	 * @return

-	 * 	The supported <code>Content-Type</code> header values for this resource.

+	 * 	The supported <c>Content-Type</c> header values for this resource.

 	 * 	<br>Never <jk>null</jk>.

 	 */

 	public List<MediaType> getConsumes() {

diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContextBuilder.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContextBuilder.java
index a06ba3c..97735be 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContextBuilder.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContextBuilder.java
@@ -44,7 +44,7 @@
 import org.apache.juneau.utils.*;
 
 /**
- * Defines the initial configuration of a <code>RestServlet</code> or <code>@RestResource</code> annotated object.
+ * Defines the initial configuration of a <c>RestServlet</c> or <c>@RestResource</c> annotated object.
  *
  * <p>
  * An extension of the {@link ServletConfig} object used during servlet initialization.
@@ -451,13 +451,13 @@
 	 * Configuration property:  Allowed method headers.
 	 *
 	 * <p>
-	 * A comma-delimited list of HTTP method names that are allowed to be passed as values in an <code>X-Method</code> HTTP header
+	 * A comma-delimited list of HTTP method names that are allowed to be passed as values in an <c>X-Method</c> HTTP header
 	 * to override the real HTTP method name.
 	 * <p>
 	 * Allows you to override the actual HTTP method with a simulated method.
-	 * <br>For example, if an HTTP Client API doesn't support <code>PATCH</code> but does support <code>POST</code> (because
-	 * <code>PATCH</code> is not part of the original HTTP spec), you can add a <code>X-Method: PATCH</code> header on a normal
-	 * <code>HTTP POST /foo</code> request call which will make the HTTP call look like a <code>PATCH</code> request in any of the REST APIs.
+	 * <br>For example, if an HTTP Client API doesn't support <c>PATCH</c> but does support <c>POST</c> (because
+	 * <c>PATCH</c> is not part of the original HTTP spec), you can add a <c>X-Method: PATCH</c> header on a normal
+	 * <c>HTTP POST /foo</c> request call which will make the HTTP call look like a <c>PATCH</c> request in any of the REST APIs.
 	 *
 	 * <h5 class='section'>See Also:</h5>
 	 * <ul>
@@ -840,10 +840,10 @@
 	}
 
 	/**
-	 * Specifies a default <code>Accept</code> header value if not specified on a request.
+	 * Specifies a default <c>Accept</c> header value if not specified on a request.
 	 *
 	 * @param value
-	 * 	The default value of the <code>Accept</code> header.
+	 * 	The default value of the <c>Accept</c> header.
 	 * 	<br>Ignored if <jk>null</jk> or empty.
 	 * @return This object (for method chaining).
 	 */
@@ -854,10 +854,10 @@
 	}
 
 	/**
-	 * Specifies a default <code>Content-Type</code> header value if not specified on a request.
+	 * Specifies a default <c>Content-Type</c> header value if not specified on a request.
 	 *
 	 * @param value
-	 * 	The default value of the <code>Content-Type</code> header.
+	 * 	The default value of the <c>Content-Type</c> header.
 	 * 	<br>Ignored if <jk>null</jk> or empty.
 	 * @return This object (for method chaining).
 	 */
@@ -1205,7 +1205,7 @@
 	 *
 	 * <p>
 	 * By default, the Juneau framework will automatically Java method parameters of various types (e.g.
-	 * <code>RestRequest</code>, <code>Accept</code>, <code>Reader</code>).
+	 * <c>RestRequest</c>, <c>Accept</c>, <c>Reader</c>).
 	 * This annotation allows you to provide your own resolvers for your own class types that you want resolved.
 	 *
 	 * <h5 class='section'>See Also:</h5>
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestException.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestException.java
index 01dc6a0..f13e9db 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestException.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestException.java
@@ -24,7 +24,7 @@
  *

  * <p>

  * REST methods on subclasses of {@link RestServlet} can throw this exception to trigger an HTTP status other than the

- * automatically-generated <code>404</code>, <code>405</code>, and <code>500</code> statuses.

+ * automatically-generated <c>404</c>, <c>405</c>, and <c>500</c> statuses.

  */

 public class RestException extends RuntimeException {

 

@@ -175,7 +175,7 @@
 	 * Returns the number of times this exception occurred on this servlet.

 	 *

 	 * @return

-	 * 	The occurrence number if {@link RestResource#useStackTraceHashes() @RestResource(useStackTraceHashes)} is enabled, or <code>0</code> otherwise.

+	 * 	The occurrence number if {@link RestResource#useStackTraceHashes() @RestResource(useStackTraceHashes)} is enabled, or <c>0</c> otherwise.

 	 */

 	public int getOccurrence() {

 		return occurrence;

diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestInfoProvider.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestInfoProvider.java
index 1cadb39..b2ff842 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestInfoProvider.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestInfoProvider.java
@@ -66,8 +66,8 @@
 	 * This object is made available through the following:
 	 * <ul>
 	 * 	<li class='jm'>{@link RestRequest#getSiteName()}
-	 * 	<li><code>$RI{siteName}</code> variable.
-	 * 	<li><code>$R{siteName}</code> variable.
+	 * 	<li><c>$RI{siteName}</c> variable.
+	 * 	<li><c>$R{siteName}</c> variable.
 	 * </ul>
 	 *
 	 * @param req The current request.
@@ -85,8 +85,8 @@
 	 * This object is made available through the following:
 	 * <ul>
 	 * 	<li class='jm'>{@link RestRequest#getResourceTitle()}
-	 * 	<li><code>$RI{title}</code> variable.
-	 * 	<li><code>$R{resourceTitle}</code> variable.
+	 * 	<li><c>$RI{title}</c> variable.
+	 * 	<li><c>$R{resourceTitle}</c> variable.
 	 * </ul>
 	 *
 	 * @param req The current request.
@@ -104,8 +104,8 @@
 	 * This object is made available through the following:
 	 * <ul>
 	 * 	<li class='jm'>{@link RestRequest#getResourceDescription()}
-	 * 	<li><code>$RI{description}</code> variable.
-	 * 	<li><code>$R{resourceDescription}</code> variable.
+	 * 	<li><c>$RI{description}</c> variable.
+	 * 	<li><c>$R{resourceDescription}</c> variable.
 	 * </ul>
 	 *
 	 * @param req The current request.
@@ -123,8 +123,8 @@
 	 * This object is made available through the following:
 	 * <ul>
 	 * 	<li class='jm'>{@link RestRequest#getMethodSummary()}
-	 * 	<li><code>$RI{methodSummary}</code> variable.
-	 * 	<li><code>$R{methodSummary}</code> variable.
+	 * 	<li><c>$RI{methodSummary}</c> variable.
+	 * 	<li><c>$R{methodSummary}</c> variable.
 	 * </ul>
 	 *
 	 * @param method The Java method annotated with {@link RestMethod @RestMethod}.
@@ -143,8 +143,8 @@
 	 * This object is made available through the following:
 	 * <ul>
 	 * 	<li class='jm'>{@link RestRequest#getMethodDescription()}
-	 * 	<li><code>$RI{methodDescription}</code> variable.
-	 * 	<li><code>$R{methodDescription}</code> variable.
+	 * 	<li><c>$RI{methodDescription}</c> variable.
+	 * 	<li><c>$R{methodDescription}</c> variable.
 	 * </ul>
 	 *
 	 * @param method The Java method annotated with {@link RestMethod @RestMethod}.
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestLogger.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestLogger.java
index 846d3c4..639ea46 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestLogger.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestLogger.java
@@ -90,7 +90,7 @@
 	 * Typically, subclasses will override this method and log errors themselves.
 	 *
 	 * <p>
-	 * The default implementation simply logs errors to the <code>RestServlet</code> logger.
+	 * The default implementation simply logs errors to the <c>RestServlet</c> logger.
 	 *
 	 * <p>
 	 * Here's a typical implementation showing how stack trace hashing can be used to reduce log file sizes...
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestMatcher.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestMatcher.java
index 328c8e4..98fc7fd 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestMatcher.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestMatcher.java
@@ -59,7 +59,7 @@
  * Instances must provide one of the following public constructors:

  * <ul>

  * 	<li>No-args.

- * 	<li>The following args: <code>Object resource, Method javaMethod</code>.

+ * 	<li>The following args: <c>Object resource, Method javaMethod</c>.

  * 		<br>This gives access to the servlet/resource and Java method it's applied to.

  * </ul>

  *

diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestMethodContext.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestMethodContext.java
index 02d75dc..7166631 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestMethodContext.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestMethodContext.java
@@ -70,7 +70,7 @@
 	 * <h5 class='section'>Property:</h5>
 	 * <ul>
 	 * 	<li><b>Name:</b>  <js>"RestMethodContext.defaultRequestAttributes.smo"</js>
-	 * 	<li><b>Data type:</b>  <code>Map&lt;String,Object&gt;</code>
+	 * 	<li><b>Data type:</b>  <c>Map&lt;String,Object&gt;</c>
 	 * 	<li><b>Default:</b>  <jk>null</jk>
 	 * 	<li><b>Session property:</b>  <jk>false</jk>
 	 * 	<li><b>Annotations:</b>
@@ -112,7 +112,7 @@
 	 * <h5 class='section'>Property:</h5>
 	 * <ul>
 	 * 	<li><b>Name:</b>  <js>"RestMethodContext.clientVersion.s"</js>
-	 * 	<li><b>Data type:</b>  <code>String</code>
+	 * 	<li><b>Data type:</b>  <c>String</c>
 	 * 	<li><b>Default:</b>  empty string
 	 * 	<li><b>Session property:</b>  <jk>false</jk>
 	 * 	<li><b>Annotations:</b>
@@ -190,7 +190,7 @@
 	 * <h5 class='section'>Property:</h5>
 	 * <ul>
 	 * 	<li><b>Name:</b>  <js>"RestMethodContext.defaultFormData.omo"</js>
-	 * 	<li><b>Data type:</b>  <code>Map&lt;String,Object&gt;</code>
+	 * 	<li><b>Data type:</b>  <c>Map&lt;String,Object&gt;</c>
 	 * 	<li><b>Default:</b>  empty map
 	 * 	<li><b>Session property:</b>  <jk>false</jk>
 	 * 	<li><b>Annotations:</b>
@@ -223,7 +223,7 @@
 	 * <h5 class='section'>Property:</h5>
 	 * <ul>
 	 * 	<li><b>Name:</b>  <js>"RestMethodContext.defaultQuery.omo"</js>
-	 * 	<li><b>Data type:</b>  <code>Map&lt;String,Object&gt;</code>
+	 * 	<li><b>Data type:</b>  <c>Map&lt;String,Object&gt;</c>
 	 * 	<li><b>Default:</b>  empty map
 	 * 	<li><b>Session property:</b>  <jk>false</jk>
 	 * 	<li><b>Annotations:</b>
@@ -255,7 +255,7 @@
 	 * <h5 class='section'>Property:</h5>
 	 * <ul>
 	 * 	<li><b>Name:</b>  <js>"RestMethodContext.defaultRequestHeaders.smo"</js>
-	 * 	<li><b>Data type:</b>  <code>Map&lt;String,Object&gt;</code>
+	 * 	<li><b>Data type:</b>  <c>Map&lt;String,Object&gt;</c>
 	 * 	<li><b>Default:</b>  <jk>null</jk>
 	 * 	<li><b>Session property:</b>  <jk>false</jk>
 	 * 	<li><b>Annotations:</b>
@@ -299,7 +299,7 @@
 	 * <h5 class='section'>Property:</h5>
 	 * <ul>
 	 * 	<li><b>Name:</b>  <js>"RestMethodContext.httpMethod.s"</js>
-	 * 	<li><b>Data type:</b>  <code>String</code>
+	 * 	<li><b>Data type:</b>  <c>String</c>
 	 * 	<li><b>Default:</b>  <jk>null</jk>
 	 * 	<li><b>Session property:</b>  <jk>false</jk>
 	 * 	<li><b>Annotations:</b>
@@ -334,7 +334,7 @@
 	 * 		<js>""</js>
 	 * 		- Auto-detect.
 	 * 		<br>The method name is determined based on the Java method name.
-	 * 		<br>For example, if the method is <code>doPost(...)</code>, then the method name is automatically detected
+	 * 		<br>For example, if the method is <c>doPost(...)</c>, then the method name is automatically detected
 	 * 		as <js>"POST"</js>.
 	 * 		<br>Otherwise, defaults to <js>"GET"</js>.
 	 * 	<li>
@@ -342,14 +342,14 @@
 	 * 		- Remote-proxy interface.
 	 * 		<br>This denotes a Java method that returns an object (usually an interface, often annotated with the
 	 * 		{@link RemoteInterface @RemoteInterface} annotation) to be used as a remote proxy using
-	 * 		<code>RestClient.getRemoteInterface(Class&lt;T&gt; interfaceClass, String url)</code>.
+	 * 		<c>RestClient.getRemoteInterface(Class&lt;T&gt; interfaceClass, String url)</c>.
 	 * 		<br>This allows you to construct client-side interface proxies using REST as a transport medium.
-	 * 		<br>Conceptually, this is simply a fancy <code>POST</code> against the url <js>"/{path}/{javaMethodName}"</js>
+	 * 		<br>Conceptually, this is simply a fancy <c>POST</c> against the url <js>"/{path}/{javaMethodName}"</js>
 	 * 		where the arguments are marshalled from the client to the server as an HTTP body containing an array of
 	 * 		objects, passed to the method as arguments, and then the resulting object is marshalled back to the client.
 	 * 	<li>
 	 * 		Anything else
-	 * 		- Overloaded non-HTTP-standard names that are passed in through a <code>&amp;method=methodName</code> URL
+	 * 		- Overloaded non-HTTP-standard names that are passed in through a <c>&amp;method=methodName</c> URL
 	 * 		parameter.
 	 * </ul>
 	 */
@@ -397,7 +397,7 @@
 	 * <h5 class='section'>Property:</h5>
 	 * <ul>
 	 * 	<li><b>Name:</b>  <js>"RestMethodContext.path.s"</js>
-	 * 	<li><b>Data type:</b>  <code>String</code>
+	 * 	<li><b>Data type:</b>  <c>String</c>
 	 * 	<li><b>Default:</b>  <jk>null</jk>
 	 * 	<li><b>Session property:</b>  <jk>false</jk>
 	 * 	<li><b>Annotations:</b>
@@ -428,8 +428,8 @@
 	 * <h5 class='section'>Property:</h5>
 	 * <ul>
 	 * 	<li><b>Name:</b>  <js>"RestMethodContext.priority.i"</js>
-	 * 	<li><b>Data type:</b>  <code>Integer</code>
-	 * 	<li><b>Default:</b>  <code>0</code>
+	 * 	<li><b>Data type:</b>  <c>Integer</c>
+	 * 	<li><b>Default:</b>  <c>0</c>
 	 * 	<li><b>Session property:</b>  <jk>false</jk>
 	 * 	<li><b>Annotations:</b>
 	 * 		<ul>
@@ -444,7 +444,7 @@
 	 * To force path patterns to be checked before other path patterns, use a higher priority number.
 	 *
 	 * <p>
-	 * By default, it's <code>0</code>, which means it will use an internal heuristic to determine a best match.
+	 * By default, it's <c>0</c>, which means it will use an internal heuristic to determine a best match.
 	 */
 	public static final String RESTMETHOD_priority = PREFIX + ".priority.i";
 
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestRequest.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestRequest.java
index c07a266..832e0e9 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestRequest.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestRequest.java
@@ -292,7 +292,7 @@
 	}

 

 	/**

-	 * Shortcut for calling <code>getProperties().append(name, value);</code> fluently.

+	 * Shortcut for calling <c>getProperties().append(name, value);</c> fluently.

 	 *

 	 * @param name The property name.

 	 * @param value The property value.

@@ -374,7 +374,7 @@
 	}

 

 	/**

-	 * Returns the media types that are valid for <code>Accept</code> headers on the request.

+	 * Returns the media types that are valid for <c>Accept</c> headers on the request.

 	 *

 	 * @return The set of media types registered in the serializer group of this request.

 	 */

@@ -383,7 +383,7 @@
 	}

 

 	/**

-	 * Returns the media types that are valid for <code>Content-Type</code> headers on the request.

+	 * Returns the media types that are valid for <c>Content-Type</c> headers on the request.

 	 *

 	 * @return The set of media types registered in the parser group of this request.

 	 */

@@ -414,7 +414,7 @@
 	}

 

 	/**

-	 * Returns the charset specified on the <code>Content-Type</code> header, or <js>"UTF-8"</js> if not specified.

+	 * Returns the charset specified on the <c>Content-Type</c> header, or <js>"UTF-8"</js> if not specified.

 	 */

 	@Override /* ServletRequest */

 	public String getCharacterEncoding() throws UnsupportedMediaType {

@@ -602,7 +602,7 @@
 	}

 

 	/**

-	 * Shortcut for calling <code>getQuery().getString(name)</code>.

+	 * Shortcut for calling <c>getQuery().getString(name)</c>.

 	 *

 	 * @param name The query parameter name.

 	 * @return The query parameter value, or <jk>null</jk> if not found.

@@ -685,7 +685,7 @@
 	}

 

 	/**

-	 * Shortcut for calling <code>getFormData().getString(name)</code>.

+	 * Shortcut for calling <c>getFormData().getString(name)</c>.

 	 *

 	 * @param name The form data parameter name.

 	 * @return The form data parameter value, or <jk>null<jk> if not found.

@@ -748,7 +748,7 @@
 	}

 

 	/**

-	 * Shortcut for calling <code>getPathMatch().get(name)</code>.

+	 * Shortcut for calling <c>getPathMatch().get(name)</c>.

 	 *

 	 * @param name The path variable name.

 	 * @return The path variable value, or <jk>null</jk> if not found.

@@ -758,7 +758,7 @@
 	}

 

 	/**

-	 * Shortcut for calling <code>getPathMatch().getRemainder()</code>.

+	 * Shortcut for calling <c>getPathMatch().getRemainder()</c>.

 	 *

 	 * @return The path remainder value, or <jk>null</jk> if not found.

 	 */

@@ -1003,7 +1003,7 @@
 	 * Returns the localized swagger associated with the resource.

 	 *

 	 * <p>

-	 * A shortcut for calling <code>getInfoProvider().getSwagger(request);</code>

+	 * A shortcut for calling <c>getInfoProvider().getSwagger(request);</c>

 	 *

 	 * <h5 class='section'>Example:</h5>

 	 * <p class='bcode w800'>

@@ -1214,8 +1214,8 @@
 	 * Returns the method of this request.

 	 *

 	 * <p>

-	 * If <code>allowHeaderParams</code> init parameter is <jk>true</jk>, then first looks for

-	 * <code>&amp;method=xxx</code> in the URL query string.

+	 * If <c>allowHeaderParams</c> init parameter is <jk>true</jk>, then first looks for

+	 * <c>&amp;method=xxx</c> in the URL query string.

 	 */

 	@Override /* ServletRequest */

 	public String getMethod() {

@@ -1244,10 +1244,10 @@
 	}

 

 	/**

-	 * Returns <jk>true</jk> if <code>&amp;plainText=true</code> was specified as a URL parameter.

+	 * Returns <jk>true</jk> if <c>&amp;plainText=true</c> was specified as a URL parameter.

 	 *

 	 * <p>

-	 * This indicates that the <code>Content-Type</code> of the output should always be set to <js>"text/plain"</js>

+	 * This indicates that the <c>Content-Type</c> of the output should always be set to <js>"text/plain"</js>

 	 * to make it easy to render in a browser.

 	 *

 	 * <p>

@@ -1334,7 +1334,7 @@
 	 * 		point of execution.

 	 * </ul>

 	 *

-	 * @return The Java method handling the request, or <code>null</code> if the method has not yet been resolved.

+	 * @return The Java method handling the request, or <c>null</c> if the method has not yet been resolved.

 	 */

 	public Method getJavaMethod() {

 		return javaMethod;

@@ -1352,7 +1352,7 @@
 	/**

 	 * Returns <jk>true</jk> if debug mode is enabled.

 	 *

-	 * Debug mode is enabled by simply adding <js>"?debug=true"</js> to the query string or adding a <code>Debug: true</code> header on the request.

+	 * Debug mode is enabled by simply adding <js>"?debug=true"</js> to the query string or adding a <c>Debug: true</c> header on the request.

 	 *

 	 * @return <jk>true</jk> if debug mode is enabled.

 	 */

@@ -1734,7 +1734,7 @@
 	 * Logger.

 	 *

 	 * <p>

-	 * Shortcut for calling <code>getContext().getLogger()</code>.

+	 * Shortcut for calling <c>getContext().getLogger()</c>.

 	 *

 	 * <h5 class='section'>Example:</h5>

 	 * <p class='bcode w800'>

diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestResponse.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestResponse.java
index e95cdbf..a28df9d 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestResponse.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestResponse.java
@@ -143,7 +143,7 @@
 	}

 

 	/**

-	 * Returns the media types that are valid for <code>Accept</code> headers on the request.

+	 * Returns the media types that are valid for <c>Accept</c> headers on the request.

 	 *

 	 * @return The set of media types registered in the parser group of this request.

 	 */

@@ -152,7 +152,7 @@
 	}

 

 	/**

-	 * Returns the codings that are valid for <code>Accept-Encoding</code> and <code>Content-Encoding</code> headers on

+	 * Returns the codings that are valid for <c>Accept-Encoding</c> and <c>Content-Encoding</c> headers on

 	 * the request.

 	 *

 	 * @return The set of media types registered in the parser group of this request.

@@ -184,7 +184,7 @@
 	 * <ul class='spaced-list'>

 	 * 	<li>

 	 * 		Calling this method with a <jk>null</jk> value is NOT the same as not calling this method at all.

-	 * 		<br>A <jk>null</jk> output value means we want to serialize <jk>null</jk> as a response (e.g. as a JSON <code>null</code>).

+	 * 		<br>A <jk>null</jk> output value means we want to serialize <jk>null</jk> as a response (e.g. as a JSON <c>null</c>).

 	 * 		<br>Not calling this method or returning a value means you're handing the response yourself via the underlying stream or writer.

 	 * 		<br>This distinction affects the {@link #hasOutput()} method behavior.

 	 * </ul>

@@ -297,7 +297,7 @@
 	}

 

 	/**

-	 * Shortcut for calling <code>getProperties().append(name, value);</code> fluently.

+	 * Shortcut for calling <c>getProperties().append(name, value);</c> fluently.

 	 *

 	 * @param name The property name.

 	 * @param value The property value.

@@ -311,7 +311,7 @@
 	}

 

 	/**

-	 * Shortcut for calling <code>getRequest().getAttributes()</code>.

+	 * Shortcut for calling <c>getRequest().getAttributes()</c>.

 	 *

 	 * @return The request attributes object.

 	 */

@@ -320,7 +320,7 @@
 	}

 

 	/**

-	 * Shortcut for calling <code>getRequest().setAttribute(String,Object)</code>.

+	 * Shortcut for calling <c>getRequest().setAttribute(String,Object)</c>.

 	 *

 	 * @param name The property name.

 	 * @param value The property value.

@@ -384,7 +384,7 @@
 

 	/**

 	 * Equivalent to {@link HttpServletResponse#getOutputStream()}, except wraps the output stream if an {@link Encoder}

-	 * was found that matched the <code>Accept-Encoding</code> header.

+	 * was found that matched the <c>Accept-Encoding</c> header.

 	 *

 	 * @return A negotiated output stream.

 	 * @throws NotAcceptable If unsupported Accept-Encoding value specified.

@@ -460,7 +460,7 @@
 	 * <p>

 	 * This can be useful if you want to render a streaming 'console' on a web page.

 	 *

-	 * @param contentType The value to set as the <code>Content-Type</code> on the response.

+	 * @param contentType The value to set as the <c>Content-Type</c> on the response.

 	 * @return The raw writer.

 	 * @throws IOException

 	 */

@@ -473,7 +473,7 @@
 

 	/**

 	 * Equivalent to {@link HttpServletResponse#getWriter()}, except wraps the output stream if an {@link Encoder} was

-	 * found that matched the <code>Accept-Encoding</code> header and sets the <code>Content-Encoding</code>

+	 * found that matched the <c>Accept-Encoding</c> header and sets the <c>Content-Encoding</c>

 	 * header to the appropriate value.

 	 *

 	 * @return The negotiated writer.

@@ -505,9 +505,9 @@
 	}

 

 	/**

-	 * Returns the <code>Content-Type</code> header stripped of the charset attribute if present.

+	 * Returns the <c>Content-Type</c> header stripped of the charset attribute if present.

 	 *

-	 * @return The <code>media-type</code> portion of the <code>Content-Type</code> header.

+	 * @return The <c>media-type</c> portion of the <c>Content-Type</c> header.

 	 */

 	public MediaType getMediaType() {

 		return MediaType.forString(getContentType());

diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestServlet.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestServlet.java
index bf64118..dbda145 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestServlet.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestServlet.java
@@ -202,7 +202,7 @@
 	}

 

 	/**

-	 * Convenience method for calling <code>getContext().getLogger().log(level, msg, args);</code>

+	 * Convenience method for calling <c>getContext().getLogger().log(level, msg, args);</c>

 	 *

 	 * @param level The log level.

 	 * @param msg The message to log.

@@ -214,7 +214,7 @@
 	}

 

 	/**

-	 * Convenience method for calling <code>getContext().getLogger().logObjects(level, msg, args);</code>

+	 * Convenience method for calling <c>getContext().getLogger().logObjects(level, msg, args);</c>

 	 *

 	 * @param level The log level.

 	 * @param msg The message to log.

@@ -226,7 +226,7 @@
 	}

 

 	/**

-	 * Convenience method for calling <code>getContext().getLogger().log(level, cause, msg, args);</code>

+	 * Convenience method for calling <c>getContext().getLogger().log(level, cause, msg, args);</c>

 	 *

 	 * @param level The log level.

 	 * @param cause The cause.

@@ -274,7 +274,7 @@
 	}

 

 	/**

-	 * Convenience method for calling <code>getContext().getProperties();</code>

+	 * Convenience method for calling <c>getContext().getProperties();</c>

 	 *

 	 * @return The resource properties as an {@link RestContextProperties}.

 	 * @see RestContext#getProperties()

diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Attr.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Attr.java
index 9a3f38b..023a611 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Attr.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Attr.java
@@ -73,7 +73,7 @@
 	 * A blank value (the default) has the following behavior:

 	 * <ul class='spaced-list'>

 	 * 	<li>

-	 * 		If the data type is <code>NameValuePairs</code>, <code>Map</code>, or a bean,

+	 * 		If the data type is <c>NameValuePairs</c>, <c>Map</c>, or a bean,

 	 * 		then it's the equivalent to <js>"*"</js> which will cause the value to be serialized as name/value pairs.

 	 *

 	 * 		<h5 class='figure'>Examples:</h5>

diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/HookEvent.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/HookEvent.java
index 6e9148c..94bd7ed 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/HookEvent.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/HookEvent.java
@@ -39,7 +39,7 @@
 public enum HookEvent {
 
 	/**
-	 * Identifies a method that should be called immediately after the <code>HttpServlet.service(HttpServletRequest, HttpServletResponse)</code>
+	 * Identifies a method that should be called immediately after the <c>HttpServlet.service(HttpServletRequest, HttpServletResponse)</c>
 	 * method is called.
 	 *
 	 * <p>
@@ -332,7 +332,7 @@
 	 * The only valid parameter type for this method is {@link RestContextBuilder} which can be used to configure the servlet.
 	 *
 	 * <p>
-	 * An example of this is the <code>PetStoreResource</code> class that uses an init method to perform initialization
+	 * An example of this is the <c>PetStoreResource</c> class that uses an init method to perform initialization
 	 * of an internal data structure.
 	 *
 	 * <h5 class='figure'>Example:</h5>
@@ -477,7 +477,7 @@
 	 * 		<br>The order of DESTROY method invocations within a class is alphabetical, then by parameter count, then by parameter types.
 	 * 	<li>
 	 * 		In general, destroy methods should not throw any exceptions, although if any are thrown, the stack trace will be
-	 * 		printed to <code>System.err</code>.
+	 * 		printed to <c>System.err</c>.
 	 * 	<li>
 	 * 		Note that if you override a parent method, you probably need to call <code><jk>super</jk>.parentMethod(...)</code>.
 	 * 		<br>The method is still considered part of the parent class for ordering purposes even though it's
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/MethodSwagger.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/MethodSwagger.java
index 1da086a..05953c4 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/MethodSwagger.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/MethodSwagger.java
@@ -25,7 +25,7 @@
 public @interface MethodSwagger {
 
 	/**
-	 * Defines the swagger field <code>/paths/{path}/{method}/summary</code>.
+	 * Defines the swagger field <c>/paths/{path}/{method}/summary</c>.
 	 *
 	 * <h5 class='section'>Notes:</h5>
 	 * <ul class='spaced-list'>
@@ -44,7 +44,7 @@
 	String[] summary() default {};
 
 	/**
-	 * Defines the swagger field <code>/paths/{path}/{method}/description</code>.
+	 * Defines the swagger field <c>/paths/{path}/{method}/description</c>.
 	 *
 	 * <h5 class='section'>Notes:</h5>
 	 * <ul class='spaced-list'>
@@ -63,7 +63,7 @@
 	String[] description() default {};
 
 	/**
-	 * Defines the swagger field <code>/paths/{path}/{method}/operationId</code>.
+	 * Defines the swagger field <c>/paths/{path}/{method}/operationId</c>.
 	 *
 	 * <h5 class='section'>Notes:</h5>
 	 * <ul class='spaced-list'>
@@ -81,7 +81,7 @@
 	String operationId() default "";
 
 	/**
-	 * Defines the swagger field <code>/paths/{path}/{method}/schemes</code>.
+	 * Defines the swagger field <c>/paths/{path}/{method}/schemes</c>.
 	 *
 	 * <h5 class='section'>Notes:</h5>
 	 * <ul class='spaced-list'>
@@ -97,7 +97,7 @@
 	String[] schemes() default {};
 
 	/**
-	 * Defines the swagger field <code>/paths/{path}/{method}/deprecated</code>.
+	 * Defines the swagger field <c>/paths/{path}/{method}/deprecated</c>.
 	 *
 	 * <h5 class='section'>Example:</h5>
 	 * <p class='bcode w800'>
@@ -124,10 +124,10 @@
 	String deprecated() default "";
 
 	/**
-	 * Defines the swagger field <code>/paths/{path}/{method}/consumes</code>.
+	 * Defines the swagger field <c>/paths/{path}/{method}/consumes</c>.
 	 *
 	 * <p>
-	 * Use this value to override the supported <code>Content-Type</code> media types defined by the parsers defined via {@link RestMethod#parsers()}.
+	 * Use this value to override the supported <c>Content-Type</c> media types defined by the parsers defined via {@link RestMethod#parsers()}.
 	 *
 	 * <h5 class='section'>Notes:</h5>
 	 * <ul class='spaced-list'>
@@ -143,10 +143,10 @@
 	String[] consumes() default {};
 
 	/**
-	 * Defines the swagger field <code>/paths/{path}/{method}/consumes</code>.
+	 * Defines the swagger field <c>/paths/{path}/{method}/consumes</c>.
 	 *
 	 * <p>
-	 * Use this value to override the supported <code>Accept</code> media types defined by the serializers defined via {@link RestMethod#serializers()}.
+	 * Use this value to override the supported <c>Accept</c> media types defined by the serializers defined via {@link RestMethod#serializers()}.
 	 *
 	 * <h5 class='section'>Notes:</h5>
 	 * <ul class='spaced-list'>
@@ -162,7 +162,7 @@
 	String[] produces() default {};
 
 	/**
-	 * Defines the swagger field <code>/paths/{path}/{method}/externalDocs</code>.
+	 * Defines the swagger field <c>/paths/{path}/{method}/externalDocs</c>.
 	 *
 	 * <h5 class='section'>Example:</h5>
 	 * <p class='bcode w800'>
@@ -185,7 +185,7 @@
 	ExternalDocs externalDocs() default @ExternalDocs;
 
 	/**
-	 * Defines the swagger field <code>/paths/{path}/{method}/parameters</code>.
+	 * Defines the swagger field <c>/paths/{path}/{method}/parameters</c>.
 	 *
 	 * <p>
 	 * This annotation is provided for documentation purposes and is used to populate the method <js>"parameters"</js>
@@ -221,7 +221,7 @@
 	String[] parameters() default {};
 
 	/**
-	 * Defines the swagger field <code>/paths/{path}/{method}/responses</code>.
+	 * Defines the swagger field <c>/paths/{path}/{method}/responses</c>.
 	 *
 	 * <p>
 	 * This annotation is provided for documentation purposes and is used to populate the method <js>"responses"</js>
@@ -277,13 +277,13 @@
 	 * 		Supports {@doc DefaultRestSvlVariables}
 	 * 		(e.g. <js>"$L{my.localized.variable}"</js>).
 	 * 	<li>
-	 * 		Corresponds to the swagger field <code>/paths/{path}/{method}/tags</code>.
+	 * 		Corresponds to the swagger field <c>/paths/{path}/{method}/tags</c>.
 	 * </ul>
 	 */
 	String[] tags() default {};
 
 	/**
-	 * Defines the swagger field <code>/paths/{path}/{method}</code>.
+	 * Defines the swagger field <c>/paths/{path}/{method}</c>.
 	 *
 	 * <p>
 	 * Used for free-form Swagger documentation of a REST Java method.
@@ -380,7 +380,7 @@
 	 * 	<li>
 	 * 		The format is a {@doc juneau-marshall.JsonDetails.SimplifiedJson} object.
 	 * 	<li>
-	 * 		The leading/trailing <code>{ }</code> characters are optional.
+	 * 		The leading/trailing <c>{ }</c> characters are optional.
 	 * 		<br>The following two example are considered equivalent:
 	 * 		<p class='bcode w800'>
 	 * 	<ja>@MethodSwagger</ja>(<js>"{summary: 'Add pet'}"</js>)
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Property.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Property.java
index 53cee01..1f127b9 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Property.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Property.java
@@ -24,8 +24,8 @@
  * Any of the properties defined on any of the serializers or parsers can be defined.

  *

  * <p>

- * Property values types that are not <code>Strings</code> will automatically be converted to the correct type

- * (e.g. <code>Boolean</code>, etc...).

+ * Property values types that are not <c>Strings</c> will automatically be converted to the correct type

+ * (e.g. <c>Boolean</c>, etc...).

  *

  * <h5 class='section'>See Also:</h5>

  * <ul>

diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/ResourceSwagger.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/ResourceSwagger.java
index 784c1cf..58132ce 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/ResourceSwagger.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/ResourceSwagger.java
@@ -27,7 +27,7 @@
 
 
 	/**
-	 * Defines the swagger field <code>/info/title</code>.
+	 * Defines the swagger field <c>/info/title</c>.
 	 *
 	 * <h5 class='section'>Example:</h5>
 	 * <p class='bcode w800'>
@@ -46,7 +46,7 @@
 	 * 	<li>
 	 * 		The precedence of lookup for this field is:
 	 * 		<ol>
-	 * 			<li><code>{resource-class}.title</code> property in resource bundle.
+	 * 			<li><c>{resource-class}.title</c> property in resource bundle.
 	 * 			<li>{@link ResourceSwagger#title()} on this class, then any parent classes.
 	 * 			<li>Value defined in Swagger JSON file.
 	 * 			<li>{@link RestResource#title()} on this class, then any parent classes.
@@ -60,7 +60,7 @@
 	String[] title() default {};
 
 	/**
-	 * Defines the swagger field <code>/info/description</code>.
+	 * Defines the swagger field <c>/info/description</c>.
 	 *
 	 * <h5 class='section'>Example:</h5>
 	 * <p class='bcode w800'>
@@ -82,7 +82,7 @@
 	 * 	<li>
 	 * 		The precedence of lookup for this field is:
 	 * 		<ol>
-	 * 			<li><code>{resource-class}.description</code> property in resource bundle.
+	 * 			<li><c>{resource-class}.description</c> property in resource bundle.
 	 * 			<li>{@link ResourceSwagger#description()} on this class, then any parent classes.
 	 * 			<li>Value defined in Swagger JSON file.
 	 * 			<li>{@link RestResource#description()} on this class, then any parent classes.
@@ -96,7 +96,7 @@
 	String[] description() default {};
 
 	/**
-	 * Defines the swagger field <code>/info/contact</code>.
+	 * Defines the swagger field <c>/info/contact</c>.
 	 *
 	 * <p>
 	 * A {@doc juneau-marshall.JsonDetails.SimplifiedJson} string with the following fields:
@@ -109,7 +109,7 @@
 	 * </p>
 	 *
 	 * <p>
-	 * The default value pulls the description from the <code>contact</code> entry in the servlet resource bundle.
+	 * The default value pulls the description from the <c>contact</c> entry in the servlet resource bundle.
 	 * (e.g. <js>"contact = {name:'John Smith',email:'john.smith@foo.bar'}"</js> or
 	 * <js>"MyServlet.contact = {name:'John Smith',email:'john.smith@foo.bar'}"</js>).
 	 *
@@ -152,13 +152,13 @@
 	Contact contact() default @Contact;
 
 	/**
-	 * Defines the swagger field <code>/externalDocs</code>.
+	 * Defines the swagger field <c>/externalDocs</c>.
 	 *
 	 * <p>
 	 * It is used to populate the Swagger external documentation field and to display on HTML pages.
 	 * 	 *
 	 * <p>
-	 * The default value pulls the description from the <code>externalDocs</code> entry in the servlet resource bundle.
+	 * The default value pulls the description from the <c>externalDocs</c> entry in the servlet resource bundle.
 	 * (e.g. <js>"externalDocs = {url:'http://juneau.apache.org'}"</js> or
 	 * <js>"MyServlet.externalDocs = {url:'http://juneau.apache.org'}"</js>).
 	 *
@@ -174,7 +174,7 @@
 	ExternalDocs externalDocs() default @ExternalDocs;
 
 	/**
-	 * Defines the swagger field <code>/info/license</code>.
+	 * Defines the swagger field <c>/info/license</c>.
 	 *
 	 * <p>
 	 * It is used to populate the Swagger license field and to display on HTML pages.
@@ -189,7 +189,7 @@
 	 * </p>
 	 *
 	 * <p>
-	 * The default value pulls the description from the <code>license</code> entry in the servlet resource bundle.
+	 * The default value pulls the description from the <c>license</c> entry in the servlet resource bundle.
 	 * (e.g. <js>"license = {name:'Apache 2.0',url:'http://www.apache.org/licenses/LICENSE-2.0.html'}"</js> or
 	 * <js>"MyServlet.license = {name:'Apache 2.0',url:'http://www.apache.org/licenses/LICENSE-2.0.html'}"</js>).
 	 *
@@ -215,7 +215,7 @@
 	License license() default @License;
 
 	/**
-	 * Defines the swagger field <code>/tags</code>.
+	 * Defines the swagger field <c>/tags</c>.
 	 *
 	 *
 	 * Optional tagging information for the exposed API.
@@ -239,7 +239,7 @@
 	 * </p>
 	 *
 	 * <p>
-	 * The default value pulls the description from the <code>tags</code> entry in the servlet resource bundle.
+	 * The default value pulls the description from the <c>tags</c> entry in the servlet resource bundle.
 	 * (e.g. <js>"tags = [{name:'Foo',description:'Foobar'}]"</js> or
 	 * <js>"MyServlet.tags = [{name:'Foo',description:'Foobar'}]"</js>).
 	 *
@@ -265,7 +265,7 @@
 	Tag[] tags() default {};
 
 	/**
-	 * Defines the swagger field <code>/info/termsOfService</code>.
+	 * Defines the swagger field <c>/info/termsOfService</c>.
 	 *
 	 *
 	 * Optional servlet terms-of-service for this API.
@@ -274,7 +274,7 @@
 	 * It is used to populate the Swagger terms-of-service field.
 	 *
 	 * <p>
-	 * The default value pulls the description from the <code>termsOfService</code> entry in the servlet resource bundle.
+	 * The default value pulls the description from the <c>termsOfService</c> entry in the servlet resource bundle.
 	 * (e.g. <js>"termsOfService = foo"</js> or <js>"MyServlet.termsOfService = foo"</js>).
 	 *
 	 * <h5 class='section'>Notes:</h5>
@@ -290,7 +290,7 @@
 	String[] termsOfService() default {};
 
 	/**
-	 * Defines the swagger field <code>/info/version</code>.
+	 * Defines the swagger field <c>/info/version</c>.
 	 *
 	 *
 	 *
@@ -300,7 +300,7 @@
 	 * It is used to populate the Swagger version field and to display on HTML pages.
 	 *
 	 * <p>
-	 * The default value pulls the description from the <code>version</code> entry in the servlet resource bundle.
+	 * The default value pulls the description from the <c>version</c> entry in the servlet resource bundle.
 	 * (e.g. <js>"version = 2.0"</js> or <js>"MyServlet.version = 2.0"</js>).
 	 *
 	 * <h5 class='section'>Notes:</h5>
@@ -410,7 +410,7 @@
 	 * 	<li>
 	 * 		The format is a {@doc juneau-marshall.JsonDetails.SimplifiedJson} object.
 	 * 	<li>
-	 * 		The leading/trailing <code>{ }</code> characters are optional.
+	 * 		The leading/trailing <c>{ }</c> characters are optional.
 	 * 		<br>The following two example are considered equivalent:
 	 * 		<p class='bcode w800'>
 	 * 	<ja>@ResourceSwagger</ja>(<js>"{title:'Petstore application'}"</js>)
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestMethod.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestMethod.java
index 244242c..d1aecb1 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestMethod.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestMethod.java
@@ -284,10 +284,10 @@
 	Class<? extends RestConverter>[] converters() default {};

 

 	/**

-	 * Default <code>Accept</code> header.

+	 * Default <c>Accept</c> header.

 	 *

 	 * <p>

-	 * The default value for the <code>Accept</code> header if not specified on a request.

+	 * The default value for the <c>Accept</c> header if not specified on a request.

 	 *

 	 * <p>

 	 * This is a shortcut for using {@link #defaultRequestHeaders()} for just this specific header.

@@ -315,10 +315,10 @@
 	String defaultCharset() default "";

 

 	/**

-	 * Default <code>Content-Type</code> header.

+	 * Default <c>Content-Type</c> header.

 	 *

 	 * <p>

-	 * The default value for the <code>Content-Type</code> header if not specified on a request.

+	 * The default value for the <c>Content-Type</c> header if not specified on a request.

 	 *

 	 * <p>

 	 * This is a shortcut for using {@link #defaultRequestHeaders()} for just this specific header.

@@ -426,7 +426,7 @@
 	 * <h5 class='section'>Notes:</h5>

 	 * <ul class='spaced-list'>

 	 * 	<li>

-	 * 		Corresponds to the swagger field <code>/paths/{path}/{method}/description</code>.

+	 * 		Corresponds to the swagger field <c>/paths/{path}/{method}/description</c>.

 	 * 	<li>

 	 * 		Supports {@doc DefaultRestSvlVariables}

 	 * 		(e.g. <js>"$L{my.localized.variable}"</js>).

@@ -569,7 +569,7 @@
 	 * 		<js>""</js>

 	 * 		- Auto-detect.

 	 * 		<br>The method name is determined based on the Java method name.

-	 * 		<br>For example, if the method is <code>doPost(...)</code>, then the method name is automatically detected

+	 * 		<br>For example, if the method is <c>doPost(...)</c>, then the method name is automatically detected

 	 * 		as <js>"POST"</js>.

 	 * 		<br>Otherwise, defaults to <js>"GET"</js>.

 	 * 	<li>

@@ -577,14 +577,14 @@
 	 * 		- Remote-proxy interface.

 	 * 		<br>This denotes a Java method that returns an object (usually an interface, often annotated with the

 	 * 		{@link RemoteInterface @RemoteInterface} annotation) to be used as a remote proxy using

-	 * 		<code>RestClient.getRemoteInterface(Class&lt;T&gt; interfaceClass, String url)</code>.

+	 * 		<c>RestClient.getRemoteInterface(Class&lt;T&gt; interfaceClass, String url)</c>.

 	 * 		<br>This allows you to construct client-side interface proxies using REST as a transport medium.

-	 * 		<br>Conceptually, this is simply a fancy <code>POST</code> against the url <js>"/{path}/{javaMethodName}"</js>

+	 * 		<br>Conceptually, this is simply a fancy <c>POST</c> against the url <js>"/{path}/{javaMethodName}"</js>

 	 * 		where the arguments are marshalled from the client to the server as an HTTP body containing an array of

 	 * 		objects, passed to the method as arguments, and then the resulting object is marshalled back to the client.

 	 * 	<li>

 	 * 		Anything else

-	 * 		- Overloaded non-HTTP-standard names that are passed in through a <code>&amp;method=methodName</code> URL

+	 * 		- Overloaded non-HTTP-standard names that are passed in through a <c>&amp;method=methodName</c> URL

 	 * 		parameter.

 	 * </ul>

 	 */

@@ -724,7 +724,7 @@
 	 * To force path patterns to be checked before other path patterns, use a higher priority number.

 	 *

 	 * <p>

-	 * By default, it's <code>0</code>, which means it will use an internal heuristic to determine a best match.

+	 * By default, it's <c>0</c>, which means it will use an internal heuristic to determine a best match.

 	 */

 	int priority() default 0;

 

@@ -732,7 +732,7 @@
 	 * Same as {@link RestResource#properties() @RestResource(properties)}, except defines property values by default when this method is called.

 	 *

 	 * <p>

-	 * This is equivalent to simply calling <code>res.addProperties()</code> in the Java method, but is provided for

+	 * This is equivalent to simply calling <c>res.addProperties()</c> in the Java method, but is provided for

 	 * convenience.

 	 */

 	Property[] properties() default {};

@@ -876,7 +876,7 @@
 	 * <h5 class='section'>Notes:</h5>

 	 * <ul class='spaced-list'>

 	 * 	<li>

-	 * 		Corresponds to the swagger field <code>/paths/{path}/{method}/summary</code>.

+	 * 		Corresponds to the swagger field <c>/paths/{path}/{method}/summary</c>.

 	 * 	<li>

 	 * 		Supports {@doc DefaultRestSvlVariables}

 	 * 		(e.g. <js>"$L{my.localized.variable}"</js>).

diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestResource.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestResource.java
index e190052..cc5f4e6 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestResource.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestResource.java
@@ -111,13 +111,13 @@
 	 * Configuration property:  Allowed method headers.

 	 *

 	 * <p>

-	 * A comma-delimited list of HTTP method names that are allowed to be passed as values in an <code>X-Method</code> HTTP header

+	 * A comma-delimited list of HTTP method names that are allowed to be passed as values in an <c>X-Method</c> HTTP header

 	 * to override the real HTTP method name.

 	 * <p>

 	 * Allows you to override the actual HTTP method with a simulated method.

-	 * <br>For example, if an HTTP Client API doesn't support <code>PATCH</code> but does support <code>POST</code> (because

-	 * <code>PATCH</code> is not part of the original HTTP spec), you can add a <code>X-Method: PATCH</code> header on a normal

-	 * <code>HTTP POST /foo</code> request call which will make the HTTP call look like a <code>PATCH</code> request in any of the REST APIs.

+	 * <br>For example, if an HTTP Client API doesn't support <c>PATCH</c> but does support <c>POST</c> (because

+	 * <c>PATCH</c> is not part of the original HTTP spec), you can add a <c>X-Method: PATCH</c> header on a normal

+	 * <c>HTTP POST /foo</c> request call which will make the HTTP call look like a <c>PATCH</c> request in any of the REST APIs.

 	 *

 	 * <h5 class='section'>Notes:</h5>

 	 * <ul class='spaced-list'>

@@ -299,7 +299,7 @@
 	 * 		Supports {@doc DefaultRestSvlVariables}

 	 * 		(e.g. <js>"$L{my.localized.variable}"</js>).

 	 * 	<li>

-	 * 		Use the keyword <code>SYSTEM_DEFAULT</code> to refer to the system default configuration

+	 * 		Use the keyword <c>SYSTEM_DEFAULT</c> to refer to the system default configuration

 	 * 		returned by the {@link Config#getSystemDefault()}.

 	 * </ul>

 	 *

@@ -324,10 +324,10 @@
 	Class<? extends RestConverter>[] converters() default {};

 

 	/**

-	 * Default <code>Accept</code> header.

+	 * Default <c>Accept</c> header.

 	 *

 	 * <p>

-	 * The default value for the <code>Accept</code> header if not specified on a request.

+	 * The default value for the <c>Accept</c> header if not specified on a request.

 	 *

 	 * <p>

 	 * This is a shortcut for using {@link #defaultRequestHeaders()} for just this specific header.

@@ -362,10 +362,10 @@
 	String defaultCharset() default "";

 

 	/**

-	 * Default <code>Content-Type</code> header.

+	 * Default <c>Content-Type</c> header.

 	 *

 	 * <p>

-	 * The default value for the <code>Content-Type</code> header if not specified on a request.

+	 * The default value for the <c>Content-Type</c> header if not specified on a request.

 	 *

 	 * <p>

 	 * This is a shortcut for using {@link #defaultRequestHeaders()} for just this specific header.

@@ -626,7 +626,7 @@
 	 *

 	 * <p>

 	 * By default, the Juneau framework will automatically Java method parameters of various types (e.g.

-	 * <code>RestRequest</code>, <code>Accept</code>, <code>Reader</code>).

+	 * <c>RestRequest</c>, <c>Accept</c>, <c>Reader</c>).

 	 * <br>This setting allows you to provide your own resolvers for your own class types that you want resolved.

 	 *

 	 * <h5 class='section'>See Also:</h5>

@@ -708,7 +708,7 @@
 	 * 		On child resources (resource classes attached to parents via the {@link #children()} annotation) to identify

 	 * 		the subpath used to access the child resource relative to the parent.

 	 * 	<li>

-	 * 		On top-level {@link RestServlet} classes deployed as Spring beans when <code>JuneauRestInitializer</code> is being used.

+	 * 		On top-level {@link RestServlet} classes deployed as Spring beans when <c>JuneauRestInitializer</c> is being used.

 	 * </ul>

 	 *

 	 * <h5 class='topic'>On child resources</h5>

@@ -741,16 +741,16 @@
 	 *	}

 	 * </p>

 	 * <p>

-	 * In the example above, assuming the <code>TopLevelResource</code> servlet is deployed to path <code>/myContext/myServlet</code>,

-	 * then the <code>sayHello</code> method is accessible through the URI <code>/myContext/myServlet/child/grandchild</code>.

+	 * In the example above, assuming the <c>TopLevelResource</c> servlet is deployed to path <c>/myContext/myServlet</c>,

+	 * then the <c>sayHello</c> method is accessible through the URI <c>/myContext/myServlet/child/grandchild</c>.

 	 *

 	 * <p>

-	 * Note that in this scenario, the <code>path</code> attribute is not defined on the top-level resource.

+	 * Note that in this scenario, the <c>path</c> attribute is not defined on the top-level resource.

 	 * Specifying the path on the top-level resource has no effect, but can be used for readability purposes.

 	 *

 	 * <h5 class='topic'>On top-level resources deployed as Spring beans</h5>

 	 * <p>

-	 * The path can also be used on top-level resources deployed as Spring beans when used with the <code>JuneauRestInitializer</code>

+	 * The path can also be used on top-level resources deployed as Spring beans when used with the <c>JuneauRestInitializer</c>

 	 * Spring Boot initializer class:

 	 *

 	 * <h5 class='figure'>Example:</h5>

@@ -808,7 +808,7 @@
 	 * Variables can be used on either top-level or child resources and can be defined on multiple levels.

 	 *

 	 * <p>

-	 * All variables in the path must be specified or else the target will not resolve and a <code>404</code> will result.

+	 * All variables in the path must be specified or else the target will not resolve and a <c>404</c> will result.

 	 *

 	 * <p>

 	 * When variables are used on a path of a top-level resource deployed as a Spring bean in a Spring Boot application,

@@ -1194,7 +1194,7 @@
 	 * 		Supports {@doc DefaultRestSvlVariables}

 	 * 		(e.g. <js>"$L{my.localized.variable}"</js>).

 	 * 	<li>

-	 * 		Corresponds to the swagger field <code>/info/title</code>.

+	 * 		Corresponds to the swagger field <c>/info/title</c>.

 	 * </ul>

 	 *

 	 * <h5 class='section'>See Also:</h5>

diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/converters/Introspectable.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/converters/Introspectable.java
index c793d42..b6fa06b 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/converters/Introspectable.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/converters/Introspectable.java
@@ -21,7 +21,7 @@
 

 /**

  * Converter for enablement of {@link PojoIntrospector} support on response objects returned by a

- * <code>@RestMethod</code> method.

+ * <c>@RestMethod</c> method.

  *

  * <p>

  * When enabled, public methods can be called on objects returned through the {@link RestResponse#setOutput(Object)}

@@ -35,10 +35,10 @@
  * Java methods are invoked by passing in the following URL parameters:

  * <ul class='spaced-list'>

  * 	<li>

- * 		<code>&amp;invokeMethod</code> - The Java method name, optionally with arguments if necessary to

+ * 		<c>&amp;invokeMethod</c> - The Java method name, optionally with arguments if necessary to

  * 		differentiate between methods.

  * 	<li>

- * 		<code>&amp;invokeArgs</code> - The arguments as an array.

+ * 		<c>&amp;invokeArgs</c> - The arguments as an array.

  * </ul>

  *

  * <h5 class='section'>See Also:</h5>

diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/converters/Queryable.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/converters/Queryable.java
index d8d7e63..1daafc2 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/converters/Queryable.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/converters/Queryable.java
@@ -16,7 +16,7 @@
 import org.apache.juneau.utils.*;

 

 /**

- * Converter for enabling of {@link PojoQuery} support on response objects returned by a <code>@RestMethod</code> method.

+ * Converter for enabling of {@link PojoQuery} support on response objects returned by a <c>@RestMethod</c> method.

  *

  * <p>

  * When enabled, objects in a POJO tree can be filtered using the functionality described in the {@link PojoQuery}

@@ -27,21 +27,21 @@
  * arrays of beans, etc...):

  * <ul class='spaced-list'>

  * 	<li>

- * 		<code>&amp;s=</code> Search arguments.

+ * 		<c>&amp;s=</c> Search arguments.

  * 		<br>Comma-delimited list of key/value pairs representing column names and search tokens.

  * 		<br>Example:

  * 		<p class='bcode w800'>

  * 	&amp;s=name=Bill*,birthDate&gt;2000

  * 		</p>

  * 	<li>

- * 		<code>&amp;v=</code> Visible columns.

+ * 		<c>&amp;v=</c> Visible columns.

  * 		<br>Comma-delimited list of column names to display.

  * 		<br>Example:

  * 		<p class='bcode w800'>

  * 	&amp;v=name,birthDate

  * 		</p>

  * 	<li>

- * 		<code>&amp;o=</code> Sort commands.

+ * 		<c>&amp;o=</c> Sort commands.

  * 		<br>Comma-delimited list of columns to sort by.

  * 		<br>Column names can be suffixed with <js>'+'</js> or <js>'-'</js> to indicate ascending or descending order.

  * 		<br>The default is ascending order.

@@ -50,14 +50,14 @@
  * 	&amp;o=name,birthDate-

  * 		</p>

  * 	<li>

- * 		<code>&amp;i=</code> Case-insensitive parameter.

+ * 		<c>&amp;i=</c> Case-insensitive parameter.

  * 		<br>Boolean flag for case-insensitive matching on the search parameters.

  * 	<li>

- * 		<code>&amp;p=</code> - Position parameter.

+ * 		<c>&amp;p=</c> - Position parameter.

  * 		<br>Only return rows starting at the specified index position (zero-indexed).

  * 		<br>Default is {@code 0}.

  * 	<li>

- * 		<code>&amp;l=</code> Limit parameter.

+ * 		<c>&amp;l=</c> Limit parameter.

  * 		<br>Only return the specified number of rows.

  * 		<br>Default is {@code 0} (meaning return all rows).

  * </ul>

diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/converters/Traversable.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/converters/Traversable.java
index b381a22..523e76b 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/converters/Traversable.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/converters/Traversable.java
@@ -19,7 +19,7 @@
 import org.apache.juneau.utils.*;

 

 /**

- * Converter for enabling of {@link PojoRest} support on response objects returned by a <code>@RestMethod</code> method.

+ * Converter for enabling of {@link PojoRest} support on response objects returned by a <c>@RestMethod</c> method.

  *

  * <p>

  * When enabled, objects in a POJO tree returned by the REST method can be addressed through additional URL path

diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/exception/Unauthorized.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/exception/Unauthorized.java
index 43730d1..e0268c7 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/exception/Unauthorized.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/exception/Unauthorized.java
@@ -23,7 +23,7 @@
  * Exception representing an HTTP 401 (Unauthorized).
  *
  * <p>
- * Similar to <code>403 Forbidden</code>, but specifically for use when authentication is required and has failed or has not yet been provided.
+ * Similar to <c>403 Forbidden</c>, but specifically for use when authentication is required and has failed or has not yet been provided.
  * <br>The response must include a WWW-Authenticate header field containing a challenge applicable to the requested resource.
  * <br>401 semantically means "unauthenticated",i.e. the user does not have the necessary credentials.
  * <br>Note: Some sites issue HTTP 401 when an IP address is banned from the website (usually the website domain) and that specific address is refused permission to access a website.
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/helper/ResolvingReaderResource.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/helper/ResolvingReaderResource.java
index 5a17752..b033a95 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/helper/ResolvingReaderResource.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/helper/ResolvingReaderResource.java
@@ -53,10 +53,10 @@
 	 * 	<br>If multiple contents are specified, the results will be concatenated.
 	 * 	<br>Contents can be any of the following:
 	 * 	<ul>
-	 * 		<li><code>InputStream</code>
-	 * 		<li><code>Reader</code> - Converted to UTF-8 bytes.
-	 * 		<li><code>File</code>
-	 * 		<li><code>CharSequence</code> - Converted to UTF-8 bytes.
+	 * 		<li><c>InputStream</c>
+	 * 		<li><c>Reader</c> - Converted to UTF-8 bytes.
+	 * 		<li><c>File</c>
+	 * 		<li><c>CharSequence</c> - Converted to UTF-8 bytes.
 	 * 	</ul>
 	 * @throws IOException
 	 */
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/mock/MockHttpSession.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/mock/MockHttpSession.java
index 4bf2180..09bb510 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/mock/MockHttpSession.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/mock/MockHttpSession.java
@@ -20,7 +20,7 @@
 /**
  * An implementation of {@link HttpSession} for mocking purposes.
  *
- * @deprecated Use <code>org.apache.juneau.rest.mock2</code>
+ * @deprecated Use <c>org.apache.juneau.rest.mock2</c>
  */
 @Deprecated
 public class MockHttpSession implements HttpSession {
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/mock/MockRest.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/mock/MockRest.java
index a5682be..93e5283 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/mock/MockRest.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/mock/MockRest.java
@@ -49,7 +49,7 @@
  *  }
  * </p>
  *
- * @deprecated Use <code>org.apache.juneau.rest.mock2</code>
+ * @deprecated Use <c>org.apache.juneau.rest.mock2</c>
  */
 @Deprecated
 public class MockRest implements MockHttpConnection {
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/mock/MockServletRequest.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/mock/MockServletRequest.java
index b6d7cfa..c74916e 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/mock/MockServletRequest.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/mock/MockServletRequest.java
@@ -31,7 +31,7 @@
 /**
  * An implementation of {@link HttpServletRequest} for mocking purposes.
  *
- * @deprecated Use <code>org.apache.juneau.rest.mock2</code>
+ * @deprecated Use <c>org.apache.juneau.rest.mock2</c>
  */
 @Deprecated
 public class MockServletRequest implements HttpServletRequest, MockHttpRequest {
@@ -79,8 +79,8 @@
 	 *
 	 * Initialized with the following:
 	 * <ul>
-	 * 	<li><code>"Accept: text/json+simple"</code>
-	 * 	<li><code>"Content-Type: text/json"</code>
+	 * 	<li><c>"Accept: text/json+simple"</c>
+	 * 	<li><c>"Content-Type: text/json"</c>
 	 * </ul>
 	 *
 	 * @return A new request.
@@ -95,8 +95,8 @@
 	 *
 	 * Initialized with the following:
 	 * <ul>
-	 * 	<li><code>"Accept: text/json+simple"</code>
-	 * 	<li><code>"Content-Type: text/json"</code>
+	 * 	<li><c>"Accept: text/json+simple"</c>
+	 * 	<li><c>"Content-Type: text/json"</c>
 	 * </ul>
 	 *
 	 * @param method The HTTP method  name.
@@ -112,7 +112,7 @@
 	}
 
 	/**
-	 * Convenience method for setting <code>Accept</code> and <code>Content-Type</code> headers to <js>"application/json"</js>.
+	 * Convenience method for setting <c>Accept</c> and <c>Content-Type</c> headers to <js>"application/json"</js>.
 	 *
 	 * @return This object (for method chaining).
 	 */
@@ -121,7 +121,7 @@
 	}
 
 	/**
-	 * Convenience method for setting <code>Accept</code> and <code>Content-Type</code> headers to <js>"text/xml"</js>.
+	 * Convenience method for setting <c>Accept</c> and <c>Content-Type</c> headers to <js>"text/xml"</js>.
 	 *
 	 * @return This object (for method chaining).
 	 */
@@ -130,7 +130,7 @@
 	}
 
 	/**
-	 * Convenience method for setting <code>Accept</code> and <code>Content-Type</code> headers to <js>"text/html"</js>.
+	 * Convenience method for setting <c>Accept</c> and <c>Content-Type</c> headers to <js>"text/html"</js>.
 	 *
 	 * @return This object (for method chaining).
 	 */
@@ -139,7 +139,7 @@
 	}
 
 	/**
-	 * Convenience method for setting <code>Accept</code> and <code>Content-Type</code> headers to <js>"text/plain"</js>.
+	 * Convenience method for setting <c>Accept</c> and <c>Content-Type</c> headers to <js>"text/plain"</js>.
 	 *
 	 * @return This object (for method chaining).
 	 */
@@ -148,7 +148,7 @@
 	}
 
 	/**
-	 * Convenience method for setting <code>Accept</code> and <code>Content-Type</code> headers to <js>"octal/msgpack"</js>.
+	 * Convenience method for setting <c>Accept</c> and <c>Content-Type</c> headers to <js>"octal/msgpack"</js>.
 	 *
 	 * @return This object (for method chaining).
 	 */
@@ -157,7 +157,7 @@
 	}
 
 	/**
-	 * Convenience method for setting <code>Accept</code> and <code>Content-Type</code> headers to <js>"text/uon"</js>.
+	 * Convenience method for setting <c>Accept</c> and <c>Content-Type</c> headers to <js>"text/uon"</js>.
 	 *
 	 * @return This object (for method chaining).
 	 */
@@ -166,7 +166,7 @@
 	}
 
 	/**
-	 * Convenience method for setting <code>Accept</code> and <code>Content-Type</code> headers to <js>"application/x-www-form-urlencoded"</js>.
+	 * Convenience method for setting <c>Accept</c> and <c>Content-Type</c> headers to <js>"application/x-www-form-urlencoded"</js>.
 	 *
 	 * @return This object (for method chaining).
 	 */
@@ -175,7 +175,7 @@
 	}
 
 	/**
-	 * Convenience method for setting <code>Accept</code> and <code>Content-Type</code> headers to <js>"text/yaml"</js>.
+	 * Convenience method for setting <c>Accept</c> and <c>Content-Type</c> headers to <js>"text/yaml"</js>.
 	 *
 	 * @return This object (for method chaining).
 	 */
@@ -1060,7 +1060,7 @@
 	//=================================================================================================================
 
 	/**
-	 * Specifies the <code>Accept</code> header value on the request.
+	 * Specifies the <c>Accept</c> header value on the request.
 	 *
 	 * @param value The new value.
 	 * @return This object (for method chaining).
@@ -1070,7 +1070,7 @@
 	}
 
 	/**
-	 * Specifies the <code>Accept-Charset</code> header value on the request.
+	 * Specifies the <c>Accept-Charset</c> header value on the request.
 	 *
 	 * @param value The new value.
 	 * @return This object (for method chaining).
@@ -1080,7 +1080,7 @@
 	}
 
 	/**
-	 * Specifies the <code>Accept-Encoding</code> header value on the request.
+	 * Specifies the <c>Accept-Encoding</c> header value on the request.
 	 *
 	 * @param value The new value.
 	 * @return This object (for method chaining).
@@ -1090,7 +1090,7 @@
 	}
 
 	/**
-	 * Specifies the <code>Accept-Language</code> header value on the request.
+	 * Specifies the <c>Accept-Language</c> header value on the request.
 	 *
 	 * @param value The new value.
 	 * @return This object (for method chaining).
@@ -1100,7 +1100,7 @@
 	}
 
 	/**
-	 * Specifies the <code>Authorization</code> header value on the request.
+	 * Specifies the <c>Authorization</c> header value on the request.
 	 *
 	 * @param value The new value for the header.
 	 * @return This object (for method chaining).
@@ -1110,7 +1110,7 @@
 	}
 
 	/**
-	 * Specifies the <code>Cache-Control</code> header value on the request.
+	 * Specifies the <c>Cache-Control</c> header value on the request.
 	 *
 	 * @param value The new value for the header.
 	 * @return This object (for method chaining).
@@ -1120,7 +1120,7 @@
 	}
 
 	/**
-	 * Specifies the <code>X-Client-Version</code> header value on the request.
+	 * Specifies the <c>X-Client-Version</c> header value on the request.
 	 *
 	 * @param value The new value.
 	 * @return This object (for method chaining).
@@ -1130,7 +1130,7 @@
 	}
 
 	/**
-	 * Specifies the <code>Connection</code> header value on the request.
+	 * Specifies the <c>Connection</c> header value on the request.
 	 *
 	 * @param value The new value for the header.
 	 * @return This object (for method chaining).
@@ -1140,7 +1140,7 @@
 	}
 
 	/**
-	 * Specifies the <code>Content-Encoding</code> header value on the request.
+	 * Specifies the <c>Content-Encoding</c> header value on the request.
 	 *
 	 * @param value The new value.
 	 * @return This object (for method chaining).
@@ -1150,7 +1150,7 @@
 	}
 
 	/**
-	 * Specifies the <code>Content-Length</code> header value on the request.
+	 * Specifies the <c>Content-Length</c> header value on the request.
 	 *
 	 * @param value The new value for the header.
 	 * @return This object (for method chaining).
@@ -1160,7 +1160,7 @@
 	}
 
 	/**
-	 * Specifies the <code>Content-Type</code> header value on the request.
+	 * Specifies the <c>Content-Type</c> header value on the request.
 	 *
 	 * @param value The new value.
 	 * @return This object (for method chaining).
@@ -1170,7 +1170,7 @@
 	}
 
 	/**
-	 * Specifies the <code>Date</code> header value on the request.
+	 * Specifies the <c>Date</c> header value on the request.
 	 *
 	 * @param value The new value for the header.
 	 * @return This object (for method chaining).
@@ -1180,7 +1180,7 @@
 	}
 
 	/**
-	 * Specifies the <code>Expect</code> header value on the request.
+	 * Specifies the <c>Expect</c> header value on the request.
 	 *
 	 * @param value The new value for the header.
 	 * @return This object (for method chaining).
@@ -1190,7 +1190,7 @@
 	}
 
 	/**
-	 * Specifies the <code>From</code> header value on the request.
+	 * Specifies the <c>From</c> header value on the request.
 	 *
 	 * @param value The new value for the header.
 	 * @return This object (for method chaining).
@@ -1200,7 +1200,7 @@
 	}
 
 	/**
-	 * Specifies the <code>Host</code> header value on the request.
+	 * Specifies the <c>Host</c> header value on the request.
 	 *
 	 * @param value The new value for the header.
 	 * @return This object (for method chaining).
@@ -1210,7 +1210,7 @@
 	}
 
 	/**
-	 * Specifies the <code>If-Match</code> header value on the request.
+	 * Specifies the <c>If-Match</c> header value on the request.
 	 *
 	 * @param value The new value for the header.
 	 * @return This object (for method chaining).
@@ -1220,7 +1220,7 @@
 	}
 
 	/**
-	 * Specifies the <code>If-Modified-Since</code> header value on the request.
+	 * Specifies the <c>If-Modified-Since</c> header value on the request.
 	 *
 	 * @param value The new value for the header.
 	 * @return This object (for method chaining).
@@ -1230,7 +1230,7 @@
 	}
 
 	/**
-	 * Specifies the <code>If-None-Match</code> header value on the request.
+	 * Specifies the <c>If-None-Match</c> header value on the request.
 	 *
 	 * @param value The new value for the header.
 	 * @return This object (for method chaining).
@@ -1240,7 +1240,7 @@
 	}
 
 	/**
-	 * Specifies the <code>If-Range</code> header value on the request.
+	 * Specifies the <c>If-Range</c> header value on the request.
 	 *
 	 * @param value The new value for the header.
 	 * @return This object (for method chaining).
@@ -1250,7 +1250,7 @@
 	}
 
 	/**
-	 * Specifies the <code>If-Unmodified-Since</code> header value on the request.
+	 * Specifies the <c>If-Unmodified-Since</c> header value on the request.
 	 *
 	 * @param value The new value for the header.
 	 * @return This object (for method chaining).
@@ -1260,7 +1260,7 @@
 	}
 
 	/**
-	 * Specifies the <code>Max-Forwards</code> header value on the request.
+	 * Specifies the <c>Max-Forwards</c> header value on the request.
 	 *
 	 * @param value The new value for the header.
 	 * @return This object (for method chaining).
@@ -1270,7 +1270,7 @@
 	}
 
 	/**
-	 * Specifies the <code>Pragma</code> header value on the request.
+	 * Specifies the <c>Pragma</c> header value on the request.
 	 *
 	 * @param value The new value for the header.
 	 * @return This object (for method chaining).
@@ -1280,7 +1280,7 @@
 	}
 
 	/**
-	 * Specifies the <code>Proxy-Authorization</code> header value on the request.
+	 * Specifies the <c>Proxy-Authorization</c> header value on the request.
 	 *
 	 * @param value The new value for the header.
 	 * @return This object (for method chaining).
@@ -1290,7 +1290,7 @@
 	}
 
 	/**
-	 * Specifies the <code>Range</code> header value on the request.
+	 * Specifies the <c>Range</c> header value on the request.
 	 *
 	 * @param value The new value for the header.
 	 * @return This object (for method chaining).
@@ -1300,7 +1300,7 @@
 	}
 
 	/**
-	 * Specifies the <code>Referer</code> header value on the request.
+	 * Specifies the <c>Referer</c> header value on the request.
 	 *
 	 * @param value The new value for the header.
 	 * @return This object (for method chaining).
@@ -1310,7 +1310,7 @@
 	}
 
 	/**
-	 * Specifies the <code>TE</code> header value on the request.
+	 * Specifies the <c>TE</c> header value on the request.
 	 *
 	 * @param value The new value for the header.
 	 * @return This object (for method chaining).
@@ -1320,7 +1320,7 @@
 	}
 
 	/**
-	 * Specifies the <code>Upgrade</code> header value on the request.
+	 * Specifies the <c>Upgrade</c> header value on the request.
 	 *
 	 * @param value The new value for the header.
 	 * @return This object (for method chaining).
@@ -1330,7 +1330,7 @@
 	}
 
 	/**
-	 * Specifies the <code>User-Agent</code> header value on the request.
+	 * Specifies the <c>User-Agent</c> header value on the request.
 	 *
 	 * @param value The new value for the header.
 	 * @return This object (for method chaining).
@@ -1340,7 +1340,7 @@
 	}
 
 	/**
-	 * Specifies the <code>Warning</code> header value on the request.
+	 * Specifies the <c>Warning</c> header value on the request.
 	 *
 	 * @param value The new value for the header.
 	 * @return This object (for method chaining).
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/mock/MockServletResponse.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/mock/MockServletResponse.java
index bf2863e..f00f261 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/mock/MockServletResponse.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/mock/MockServletResponse.java
@@ -29,7 +29,7 @@
 /**
  * An implementation of {@link HttpServletResponse} for mocking purposes.
  *
- * @deprecated Use <code>org.apache.juneau.rest.mock2</code>
+ * @deprecated Use <c>org.apache.juneau.rest.mock2</c>
 */
 @Deprecated
 public class MockServletResponse implements HttpServletResponse, MockHttpResponse {
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/remote/RrpcServlet.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/remote/RrpcServlet.java
index 5ad8728..433da26 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/remote/RrpcServlet.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/remote/RrpcServlet.java
@@ -222,7 +222,7 @@
 	}

 

 	/**

-	 * Return the <code>Class</code> given it's name if it exists in the services map.

+	 * Return the <c>Class</c> given it's name if it exists in the services map.

 	 */

 	private RemoteInterfaceMeta getInterfaceClass(String javaInterface) throws NotFound, Exception {

 		RemoteInterfaceMeta rm = serviceMap.get(javaInterface);

diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/reshandlers/DefaultHandler.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/reshandlers/DefaultHandler.java
index c5be8d9..896eb79 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/reshandlers/DefaultHandler.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/reshandlers/DefaultHandler.java
@@ -37,11 +37,11 @@
  * This uses the serializers defined on the response to serialize the POJO.

  *

  * <p>

- * The {@link Serializer} used is based on the <code>Accept</code> header on the request.

+ * The {@link Serializer} used is based on the <c>Accept</c> header on the request.

  *

  * <p>

- * The <code>Content-Type</code> header is set to the mime-type defined on the selected serializer based on the

- * <code>produces</code> value passed in through the constructor.

+ * The <c>Content-Type</c> header is set to the mime-type defined on the selected serializer based on the

+ * <c>produces</c> value passed in through the constructor.

  *

  * <h5 class='section'>See Also:</h5>

  * <ul>

diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/reshandlers/InputStreamHandler.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/reshandlers/InputStreamHandler.java
index f4c9542..9a1574b 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/reshandlers/InputStreamHandler.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/reshandlers/InputStreamHandler.java
@@ -25,7 +25,7 @@
  * Simply pipes the contents of the {@link InputStream} to {@link RestResponse#getNegotiatedOutputStream()}.

  *

  * <p>

- * Sets the <code>Content-Type</code> response header to whatever was set via {@link RestResponse#setContentType(String)}.

+ * Sets the <c>Content-Type</c> response header to whatever was set via {@link RestResponse#setContentType(String)}.

  *

  * <h5 class='section'>See Also:</h5>

  * <ul>

diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/Accepted.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/Accepted.java
index e704d05..1cfb2f5 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/Accepted.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/Accepted.java
@@ -17,7 +17,7 @@
 import org.apache.juneau.http.annotation.*;
 
 /**
- * Represents an <code>HTTP 202 Accepted</code> response.
+ * Represents an <c>HTTP 202 Accepted</c> response.
  *
  * <p>
  * The request has been accepted for processing, but the processing has not been completed.
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/AlreadyReported.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/AlreadyReported.java
index 8625a87..8ca68e8 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/AlreadyReported.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/AlreadyReported.java
@@ -17,7 +17,7 @@
 import org.apache.juneau.http.annotation.*;
 
 /**
- * Represents an <code>HTTP 208 Already Reported</code> response.
+ * Represents an <c>HTTP 208 Already Reported</c> response.
  *
  * <p>
  * The members of a DAV binding have already been enumerated in a preceding part of the (multistatus) response, and are not being included again.
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/Continue.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/Continue.java
index 86756c9..d551b3c 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/Continue.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/Continue.java
@@ -17,7 +17,7 @@
 import org.apache.juneau.http.annotation.*;
 
 /**
- * Represents an <code>HTTP 100 Continue</code> response.
+ * Represents an <c>HTTP 100 Continue</c> response.
  *
  * <p>
  * The server has received the request headers and the client should proceed to send the request body (in the case of a request for which a body needs to be sent; for example, a POST request).
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/Created.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/Created.java
index bc8d17e..0fbb45a 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/Created.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/Created.java
@@ -17,7 +17,7 @@
 import org.apache.juneau.http.annotation.*;
 
 /**
- * Represents an <code>HTTP 201 Created</code> response.
+ * Represents an <c>HTTP 201 Created</c> response.
  *
  * <p>
  * The request has been fulfilled, resulting in the creation of a new resource.
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/EarlyHints.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/EarlyHints.java
index 28e05a5..98c36e7 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/EarlyHints.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/EarlyHints.java
@@ -17,7 +17,7 @@
 import org.apache.juneau.http.annotation.*;
 
 /**
- * Represents an <code>HTTP 103 Early Hints</code> response.
+ * Represents an <c>HTTP 103 Early Hints</c> response.
  *
  * <p>
  * Used to return some response headers before final HTTP message.
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/Found.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/Found.java
index d2ce146..c01066f 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/Found.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/Found.java
@@ -20,7 +20,7 @@
 import org.apache.juneau.http.annotation.*;
 
 /**
- * Represents an <code>HTTP 302 Found</code> response.
+ * Represents an <c>HTTP 302 Found</c> response.
  *
  * <p>
  * Tells the client to look at (browse to) another url. 302 has been superseded by 303 and 307.
@@ -66,7 +66,7 @@
 	/**
 	 * Constructor using custom message.
 	 * @param message Message to send as the response.
-	 * @param location <code>Location</code> header value.
+	 * @param location <c>Location</c> header value.
 	 */
 	public Found(String message, URI location) {
 		super(message);
@@ -75,14 +75,14 @@
 
 	/**
 	 * Constructor.
-	 * @param location <code>Location</code> header value.
+	 * @param location <c>Location</c> header value.
 	 */
 	public Found(URI location) {
 		this(MESSAGE, location);
 	}
 
 	/**
-	 * @return <code>Location</code> header value.
+	 * @return <c>Location</c> header value.
 	 */
 	@ResponseHeader(name="Location", description="Location of resource.")
 	public URI getLocation() {
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/IMUsed.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/IMUsed.java
index a6987cc..0300590 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/IMUsed.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/IMUsed.java
@@ -17,7 +17,7 @@
 import org.apache.juneau.http.annotation.*;
 
 /**
- * Represents an <code>HTTP 226 IM Used</code> response.
+ * Represents an <c>HTTP 226 IM Used</c> response.
  *
  * <p>
  * The server has fulfilled a request for the resource, and the response is a representation of the result of one or more instance-manipulations applied to the current instance.
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/MovedPermanently.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/MovedPermanently.java
index 968e00a..32ec695 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/MovedPermanently.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/MovedPermanently.java
@@ -20,7 +20,7 @@
 import org.apache.juneau.http.annotation.*;
 
 /**
- * Represents an <code>HTTP 301 Moved Permanently</code> response.
+ * Represents an <c>HTTP 301 Moved Permanently</c> response.
  *
  * <p>
  * This and all future requests should be directed to the given URI.
@@ -62,7 +62,7 @@
 	/**
 	 * Constructor using custom message.
 	 * @param message Message to send as the response.
-	 * @param location <code>Location</code> header value.
+	 * @param location <c>Location</c> header value.
 	 */
 	public MovedPermanently(String message, URI location) {
 		super(message);
@@ -71,14 +71,14 @@
 
 	/**
 	 * Constructor.
-	 * @param location <code>Location</code> header value.
+	 * @param location <c>Location</c> header value.
 	 */
 	public MovedPermanently(URI location) {
 		this(MESSAGE, location);
 	}
 
 	/**
-	 * @return <code>Location</code> header value.
+	 * @return <c>Location</c> header value.
 	 */
 	@ResponseHeader(name="Location", description="New location of resource.")
 	public URI getLocation() {
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/MultiStatus.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/MultiStatus.java
index ea321fc..fdecc73 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/MultiStatus.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/MultiStatus.java
@@ -17,7 +17,7 @@
 import org.apache.juneau.http.annotation.*;
 
 /**
- * Represents an <code>HTTP 207 Multi-Status</code> response.
+ * Represents an <c>HTTP 207 Multi-Status</c> response.
  *
  * <p>
  * The message body that follows is by default an XML message and can contain a number of separate response codes, depending on how many sub-requests were made.
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/MultipleChoices.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/MultipleChoices.java
index a1dabeb..e7e1a31 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/MultipleChoices.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/MultipleChoices.java
@@ -17,7 +17,7 @@
 import org.apache.juneau.http.annotation.*;
 
 /**
- * Represents an <code>HTTP 300 Multiple Choices</code> response.
+ * Represents an <c>HTTP 300 Multiple Choices</c> response.
  *
  * <p>
  * Indicates multiple options for the resource from which the client may choose (via agent-driven content negotiation).
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/NoContent.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/NoContent.java
index 41f037d..55dee7e 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/NoContent.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/NoContent.java
@@ -17,7 +17,7 @@
 import org.apache.juneau.http.annotation.*;
 
 /**
- * Represents an <code>HTTP 204 No Content</code> response.
+ * Represents an <c>HTTP 204 No Content</c> response.
  *
  * <p>
  * The server successfully processed the request and is not returning any content.
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/NonAuthoritiveInformation.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/NonAuthoritiveInformation.java
index 9c8f460..1945e40 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/NonAuthoritiveInformation.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/NonAuthoritiveInformation.java
@@ -17,7 +17,7 @@
 import org.apache.juneau.http.annotation.*;
 
 /**
- * Represents an <code>HTTP 203 Non-Authoritative Information</code> response.
+ * Represents an <c>HTTP 203 Non-Authoritative Information</c> response.
  *
  * <p>
  * The server is a transforming proxy (e.g. a Web accelerator) that received a 200 OK from its origin, but is returning a modified version of the origin's response.
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/NotModified.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/NotModified.java
index b52e60a..ec57653 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/NotModified.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/NotModified.java
@@ -17,7 +17,7 @@
 import org.apache.juneau.http.annotation.*;
 
 /**
- * Represents an <code>HTTP 304 Not Modified</code> response.
+ * Represents an <c>HTTP 304 Not Modified</c> response.
  *
  * <p>
  * Indicates that the resource has not been modified since the version specified by the request headers If-Modified-Since or If-None-Match.
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/Ok.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/Ok.java
index 6edbc44..e14df24 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/Ok.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/Ok.java
@@ -17,7 +17,7 @@
 import org.apache.juneau.http.annotation.*;
 
 /**
- * Represents an <code>HTTP 200 OK</code> response.
+ * Represents an <c>HTTP 200 OK</c> response.
  *
  * <p>
  * Standard response for successful HTTP requests. The actual response will depend on the request method used.
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/PartialContent.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/PartialContent.java
index 68db526..eb7020b 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/PartialContent.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/PartialContent.java
@@ -17,7 +17,7 @@
 import org.apache.juneau.http.annotation.*;
 
 /**
- * Represents an <code>HTTP 206 Partial Content</code> response.
+ * Represents an <c>HTTP 206 Partial Content</c> response.
  *
  * <p>
  * The server is delivering only part of the resource (byte serving) due to a range header sent by the client.
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/PermanentRedirect.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/PermanentRedirect.java
index cfc5ff4..b155ffb 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/PermanentRedirect.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/PermanentRedirect.java
@@ -20,7 +20,7 @@
 import org.apache.juneau.http.annotation.*;
 
 /**
- * Represents an <code>HTTP 308 Permanent Redirect</code> response.
+ * Represents an <c>HTTP 308 Permanent Redirect</c> response.
  *
  * <p>
  * The request and all future requests should be repeated using another URI. 307 and 308 parallel the behaviors of 302 and 301, but do not allow the HTTP method to change.
@@ -63,7 +63,7 @@
 	/**
 	 * Constructor using custom message.
 	 * @param message Message to send as the response.
-	 * @param location <code>Location</code> header value.
+	 * @param location <c>Location</c> header value.
 	 */
 	public PermanentRedirect(String message, URI location) {
 		super(message);
@@ -72,14 +72,14 @@
 
 	/**
 	 * Constructor.
-	 * @param location <code>Location</code> header value.
+	 * @param location <c>Location</c> header value.
 	 */
 	public PermanentRedirect(URI location) {
 		this(MESSAGE, location);
 	}
 
 	/**
-	 * @return <code>Location</code> header value.
+	 * @return <c>Location</c> header value.
 	 */
 	@ResponseHeader(name="Location", description="New location of resource.")
 	public URI getLocation() {
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/Processing.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/Processing.java
index 5206d5e..e26cad3 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/Processing.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/Processing.java
@@ -17,7 +17,7 @@
 import org.apache.juneau.http.annotation.*;
 
 /**
- * Represents an <code>HTTP 102 Processing</code> response.
+ * Represents an <c>HTTP 102 Processing</c> response.
  *
  * <p>
  * A WebDAV request may contain many sub-requests involving file operations, requiring a long time to complete the request.
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/ResetContent.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/ResetContent.java
index 74ebad9..76a2cbf 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/ResetContent.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/ResetContent.java
@@ -17,7 +17,7 @@
 import org.apache.juneau.http.annotation.*;
 
 /**
- * Represents an <code>HTTP 205 Reset Content</code> response.
+ * Represents an <c>HTTP 205 Reset Content</c> response.
  *
  * <p>
  * The server successfully processed the request, but is not returning any content.
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/SeeOther.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/SeeOther.java
index 7cdc508..2c65e02 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/SeeOther.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/SeeOther.java
@@ -22,7 +22,7 @@
 import org.apache.juneau.http.annotation.*;
 
 /**
- * Represents an <code>HTTP 303 See Other</code> response.
+ * Represents an <c>HTTP 303 See Other</c> response.
  *
  * <p>
  * The response to the request can be found under another URI using the GET method.
@@ -66,7 +66,7 @@
 	 * Constructor using custom message.
 	 *
 	 * @param message Message to send as the response.
-	 * @param location <code>Location</code> header value.
+	 * @param location <c>Location</c> header value.
 	 */
 	public SeeOther(String message, URI location) {
 		super(message);
@@ -87,7 +87,7 @@
 	/**
 	 * Constructor.
 	 *
-	 * @param location <code>Location</code> header value.
+	 * @param location <c>Location</c> header value.
 	 */
 	public SeeOther(URI location) {
 		this(MESSAGE, location);
@@ -104,7 +104,7 @@
 	}
 
 	/**
-	 * @return <code>Location</code> header value.
+	 * @return <c>Location</c> header value.
 	 */
 	@ResponseHeader(name="Location", description="Other location.")
 	public URI getLocation() {
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/SwitchingProtocols.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/SwitchingProtocols.java
index 82fcfcd..611c2ec 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/SwitchingProtocols.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/SwitchingProtocols.java
@@ -17,7 +17,7 @@
 import org.apache.juneau.http.annotation.*;
 
 /**
- * Represents an <code>HTTP 101 Switching Protocols</code> response.
+ * Represents an <c>HTTP 101 Switching Protocols</c> response.
  *
  * <p>
  * The requester has asked the server to switch protocols and the server has agreed to do so.
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/TemporaryRedirect.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/TemporaryRedirect.java
index 221bf77..12a4dbe 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/TemporaryRedirect.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/TemporaryRedirect.java
@@ -20,7 +20,7 @@
 import org.apache.juneau.http.annotation.*;
 
 /**
- * Represents an <code>HTTP 307 Temporary Redirect</code> response.
+ * Represents an <c>HTTP 307 Temporary Redirect</c> response.
  *
  * <p>
  * In this case, the request should be repeated with another URI; however, future requests should still use the original URI.
@@ -64,7 +64,7 @@
 	/**
 	 * Constructor using custom message.
 	 * @param message Message to send as the response.
-	 * @param location <code>Location</code> header value.
+	 * @param location <c>Location</c> header value.
 	 */
 	public TemporaryRedirect(String message, URI location) {
 		super(message);
@@ -73,14 +73,14 @@
 
 	/**
 	 * Constructor.
-	 * @param location <code>Location</code> header value.
+	 * @param location <c>Location</c> header value.
 	 */
 	public TemporaryRedirect(URI location) {
 		this(MESSAGE, location);
 	}
 
 	/**
-	 * @return <code>Location</code> header value.
+	 * @return <c>Location</c> header value.
 	 */
 	@ResponseHeader(name="Location", description="Temporary location of resource.")
 	public URI getLocation() {
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/UseProxy.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/UseProxy.java
index 4454281..b89b26c 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/UseProxy.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/UseProxy.java
@@ -17,7 +17,7 @@
 import org.apache.juneau.http.annotation.*;
 
 /**
- * Represents an <code>HTTP 305 Use Proxy</code> response.
+ * Represents an <c>HTTP 305 Use Proxy</c> response.
  *
  * <p>
  * The requested resource is available only through a proxy, the address for which is provided in the response.
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/util/FinishablePrintWriter.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/util/FinishablePrintWriter.java
index 77f48f6..249cd80 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/util/FinishablePrintWriter.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/util/FinishablePrintWriter.java
@@ -17,7 +17,7 @@
 import org.apache.juneau.encoders.*;
 
 /**
- * A wrapped {@link PrintWriter} with an added <code>finish()</code> method.
+ * A wrapped {@link PrintWriter} with an added <c>finish()</c> method.
  */
 public class FinishablePrintWriter extends PrintWriter implements Finishable {
 
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/util/FinishableServletOutputStream.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/util/FinishableServletOutputStream.java
index 13e8956..e708f0e 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/util/FinishableServletOutputStream.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/util/FinishableServletOutputStream.java
@@ -19,7 +19,7 @@
 import org.apache.juneau.encoders.*;
 
 /**
- * A wrapped {@link ServletOutputStream} with an added <code>finish()</code> method.
+ * A wrapped {@link ServletOutputStream} with an added <c>finish()</c> method.
  */
 public class FinishableServletOutputStream extends ServletOutputStream implements Finishable {
 
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/util/UrlPathPattern.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/util/UrlPathPattern.java
index 1c76627..2f65d5f 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/util/UrlPathPattern.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/util/UrlPathPattern.java
@@ -149,14 +149,14 @@
 	 * The comparator is designed to order URL pattern from most-specific to least-specific.

 	 * For example, the following patterns would be ordered as follows:

 	 * <ol>

-	 * 	<li><code>/foo/bar</code>

-	 * 	<li><code>/foo/bar/*</code>

-	 * 	<li><code>/foo/{id}/bar</code>

-	 * 	<li><code>/foo/{id}/bar/*</code>

-	 * 	<li><code>/foo/{id}</code>

-	 * 	<li><code>/foo/{id}/*</code>

-	 * 	<li><code>/foo</code>

-	 * 	<li><code>/foo/*</code>

+	 * 	<li><c>/foo/bar</c>

+	 * 	<li><c>/foo/bar/*</c>

+	 * 	<li><c>/foo/{id}/bar</c>

+	 * 	<li><c>/foo/{id}/bar/*</c>

+	 * 	<li><c>/foo/{id}</c>

+	 * 	<li><c>/foo/{id}/*</c>

+	 * 	<li><c>/foo</c>

+	 * 	<li><c>/foo/*</c>

 	 * </ol>

 	 */

 	@Override /* Comparable */

diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/widget/ContentTypeMenuItem.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/widget/ContentTypeMenuItem.java
index bafb48b..21cabe5 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/widget/ContentTypeMenuItem.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/widget/ContentTypeMenuItem.java
@@ -30,7 +30,7 @@
  * The variable it resolves is <js>"$W{ContentTypeMenuItem}"</js>.
  *
  * <p>
- * An example of this widget can be found in the <code>PetStoreResource</code> in the examples that provides
+ * An example of this widget can be found in the <c>PetStoreResource</c> in the examples that provides
  * a drop-down menu item for rendering all other supported content types in plain text:
  * <p class='bcode w800'>
  * 	<ja>@RestMethod</ja>(
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/widget/PoweredByApache.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/widget/PoweredByApache.java
index cb68a0f..e929278 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/widget/PoweredByApache.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/widget/PoweredByApache.java
@@ -23,7 +23,7 @@
  *
  * <p>
  * It produces a simple Apache icon floating on the right.
- * Typically it's used in the footer of the page, as shown below in the <code>RootResources</code> from the examples:
+ * Typically it's used in the footer of the page, as shown below in the <c>RootResources</c> from the examples:
  *
  * <p class='bcode'>
  * 	<ja>@RestResource</ja>(
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/widget/Tooltip.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/widget/Tooltip.java
index e42dc31..87f0682 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/widget/Tooltip.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/widget/Tooltip.java
@@ -23,7 +23,7 @@
  * Simple template for adding tooltips to HTML5 bean constructs, typically in menu item widgets.
  *
  * <p>
- * Tooltips depend on the existence of the <code>tooltip</code> and <code>tooltiptext</code> styles that should be
+ * Tooltips depend on the existence of the <c>tooltip</c> and <c>tooltiptext</c> styles that should be
  * present in the stylesheet for the document.
  *
  * <h5 class='section'>See Also:</h5>
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/widget/Widget.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/widget/Widget.java
index 1ee6e6d..ca9561e 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/widget/Widget.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/widget/Widget.java
@@ -182,7 +182,7 @@
 	 * Same as {@link #getClasspathResourceAsString(String)} except also looks for localized-versions of the file.
 	 *
 	 * <p>
-	 * If the <code>locale</code> is specified, then we look for resources whose name matches that locale.
+	 * If the <c>locale</c> is specified, then we look for resources whose name matches that locale.
 	 * <br>For example, if looking for the resource <js>"MyResource.txt"</js> for the Japanese locale, we will look for
 	 * files in the following order:
 	 * <ol>