diff --git a/juneau-doc/docs/ReleaseNotes/8.1.3.html b/juneau-doc/docs/ReleaseNotes/8.1.3.html
index 545aff3..b478575 100644
--- a/juneau-doc/docs/ReleaseNotes/8.1.3.html
+++ b/juneau-doc/docs/ReleaseNotes/8.1.3.html
@@ -84,5 +84,5 @@
 <h5 class='topic w800'>juneau-doc</h5>
 <ul class='spaced-list'>
 	<li>
-		New auto-generated glossary of all configurable properties: {@doc Glossaries.ConfigurablePropertiesGlossary}
+		New auto-generated glossary of all configurable properties: {@doc Glossaries.ConfigurableProperties}
 </ul>
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 65ddcf2..6dc57cd 100644
--- a/juneau-doc/docs/Topics/02.juneau-marshall/01.Serializers.html
+++ b/juneau-doc/docs/Topics/02.juneau-marshall/01.Serializers.html
@@ -98,59 +98,8 @@
 	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:
-</p>
-<ul class='javatree'>
-	<li class='jac'>{@link oaj.serializer.Serializer}
-	<ul>
-		<li class='jac'>{@link oaj.serializer.WriterSerializer}
-		<ul>
-			<li class='jc'>{@link oaj.json.JsonSerializer}
-			<ul>
-			<li class='jc'>{@link oaj.json.JsonSchemaSerializer}
-			<li class='jc'>{@link oaj.json.SimpleJsonSerializer}
-			</ul>
-			<li class='jc'>{@link oaj.plaintext.PlainTextSerializer}
-			<li class='jc'>{@link oaj.jena.RdfSerializer}
-			<ul>
-				<li class='jc'>{@link oaj.jena.N3Serializer}
-				<li class='jc'>{@link oaj.jena.NTripleSerializer}
-				<li class='jc'>{@link oaj.jena.RdfXmlSerializer}
-				<li class='jc'>{@link oaj.jena.RdfXmlAbbrevSerializer}
-				<li class='jc'>{@link oaj.jena.TurtleSerializer}
-			</ul>
-			<li class='jc'>{@link oaj.uon.UonSerializer}
-			<ul>
-				<li class='jc'>{@link oaj.oapi.OpenApiSerializer}
-				<li class='jc'>{@link oaj.urlencoding.UrlEncodingSerializer}
-			</ul>
-			<li class='jc'>{@link oaj.xml.XmlSerializer}
-			<ul>
-				<li class='jc'>{@link oaj.html.HtmlSerializer}
-				<ul>
-					<li class='jc'>{@link oaj.html.HtmlSchemaSerializer}
-					<li class='jc'>{@link oaj.html.HtmlStrippedDocSerializer}
-					<ul>
-						<li class='jc'>{@link oaj.html.HtmlDocSerializer}
-						<ul>
-							<li class='jc'>{@link oaj.html.HtmlSchemaDocSerializer}
-						</ul>
-					</ul>
-				</ul>
-				<li class='jc'>{@link oaj.soap.SoapXmlSerializer}
-				<li class='jc'>{@link oaj.xml.XmlDocSerializer}
-				<li class='jc'>{@link oaj.xmlschema.XmlSchemaSerializer}
-				<ul>
-					<li class='jc'>{@link oaj.xmlschema.XmlSchemaDocSerializer}
-				</ul>
-			</ul>
-		</ul>
-		<li class='jac'>{@link oaj.serializer.OutputStreamSerializer}
-		<ul>
-			<li class='jc'>{@link oaj.jso.JsoSerializer}
-			<li class='jc'>{@link oaj.msgpack.MsgPackSerializer}
-		</ul>
-	</ul>
+
+<ul class='seealso'>
+	<li class='doclink'>{@doc Glossaries.LanguageSupport link} - Glossary of all supported languages.
 </ul>
 
diff --git a/juneau-doc/docs/Topics/02.juneau-marshall/02.Parsers.html b/juneau-doc/docs/Topics/02.juneau-marshall/02.Parsers.html
index 8b99294..932aae6 100644
--- a/juneau-doc/docs/Topics/02.juneau-marshall/02.Parsers.html
+++ b/juneau-doc/docs/Topics/02.juneau-marshall/02.Parsers.html
@@ -89,37 +89,6 @@
 	with escapes.  
 </div>
 
-<p>
-	The class hierarchy for the parsers (excluding specialized subclasses) are:
-</p>
-<ul class='javatree'>
-	<li class='jac'>{@link oaj.parser.Parser}
-	<ul>
-		<li class='jac'>{@link oaj.parser.ReaderParser}
-		<ul>
-			<li class='jc'>{@link oaj.json.JsonParser}
-			<li class='jc'>{@link oaj.plaintext.PlainTextParser}
-			<li class='jc'>{@link oaj.jena.RdfParser}
-			<ul>
-				<li class='jc'>{@link oaj.jena.RdfXmlParser}
-				<li class='jc'>{@link oaj.jena.N3Parser}
-				<li class='jc'>{@link oaj.jena.NTripleParser}
-				<li class='jc'>{@link oaj.jena.TurtleParser}
-			</ul>
-			<li class='jc'>{@link oaj.uon.UonParser}
-			<ul>
-				<li class='jc'>{@link oaj.oapi.OpenApiParser}
-				<li class='jc'>{@link oaj.urlencoding.UrlEncodingParser}
-			</ul>
-			<li class='jc'>{@link oaj.xml.XmlParser}
-			<ul>
-				<li class='jc'>{@link oaj.html.HtmlParser}
-			</ul>
-		</ul>
-		<li class='jac'>{@link oaj.parser.InputStreamParser}
-		<ul>
-			<li class='jc'>{@link oaj.jso.JsoParser}
-			<li class='jc'>{@link oaj.msgpack.MsgPackParser}
-		</ul>
-	</ul>
-</ul>		
+<ul class='seealso'>
+	<li class='doclink'>{@doc Glossaries.LanguageSupport link} - Glossary of all supported languages.
+</ul>
diff --git a/juneau-doc/docs/Topics/02.juneau-marshall/03.Marshalls.html b/juneau-doc/docs/Topics/02.juneau-marshall/03.Marshalls.html
index 4ce4f1b..9e89a55 100644
--- a/juneau-doc/docs/Topics/02.juneau-marshall/03.Marshalls.html
+++ b/juneau-doc/docs/Topics/02.juneau-marshall/03.Marshalls.html
@@ -48,33 +48,8 @@
 	MyPojo myPojo = Json.<jsf>DEFAULT</jsf>.read(string, MyPojo.<jk>class</jk>);
 	String string = Json.<jsf>DEFAULT</jsf>.write(myPojo);
 </p>
-<p>
-	Marshalls exist for all supported languages:
-</p>
-<ul class='javatree'>
-	<li class='jac'>{@link oaj.marshall.Marshall}
-	<ul>
-		<li class='jac'>{@link oaj.marshall.CharMarshall}
-		<ul>
-			<li class='jc'>{@link oaj.marshall.Html}
-			<li class='jc'>{@link oaj.marshall.Json}
-			<li class='jc'>{@link oaj.marshall.PlainText}
-			<li class='jc'>{@link oaj.marshall.SimpleJson}
-			<li class='jc'>{@link oaj.marshall.Uon}
-			<li class='jc'>{@link oaj.marshall.UrlEncoding}
-			<li class='jc'>{@link oaj.marshall.Xml}
-			<li class='jc'>{@link oaj.marshall.N3}
-			<li class='jc'>{@link oaj.marshall.NTriple}
-			<li class='jc'>{@link oaj.marshall.RdfXml}
-			<li class='jc'>{@link oaj.marshall.RdfXmlAbbrev}
-			<li class='jc'>{@link oaj.marshall.Turtle}	
-		</ul>
-		<li class='jac'>{@link oaj.marshall.StreamMarshall}
-		<ul>
-			<li class='jc'>{@link oaj.marshall.Jso}
-			<li class='jc'>{@link oaj.marshall.MsgPack}
-		</ul>
-	</ul>
-</ul>
 
+<ul class='seealso'>
+	<li class='doclink'>{@doc Glossaries.LanguageSupport link} - Glossary of all supported languages.
+</ul>
 
diff --git a/juneau-doc/docs/Topics/02.juneau-marshall/06.ConfigurableProperties.html b/juneau-doc/docs/Topics/02.juneau-marshall/06.ConfigurableProperties.html
index ec00746..90b6a6f 100644
--- a/juneau-doc/docs/Topics/02.juneau-marshall/06.ConfigurableProperties.html
+++ b/juneau-doc/docs/Topics/02.juneau-marshall/06.ConfigurableProperties.html
@@ -13,7 +13,8 @@
  ***************************************************************************************************************************/
  -->
 
-{8.1.3-updated} Configurable Properties
+{8.1.3-updated} 
+Configurable Properties
 
 <p>
 	Serializers and parsers have a wide variety of configurable properties.  They all extend from the 
@@ -88,3 +89,8 @@
 	This setting can be enabled by setting the system property <js>"WriterSerializer.useWhitespace"</js> or environment
 	variables <js>"WriterSerializer_useWhitespace"</js> or <js>"WRITERSERIALIZER_USEWHITESPACE"</js> to <js>"true"</js>.
 </p>
+
+<ul class='seealso'>
+	<li class='doclink'>{@doc Glossaries.ConfigurableProperties link} - Glossary of all configurable properties.
+</ul>
+
diff --git a/juneau-doc/docs/Topics/02.juneau-marshall/06.ConfigurableProperties/01.Common.html b/juneau-doc/docs/Topics/02.juneau-marshall/06.ConfigurableProperties/01.Common.html
deleted file mode 100644
index 87b429c..0000000
--- a/juneau-doc/docs/Topics/02.juneau-marshall/06.ConfigurableProperties/01.Common.html
+++ /dev/null
@@ -1,60 +0,0 @@
-<!--
-/***************************************************************************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *  
- *  http://www.apache.org/licenses/LICENSE-2.0
- *  
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations under the License.
- ***************************************************************************************************************************/
- -->
-
-Common Serializer Properties
-
-<p>
-	All serializers and parsers extend from the {@link oaj.BeanContext} class.
-	Therefore, the following properties are common to all serializers and parsers:
-</p>
-<ul class='javatree'>
-	<li class='jc'>{@link oaj.BeanContext}
-	<ul>
-		<li class='jf'>{@link oaj.BeanContext#BEAN_beanClassVisibility BEAN_beanClassVisibility}
-		<li class='jf'>{@link oaj.BeanContext#BEAN_beanConstructorVisibility BEAN_beanConstructorVisibility}
-		<li class='jf'>{@link oaj.BeanContext#BEAN_beanDictionary BEAN_beanDictionary}
-		<li class='jf'>{@link oaj.BeanContext#BEAN_beanFieldVisibility BEAN_beanFieldVisibility}
-		<li class='jf'>{@link oaj.BeanContext#BEAN_beanFilters BEAN_beanFilters}
-		<li class='jf'>{@link oaj.BeanContext#BEAN_beanMapPutReturnsOldValue BEAN_beanMapPutReturnsOldValue}
-		<li class='jf'>{@link oaj.BeanContext#BEAN_beanMethodVisibility BEAN_beanMethodVisibility}
-		<li class='jf'>{@link oaj.BeanContext#BEAN_beansRequireDefaultConstructor BEAN_beansRequireDefaultConstructor}
-		<li class='jf'>{@link oaj.BeanContext#BEAN_beansRequireSerializable BEAN_beansRequireSerializable}
-		<li class='jf'>{@link oaj.BeanContext#BEAN_beansRequireSettersForGetters BEAN_beansRequireSettersForGetters}
-		<li class='jf'>{@link oaj.BeanContext#BEAN_beansRequireSomeProperties BEAN_beansRequireSomeProperties}
-		<li class='jf'>{@link oaj.BeanContext#BEAN_beanTypePropertyName BEAN_beanTypePropertyName}
-		<li class='jf'>{@link oaj.BeanContext#BEAN_bpi BEAN_bpi}
-		<li class='jf'>{@link oaj.BeanContext#BEAN_bpx BEAN_bpx}
-		<li class='jf'>{@link oaj.BeanContext#BEAN_debug BEAN_debug}
-		<li class='jf'>{@link oaj.BeanContext#BEAN_examples BEAN_examples}
-		<li class='jf'>{@link oaj.BeanContext#BEAN_fluentSetters BEAN_fluentSetters}
-		<li class='jf'>{@link oaj.BeanContext#BEAN_ignoreInvocationExceptionsOnGetters BEAN_ignoreInvocationExceptionsOnGetters}
-		<li class='jf'>{@link oaj.BeanContext#BEAN_ignoreInvocationExceptionsOnSetters BEAN_ignoreInvocationExceptionsOnSetters}
-		<li class='jf'>{@link oaj.BeanContext#BEAN_ignorePropertiesWithoutSetters BEAN_ignorePropertiesWithoutSetters}
-		<li class='jf'>{@link oaj.BeanContext#BEAN_ignoreUnknownBeanProperties BEAN_ignoreUnknownBeanProperties}
-		<li class='jf'>{@link oaj.BeanContext#BEAN_ignoreUnknownNullBeanProperties BEAN_ignoreUnknownNullBeanProperties}
-		<li class='jf'>{@link oaj.BeanContext#BEAN_implClasses BEAN_implClasses}
-		<li class='jf'>{@link oaj.BeanContext#BEAN_locale BEAN_locale}
-		<li class='jf'>{@link oaj.BeanContext#BEAN_mediaType BEAN_mediaType}
-		<li class='jf'>{@link oaj.BeanContext#BEAN_notBeanClasses BEAN_notBeanClasses}
-		<li class='jf'>{@link oaj.BeanContext#BEAN_notBeanPackages BEAN_notBeanPackages}
-		<li class='jf'>{@link oaj.BeanContext#BEAN_pojoSwaps BEAN_pojoSwaps}
-		<li class='jf'>{@link oaj.BeanContext#BEAN_propertyNamer BEAN_propertyNamer}
-		<li class='jf'>{@link oaj.BeanContext#BEAN_sortProperties BEAN_sortProperties}
-		<li class='jf'>{@link oaj.BeanContext#BEAN_timeZone BEAN_timeZone}
-		<li class='jf'>{@link oaj.BeanContext#BEAN_useEnumNames BEAN_useEnumNames}
-		<li class='jf'>{@link oaj.BeanContext#BEAN_useInterfaceProxies BEAN_useInterfaceProxies}
-		<li class='jf'>{@link oaj.BeanContext#BEAN_useJavaBeanIntrospector BEAN_useJavaBeanIntrospector}
-	</ul>
-</ul>
diff --git a/juneau-doc/docs/Topics/02.juneau-marshall/06.ConfigurableProperties/02.CommonSerializer.html b/juneau-doc/docs/Topics/02.juneau-marshall/06.ConfigurableProperties/02.CommonSerializer.html
deleted file mode 100644
index 867467b..0000000
--- a/juneau-doc/docs/Topics/02.juneau-marshall/06.ConfigurableProperties/02.CommonSerializer.html
+++ /dev/null
@@ -1,57 +0,0 @@
-<!--
-/***************************************************************************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *  
- *  http://www.apache.org/licenses/LICENSE-2.0
- *  
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations under the License.
- ***************************************************************************************************************************/
- -->
-
-{8.1.0-updated} 
-Common Serializer Properties
-
-<p>
-	In addition to the common properties above, the following properties are common to all serializers:
-</p>
-<ul class='javatree'>
-	<li class='jc'>{@link oaj.BeanTraverseContext}
-	<ul>
-		<li class='jf'>{@link oaj.BeanTraverseContext#BEANTRAVERSE_detectRecursions BEANTRAVERSE_detectRecursions}
-		<li class='jf'>{@link oaj.BeanTraverseContext#BEANTRAVERSE_ignoreRecursions BEANTRAVERSE_ignoreRecursions}
-		<li class='jf'>{@link oaj.BeanTraverseContext#BEANTRAVERSE_initialDepth BEANTRAVERSE_initialDepth}
-		<li class='jf'>{@link oaj.BeanTraverseContext#BEANTRAVERSE_maxDepth BEANTRAVERSE_maxDepth}
-		<li class='jc'>{@link oaj.serializer.Serializer}
-		<ul>
-			<li class='jf'>{@link oaj.serializer.Serializer#SERIALIZER_addBeanTypes SERIALIZER_addBeanTypes}
-			<li class='jf'>{@link oaj.serializer.Serializer#SERIALIZER_addRootType SERIALIZER_addRootType}
-			<li class='jf'>{@link oaj.serializer.Serializer#SERIALIZER_listener SERIALIZER_listener}
-			<li class='jf'>{@link oaj.serializer.Serializer#SERIALIZER_sortCollections SERIALIZER_sortCollections}
-			<li class='jf'>{@link oaj.serializer.Serializer#SERIALIZER_sortMaps SERIALIZER_sortMaps}
-			<li class='jf'>{@link oaj.serializer.Serializer#SERIALIZER_trimEmptyCollections SERIALIZER_trimEmptyCollections}
-			<li class='jf'>{@link oaj.serializer.Serializer#SERIALIZER_trimEmptyMaps SERIALIZER_trimEmptyMaps}
-			<li class='jf'>{@link oaj.serializer.Serializer#SERIALIZER_trimNullProperties SERIALIZER_trimNullProperties}
-			<li class='jf'>{@link oaj.serializer.Serializer#SERIALIZER_trimStrings SERIALIZER_trimStrings}
-			<li class='jf'>{@link oaj.serializer.Serializer#SERIALIZER_uriContext SERIALIZER_uriContext}
-			<li class='jf'>{@link oaj.serializer.Serializer#SERIALIZER_uriRelativity SERIALIZER_uriRelativity}
-			<li class='jf'>{@link oaj.serializer.Serializer#SERIALIZER_uriResolution SERIALIZER_uriResolution}
-			<li class='jc'>{@link oaj.serializer.WriterSerializer}
-			<ul>
-				<li class='jf'>{@link oaj.serializer.WriterSerializer#WSERIALIZER_fileCharset WSERIALIZER_fileCharset}
-				<li class='jf'>{@link oaj.serializer.WriterSerializer#WSERIALIZER_maxIndent WSERIALIZER_maxIndent}
-				<li class='jf'>{@link oaj.serializer.WriterSerializer#WSERIALIZER_quoteChar WSERIALIZER_quoteChar}
-				<li class='jf'>{@link oaj.serializer.WriterSerializer#WSERIALIZER_streamCharset WSERIALIZER_streamCharset}
-				<li class='jf'>{@link oaj.serializer.WriterSerializer#WSERIALIZER_useWhitespace WSERIALIZER_useWhitespace}
-			</ul>
-			<li class='jc'>{@link oaj.serializer.OutputStreamSerializer}
-			<ul>
-				<li class='jf'>{@link oaj.serializer.OutputStreamSerializer#OSSERIALIZER_binaryFormat OSSERIALIZER_binaryFormat}
-			</ul>
-		</ul>
-	</ul>
-</ul>
diff --git a/juneau-doc/docs/Topics/02.juneau-marshall/06.ConfigurableProperties/03.CommonParser.html b/juneau-doc/docs/Topics/02.juneau-marshall/06.ConfigurableProperties/03.CommonParser.html
deleted file mode 100644
index 17a5970..0000000
--- a/juneau-doc/docs/Topics/02.juneau-marshall/06.ConfigurableProperties/03.CommonParser.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!--
-/***************************************************************************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *  
- *  http://www.apache.org/licenses/LICENSE-2.0
- *  
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations under the License.
- ***************************************************************************************************************************/
- -->
-
-{8.1.3-updated} 
-Common Parser Properties
-
-<p>
-	In addition to the common properties above, the following properties are common to all parsers:
-</p>
-<ul class='javatree'>
-	<li class='jc'>{@link oaj.parser.Parser}
-	<ul>
-		<li class='jf'>{@link oaj.parser.Parser#PARSER_autoCloseStreams PARSER_autoCloseStreams}
-		<li class='jf'>{@link oaj.parser.Parser#PARSER_debugOutputLines PARSER_debugOutputLines}
-		<li class='jf'>{@link oaj.parser.Parser#PARSER_listener PARSER_listener}
-		<li class='jf'>{@link oaj.parser.Parser#PARSER_strict PARSER_strict}
-		<li class='jf'>{@link oaj.parser.Parser#PARSER_trimStrings PARSER_trimStrings}
-		<li class='jf'>{@link oaj.parser.Parser#PARSER_unbuffered PARSER_unbuffered}
-		<li class='jc'>{@link oaj.parser.ReaderParser}
-		<ul>
-			<li class='jf'>{@link oaj.parser.ReaderParser#RPARSER_fileCharset RPARSER_fileCharset}
-			<li class='jf'>{@link oaj.parser.ReaderParser#RPARSER_streamCharset RPARSER_streamCharset}
-		</ul>
-		<li class='jc'>{@link oaj.parser.InputStreamParser}
-		<ul>
-			<li class='jf'>{@link oaj.parser.InputStreamParser#ISPARSER_binaryFormat ISPARSER_binaryFormat}
-		</ul>
-	</ul>
-</ul>
diff --git a/juneau-doc/docs/Topics/02.juneau-marshall/07.ConfigurableAnnotations.html b/juneau-doc/docs/Topics/02.juneau-marshall/07.ConfigurableAnnotations.html
index b0cf513..ae63254 100644
--- a/juneau-doc/docs/Topics/02.juneau-marshall/07.ConfigurableAnnotations.html
+++ b/juneau-doc/docs/Topics/02.juneau-marshall/07.ConfigurableAnnotations.html
@@ -101,4 +101,8 @@
 	
 	WriterSerializer ws = JsonSerializer.<jsm>create</jsm>().applyAnnotations(DummyClass.<jk>class</jk>).build();
 	String json = ws.toString(addressBean);
-</p>
\ No newline at end of file
+</p>
+
+<ul class='seealso'>
+	<li class='doclink'>{@doc Glossaries.Annotations link} - Glossary of all annotations.
+</ul>
diff --git a/juneau-doc/docs/Topics/19.Glossaries/01.LanguageSupport.html b/juneau-doc/docs/Topics/19.Glossaries/01.LanguageSupport.html
new file mode 100644
index 0000000..c53d24b
--- /dev/null
+++ b/juneau-doc/docs/Topics/19.Glossaries/01.LanguageSupport.html
@@ -0,0 +1,164 @@
+<!--
+/***************************************************************************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *  
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *  
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations under the License.
+ ***************************************************************************************************************************/
+ -->
+
+{8.1.3-new} 
+Language Support
+
+<h5 class='figure'>All serializers/parsers defined in Juneau</h5>
+<table class='styled w1000'>
+	<tr>
+		<th>Language</th><th>Serializers</th><th>Parsers</th><th>Marshalls</th><th>Documentation</th>
+	</tr>
+	<tr>
+		<td><c>text/csv</c></td>
+		<td><ul><li class='jc'>{@link oaj.csv.CsvSerializer}</ul></td>
+		<td><ul><li class='jc'>{@link oaj.csv.CsvParser}</ul></td>
+		<td>&nbsp;</td>
+		<td>&nbsp;</td>
+	</tr>
+	<tr>
+		<td><c>text/html</c></td>
+		<td><ul><li class='jc'>{@link oaj.html.HtmlSerializer}<li class='jc'>{@link oaj.html.HtmlStrippedDocSerializer}<li class='jc'>{@link oaj.html.HtmlDocSerializer}</ul></td>
+		<td><ul><li class='jc'>{@link oaj.html.HtmlParser}</ul></td>
+		<td><ul><li class='jc'>{@link oaj.marshall.Html}</ul></td>
+		<td>{@doc juneau-marshall.HtmlDetails HTML Details}</td>
+	</tr>
+	<tr>
+		<td><c>text/html+schema</c></td>
+		<td><ul><li class='jc'>{@link oaj.html.HtmlSchemaSerializer}<li class='jc'>{@link oaj.html.HtmlSchemaDocSerializer}</ul></td>
+		<td>&nbsp;</td>
+		<td>&nbsp;</td>
+		<td>{@doc juneau-marshall.HtmlDetails HTML Details}</td>
+	</tr>
+	<tr>
+		<td><c>application/x-java-serialized-object</c></td>
+		<td><ul><li class='jc'>{@link oaj.jso.JsoSerializer}</ul></td>
+		<td><ul><li class='jc'>{@link oaj.jso.JsoParser}</ul></td>
+		<td><ul><li class='jc'>{@link oaj.marshall.Jso}</ul></td>
+		<td>&nbsp;</td>
+	</tr>
+	<tr>
+		<td><c>application/json</c><br><c>text/json</c></td>
+		<td><ul><li class='jc'>{@link oaj.json.JsonSerializer}<li class='jc'>{@link oaj.json.JsonSerializer.Readable}<li class='jc'>{@link oaj.json.JsonSerializer.ReadableSafe}</ul></td>
+		<td><ul><li class='jc'>{@link oaj.json.JsonParser}</ul></td>
+		<td><ul><li class='jc'>{@link oaj.marshall.Json}</ul></td>
+		<td>{@doc juneau-marshall.JsonDetails JSON Details}</td>
+	</tr>
+	<tr>
+		<td><c>application/json+simple</c><br><c>text/json+simple</c></td>
+		<td><ul><li class='jc'>{@link oaj.json.SimpleJsonSerializer}</ul></td>
+		<td><ul><li class='jc'>{@link oaj.json.JsonParser}</ul></td>
+		<td><ul><li class='jc'>{@link oaj.marshall.SimpleJson}</ul></td>
+		<td>{@doc juneau-marshall.JsonDetails.SimplifiedJson Simplified JSON}</td>
+	</tr>
+	<tr>
+		<td><c>application/json+schema</c><br><c>text/json+schema</c></td>
+		<td><ul><li class='jc'>{@link oaj.json.JsonSchemaSerializer}</ul></td>
+		<td>&nbsp;</td>
+		<td>&nbsp;</td>
+		<td>{@doc juneau-marshall.JsonDetails.JsonSchema JSON-Schema Support}</td>
+	</tr>
+	<tr>
+		<td><c>octal/msgpack</c></td>
+		<td><ul><li class='jc'>{@link oaj.msgpack.MsgPackSerializer}</ul></td>
+		<td><ul><li class='jc'>{@link oaj.msgpack.MsgPackParser}</ul></td>
+		<td><ul><li class='jc'>{@link oaj.marshall.MsgPack}</ul></td>
+		<td>{@doc juneau-marshall.MsgPackDetails MessagePack Details}</td>
+	</tr>
+	<tr>
+		<td><c>text/n3</c></td>
+		<td><ul><li class='jc'>{@link oaj.jena.N3Serializer}</ul></td>
+		<td><ul><li class='jc'>{@link oaj.jena.N3Parser}</ul></td>
+		<td><ul><li class='jc'>{@link oaj.marshall.N3}</ul></td>
+		<td>{@doc juneau-marshall-rdf juneau-marshall-rdf}</td>
+	</tr>
+	<tr>
+		<td><c>text/n-triple</c></td>
+		<td><ul><li class='jc'>{@link oaj.jena.NTripleSerializer}</ul></td>
+		<td><ul><li class='jc'>{@link oaj.jena.NTripleParser}</ul></td>
+		<td><ul><li class='jc'>{@link oaj.marshall.NTriple}</ul></td>
+		<td>{@doc juneau-marshall-rdf juneau-marshall-rdf}</td>
+	</tr>
+	<tr>
+		<td><c>text/openapi</c></td>
+		<td><ul><li class='jc'>{@link oaj.oapi.OpenApiSerializer}</ul></td>
+		<td><ul><li class='jc'>{@link oaj.oapi.OpenApiParser}</ul></td>
+		<td><ul><li class='jc'>{@link oaj.marshall.OpenApi}</ul></td>
+		<td>{@doc juneau-marshall.OpenApiDetails OpenAPI Details}</td>
+	</tr>
+	<tr>
+		<td><c>text/plain</c></td>
+		<td><ul><li class='jc'>{@link oaj.plaintext.PlainTextSerializer}</ul></td>
+		<td>&nbsp;</td>
+		<td>&nbsp;</td>
+		<td>&nbsp;</td>
+	</tr>
+	<tr>
+		<td><c>text/xml+rdf<c></td>
+		<td><ul><li class='jc'>{@link oaj.jena.RdfXmlSerializer}</ul></td>
+		<td><ul><li class='jc'>{@link oaj.jena.RdfXmlParser}</ul></td>
+		<td><ul><li class='jc'>{@link oaj.marshall.RdfXml}</ul></td>
+		<td>{@doc juneau-marshall-rdf juneau-marshall-rdf}</td>
+	</tr>
+	<tr>
+		<td><c>text/xml+rdf+abbrev</c></td>
+		<td><ul><li class='jc'>{@link oaj.jena.RdfXmlAbbrevSerializer}</ul></td>
+		<td><ul><li class='jc'>{@link oaj.jena.RdfXmlParser}</ul></td>
+		<td><ul><li class='jc'>{@link oaj.marshall.RdfXmlAbbrev}</ul></td>
+		<td>{@doc juneau-marshall-rdf juneau-marshall-rdf}</td>
+	</tr>
+	<tr>
+		<td><c>text/xml+soap</c></td>
+		<td><ul><li class='jc'>{@link oaj.soap.SoapXmlSerializer}</ul></td>
+		<td>&nbsp;</td>
+		<td>&nbsp;</td>
+		<td>&nbsp;</td>
+	</tr>
+	<tr>
+		<td><c>text/turtle</c></td>
+		<td><ul><li class='jc'>{@link oaj.jena.TurtleSerializer}</ul></td>
+		<td><ul><li class='jc'>{@link oaj.jena.TurtleParser}</ul></td>
+		<td><ul><li class='jc'>{@link oaj.marshall.Turtle}</ul></td>
+		<td>{@doc juneau-marshall-rdf juneau-marshall-rdf}</td>
+	</tr>
+	<tr>
+		<td><c>text/uon</c></td>
+		<td><ul><li class='jc'>{@link oaj.uon.UonSerializer}</ul></td>
+		<td><ul><li class='jc'>{@link oaj.uon.UonParser}</ul></td>
+		<td><ul><li class='jc'>{@link oaj.marshall.Uon}</ul></td>
+		<td>{@doc juneau-marshall.UonDetails UON Details}</td>
+	</tr>
+	<tr>
+		<td><c>application/x-www-form-urlencoded</c></td>
+		<td><ul><li class='jc'>{@link oaj.urlencoding.UrlEncodingSerializer}</ul></td>
+		<td><ul><li class='jc'>{@link oaj.urlencoding.UrlEncodingParser}</ul></td>
+		<td><ul><li class='jc'>{@link oaj.marshall.UrlEncoding}</ul></td>
+		<td>{@doc juneau-marshall.UrlEncodingDetails URL-Encoding Details}</td>
+	</tr>
+	<tr>
+		<td><c>text/xml</c></td>
+		<td><ul><li class='jc'>{@link oaj.xml.XmlSerializer}<li class='jc'>{@link oaj.xml.XmlDocSerializer}</ul></td>
+		<td><ul><li class='jc'>{@link oaj.xml.XmlParser}</ul></td>
+		<td><ul><li class='jc'>{@link oaj.marshall.Xml}</ul></td>
+		<td>{@doc juneau-marshall.XmlDetails XML Details}</td>
+	</tr>
+	<tr>
+		<td><c>text/xml+schema</c></td>
+		<td><ul><li class='jc'>{@link oaj.xmlschema.XmlSchemaSerializer}<li class='jc'>{@link oaj.xmlschema.XmlSchemaDocSerializer}</ul></td>
+		<td>&nbsp;</td>
+		<td>&nbsp;</td>
+		<td>{@doc juneau-marshall.XmlDetails.XmlSchema XML-Schema Support}</td>
+	</tr>
+</table>
diff --git a/juneau-doc/docs/Topics/19.Glossaries/02.Annotations.html b/juneau-doc/docs/Topics/19.Glossaries/02.Annotations.html
new file mode 100644
index 0000000..d1452e5
--- /dev/null
+++ b/juneau-doc/docs/Topics/19.Glossaries/02.Annotations.html
@@ -0,0 +1,360 @@
+<!--
+/***************************************************************************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *  
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *  
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations under the License.
+ ***************************************************************************************************************************/
+ -->
+
+{8.1.3-new} 
+Annotations
+
+<h5 class='figure'>Serialization Annotations (used to modify how artifacts are marshalled)</h5>
+<table class='styled w1000'>
+	<tr>
+		<th>Annotation</th><th>Description</th><th>Used On</th><th>Used By</th>
+	</tr>
+	<tr>
+		<td><ul style='margin-left:20px'><li class='ja'>{@link oaj.annotation.Bean}</ul></td>
+		<td><ul><li>Classes</ul></td>
+		<td>All serializers and parsers</td>
+		<td>Tailors how beans get marshalled.</td>
+	</tr>
+	<tr>
+		<td><ul style='margin-left:20px'><li class='ja'>{@link oaj.annotation.Beanc}</ul></td>
+		<td><ul><li>Bean constructors</ul></td>
+		<td>All serializers and parsers</td>
+		<td>Identifies bean constructors and property args.</td>
+	</tr>
+	<tr>
+		<td><ul style='margin-left:20px'><li class='ja'>{@link oaj.annotation.BeanIgnore}</ul></td>
+		<td><ul><li>Classes<li>Fields<li>Methods</ul></td>
+		<td>All serializers and parsers</td>
+		<td>Prevents artifacts from being interpreted as beans/bean components.</td>
+	</tr>
+	<tr>
+		<td><ul style='margin-left:20px'><li class='ja'>{@link oaj.annotation.Beanp}</ul></td>
+		<td><ul><li>Methods<li>Fields<li>Constructor args</ul></td>
+		<td>All serializers and parsers</td>
+		<td>Tailors how bean properties get marshalled.</td>
+	</tr>
+	<tr>
+		<td><ul style='margin-left:20px'><li class='ja'>{@link oaj.annotation.Builder}</ul></td>
+		<td><ul><li>Classes</ul></td>
+		<td>All parsers</td>
+		<td>Identifies a class as a builder for a POJO class.</td>
+	</tr>
+	<tr>
+		<td><ul style='margin-left:20px'><li class='ja'>{@link oaj.csv.annotation.Csv}</ul></td>
+		<td><ul><li>Classes<li>Methods<li>Fields</ul></td>
+		<td><ul><li class='jc'>{@link oaj.csv.CsvSerializer}<li class='jc'>{@link oaj.csv.CsvParser}</ul></td>
+		<td>CSV-specific tweaks.</td>
+	</tr>
+	<tr>
+		<td><ul style='margin-left:20px'><li class='ja'>{@link oaj.annotation.Example}</ul></td>
+		<td><ul><li>Static methods<li>Static fields<li>Classes</ul></td>
+		<td><ul><li class='jc'>{@link oaj.json.JsonSchemaSerializer}</ul></td>
+		<td>Identifies examples for POJOs.</td>
+	</tr>
+	<tr>
+		<td><ul style='margin-left:20px'><li class='ja'>{@link oaj.html.annotation.Html}</ul></td>
+		<td><ul><li>Classes<li>Methods<li>Fields</ul></td>
+		<td><ul><li class='jc'>{@link oaj.html.HtmlSerializer}<li class='jc'>{@link oaj.html.HtmlParser}</ul></td>
+		<td>HTML-specific tweaks.</td>
+	</tr>
+	<tr>
+		<td><ul style='margin-left:20px'><li class='ja'>{@link oaj.html.annotation.HtmlLink}</ul></td>
+		<td><ul><li>Classes</ul></td>
+		<td><ul><li class='jc'>{@link oaj.html.HtmlSerializer}</ul></td>
+		<td>Defines how to construct hyperlinks on objects.</td>
+	</tr>
+	<tr>
+		<td><ul style='margin-left:20px'><li class='ja'>{@link oaj.jso.annotation.Jso}</ul></td>
+		<td><ul><li>Classes<li>Methods<li>Fields</ul></td>
+		<td><ul><li class='jc'>{@link oaj.jso.JsoSerializer}<li class='jc'>{@link oaj.jso.JsoParser}</ul></td>
+		<td>JSO-specific tweaks.</td>
+	</tr>
+	<tr>
+		<td><ul style='margin-left:20px'><li class='ja'>{@link oaj.json.annotation.Json}</ul></td>
+		<td><ul><li>Classes<li>Methods<li>Fields</ul></td>
+		<td><ul><li class='jc'>{@link oaj.json.JsonSerializer}<li class='jc'>{@link oaj.json.JsonParser}</ul></td>
+		<td>JSON-specific tweaks.</td>
+	</tr>
+	<tr>
+		<td><ul style='margin-left:20px'><li class='ja'>{@link oaj.msgpack.annotation.MsgPack}</ul></td>
+		<td><ul><li>Classes<li>Methods<li>Fields</ul></td>
+		<td><ul><li class='jc'>{@link oaj.msgpack.MsgPackSerializer}<li class='jc'>{@link oaj.msgpack.MsgPackParser}</ul></td>
+		<td>MessagePack-specific tweaks.</td>
+	</tr>
+	<tr>
+		<td><ul style='margin-left:20px'><li class='ja'>{@link oaj.annotation.Name}</ul></td>
+		<td><ul><li>Constructor args</ul></td>
+		<td>All parsers</td>
+		<td>Maps constructor args to property names.</td>
+	</tr>
+	<tr>
+		<td><ul style='margin-left:20px'><li class='ja'>{@link oaj.annotation.NameProperty}</ul></td>
+		<td><ul><li>Methods<li>Fields</ul></td>
+		<td>All parsers</td>
+		<td>Identifies a 'name' property.</td>
+	</tr>
+	<tr>
+		<td><ul style='margin-left:20px'><li class='ja'>{@link oaj.oapi.annotation.OpenApi}</ul></td>
+		<td><ul><li>Classes<li>Methods<li>Fields</ul></td>
+		<td><ul><li class='jc'>{@link oaj.oapi.OpenApiSerializer}<li class='jc'>{@link oaj.oapi.OpenApiParser}</ul></td>
+		<td>OpenAPI-specific tweaks.</td>
+	</tr>
+	<tr>
+		<td><ul style='margin-left:20px'><li class='ja'>{@link oaj.annotation.ParentProperty}</ul></td>
+		<td><ul><li>Methods<li>Fields</ul></td>
+		<td>All parsers</td>
+		<td>Identifies a 'parent' property.</td>
+	</tr>
+	<tr>
+		<td><ul style='margin-left:20px'><li class='ja'>{@link oaj.plaintext.annotation.PlainText}</ul></td>
+		<td><ul><li>Classes<li>Methods<li>Fields</ul></td>
+		<td><ul><li class='jc'>{@link oaj.plaintext.PlainTextSerializer}<li class='jc'>{@link oaj.plaintext.PlainTextParser}</ul></td>
+		<td>PlainText-specific tweaks.</td>
+	</tr>
+	<tr>
+		<td><ul style='margin-left:20px'><li class='ja'>{@link oaj.jena.annotation.Rdf}</ul></td>
+		<td><ul><li>Classes<li>Methods<li>Fields</ul></td>
+		<td>All RDF serializers and parsers</td>
+		<td>RDF-specific tweaks.</td>
+	</tr>
+	<tr>
+		<td><ul style='margin-left:20px'><li class='ja'>{@link oaj.jena.annotation.RdfSchema}</ul></td>
+		<td><ul><li>Packages</ul></td>
+		<td>All RDF serializers and parsers</td>
+		<td>Identifies the default RDF namespaces at the package level.</td>
+	</tr>
+	<tr>
+		<td><ul style='margin-left:20px'><li class='ja'>{@link oaj.soap.annotation.SoapXml}</ul></td>
+		<td><ul><li>Classes<li>Methods<li>Fields</ul></td>
+		<td><ul><li class='jc'>{@link oaj.soap.SoapXmlSerializer}</ul></td>
+		<td>SOAP/XML-specific tweaks.</td>
+	</tr>
+	<tr>
+		<td><ul style='margin-left:20px'><li class='ja'>{@link oaj.annotation.Swap}</ul></td>
+		<td><ul><li>Classes<li>Bean getters/setters<li>Fields</ul></td>
+		<td>All serializers and parsers</td>
+		<td>Associates swaps and surrogates with POJOs and bean properties.</td>
+	</tr>
+	<tr>
+		<td><ul style='margin-left:20px'><li class='ja'>{@link oaj.annotation.Swaps}</ul></td>
+		<td><ul><li>Classes</ul></td>
+		<td>All serializers and parsers</td>
+		<td>Associates multiple swaps with the same POJO class.</td>
+	</tr>
+	<tr>
+		<td><ul style='margin-left:20px'><li class='ja'>{@link oaj.uon.annotation.Uon}</ul></td>
+		<td><ul><li>Classes<li>Methods<li>Fields</ul></td>
+		<td><ul><li class='jc'>{@link oaj.uon.UonSerializer}<li class='jc'>{@link oaj.uon.UonParser}</ul></td>
+		<td>UON-specific tweaks.</td>
+	</tr>
+	<tr>
+		<td><ul style='margin-left:20px'><li class='ja'>{@link oaj.annotation.URI}</ul></td>
+		<td><ul><li>Classes<li>Methods<li>Fields</ul></td>
+		<td>HTML and XML serializers</td>
+		<td>Identifies a class or bean property as a URI.</td>
+	</tr>
+	<tr>
+		<td><ul style='margin-left:20px'><li class='ja'>{@link oaj.urlencoding.annotation.UrlEncoding}</ul></td>
+		<td><ul><li>Classes<li>Methods<li>Fields</ul></td>
+		<td><ul><li class='jc'>{@link oaj.urlencoding.UrlEncodingSerializer}<li class='jc'>{@link oaj.urlencoding.UrlEncodingParser}</ul></td>
+		<td>URL-Encoding-specific tweaks.</td>
+	</tr>
+	<tr>
+		<td><ul style='margin-left:20px'><li class='ja'>{@link oaj.xml.annotation.Xml}</ul></td>
+		<td><ul><li>Classes<li>Methods<li>Fields</ul></td>
+		<td><ul><li class='jc'>{@link oaj.xml.XmlSerializer}<li class='jc'>{@link oaj.xml.XmlParser}</ul></td>
+		<td>XML-specific tweaks.</td>
+	</tr>
+	<tr>
+		<td><ul style='margin-left:20px'><li class='ja'>{@link oaj.xml.annotation.XmlSchema}</ul></td>
+		<td><ul><li>Packages</ul></td>
+		<td>XML serializers and parsers</td>
+		<td>Identifies the default XML namespaces at the package level.</td>
+	</tr>
+</table>
+<br><br>
+
+<h5 class='figure'>Configuration Annotations (used to modify how serializers/parsers behave)</h5>
+<table class='styled w800'>
+	<tr>
+		<th>Annotation</th><th>Configures</th>
+	</tr>
+	<tr>
+		<td><ul style='margin-left:20px'><li class='ja'>{@link oaj.annotation.BeanConfig}</ul></td>
+		<td>All serializers and parsers</td>
+	</tr>
+	<tr>
+		<td><ul style='margin-left:20px'><li class='ja'>{@link oaj.csv.annotation.CsvConfig}</ul></td>
+		<td><ul><li class='jc'>{@link oaj.csv.CsvSerializer}<li class='jc'>{@link oaj.csv.CsvParser}</ul></td>
+	</tr>
+	<tr>
+		<td><ul style='margin-left:20px'><li class='ja'>{@link oaj.html.annotation.HtmlConfig}</ul></td>
+		<td><ul><li class='jc'>{@link oaj.html.HtmlSerializer}<li class='jc'>{@link oaj.html.HtmlParser}</ul></td>
+	</tr>
+	<tr>
+		<td><ul style='margin-left:20px'><li class='ja'>{@link oaj.html.annotation.HtmlDocConfig}</ul></td>
+		<td><ul><li class='jc'>{@link oaj.html.HtmlDocSerializer}</ul></td>
+	</tr>
+	<tr>
+		<td><ul style='margin-left:20px'><li class='ja'>{@link oaj.jso.annotation.JsoConfig}</ul></td>
+		<td><ul><li class='jc'>{@link oaj.jso.JsoSerializer}<li class='jc'>{@link oaj.jso.JsoParser}</ul></td>
+	</tr>
+	<tr>
+		<td><ul style='margin-left:20px'><li class='ja'>{@link oaj.json.annotation.JsonConfig}</ul></td>
+		<td><ul><li class='jc'>{@link oaj.json.JsonSerializer}<li class='jc'>{@link oaj.json.JsonParser}</ul></td>
+	</tr>
+	<tr>
+		<td><ul style='margin-left:20px'><li class='ja'>{@link oaj.jsonschema.annotation.JsonSchemaConfig}</ul></td>
+		<td><ul><li class='jc'>{@link oaj.json.JsonSchemaSerializer}</ul></td>
+	</tr>
+	<tr>
+		<td><ul style='margin-left:20px'><li class='ja'>{@link oaj.msgpack.annotation.MsgPackConfig}</ul></td>
+		<td><ul><li class='jc'>{@link oaj.msgpack.MsgPackSerializer}<li class='jc'>{@link oaj.msgpack.MsgPackParser}</ul></td>
+	</tr>
+	<tr>
+		<td><ul style='margin-left:20px'><li class='ja'>{@link oaj.oapi.annotation.OpenApiConfig}</ul></td>
+		<td><ul><li class='jc'>{@link oaj.oapi.OpenApiSerializer}<li class='jc'>{@link oaj.oapi.OpenApiParser}</ul></td>
+	</tr>
+	<tr>
+		<td><ul style='margin-left:20px'><li class='ja'>{@link oaj.parser.annotation.ParserConfig}</ul></td>
+		<td>All parsers</td>
+	</tr>
+	<tr>
+		<td><ul style='margin-left:20px'><li class='ja'>{@link oaj.plaintext.annotation.PlainTextConfig}</ul></td>
+		<td><ul><li class='jc'>{@link oaj.plaintext.PlainTextSerializer}</ul></td>
+	</tr>
+	<tr>
+		<td><ul style='margin-left:20px'><li class='ja'>{@link oaj.jena.annotation.RdfConfig}</ul></td>
+		<td>All RDF serializers and parsers</td>
+	</tr>
+	<tr>
+		<td><ul style='margin-left:20px'><li class='ja'>{@link oaj.serializer.annotation.SerializerConfig}</ul></td>
+		<td>All serializers</td>
+	</tr>
+	<tr>
+		<td><ul style='margin-left:20px'><li class='ja'>{@link oaj.soap.annotation.SoapXmlConfig}</ul></td>
+		<td><ul><li class='jc'>{@link oaj.soap.SoapXmlSerializer}</ul></td>
+	</tr>
+	<tr>
+		<td><ul style='margin-left:20px'><li class='ja'>{@link oaj.uon.annotation.UonConfig}</ul></td>
+		<td><ul><li class='jc'>{@link oaj.uon.UonSerializer}<li class='jc'>{@link oaj.uon.UonParser}</ul></td>
+	</tr>
+	<tr>
+		<td><ul style='margin-left:20px'><li class='ja'>{@link oaj.urlencoding.annotation.UrlEncodingConfig}</ul></td>
+		<td><ul><li class='jc'>{@link oaj.urlencoding.UrlEncodingSerializer}<li class='jc'>{@link oaj.urlencoding.UrlEncodingParser}</ul></td>
+	</tr>
+	<tr>
+		<td><ul style='margin-left:20px'><li class='ja'>{@link oaj.xml.annotation.XmlConfig}</ul></td>
+		<td><ul><li class='jc'>{@link oaj.xml.XmlSerializer}<li class='jc'>{@link oaj.xml.XmlParser}</ul></td>
+	</tr>
+</table>
+<br><br>
+
+<h5 class='figure'>Common REST Annotations (used on both client-side and server-side)</h5>
+<table class='styled w800'>
+	<tr>
+		<th>Annotation</th><th>Used On</th><th>Description</th>
+	</tr>
+	<tr>
+		<td><ul style='margin-left:20px'><li class='ja'>{@link oaj.http.annotation.Body}</ul></td>
+		<td><ul><li>Classes<li>Methods<li>Fields<li>Parameters</ul></td>
+		<td>HTTP request/response body.</td>
+	</tr>
+	<tr>
+		<td><ul style='margin-left:20px'><li class='ja'>{@link oaj.http.annotation.FormData}</ul></td>
+		<td><ul><li>Classes<li>Methods<li>Fields<li>Parameters</ul></td>
+		<td>HTTP form data parameter.</td>
+	</tr>
+	<tr>
+		<td><ul style='margin-left:20px'><li class='ja'>{@link oaj.http.annotation.HasFormData}</ul></td>
+		<td><ul><li>Classes<li>Methods<li>Fields<li>Parameters</ul></td>
+		<td>HTTP form data parameter is present.</td>
+	</tr>
+	<tr>
+		<td><ul style='margin-left:20px'><li class='ja'>{@link oaj.http.annotation.HasQuery}</ul></td>
+		<td><ul><li>Classes<li>Methods<li>Fields<li>Parameters</ul></td>
+		<td>HTTP query parameter is present.</td>
+	</tr>
+	<tr>
+		<td><ul style='margin-left:20px'><li class='ja'>{@link oaj.http.annotation.Header}</ul></td>
+		<td><ul><li>Classes<li>Methods<li>Fields<li>Parameters</ul></td>
+		<td>HTTP header.</td>
+	</tr>
+	<tr>
+		<td><ul style='margin-left:20px'><li class='ja'>{@link oaj.http.annotation.Path}</ul></td>
+		<td><ul><li>Classes<li>Methods<li>Fields<li>Parameters</ul></td>
+		<td>HTTP path part.</td>
+	</tr>
+	<tr>
+		<td><ul style='margin-left:20px'><li class='ja'>{@link oaj.http.annotation.Query}</ul></td>
+		<td><ul><li>Classes<li>Methods<li>Fields<li>Parameters</ul></td>
+		<td>HTTP query parameter.</td>
+	</tr>
+	<tr>
+		<td><ul style='margin-left:20px'><li class='ja'>{@link oaj.http.annotation.Request}</ul></td>
+		<td><ul><li>Classes<li>Parameters</ul></td>
+		<td>Identifies an interface to use to interact with HTTP parts of an HTTP request through a bean.</td>
+	</tr>
+	<tr>
+		<td><ul style='margin-left:20px'><li class='ja'>{@link oaj.http.annotation.Response}</ul></td>
+		<td><ul><li>Classes<li>Methods<li>Parameters</ul></td>
+		<td>Identifies an interface to use to interact with HTTP parts of an HTTP response through a bean.</td>
+	</tr>
+	<tr>
+		<td><ul style='margin-left:20px'><li class='ja'>{@link oaj.http.annotation.ResponseBody}</ul></td>
+		<td><ul><li>Methods</ul></td>
+		<td>Denotes a method as an HTTP response body on a <ja>@Response</ja>-annotated bean.</td>
+	</tr>
+	<tr>
+		<td><ul style='margin-left:20px'><li class='ja'>{@link oaj.http.annotation.ResponseHeader}</ul></td>
+		<td><ul><li>Classes<li>Methods<li>Parameters</ul></td>
+		<td>Denotes a method as an HTTP response header on a <ja>@Response</ja>-annotated bean.</td>
+	</tr>
+	<tr>
+		<td><ul style='margin-left:20px'><li class='ja'>{@link oaj.http.annotation.ResponseStatus}</ul></td>
+		<td><ul><li>Methods<li>Parameters</ul></td>
+		<td>Denotes a method as an HTTP response status code on a <ja>@Response</ja>-annotated bean.</td>
+	</tr>
+</table>
+<br><br>
+
+<h5 class='figure'>REST Server-only Annotations</h5>
+<table class='styled w800'>
+	<tr>
+		<th>Annotation</th><th>Used On</th><th>Description</th>
+	</tr>
+	<tr>
+		<td><ul style='margin-left:20px'><li class='ja'>{@link oaj.rest.annotation.Attr}</ul></td>
+		<td><ul><li>Parameters</ul></td>
+		<td>Request attribute.</td>
+	</tr>
+	<tr>
+		<td><ul style='margin-left:20px'><li class='ja'>{@link oaj.rest.annotation.Rest}</ul></td>
+		<td><ul><li>Classes</ul></td>
+		<td>Identifies and configures REST resource classes.</td>
+	</tr>
+	<tr>
+		<td><ul style='margin-left:20px'><li class='ja'>{@link oaj.rest.annotation.RestHook}</ul></td>
+		<td><ul><li>Methods</ul></td>
+		<td>Identifies REST lifecycle hook methods.</td>
+	</tr>
+	<tr>
+		<td><ul style='margin-left:20px'><li class='ja'>{@link oaj.rest.annotation.RestMethod}</ul></td>
+		<td><ul><li>Methods</ul></td>
+		<td>Identifies and configures REST resource class methods.</td>
+	</tr>
+</table>
+<br><br>
+	
\ No newline at end of file
diff --git a/juneau-doc/docs/Topics/19.Glossaries/01.ConfigurablePropertiesGlossary.html b/juneau-doc/docs/Topics/19.Glossaries/03.ConfigurableProperties.html
similarity index 90%
rename from juneau-doc/docs/Topics/19.Glossaries/01.ConfigurablePropertiesGlossary.html
rename to juneau-doc/docs/Topics/19.Glossaries/03.ConfigurableProperties.html
index acb8b9f..b6bb89d 100644
--- a/juneau-doc/docs/Topics/19.Glossaries/01.ConfigurablePropertiesGlossary.html
+++ b/juneau-doc/docs/Topics/19.Glossaries/03.ConfigurableProperties.html
@@ -14,9 +14,7 @@
  -->
 
 {8.1.3-new} 
-Configurable Properties Glossary
+Configurable Properties
 
-<p>
-	The following is a list of all properties defined throughout Juneau:
-</p>
+<h5 class='figure'>All properties defined in Juneau</h5>
 {CONFIG-PROPS}
diff --git a/juneau-doc/src/main/javadoc/overview.html b/juneau-doc/src/main/javadoc/overview.html
index 577a7ec..4f5b50f 100644
--- a/juneau-doc/src/main/javadoc/overview.html
+++ b/juneau-doc/src/main/javadoc/overview.html
@@ -171,12 +171,7 @@
 		<li><p><a class='doclink' href='#juneau-marshall.Marshalls'>Marshalls</a></p>
 		<li><p><a class='doclink' href='#juneau-marshall.HttpPartSerializers'>HTTP Part Serializers</a></p>
 		<li><p><a class='doclink' href='#juneau-marshall.HttpPartParsers'>HTTP Part Parsers</a></p>
-		<li><p><a class='doclink' href='#juneau-marshall.ConfigurableProperties'></a><span class='update'><b>8.1.3-updated</b></span></p>
-		<ol>
-			<li><p><a class='doclink' href='#juneau-marshall.ConfigurableProperties.Common'>Common Serializer Properties</a></p>
-			<li><p><a class='doclink' href='#juneau-marshall.ConfigurableProperties.CommonSerializer'>Common Serializer Properties</a><span class='update'>8.1.0-updated</span></p>
-			<li><p><a class='doclink' href='#juneau-marshall.ConfigurableProperties.CommonParser'>Common Parser Properties</a><span class='update'><b>8.1.3-updated</b></span></p>
-		</ol>
+		<li><p><a class='doclink' href='#juneau-marshall.ConfigurableProperties'>Configurable Properties</a><span class='update'><b>8.1.3-updated</b></span></p>
 		<li><p><a class='doclink' href='#juneau-marshall.ConfigurableAnnotations'>Configurable Annotations</a><span class='update'>8.1.0-new, <b>8.1.3-updated</b></span></p>
 		<li><p><a class='doclink' href='#juneau-marshall.ObjectMap'>ObjectMap and ObjectList</a></p>
 		<li><p><a class='doclink' href='#juneau-marshall.Groups'>SerializerGroups and ParserGroups</a></p>
@@ -561,7 +556,9 @@
 	</ol>
 	<li><p class='toc2'><a class='doclink' href='#Glossaries'>Glossaries</a><span class='update'><b>8.1.3-new</b></span></p>
 	<ol>
-		<li><p><a class='doclink' href='#Glossaries.ConfigurablePropertiesGlossary'>Configurable Properties Glossary</a><span class='update'><b>8.1.3-new</b></span></p>
+		<li><p><a class='doclink' href='#Glossaries.LanguageSupport'>Language Support</a><span class='update'><b>8.1.3-new</b></span></p>
+		<li><p><a class='doclink' href='#Glossaries.Annotations'>Annotations</a><span class='update'><b>8.1.3-new</b></span></p>
+		<li><p><a class='doclink' href='#Glossaries.ConfigurableProperties'>Configurable Properties</a><span class='update'><b>8.1.3-new</b></span></p>
 	</ol>
 	<li><p class='toc2'><a class='doclink' href='#Security'>Security Best-Practices</a></p>
 	<ol>
@@ -1105,60 +1102,9 @@
 	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:
-</p>
-<ul class='javatree'>
-	<li class='jac'>{@link org.apache.juneau.serializer.Serializer}
-	<ul>
-		<li class='jac'>{@link org.apache.juneau.serializer.WriterSerializer}
-		<ul>
-			<li class='jc'>{@link org.apache.juneau.json.JsonSerializer}
-			<ul>
-			<li class='jc'>{@link org.apache.juneau.json.JsonSchemaSerializer}
-			<li class='jc'>{@link org.apache.juneau.json.SimpleJsonSerializer}
-			</ul>
-			<li class='jc'>{@link org.apache.juneau.plaintext.PlainTextSerializer}
-			<li class='jc'>{@link org.apache.juneau.jena.RdfSerializer}
-			<ul>
-				<li class='jc'>{@link org.apache.juneau.jena.N3Serializer}
-				<li class='jc'>{@link org.apache.juneau.jena.NTripleSerializer}
-				<li class='jc'>{@link org.apache.juneau.jena.RdfXmlSerializer}
-				<li class='jc'>{@link org.apache.juneau.jena.RdfXmlAbbrevSerializer}
-				<li class='jc'>{@link org.apache.juneau.jena.TurtleSerializer}
-			</ul>
-			<li class='jc'>{@link org.apache.juneau.uon.UonSerializer}
-			<ul>
-				<li class='jc'>{@link org.apache.juneau.oapi.OpenApiSerializer}
-				<li class='jc'>{@link org.apache.juneau.urlencoding.UrlEncodingSerializer}
-			</ul>
-			<li class='jc'>{@link org.apache.juneau.xml.XmlSerializer}
-			<ul>
-				<li class='jc'>{@link org.apache.juneau.html.HtmlSerializer}
-				<ul>
-					<li class='jc'>{@link org.apache.juneau.html.HtmlSchemaSerializer}
-					<li class='jc'>{@link org.apache.juneau.html.HtmlStrippedDocSerializer}
-					<ul>
-						<li class='jc'>{@link org.apache.juneau.html.HtmlDocSerializer}
-						<ul>
-							<li class='jc'>{@link org.apache.juneau.html.HtmlSchemaDocSerializer}
-						</ul>
-					</ul>
-				</ul>
-				<li class='jc'>{@link org.apache.juneau.soap.SoapXmlSerializer}
-				<li class='jc'>{@link org.apache.juneau.xml.XmlDocSerializer}
-				<li class='jc'>{@link org.apache.juneau.xmlschema.XmlSchemaSerializer}
-				<ul>
-					<li class='jc'>{@link org.apache.juneau.xmlschema.XmlSchemaDocSerializer}
-				</ul>
-			</ul>
-		</ul>
-		<li class='jac'>{@link org.apache.juneau.serializer.OutputStreamSerializer}
-		<ul>
-			<li class='jc'>{@link org.apache.juneau.jso.JsoSerializer}
-			<li class='jc'>{@link org.apache.juneau.msgpack.MsgPackSerializer}
-		</ul>
-	</ul>
+
+<ul class='seealso'>
+	<li class='doclink'>{@doc Glossaries.LanguageSupport link} - Glossary of all supported languages.
 </ul>
 </div><!-- END: 2.1 - juneau-marshall.Serializers -->
 
@@ -1240,39 +1186,8 @@
 	with escapes.  
 </div>
 
-<p>
-	The class hierarchy for the parsers (excluding specialized subclasses) are:
-</p>
-<ul class='javatree'>
-	<li class='jac'>{@link org.apache.juneau.parser.Parser}
-	<ul>
-		<li class='jac'>{@link org.apache.juneau.parser.ReaderParser}
-		<ul>
-			<li class='jc'>{@link org.apache.juneau.json.JsonParser}
-			<li class='jc'>{@link org.apache.juneau.plaintext.PlainTextParser}
-			<li class='jc'>{@link org.apache.juneau.jena.RdfParser}
-			<ul>
-				<li class='jc'>{@link org.apache.juneau.jena.RdfXmlParser}
-				<li class='jc'>{@link org.apache.juneau.jena.N3Parser}
-				<li class='jc'>{@link org.apache.juneau.jena.NTripleParser}
-				<li class='jc'>{@link org.apache.juneau.jena.TurtleParser}
-			</ul>
-			<li class='jc'>{@link org.apache.juneau.uon.UonParser}
-			<ul>
-				<li class='jc'>{@link org.apache.juneau.oapi.OpenApiParser}
-				<li class='jc'>{@link org.apache.juneau.urlencoding.UrlEncodingParser}
-			</ul>
-			<li class='jc'>{@link org.apache.juneau.xml.XmlParser}
-			<ul>
-				<li class='jc'>{@link org.apache.juneau.html.HtmlParser}
-			</ul>
-		</ul>
-		<li class='jac'>{@link org.apache.juneau.parser.InputStreamParser}
-		<ul>
-			<li class='jc'>{@link org.apache.juneau.jso.JsoParser}
-			<li class='jc'>{@link org.apache.juneau.msgpack.MsgPackParser}
-		</ul>
-	</ul>
+<ul class='seealso'>
+	<li class='doclink'>{@doc Glossaries.LanguageSupport link} - Glossary of all supported languages.
 </ul>
 </div><!-- END: 2.2 - juneau-marshall.Parsers -->
 
@@ -1313,33 +1228,9 @@
 	MyPojo myPojo = Json.<jsf>DEFAULT</jsf>.read(string, MyPojo.<jk>class</jk>);
 	String string = Json.<jsf>DEFAULT</jsf>.write(myPojo);
 </p>
-<p>
-	Marshalls exist for all supported languages:
-</p>
-<ul class='javatree'>
-	<li class='jac'>{@link org.apache.juneau.marshall.Marshall}
-	<ul>
-		<li class='jac'>{@link org.apache.juneau.marshall.CharMarshall}
-		<ul>
-			<li class='jc'>{@link org.apache.juneau.marshall.Html}
-			<li class='jc'>{@link org.apache.juneau.marshall.Json}
-			<li class='jc'>{@link org.apache.juneau.marshall.PlainText}
-			<li class='jc'>{@link org.apache.juneau.marshall.SimpleJson}
-			<li class='jc'>{@link org.apache.juneau.marshall.Uon}
-			<li class='jc'>{@link org.apache.juneau.marshall.UrlEncoding}
-			<li class='jc'>{@link org.apache.juneau.marshall.Xml}
-			<li class='jc'>{@link org.apache.juneau.marshall.N3}
-			<li class='jc'>{@link org.apache.juneau.marshall.NTriple}
-			<li class='jc'>{@link org.apache.juneau.marshall.RdfXml}
-			<li class='jc'>{@link org.apache.juneau.marshall.RdfXmlAbbrev}
-			<li class='jc'>{@link org.apache.juneau.marshall.Turtle}	
-		</ul>
-		<li class='jac'>{@link org.apache.juneau.marshall.StreamMarshall}
-		<ul>
-			<li class='jc'>{@link org.apache.juneau.marshall.Jso}
-			<li class='jc'>{@link org.apache.juneau.marshall.MsgPack}
-		</ul>
-	</ul>
+
+<ul class='seealso'>
+	<li class='doclink'>{@doc Glossaries.LanguageSupport link} - Glossary of all supported languages.
 </ul>
 </div><!-- END: 2.3 - juneau-marshall.Marshalls -->
 
@@ -1435,7 +1326,7 @@
 
 <!-- ==================================================================================================== -->
 
-<h3 class='topic' onclick='toggle(this)'><a href='#juneau-marshall.ConfigurableProperties' id='juneau-marshall.ConfigurableProperties'>2.6 - </a><span class='update'><b>8.1.3-updated</b></span></h3>
+<h3 class='topic' onclick='toggle(this)'><a href='#juneau-marshall.ConfigurableProperties' id='juneau-marshall.ConfigurableProperties'>2.6 - Configurable Properties</a><span class='update'><b>8.1.3-updated</b></span></h3>
 <div class='topic'><!-- START: 2.6 - juneau-marshall.ConfigurableProperties -->
 <p>
 	Serializers and parsers have a wide variety of configurable properties.  They all extend from the 
@@ -1511,128 +1402,9 @@
 	variables <js>"WriterSerializer_useWhitespace"</js> or <js>"WRITERSERIALIZER_USEWHITESPACE"</js> to <js>"true"</js>.
 </p>
 
-<!-- ==================================================================================================== -->
-
-<h4 class='topic' onclick='toggle(this)'><a href='#juneau-marshall.ConfigurableProperties.Common' id='juneau-marshall.ConfigurableProperties.Common'>2.6.1 - Common Serializer Properties</a></h4>
-<div class='topic'><!-- START: 2.6.1 - juneau-marshall.ConfigurableProperties.Common -->
-<p>
-	All serializers and parsers extend from the {@link org.apache.juneau.BeanContext} class.
-	Therefore, the following properties are common to all serializers and parsers:
-</p>
-<ul class='javatree'>
-	<li class='jc'>{@link org.apache.juneau.BeanContext}
-	<ul>
-		<li class='jf'>{@link org.apache.juneau.BeanContext#BEAN_beanClassVisibility BEAN_beanClassVisibility}
-		<li class='jf'>{@link org.apache.juneau.BeanContext#BEAN_beanConstructorVisibility BEAN_beanConstructorVisibility}
-		<li class='jf'>{@link org.apache.juneau.BeanContext#BEAN_beanDictionary BEAN_beanDictionary}
-		<li class='jf'>{@link org.apache.juneau.BeanContext#BEAN_beanFieldVisibility BEAN_beanFieldVisibility}
-		<li class='jf'>{@link org.apache.juneau.BeanContext#BEAN_beanFilters BEAN_beanFilters}
-		<li class='jf'>{@link org.apache.juneau.BeanContext#BEAN_beanMapPutReturnsOldValue BEAN_beanMapPutReturnsOldValue}
-		<li class='jf'>{@link org.apache.juneau.BeanContext#BEAN_beanMethodVisibility BEAN_beanMethodVisibility}
-		<li class='jf'>{@link org.apache.juneau.BeanContext#BEAN_beansRequireDefaultConstructor BEAN_beansRequireDefaultConstructor}
-		<li class='jf'>{@link org.apache.juneau.BeanContext#BEAN_beansRequireSerializable BEAN_beansRequireSerializable}
-		<li class='jf'>{@link org.apache.juneau.BeanContext#BEAN_beansRequireSettersForGetters BEAN_beansRequireSettersForGetters}
-		<li class='jf'>{@link org.apache.juneau.BeanContext#BEAN_beansRequireSomeProperties BEAN_beansRequireSomeProperties}
-		<li class='jf'>{@link org.apache.juneau.BeanContext#BEAN_beanTypePropertyName BEAN_beanTypePropertyName}
-		<li class='jf'>{@link org.apache.juneau.BeanContext#BEAN_bpi BEAN_bpi}
-		<li class='jf'>{@link org.apache.juneau.BeanContext#BEAN_bpx BEAN_bpx}
-		<li class='jf'>{@link org.apache.juneau.BeanContext#BEAN_debug BEAN_debug}
-		<li class='jf'>{@link org.apache.juneau.BeanContext#BEAN_examples BEAN_examples}
-		<li class='jf'>{@link org.apache.juneau.BeanContext#BEAN_fluentSetters BEAN_fluentSetters}
-		<li class='jf'>{@link org.apache.juneau.BeanContext#BEAN_ignoreInvocationExceptionsOnGetters BEAN_ignoreInvocationExceptionsOnGetters}
-		<li class='jf'>{@link org.apache.juneau.BeanContext#BEAN_ignoreInvocationExceptionsOnSetters BEAN_ignoreInvocationExceptionsOnSetters}
-		<li class='jf'>{@link org.apache.juneau.BeanContext#BEAN_ignorePropertiesWithoutSetters BEAN_ignorePropertiesWithoutSetters}
-		<li class='jf'>{@link org.apache.juneau.BeanContext#BEAN_ignoreUnknownBeanProperties BEAN_ignoreUnknownBeanProperties}
-		<li class='jf'>{@link org.apache.juneau.BeanContext#BEAN_ignoreUnknownNullBeanProperties BEAN_ignoreUnknownNullBeanProperties}
-		<li class='jf'>{@link org.apache.juneau.BeanContext#BEAN_implClasses BEAN_implClasses}
-		<li class='jf'>{@link org.apache.juneau.BeanContext#BEAN_locale BEAN_locale}
-		<li class='jf'>{@link org.apache.juneau.BeanContext#BEAN_mediaType BEAN_mediaType}
-		<li class='jf'>{@link org.apache.juneau.BeanContext#BEAN_notBeanClasses BEAN_notBeanClasses}
-		<li class='jf'>{@link org.apache.juneau.BeanContext#BEAN_notBeanPackages BEAN_notBeanPackages}
-		<li class='jf'>{@link org.apache.juneau.BeanContext#BEAN_pojoSwaps BEAN_pojoSwaps}
-		<li class='jf'>{@link org.apache.juneau.BeanContext#BEAN_propertyNamer BEAN_propertyNamer}
-		<li class='jf'>{@link org.apache.juneau.BeanContext#BEAN_sortProperties BEAN_sortProperties}
-		<li class='jf'>{@link org.apache.juneau.BeanContext#BEAN_timeZone BEAN_timeZone}
-		<li class='jf'>{@link org.apache.juneau.BeanContext#BEAN_useEnumNames BEAN_useEnumNames}
-		<li class='jf'>{@link org.apache.juneau.BeanContext#BEAN_useInterfaceProxies BEAN_useInterfaceProxies}
-		<li class='jf'>{@link org.apache.juneau.BeanContext#BEAN_useJavaBeanIntrospector BEAN_useJavaBeanIntrospector}
-	</ul>
+<ul class='seealso'>
+	<li class='doclink'>{@doc Glossaries.ConfigurableProperties link} - Glossary of all configurable properties.
 </ul>
-</div><!-- END: 2.6.1 - juneau-marshall.ConfigurableProperties.Common -->
-
-<!-- ==================================================================================================== -->
-
-<h4 class='topic' onclick='toggle(this)'><a href='#juneau-marshall.ConfigurableProperties.CommonSerializer' id='juneau-marshall.ConfigurableProperties.CommonSerializer'>2.6.2 - Common Serializer Properties</a><span class='update'>8.1.0-updated</span></h4>
-<div class='topic'><!-- START: 2.6.2 - juneau-marshall.ConfigurableProperties.CommonSerializer -->
-<p>
-	In addition to the common properties above, the following properties are common to all serializers:
-</p>
-<ul class='javatree'>
-	<li class='jc'>{@link org.apache.juneau.BeanTraverseContext}
-	<ul>
-		<li class='jf'>{@link org.apache.juneau.BeanTraverseContext#BEANTRAVERSE_detectRecursions BEANTRAVERSE_detectRecursions}
-		<li class='jf'>{@link org.apache.juneau.BeanTraverseContext#BEANTRAVERSE_ignoreRecursions BEANTRAVERSE_ignoreRecursions}
-		<li class='jf'>{@link org.apache.juneau.BeanTraverseContext#BEANTRAVERSE_initialDepth BEANTRAVERSE_initialDepth}
-		<li class='jf'>{@link org.apache.juneau.BeanTraverseContext#BEANTRAVERSE_maxDepth BEANTRAVERSE_maxDepth}
-		<li class='jc'>{@link org.apache.juneau.serializer.Serializer}
-		<ul>
-			<li class='jf'>{@link org.apache.juneau.serializer.Serializer#SERIALIZER_addBeanTypes SERIALIZER_addBeanTypes}
-			<li class='jf'>{@link org.apache.juneau.serializer.Serializer#SERIALIZER_addRootType SERIALIZER_addRootType}
-			<li class='jf'>{@link org.apache.juneau.serializer.Serializer#SERIALIZER_listener SERIALIZER_listener}
-			<li class='jf'>{@link org.apache.juneau.serializer.Serializer#SERIALIZER_sortCollections SERIALIZER_sortCollections}
-			<li class='jf'>{@link org.apache.juneau.serializer.Serializer#SERIALIZER_sortMaps SERIALIZER_sortMaps}
-			<li class='jf'>{@link org.apache.juneau.serializer.Serializer#SERIALIZER_trimEmptyCollections SERIALIZER_trimEmptyCollections}
-			<li class='jf'>{@link org.apache.juneau.serializer.Serializer#SERIALIZER_trimEmptyMaps SERIALIZER_trimEmptyMaps}
-			<li class='jf'>{@link org.apache.juneau.serializer.Serializer#SERIALIZER_trimNullProperties SERIALIZER_trimNullProperties}
-			<li class='jf'>{@link org.apache.juneau.serializer.Serializer#SERIALIZER_trimStrings SERIALIZER_trimStrings}
-			<li class='jf'>{@link org.apache.juneau.serializer.Serializer#SERIALIZER_uriContext SERIALIZER_uriContext}
-			<li class='jf'>{@link org.apache.juneau.serializer.Serializer#SERIALIZER_uriRelativity SERIALIZER_uriRelativity}
-			<li class='jf'>{@link org.apache.juneau.serializer.Serializer#SERIALIZER_uriResolution SERIALIZER_uriResolution}
-			<li class='jc'>{@link org.apache.juneau.serializer.WriterSerializer}
-			<ul>
-				<li class='jf'>{@link org.apache.juneau.serializer.WriterSerializer#WSERIALIZER_fileCharset WSERIALIZER_fileCharset}
-				<li class='jf'>{@link org.apache.juneau.serializer.WriterSerializer#WSERIALIZER_maxIndent WSERIALIZER_maxIndent}
-				<li class='jf'>{@link org.apache.juneau.serializer.WriterSerializer#WSERIALIZER_quoteChar WSERIALIZER_quoteChar}
-				<li class='jf'>{@link org.apache.juneau.serializer.WriterSerializer#WSERIALIZER_streamCharset WSERIALIZER_streamCharset}
-				<li class='jf'>{@link org.apache.juneau.serializer.WriterSerializer#WSERIALIZER_useWhitespace WSERIALIZER_useWhitespace}
-			</ul>
-			<li class='jc'>{@link org.apache.juneau.serializer.OutputStreamSerializer}
-			<ul>
-				<li class='jf'>{@link org.apache.juneau.serializer.OutputStreamSerializer#OSSERIALIZER_binaryFormat OSSERIALIZER_binaryFormat}
-			</ul>
-		</ul>
-	</ul>
-</ul>
-</div><!-- END: 2.6.2 - juneau-marshall.ConfigurableProperties.CommonSerializer -->
-
-<!-- ==================================================================================================== -->
-
-<h4 class='topic' onclick='toggle(this)'><a href='#juneau-marshall.ConfigurableProperties.CommonParser' id='juneau-marshall.ConfigurableProperties.CommonParser'>2.6.3 - Common Parser Properties</a><span class='update'><b>8.1.3-updated</b></span></h4>
-<div class='topic'><!-- START: 2.6.3 - juneau-marshall.ConfigurableProperties.CommonParser -->
-<p>
-	In addition to the common properties above, the following properties are common to all parsers:
-</p>
-<ul class='javatree'>
-	<li class='jc'>{@link org.apache.juneau.parser.Parser}
-	<ul>
-		<li class='jf'>{@link org.apache.juneau.parser.Parser#PARSER_autoCloseStreams PARSER_autoCloseStreams}
-		<li class='jf'>{@link org.apache.juneau.parser.Parser#PARSER_debugOutputLines PARSER_debugOutputLines}
-		<li class='jf'>{@link org.apache.juneau.parser.Parser#PARSER_listener PARSER_listener}
-		<li class='jf'>{@link org.apache.juneau.parser.Parser#PARSER_strict PARSER_strict}
-		<li class='jf'>{@link org.apache.juneau.parser.Parser#PARSER_trimStrings PARSER_trimStrings}
-		<li class='jf'>{@link org.apache.juneau.parser.Parser#PARSER_unbuffered PARSER_unbuffered}
-		<li class='jc'>{@link org.apache.juneau.parser.ReaderParser}
-		<ul>
-			<li class='jf'>{@link org.apache.juneau.parser.ReaderParser#RPARSER_fileCharset RPARSER_fileCharset}
-			<li class='jf'>{@link org.apache.juneau.parser.ReaderParser#RPARSER_streamCharset RPARSER_streamCharset}
-		</ul>
-		<li class='jc'>{@link org.apache.juneau.parser.InputStreamParser}
-		<ul>
-			<li class='jf'>{@link org.apache.juneau.parser.InputStreamParser#ISPARSER_binaryFormat ISPARSER_binaryFormat}
-		</ul>
-	</ul>
-</ul>
-</div><!-- END: 2.6.3 - juneau-marshall.ConfigurableProperties.CommonParser -->
 </div><!-- END: 2.6 - juneau-marshall.ConfigurableProperties -->
 
 <!-- ==================================================================================================== -->
@@ -1725,6 +1497,10 @@
 	WriterSerializer ws = JsonSerializer.<jsm>create</jsm>().applyAnnotations(DummyClass.<jk>class</jk>).build();
 	String json = ws.toString(addressBean);
 </p>
+
+<ul class='seealso'>
+	<li class='doclink'>{@doc Glossaries.Annotations link} - Glossary of all annotations.
+</ul>
 </div><!-- END: 2.7 - juneau-marshall.ConfigurableAnnotations -->
 
 <!-- ==================================================================================================== -->
@@ -28764,11 +28540,508 @@
 
 <!-- ==================================================================================================== -->
 
-<h3 class='topic' onclick='toggle(this)'><a href='#Glossaries.ConfigurablePropertiesGlossary' id='Glossaries.ConfigurablePropertiesGlossary'>19.1 - Configurable Properties Glossary</a><span class='update'><b>8.1.3-new</b></span></h3>
-<div class='topic'><!-- START: 19.1 - Glossaries.ConfigurablePropertiesGlossary -->
-<p>
-	The following is a list of all properties defined throughout Juneau:
-</p>
+<h3 class='topic' onclick='toggle(this)'><a href='#Glossaries.LanguageSupport' id='Glossaries.LanguageSupport'>19.1 - Language Support</a><span class='update'><b>8.1.3-new</b></span></h3>
+<div class='topic'><!-- START: 19.1 - Glossaries.LanguageSupport -->
+<h5 class='figure'>All serializers/parsers defined in Juneau</h5>
+<table class='styled w1000'>
+	<tr>
+		<th>Language</th><th>Serializers</th><th>Parsers</th><th>Marshalls</th><th>Documentation</th>
+	</tr>
+	<tr>
+		<td><c>text/csv</c></td>
+		<td><ul><li class='jc'>{@link org.apache.juneau.csv.CsvSerializer}</ul></td>
+		<td><ul><li class='jc'>{@link org.apache.juneau.csv.CsvParser}</ul></td>
+		<td>&nbsp;</td>
+		<td>&nbsp;</td>
+	</tr>
+	<tr>
+		<td><c>text/html</c></td>
+		<td><ul><li class='jc'>{@link org.apache.juneau.html.HtmlSerializer}<li class='jc'>{@link org.apache.juneau.html.HtmlStrippedDocSerializer}<li class='jc'>{@link org.apache.juneau.html.HtmlDocSerializer}</ul></td>
+		<td><ul><li class='jc'>{@link org.apache.juneau.html.HtmlParser}</ul></td>
+		<td><ul><li class='jc'>{@link org.apache.juneau.marshall.Html}</ul></td>
+		<td>{@doc juneau-marshall.HtmlDetails HTML Details}</td>
+	</tr>
+	<tr>
+		<td><c>text/html+schema</c></td>
+		<td><ul><li class='jc'>{@link org.apache.juneau.html.HtmlSchemaSerializer}<li class='jc'>{@link org.apache.juneau.html.HtmlSchemaDocSerializer}</ul></td>
+		<td>&nbsp;</td>
+		<td>&nbsp;</td>
+		<td>{@doc juneau-marshall.HtmlDetails HTML Details}</td>
+	</tr>
+	<tr>
+		<td><c>application/x-java-serialized-object</c></td>
+		<td><ul><li class='jc'>{@link org.apache.juneau.jso.JsoSerializer}</ul></td>
+		<td><ul><li class='jc'>{@link org.apache.juneau.jso.JsoParser}</ul></td>
+		<td><ul><li class='jc'>{@link org.apache.juneau.marshall.Jso}</ul></td>
+		<td>&nbsp;</td>
+	</tr>
+	<tr>
+		<td><c>application/json</c><br><c>text/json</c></td>
+		<td><ul><li class='jc'>{@link org.apache.juneau.json.JsonSerializer}<li class='jc'>{@link org.apache.juneau.json.JsonSerializer.Readable}<li class='jc'>{@link org.apache.juneau.json.JsonSerializer.ReadableSafe}</ul></td>
+		<td><ul><li class='jc'>{@link org.apache.juneau.json.JsonParser}</ul></td>
+		<td><ul><li class='jc'>{@link org.apache.juneau.marshall.Json}</ul></td>
+		<td>{@doc juneau-marshall.JsonDetails JSON Details}</td>
+	</tr>
+	<tr>
+		<td><c>application/json+simple</c><br><c>text/json+simple</c></td>
+		<td><ul><li class='jc'>{@link org.apache.juneau.json.SimpleJsonSerializer}</ul></td>
+		<td><ul><li class='jc'>{@link org.apache.juneau.json.JsonParser}</ul></td>
+		<td><ul><li class='jc'>{@link org.apache.juneau.marshall.SimpleJson}</ul></td>
+		<td>{@doc juneau-marshall.JsonDetails.SimplifiedJson Simplified JSON}</td>
+	</tr>
+	<tr>
+		<td><c>application/json+schema</c><br><c>text/json+schema</c></td>
+		<td><ul><li class='jc'>{@link org.apache.juneau.json.JsonSchemaSerializer}</ul></td>
+		<td>&nbsp;</td>
+		<td>&nbsp;</td>
+		<td>{@doc juneau-marshall.JsonDetails.JsonSchema JSON-Schema Support}</td>
+	</tr>
+	<tr>
+		<td><c>octal/msgpack</c></td>
+		<td><ul><li class='jc'>{@link org.apache.juneau.msgpack.MsgPackSerializer}</ul></td>
+		<td><ul><li class='jc'>{@link org.apache.juneau.msgpack.MsgPackParser}</ul></td>
+		<td><ul><li class='jc'>{@link org.apache.juneau.marshall.MsgPack}</ul></td>
+		<td>{@doc juneau-marshall.MsgPackDetails MessagePack Details}</td>
+	</tr>
+	<tr>
+		<td><c>text/n3</c></td>
+		<td><ul><li class='jc'>{@link org.apache.juneau.jena.N3Serializer}</ul></td>
+		<td><ul><li class='jc'>{@link org.apache.juneau.jena.N3Parser}</ul></td>
+		<td><ul><li class='jc'>{@link org.apache.juneau.marshall.N3}</ul></td>
+		<td>{@doc juneau-marshall-rdf juneau-marshall-rdf}</td>
+	</tr>
+	<tr>
+		<td><c>text/n-triple</c></td>
+		<td><ul><li class='jc'>{@link org.apache.juneau.jena.NTripleSerializer}</ul></td>
+		<td><ul><li class='jc'>{@link org.apache.juneau.jena.NTripleParser}</ul></td>
+		<td><ul><li class='jc'>{@link org.apache.juneau.marshall.NTriple}</ul></td>
+		<td>{@doc juneau-marshall-rdf juneau-marshall-rdf}</td>
+	</tr>
+	<tr>
+		<td><c>text/openapi</c></td>
+		<td><ul><li class='jc'>{@link org.apache.juneau.oapi.OpenApiSerializer}</ul></td>
+		<td><ul><li class='jc'>{@link org.apache.juneau.oapi.OpenApiParser}</ul></td>
+		<td><ul><li class='jc'>{@link org.apache.juneau.marshall.OpenApi}</ul></td>
+		<td>{@doc juneau-marshall.OpenApiDetails OpenAPI Details}</td>
+	</tr>
+	<tr>
+		<td><c>text/plain</c></td>
+		<td><ul><li class='jc'>{@link org.apache.juneau.plaintext.PlainTextSerializer}</ul></td>
+		<td>&nbsp;</td>
+		<td>&nbsp;</td>
+		<td>&nbsp;</td>
+	</tr>
+	<tr>
+		<td><c>text/xml+rdf<c></td>
+		<td><ul><li class='jc'>{@link org.apache.juneau.jena.RdfXmlSerializer}</ul></td>
+		<td><ul><li class='jc'>{@link org.apache.juneau.jena.RdfXmlParser}</ul></td>
+		<td><ul><li class='jc'>{@link org.apache.juneau.marshall.RdfXml}</ul></td>
+		<td>{@doc juneau-marshall-rdf juneau-marshall-rdf}</td>
+	</tr>
+	<tr>
+		<td><c>text/xml+rdf+abbrev</c></td>
+		<td><ul><li class='jc'>{@link org.apache.juneau.jena.RdfXmlAbbrevSerializer}</ul></td>
+		<td><ul><li class='jc'>{@link org.apache.juneau.jena.RdfXmlParser}</ul></td>
+		<td><ul><li class='jc'>{@link org.apache.juneau.marshall.RdfXmlAbbrev}</ul></td>
+		<td>{@doc juneau-marshall-rdf juneau-marshall-rdf}</td>
+	</tr>
+	<tr>
+		<td><c>text/xml+soap</c></td>
+		<td><ul><li class='jc'>{@link org.apache.juneau.soap.SoapXmlSerializer}</ul></td>
+		<td>&nbsp;</td>
+		<td>&nbsp;</td>
+		<td>&nbsp;</td>
+	</tr>
+	<tr>
+		<td><c>text/turtle</c></td>
+		<td><ul><li class='jc'>{@link org.apache.juneau.jena.TurtleSerializer}</ul></td>
+		<td><ul><li class='jc'>{@link org.apache.juneau.jena.TurtleParser}</ul></td>
+		<td><ul><li class='jc'>{@link org.apache.juneau.marshall.Turtle}</ul></td>
+		<td>{@doc juneau-marshall-rdf juneau-marshall-rdf}</td>
+	</tr>
+	<tr>
+		<td><c>text/uon</c></td>
+		<td><ul><li class='jc'>{@link org.apache.juneau.uon.UonSerializer}</ul></td>
+		<td><ul><li class='jc'>{@link org.apache.juneau.uon.UonParser}</ul></td>
+		<td><ul><li class='jc'>{@link org.apache.juneau.marshall.Uon}</ul></td>
+		<td>{@doc juneau-marshall.UonDetails UON Details}</td>
+	</tr>
+	<tr>
+		<td><c>application/x-www-form-urlencoded</c></td>
+		<td><ul><li class='jc'>{@link org.apache.juneau.urlencoding.UrlEncodingSerializer}</ul></td>
+		<td><ul><li class='jc'>{@link org.apache.juneau.urlencoding.UrlEncodingParser}</ul></td>
+		<td><ul><li class='jc'>{@link org.apache.juneau.marshall.UrlEncoding}</ul></td>
+		<td>{@doc juneau-marshall.UrlEncodingDetails URL-Encoding Details}</td>
+	</tr>
+	<tr>
+		<td><c>text/xml</c></td>
+		<td><ul><li class='jc'>{@link org.apache.juneau.xml.XmlSerializer}<li class='jc'>{@link org.apache.juneau.xml.XmlDocSerializer}</ul></td>
+		<td><ul><li class='jc'>{@link org.apache.juneau.xml.XmlParser}</ul></td>
+		<td><ul><li class='jc'>{@link org.apache.juneau.marshall.Xml}</ul></td>
+		<td>{@doc juneau-marshall.XmlDetails XML Details}</td>
+	</tr>
+	<tr>
+		<td><c>text/xml+schema</c></td>
+		<td><ul><li class='jc'>{@link org.apache.juneau.xmlschema.XmlSchemaSerializer}<li class='jc'>{@link org.apache.juneau.xmlschema.XmlSchemaDocSerializer}</ul></td>
+		<td>&nbsp;</td>
+		<td>&nbsp;</td>
+		<td>{@doc juneau-marshall.XmlDetails.XmlSchema XML-Schema Support}</td>
+	</tr>
+</table>
+</div><!-- END: 19.1 - Glossaries.LanguageSupport -->
+
+<!-- ==================================================================================================== -->
+
+<h3 class='topic' onclick='toggle(this)'><a href='#Glossaries.Annotations' id='Glossaries.Annotations'>19.2 - Annotations</a><span class='update'><b>8.1.3-new</b></span></h3>
+<div class='topic'><!-- START: 19.2 - Glossaries.Annotations -->
+<h5 class='figure'>Serialization Annotations (used to modify how artifacts are marshalled)</h5>
+<table class='styled w1000'>
+	<tr>
+		<th>Annotation</th><th>Description</th><th>Used On</th><th>Used By</th>
+	</tr>
+	<tr>
+		<td><ul style='margin-left:20px'><li class='ja'>{@link org.apache.juneau.annotation.Bean}</ul></td>
+		<td><ul><li>Classes</ul></td>
+		<td>All serializers and parsers</td>
+		<td>Tailors how beans get marshalled.</td>
+	</tr>
+	<tr>
+		<td><ul style='margin-left:20px'><li class='ja'>{@link org.apache.juneau.annotation.Beanc}</ul></td>
+		<td><ul><li>Bean constructors</ul></td>
+		<td>All serializers and parsers</td>
+		<td>Identifies bean constructors and property args.</td>
+	</tr>
+	<tr>
+		<td><ul style='margin-left:20px'><li class='ja'>{@link org.apache.juneau.annotation.BeanIgnore}</ul></td>
+		<td><ul><li>Classes<li>Fields<li>Methods</ul></td>
+		<td>All serializers and parsers</td>
+		<td>Prevents artifacts from being interpreted as beans/bean components.</td>
+	</tr>
+	<tr>
+		<td><ul style='margin-left:20px'><li class='ja'>{@link org.apache.juneau.annotation.Beanp}</ul></td>
+		<td><ul><li>Methods<li>Fields<li>Constructor args</ul></td>
+		<td>All serializers and parsers</td>
+		<td>Tailors how bean properties get marshalled.</td>
+	</tr>
+	<tr>
+		<td><ul style='margin-left:20px'><li class='ja'>{@link org.apache.juneau.annotation.Builder}</ul></td>
+		<td><ul><li>Classes</ul></td>
+		<td>All parsers</td>
+		<td>Identifies a class as a builder for a POJO class.</td>
+	</tr>
+	<tr>
+		<td><ul style='margin-left:20px'><li class='ja'>{@link org.apache.juneau.csv.annotation.Csv}</ul></td>
+		<td><ul><li>Classes<li>Methods<li>Fields</ul></td>
+		<td><ul><li class='jc'>{@link org.apache.juneau.csv.CsvSerializer}<li class='jc'>{@link org.apache.juneau.csv.CsvParser}</ul></td>
+		<td>CSV-specific tweaks.</td>
+	</tr>
+	<tr>
+		<td><ul style='margin-left:20px'><li class='ja'>{@link org.apache.juneau.annotation.Example}</ul></td>
+		<td><ul><li>Static methods<li>Static fields<li>Classes</ul></td>
+		<td><ul><li class='jc'>{@link org.apache.juneau.json.JsonSchemaSerializer}</ul></td>
+		<td>Identifies examples for POJOs.</td>
+	</tr>
+	<tr>
+		<td><ul style='margin-left:20px'><li class='ja'>{@link org.apache.juneau.html.annotation.Html}</ul></td>
+		<td><ul><li>Classes<li>Methods<li>Fields</ul></td>
+		<td><ul><li class='jc'>{@link org.apache.juneau.html.HtmlSerializer}<li class='jc'>{@link org.apache.juneau.html.HtmlParser}</ul></td>
+		<td>HTML-specific tweaks.</td>
+	</tr>
+	<tr>
+		<td><ul style='margin-left:20px'><li class='ja'>{@link org.apache.juneau.html.annotation.HtmlLink}</ul></td>
+		<td><ul><li>Classes</ul></td>
+		<td><ul><li class='jc'>{@link org.apache.juneau.html.HtmlSerializer}</ul></td>
+		<td>Defines how to construct hyperlinks on objects.</td>
+	</tr>
+	<tr>
+		<td><ul style='margin-left:20px'><li class='ja'>{@link org.apache.juneau.jso.annotation.Jso}</ul></td>
+		<td><ul><li>Classes<li>Methods<li>Fields</ul></td>
+		<td><ul><li class='jc'>{@link org.apache.juneau.jso.JsoSerializer}<li class='jc'>{@link org.apache.juneau.jso.JsoParser}</ul></td>
+		<td>JSO-specific tweaks.</td>
+	</tr>
+	<tr>
+		<td><ul style='margin-left:20px'><li class='ja'>{@link org.apache.juneau.json.annotation.Json}</ul></td>
+		<td><ul><li>Classes<li>Methods<li>Fields</ul></td>
+		<td><ul><li class='jc'>{@link org.apache.juneau.json.JsonSerializer}<li class='jc'>{@link org.apache.juneau.json.JsonParser}</ul></td>
+		<td>JSON-specific tweaks.</td>
+	</tr>
+	<tr>
+		<td><ul style='margin-left:20px'><li class='ja'>{@link org.apache.juneau.msgpack.annotation.MsgPack}</ul></td>
+		<td><ul><li>Classes<li>Methods<li>Fields</ul></td>
+		<td><ul><li class='jc'>{@link org.apache.juneau.msgpack.MsgPackSerializer}<li class='jc'>{@link org.apache.juneau.msgpack.MsgPackParser}</ul></td>
+		<td>MessagePack-specific tweaks.</td>
+	</tr>
+	<tr>
+		<td><ul style='margin-left:20px'><li class='ja'>{@link org.apache.juneau.annotation.Name}</ul></td>
+		<td><ul><li>Constructor args</ul></td>
+		<td>All parsers</td>
+		<td>Maps constructor args to property names.</td>
+	</tr>
+	<tr>
+		<td><ul style='margin-left:20px'><li class='ja'>{@link org.apache.juneau.annotation.NameProperty}</ul></td>
+		<td><ul><li>Methods<li>Fields</ul></td>
+		<td>All parsers</td>
+		<td>Identifies a 'name' property.</td>
+	</tr>
+	<tr>
+		<td><ul style='margin-left:20px'><li class='ja'>{@link org.apache.juneau.oapi.annotation.OpenApi}</ul></td>
+		<td><ul><li>Classes<li>Methods<li>Fields</ul></td>
+		<td><ul><li class='jc'>{@link org.apache.juneau.oapi.OpenApiSerializer}<li class='jc'>{@link org.apache.juneau.oapi.OpenApiParser}</ul></td>
+		<td>OpenAPI-specific tweaks.</td>
+	</tr>
+	<tr>
+		<td><ul style='margin-left:20px'><li class='ja'>{@link org.apache.juneau.annotation.ParentProperty}</ul></td>
+		<td><ul><li>Methods<li>Fields</ul></td>
+		<td>All parsers</td>
+		<td>Identifies a 'parent' property.</td>
+	</tr>
+	<tr>
+		<td><ul style='margin-left:20px'><li class='ja'>{@link org.apache.juneau.plaintext.annotation.PlainText}</ul></td>
+		<td><ul><li>Classes<li>Methods<li>Fields</ul></td>
+		<td><ul><li class='jc'>{@link org.apache.juneau.plaintext.PlainTextSerializer}<li class='jc'>{@link org.apache.juneau.plaintext.PlainTextParser}</ul></td>
+		<td>PlainText-specific tweaks.</td>
+	</tr>
+	<tr>
+		<td><ul style='margin-left:20px'><li class='ja'>{@link org.apache.juneau.jena.annotation.Rdf}</ul></td>
+		<td><ul><li>Classes<li>Methods<li>Fields</ul></td>
+		<td>All RDF serializers and parsers</td>
+		<td>RDF-specific tweaks.</td>
+	</tr>
+	<tr>
+		<td><ul style='margin-left:20px'><li class='ja'>{@link org.apache.juneau.jena.annotation.RdfSchema}</ul></td>
+		<td><ul><li>Packages</ul></td>
+		<td>All RDF serializers and parsers</td>
+		<td>Identifies the default RDF namespaces at the package level.</td>
+	</tr>
+	<tr>
+		<td><ul style='margin-left:20px'><li class='ja'>{@link org.apache.juneau.soap.annotation.SoapXml}</ul></td>
+		<td><ul><li>Classes<li>Methods<li>Fields</ul></td>
+		<td><ul><li class='jc'>{@link org.apache.juneau.soap.SoapXmlSerializer}</ul></td>
+		<td>SOAP/XML-specific tweaks.</td>
+	</tr>
+	<tr>
+		<td><ul style='margin-left:20px'><li class='ja'>{@link org.apache.juneau.annotation.Swap}</ul></td>
+		<td><ul><li>Classes<li>Bean getters/setters<li>Fields</ul></td>
+		<td>All serializers and parsers</td>
+		<td>Associates swaps and surrogates with POJOs and bean properties.</td>
+	</tr>
+	<tr>
+		<td><ul style='margin-left:20px'><li class='ja'>{@link org.apache.juneau.annotation.Swaps}</ul></td>
+		<td><ul><li>Classes</ul></td>
+		<td>All serializers and parsers</td>
+		<td>Associates multiple swaps with the same POJO class.</td>
+	</tr>
+	<tr>
+		<td><ul style='margin-left:20px'><li class='ja'>{@link org.apache.juneau.uon.annotation.Uon}</ul></td>
+		<td><ul><li>Classes<li>Methods<li>Fields</ul></td>
+		<td><ul><li class='jc'>{@link org.apache.juneau.uon.UonSerializer}<li class='jc'>{@link org.apache.juneau.uon.UonParser}</ul></td>
+		<td>UON-specific tweaks.</td>
+	</tr>
+	<tr>
+		<td><ul style='margin-left:20px'><li class='ja'>{@link org.apache.juneau.annotation.URI}</ul></td>
+		<td><ul><li>Classes<li>Methods<li>Fields</ul></td>
+		<td>HTML and XML serializers</td>
+		<td>Identifies a class or bean property as a URI.</td>
+	</tr>
+	<tr>
+		<td><ul style='margin-left:20px'><li class='ja'>{@link org.apache.juneau.urlencoding.annotation.UrlEncoding}</ul></td>
+		<td><ul><li>Classes<li>Methods<li>Fields</ul></td>
+		<td><ul><li class='jc'>{@link org.apache.juneau.urlencoding.UrlEncodingSerializer}<li class='jc'>{@link org.apache.juneau.urlencoding.UrlEncodingParser}</ul></td>
+		<td>URL-Encoding-specific tweaks.</td>
+	</tr>
+	<tr>
+		<td><ul style='margin-left:20px'><li class='ja'>{@link org.apache.juneau.xml.annotation.Xml}</ul></td>
+		<td><ul><li>Classes<li>Methods<li>Fields</ul></td>
+		<td><ul><li class='jc'>{@link org.apache.juneau.xml.XmlSerializer}<li class='jc'>{@link org.apache.juneau.xml.XmlParser}</ul></td>
+		<td>XML-specific tweaks.</td>
+	</tr>
+	<tr>
+		<td><ul style='margin-left:20px'><li class='ja'>{@link org.apache.juneau.xml.annotation.XmlSchema}</ul></td>
+		<td><ul><li>Packages</ul></td>
+		<td>XML serializers and parsers</td>
+		<td>Identifies the default XML namespaces at the package level.</td>
+	</tr>
+</table>
+<br><br>
+
+<h5 class='figure'>Configuration Annotations (used to modify how serializers/parsers behave)</h5>
+<table class='styled w800'>
+	<tr>
+		<th>Annotation</th><th>Configures</th>
+	</tr>
+	<tr>
+		<td><ul style='margin-left:20px'><li class='ja'>{@link org.apache.juneau.annotation.BeanConfig}</ul></td>
+		<td>All serializers and parsers</td>
+	</tr>
+	<tr>
+		<td><ul style='margin-left:20px'><li class='ja'>{@link org.apache.juneau.csv.annotation.CsvConfig}</ul></td>
+		<td><ul><li class='jc'>{@link org.apache.juneau.csv.CsvSerializer}<li class='jc'>{@link org.apache.juneau.csv.CsvParser}</ul></td>
+	</tr>
+	<tr>
+		<td><ul style='margin-left:20px'><li class='ja'>{@link org.apache.juneau.html.annotation.HtmlConfig}</ul></td>
+		<td><ul><li class='jc'>{@link org.apache.juneau.html.HtmlSerializer}<li class='jc'>{@link org.apache.juneau.html.HtmlParser}</ul></td>
+	</tr>
+	<tr>
+		<td><ul style='margin-left:20px'><li class='ja'>{@link org.apache.juneau.html.annotation.HtmlDocConfig}</ul></td>
+		<td><ul><li class='jc'>{@link org.apache.juneau.html.HtmlDocSerializer}</ul></td>
+	</tr>
+	<tr>
+		<td><ul style='margin-left:20px'><li class='ja'>{@link org.apache.juneau.jso.annotation.JsoConfig}</ul></td>
+		<td><ul><li class='jc'>{@link org.apache.juneau.jso.JsoSerializer}<li class='jc'>{@link org.apache.juneau.jso.JsoParser}</ul></td>
+	</tr>
+	<tr>
+		<td><ul style='margin-left:20px'><li class='ja'>{@link org.apache.juneau.json.annotation.JsonConfig}</ul></td>
+		<td><ul><li class='jc'>{@link org.apache.juneau.json.JsonSerializer}<li class='jc'>{@link org.apache.juneau.json.JsonParser}</ul></td>
+	</tr>
+	<tr>
+		<td><ul style='margin-left:20px'><li class='ja'>{@link org.apache.juneau.jsonschema.annotation.JsonSchemaConfig}</ul></td>
+		<td><ul><li class='jc'>{@link org.apache.juneau.json.JsonSchemaSerializer}</ul></td>
+	</tr>
+	<tr>
+		<td><ul style='margin-left:20px'><li class='ja'>{@link org.apache.juneau.msgpack.annotation.MsgPackConfig}</ul></td>
+		<td><ul><li class='jc'>{@link org.apache.juneau.msgpack.MsgPackSerializer}<li class='jc'>{@link org.apache.juneau.msgpack.MsgPackParser}</ul></td>
+	</tr>
+	<tr>
+		<td><ul style='margin-left:20px'><li class='ja'>{@link org.apache.juneau.oapi.annotation.OpenApiConfig}</ul></td>
+		<td><ul><li class='jc'>{@link org.apache.juneau.oapi.OpenApiSerializer}<li class='jc'>{@link org.apache.juneau.oapi.OpenApiParser}</ul></td>
+	</tr>
+	<tr>
+		<td><ul style='margin-left:20px'><li class='ja'>{@link org.apache.juneau.parser.annotation.ParserConfig}</ul></td>
+		<td>All parsers</td>
+	</tr>
+	<tr>
+		<td><ul style='margin-left:20px'><li class='ja'>{@link org.apache.juneau.plaintext.annotation.PlainTextConfig}</ul></td>
+		<td><ul><li class='jc'>{@link org.apache.juneau.plaintext.PlainTextSerializer}</ul></td>
+	</tr>
+	<tr>
+		<td><ul style='margin-left:20px'><li class='ja'>{@link org.apache.juneau.jena.annotation.RdfConfig}</ul></td>
+		<td>All RDF serializers and parsers</td>
+	</tr>
+	<tr>
+		<td><ul style='margin-left:20px'><li class='ja'>{@link org.apache.juneau.serializer.annotation.SerializerConfig}</ul></td>
+		<td>All serializers</td>
+	</tr>
+	<tr>
+		<td><ul style='margin-left:20px'><li class='ja'>{@link org.apache.juneau.soap.annotation.SoapXmlConfig}</ul></td>
+		<td><ul><li class='jc'>{@link org.apache.juneau.soap.SoapXmlSerializer}</ul></td>
+	</tr>
+	<tr>
+		<td><ul style='margin-left:20px'><li class='ja'>{@link org.apache.juneau.uon.annotation.UonConfig}</ul></td>
+		<td><ul><li class='jc'>{@link org.apache.juneau.uon.UonSerializer}<li class='jc'>{@link org.apache.juneau.uon.UonParser}</ul></td>
+	</tr>
+	<tr>
+		<td><ul style='margin-left:20px'><li class='ja'>{@link org.apache.juneau.urlencoding.annotation.UrlEncodingConfig}</ul></td>
+		<td><ul><li class='jc'>{@link org.apache.juneau.urlencoding.UrlEncodingSerializer}<li class='jc'>{@link org.apache.juneau.urlencoding.UrlEncodingParser}</ul></td>
+	</tr>
+	<tr>
+		<td><ul style='margin-left:20px'><li class='ja'>{@link org.apache.juneau.xml.annotation.XmlConfig}</ul></td>
+		<td><ul><li class='jc'>{@link org.apache.juneau.xml.XmlSerializer}<li class='jc'>{@link org.apache.juneau.xml.XmlParser}</ul></td>
+	</tr>
+</table>
+<br><br>
+
+<h5 class='figure'>Common REST Annotations (used on both client-side and server-side)</h5>
+<table class='styled w800'>
+	<tr>
+		<th>Annotation</th><th>Used On</th><th>Description</th>
+	</tr>
+	<tr>
+		<td><ul style='margin-left:20px'><li class='ja'>{@link org.apache.juneau.http.annotation.Body}</ul></td>
+		<td><ul><li>Classes<li>Methods<li>Fields<li>Parameters</ul></td>
+		<td>HTTP request/response body.</td>
+	</tr>
+	<tr>
+		<td><ul style='margin-left:20px'><li class='ja'>{@link org.apache.juneau.http.annotation.FormData}</ul></td>
+		<td><ul><li>Classes<li>Methods<li>Fields<li>Parameters</ul></td>
+		<td>HTTP form data parameter.</td>
+	</tr>
+	<tr>
+		<td><ul style='margin-left:20px'><li class='ja'>{@link org.apache.juneau.http.annotation.HasFormData}</ul></td>
+		<td><ul><li>Classes<li>Methods<li>Fields<li>Parameters</ul></td>
+		<td>HTTP form data parameter is present.</td>
+	</tr>
+	<tr>
+		<td><ul style='margin-left:20px'><li class='ja'>{@link org.apache.juneau.http.annotation.HasQuery}</ul></td>
+		<td><ul><li>Classes<li>Methods<li>Fields<li>Parameters</ul></td>
+		<td>HTTP query parameter is present.</td>
+	</tr>
+	<tr>
+		<td><ul style='margin-left:20px'><li class='ja'>{@link org.apache.juneau.http.annotation.Header}</ul></td>
+		<td><ul><li>Classes<li>Methods<li>Fields<li>Parameters</ul></td>
+		<td>HTTP header.</td>
+	</tr>
+	<tr>
+		<td><ul style='margin-left:20px'><li class='ja'>{@link org.apache.juneau.http.annotation.Path}</ul></td>
+		<td><ul><li>Classes<li>Methods<li>Fields<li>Parameters</ul></td>
+		<td>HTTP path part.</td>
+	</tr>
+	<tr>
+		<td><ul style='margin-left:20px'><li class='ja'>{@link org.apache.juneau.http.annotation.Query}</ul></td>
+		<td><ul><li>Classes<li>Methods<li>Fields<li>Parameters</ul></td>
+		<td>HTTP query parameter.</td>
+	</tr>
+	<tr>
+		<td><ul style='margin-left:20px'><li class='ja'>{@link org.apache.juneau.http.annotation.Request}</ul></td>
+		<td><ul><li>Classes<li>Parameters</ul></td>
+		<td>Identifies an interface to use to interact with HTTP parts of an HTTP request through a bean.</td>
+	</tr>
+	<tr>
+		<td><ul style='margin-left:20px'><li class='ja'>{@link org.apache.juneau.http.annotation.Response}</ul></td>
+		<td><ul><li>Classes<li>Methods<li>Parameters</ul></td>
+		<td>Identifies an interface to use to interact with HTTP parts of an HTTP response through a bean.</td>
+	</tr>
+	<tr>
+		<td><ul style='margin-left:20px'><li class='ja'>{@link org.apache.juneau.http.annotation.ResponseBody}</ul></td>
+		<td><ul><li>Methods</ul></td>
+		<td>Denotes a method as an HTTP response body on a <ja>@Response</ja>-annotated bean.</td>
+	</tr>
+	<tr>
+		<td><ul style='margin-left:20px'><li class='ja'>{@link org.apache.juneau.http.annotation.ResponseHeader}</ul></td>
+		<td><ul><li>Classes<li>Methods<li>Parameters</ul></td>
+		<td>Denotes a method as an HTTP response header on a <ja>@Response</ja>-annotated bean.</td>
+	</tr>
+	<tr>
+		<td><ul style='margin-left:20px'><li class='ja'>{@link org.apache.juneau.http.annotation.ResponseStatus}</ul></td>
+		<td><ul><li>Methods<li>Parameters</ul></td>
+		<td>Denotes a method as an HTTP response status code on a <ja>@Response</ja>-annotated bean.</td>
+	</tr>
+</table>
+<br><br>
+
+<h5 class='figure'>REST Server-only Annotations</h5>
+<table class='styled w800'>
+	<tr>
+		<th>Annotation</th><th>Used On</th><th>Description</th>
+	</tr>
+	<tr>
+		<td><ul style='margin-left:20px'><li class='ja'>{@link org.apache.juneau.rest.annotation.Attr}</ul></td>
+		<td><ul><li>Parameters</ul></td>
+		<td>Request attribute.</td>
+	</tr>
+	<tr>
+		<td><ul style='margin-left:20px'><li class='ja'>{@link org.apache.juneau.rest.annotation.Rest}</ul></td>
+		<td><ul><li>Classes</ul></td>
+		<td>Identifies and configures REST resource classes.</td>
+	</tr>
+	<tr>
+		<td><ul style='margin-left:20px'><li class='ja'>{@link org.apache.juneau.rest.annotation.RestHook}</ul></td>
+		<td><ul><li>Methods</ul></td>
+		<td>Identifies REST lifecycle hook methods.</td>
+	</tr>
+	<tr>
+		<td><ul style='margin-left:20px'><li class='ja'>{@link org.apache.juneau.rest.annotation.RestMethod}</ul></td>
+		<td><ul><li>Methods</ul></td>
+		<td>Identifies and configures REST resource class methods.</td>
+	</tr>
+</table>
+<br><br>
+</div><!-- END: 19.2 - Glossaries.Annotations -->
+
+<!-- ==================================================================================================== -->
+
+<h3 class='topic' onclick='toggle(this)'><a href='#Glossaries.ConfigurableProperties' id='Glossaries.ConfigurableProperties'>19.3 - Configurable Properties</a><span class='update'><b>8.1.3-new</b></span></h3>
+<div class='topic'><!-- START: 19.3 - Glossaries.ConfigurableProperties -->
+<h5 class='figure'>All properties defined in Juneau</h5>
 <table class='styled w1000'>
 	<tr>
 		<th>Context</th><th>ID</th><th style='min-width:250px'>Description</th><th>Data type</th>
@@ -30233,7 +30506,7 @@
 	</tr>
 </table>
 
-</div><!-- END: 19.1 - Glossaries.ConfigurablePropertiesGlossary -->
+</div><!-- END: 19.3 - Glossaries.ConfigurableProperties -->
 </div><!-- END: 19 - Glossaries -->
 
 <!-- ==================================================================================================== -->
@@ -37189,7 +37462,7 @@
 <h5 class='topic w800'>juneau-doc</h5>
 <ul class='spaced-list'>
 	<li>
-		New auto-generated glossary of all configurable properties: {@doc Glossaries.ConfigurablePropertiesGlossary}
+		New auto-generated glossary of all configurable properties: {@doc Glossaries.ConfigurableProperties}
 </ul>
 </div><!-- END: 8.1.3 -->
 
diff --git a/juneau-doc/src/main/javadoc/resources/docs.txt b/juneau-doc/src/main/javadoc/resources/docs.txt
index 901933e..af98641 100644
--- a/juneau-doc/src/main/javadoc/resources/docs.txt
+++ b/juneau-doc/src/main/javadoc/resources/docs.txt
@@ -4,7 +4,9 @@
 DefaultSvlVariables = #juneau-marshall.SimpleVariableLanguage.DefaultVarResolver, Default SVL Variables
 GFM = https://help.github.com/articles/github-flavored-markdown, GFM syntax
 Glossaries = #Glossaries, Overview > Glossaries
-Glossaries.ConfigurablePropertiesGlossary = #Glossaries.ConfigurablePropertiesGlossary, Overview > Glossaries > Configurable Properties Glossary
+Glossaries.Annotations = #Glossaries.Annotations, Overview > Glossaries > Annotations
+Glossaries.ConfigurableProperties = #Glossaries.ConfigurableProperties, Overview > Glossaries > Configurable Properties
+Glossaries.LanguageSupport = #Glossaries.LanguageSupport, Overview > Glossaries > Language Support
 HTML5 =  https://www.w3.org/TR/html5, html5
 HTML5.document-metadata =  https://www.w3.org/TR/html5/document-metadata.html, document-metadata.html
 HTML5.dom =  https://www.w3.org/TR/html5/dom.html, dom.html
@@ -132,10 +134,7 @@
 juneau-marshall.BeanDictionaries.BeanSubTypes = #juneau-marshall.BeanDictionaries.BeanSubTypes, Overview > juneau-marshall > Bean Names and Dictionaries > Bean Subtypes
 juneau-marshall.BestPractices = #juneau-marshall.BestPractices, Overview > juneau-marshall > Best Practices
 juneau-marshall.ConfigurableAnnotations = #juneau-marshall.ConfigurableAnnotations, Overview > juneau-marshall > Configurable Annotations
-juneau-marshall.ConfigurableProperties = #juneau-marshall.ConfigurableProperties, Overview > juneau-marshall > 
-juneau-marshall.ConfigurableProperties.Common = #juneau-marshall.ConfigurableProperties.Common, Overview > juneau-marshall >  > Common Serializer Properties
-juneau-marshall.ConfigurableProperties.CommonParser = #juneau-marshall.ConfigurableProperties.CommonParser, Overview > juneau-marshall >  > Common Parser Properties
-juneau-marshall.ConfigurableProperties.CommonSerializer = #juneau-marshall.ConfigurableProperties.CommonSerializer, Overview > juneau-marshall >  > Common Serializer Properties
+juneau-marshall.ConfigurableProperties = #juneau-marshall.ConfigurableProperties, Overview > juneau-marshall > Configurable Properties
 juneau-marshall.ContextsBuildersSessionsPropertyStores = #juneau-marshall.ContextsBuildersSessionsPropertyStores, Overview > juneau-marshall > Contexts, Builders, Sessions, and PropertyStores
 juneau-marshall.DynamicallyAppliedAnnotations = #juneau-marshall.DynamicallyAppliedAnnotations, Overview > juneau-marshall > Dynamically Applied Annotations
 juneau-marshall.Groups = #juneau-marshall.Groups, Overview > juneau-marshall > SerializerGroups and ParserGroups
diff --git a/juneau-doc/src/main/javadoc/resources/fragments/toc.html b/juneau-doc/src/main/javadoc/resources/fragments/toc.html
index 425883c..8f0ac0b 100644
--- a/juneau-doc/src/main/javadoc/resources/fragments/toc.html
+++ b/juneau-doc/src/main/javadoc/resources/fragments/toc.html
@@ -25,12 +25,7 @@
 		<li><p><a class='doclink' href='{OVERVIEW_URL}#juneau-marshall.Marshalls'>Marshalls</a></p>
 		<li><p><a class='doclink' href='{OVERVIEW_URL}#juneau-marshall.HttpPartSerializers'>HTTP Part Serializers</a></p>
 		<li><p><a class='doclink' href='{OVERVIEW_URL}#juneau-marshall.HttpPartParsers'>HTTP Part Parsers</a></p>
-		<li><p><a class='doclink' href='{OVERVIEW_URL}#juneau-marshall.ConfigurableProperties'></a><span class='update'><b>8.1.3-updated</b></span></p>
-		<ol>
-			<li><p><a class='doclink' href='{OVERVIEW_URL}#juneau-marshall.ConfigurableProperties.Common'>Common Serializer Properties</a></p>
-			<li><p><a class='doclink' href='{OVERVIEW_URL}#juneau-marshall.ConfigurableProperties.CommonSerializer'>Common Serializer Properties</a><span class='update'>8.1.0-updated</span></p>
-			<li><p><a class='doclink' href='{OVERVIEW_URL}#juneau-marshall.ConfigurableProperties.CommonParser'>Common Parser Properties</a><span class='update'><b>8.1.3-updated</b></span></p>
-		</ol>
+		<li><p><a class='doclink' href='{OVERVIEW_URL}#juneau-marshall.ConfigurableProperties'>Configurable Properties</a><span class='update'><b>8.1.3-updated</b></span></p>
 		<li><p><a class='doclink' href='{OVERVIEW_URL}#juneau-marshall.ConfigurableAnnotations'>Configurable Annotations</a><span class='update'>8.1.0-new, <b>8.1.3-updated</b></span></p>
 		<li><p><a class='doclink' href='{OVERVIEW_URL}#juneau-marshall.ObjectMap'>ObjectMap and ObjectList</a></p>
 		<li><p><a class='doclink' href='{OVERVIEW_URL}#juneau-marshall.Groups'>SerializerGroups and ParserGroups</a></p>
@@ -415,7 +410,9 @@
 	</ol>
 	<li><p class='toc2'><a class='doclink' href='{OVERVIEW_URL}#Glossaries'>Glossaries</a><span class='update'><b>8.1.3-new</b></span></p>
 	<ol>
-		<li><p><a class='doclink' href='{OVERVIEW_URL}#Glossaries.ConfigurablePropertiesGlossary'>Configurable Properties Glossary</a><span class='update'><b>8.1.3-new</b></span></p>
+		<li><p><a class='doclink' href='{OVERVIEW_URL}#Glossaries.LanguageSupport'>Language Support</a><span class='update'><b>8.1.3-new</b></span></p>
+		<li><p><a class='doclink' href='{OVERVIEW_URL}#Glossaries.Annotations'>Annotations</a><span class='update'><b>8.1.3-new</b></span></p>
+		<li><p><a class='doclink' href='{OVERVIEW_URL}#Glossaries.ConfigurableProperties'>Configurable Properties</a><span class='update'><b>8.1.3-new</b></span></p>
 	</ol>
 	<li><p class='toc2'><a class='doclink' href='{OVERVIEW_URL}#Security'>Security Best-Practices</a></p>
 	<ol>
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 023a611..711b0fe 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
@@ -46,7 +46,7 @@
  * </p>
  */
 @Documented
-@Target({PARAMETER,FIELD,METHOD,TYPE})
+@Target({PARAMETER})
 @Retention(RUNTIME)
 @Inherited
 public @interface Attr {