juneau-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jamesbog...@apache.org
Subject [juneau] branch master updated: Update Javadocs.
Date Fri, 02 Feb 2018 18:24:19 GMT
This is an automated email from the ASF dual-hosted git repository.

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


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

commit c04187515b8c64bbb286dca717dafec51ba095b9
Author: JamesBognar <jamesbognar@apache.org>
AuthorDate: Fri Feb 2 13:24:16 2018 -0500

    Update Javadocs.
---
 .../java/org/apache/juneau/ini/ConfigFile.java     |  12 +-
 .../main/java/org/apache/juneau/ini/package.html   |   6 +-
 .../java/org/apache/juneau/dto/ResultSetList.java  |   3 +-
 .../org/apache/juneau/dto/atom/AtomBuilder.java    |   2 +-
 .../java/org/apache/juneau/dto/atom/Category.java  |   4 +-
 .../java/org/apache/juneau/dto/atom/Common.java    |   4 +-
 .../org/apache/juneau/dto/atom/CommonEntry.java    |   4 +-
 .../java/org/apache/juneau/dto/atom/Content.java   |   4 +-
 .../java/org/apache/juneau/dto/atom/Entry.java     |   4 +-
 .../main/java/org/apache/juneau/dto/atom/Feed.java |   4 +-
 .../java/org/apache/juneau/dto/atom/Generator.java |   4 +-
 .../main/java/org/apache/juneau/dto/atom/Icon.java |   4 +-
 .../main/java/org/apache/juneau/dto/atom/Id.java   |   4 +-
 .../main/java/org/apache/juneau/dto/atom/Link.java |   4 +-
 .../main/java/org/apache/juneau/dto/atom/Logo.java |   4 +-
 .../java/org/apache/juneau/dto/atom/Person.java    |   4 +-
 .../java/org/apache/juneau/dto/atom/Source.java    |   4 +-
 .../main/java/org/apache/juneau/dto/atom/Text.java |   4 +-
 .../java/org/apache/juneau/dto/atom/Utils.java     |   2 +-
 .../java/org/apache/juneau/dto/atom/package.html   |  22 +-
 .../java/org/apache/juneau/dto/cognos/DataSet.java |   1 -
 .../java/org/apache/juneau/dto/cognos/package.html |  12 +-
 .../main/java/org/apache/juneau/dto/html5/A.java   |   2 +-
 .../java/org/apache/juneau/dto/html5/Abbr.java     |   2 +-
 .../java/org/apache/juneau/dto/html5/Address.java  |   2 +-
 .../java/org/apache/juneau/dto/html5/Area.java     |   2 +-
 .../java/org/apache/juneau/dto/html5/Article.java  |   2 +-
 .../java/org/apache/juneau/dto/html5/Aside.java    |   2 +-
 .../java/org/apache/juneau/dto/html5/Audio.java    |   2 +-
 .../main/java/org/apache/juneau/dto/html5/B.java   |   2 +-
 .../java/org/apache/juneau/dto/html5/Base.java     |   2 +-
 .../main/java/org/apache/juneau/dto/html5/Bdi.java |   2 +-
 .../main/java/org/apache/juneau/dto/html5/Bdo.java |   2 +-
 .../org/apache/juneau/dto/html5/Blockquote.java    |   2 +-
 .../java/org/apache/juneau/dto/html5/Body.java     |   2 +-
 .../main/java/org/apache/juneau/dto/html5/Br.java  |   2 +-
 .../java/org/apache/juneau/dto/html5/Button.java   |   2 +-
 .../java/org/apache/juneau/dto/html5/Canvas.java   |   2 +-
 .../java/org/apache/juneau/dto/html5/Caption.java  |   2 +-
 .../java/org/apache/juneau/dto/html5/Cite.java     |   2 +-
 .../java/org/apache/juneau/dto/html5/Code.java     |   2 +-
 .../main/java/org/apache/juneau/dto/html5/Col.java |   2 +-
 .../java/org/apache/juneau/dto/html5/Colgroup.java |   2 +-
 .../java/org/apache/juneau/dto/html5/Data.java     |   2 +-
 .../java/org/apache/juneau/dto/html5/Datalist.java |   2 +-
 .../main/java/org/apache/juneau/dto/html5/Dd.java  |   2 +-
 .../main/java/org/apache/juneau/dto/html5/Del.java |   2 +-
 .../main/java/org/apache/juneau/dto/html5/Dfn.java |   2 +-
 .../main/java/org/apache/juneau/dto/html5/Div.java |   2 +-
 .../main/java/org/apache/juneau/dto/html5/Dl.java  |   2 +-
 .../main/java/org/apache/juneau/dto/html5/Dt.java  |   2 +-
 .../main/java/org/apache/juneau/dto/html5/Em.java  |   2 +-
 .../java/org/apache/juneau/dto/html5/Embed.java    |   2 +-
 .../java/org/apache/juneau/dto/html5/Fieldset.java |   2 +-
 .../org/apache/juneau/dto/html5/Figcaption.java    |   2 +-
 .../java/org/apache/juneau/dto/html5/Figure.java   |   2 +-
 .../java/org/apache/juneau/dto/html5/Footer.java   |   2 +-
 .../java/org/apache/juneau/dto/html5/Form.java     |   2 +-
 .../main/java/org/apache/juneau/dto/html5/H1.java  |   2 +-
 .../main/java/org/apache/juneau/dto/html5/H2.java  |   2 +-
 .../main/java/org/apache/juneau/dto/html5/H3.java  |   2 +-
 .../main/java/org/apache/juneau/dto/html5/H4.java  |   2 +-
 .../main/java/org/apache/juneau/dto/html5/H5.java  |   2 +-
 .../main/java/org/apache/juneau/dto/html5/H6.java  |   2 +-
 .../java/org/apache/juneau/dto/html5/Head.java     |   2 +-
 .../java/org/apache/juneau/dto/html5/Header.java   |   2 +-
 .../main/java/org/apache/juneau/dto/html5/Hr.java  |   2 +-
 .../java/org/apache/juneau/dto/html5/Html.java     |   2 +-
 .../juneau/dto/html5/HtmlBeanDictionary.java       |   2 +-
 .../org/apache/juneau/dto/html5/HtmlBuilder.java   |   2 +-
 .../org/apache/juneau/dto/html5/HtmlElement.java   |   2 +-
 .../juneau/dto/html5/HtmlElementContainer.java     |   2 +-
 .../apache/juneau/dto/html5/HtmlElementMixed.java  |   2 +-
 .../juneau/dto/html5/HtmlElementRawText.java       |   2 +-
 .../apache/juneau/dto/html5/HtmlElementText.java   |   2 +-
 .../apache/juneau/dto/html5/HtmlElementVoid.java   |   2 +-
 .../main/java/org/apache/juneau/dto/html5/I.java   |   2 +-
 .../java/org/apache/juneau/dto/html5/Iframe.java   |   2 +-
 .../main/java/org/apache/juneau/dto/html5/Img.java |   2 +-
 .../java/org/apache/juneau/dto/html5/Input.java    |   2 +-
 .../main/java/org/apache/juneau/dto/html5/Ins.java |   2 +-
 .../main/java/org/apache/juneau/dto/html5/Kbd.java |   2 +-
 .../java/org/apache/juneau/dto/html5/Keygen.java   |   2 +-
 .../java/org/apache/juneau/dto/html5/Label.java    |   2 +-
 .../java/org/apache/juneau/dto/html5/Legend.java   |   2 +-
 .../main/java/org/apache/juneau/dto/html5/Li.java  |   2 +-
 .../java/org/apache/juneau/dto/html5/Link.java     |   2 +-
 .../java/org/apache/juneau/dto/html5/Main.java     |   2 +-
 .../main/java/org/apache/juneau/dto/html5/Map.java |   2 +-
 .../java/org/apache/juneau/dto/html5/Mark.java     |   2 +-
 .../java/org/apache/juneau/dto/html5/Meta.java     |   2 +-
 .../java/org/apache/juneau/dto/html5/Meter.java    |   2 +-
 .../main/java/org/apache/juneau/dto/html5/Nav.java |   2 +-
 .../java/org/apache/juneau/dto/html5/Noscript.java |   2 +-
 .../java/org/apache/juneau/dto/html5/Object2.java  |   2 +-
 .../main/java/org/apache/juneau/dto/html5/Ol.java  |   2 +-
 .../java/org/apache/juneau/dto/html5/Optgroup.java |   2 +-
 .../java/org/apache/juneau/dto/html5/Option.java   |   2 +-
 .../java/org/apache/juneau/dto/html5/Output.java   |   2 +-
 .../main/java/org/apache/juneau/dto/html5/P.java   |   2 +-
 .../java/org/apache/juneau/dto/html5/Param.java    |   2 +-
 .../main/java/org/apache/juneau/dto/html5/Pre.java |   2 +-
 .../java/org/apache/juneau/dto/html5/Progress.java |   2 +-
 .../main/java/org/apache/juneau/dto/html5/Q.java   |   2 +-
 .../main/java/org/apache/juneau/dto/html5/Rb.java  |   2 +-
 .../main/java/org/apache/juneau/dto/html5/Rp.java  |   2 +-
 .../main/java/org/apache/juneau/dto/html5/Rt.java  |   2 +-
 .../main/java/org/apache/juneau/dto/html5/Rtc.java |   2 +-
 .../java/org/apache/juneau/dto/html5/Ruby.java     |   2 +-
 .../main/java/org/apache/juneau/dto/html5/S.java   |   2 +-
 .../java/org/apache/juneau/dto/html5/Samp.java     |   2 +-
 .../java/org/apache/juneau/dto/html5/Script.java   |   2 +-
 .../java/org/apache/juneau/dto/html5/Section.java  |   2 +-
 .../java/org/apache/juneau/dto/html5/Select.java   |   2 +-
 .../java/org/apache/juneau/dto/html5/Small.java    |   2 +-
 .../java/org/apache/juneau/dto/html5/Source.java   |   2 +-
 .../java/org/apache/juneau/dto/html5/Span.java     |   2 +-
 .../java/org/apache/juneau/dto/html5/Strong.java   |   2 +-
 .../java/org/apache/juneau/dto/html5/Style.java    |   2 +-
 .../main/java/org/apache/juneau/dto/html5/Sub.java |   2 +-
 .../main/java/org/apache/juneau/dto/html5/Sup.java |   2 +-
 .../java/org/apache/juneau/dto/html5/Table.java    |   2 +-
 .../java/org/apache/juneau/dto/html5/Tbody.java    |   2 +-
 .../main/java/org/apache/juneau/dto/html5/Td.java  |   2 +-
 .../java/org/apache/juneau/dto/html5/Template.java |   2 +-
 .../java/org/apache/juneau/dto/html5/Textarea.java |   2 +-
 .../java/org/apache/juneau/dto/html5/Tfoot.java    |   2 +-
 .../main/java/org/apache/juneau/dto/html5/Th.java  |   2 +-
 .../java/org/apache/juneau/dto/html5/Thead.java    |   2 +-
 .../java/org/apache/juneau/dto/html5/Time.java     |   2 +-
 .../java/org/apache/juneau/dto/html5/Title.java    |   2 +-
 .../main/java/org/apache/juneau/dto/html5/Tr.java  |   2 +-
 .../java/org/apache/juneau/dto/html5/Track.java    |   2 +-
 .../main/java/org/apache/juneau/dto/html5/U.java   |   2 +-
 .../main/java/org/apache/juneau/dto/html5/Ul.java  |   2 +-
 .../main/java/org/apache/juneau/dto/html5/Var.java |   2 +-
 .../java/org/apache/juneau/dto/html5/Video.java    |   2 +-
 .../main/java/org/apache/juneau/dto/html5/Wbr.java |   2 +-
 .../org/apache/juneau/dto/jsonschema/JsonType.java |   2 +-
 .../juneau/dto/jsonschema/JsonTypeArray.java       |   2 +-
 .../org/apache/juneau/dto/jsonschema/Schema.java   |   2 +-
 .../apache/juneau/dto/jsonschema/SchemaArray.java  |   2 +-
 .../apache/juneau/dto/jsonschema/SchemaMap.java    |   2 +-
 .../juneau/dto/jsonschema/SchemaProperty.java      |   2 +-
 .../dto/jsonschema/SchemaPropertySimpleArray.java  |   2 +-
 .../apache/juneau/dto/jsonschema/SchemaRef.java    |   2 +-
 .../org/apache/juneau/dto/jsonschema/package.html  |  14 +-
 .../org/apache/juneau/dto/swagger/Contact.java     |   2 +-
 .../juneau/dto/swagger/ExternalDocumentation.java  |   2 +-
 .../org/apache/juneau/dto/swagger/HeaderInfo.java  |   8 +-
 .../java/org/apache/juneau/dto/swagger/Info.java   |   6 +-
 .../java/org/apache/juneau/dto/swagger/Items.java  |   8 +-
 .../org/apache/juneau/dto/swagger/License.java     |   2 +-
 .../org/apache/juneau/dto/swagger/Operation.java   |  28 +-
 .../apache/juneau/dto/swagger/ParameterInfo.java   |  10 +-
 .../apache/juneau/dto/swagger/ResponseInfo.java    |   8 +-
 .../org/apache/juneau/dto/swagger/SchemaInfo.java  |  20 +-
 .../apache/juneau/dto/swagger/SecurityScheme.java  |   4 +-
 .../org/apache/juneau/dto/swagger/Swagger.java     |  36 +-
 .../apache/juneau/dto/swagger/SwaggerBuilder.java  |   2 +-
 .../apache/juneau/dto/swagger/SwaggerElement.java  |   2 +-
 .../java/org/apache/juneau/dto/swagger/Tag.java    |   4 +-
 .../java/org/apache/juneau/dto/swagger/Xml.java    |   6 +-
 .../java/org/apache/juneau/jena/RdfParser.java     |   2 +-
 .../org/apache/juneau/jena/RdfParserBuilder.java   |  10 +-
 .../java/org/apache/juneau/jena/RdfSerializer.java |   2 +-
 .../apache/juneau/jena/RdfSerializerBuilder.java   |   2 +-
 .../main/java/org/apache/juneau/jena/package.html  |  12 +-
 .../java/org/apache/juneau/BeanContextBuilder.java |   4 +-
 .../src/main/java/org/apache/juneau/BeanMap.java   |   4 +-
 .../src/main/java/org/apache/juneau/BeanMeta.java  |   2 +-
 .../main/java/org/apache/juneau/PropertyStore.java |  16 +-
 .../org/apache/juneau/annotation/BeanProperty.java |   2 +-
 .../java/org/apache/juneau/annotation/Builder.java |   2 +-
 .../main/java/org/apache/juneau/csv/CsvParser.java |   3 -
 .../org/apache/juneau/encoders/EncoderGroup.java   |   2 +-
 .../org/apache/juneau/html/HtmlDocSerializer.java  |   4 +-
 .../org/apache/juneau/html/HtmlSerializer.java     |   2 +-
 .../org/apache/juneau/html/annotation/Html.java    |   4 +-
 .../main/java/org/apache/juneau/html/package.html  |  12 +-
 .../main/java/org/apache/juneau/http/Accept.java   |   6 +-
 .../java/org/apache/juneau/http/AcceptCharset.java |   6 +-
 .../org/apache/juneau/http/AcceptEncoding.java     |   6 +-
 .../org/apache/juneau/http/AcceptLanguage.java     |   6 +-
 .../java/org/apache/juneau/http/AcceptRanges.java  |   6 +-
 .../src/main/java/org/apache/juneau/http/Age.java  |   6 +-
 .../main/java/org/apache/juneau/http/Allow.java    |   6 +-
 .../java/org/apache/juneau/http/Authorization.java |   6 +-
 .../java/org/apache/juneau/http/CacheControl.java  |   6 +-
 .../java/org/apache/juneau/http/Connection.java    |   6 +-
 .../java/org/apache/juneau/http/Constants.java     |   2 +-
 .../org/apache/juneau/http/ContentEncoding.java    |   6 +-
 .../apache/juneau/http/ContentEncodingEnum.java    |   2 +-
 .../org/apache/juneau/http/ContentLanguage.java    |   6 +-
 .../java/org/apache/juneau/http/ContentLength.java |   6 +-
 .../org/apache/juneau/http/ContentLocation.java    |   6 +-
 .../java/org/apache/juneau/http/ContentRange.java  |   6 +-
 .../java/org/apache/juneau/http/ContentType.java   |   6 +-
 .../src/main/java/org/apache/juneau/http/Date.java |   6 +-
 .../src/main/java/org/apache/juneau/http/ETag.java |   6 +-
 .../org/apache/juneau/http/EntityValidator.java    |   4 +-
 .../main/java/org/apache/juneau/http/Expect.java   |   6 +-
 .../main/java/org/apache/juneau/http/Expires.java  |   6 +-
 .../src/main/java/org/apache/juneau/http/From.java |   6 +-
 .../java/org/apache/juneau/http/HeaderDate.java    |   4 +-
 .../apache/juneau/http/HeaderEntityValidator.java  |   4 +-
 .../juneau/http/HeaderEntityValidatorArray.java    |   4 +-
 .../java/org/apache/juneau/http/HeaderEnum.java    |   4 +-
 .../java/org/apache/juneau/http/HeaderInteger.java |   4 +-
 .../org/apache/juneau/http/HeaderRangeArray.java   |   4 +-
 .../java/org/apache/juneau/http/HeaderString.java  |   4 +-
 .../org/apache/juneau/http/HeaderStringArray.java  |   4 +-
 .../java/org/apache/juneau/http/HeaderUri.java     |   4 +-
 .../src/main/java/org/apache/juneau/http/Host.java |   6 +-
 .../java/org/apache/juneau/http/HttpMethod.java    |  18 +-
 .../org/apache/juneau/http/HttpMethodName.java     |  18 +-
 .../main/java/org/apache/juneau/http/IfMatch.java  |   6 +-
 .../org/apache/juneau/http/IfModifiedSince.java    |   6 +-
 .../java/org/apache/juneau/http/IfNoneMatch.java   |   6 +-
 .../main/java/org/apache/juneau/http/IfRange.java  |   6 +-
 .../org/apache/juneau/http/IfUnmodifiedSince.java  |   6 +-
 .../java/org/apache/juneau/http/LastModified.java  |   6 +-
 .../main/java/org/apache/juneau/http/Location.java |   6 +-
 .../java/org/apache/juneau/http/MaxForwards.java   |   6 +-
 .../java/org/apache/juneau/http/MediaType.java     |   4 +-
 .../org/apache/juneau/http/MediaTypeRange.java     |   2 +-
 .../main/java/org/apache/juneau/http/Pragma.java   |   6 +-
 .../org/apache/juneau/http/ProxyAuthenticate.java  |   6 +-
 .../org/apache/juneau/http/ProxyAuthorization.java |   6 +-
 .../main/java/org/apache/juneau/http/Range.java    |   6 +-
 .../main/java/org/apache/juneau/http/Referer.java  |   6 +-
 .../java/org/apache/juneau/http/RetryAfter.java    |   6 +-
 .../main/java/org/apache/juneau/http/Server.java   |   6 +-
 .../java/org/apache/juneau/http/StringRange.java   |   2 +-
 .../src/main/java/org/apache/juneau/http/TE.java   |   6 +-
 .../main/java/org/apache/juneau/http/Trailer.java  |   6 +-
 .../org/apache/juneau/http/TransferEncoding.java   |   6 +-
 .../main/java/org/apache/juneau/http/Upgrade.java  |   6 +-
 .../java/org/apache/juneau/http/UserAgent.java     |   6 +-
 .../src/main/java/org/apache/juneau/http/Vary.java |   6 +-
 .../src/main/java/org/apache/juneau/http/Via.java  |   8 +-
 .../main/java/org/apache/juneau/http/Warning.java  |   6 +-
 .../org/apache/juneau/http/WwwAuthenticate.java    |   6 +-
 .../org/apache/juneau/httppart/HttpPartParser.java |   2 +-
 .../apache/juneau/httppart/HttpPartSerializer.java |   2 +-
 .../org/apache/juneau/internal/ObjectUtils.java    |  28 +-
 .../org/apache/juneau/json/JsonSerializer.java     |   2 +-
 .../main/java/org/apache/juneau/json/package.html  |  18 +-
 .../main/java/org/apache/juneau/parser/Parser.java |   4 +-
 .../java/org/apache/juneau/parser/ParserGroup.java |   2 +-
 .../java/org/apache/juneau/remoteable/Body.java    |   2 +-
 .../org/apache/juneau/remoteable/FormData.java     |   6 +-
 .../org/apache/juneau/remoteable/FormDataIfNE.java |   2 +-
 .../java/org/apache/juneau/remoteable/Header.java  |   6 +-
 .../org/apache/juneau/remoteable/HeaderIfNE.java   |   2 +-
 .../java/org/apache/juneau/remoteable/Path.java    |   6 +-
 .../java/org/apache/juneau/remoteable/Query.java   |   6 +-
 .../org/apache/juneau/remoteable/QueryIfNE.java    |   2 +-
 .../org/apache/juneau/remoteable/RemoteMethod.java |   2 +-
 .../apache/juneau/remoteable/RemoteMethodArg.java  |   2 +-
 .../org/apache/juneau/remoteable/Remoteable.java   |   2 +-
 .../apache/juneau/remoteable/RemoteableMeta.java   |   2 +-
 .../juneau/remoteable/RemoteableMethodMeta.java    |   2 +-
 .../org/apache/juneau/remoteable/RequestBean.java  |   2 +-
 .../org/apache/juneau/serializer/Serializer.java   |   8 +-
 .../apache/juneau/serializer/SerializerGroup.java  |   2 +-
 .../apache/juneau/transform/BeanFilterBuilder.java |   4 +-
 .../java/org/apache/juneau/transform/PojoSwap.java |   8 +-
 .../apache/juneau/transform/PropertyFilter.java    |   4 +-
 .../org/apache/juneau/transforms/CalendarSwap.java |   6 +-
 .../org/apache/juneau/transforms/DateSwap.java     |   6 +-
 .../org/apache/juneau/transforms/ReaderSwap.java   |   2 +-
 .../main/java/org/apache/juneau/uon/package.html   |  16 +-
 .../juneau/urlencoding/UrlEncodingParser.java      |   2 +-
 .../org/apache/juneau/urlencoding/package.html     |  16 +-
 .../main/java/org/apache/juneau/utils/Args.java    |   2 +-
 .../org/apache/juneau/utils/CalendarUtils.java     |   4 +-
 .../java/org/apache/juneau/utils/PojoQuery.java    |  10 +-
 .../java/org/apache/juneau/utils/PojoRest.java     |   2 +-
 .../java/org/apache/juneau/xml/XmlSerializer.java  |   2 +-
 .../main/java/org/apache/juneau/xml/package.html   |  48 +-
 .../java/org/apache/juneau/yaml/proto/package.html |  18 +-
 .../src/main/java/org/apache/juneau/svl/Var.java   |   2 +-
 .../java/org/apache/juneau/svl/VarResolver.java    |   4 +-
 .../main/java/org/apache/juneau/svl/package.html   |   2 +-
 juneau-doc/src/main/javadoc/javadoc.css            |   7 +-
 juneau-doc/src/main/javadoc/overview.html          | 609 ++++++++++-----------
 .../apache/juneau/microservice/Microservice.java   |  10 +-
 .../org/apache/juneau/microservice/Resource.java   |   4 +-
 .../apache/juneau/microservice/ResourceGroup.java  |   4 +-
 .../juneau/microservice/ResourceJenaGroup.java     |   4 +-
 .../juneau/microservice/RestMicroservice.java      |   6 +-
 .../org/apache/juneau/microservice/package.html    |  10 +-
 .../org/apache/juneau/rest/client/RestClient.java  |   4 +-
 .../juneau/rest/client/RestClientBuilder.java      |   4 +-
 .../org/apache/juneau/rest/client/package.html     |  26 +-
 .../java/org/apache/juneau/rest/jaxrs/package.html |   2 +-
 .../java/org/apache/juneau/rest/RequestBody.java   |   4 +-
 .../org/apache/juneau/rest/RequestHeaders.java     |  56 +-
 .../java/org/apache/juneau/rest/RestContext.java   |   4 +-
 .../java/org/apache/juneau/rest/RestConverter.java |   2 +-
 .../java/org/apache/juneau/rest/RestGuard.java     |   6 +-
 .../juneau/rest/RestInfoProviderDefault.java       |  70 +--
 .../java/org/apache/juneau/rest/RestParam.java     |   2 +-
 .../java/org/apache/juneau/rest/RestRequest.java   |   2 +-
 .../org/apache/juneau/rest/RestServletDefault.java |   2 +-
 .../apache/juneau/rest/annotation/FormData.java    |   2 +-
 .../apache/juneau/rest/annotation/HasFormData.java |   2 +-
 .../apache/juneau/rest/annotation/HookEvent.java   |  16 +-
 .../juneau/rest/vars/RequestAttributeVar.java      |   2 +-
 .../juneau/rest/vars/RequestFormDataVar.java       |   2 +-
 .../apache/juneau/rest/vars/RequestHeaderVar.java  |   2 +-
 .../apache/juneau/rest/vars/RequestPathVar.java    |   2 +-
 .../apache/juneau/rest/vars/RequestQueryVar.java   |   4 +-
 .../apache/juneau/rest/widget/MenuItemWidget.java  |   5 +-
 315 files changed, 1060 insertions(+), 1062 deletions(-)

diff --git a/juneau-core/juneau-config/src/main/java/org/apache/juneau/ini/ConfigFile.java b/juneau-core/juneau-config/src/main/java/org/apache/juneau/ini/ConfigFile.java
index 61d30fd..2fe7cd6 100644
--- a/juneau-core/juneau-config/src/main/java/org/apache/juneau/ini/ConfigFile.java
+++ b/juneau-core/juneau-config/src/main/java/org/apache/juneau/ini/ConfigFile.java
@@ -918,7 +918,7 @@ public abstract class ConfigFile implements Map<String,Section> {
 	 * <p>
 	 * Key/value pairs in the config file section get copied as bean property values to the specified bean class.
 	 * 
-	 * <h6 class='figure'>Example config file</h6>
+	 * <h5 class='figure'>Example config file</h5>
 	 * <p class='bcode'>
 	 * 	<cs>[MyAddress]</cs>
 	 * 	<ck>name</ck> = <cv>John Smith</cv>
@@ -928,7 +928,7 @@ public abstract class ConfigFile implements Map<String,Section> {
 	 * 	<ck>zip</ck> = <cv>12345</cv>
 	 * </p>
 	 * 
-	 * <h6 class='figure'>Example bean</h6>
+	 * <h5 class='figure'>Example bean</h5>
 	 * <p class='bcode'>
 	 * 	<jk>public class</jk> Address {
 	 * 		public String name, street, city;
@@ -937,7 +937,7 @@ public abstract class ConfigFile implements Map<String,Section> {
 	 * 	}
 	 * </p>
 	 * 
-	 * <h6 class='figure'>Example usage</h6>
+	 * <h5 class='figure'>Example usage</h5>
 	 * <p class='bcode'>
 	 * 	ConfigFile cf = ConfigFile.<jsm>create</jsm>().build(<js>"MyConfig.cfg"</js>);
 	 * 	Address myAddress = cf.getSectionAsBean(<js>"MySection"</js>, Address.<jk>class</jk>);
@@ -976,7 +976,7 @@ public abstract class ConfigFile implements Map<String,Section> {
 	 * Wraps a config file section inside a Java interface so that values in the section can be read and
 	 * write using getters and setters.
 	 * 
-	 * <h6 class='figure'>Example config file</h6>
+	 * <h5 class='figure'>Example config file</h5>
 	 * <p class='bcode'>
 	 * 	<cs>[MySection]</cs>
 	 * 	<ck>string</ck> = <cv>foo</cv>
@@ -987,7 +987,7 @@ public abstract class ConfigFile implements Map<String,Section> {
 	 * 	<ck>bean1d3dListMap</ck> = <cv>{key:[[[[{foo:'bar',baz:123}]]]]}</cv>
 	 * </p>
 	 * 
-	 * <h6 class='figure'>Example interface</h6>
+	 * <h5 class='figure'>Example interface</h5>
 	 * <p class='bcode'>
 	 * 	<jk>public interface</jk> MyConfigInterface {
 	 * 
@@ -1011,7 +1011,7 @@ public abstract class ConfigFile implements Map<String,Section> {
 	 * 	}
 	 * </p>
 	 * 
-	 * <h6 class='figure'>Example usage</h6>
+	 * <h5 class='figure'>Example usage</h5>
 	 * <p class='bcode'>
 	 * 	ConfigFile cf = ConfigFile.<jsm>create</jsm>().build(<js>"MyConfig.cfg"</js>);
 	 * 
diff --git a/juneau-core/juneau-config/src/main/java/org/apache/juneau/ini/package.html b/juneau-core/juneau-config/src/main/java/org/apache/juneau/ini/package.html
index 678ae14..aa13cca 100644
--- a/juneau-core/juneau-config/src/main/java/org/apache/juneau/ini/package.html
+++ b/juneau-core/juneau-config/src/main/java/org/apache/juneau/ini/package.html
@@ -248,7 +248,7 @@
 			<code>$C{key}</code>, <code>$C{key,default}</code> - Values in this configuration file.
 	</ul>
 	
-	<h6 class='topic'>Examples:</h6>
+	<h5 class='topic'>Examples:</h5>
 	<p class='bcode'>
 	<cc>#--------------------------</cc>
 	<cc># Examples </cc>
@@ -336,7 +336,7 @@
 			{@link org.apache.juneau.ini.EntryListener} - An individual entry is modified.
 	</ul>
 	
-	<h6 class="topic">Example:</h6>
+	<h5 class="topic">Example:</h5>
 	<p class='bcode'>
 	<jc>// Get our config file using the default config manager</jc>
 	ConfigFile f = ConfigFile.<jsm>create</jsm>().build(<js>"C:/temp/MyConfig.cfg"</js>);
@@ -588,7 +588,7 @@
 		 * <ja>@return</ja> The config file.  
 		 * <ja>@throws</ja> Exception 
 		 */</jd>
-		<ja>@RestMethod</ja>(name=<jsf>GET</jfs>, path=<js>"/"</js>, description=<js>"Show contents of config file."</js>)
+		<ja>@RestMethod</ja>(name=<jsf>GET</jsf>, path=<js>"/"</js>, description=<js>"Show contents of config file."</js>)
 		<jk>public</jk> ConfigFile getConfigContents() <jk>throws</jk> Exception {
 			<jk>return</jk> getConfig();
 		}
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/ResultSetList.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/ResultSetList.java
index 202b70a..ea26c37 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/ResultSetList.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/ResultSetList.java
@@ -21,8 +21,7 @@ import org.apache.juneau.internal.*;
 
 /**
  * Transforms an SQL {@link ResultSet ResultSet} into a list of maps.
- * <
- * p>
+ * <p>
  * Loads the entire result set into an in-memory data structure, and then closes the result set object.
  */
 public final class ResultSetList extends LinkedList<Map<String,Object>> {
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/AtomBuilder.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/AtomBuilder.java
index da9e82b..8a8cd46 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/AtomBuilder.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/AtomBuilder.java
@@ -37,7 +37,7 @@ import org.apache.juneau.*;
  * 		);
  * </p>
  * 
- * <h6 class='section'>See Also:</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Category.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Category.java
index d65230f..cf38d0a 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Category.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Category.java
@@ -25,7 +25,7 @@ import org.apache.juneau.xml.annotation.*;
 /**
  * Represents an <code>atomCategory</code> construct in the RFC4287 specification.
  * 
- * <h6 class='figure'>Schema</h6>
+ * <h5 class='figure'>Schema</h5>
  * <p class='bcode'>
  * 	atomCategory =
  * 		element atom:category {
@@ -37,7 +37,7 @@ import org.apache.juneau.xml.annotation.*;
  * 		}
  * </p>
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Common.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Common.java
index 3e6ced5..7f9b07f 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Common.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Common.java
@@ -26,7 +26,7 @@ import org.apache.juneau.xml.annotation.*;
 /**
  * Represents an <code>atomCommonAttributes</code> construct in the RFC4287 specification.
  * 
- * <h6 class='figure'>Schema</h6>
+ * <h5 class='figure'>Schema</h5>
  * <p class='bcode'>
  * 	atomCommonAttributes =
  * 		attribute xml:base { atomUri }?,
@@ -34,7 +34,7 @@ import org.apache.juneau.xml.annotation.*;
  * 		undefinedAttribute*
  * </p>
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/CommonEntry.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/CommonEntry.java
index fa43882..f3ca92a 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/CommonEntry.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/CommonEntry.java
@@ -22,9 +22,9 @@ import org.apache.juneau.transforms.*;
 import org.apache.juneau.xml.annotation.*;
 
 /**
- * Parent class of {@link Entry}, {@link Feed}, and {@link Source}
+ * Parent class of {@link Entry}, {@link Feed}, and {@link Source}.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Content.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Content.java
index 4ec67a9..1ff74ee 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Content.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Content.java
@@ -25,7 +25,7 @@ import org.apache.juneau.xml.annotation.*;
 /**
  * Represents an <code>atomContent</code> construct in the RFC4287 specification.
  * 
- * <h6 class='figure'>Schema</h6>
+ * <h5 class='figure'>Schema</h5>
  * <p class='bcode'>
  * 	atomContent = atomInlineTextContent
  * 		| atomInlineXHTMLContent
@@ -62,7 +62,7 @@ import org.apache.juneau.xml.annotation.*;
  * 	}
  * </p>
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Entry.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Entry.java
index 55e48eb..6d4a2dd 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Entry.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Entry.java
@@ -22,7 +22,7 @@ import org.apache.juneau.transforms.*;
 /**
  * Represents an <code>atomEntry</code> construct in the RFC4287 specification.
  * 
- * <h6 class='figure'>Schema</h6>
+ * <h5 class='figure'>Schema</h5>
  * <p class='bcode'>
  * 	atomEntry =
  * 		element atom:entry {
@@ -43,7 +43,7 @@ import org.apache.juneau.transforms.*;
  * 		}
  * </p>
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Feed.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Feed.java
index 044e6dd..9c6fde6 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Feed.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Feed.java
@@ -25,7 +25,7 @@ import org.apache.juneau.xml.annotation.*;
  * <p>
  * Represents an <code>atomFeed</code> construct in the RFC4287 specification.
  * 
- * <h6 class='figure'>Schema</h6>
+ * <h5 class='figure'>Schema</h5>
  * <p class='bcode'>
  * 	atomFeed =
  * 		element atom:feed {
@@ -47,7 +47,7 @@ import org.apache.juneau.xml.annotation.*;
  * 		}
  * </p>
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Generator.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Generator.java
index c38db92..ae79361 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Generator.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Generator.java
@@ -25,7 +25,7 @@ import org.apache.juneau.xml.annotation.*;
 /**
  * Represents an <code>atomGenerator</code> construct in the RFC4287 specification.
  * 
- * <h6 class='figure'>Schema</h6>
+ * <h5 class='figure'>Schema</h5>
  * <p class='bcode'>
  * 	atomGenerator = element atom:generator {
  * 		atomCommonAttributes,
@@ -35,7 +35,7 @@ import org.apache.juneau.xml.annotation.*;
  * 	}
  * </p>
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Icon.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Icon.java
index 5e60325..215dc19 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Icon.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Icon.java
@@ -25,7 +25,7 @@ import org.apache.juneau.xml.annotation.*;
 /**
  * Represents an <code>atomIcon</code> construct in the RFC4287 specification.
  * 
- * <h6 class='figure'>Schema</h6>
+ * <h5 class='figure'>Schema</h5>
  * <p class='bcode'>
  * 	atomIcon = element atom:icon {
  * 		atomCommonAttributes,
@@ -33,7 +33,7 @@ import org.apache.juneau.xml.annotation.*;
  * 	}
  * </p>
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Id.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Id.java
index f784965..a4eafd2 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Id.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Id.java
@@ -20,7 +20,7 @@ import org.apache.juneau.xml.annotation.*;
 /**
  * Represents an <code>atomId</code> construct in the RFC4287 specification.
  * 
- * <h6 class='figure'>Schema</h6>
+ * <h5 class='figure'>Schema</h5>
  * <p class='bcode'>
  * 	atomId = element atom:id {
  * 		atomCommonAttributes,
@@ -28,7 +28,7 @@ import org.apache.juneau.xml.annotation.*;
  * 	}
  * </p>
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Link.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Link.java
index 8a6059d..3a10be4 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Link.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Link.java
@@ -20,7 +20,7 @@ import org.apache.juneau.xml.annotation.*;
 /**
  * Represents an <code>atomLink</code> construct in the RFC4287 specification.
  * 
- * <h6 class='figure'>Schema</h6>
+ * <h5 class='figure'>Schema</h5>
  * <p class='bcode'>
  * 	atomLink =
  * 		element atom:link {
@@ -35,7 +35,7 @@ import org.apache.juneau.xml.annotation.*;
  * 		}
  * </p>
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Logo.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Logo.java
index 996939e..7030aef 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Logo.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Logo.java
@@ -25,7 +25,7 @@ import org.apache.juneau.xml.annotation.*;
 /**
  * Represents an <code>atomLogo</code> construct in the RFC4287 specification.
  * 
- * <h6 class='figure'>Schema</h6>
+ * <h5 class='figure'>Schema</h5>
  * <p class='bcode'>
  * 	atomLogo = element atom:logo {
  * 		atomCommonAttributes,
@@ -33,7 +33,7 @@ import org.apache.juneau.xml.annotation.*;
  * 	}
  * </p>
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Person.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Person.java
index fd1c2ff..9bd5123 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Person.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Person.java
@@ -24,7 +24,7 @@ import org.apache.juneau.annotation.*;
 /**
  * Represents an <code>atomPersonConstruct</code> construct in the RFC4287 specification.
  * 
- * <h6 class='figure'>Schema</h6>
+ * <h5 class='figure'>Schema</h5>
  * <p class='bcode'>
  * 	atomPersonConstruct =
  * 		atomCommonAttributes,
@@ -34,7 +34,7 @@ import org.apache.juneau.annotation.*;
  * 		&amp; extensionElement*)
  * </p>
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Source.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Source.java
index fede36e..eca39ff 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Source.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Source.java
@@ -19,7 +19,7 @@ import org.apache.juneau.annotation.*;
 /**
  * Represents an <code>atomSource</code> construct in the RFC4287 specification.
  * 
- * <h6 class='figure'>Schema</h6>
+ * <h5 class='figure'>Schema</h5>
  * <p class='bcode'>
  * 	atomSource =
  * 		element atom:source {
@@ -40,7 +40,7 @@ import org.apache.juneau.annotation.*;
  * 		}
  * </p>
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Text.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Text.java
index 72b7e6c..7541375 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Text.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Text.java
@@ -20,7 +20,7 @@ import org.apache.juneau.xml.annotation.*;
 /**
  * Represents an <code>atomTextConstruct</code> construct in the RFC4287 specification.
  * 
- * <h6 class='figure'>Schema</h6>
+ * <h5 class='figure'>Schema</h5>
  * <p class='bcode'>
  * 	atomTextConstruct = atomPlainTextConstruct | atomXHTMLTextConstruct
  * 
@@ -41,7 +41,7 @@ import org.apache.juneau.xml.annotation.*;
  * 	}
  * </p>
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Utils.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Utils.java
index 67b0a92..36ed751 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Utils.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Utils.java
@@ -19,7 +19,7 @@ import javax.xml.bind.*;
 /**
  * Static utility methods for ATOM marshalling code.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/package.html b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/package.html
index 3e3ad4d..911c5c8 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/package.html
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/package.html
@@ -131,7 +131,7 @@
 			To serialize this to ATOM, use the {@link org.apache.juneau.xml.XmlSerializer} class:
 		</p>
 		
-		<h6 class='figure'>Example with no namespaces</h6>
+		<h5 class='figure'>Example with no namespaces</h5>
 		<p class='bcode'>
 	<jc>// Create a serializer with readable output, no namespaces yet.</jc>
 	XmlSerializer s = XmlSerializer.<jsm>create</jsm>().sq().ws().build();
@@ -140,7 +140,7 @@
 	String atomXml = s.serialize(feed);
 		</p>
 		
-		<h6 class='figure'>Results</h6>
+		<h5 class='figure'>Results</h5>
 		<p class='bcode'>
 	<xt>&lt;feed&gt;</xt>
 		<xt>&lt;id&gt;</xt>
@@ -188,7 +188,7 @@
 			The following is the same, except with XML namespaces enabled:
 		</p>
 	
-		<h6 class='figure'>Example with namespaces</h6>
+		<h5 class='figure'>Example with namespaces</h5>
 		<p class='bcode'>
 	<jc>// Create a serializer with readable output with namespaces.</jc>
 	XmlSerializer s = XmlSerializer.<jsm>create</jsm>().sq().ws().build();
@@ -197,7 +197,7 @@
 	String atomXml = s.serialize(feed);
 		</p>
 		
-		<h6 class='figure'>Results</h6>
+		<h5 class='figure'>Results</h5>
 		<p class='bcode'>
 	<xt>&lt;atom:feed</xt> 
 			<xa>xmlns</xa>=<xs>'http://www.apache.org/2013/Juneau'</xs> 
@@ -249,7 +249,7 @@
 			The following is the same, except with XML namespaces enabled and the ATOM namespace as the default namespace:
 		</p>
 
-		<h6 class='figure'>Example with namespaces with ATOM as the default namespace</h6>
+		<h5 class='figure'>Example with namespaces with ATOM as the default namespace</h5>
 		<p class='bcode'>
 	<jc>// Create a serializer with readable output with namespaces.</jc>
 	XmlSerializer s = XmlSerializer.<jsm>create</jsm>().sq().ws().defaultNamespaceUri(<js>"atom"</js>).build();
@@ -258,7 +258,7 @@
 	String atomXml = s.serialize(feed);
 		</p>
 		
-		<h6 class='figure'>Results</h6>
+		<h5 class='figure'>Results</h5>
 		<p class='bcode'>
 	<xt>&lt;feed</xt> 
 			<xa>xmlns</xa>=<xs>'http://www.w3.org/2005/Atom/'</xs> 
@@ -314,7 +314,7 @@
 				The {@link org.apache.juneau.json.JsonSerializer} class can also be used to produce ATOM in JSON format.
 			</p>
 
-			<h6 class='figure'>ATOM/JSON example</h6>
+			<h5 class='figure'>ATOM/JSON example</h5>
 			<p class='bcode'>
 	<jc>// Get JSON serializer with readable output.</jc>
 	JsonSerializer s = JsonSerializer.<jsf>DEFAULT_LAX_READABLE</jsf>;
@@ -323,7 +323,7 @@
 	String atomJson = s.serialize(feed);
 			</p>
 		
-			<h6 class='figure'>Results</h6>
+			<h5 class='figure'>Results</h5>
 			<p class='bcode'>
 	{
 		id: {
@@ -413,7 +413,7 @@
 				in various RDF formats.
 			</p>
 
-			<h6 class='figure'>ATOM/RDF/XML example</h6>
+			<h5 class='figure'>ATOM/RDF/XML example</h5>
 			<p class='bcode'>
 	<jc>// Get RDF/XML serializer with readable output.</jc>
 	RdfSerializer s = RdfSerializer.<jsm>create</jsm>()
@@ -427,7 +427,7 @@
 	String atomRdfXml = s.serialize(feed);
 			</p>
 			
-			<h6 class='figure'>Results</h6>
+			<h5 class='figure'>Results</h5>
 			<p class='bcode'>
 	<xt>&lt;rdf:RDF</xt>
 	    <xa>xmlns:rdf</xa>=<xs>'http://www.w3.org/1999/02/22-rdf-syntax-ns#'</xs>
@@ -536,7 +536,7 @@
 				The following is the output produced by the <code>AtomFeedResource</code> in the <code>org.apache.juneau.sample.war</code> project:
 			</p>
 			
-			<h6 class='figure'>Example ATOM/HTML results</h6>
+			<h5 class='figure'>Example ATOM/HTML results</h5>
 			<img class='bordered' src='doc-files/Example_HTML.png'>	
 		</div>
 	</div>
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/cognos/DataSet.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/cognos/DataSet.java
index 9bb8f71..a8ac1de 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/cognos/DataSet.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/cognos/DataSet.java
@@ -55,7 +55,6 @@ import org.apache.juneau.xml.annotation.*;
  * The construct shown above is a serialized <code>AddressBook</code> object which is a subclass of
  * <code>LinkedList&lt;Person&gt;</code>.
  * The code for generating the XML is as follows...
- * </p>
  * <p class='bcode'>
  * 	Column[] items = {
  * 		<jk>new</jk> Column(<js>"name"</js>, <js>"xs:String"</js>, 255),
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/cognos/package.html b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/cognos/package.html
index b19a781..083b88e 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/cognos/package.html
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/cognos/package.html
@@ -80,7 +80,7 @@
 		<li>{@code HashMap[]}
 	</ul>
 	
-	<h6 class='topic'>Example:</h6>
+	<h5 class='topic'>Example:</h5>
 	<p>
 		The following example shows how to generate Cognos-XML from a POJO.  
 		The example uses the <a class='doclink' href='../../doc-files/AddressBook.html'>AddressBook</a> sample POJO.
@@ -150,18 +150,18 @@
 	<xt>&lt;/c:dataset&gt;</xt>
 	</p>
 	
-	<h6 class='topic'>Other data formats</h6>
+	<h5 class='topic'>Other data formats</h5>
 	<p>
 		The following shows examples of what this data structure looks like when serialized to other formats:
 	</p>
 	
-	<h6 class='figure'>HTML</h6>
+	<h5 class='figure'>HTML</h5>
 	<img class='bordered' src='doc-files/HTML.png'>
 	
-	<h6 class='figure'>JSON</h6>
+	<h5 class='figure'>JSON</h5>
 	<img class='bordered' src='doc-files/JSON.png'>
 	
-	<h6 class='figure'>RDF/XML</h6>
+	<h5 class='figure'>RDF/XML</h5>
 	<img class='bordered' src='doc-files/RDFXML.png'>
 </div>
 
@@ -173,7 +173,7 @@
 		The {@link org.apache.juneau.dto.cognos.DataSet} class can be reconstructed from Cognos/XML using one of the standard XML parsers.
 	</p>
 	
-	<h6 class='topic'>Example:</h6>
+	<h5 class='topic'>Example:</h5>
 	<p class='bcode'>
 	<jc>// Parse XML back into original DataSet</jc> 
 	DataSet ds = XmlParser.<jsf>DEFAULT</jsf>.parse(xml, DataSet.<jk>class</jk>);
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/A.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/A.java
index fccfa95..d6b2b26 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/A.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/A.java
@@ -22,7 +22,7 @@ import org.apache.juneau.annotation.*;
  * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/text-level-semantics.html#the-a-element">&lt;a&gt;</a>
  * element.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Abbr.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Abbr.java
index 6db8add..214ff3e 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Abbr.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Abbr.java
@@ -18,7 +18,7 @@ import org.apache.juneau.annotation.*;
  * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/text-level-semantics.html#the-abbr-element">&lt;abbr&gt;</a>
  * element.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Address.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Address.java
index 6381ab3..3080849 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Address.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Address.java
@@ -18,7 +18,7 @@ import org.apache.juneau.annotation.*;
  * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/sections.html#the-address-element">&lt;address&gt;</a>
  * element.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Area.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Area.java
index 99f28b3..a1e245e 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Area.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Area.java
@@ -22,7 +22,7 @@ import org.apache.juneau.annotation.*;
  * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#the-area-element">&lt;area&gt;</a>
  * element.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Article.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Article.java
index 30d944d..8233140 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Article.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Article.java
@@ -18,7 +18,7 @@ import org.apache.juneau.annotation.*;
  * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/sections.html#the-article-element">&lt;article&gt;</a>
  * element.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Aside.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Aside.java
index a6e783c..0465ab9 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Aside.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Aside.java
@@ -18,7 +18,7 @@ import org.apache.juneau.annotation.*;
  * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/sections.html#the-aside-element">&lt;aside&gt;</a>
  * element.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Audio.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Audio.java
index 0e23c18..e611af3 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Audio.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Audio.java
@@ -22,7 +22,7 @@ import org.apache.juneau.annotation.*;
  * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#the-audio-element">&lt;audio&gt;</a>
  * element.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/B.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/B.java
index 1c49111..253fd01 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/B.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/B.java
@@ -18,7 +18,7 @@ import org.apache.juneau.annotation.*;
  * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/text-level-semantics.html#the-b-element">&lt;b&gt;</a>
  * element.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Base.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Base.java
index 67ab9aa..3f2fdcf 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Base.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Base.java
@@ -22,7 +22,7 @@ import org.apache.juneau.annotation.*;
  * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/document-metadata.html#the-base-element">&lt;base&gt;</a>
  * element.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Bdi.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Bdi.java
index 2c7675f..1aa4403 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Bdi.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Bdi.java
@@ -18,7 +18,7 @@ import org.apache.juneau.annotation.*;
  * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/text-level-semantics.html#the-bdi-element">&lt;bdi&gt;</a>
  * element.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Bdo.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Bdo.java
index b97ba90..b825fcd 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Bdo.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Bdo.java
@@ -18,7 +18,7 @@ import org.apache.juneau.annotation.*;
  * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/text-level-semantics.html#the-bdo-element">&lt;bdo&gt;</a>
  * element.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Blockquote.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Blockquote.java
index 7bd24b9..b9f094e 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Blockquote.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Blockquote.java
@@ -18,7 +18,7 @@ import org.apache.juneau.annotation.*;
  * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/grouping-content.html#the-blockquote-element">&lt;blockquote&gt;</a>
  * element.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Body.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Body.java
index 05d09c8..e829214 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Body.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Body.java
@@ -18,7 +18,7 @@ import org.apache.juneau.annotation.*;
  * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/sections.html#the-body-element">&lt;body&gt;</a>
  * element.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Br.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Br.java
index 5fbfbb5..f67814b 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Br.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Br.java
@@ -18,7 +18,7 @@ import org.apache.juneau.annotation.*;
  * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/text-level-semantics.html#the-br-element">&lt;br&gt;</a>
  * element.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Button.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Button.java
index e12955d..f64e36e 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Button.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Button.java
@@ -22,7 +22,7 @@ import org.apache.juneau.annotation.*;
  * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#the-button-element">&lt;button&gt;</a>
  * element.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Canvas.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Canvas.java
index 4def2e3..9b3da2a 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Canvas.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Canvas.java
@@ -18,7 +18,7 @@ import org.apache.juneau.annotation.*;
  * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/scripting-1.html#the-canvas-element">&lt;canvas&gt;</a>
  * element.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Caption.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Caption.java
index c821f8b..b5553cf 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Caption.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Caption.java
@@ -18,7 +18,7 @@ import org.apache.juneau.annotation.*;
  * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/tabular-data.html#the-caption-element">&lt;caption&gt;</a>
  * element.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Cite.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Cite.java
index 634ce26..7ea492c 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Cite.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Cite.java
@@ -18,7 +18,7 @@ import org.apache.juneau.annotation.*;
  * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/text-level-semantics.html#the-cite-element">&lt;cite&gt;</a>
  * element.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Code.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Code.java
index 058bb2c..4b775c7 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Code.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Code.java
@@ -18,7 +18,7 @@ import org.apache.juneau.annotation.*;
  * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/text-level-semantics.html#the-code-element">&lt;code&gt;</a>
  * element.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Col.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Col.java
index 9933040..d5b946b 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Col.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Col.java
@@ -18,7 +18,7 @@ import org.apache.juneau.annotation.*;
  * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/tabular-data.html#the-col-element">&lt;col&gt;</a>
  * element.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Colgroup.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Colgroup.java
index 9642a31..7819b55 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Colgroup.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Colgroup.java
@@ -18,7 +18,7 @@ import org.apache.juneau.annotation.*;
  * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/tabular-data.html#the-colgroup-element">&lt;colgroup&gt;</a>
  * element.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Data.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Data.java
index b1e9bc1..c38e2c2 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Data.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Data.java
@@ -18,7 +18,7 @@ import org.apache.juneau.annotation.*;
  * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/text-level-semantics.html#the-data-element">&lt;data&gt;</a>
  * element.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Datalist.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Datalist.java
index 5484f56..087425b 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Datalist.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Datalist.java
@@ -18,7 +18,7 @@ import org.apache.juneau.annotation.*;
  * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#the-datalist-element">&lt;datalist&gt;</a>
  * element.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Dd.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Dd.java
index ceb1551..ad5ed4c 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Dd.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Dd.java
@@ -18,7 +18,7 @@ import org.apache.juneau.annotation.*;
  * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/grouping-content.html#the-dd-element">&lt;dd&gt;</a>
  * element.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Del.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Del.java
index 6a5be90..7561751 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Del.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Del.java
@@ -18,7 +18,7 @@ import org.apache.juneau.annotation.*;
  * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/edits.html#the-del-element">&lt;del&gt;</a>
  * element.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Dfn.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Dfn.java
index a8b93c0..38c64fd 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Dfn.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Dfn.java
@@ -18,7 +18,7 @@ import org.apache.juneau.annotation.*;
  * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/text-level-semantics.html#the-dfn-element">&lt;dfn&gt;</a>
  * element.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Div.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Div.java
index 71f5c43..5dd27b0 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Div.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Div.java
@@ -18,7 +18,7 @@ import org.apache.juneau.annotation.*;
  * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/grouping-content.html#the-div-element">&lt;div&gt;</a>
  * element.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Dl.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Dl.java
index 6a4828b..55e8ee1 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Dl.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Dl.java
@@ -18,7 +18,7 @@ import org.apache.juneau.annotation.*;
  * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/grouping-content.html#the-dl-element">&lt;dl&gt;</a>
  * element.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Dt.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Dt.java
index d49f6dc..97a7b89 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Dt.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Dt.java
@@ -18,7 +18,7 @@ import org.apache.juneau.annotation.*;
  * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/grouping-content.html#the-dt-element">&lt;dt&gt;</a>
  * element.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Em.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Em.java
index 8756565..ec1a198 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Em.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Em.java
@@ -18,7 +18,7 @@ import org.apache.juneau.annotation.*;
  * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/text-level-semantics.html#the-em-element">&lt;em&gt;</a>
  * element.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Embed.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Embed.java
index f345023..23966f6 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Embed.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Embed.java
@@ -22,7 +22,7 @@ import org.apache.juneau.annotation.*;
  * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#the-embed-element">&lt;embed&gt;</a>
  * element.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Fieldset.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Fieldset.java
index d9b3a8f..a3d0c14 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Fieldset.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Fieldset.java
@@ -18,7 +18,7 @@ import org.apache.juneau.annotation.*;
  * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#the-fieldset-element">&lt;fieldset&gt;</a>
  * element.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Figcaption.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Figcaption.java
index 67fc141..1c51a08 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Figcaption.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Figcaption.java
@@ -18,7 +18,7 @@ import org.apache.juneau.annotation.*;
  * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/grouping-content.html#the-figcaption-element">&lt;figcaption&gt;</a>
  * element.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Figure.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Figure.java
index 259fbc7..61f6874 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Figure.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Figure.java
@@ -18,7 +18,7 @@ import org.apache.juneau.annotation.*;
  * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/grouping-content.html#the-figure-element">&lt;figure&gt;</a>
  * element.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Footer.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Footer.java
index a32051d..6bf507b 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Footer.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Footer.java
@@ -18,7 +18,7 @@ import org.apache.juneau.annotation.*;
  * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/sections.html#the-footer-element">&lt;footer&gt;</a>
  * element.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Form.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Form.java
index 205f930..ab27fd8 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Form.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Form.java
@@ -22,7 +22,7 @@ import org.apache.juneau.annotation.*;
  * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#the-form-element">&lt;form&gt;</a>
  * element.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/H1.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/H1.java
index 8cd6f5d..0f35088 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/H1.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/H1.java
@@ -18,7 +18,7 @@ import org.apache.juneau.annotation.*;
  * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/sections.html#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements">&lt;h1&gt;</a>
  * element.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/H2.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/H2.java
index 08d9c46..3e68e76 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/H2.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/H2.java
@@ -18,7 +18,7 @@ import org.apache.juneau.annotation.*;
  * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/sections.html#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements">&lt;h2&gt;</a>
  * element.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/H3.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/H3.java
index 2fc4cf5..65e1441 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/H3.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/H3.java
@@ -18,7 +18,7 @@ import org.apache.juneau.annotation.*;
  * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/sections.html#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements">&lt;h3&gt;</a>
  * element.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/H4.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/H4.java
index 0739eac..4636d1f 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/H4.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/H4.java
@@ -18,7 +18,7 @@ import org.apache.juneau.annotation.*;
  * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/sections.html#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements">&lt;h4&gt;</a>
  * element.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/H5.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/H5.java
index da709be..050be41 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/H5.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/H5.java
@@ -18,7 +18,7 @@ import org.apache.juneau.annotation.*;
  * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/sections.html#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements">&lt;h5&gt;</a>
  * element.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/H6.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/H6.java
index b550787..1787fab 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/H6.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/H6.java
@@ -18,7 +18,7 @@ import org.apache.juneau.annotation.*;
  * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/sections.html#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements">&lt;h6&gt;</a>
  * element.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Head.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Head.java
index ae43db2..c94e703 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Head.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Head.java
@@ -18,7 +18,7 @@ import org.apache.juneau.annotation.*;
  * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/document-metadata.html#the-head-element">&lt;head&gt;</a>
  * element.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Header.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Header.java
index b8f88bb..67cb57d 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Header.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Header.java
@@ -18,7 +18,7 @@ import org.apache.juneau.annotation.*;
  * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/sections.html#the-header-element">&lt;header&gt;</a>
  * element.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Hr.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Hr.java
index 181ffe9..58eff63 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Hr.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Hr.java
@@ -18,7 +18,7 @@ import org.apache.juneau.annotation.*;
  * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/grouping-content.html#the-hr-element">&lt;hr&gt;</a>
  * element.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Html.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Html.java
index 393e384..0923a99 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Html.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Html.java
@@ -18,7 +18,7 @@ import org.apache.juneau.annotation.*;
  * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/semantics.html#the-html-element">&lt;html&gt;</a>
  * element.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlBeanDictionary.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlBeanDictionary.java
index 7c0aff1..721664b 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlBeanDictionary.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlBeanDictionary.java
@@ -17,7 +17,7 @@ import org.apache.juneau.*;
 /**
  * Defines the Java classes that make up the HTML DTO type dictionary.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlBuilder.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlBuilder.java
index 9c6476c..6846d93 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlBuilder.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlBuilder.java
@@ -15,7 +15,7 @@ package org.apache.juneau.dto.html5;
 /**
  * Various useful static methods for creating HTML elements.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlElement.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlElement.java
index c7047c5..e67213b 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlElement.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlElement.java
@@ -31,7 +31,7 @@ import org.apache.juneau.xml.annotation.*;
  * <p>
  * These are beans that when serialized using {@link HtmlSerializer} generate valid HTML5 elements.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlElementContainer.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlElementContainer.java
index a0a3b48..6bd734f 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlElementContainer.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlElementContainer.java
@@ -24,7 +24,7 @@ import org.apache.juneau.xml.annotation.*;
 /**
  * A subclass of HTML elements that contain only other elements, not text.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlElementMixed.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlElementMixed.java
index 0255253..3a40413 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlElementMixed.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlElementMixed.java
@@ -24,7 +24,7 @@ import org.apache.juneau.xml.annotation.*;
 /**
  * A subclass of HTML elements that contain mixed content (elements and text).
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlElementRawText.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlElementRawText.java
index ff2bdc8..91af026 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlElementRawText.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlElementRawText.java
@@ -19,7 +19,7 @@ import org.apache.juneau.xml.annotation.*;
  * A subclass of HTML elements that contain <a href="https://www.w3.org/TR/html51/syntax.html#raw-text">raw text</a>
  * only.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlElementText.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlElementText.java
index 8b41d14..87b15c4 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlElementText.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlElementText.java
@@ -18,7 +18,7 @@ import org.apache.juneau.xml.annotation.*;
 /**
  * A subclass of HTML elements that contain text only.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlElementVoid.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlElementVoid.java
index a320550..d4899d9 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlElementVoid.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlElementVoid.java
@@ -22,7 +22,7 @@ import org.apache.juneau.xml.annotation.*;
  * <p>
  * See <a href="https://www.w3.org/TR/html51/syntax.html#void-elements">void elements</a>
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/I.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/I.java
index ea864e1..547de2a 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/I.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/I.java
@@ -18,7 +18,7 @@ import org.apache.juneau.annotation.*;
  * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/text-level-semantics.html#the-i-element">&lt;i&gt;</a>
  * element.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Iframe.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Iframe.java
index cf09aec..d53f4dc 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Iframe.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Iframe.java
@@ -22,7 +22,7 @@ import org.apache.juneau.annotation.*;
  * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#the-iframe-element">&lt;iframe&gt;</a>
  * element.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Img.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Img.java
index e022d73..36173db 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Img.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Img.java
@@ -22,7 +22,7 @@ import org.apache.juneau.annotation.*;
  * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#the-img-element">&lt;img&gt;</a>
  * element.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Input.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Input.java
index 2966668..74c0725 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Input.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Input.java
@@ -20,7 +20,7 @@ import org.apache.juneau.annotation.*;
  * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#the-input-element">&lt;input&gt;</a>
  * element.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Ins.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Ins.java
index f009f2e..53a2008 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Ins.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Ins.java
@@ -18,7 +18,7 @@ import org.apache.juneau.annotation.*;
  * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/edits.html#the-ins-element">&lt;ins&gt;</a>
  * element.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Kbd.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Kbd.java
index 876d153..2856e92 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Kbd.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Kbd.java
@@ -18,7 +18,7 @@ import org.apache.juneau.annotation.*;
  * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/text-level-semantics.html#the-kbd-element">&lt;kbd&gt;</a>
  * element.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Keygen.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Keygen.java
index 25c78cb..ec0bfd1 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Keygen.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Keygen.java
@@ -18,7 +18,7 @@ import org.apache.juneau.annotation.*;
  * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#the-keygen-element">&lt;keygen&gt;</a>
  * element.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Label.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Label.java
index 24c15d2..e4e504e 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Label.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Label.java
@@ -18,7 +18,7 @@ import org.apache.juneau.annotation.*;
  * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#the-label-element">&lt;label&gt;</a>
  * element.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Legend.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Legend.java
index ad5364c..ed32b4d 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Legend.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Legend.java
@@ -18,7 +18,7 @@ import org.apache.juneau.annotation.*;
  * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#the-legend-element">&lt;legend&gt;</a>
  * element.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Li.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Li.java
index a808a77..b211f39 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Li.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Li.java
@@ -18,7 +18,7 @@ import org.apache.juneau.annotation.*;
  * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/grouping-content.html#the-li-element">&lt;li&gt;</a>
  * element.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Link.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Link.java
index 69e2124..213f381 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Link.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Link.java
@@ -22,7 +22,7 @@ import org.apache.juneau.annotation.*;
  * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/document-metadata.html#the-link-element">&lt;link&gt;</a>
  * element.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Main.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Main.java
index a0e783e..a7c39a1 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Main.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Main.java
@@ -18,7 +18,7 @@ import org.apache.juneau.annotation.*;
  * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/grouping-content.html#the-main-element">&lt;main&gt;</a>
  * element.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Map.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Map.java
index 6fce8c8..d594dd1 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Map.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Map.java
@@ -18,7 +18,7 @@ import org.apache.juneau.annotation.*;
  * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#the-map-element">&lt;map&gt;</a>
  * element.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Mark.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Mark.java
index 8f2ad47..4af8630 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Mark.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Mark.java
@@ -18,7 +18,7 @@ import org.apache.juneau.annotation.*;
  * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/text-level-semantics.html#the-mark-element">&lt;mark&gt;</a>
  * element.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Meta.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Meta.java
index 26ab304..c6bd4c7 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Meta.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Meta.java
@@ -18,7 +18,7 @@ import org.apache.juneau.annotation.*;
  * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/document-metadata.html#the-meta-element">&lt;meta&gt;</a>
  * element.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Meter.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Meter.java
index 0a4d184..db1de68 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Meter.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Meter.java
@@ -18,7 +18,7 @@ import org.apache.juneau.annotation.*;
  * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#the-meter-element">&lt;meter&gt;</a>
  * element.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Nav.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Nav.java
index 4cf89f9..6a6e67e 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Nav.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Nav.java
@@ -18,7 +18,7 @@ import org.apache.juneau.annotation.*;
  * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/sections.html#the-nav-element">&lt;nav&gt;</a>
  * element.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Noscript.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Noscript.java
index a8f18fe..56e677e 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Noscript.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Noscript.java
@@ -18,7 +18,7 @@ import org.apache.juneau.annotation.*;
  * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/scripting-1.html#the-noscript-element">&lt;noscript&gt;</a>
  * element.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Object2.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Object2.java
index 4683a5d..1f80a1e 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Object2.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Object2.java
@@ -18,7 +18,7 @@ import org.apache.juneau.annotation.*;
  * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#the-object-element">&lt;object&gt;</a>
  * element.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Ol.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Ol.java
index 4b06d4c..9bf56d7 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Ol.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Ol.java
@@ -18,7 +18,7 @@ import org.apache.juneau.annotation.*;
  * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/grouping-content.html#the-ol-element">&lt;ol&gt;</a>
  * element.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Optgroup.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Optgroup.java
index 88ed414..882028d 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Optgroup.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Optgroup.java
@@ -18,7 +18,7 @@ import org.apache.juneau.annotation.*;
  * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#the-optgroup-element">&lt;optgroup&gt;</a>
  * element.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Option.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Option.java
index 1453ab1..4133958 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Option.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Option.java
@@ -18,7 +18,7 @@ import org.apache.juneau.annotation.*;
  * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#the-option-element">&lt;option&gt;</a>
  * element.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Output.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Output.java
index d15f77f..8b3abe2 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Output.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Output.java
@@ -18,7 +18,7 @@ import org.apache.juneau.annotation.*;
  * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#the-output-element">&lt;output&gt;</a>
  * element.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/P.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/P.java
index 94b0149..aa4cd99 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/P.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/P.java
@@ -18,7 +18,7 @@ import org.apache.juneau.annotation.*;
  * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/grouping-content.html#the-p-element">&lt;p&gt;</a>
  * element.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Param.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Param.java
index 86ac0f4..07fe019 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Param.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Param.java
@@ -18,7 +18,7 @@ import org.apache.juneau.annotation.*;
  * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#the-param-element">&lt;param&gt;</a>
  * element.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Pre.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Pre.java
index 83a83b1..cd93b1f 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Pre.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Pre.java
@@ -23,7 +23,7 @@ import org.apache.juneau.xml.annotation.*;
  * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/grouping-content.html#the-pre-element">&lt;pre&gt;</a>
  * element.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Progress.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Progress.java
index 1ae39f1..6b1f6dc 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Progress.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Progress.java
@@ -18,7 +18,7 @@ import org.apache.juneau.annotation.*;
  * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#the-progress-element">&lt;progress&gt;</a>
  * element.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Q.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Q.java
index d45375b..0bd4318 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Q.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Q.java
@@ -18,7 +18,7 @@ import org.apache.juneau.annotation.*;
  * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/text-level-semantics.html#the-q-element">&lt;q&gt;</a>
  * element.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Rb.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Rb.java
index a12c8f1..afc6bf5 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Rb.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Rb.java
@@ -18,7 +18,7 @@ import org.apache.juneau.annotation.*;
  * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/text-level-semantics.html#the-rb-element">&lt;rb&gt;</a>
  * element.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Rp.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Rp.java
index 920eb3c..bb2101b 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Rp.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Rp.java
@@ -18,7 +18,7 @@ import org.apache.juneau.annotation.*;
  * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/text-level-semantics.html#the-rp-element">&lt;rp&gt;</a>
  * element.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Rt.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Rt.java
index 177d014..4a35bca 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Rt.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Rt.java
@@ -18,7 +18,7 @@ import org.apache.juneau.annotation.*;
  * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/text-level-semantics.html#the-rt-element">&lt;rt&gt;</a>
  * element.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Rtc.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Rtc.java
index 4543c18..6959207 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Rtc.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Rtc.java
@@ -18,7 +18,7 @@ import org.apache.juneau.annotation.*;
  * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/text-level-semantics.html#the-rtc-element">&lt;rtc&gt;</a>
  * element.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Ruby.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Ruby.java
index 590e875..d842503 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Ruby.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Ruby.java
@@ -18,7 +18,7 @@ import org.apache.juneau.annotation.*;
  * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/text-level-semantics.html#the-ruby-element">&lt;ruby&gt;</a>
  * element.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/S.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/S.java
index 91055de..757bc4c 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/S.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/S.java
@@ -18,7 +18,7 @@ import org.apache.juneau.annotation.*;
  * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/text-level-semantics.html#the-s-element">&lt;s&gt;</a>
  * element.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Samp.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Samp.java
index 22c0204..7b06b30 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Samp.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Samp.java
@@ -18,7 +18,7 @@ import org.apache.juneau.annotation.*;
  * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/text-level-semantics.html#the-samp-element">&lt;samp&gt;</a>
  * element.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Script.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Script.java
index 0eb9c6d..a9d8327 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Script.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Script.java
@@ -22,7 +22,7 @@ import org.apache.juneau.annotation.*;
  * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/scripting-1.html#the-script-element">&lt;script&gt;</a>
  * element.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Section.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Section.java
index ea839e5..ace6519 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Section.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Section.java
@@ -18,7 +18,7 @@ import org.apache.juneau.annotation.*;
  * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/sections.html#the-section-element">&lt;section&gt;</a>
  * element.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Select.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Select.java
index c68f236..251b843 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Select.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Select.java
@@ -18,7 +18,7 @@ import org.apache.juneau.annotation.*;
  * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#the-select-element">&lt;select&gt;</a>
  * element.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Small.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Small.java
index b34f419..c44e639 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Small.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Small.java
@@ -18,7 +18,7 @@ import org.apache.juneau.annotation.*;
  * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/text-level-semantics.html#the-small-element">&lt;small&gt;</a>
  * element.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Source.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Source.java
index 7b8ae8f..5ad5847 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Source.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Source.java
@@ -22,7 +22,7 @@ import org.apache.juneau.annotation.*;
  * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#the-source-element">&lt;source&gt;</a>
  * element.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Span.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Span.java
index b3809f7..dd3af37 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Span.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Span.java
@@ -18,7 +18,7 @@ import org.apache.juneau.annotation.*;
  * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/text-level-semantics.html#the-span-element">&lt;span&gt;</a>
  * element.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Strong.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Strong.java
index 6c6ebb3..3dceb56 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Strong.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Strong.java
@@ -18,7 +18,7 @@ import org.apache.juneau.annotation.*;
  * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/text-level-semantics.html#the-strong-element">&lt;strong&gt;</a>
  * element.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Style.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Style.java
index 725b07e..47c5415 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Style.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Style.java
@@ -18,7 +18,7 @@ import org.apache.juneau.annotation.*;
  * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/document-metadata.html#the-style-element">&lt;style&gt;</a>
  * element.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Sub.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Sub.java
index b724ab2..05abc2a 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Sub.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Sub.java
@@ -18,7 +18,7 @@ import org.apache.juneau.annotation.*;
  * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/text-level-semantics.html#the-sub-and-sup-elements">&lt;sub&gt;</a>
  * element.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Sup.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Sup.java
index d5269e6..e99d373 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Sup.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Sup.java
@@ -18,7 +18,7 @@ import org.apache.juneau.annotation.*;
  * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/text-level-semantics.html#the-sub-and-sup-elements">&lt;sup&gt;</a>
  * element.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Table.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Table.java
index 5e61942..e866c12 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Table.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Table.java
@@ -18,7 +18,7 @@ import org.apache.juneau.annotation.*;
  * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/tabular-data.html#the-table-element">&lt;table&gt;</a>
  * element.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Tbody.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Tbody.java
index 0d2ca05..d754f2a 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Tbody.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Tbody.java
@@ -18,7 +18,7 @@ import org.apache.juneau.annotation.*;
  * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/tabular-data.html#the-tbody-element">&lt;tbody&gt;</a>
  * element.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Td.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Td.java
index 74234df..7516b3d 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Td.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Td.java
@@ -18,7 +18,7 @@ import org.apache.juneau.annotation.*;
  * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/tabular-data.html#the-td-element">&lt;td&gt;</a>
  * element.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Template.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Template.java
index 885404c..d46be06 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Template.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Template.java
@@ -18,7 +18,7 @@ import org.apache.juneau.annotation.*;
  * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/scripting-1.html#the-template-element">&lt;template&gt;</a>
  * element.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Textarea.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Textarea.java
index 4e31c35..73d5aea 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Textarea.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Textarea.java
@@ -18,7 +18,7 @@ import org.apache.juneau.annotation.*;
  * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#the-textarea-element">&lt;textarea&gt;</a>
  * element.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Tfoot.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Tfoot.java
index 9020439..63fbe97 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Tfoot.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Tfoot.java
@@ -18,7 +18,7 @@ import org.apache.juneau.annotation.*;
  * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/tabular-data.html#the-tfoot-element">&lt;tfoot&gt;</a>
  * element.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Th.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Th.java
index 18a66db..34a9a66 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Th.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Th.java
@@ -18,7 +18,7 @@ import org.apache.juneau.annotation.*;
  * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/tabular-data.html#the-th-element">&lt;th&gt;</a>
  * element.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Thead.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Thead.java
index d3ad9b3..1e63159 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Thead.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Thead.java
@@ -18,7 +18,7 @@ import org.apache.juneau.annotation.*;
  * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/tabular-data.html#the-thead-element">&lt;thead&gt;</a>
  * element.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Time.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Time.java
index 5a1e9c0..8ebe728 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Time.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Time.java
@@ -18,7 +18,7 @@ import org.apache.juneau.annotation.*;
  * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/text-level-semantics.html#the-time-element">&lt;time&gt;</a>
  * element.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Title.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Title.java
index 27e4264..7f9a48a 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Title.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Title.java
@@ -18,7 +18,7 @@ import org.apache.juneau.annotation.*;
  * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/document-metadata.html#the-title-element">&lt;title&gt;</a>
  * element.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Tr.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Tr.java
index 4cc6964..f722b77 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Tr.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Tr.java
@@ -18,7 +18,7 @@ import org.apache.juneau.annotation.*;
  * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/tabular-data.html#the-tr-element">&lt;tr&gt;</a>
  * element.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Track.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Track.java
index d8e7c03..e7199df 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Track.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Track.java
@@ -22,7 +22,7 @@ import org.apache.juneau.annotation.*;
  * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#the-track-element">&lt;track&gt;</a>
  * element.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/U.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/U.java
index c608d58..886b8bd 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/U.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/U.java
@@ -18,7 +18,7 @@ import org.apache.juneau.annotation.*;
  * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/text-level-semantics.html#the-u-element">&lt;u&gt;</a>
  * element.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Ul.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Ul.java
index 1dddb34..36391d1 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Ul.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Ul.java
@@ -18,7 +18,7 @@ import org.apache.juneau.annotation.*;
  * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/grouping-content.html#the-ul-element">&lt;ul&gt;</a>
  * element.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Var.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Var.java
index 736e850..b6e32e6 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Var.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Var.java
@@ -18,7 +18,7 @@ import org.apache.juneau.annotation.*;
  * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/text-level-semantics.html#the-var-element">&lt;var&gt;</a>
  * element.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Video.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Video.java
index 74c4aa3..43dc876 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Video.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Video.java
@@ -22,7 +22,7 @@ import org.apache.juneau.annotation.*;
  * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#the-video-element">&lt;video&gt;</a>
  * element.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Wbr.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Wbr.java
index 874b951..8f7ad73 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Wbr.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Wbr.java
@@ -18,7 +18,7 @@ import org.apache.juneau.annotation.*;
  * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/text-level-semantics.html#the-wbr-element">&lt;wbr&gt;</a>
  * element.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/JsonType.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/JsonType.java
index 1e21966..1d1fabb 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/JsonType.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/JsonType.java
@@ -26,7 +26,7 @@ package org.apache.juneau.dto.jsonschema;
  * 	String json = JsonSerializer.DEFAULT.serialize(JsonType.NUMBER);
  * </p>
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/JsonTypeArray.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/JsonTypeArray.java
index df811f5..e9c20a0 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/JsonTypeArray.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/JsonTypeArray.java
@@ -17,7 +17,7 @@ import java.util.*;
 /**
  * Represents a list of {@link JsonType} objects.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/Schema.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/Schema.java
index 083cb61..e6b808f 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/Schema.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/Schema.java
@@ -28,7 +28,7 @@ import org.apache.juneau.transform.*;
 /**
  * Represents a top-level schema object bean in the JSON-Schema core specification.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/SchemaArray.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/SchemaArray.java
index 58cf9bb..e334287 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/SchemaArray.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/SchemaArray.java
@@ -17,7 +17,7 @@ import java.util.*;
 /**
  * Represents a list of {@link Schema} objects.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/SchemaMap.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/SchemaMap.java
index 14332de..5eae3e7 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/SchemaMap.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/SchemaMap.java
@@ -32,7 +32,7 @@ import org.apache.juneau.json.*;
  * 		{@link #load(URI)} - If you want control over construction of {@link Schema} objects.
  * </ul>
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/SchemaProperty.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/SchemaProperty.java
index d30fb9c..a64ddbb 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/SchemaProperty.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/SchemaProperty.java
@@ -15,7 +15,7 @@ package org.apache.juneau.dto.jsonschema;
 /**
  * Represents a JSON property in the JSON-Schema core specification.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/SchemaPropertySimpleArray.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/SchemaPropertySimpleArray.java
index 66f5224..582355f 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/SchemaPropertySimpleArray.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/SchemaPropertySimpleArray.java
@@ -26,7 +26,7 @@ package org.apache.juneau.dto.jsonschema;
  * 		);
  * </p>
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/SchemaRef.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/SchemaRef.java
index c78d02a..d31cf6b 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/SchemaRef.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/SchemaRef.java
@@ -26,7 +26,7 @@ import org.apache.juneau.*;
  * 	Schema s = <jk>new</jk> Schema().setRef(uri);
  * </p>
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/package.html b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/package.html
index 2b4cc12..264b3e8 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/package.html
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/package.html
@@ -483,7 +483,7 @@
 				browser asks for by default).
 			</p>
 			
-			<h6 class='figure'>HTML</h6>
+			<h5 class='figure'>HTML</h5>
 			<img class='bordered' src="doc-files/Example_Html.png">
 			<p>
 				The REST API allows you to specify the <code>Accept</code> header as a GET parameter, and the 
@@ -492,19 +492,19 @@
 				We'll use this to view the JSON-Schema document in other languages.
 			</p>			
 			
-			<h6 class='figure'>Normal JSON</h6>
+			<h5 class='figure'>Normal JSON</h5>
 			<img class='bordered' src="doc-files/Example_Json.png">
 			
-			<h6 class='figure'>XML</h6>
+			<h5 class='figure'>XML</h5>
 			<img class='bordered' src="doc-files/Example_Xml.png">
 
-			<h6 class='figure'>URL-Encoded</h6>
+			<h5 class='figure'>URL-Encoded</h5>
 			<img class='bordered' src="doc-files/Example_UrlEncoded.png">
 
-			<h6 class='figure'>Abbreviated RDF/XML</h6>
+			<h5 class='figure'>Abbreviated RDF/XML</h5>
 			<img class='bordered' src="doc-files/Example_XmlRdfAbbrev.png">
 
-			<h6 class='figure'>Turtle</h6>
+			<h5 class='figure'>Turtle</h5>
 			<img class='bordered' src="doc-files/Example_Turtle.png">
 			
 			<p>
@@ -512,7 +512,7 @@
 				page.
 			</p>
 			
-			<h6 class='figure'>Resource Options</h6>
+			<h5 class='figure'>Resource Options</h5>
 			<img class='bordered' src="doc-files/Example_Options.png">
 		</div>	
 	</div>
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Contact.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Contact.java
index 4587f36..3c41bb4 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Contact.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Contact.java
@@ -43,7 +43,7 @@ import org.apache.juneau.annotation.*;
  * 	}
  * </p>
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'><a class='doclink' href='../../../../../overview-summary.html#juneau-dto.Swagger'>Overview > juneau-dto > Swagger</a>
  * </ul>
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/ExternalDocumentation.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/ExternalDocumentation.java
index 3b9e02b..3acb717 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/ExternalDocumentation.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/ExternalDocumentation.java
@@ -42,7 +42,7 @@ import org.apache.juneau.annotation.*;
  * 	}
  * </p>
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'><a class='doclink' href='../../../../../overview-summary.html#juneau-dto.Swagger'>Overview > juneau-dto > Swagger</a>
  * </ul>
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/HeaderInfo.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/HeaderInfo.java
index e7357cd..6364595 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/HeaderInfo.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/HeaderInfo.java
@@ -42,7 +42,7 @@ import org.apache.juneau.annotation.*;
  * 	}
  * </p>
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'><a class='doclink' href='../../../../../overview-summary.html#juneau-dto.Swagger'>Overview > juneau-dto > Swagger</a>
  * </ul>
@@ -267,7 +267,7 @@ public class HeaderInfo extends SwaggerElement {
 	 * 	<ul>
 	 * 		<li>{@link Items}
 	 * 		<li><code>String</code> - JSON object representation of {@link Items}
-	 * 			<h6 class='figure'>Example:</h6>
+	 * 			<h5 class='figure'>Example:</h5>
 	 * 			<p class='bcode'>
 	 * 	items(<js>"{type:'type',format:'format',...}"</js>);
 	 * 			</p>
@@ -900,12 +900,12 @@ public class HeaderInfo extends SwaggerElement {
 	 * 		<li><code>Object</code>
 	 * 		<li><code>Collection&lt;Object&gt;</code>
 	 * 		<li><code>String</code> - JSON array representation of <code>Collection&lt;Object&gt;</code>.
-	 * 			<h6 class='figure'>Example:</h6>
+	 * 			<h5 class='figure'>Example:</h5>
 	 * 			<p class='bcode'>
 	 * 	_enum(<js>"['foo','bar']"</js>);
 	 * 			</p>
 	 * 		<li><code>String</code> - Individual values.
-	 * 			<h6 class='figure'>Example:</h6>
+	 * 			<h5 class='figure'>Example:</h5>
 	 * 			<p class='bcode'>
 	 * 	_enum(<js>"foo"</js>, <js>"bar"</js>);
 	 * 			</p>
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Info.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Info.java
index 913dde2..86a7c7b 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Info.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Info.java
@@ -57,7 +57,7 @@ import org.apache.juneau.annotation.*;
  * 	}
  * </p>
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'><a class='doclink' href='../../../../../overview-summary.html#juneau-dto.Swagger'>Overview > juneau-dto > Swagger</a>
  * </ul>
@@ -235,7 +235,7 @@ public class Info extends SwaggerElement {
 	 * 	<ul>
 	 * 		<li>{@link Contact}
 	 * 		<li><code>String</code> - JSON object representation of {@link Contact}
-	 * 			<h6 class='figure'>Example:</h6>
+	 * 			<h5 class='figure'>Example:</h5>
 	 * 			<p class='bcode'>
 	 * 	contact(<js>"{name:'name',url:'url',...}"</js>);
 	 * 			</p>
@@ -284,7 +284,7 @@ public class Info extends SwaggerElement {
 	 * 	<ul>
 	 * 		<li>{@link License}
 	 * 		<li><code>String</code> - JSON object representation of {@link License}
-	 * 			<h6 class='figure'>Example:</h6>
+	 * 			<h5 class='figure'>Example:</h5>
 	 * 			<p class='bcode'>
 	 * 	license(<js>"{name:'name',url:'url',...}"</js>);
 	 * 			</p>
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Items.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Items.java
index abb41e5..0687463 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Items.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Items.java
@@ -43,7 +43,7 @@ import org.apache.juneau.json.*;
  * 	}
  * </p>
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'><a class='doclink' href='../../../../../overview-summary.html#juneau-dto.Swagger'>Overview > juneau-dto > Swagger</a>
  * </ul>
@@ -233,7 +233,7 @@ public class Items extends SwaggerElement {
 	 * 	<ul>
 	 * 		<li>{@link Items}
 	 * 		<li><code>String</code> - JSON object representation of {@link Items}
-	 * 			<h6 class='figure'>Example:</h6>
+	 * 			<h5 class='figure'>Example:</h5>
 	 * 			<p class='bcode'>
 	 * 	items(<js>"{type:'type',format:'format',...}"</js>);
 	 * 			</p>
@@ -876,12 +876,12 @@ public class Items extends SwaggerElement {
 	 * 		<li><code>Object</code>
 	 * 		<li><code>Collection&lt;Object&gt;</code>
 	 * 		<li><code>String</code> - JSON array representation of <code>Collection&lt;Object&gt;</code>
-	 * 			<h6 class='figure'>Example:</h6>
+	 * 			<h5 class='figure'>Example:</h5>
 	 * 			<p class='bcode'>
 	 * 	_enum(<js>"['foo','bar']"</js>);
 	 * 			</p>
 	 * 		<li><code>String</code> - Individual values
-	 * 			<h6 class='figure'>Example:</h6>
+	 * 			<h5 class='figure'>Example:</h5>
 	 * 			<p class='bcode'>
 	 * 	_enum(<js>"foo"</js>, <js>"bar"</js>);
 	 * 			</p>
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/License.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/License.java
index e238fa3..7c5beef 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/License.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/License.java
@@ -41,7 +41,7 @@ import org.apache.juneau.annotation.*;
  * 	}
  * </p>
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'><a class='doclink' href='../../../../../overview-summary.html#juneau-dto.Swagger'>Overview > juneau-dto > Swagger</a>
  * </ul>
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Operation.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Operation.java
index c58a4d9..3da8fe1 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Operation.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Operation.java
@@ -119,7 +119,7 @@ import org.apache.juneau.http.*;
  * 	}
  * </p>
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'><a class='doclink' href='../../../../../overview-summary.html#juneau-dto.Swagger'>Overview > juneau-dto > Swagger</a>
  * </ul>
@@ -199,12 +199,12 @@ public class Operation extends SwaggerElement {
 	 * 	<ul>
 	 * 		<li><code>Collection&lt;String&gt;</code>
 	 * 		<li><code>String</code> - JSON array representation of <code>Collection&lt;String&gt;</code>
-	 * 			<h6 class='figure'>Example:</h6>
+	 * 			<h5 class='figure'>Example:</h5>
 	 * 			<p class='bcode'>
 	 * 	tags(<js>"['foo','bar']"</js>);
 	 * 			</p>
 	 * 		<li><code>String</code> - Individual values
-	 * 			<h6 class='figure'>Example:</h6>
+	 * 			<h5 class='figure'>Example:</h5>
 	 * 			<p class='bcode'>
 	 * 	tags(<js>"foo"</js>, <js>"bar"</js>);
 	 * 			</p>
@@ -337,7 +337,7 @@ public class Operation extends SwaggerElement {
 	 * 	<ul>
 	 * 		<li>{@link ExternalDocumentation}
 	 * 		<li><code>String</code> - JSON object representation of {@link ExternalDocumentation}
-	 * 			<h6 class='figure'>Example:</h6>
+	 * 			<h5 class='figure'>Example:</h5>
 	 * 			<p class='bcode'>
 	 * 	externalDocs(<js>"{description:'description',url:'url'}"</js>);
 	 * 			</p>
@@ -465,12 +465,12 @@ public class Operation extends SwaggerElement {
 	 * 		<li><code>Collection&lt;{@link MediaType}|String&gt;</code>
 	 * 		<li><code>{@link MediaType}[]</code>
 	 * 		<li><code>String</code> - JSON array representation of <code>Collection&lt;{@link MediaType}&gt;</code>
-	 * 			<h6 class='figure'>Example:</h6>
+	 * 			<h5 class='figure'>Example:</h5>
 	 * 			<p class='bcode'>
 	 * 	consumes(<js>"['text/json']"</js>);
 	 * 			</p>
 	 * 		<li><code>String</code> - Individual values
-	 * 			<h6 class='figure'>Example:</h6>
+	 * 			<h5 class='figure'>Example:</h5>
 	 * 			<p class='bcode'>
 	 * 	consumes(<js>"text/json"</js>);
 	 * 			</p>
@@ -551,12 +551,12 @@ public class Operation extends SwaggerElement {
 	 * 		<li><code>Collection&lt;{@link MediaType}|String&gt;</code>
 	 * 		<li><code>{@link MediaType}[]</code>
 	 * 		<li><code>String</code> - JSON array representation of <code>Collection&lt;{@link MediaType}&gt;</code>
-	 * 			<h6 class='figure'>Example:</h6>
+	 * 			<h5 class='figure'>Example:</h5>
 	 * 			<p class='bcode'>
 	 * 	produces(<js>"['text/json']"</js>);
 	 * 			</p>
 	 * 		<li><code>String</code> - Individual values
-	 * 			<h6 class='figure'>Example:</h6>
+	 * 			<h5 class='figure'>Example:</h5>
 	 * 			<p class='bcode'>
 	 * 	produces(<js>"text/json"</js>);
 	 * 			</p>
@@ -671,12 +671,12 @@ public class Operation extends SwaggerElement {
 	 * 		<li>{@link ParameterInfo}
 	 * 		<li><code>Collection&lt;{@link ParameterInfo}|String&gt;</code>
 	 * 		<li><code>String</code> - JSON array representation of <code>Collection&lt;{@link ParameterInfo}&gt;</code>
-	 * 			<h6 class='figure'>Example:</h6>
+	 * 			<h5 class='figure'>Example:</h5>
 	 * 			<p class='bcode'>
 	 * 	parameters(<js>"[{path:'path',id:'id'}]"</js>);
 	 * 			</p>
 	 * 		<li><code>String</code> - JSON object representation of {@link ParameterInfo}
-	 * 			<h6 class='figure'>Example:</h6>
+	 * 			<h5 class='figure'>Example:</h5>
 	 * 			<p class='bcode'>
 	 * 	parameters(<js>"{path:'path',id:'id'}"</js>);
 	 * 			</p>
@@ -753,7 +753,7 @@ public class Operation extends SwaggerElement {
 	 * 	<ul>
 	 * 		<li><code>Map&lt;Integer,{@link ResponseInfo}|String&gt;</code>
 	 * 		<li><code>String</code> - JSON object representation of <code>Map&lt;Integer,{@link ResponseInfo}&gt;</code>
-	 * 			<h6 class='figure'>Example:</h6>
+	 * 			<h5 class='figure'>Example:</h5>
 	 * 			<p class='bcode'>
 	 * 	responses(<js>"{'404':{description:'description',...}}"</js>);
 	 * 			</p>
@@ -828,12 +828,12 @@ public class Operation extends SwaggerElement {
 	 * 	<ul>
 	 * 		<li><code>Collection&lt;String&gt;</code>
 	 * 		<li><code>String</code> - JSON array representation of <code>Collection&lt;String&gt;</code>
-	 * 			<h6 class='figure'>Example:</h6>
+	 * 			<h5 class='figure'>Example:</h5>
 	 * 			<p class='bcode'>
 	 * 	schemes(<js>"['scheme1','scheme2']"</js>);
 	 * 			</p>
 	 * 		<li><code>String</code> - Individual values
-	 * 			<h6 class='figure'>Example:</h6>
+	 * 			<h5 class='figure'>Example:</h5>
 	 * 			<p class='bcode'>
 	 * 	schemes(<js>"scheme1</js>, <js>"scheme2"</js>);
 	 * 			</p>
@@ -973,7 +973,7 @@ public class Operation extends SwaggerElement {
 	 * 	<ul>
 	 * 		<li><code>Map&lt;String,List&lt;String&gt;&gt;</code>
 	 * 		<li><code>String</code> - JSON object representation of a <code>Map&lt;String,List&lt;String&gt;&gt;</code>
-	 * 		<h6 class='figure'>Example:</h6>
+	 * 		<h5 class='figure'>Example:</h5>
 	 * 		<p class='bcode'>
 	 * 	securities(<js>"{key:['val1','val2']}"</js>);
 	 * 		</p>
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/ParameterInfo.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/ParameterInfo.java
index e361516..0e50a84 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/ParameterInfo.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/ParameterInfo.java
@@ -83,7 +83,7 @@ import org.apache.juneau.annotation.*;
  * 	}
  * </p>
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'><a class='doclink' href='../../../../../overview-summary.html#juneau-dto.Swagger'>Overview > juneau-dto > Swagger</a>
  * </ul>
@@ -456,7 +456,7 @@ public class ParameterInfo extends SwaggerElement {
 	 * 	<ul>
 	 * 		<li>{@link SchemaInfo}
 	 * 		<li><code>String</code> - JSON object representation of {@link SchemaInfo}
-	 * 			<h6 class='figure'>Example:</h6>
+	 * 			<h5 class='figure'>Example:</h5>
 	 * 			<p class='bcode'>
 	 * 	schema(<js>"{type:'type',description:'description',...}"</js>);
 	 * 			</p>
@@ -675,7 +675,7 @@ public class ParameterInfo extends SwaggerElement {
 	 * 	<ul>
 	 * 		<li>{@link Items}
 	 * 		<li><code>String</code> - JSON object representation of {@link Items}
-	 * 			<h6 class='figure'>Example:</h6>
+	 * 			<h5 class='figure'>Example:</h5>
 	 * 			<p class='bcode'>
 	 * 	items(<js>"{type:'type',format:'format',...}"</js>);
 	 * 			</p>
@@ -1291,12 +1291,12 @@ public class ParameterInfo extends SwaggerElement {
 	 * 		<li><code>Object</code>
 	 * 		<li><code>Collection&lt;Object&gt;</code>
 	 * 		<li><code>String</code> - JSON array representation of <code>Collection&lt;Object&gt;</code>
-	 * 			<h6 class='figure'>Example:</h6>
+	 * 			<h5 class='figure'>Example:</h5>
 	 * 			<p class='bcode'>
 	 * 	_enum(<js>"['foo','bar']"</js>);
 	 * 			</p>
 	 * 		<li><code>String</code> - Individual values
-	 * 			<h6 class='figure'>Example:</h6>
+	 * 			<h5 class='figure'>Example:</h5>
 	 * 			<p class='bcode'>
 	 * 	_enum(<js>"foo"</js>, <js>"bar"</js>);
 	 * 			</p>
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/ResponseInfo.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/ResponseInfo.java
index 6e79d6d..262f270 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/ResponseInfo.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/ResponseInfo.java
@@ -52,7 +52,7 @@ import org.apache.juneau.annotation.*;
  * 	}
  * </p>
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'><a class='doclink' href='../../../../../overview-summary.html#juneau-dto.Swagger'>Overview > juneau-dto > Swagger</a>
  * </ul>
@@ -189,7 +189,7 @@ public class ResponseInfo extends SwaggerElement {
 	 * 	<ul>
 	 * 		<li>{@link SchemaInfo}
 	 * 		<li><code>String</code> - JSON object representation of {@link SchemaInfo}
-	 * 			<h6 class='figure'>Example:</h6>
+	 * 			<h5 class='figure'>Example:</h5>
 	 * 			<p class='bcode'>
 	 * 	schema(<js>"{type:'type',description:'description',...}"</js>);
 	 * 			</p>
@@ -263,7 +263,7 @@ public class ResponseInfo extends SwaggerElement {
 	 * 	<ul>
 	 * 		<li><code>Map&lt;String,{@link HeaderInfo}|String&gt;</code>
 	 * 		<li><code>String</code> - JSON object representation of <code>Map&lt;String,{@link HeaderInfo}&gt;</code>
-	 * 			<h6 class='figure'>Example:</h6>
+	 * 			<h5 class='figure'>Example:</h5>
 	 * 			<p class='bcode'>
 	 * 	headers(<js>"{headerName:{description:'description',...}}"</js>);
 	 * 			</p>
@@ -339,7 +339,7 @@ public class ResponseInfo extends SwaggerElement {
 	 * 	<ul>
 	 * 		<li><code>Map&lt;String,Object&gt;</code>
 	 * 		<li><code>String</code> - JSON object representation of <code>Map&lt;String,Object&gt;</code>
-	 * 			<h6 class='figure'>Example:</h6>
+	 * 			<h5 class='figure'>Example:</h5>
 	 * 			<p class='bcode'>
 	 * 	examples(<js>"{'text/json':{foo:'bar'}}"</js>);
 	 * 			</p>
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/SchemaInfo.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/SchemaInfo.java
index 469aa7a..068dfdb 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/SchemaInfo.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/SchemaInfo.java
@@ -50,7 +50,7 @@ import org.apache.juneau.annotation.*;
  * 	}
  * </p>
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'><a class='doclink' href='../../../../../overview-summary.html#juneau-dto.Swagger'>Overview > juneau-dto > Swagger</a>
  * </ul>
@@ -787,12 +787,12 @@ public class SchemaInfo extends SwaggerElement {
 	 * 		<li><code>Object</code>
 	 * 		<li><code>Collection&lt;Object&gt;</code>
 	 * 		<li><code>String</code> - JSON array representation of <code>Collection&lt;Object&gt;</code>
-	 * 			<h6 class='figure'>Example:</h6>
+	 * 			<h5 class='figure'>Example:</h5>
 	 * 			<p class='bcode'>
 	 * 	_enum(<js>"['foo','bar']"</js>);
 	 * 			</p>
 	 * 		<li><code>String</code> - Individual values
-	 * 			<h6 class='figure'>Example:</h6>
+	 * 			<h5 class='figure'>Example:</h5>
 	 * 			<p class='bcode'>
 	 * 	_enum(<js>"foo"</js>, <js>"bar"</js>);
 	 * 			</p>
@@ -871,7 +871,7 @@ public class SchemaInfo extends SwaggerElement {
 	 * 	<ul>
 	 * 		<li>{@link Items}
 	 * 		<li><code>String</code> - JSON object representation of {@link Items}
-	 * 			<h6 class='figure'>Example:</h6>
+	 * 			<h5 class='figure'>Example:</h5>
 	 * 			<p class='bcode'>
 	 * 	items(<js>"{type:'type',format:'format',...}"</js>);
 	 * 			</p>
@@ -928,12 +928,12 @@ public class SchemaInfo extends SwaggerElement {
 	 * 		<li><code>Object</code>
 	 * 		<li><code>Collection&lt;Object&gt;</code>
 	 * 		<li><code>String</code> - JSON array representation of <code>Collection&lt;Object&gt;</code>
-	 * 			<h6 class='figure'>Example:</h6>
+	 * 			<h5 class='figure'>Example:</h5>
 	 * 			<p class='bcode'>
 	 * 	allOf(<js>"['foo','bar']"</js>);
 	 * 			</p>
 	 * 		<li><code>String</code> - Individual values
-	 * 			<h6 class='figure'>Example:</h6>
+	 * 			<h5 class='figure'>Example:</h5>
 	 * 			<p class='bcode'>
 	 * 	allOf(<js>"foo"</js>, <js>"bar"</js>);
 	 * 			</p>
@@ -990,7 +990,7 @@ public class SchemaInfo extends SwaggerElement {
 	 * 	<ul>
 	 * 		<li><code>Map&lt;String,Map&lt;String,Object&gt;&gt;</code>
 	 * 		<li><code>String</code> - JSON object representation of <code>Map&lt;String,Map&lt;String,Object&gt;&gt;</code>
-	 * 			<h6 class='figure'>Example:</h6>
+	 * 			<h5 class='figure'>Example:</h5>
 	 * 			<p class='bcode'>
 	 * 	properties(<js>"{name:{foo:'bar'}}"</js>);
 	 * 			</p>
@@ -1060,7 +1060,7 @@ public class SchemaInfo extends SwaggerElement {
 	 * 	<ul>
 	 * 		<li><code>Map&lt;String,Object&gt;</code>
 	 * 		<li><code>String</code> - JSON object representation of <code>Map&lt;String,Object&gt;</code>
-	 * 			<h6 class='figure'>Example:</h6>
+	 * 			<h5 class='figure'>Example:</h5>
 	 * 			<p class='bcode'>
 	 * 	extraProperties(<js>"{name:'value'}"</js>);
 	 * 			</p>
@@ -1174,7 +1174,7 @@ public class SchemaInfo extends SwaggerElement {
 	 * 	<ul>
 	 * 		<li>{@link Xml}
 	 * 		<li><code>String</code> - JSON object representation of {@link Xml}
-	 * 			<h6 class='figure'>Example:</h6>
+	 * 			<h5 class='figure'>Example:</h5>
 	 * 			<p class='bcode'>
 	 * 	xml(<js>"{name:'name',namespace:'namespace',...}"</js>);
 	 * 			</p>
@@ -1217,7 +1217,7 @@ public class SchemaInfo extends SwaggerElement {
 	 * 	<ul>
 	 * 		<li>{@link ExternalDocumentation}
 	 * 		<li><code>String</code> - JSON object representation of {@link ExternalDocumentation}
-	 * 			<h6 class='figure'>Example:</h6>
+	 * 			<h5 class='figure'>Example:</h5>
 	 * 			<p class='bcode'>
 	 * 	externalDocs(<js>"{description:'description',url:'url'}"</js>);
 	 * 			</p>
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/SecurityScheme.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/SecurityScheme.java
index 92097de..f8d8cfe 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/SecurityScheme.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/SecurityScheme.java
@@ -53,7 +53,7 @@ import org.apache.juneau.annotation.*;
  * 	}
  * </p>
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'><a class='doclink' href='../../../../../overview-summary.html#juneau-dto.Swagger'>Overview > juneau-dto > Swagger</a>
  * </ul>
@@ -464,7 +464,7 @@ public class SecurityScheme extends SwaggerElement {
 	 * 	<ul>
 	 * 		<li><code>Map&lt;String,{@link HeaderInfo}|String&gt;</code>
 	 * 		<li><code>String</code> - JSON object representation of <code>Map&lt;String,{@link HeaderInfo}&gt;</code>
-	 * 			<h6 class='figure'>Example:</h6>
+	 * 			<h5 class='figure'>Example:</h5>
 	 * 			<p class='bcode'>
 	 * 	scopes(<js>"{name:'value'}"</js>);
 	 * 			</p>
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Swagger.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Swagger.java
index dd66ecd..885cc9e 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Swagger.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Swagger.java
@@ -22,7 +22,7 @@ import org.apache.juneau.json.*;
 /**
  * This is the root document object for the API specification.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'><a class='doclink' href='../../../../../overview-summary.html#juneau-dto.Swagger'>Overview > juneau-dto > Swagger</a>
  * </ul>
@@ -141,7 +141,7 @@ public class Swagger extends SwaggerElement {
 	 * 	<ul>
 	 * 		<li>{@link Info}
 	 * 		<li><code>String</code> - JSON object representation of {@link Info}
-	 * 			<h6 class='figure'>Example:</h6>
+	 * 			<h5 class='figure'>Example:</h5>
 	 * 			<p class='bcode'>
 	 * 	info(<js>"{title:'title',description:'description',...}"</js>);
 	 * 			</p>
@@ -330,12 +330,12 @@ public class Swagger extends SwaggerElement {
 	 * 	<ul>
 	 * 		<li><code>Collection&lt;String&gt;</code>
 	 * 		<li><code>String</code> - JSON array representation of <code>Collection&lt;String&gt;</code>
-	 * 		<h6 class='figure'>Example:</h6>
+	 * 		<h5 class='figure'>Example:</h5>
 	 * 		<p class='bcode'>
 	 * 	schemes(<js>"['scheme1','scheme2']"</js>);
 	 * 		</p>
 	 * 		<li><code>String</code> - Individual values
-	 * 		<h6 class='figure'>Example:</h6>
+	 * 		<h5 class='figure'>Example:</h5>
 	 * 		<p class='bcode'>
 	 * 	schemes(<js>"scheme1"</js>, <js>"scheme2"</js>);
 	 * 		</p>
@@ -412,12 +412,12 @@ public class Swagger extends SwaggerElement {
 	 * 		<li>{@link MediaType}
 	 * 		<li><code>Collection&lt;{@link MediaType}|String&gt;</code>
 	 * 		<li><code>String</code> - JSON array representation of <code>Collection&lt;{@link MediaType}&gt;</code>
-	 * 			<h6 class='figure'>Example:</h6>
+	 * 			<h5 class='figure'>Example:</h5>
 	 * 			<p class='bcode'>
 	 * 	consumes(<js>"['text/json']"</js>);
 	 * 			</p>
 	 * 		<li><code>String</code> - Individual values
-	 * 			<h6 class='figure'>Example:</h6>
+	 * 			<h5 class='figure'>Example:</h5>
 	 * 			<p class='bcode'>
 	 * 	consumes(<js>"text/json"</js>);
 	 * 			</p>
@@ -495,12 +495,12 @@ public class Swagger extends SwaggerElement {
 	 * 		<li>{@link MediaType}
 	 * 		<li><code>Collection&lt;{@link MediaType}|String&gt;</code>
 	 * 		<li><code>String</code> - JSON array representation of <code>Collection&lt;{@link MediaType}&gt;</code>
-	 * 			<h6 class='figure'>Example:</h6>
+	 * 			<h5 class='figure'>Example:</h5>
 	 * 			<p class='bcode'>
 	 * 	consumes(<js>"['text/json']"</js>);
 	 * 			</p>
 	 * 		<li><code>String</code> - Individual values
-	 * 			<h6 class='figure'>Example:</h6>
+	 * 			<h5 class='figure'>Example:</h5>
 	 * 			<p class='bcode'>
 	 * 	consumes(<js>"text/json"</js>);
 	 * 			</p>
@@ -589,7 +589,7 @@ public class Swagger extends SwaggerElement {
 	 * 	<ul>
 	 * 		<li><code>Map&lt;String,Map&lt;String,{@link Operation}&gt;|String&gt;</code>
 	 * 		<li><code>String</code> - JSON object representation of <code>Map&lt;String,Map&lt;String,{@link Operation}&gt;&gt;</code>
-	 * 			<h6 class='figure'>Example:</h6>
+	 * 			<h5 class='figure'>Example:</h5>
 	 * 			<p class='bcode'>
 	 * 	paths(<js>"{'foo':{'get':{operationId:'operationId',...}}}"</js>);
 	 * 			</p>
@@ -668,7 +668,7 @@ public class Swagger extends SwaggerElement {
 	 * 	<ul>
 	 * 		<li><code>Map&lt;String,Map&lt;String,{@link SchemaInfo}&gt;|String&gt;</code>
 	 * 		<li><code>String</code> - JSON object representation of <code>Map&lt;String,Map&lt;String,{@link SchemaInfo}&gt;&gt;</code>
-	 * 			<h6 class='figure'>Example:</h6>
+	 * 			<h5 class='figure'>Example:</h5>
 	 * 			<p class='bcode'>
 	 * 	definitions(<js>"{'foo':{'bar':{format:'format',...}}}"</js>);
 	 * 			</p>
@@ -755,7 +755,7 @@ public class Swagger extends SwaggerElement {
 	 * 	<ul>
 	 * 		<li><code>Map&lt;String,{@link ParameterInfo}|String&gt;</code>
 	 * 		<li><code>String</code> - JSON object representation of <code>Map&lt;String,{@link ParameterInfo}&gt;</code>
-	 * 			<h6 class='figure'>Example:</h6>
+	 * 			<h5 class='figure'>Example:</h5>
 	 * 			<p class='bcode'>
 	 * 	parameters(<js>"{'foo':{name:'name',...}}"</js>);
 	 * 			</p>
@@ -842,7 +842,7 @@ public class Swagger extends SwaggerElement {
 	 * 	<ul>
 	 * 		<li><code>Map&lt;String,{@link ResponseInfo}|String&gt;</code>
 	 * 		<li><code>String</code> - JSON object representation of <code>Map&lt;String,{@link ResponseInfo}&gt;</code>
-	 * 			<h6 class='figure'>Example:</h6>
+	 * 			<h5 class='figure'>Example:</h5>
 	 * 			<p class='bcode'>
 	 * 	responses(<js>"{'foo':{description:'description',...}}"</js>);
 	 * 			</p>
@@ -920,7 +920,7 @@ public class Swagger extends SwaggerElement {
 	 * 	<ul>
 	 * 		<li><code>Map&lt;String,{@link SecurityScheme}|String&gt;</code>
 	 * 		<li><code>String</code> - JSON object representation of <code>Map&lt;String,{@link SecurityScheme}&gt;</code>
-	 * 			<h6 class='figure'>Example:</h6>
+	 * 			<h5 class='figure'>Example:</h5>
 	 * 			<p class='bcode'>
 	 * 	securityDefinitions(<js>"{'foo':{name:'name',...}}"</js>);
 	 * 			</p>
@@ -1016,12 +1016,12 @@ public class Swagger extends SwaggerElement {
 	 * 	<ul>
 	 * 		<li><code>Collection&lt;Map&lt;String,List&lt;String&gt;&gt;&gt;</code>
 	 * 		<li><code>String</code> - JSON array representation of <code>Collection&lt;Map&lt;String,List&lt;String&gt;&gt;&gt;</code>
-	 * 			<h6 class='figure'>Example:</h6>
+	 * 			<h5 class='figure'>Example:</h5>
 	 * 			<p class='bcode'>
 	 * 	securities(<js>"[{...}]"</js>);
 	 * 			</p>
 	 * 		<li><code>String</code> - JSON object representation of <code>Map&lt;String,List&lt;String&gt;&gt;</code>
-	 * 			<h6 class='figure'>Example:</h6>
+	 * 			<h5 class='figure'>Example:</h5>
 	 * 			<p class='bcode'>
 	 * 	securities(<js>"{...}"</js>);
 	 * 			</p>
@@ -1099,12 +1099,12 @@ public class Swagger extends SwaggerElement {
 	 * 		<li><code>Collection&lt;{@link Tag}|String&gt;</code>
 	 * 		<li><code>{@link Tag}[]</code>
 	 * 		<li><code>String</code> - JSON array representation of <code>Collection&lt;{@link Tag}&gt;</code>
-	 * 			<h6 class='figure'>Example:</h6>
+	 * 			<h5 class='figure'>Example:</h5>
 	 * 			<p class='bcode'>
 	 * 	tags(<js>"[{name:'name',description:'description',...}]"</js>);
 	 * 			</p>
 	 * 		<li><code>String</code> - JSON object representation of <code>{@link Tag}</code>
-	 * 			<h6 class='figure'>Example:</h6>
+	 * 			<h5 class='figure'>Example:</h5>
 	 * 			<p class='bcode'>
 	 * 	tags(<js>"{name:'name',description:'description',...}"</js>);
 	 * 			</p>
@@ -1154,7 +1154,7 @@ public class Swagger extends SwaggerElement {
 	 * 	<ul>
 	 * 		<li>{@link ExternalDocumentation}
 	 * 		<li><code>String</code> - JSON object representation of {@link ExternalDocumentation}
-	 * 			<h6 class='figure'>Example:</h6>
+	 * 			<h5 class='figure'>Example:</h5>
 	 * 			<p class='bcode'>
 	 * 	externalDocs(<js>"{description:'description',url:'url'}"</js>);
 	 * 			</p>
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/SwaggerBuilder.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/SwaggerBuilder.java
index 36c4fdb..4c1f257 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/SwaggerBuilder.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/SwaggerBuilder.java
@@ -19,7 +19,7 @@ import org.apache.juneau.*;
 /**
  * Various useful static methods for creating Swagger elements.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'><a class='doclink' href='../../../../../overview-summary.html#juneau-dto.Swagger'>Overview > juneau-dto > Swagger</a>
  * </ul>
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/SwaggerElement.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/SwaggerElement.java
index 52031a7..5e8a86b 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/SwaggerElement.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/SwaggerElement.java
@@ -22,7 +22,7 @@ import org.apache.juneau.json.*;
 /**
  * Root class for all Swagger beans.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'><a class='doclink' href='../../../../../overview-summary.html#juneau-dto.Swagger'>Overview > juneau-dto > Swagger</a>
  * </ul>
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Tag.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Tag.java
index e0d072d..072c1f0 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Tag.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Tag.java
@@ -42,7 +42,7 @@ import org.apache.juneau.annotation.*;
  * 	}
  * </p>
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'><a class='doclink' href='../../../../../overview-summary.html#juneau-dto.Swagger'>Overview > juneau-dto > Swagger</a>
  * </ul>
@@ -175,7 +175,7 @@ public class Tag extends SwaggerElement {
 	 * 	<ul>
 	 * 		<li>{@link ExternalDocumentation}
 	 * 		<li><code>String</code> - JSON object representation of {@link ExternalDocumentation}
-	 * 			<h6 class='figure'>Example:</h6>
+	 * 			<h5 class='figure'>Example:</h5>
 	 * 			<p class='bcode'>
 	 * 	externalDocs(<js>"{description:'description',url:'url'}"</js>);
 	 * 			</p>
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Xml.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Xml.java
index 650b714..18e0993 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Xml.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Xml.java
@@ -43,7 +43,7 @@ import org.apache.juneau.annotation.*;
  * 	}
  * </p>
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'><a class='doclink' href='../../../../../overview-summary.html#juneau-dto.Swagger'>Overview > juneau-dto > Swagger</a>
  * </ul>
@@ -249,7 +249,7 @@ public class Xml extends SwaggerElement {
 	 * Signifies whether the array is wrapped (for example,
 	 * <code>&lt;books&gt;&lt;book/&gt;&lt;book/&gt;&lt;books&gt;</code>) or unwrapped
 	 * (<code>&lt;book/&gt;&lt;book/&gt;</code>).
-	 * <br<The definition takes effect only when defined alongside <code>type</code> being <code>array</code>
+	 * <br>The definition takes effect only when defined alongside <code>type</code> being <code>array</code>
 	 * (outside the <code>items</code>).
 	 * 
 	 * @return The property value, or <jk>null</jk> if it is not set.
@@ -268,7 +268,7 @@ public class Xml extends SwaggerElement {
 	 * Signifies whether the array is wrapped (for example,
 	 * <code>&lt;books&gt;&lt;book/&gt;&lt;book/&gt;&lt;books&gt;</code>) or unwrapped
 	 * (<code>&lt;book/&gt;&lt;book/&gt;</code>).
-	 * <br<The definition takes effect only when defined alongside <code>type</code> being <code>array</code>
+	 * <br>The definition takes effect only when defined alongside <code>type</code> being <code>array</code>
 	 * (outside the <code>items</code>).
 	 * 
 	 * @param value
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfParser.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfParser.java
index a9bf911..505f92a 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfParser.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfParser.java
@@ -23,7 +23,7 @@ import org.apache.juneau.xml.*;
 /**
  * Parses RDF into POJOs.
  * 
- * <h6 class='topic'>Behavior-specific subclasses</h6>
+ * <h5 class='topic'>Behavior-specific subclasses</h5>
  * 
  * The following direct subclasses are provided for language-specific parsers:
  * <ul class='spaced-list'>
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfParserBuilder.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfParserBuilder.java
index f3e7f05..1459a78 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfParserBuilder.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfParserBuilder.java
@@ -206,7 +206,7 @@ public class RdfParserBuilder extends ParserBuilder {
 	 * Configuration property:  RDF language.
 	 * 
 	 * <p>
-	 * Shortcut for calling <code>language(<jsf>LANG_N3</jsf>)</code>
+	 * Shortcut for calling <code>language(<jsf>LANG_N3</jsf>)</code>.
 	 * 
 	 * <h5 class='section'>See Also:</h5>
 	 * <ul>
@@ -223,7 +223,7 @@ public class RdfParserBuilder extends ParserBuilder {
 	 * Configuration property:  RDF language.
 	 * 
 	 * <p>
-	 * Shortcut for calling <code>language(<jsf>LANG_NTRIPLE</jsf>)</code>
+	 * Shortcut for calling <code>language(<jsf>LANG_NTRIPLE</jsf>)</code>.
 	 * 
 	 * <h5 class='section'>See Also:</h5>
 	 * <ul>
@@ -274,7 +274,7 @@ public class RdfParserBuilder extends ParserBuilder {
 	}
 
 	/**
-	 * Shortcut for calling <code>language(<jsf>LANG_TURTLE</jsf>)</code>
+	 * Shortcut for calling <code>language(<jsf>LANG_TURTLE</jsf>)</code>.
 	 * 
 	 * <h5 class='section'>See Also:</h5>
 	 * <ul>
@@ -310,7 +310,7 @@ public class RdfParserBuilder extends ParserBuilder {
 	}
 
 	/**
-	 * Shortcut for calling <code>language(<jsf>LANG_RDF_XML</jsf>)</code>
+	 * Shortcut for calling <code>language(<jsf>LANG_RDF_XML</jsf>)</code>.
 	 * 
 	 * <h5 class='section'>See Also:</h5>
 	 * <ul>
@@ -324,7 +324,7 @@ public class RdfParserBuilder extends ParserBuilder {
 	}
 
 	/**
-	 * Shortcut for calling <code>language(<jsf>LANG_RDF_XML_ABBREV</jsf>)</code>
+	 * Shortcut for calling <code>language(<jsf>LANG_RDF_XML_ABBREV</jsf>)</code>.
 	 * 
 	 * <h5 class='section'>See Also:</h5>
 	 * <ul>
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializer.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializer.java
index d834bde..aa2aae2 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializer.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializer.java
@@ -24,7 +24,7 @@ import org.apache.juneau.xml.*;
 /**
  * Serializes POJOs to RDF.
  * 
- * <h6 class='topic'>Behavior-specific subclasses</h6>
+ * <h5 class='topic'>Behavior-specific subclasses</h5>
  * 
  * The following direct subclasses are provided for language-specific serializers:
  * <ul>
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerBuilder.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerBuilder.java
index 79590d1..0a92639 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerBuilder.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerBuilder.java
@@ -167,7 +167,7 @@ public class RdfSerializerBuilder extends SerializerBuilder {
 	 * @param value 
 	 * 	The new value for this property.
 	 * 	<br>Possible values:
-	 * 	<ul'>
+	 * 	<ul>
 	 * 		<li><js>"DEFAULT"</js> - Default format.  The default is an RDF Sequence container.
 	 * 		<li><js>"SEQ"</js> - RDF Sequence container.
 	 * 		<li><js>"BAG"</js> - RDF Bag container.
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/package.html b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/package.html
index e8f7ea6..e50b908 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/package.html
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/package.html
@@ -126,7 +126,7 @@
 		for a complete definition of supported POJOs.
 	</p>
 	
-	<h6 class='topic'>Prerequisites</h6>
+	<h5 class='topic'>Prerequisites</h5>
 	<p>
 		Juneau uses the Jena library for these formats.  
 		<br>The predefined serializers and parsers convert POJOs to and from RDF models and then uses Jena to convert 
@@ -167,19 +167,19 @@
 			in the various RDF supported formats.
 		</p>
 		
-		<h6 class='figure'>RDF/XML</h6>
+		<h5 class='figure'>RDF/XML</h5>
 		<img class='bordered' src="doc-files/Example_RDFXML.png">
 		
-		<h6 class='figure'>Abbreviated RDF/XML</h6>
+		<h5 class='figure'>Abbreviated RDF/XML</h5>
 		<img class='bordered' src="doc-files/Example_RDFXMLABBREV.png">
 
-		<h6 class='figure'>N-Triple</h6>
+		<h5 class='figure'>N-Triple</h5>
 		<img class='bordered' src="doc-files/Example_NTriple.png">
 
-		<h6 class='figure'>Turtle</h6>
+		<h5 class='figure'>Turtle</h5>
 		<img class='bordered' src="doc-files/Example_Turtle.png">
 		
-		<h6 class='figure'>N3</h6>
+		<h5 class='figure'>N3</h5>
 		<img class='bordered' src="doc-files/Example_N3.png">
 	</div>
 </div>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContextBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContextBuilder.java
index 7054121..952a089 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContextBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContextBuilder.java
@@ -55,7 +55,7 @@ import org.apache.juneau.transform.*;
  * 
  * <h5 class='section'>See Also:</h5>
  * <ul>
- * 	<li class='link'><a class="doclink" href="../../../../overview-summary.html#juneau-marshall.ConfigurableProperties">Overview &gt; Configurable Properties</a>
+ * 	<li class='link'><a class="doclink" href="../../../overview-summary.html#juneau-marshall.ConfigurableProperties">Overview &gt; Configurable Properties</a>
  * </ul>
  */
 public class BeanContextBuilder extends ContextBuilder {
@@ -1300,7 +1300,7 @@ public class BeanContextBuilder extends ContextBuilder {
 	 * <p>
 	 * Using the built-in Java bean introspector will not pick up fields or non-standard getters/setters.
 	 * 
-	 * <h5 class 'section'>Notes:</h5>
+	 * <h5 class='section'>Notes:</h5>
 	 * <ul>
 	 * 	<li>Most {@link Bean @Bean} annotations will be ignored if you enable this setting.
 	 * </ul>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMap.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMap.java
index eeb8611..89239ef 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMap.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMap.java
@@ -34,7 +34,7 @@ import org.apache.juneau.xml.annotation.*;
  * <p>
  * Use the {@link BeanContext} class to create instances of this class.
  * 
- * <h6 class='topic'>Bean property order</h6>
+ * <h5 class='topic'>Bean property order</h5>
  * 
  * The order of the properties returned by the {@link Map#keySet() keySet()} and {@link Map#entrySet() entrySet()}
  * methods are as follows:
@@ -50,7 +50,7 @@ import org.apache.juneau.xml.annotation.*;
  * <p>
  * <br>The order can also be overridden through the use of a {@link BeanFilter}.
  * 
- * <h6 class='topic'>POJO swaps</h6>
+ * <h5 class='topic'>POJO swaps</h5>
  * 
  * If {@link PojoSwap PojoSwaps} are defined on the class types of the properties of this bean or the bean properties
  * themselves, the {@link #get(Object)} and {@link #put(String, Object)} methods will automatically transform the
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMeta.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMeta.java
index 1c85d05..c93f741 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMeta.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMeta.java
@@ -36,7 +36,7 @@ import org.apache.juneau.utils.*;
  * 	then that information is used to determine the properties on the class.
  * Otherwise, the {@code BeanInfo} functionality in Java is used to determine the properties on the class.
  * 
- * <h6 class='topic'>Bean property ordering</h6>
+ * <h5 class='topic'>Bean property ordering</h5>
  * 
  * The order of the properties are as follows:
  * <ul class='spaced-list'>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/PropertyStore.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/PropertyStore.java
index d3e306a..b861c91 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/PropertyStore.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/PropertyStore.java
@@ -66,7 +66,7 @@ import org.apache.juneau.json.*;
  * Property stores are immutable, comparable, and their hashcodes are calculated exactly one time.
  * That makes them particularly suited for use as hashmap keys, and thus for caching reusable serializers and parsers.
  * 
- * <h6 class='topic'>Property naming convention</h6>
+ * <h5 class='topic'>Property naming convention</h5>
  * 
  * <p>
  * Property names must have the following format...
@@ -110,14 +110,14 @@ import org.apache.juneau.json.*;
  * For example, <js>"BeanContext.pojoSwaps.lc"</js> refers to a property on the <code>BeanContext</code> class
  * called <code>pojoSwaps</code> that has a data type of <code>List&lt;Class&gt;</code>.
  * 
- * <h6 class='topic'>Property value normalization</h6>
+ * <h5 class='topic'>Property value normalization</h5>
  * 
  * <p>
  * Property values get 'normalized' when they get set.  
  * For example, calling <code>propertyStore.set(<js>"BeanContext.debug.b"</js>, <js>"true"</js>)</code> will cause the property
  * value to be converted to a boolean. 
  * 
- * <h6 class='topic'>Set types</h6>
+ * <h5 class='topic'>Set types</h5>
  * 
  * <p>
  * The <js>"sX"</js> property types are sorted sets.
@@ -125,7 +125,7 @@ import org.apache.juneau.json.*;
  * <br>Internally, a <code>TreeSet</code> is used so that the order in which you add elements does not affect the 
  * resulting order of the property.
  * 
- * <h6 class='topic'>List types</h6>
+ * <h5 class='topic'>List types</h5>
  * 
  * <p>
  * The <js>"lX"</js> property types are ordered lists.
@@ -163,12 +163,12 @@ import org.apache.juneau.json.*;
  * 		.build();
  * </p>
  * 
- * <h6 class='topic'>Map types</h6>
+ * <h5 class='topic'>Map types</h5>
  * 
  * <p>
  * The <js>"smX"</js> and <js>"omX"</js> are sorted and order maps respectively.
  * 
- * <h6 class='topic'>Command properties</h6>
+ * <h5 class='topic'>Command properties</h5>
  * 
  * <p>
  * Set and list properties have the additional convenience 'command' names for adding and removing entries:
@@ -183,12 +183,12 @@ import org.apache.juneau.json.*;
  * 	<js>"{class}.{name}.{type}/add.{key}"</js>  <jc>// Add a map entry (or delete if the value is null).</jc>
  * </p>
  * 
- * <h6 class='topic'>Setting properties</h6>
+ * <h5 class='topic'>Setting properties</h5>
  * 
  * <p>
  * TODO
  * 
- * <h6 class='topic'>Retrieving properties</h6>
+ * <h5 class='topic'>Retrieving properties</h5>
  * 
  * <p>
  * TODO
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanProperty.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanProperty.java
index 77daf49..34a2756 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanProperty.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanProperty.java
@@ -48,7 +48,7 @@ public @interface BeanProperty {
 	 * visibility is set to PUBLIC, but the field is PROTECTED), this annotation can be used to force the field to be
 	 * identified as a property.
 	 * 
-	 * <h6 class='topic'>Dynamic beans</h6>
+	 * <h5 class='topic'>Dynamic beans</h5>
 	 * <p>
 	 * The bean property named <js>"*"</js> is the designated "dynamic property" which allows for "extra" bean
 	 * properties not otherwise defined.
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Builder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Builder.java
index 1fb9c6b..28d10cd 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Builder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Builder.java
@@ -20,7 +20,7 @@ import java.lang.annotation.*;
 /**
  * Identifies a class as a builder for a POJO class.
  * 
- * <h6 class='figure'>Example:</h6>
+ * <h5 class='figure'>Example:</h5>
  * <p class='bcode'>
  * 	<jc>// POJO class.</jc>
  * 	<ja>@Builder</ja>(MyBeanBuilder.<jk>class</jk>)
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvParser.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvParser.java
index f64daea..0eac32d 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvParser.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvParser.java
@@ -50,9 +50,6 @@ public class CsvParser extends ReaderParser {
 	 * Instantiates a new clean-slate {@link CsvParserBuilder} object.
 	 * 
 	 * <p>
-	 * This is equivalent to simply calling <code>CsvParser.create()
-	 * 
-	 * <p>
 	 * Note that this method creates a builder initialized to all default settings, whereas {@link #builder()} copies 
 	 * the settings of the object called on.
 	 * 
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/encoders/EncoderGroup.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/encoders/EncoderGroup.java
index e9485ae..1fae662 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/encoders/EncoderGroup.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/encoders/EncoderGroup.java
@@ -28,7 +28,7 @@ import org.apache.juneau.http.*;
  * The {@link #getEncoderMatch(String)} and {@link #getEncoder(String)} methods are then used to find appropriate
  * encoders for specific <code>Accept-Encoding</code> and <code>Content-Encoding</code> header values.
  * 
- * <h6 class='topic'>Match ordering</h6>
+ * <h5 class='topic'>Match ordering</h5>
  * 
  * Encoders are matched against <code>Accept-Encoding</code> strings in the order they exist in this group.
  * 
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializer.java
index 57d3e66..98c9205 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializer.java
@@ -164,7 +164,7 @@ public class HtmlDocSerializer extends HtmlStrippedDocSerializer {
 	 * 	<ja>@RestResource</ja>(
 	 * 		properties={
 	 * 			<ja>@Property</ja>(name=HtmlDocSerializer.<jsf>HTMLDOC_links</jsf>,
-	 * 				value=<js>"['<link rel=\"icon\" href=\"htdocs/mypageicon.ico\">']"</js>)
+	 * 				value=<js>"['&lt;link rel=\"icon\" href=\"htdocs/mypageicon.ico\"&gt;']"</js>)
 	 * 		}
 	 * 	)
 	 * </p>
@@ -175,7 +175,7 @@ public class HtmlDocSerializer extends HtmlStrippedDocSerializer {
 	 * 	<ja>@RestResource</ja>(
 	 * 		htmldoc=@HtmlDoc(
 	 * 			head={
-	 * 				<js>"<link rel='icon' href='$U{servlet:/htdocs/mypageicon.ico}'>"</js>
+	 * 				<js>"&lt;link rel='icon' href='$U{servlet:/htdocs/mypageicon.ico}'&gt;"</js>
 	 * 			}
 	 * 		)
 	 * 	)
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializer.java
index 55ee06a..be9a9ce 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializer.java
@@ -52,7 +52,7 @@ import org.apache.juneau.xml.*;
  * <p>
  * The {@link HtmlLink} annotation can be used on beans to add hyperlinks to the output.
  * 
- * <h6 class='topic'>Behavior-specific subclasses</h6>
+ * <h5 class='topic'>Behavior-specific subclasses</h5>
  * 
  * The following direct subclasses are provided for convenience:
  * <ul class='spaced-list'>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/Html.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/Html.java
index e3cc8af..d675982 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/Html.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/Html.java
@@ -34,7 +34,7 @@ public @interface Html {
 	 * <p>
 	 * The text can contain any bean property values resolved through variables of the form <js>"{property-name}"</js>.
 	 * 
-	 * <h6 class='figure'>Example:</h6>
+	 * <h5 class='figure'>Example:</h5>
 	 * <p class='bcode'>
 	 * 	<jk>public class</jk> FileSpace {
 	 * 
@@ -80,7 +80,7 @@ public @interface Html {
 	 * 	<li>Path-info-relative - e.g. <js>"myPath"</js>
 	 * </ul>
 	 * 
-	 * <h6 class='figure'>Example:</h6>
+	 * <h5 class='figure'>Example:</h5>
 	 * <p class='bcode'>
 	 * 	<jk>public class</jk> FileSpace {
 	 * 
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/package.html b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/package.html
index e365a06..260d50b 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/package.html
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/package.html
@@ -75,7 +75,7 @@
 			They mirror how the data structures are represented in JSON.
 		</p>
 		
-		<h6 class='topic'>Simple types</h6>
+		<h5 class='topic'>Simple types</h5>
 		<p>
 			The representation for simple types mirror those produced by the XML serializer.
 			Tags are added to help differentiate data types when they cannot be inferred through reflection.
@@ -114,7 +114,7 @@
 			</tr>
 		</table>
 		
-		<h6 class='topic'>Maps</h6>
+		<h5 class='topic'>Maps</h5>
 		<p>
 			Maps and beans are represented as tables.
 		</p>
@@ -219,7 +219,7 @@
 			</tr>
 		</table>
 		
-		<h6 class='topic'>Arrays</h6>
+		<h5 class='topic'>Arrays</h5>
 		<p>
 			Collections and arrays are represented as ordered lists.
 		</p>
@@ -342,7 +342,7 @@
 			</tr>
 		</table>
 		
-		<h6 class='topic'>Collections</h6>
+		<h5 class='topic'>Collections</h5>
 		<table class='styled' style='width:auto'>
 			<tr>
 				<th>Data type</th>
@@ -410,7 +410,7 @@
 			</tr>
 		</table>
 
-		<h6 class='topic'>Beans</h6>
+		<h5 class='topic'>Beans</h5>
 		<table class='styled' style='width:auto'>
 			<tr>
 				<th>Data type</th>
@@ -495,7 +495,7 @@
 			</tr>
 		</table>
 		
-		<h6 class='topic'>Beans with Map properties</h6>
+		<h5 class='topic'>Beans with Map properties</h5>
 		<table class='styled' style='width:auto'>
 			<tr>
 				<th>Data type</th>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Accept.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Accept.java
index 7b56fad..71c5f79 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Accept.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Accept.java
@@ -25,12 +25,12 @@ import org.apache.juneau.internal.*;
  * <p>
  * Content-Types that are acceptable for the response.
  * 
- * <h6 class='figure'>Example</h6>
+ * <h5 class='figure'>Example</h5>
  * <p class='bcode'>
  * 	Accept: text/plain
  * </p>
  * 
- * <h6 class='topic'>RFC2616 Specification</h6>
+ * <h5 class='topic'>RFC2616 Specification</h5>
  * 
  * The Accept request-header field can be used to specify certain media types which are acceptable for the response.
  * Accept headers can be used to indicate that the request is specifically limited to a small set of desired types, as
@@ -137,7 +137,7 @@ import org.apache.juneau.internal.*;
  * However, unless the user agent is a closed system which cannot interact with other rendering agents, this default
  * set ought to be configurable by the user.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='jp'>
  * 		<a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.http</a>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/AcceptCharset.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/AcceptCharset.java
index 3d00338..3fbf122 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/AcceptCharset.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/AcceptCharset.java
@@ -23,12 +23,12 @@ import org.apache.juneau.internal.*;
  * <p>
  * Character sets that are acceptable.
  * 
- * <h6 class='figure'>Example</h6>
+ * <h5 class='figure'>Example</h5>
  * <p class='bcode'>
  * 	Accept-Charset: utf-8
  * </p>
  * 
- * <h6 class='topic'>RFC2616 Specification</h6>
+ * <h5 class='topic'>RFC2616 Specification</h5>
  * 
  * The Accept-Charset request-header field can be used to indicate what character sets are acceptable for the response.
  * 
@@ -65,7 +65,7 @@ import org.apache.juneau.internal.*;
  * the Accept-Charset header, then the server SHOULD send an error response with the 406 (not acceptable) status code,
  * though the sending of an unacceptable response is also allowed.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='jp'>
  * 		<a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.http</a>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/AcceptEncoding.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/AcceptEncoding.java
index 071c6d2..b7f2a8b 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/AcceptEncoding.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/AcceptEncoding.java
@@ -22,12 +22,12 @@ import org.apache.juneau.internal.*;
  * <p>
  * List of acceptable encodings.
  * 
- * <h6 class='figure'>Example</h6>
+ * <h5 class='figure'>Example</h5>
  * <p class='bcode'>
  * 	Accept-Encoding: gzip, deflate
  * </p>
  * 
- * <h6 class='topic'>RFC2616 Specification</h6>
+ * <h5 class='topic'>RFC2616 Specification</h5>
  * 
  * The Accept-Encoding request-header field is similar to Accept, but restricts the content-codings (section 3.5) that
  * are acceptable in the response.
@@ -85,7 +85,7 @@ import org.apache.juneau.internal.*;
  * Note: Most HTTP/1.0 applications do not recognize or obey qvalues associated with content-codings.
  * This means that qvalues will not work and are not permitted with x-gzip or x-compress.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='jp'>
  * 		<a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.http</a>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/AcceptLanguage.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/AcceptLanguage.java
index b9bef20..a55b7ca 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/AcceptLanguage.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/AcceptLanguage.java
@@ -22,12 +22,12 @@ import org.apache.juneau.internal.*;
  * <p>
  * List of acceptable human languages for response.
  * 
- * <h6 class='figure'>Example</h6>
+ * <h5 class='figure'>Example</h5>
  * <p class='bcode'>
  * 	Accept-Language: en-US
  * </p>
  * 
- * <h6 class='topic'>RFC2616 Specification</h6>
+ * <h5 class='topic'>RFC2616 Specification</h5>
  * 
  * The Accept-Language request-header field is similar to Accept, but restricts the set of natural languages that are
  * preferred as a response to the request.
@@ -97,7 +97,7 @@ import org.apache.juneau.internal.*;
  * British English is not available.
  * A user agent might suggest in such a case to add "en" to get the best matching behavior.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='jp'>
  * 		<a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.http</a>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/AcceptRanges.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/AcceptRanges.java
index 9650084..ad0361f 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/AcceptRanges.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/AcceptRanges.java
@@ -18,12 +18,12 @@ package org.apache.juneau.http;
  * <p>
  * What partial content range types this server supports via byte serving.
  * 
- * <h6 class='figure'>Example</h6>
+ * <h5 class='figure'>Example</h5>
  * <p class='bcode'>
  * 	Accept-Ranges: bytes
  * </p>
  * 
- * <h6 class='topic'>RFC2616 Specification</h6>
+ * <h5 class='topic'>RFC2616 Specification</h5>
  * 
  * The Accept-Ranges response-header field allows the server to indicate its acceptance of range requests for a
  * resource:
@@ -54,7 +54,7 @@ package org.apache.juneau.http;
  * <p>
  * ...to advise the client not to attempt a range request.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='jp'>
  * 		<a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.http</a>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Age.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Age.java
index 4286b33..9256905 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Age.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Age.java
@@ -18,12 +18,12 @@ package org.apache.juneau.http;
  * <p>
  * The age the object has been in a proxy cache in seconds.
  * 
- * <h6 class='figure'>Example</h6>
+ * <h5 class='figure'>Example</h5>
  * <p class='bcode'>
  * 	Age: 12
  * </p>
  * 
- * <h6 class='topic'>RFC2616 Specification</h6>
+ * <h5 class='topic'>RFC2616 Specification</h5>
  * 
  * The Age response-header field conveys the sender's estimate of the amount of time since the response (or its
  * revalidation) was generated at the origin server.
@@ -49,7 +49,7 @@ package org.apache.juneau.http;
  * <p>
  * Caches SHOULD use an arithmetic type of at least 31 bits of range.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='jp'>
  * 		<a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.http</a>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Allow.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Allow.java
index 21dbc29..5a602d3 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Allow.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Allow.java
@@ -18,12 +18,12 @@ package org.apache.juneau.http;
  * <p>
  * Valid methods for a specified resource. To be used for a 405 Method not allowed.
  * 
- * <h6 class='figure'>Example</h6>
+ * <h5 class='figure'>Example</h5>
  * <p class='bcode'>
  * 	Allow: GET, HEAD
  * </p>
  * 
- * <h6 class='topic'>RFC2616 Specification</h6>
+ * <h5 class='topic'>RFC2616 Specification</h5>
  * 
  * The Allow entity-header field lists the set of methods supported by the resource identified by the Request-URI.
  * The purpose of this field is strictly to inform the recipient of valid methods associated with the resource.
@@ -59,7 +59,7 @@ package org.apache.juneau.http;
  * user agent might
  * have other means of communicating with the origin server.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='jp'>
  * 		<a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.http</a>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Authorization.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Authorization.java
index 8a3cfdc..a437dbd 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Authorization.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Authorization.java
@@ -18,12 +18,12 @@ package org.apache.juneau.http;
  * <p>
  * Authentication credentials for HTTP authentication.
  * 
- * <h6 class='figure'>Example</h6>
+ * <h5 class='figure'>Example</h5>
  * <p class='bcode'>
  * 	Authorization: Basic QWxhZGRpbjpvcGVuIHNlc2FtZQ==
  * </p>
  * 
- * <h6 class='topic'>RFC2616 Specification</h6>
+ * <h5 class='topic'>RFC2616 Specification</h5>
  * 
  * A user agent that wishes to authenticate itself with a server--usually, but not necessarily, after receiving a 401
  * response--does so by including an Authorization request-header field with the request.
@@ -63,7 +63,7 @@ package org.apache.juneau.http;
  * 		request.
  * </ol>
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='jp'>
  * 		<a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.http</a>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/CacheControl.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/CacheControl.java
index b618673..4729211 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/CacheControl.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/CacheControl.java
@@ -18,12 +18,12 @@ package org.apache.juneau.http;
  * <p>
  * Used to specify directives that must be obeyed by all caching mechanisms along the request-response chain.
  * 
- * <h6 class='figure'>Example</h6>
+ * <h5 class='figure'>Example</h5>
  * <p class='bcode'>
  * 	Cache-Control: no-cache
  * </p>
  * 
- * <h6 class='topic'>RFC2616 Specification</h6>
+ * <h5 class='topic'>RFC2616 Specification</h5>
  * 
  * The Cache-Control general-header field is used to specify directives that MUST be obeyed by all caching mechanisms
  * along the request/response chain.
@@ -87,7 +87,7 @@ package org.apache.juneau.http;
  * 	<li>Extensions to the caching system.
  * </ul>
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='jp'>
  * 		<a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.http</a>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Connection.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Connection.java
index 8ac955f..e2c0963 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Connection.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Connection.java
@@ -18,13 +18,13 @@ package org.apache.juneau.http;
  * <p>
  * Control options for the current connection and list of hop-by-hop request fields.
  * 
- * <h6 class='figure'>Example</h6>
+ * <h5 class='figure'>Example</h5>
  * <p class='bcode'>
  * 	Connection: keep-alive
  * 	Connection: Upgrade
  * </p>
  * 
- * <h6 class='topic'>RFC2616 Specification</h6>
+ * <h5 class='topic'>RFC2616 Specification</h5>
  * 
  * The Connection general-header field allows the sender to specify options that are desired for that particular
  * connection and MUST NOT be communicated by proxies over further connections.
@@ -68,7 +68,7 @@ package org.apache.juneau.http;
  * This protects against mistaken forwarding of such header fields by pre-HTTP/1.1 proxies.
  * See section 19.6.2.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='jp'>
  * 		<a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.http</a>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Constants.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Constants.java
index c3ab5d7..cab8b6d 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Constants.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Constants.java
@@ -15,7 +15,7 @@ package org.apache.juneau.http;
 /**
  * Constants used by classes in this package.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='jp'>
  * 		<a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.http</a>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/ContentEncoding.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/ContentEncoding.java
index ce0ee3c..f471b6a 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/ContentEncoding.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/ContentEncoding.java
@@ -18,12 +18,12 @@ package org.apache.juneau.http;
  * <p>
  * The type of encoding used on the data.
  * 
- * <h6 class='figure'>Example</h6>
+ * <h5 class='figure'>Example</h5>
  * <p class='bcode'>
  * 	Content-Encoding: gzip
  * </p>
  * 
- * <h6 class='topic'>RFC2616 Specification</h6>
+ * <h5 class='topic'>RFC2616 Specification</h5>
  * 
  * The Content-Encoding entity-header field is used as a modifier to the media-type.
  * When present, its value indicates what additional content codings have been applied to the entity-body, and thus
@@ -60,7 +60,7 @@ package org.apache.juneau.http;
  * were applied.
  * Additional information about the encoding parameters MAY be provided.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='jp'>
  * 		<a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.http</a>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/ContentEncodingEnum.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/ContentEncodingEnum.java
index 58b4517..bf187ab 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/ContentEncodingEnum.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/ContentEncodingEnum.java
@@ -15,7 +15,7 @@ package org.apache.juneau.http;
 /**
  * Represents the possible values for a <code>Content-Encoding</code> header.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='jp'>
  * 		<a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.http</a>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/ContentLanguage.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/ContentLanguage.java
index 294b3e3..619125e 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/ContentLanguage.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/ContentLanguage.java
@@ -18,12 +18,12 @@ package org.apache.juneau.http;
  * <p>
  * The natural language or languages of the intended audience for the enclosed content.
  * 
- * <h6 class='figure'>Example</h6>
+ * <h5 class='figure'>Example</h5>
  * <p class='bcode'>
  * 	Content-Language: da
  * </p>
  * 
- * <h6 class='topic'>RFC2616 Specification</h6>
+ * <h5 class='topic'>RFC2616 Specification</h5>
  * 
  * The Content-Language entity-header field describes the natural language(s) of the intended audience for the
  * enclosed entity.
@@ -64,7 +64,7 @@ package org.apache.juneau.http;
  * <p>
  * Content-Language MAY be applied to any media type -- it is not limited to textual documents.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='jp'>
  * 		<a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.http</a>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/ContentLength.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/ContentLength.java
index 9c93965..ab89577 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/ContentLength.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/ContentLength.java
@@ -18,12 +18,12 @@ package org.apache.juneau.http;
  * <p>
  * The length of the response body in octets (8-bit bytes).
  * 
- * <h6 class='figure'>Example</h6>
+ * <h5 class='figure'>Example</h5>
  * <p class='bcode'>
  * 	Content-Length: 348
  * </p>
  * 
- * <h6 class='topic'>RFC2616 Specification</h6>
+ * <h5 class='topic'>RFC2616 Specification</h5>
  * 
  * The Content-Length entity-header field indicates the size of the entity-body, in decimal number of OCTETs, sent to
  * the recipient or, in the case of the HEAD method, the size of the entity-body that would have been sent had the
@@ -52,7 +52,7 @@ package org.apache.juneau.http;
  * In HTTP, it SHOULD be sent whenever the message's length can be determined prior to being transferred, unless this is
  * prohibited by the rules in section 4.4.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='jp'>
  * 		<a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.http</a>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/ContentLocation.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/ContentLocation.java
index 69b81f8..eec0f26 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/ContentLocation.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/ContentLocation.java
@@ -18,12 +18,12 @@ package org.apache.juneau.http;
  * <p>
  * An alternate location for the returned data.
  * 
- * <h6 class='figure'>Example</h6>
+ * <h5 class='figure'>Example</h5>
  * <p class='bcode'>
  * 	Content-Location: /index.htm
  * </p>
  * 
- * <h6 class='topic'>RFC2616 Specification</h6>
+ * <h5 class='topic'>RFC2616 Specification</h5>
  * 
  * The Content-Location entity-header field MAY be used to supply the resource location for the entity enclosed in the
  * message when that entity is accessible from a location separate from the requested resource's URI.
@@ -58,7 +58,7 @@ package org.apache.juneau.http;
  * The meaning of the Content-Location header in PUT or POST requests is undefined; servers are free to ignore it in
  * those cases.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='jp'>
  * 		<a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.http</a>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/ContentRange.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/ContentRange.java
index b688c87..ff928a3 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/ContentRange.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/ContentRange.java
@@ -18,12 +18,12 @@ package org.apache.juneau.http;
  * <p>
  * Where in a full body message this partial message belongs.
  * 
- * <h6 class='figure'>Example</h6>
+ * <h5 class='figure'>Example</h5>
  * <p class='bcode'>
  * 	Content-Range: bytes 21010-47021/47022
  * </p>
  * 
- * <h6 class='topic'>RFC2616 Specification</h6>
+ * <h5 class='topic'>RFC2616 Specification</h5>
  * 
  * The Content-Range entity-header is sent with a partial entity-body to specify where in the full entity-body the
  * partial body should be applied.
@@ -120,7 +120,7 @@ package org.apache.juneau.http;
  * response for
  * an unsatisfiable Range request-header, since not all servers implement this request-header.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='jp'>
  * 		<a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.http</a>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/ContentType.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/ContentType.java
index 3a5bb79..2d9a4ac 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/ContentType.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/ContentType.java
@@ -22,12 +22,12 @@ import org.apache.juneau.internal.*;
  * <p>
  * The MIME type of this content.
  * 
- * <h6 class='figure'>Example</h6>
+ * <h5 class='figure'>Example</h5>
  * <p class='bcode'>
  * 	Content-Type: text/html; charset=utf-8
  * </p>
  * 
- * <h6 class='topic'>RFC2616 Specification</h6>
+ * <h5 class='topic'>RFC2616 Specification</h5>
  * 
  * The Content-Type entity-header field indicates the media type of the entity-body sent to the recipient or, in the
  * case of the HEAD method, the media type that would have been sent had the request been a GET.
@@ -42,7 +42,7 @@ import org.apache.juneau.internal.*;
  * 	Content-Type: text/html; charset=ISO-8859-4
  * </p>
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='jp'>
  * 		<a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.http</a>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Date.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Date.java
index 6334c58..59a7aa7 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Date.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Date.java
@@ -18,12 +18,12 @@ package org.apache.juneau.http;
  * <p>
  * The date and time that the message was sent (in "HTTP-date" format as defined by RFC 7231).
  * 
- * <h6 class='figure'>Example</h6>
+ * <h5 class='figure'>Example</h5>
  * <p class='bcode'>
  * 	Date: Tue, 15 Nov 1994 08:12:31 GMT
  * </p>
  * 
- * <h6 class='topic'>RFC2616 Specification</h6>
+ * <h5 class='topic'>RFC2616 Specification</h5>
  * 
  * The Date general-header field represents the date and time at which the message was originated, having the same
  * semantics as orig-date in RFC 822.
@@ -70,7 +70,7 @@ package org.apache.juneau.http;
  * In practice, the date can be generated at any time during the message origination without affecting its semantic
  * value.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='jp'>
  * 		<a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.http</a>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/ETag.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/ETag.java
index 2c050c7..f0af4e8 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/ETag.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/ETag.java
@@ -18,12 +18,12 @@ package org.apache.juneau.http;
  * <p>
  * An identifier for a specific version of a resource, often a message digest.
  * 
- * <h6 class='figure'>Example</h6>
+ * <h5 class='figure'>Example</h5>
  * <p class='bcode'>
  * 	ETag: "737060cd8c284d8af7ad3082f209582d"
  * </p>
  * 
- * <h6 class='topic'>RFC2616 Specification</h6>
+ * <h5 class='topic'>RFC2616 Specification</h5>
  * 
  * The ETag response-header field provides the current value of the entity tag for the requested variant.
  * The headers used with entity tags are described in sections 14.24, 14.26 and 14.44.
@@ -41,7 +41,7 @@ package org.apache.juneau.http;
  * 	ETag: ""
  * </p>
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='jp'>
  * 		<a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.http</a>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/EntityValidator.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/EntityValidator.java
index 72980a4..8ec8422 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/EntityValidator.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/EntityValidator.java
@@ -16,13 +16,13 @@ package org.apache.juneau.http;
  * Represents a validator value.
  * 
  * <p>
- * <h6 class='figure'>Example</h6>
+ * <h5 class='figure'>Example</h5>
  * <p class='bcode'>
  * 	ETag: "123456789"    – A strong ETag validator
  * 	ETag: W/"123456789"  – A weak ETag validator
  * </p>
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='jp'>
  * 		<a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.http</a>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Expect.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Expect.java
index 4976a6f..c99abca 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Expect.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Expect.java
@@ -18,12 +18,12 @@ package org.apache.juneau.http;
  * <p>
  * Indicates that particular server behaviors are required by the client.
  * 
- * <h6 class='figure'>Example</h6>
+ * <h5 class='figure'>Example</h5>
  * <p class='bcode'>
  * 	Expect: 100-continue
  * </p>
  * 
- * <h6 class='topic'>RFC2616 Specification</h6>
+ * <h5 class='topic'>RFC2616 Specification</h5>
  * 
  * The Expect request-header field is used to indicate that particular server behaviors are required by the client.
  * <p class='bcode'>
@@ -60,7 +60,7 @@ package org.apache.juneau.http;
  * <p>
  * See section 8.2.3 for the use of the 100 (continue) status.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='jp'>
  * 		<a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.http</a>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Expires.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Expires.java
index 8116f5e..0705384 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Expires.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Expires.java
@@ -18,12 +18,12 @@ package org.apache.juneau.http;
  * <p>
  * Gives the date/time after which the response is considered stale (in "HTTP-date" format as defined by RFC 7231).
  * 
- * <h6 class='figure'>Example</h6>
+ * <h5 class='figure'>Example</h5>
  * <p class='bcode'>
  * 	Expires: Thu, 01 Dec 1994 16:00:00 GMT
  * </p>
  * 
- * <h6 class='topic'>RFC2616 Specification</h6>
+ * <h5 class='topic'>RFC2616 Specification</h5>
  * 
  * The Expires entity-header field gives the date/time after which the response is considered stale.
  * A stale cache entry may not normally be returned by a cache (either a proxy cache or a user agent cache) unless it is
@@ -71,7 +71,7 @@ package org.apache.juneau.http;
  * would by default be non-cacheable indicates that the response is cacheable, unless indicated otherwise by a
  * Cache-Control header field (section 14.9).
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='jp'>
  * 		<a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.http</a>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/From.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/From.java
index d261e0e..7af7703 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/From.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/From.java
@@ -18,12 +18,12 @@ package org.apache.juneau.http;
  * <p>
  * The email address of the user making the request.
  * 
- * <h6 class='figure'>Example</h6>
+ * <h5 class='figure'>Example</h5>
  * <p class='bcode'>
  * 	From: user@example.com
  * </p>
  * 
- * <h6 class='topic'>RFC2616 Specification</h6>
+ * <h5 class='topic'>RFC2616 Specification</h5>
  * 
  * The From request-header field, if given, SHOULD contain an Internet e-mail address for the human user who controls
  * the requesting user agent.
@@ -58,7 +58,7 @@ package org.apache.juneau.http;
  * It is strongly recommended that the user be able to disable, enable, and modify the value of this field at any time
  * prior to a request.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='jp'>
  * 		<a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.http</a>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/HeaderDate.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/HeaderDate.java
index d668bc2..7b6a522 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/HeaderDate.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/HeaderDate.java
@@ -18,12 +18,12 @@ import org.apache.juneau.internal.*;
  * Category of headers that consist of a single HTTP-date.
  * 
  * <p>
- * <h6 class='figure'>Example</h6>
+ * <h5 class='figure'>Example</h5>
  * <p class='bcode'>
  * 	If-Modified-Since: Sat, 29 Oct 1994 19:43:31 GMT
  * </p>
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='jp'>
  * 		<a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.http</a>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/HeaderEntityValidator.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/HeaderEntityValidator.java
index 91642da..da52422 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/HeaderEntityValidator.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/HeaderEntityValidator.java
@@ -16,12 +16,12 @@ package org.apache.juneau.http;
  * Category of headers that consist of a single entity validator value.
  * 
  * <p>
- * <h6 class='figure'>Example</h6>
+ * <h5 class='figure'>Example</h5>
  * <p class='bcode'>
  * 	ETag: "xyzzy"
  * </p>
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='jp'>
  * 		<a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.http</a>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/HeaderEntityValidatorArray.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/HeaderEntityValidatorArray.java
index 05cc7b1..0f37051 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/HeaderEntityValidatorArray.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/HeaderEntityValidatorArray.java
@@ -18,14 +18,14 @@ import org.apache.juneau.internal.*;
  * Category of headers that consist of a comma-delimited list of entity validator values.
  * 
  * <p>
- * <h6 class='figure'>Example</h6>
+ * <h5 class='figure'>Example</h5>
  * <p class='bcode'>
  * 	If-Match: "xyzzy"
  * 	If-Match: "xyzzy", "r2d2xxxx", "c3piozzzz"
  * 	If-Match: *
  * </p>
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='jp'>
  * 		<a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.http</a>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/HeaderEnum.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/HeaderEnum.java
index 0704f6e..d9550c3 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/HeaderEnum.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/HeaderEnum.java
@@ -16,12 +16,12 @@ package org.apache.juneau.http;
  * Category of headers that consist of a single enum value.
  * 
  * <p>
- * <h6 class='figure'>Example</h6>
+ * <h5 class='figure'>Example</h5>
  * <p class='bcode'>
  * 	Accept-Ranges: bytes
  * </p>
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='jp'>
  * 		<a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.http</a>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/HeaderInteger.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/HeaderInteger.java
index 5b1cf97..592bbe8 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/HeaderInteger.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/HeaderInteger.java
@@ -16,12 +16,12 @@ package org.apache.juneau.http;
  * Category of headers that consist of a single integer value.
  * 
  * <p>
- * <h6 class='figure'>Example</h6>
+ * <h5 class='figure'>Example</h5>
  * <p class='bcode'>
  * 	Age: 300
  * </p>
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='jp'>
  * 		<a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.http</a>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/HeaderRangeArray.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/HeaderRangeArray.java
index 6e3f9c0..f2926a6 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/HeaderRangeArray.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/HeaderRangeArray.java
@@ -20,12 +20,12 @@ import org.apache.juneau.internal.*;
  * Category of headers that consist of simple comma-delimited lists of strings with q-values.
  * 
  * <p>
- * <h6 class='figure'>Example</h6>
+ * <h5 class='figure'>Example</h5>
  * <p class='bcode'>
  * 	Accept-Encoding: compress;q=0.5, gzip;q=1.0
  * </p>
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='jp'>
  * 		<a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.http</a>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/HeaderString.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/HeaderString.java
index 8efa2e1..af4bb7e 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/HeaderString.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/HeaderString.java
@@ -18,12 +18,12 @@ import org.apache.juneau.internal.*;
  * Category of headers that consist of a single string value.
  * 
  * <p>
- * <h6 class='figure'>Example</h6>
+ * <h5 class='figure'>Example</h5>
  * <p class='bcode'>
  * 	Accept-Ranges: bytes
  * </p>
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='jp'>
  * 		<a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.http</a>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/HeaderStringArray.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/HeaderStringArray.java
index 99fb5bf..db41390 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/HeaderStringArray.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/HeaderStringArray.java
@@ -18,12 +18,12 @@ import org.apache.juneau.internal.*;
  * Category of headers that consist of a comma-delimited list of string values.
  * 
  * <p>
- * <h6 class='figure'>Example</h6>
+ * <h5 class='figure'>Example</h5>
  * <p class='bcode'>
  * 	Allow: GET, PUT
  * </p>
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='jp'>
  * 		<a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.http</a>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/HeaderUri.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/HeaderUri.java
index 106fa27..b32eb48 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/HeaderUri.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/HeaderUri.java
@@ -20,12 +20,12 @@ import org.apache.juneau.internal.*;
  * Category of headers that consist of a single URL value.
  * 
  * <p>
- * <h6 class='figure'>Example</h6>
+ * <h5 class='figure'>Example</h5>
  * <p class='bcode'>
  * 	Location: http://www.w3.org/pub/WWW/People.html
  * </p>
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='jp'>
  * 		<a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.http</a>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Host.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Host.java
index f3e058e..403f6ff 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Host.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Host.java
@@ -20,13 +20,13 @@ package org.apache.juneau.http;
  * The port number may be omitted if the port is the standard port for the service requested.
  * Mandatory since HTTP/1.1.
  * 
- * <h6 class='figure'>Example</h6>
+ * <h5 class='figure'>Example</h5>
  * <p class='bcode'>
  * 	Host: en.wikipedia.org:8080
  * 	Host: en.wikipedia.org
  * </p>
  * 
- * <h6 class='topic'>RFC2616 Specification</h6>
+ * <h5 class='topic'>RFC2616 Specification</h5>
  * 
  * The Host request-header field specifies the Internet host and port number of the resource being requested, as
  * obtained from the original URI given by the user or referring resource (generally an HTTP URL, as described in
@@ -60,7 +60,7 @@ package org.apache.juneau.http;
  * <p>
  * See sections 5.2 and 19.6.1.1 for other requirements relating to Host.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='jp'>
  * 		<a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.http</a>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/HttpMethod.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/HttpMethod.java
index 1fc3335..cdbf649 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/HttpMethod.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/HttpMethod.java
@@ -17,7 +17,7 @@ import java.util.*;
 /**
  * Represents valid HTTP 1.1 method names per the RFC 2616 spec.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='jp'>
  * 		<a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.http</a>
@@ -28,28 +28,28 @@ import java.util.*;
  */
 public enum HttpMethod {
 
-	/** <a class='doclink' href='https://www.w3.org/Protocols/rfc2616/rfc2616-sec9.html#sec9.2'>OPTIONS</a> */
+	/** <a href="https://www.w3.org/Protocols/rfc2616/rfc2616-sec9.html#sec9.2" class="doclink">OPTIONS</a> */
 	OPTIONS,
 
-	/** <a class='doclink' href='https://www.w3.org/Protocols/rfc2616/rfc2616-sec9.html#sec9.3'>GET</a> */
+	/** <a href="https://www.w3.org/Protocols/rfc2616/rfc2616-sec9.html#sec9.3" class="doclink">GET</a> */
 	GET,
 
-	/** <a class='doclink' href='https://www.w3.org/Protocols/rfc2616/rfc2616-sec9.html#sec9.4'>HEAD</a> */
+	/** <a href="https://www.w3.org/Protocols/rfc2616/rfc2616-sec9.html#sec9.4" class="doclink">HEAD</a> */
 	HEAD,
 
-	/** <a class='doclink' href='https://www.w3.org/Protocols/rfc2616/rfc2616-sec9.html#sec9.5'>POST</a> */
+	/** <a href="https://www.w3.org/Protocols/rfc2616/rfc2616-sec9.html#sec9.5" class="doclink">POST</a> */
 	POST,
 
-	/** <a class='doclink' href='https://www.w3.org/Protocols/rfc2616/rfc2616-sec9.html#sec9.6'>PUT</a> */
+	/** <a href="https://www.w3.org/Protocols/rfc2616/rfc2616-sec9.html#sec9.6" class="doclink">PUT</a> */
 	PUT,
 
-	/** <a class='doclink' href='https://www.w3.org/Protocols/rfc2616/rfc2616-sec9.html#sec9.7'>DELETE</a> */
+	/** <a href="https://www.w3.org/Protocols/rfc2616/rfc2616-sec9.html#sec9.7" class="doclink">DELETE</a> */
 	DELETE,
 
-	/** <a class='doclink' href='https://www.w3.org/Protocols/rfc2616/rfc2616-sec9.html#sec9.8'>TRACE</a> */
+	/** <a href="https://www.w3.org/Protocols/rfc2616/rfc2616-sec9.html#sec9.8" class="doclink">TRACE</a> */
 	TRACE,
 
-	/** <a class='doclink' href='https://www.w3.org/Protocols/rfc2616/rfc2616-sec9.html#sec9.9'>CONNECT</a> */
+	/** <a href="https://www.w3.org/Protocols/rfc2616/rfc2616-sec9.html#sec9.9" class="doclink">CONNECT</a> */
 	CONNECT,
 
 	/** A non-standard value. */
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/HttpMethodName.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/HttpMethodName.java
index 6eff6fc..c506299 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/HttpMethodName.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/HttpMethodName.java
@@ -15,7 +15,7 @@ package org.apache.juneau.http;
 /**
  * Represents valid HTTP 1.1 method name static strings per the RFC 2616 spec.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='extlink'>
  * 		<a class='doclink' href='https://www.w3.org/Protocols/rfc2616/rfc2616.html'>
@@ -24,28 +24,28 @@ package org.apache.juneau.http;
  */
 public final class HttpMethodName {
 
-	/** <a class='doclink' href='https://www.w3.org/Protocols/rfc2616/rfc2616-sec9.html#sec9.2'>OPTIONS</a> */
+	/** <a href="https://www.w3.org/Protocols/rfc2616/rfc2616-sec9.html#sec9.2" class="doclink">OPTIONS</a> */
 	public static final String OPTIONS = "OPTIONS";
 
-	/** <a class='doclink' href='https://www.w3.org/Protocols/rfc2616/rfc2616-sec9.html#sec9.3'>GET</a> */
+	/** <a href="https://www.w3.org/Protocols/rfc2616/rfc2616-sec9.html#sec9.3" class="doclink">GET</a> */
 	public static final String GET = "GET";
 
-	/** <a class='doclink' href='https://www.w3.org/Protocols/rfc2616/rfc2616-sec9.html#sec9.4'>HEAD</a> */
+	/** <a href="https://www.w3.org/Protocols/rfc2616/rfc2616-sec9.html#sec9.4" class="doclink">HEAD</a> */
 	public static final String HEAD = "HEAD";
 
-	/** <a class='doclink' href='https://www.w3.org/Protocols/rfc2616/rfc2616-sec9.html#sec9.5'>POST</a> */
+	/** <a href="https://www.w3.org/Protocols/rfc2616/rfc2616-sec9.html#sec9.5" class="doclink">POST</a> */
 	public static final String POST = "POST";
 
-	/** <a class='doclink' href='https://www.w3.org/Protocols/rfc2616/rfc2616-sec9.html#sec9.6'>PUT</a> */
+	/** <a href="https://www.w3.org/Protocols/rfc2616/rfc2616-sec9.html#sec9.6" class="doclink">PUT</a> */
 	public static final String PUT = "PUT";
 
-	/** <a class='doclink' href='https://www.w3.org/Protocols/rfc2616/rfc2616-sec9.html#sec9.7'>DELETE</a> */
+	/** <a href="https://www.w3.org/Protocols/rfc2616/rfc2616-sec9.html#sec9.7" class="doclink">DELETE</a> */
 	public static final String DELETE = "DELETE";
 
-	/** <a class='doclink' href='https://www.w3.org/Protocols/rfc2616/rfc2616-sec9.html#sec9.8'>TRACE</a> */
+	/** <a href="https://www.w3.org/Protocols/rfc2616/rfc2616-sec9.html#sec9.8" class="doclink">TRACE</a> */
 	public static final String TRACE = "TRACE";
 
-	/** <a class='doclink' href='https://www.w3.org/Protocols/rfc2616/rfc2616-sec9.html#sec9.9'>CONNECT</a> */
+	/** <a href="https://www.w3.org/Protocols/rfc2616/rfc2616-sec9.html#sec9.9" class="doclink">CONNECT</a> */
 	public static final String CONNECT = "CONNECT";
 
 	/** Special case for a REST method that implements a proxy interface. */
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/IfMatch.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/IfMatch.java
index a466dda..401fdf0 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/IfMatch.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/IfMatch.java
@@ -20,12 +20,12 @@ package org.apache.juneau.http;
  * This is mainly for methods like PUT to only update a resource if it has not been modified since the user last
  * updated it.
  * 
- * <h6 class='figure'>Example</h6>
+ * <h5 class='figure'>Example</h5>
  * <p class='bcode'>
  * 	If-Match: "737060cd8c284d8af7ad3082f209582d"
  * </p>
  * 
- * <h6 class='topic'>RFC2616 Specification</h6>
+ * <h5 class='topic'>RFC2616 Specification</h5>
  * 
  * The If-Match request-header field is used with a method to make it conditional.
  * A client that has one or more entities previously obtained from the resource can verify that one of those entities
@@ -82,7 +82,7 @@ package org.apache.juneau.http;
  * The result of a request having both an If-Match header field and either an If-None-Match or an If-Modified-Since
  * header fields is undefined by this specification.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='jp'>
  * 		<a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.http</a>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/IfModifiedSince.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/IfModifiedSince.java
index 8261ea2..0d31f85 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/IfModifiedSince.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/IfModifiedSince.java
@@ -18,12 +18,12 @@ package org.apache.juneau.http;
  * <p>
  * Allows a 304 Not Modified to be returned if content is unchanged.
  * 
- * <h6 class='figure'>Example</h6>
+ * <h5 class='figure'>Example</h5>
  * <p class='bcode'>
  * 	If-Modified-Since: Sat, 29 Oct 1994 19:43:31 GMT
  * </p>
  * 
- * <h6 class='topic'>RFC2616 Specification</h6>
+ * <h5 class='topic'>RFC2616 Specification</h5>
  * 
  * The If-Modified-Since request-header field is used with a method to make it conditional:
  * if the requested variant has not been modified since the time specified in this field, an entity will not be returned
@@ -82,7 +82,7 @@ package org.apache.juneau.http;
  * The result of a request having both an If-Modified-Since header field and either an If-Match or an
  * If-Unmodified-Since header fields is undefined by this specification.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='jp'>
  * 		<a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.http</a>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/IfNoneMatch.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/IfNoneMatch.java
index 8ee1c06..e13ccdd 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/IfNoneMatch.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/IfNoneMatch.java
@@ -18,12 +18,12 @@ package org.apache.juneau.http;
  * <p>
  * Allows a 304 Not Modified to be returned if content is unchanged.
  * 
- * <h6 class='figure'>Example</h6>
+ * <h5 class='figure'>Example</h5>
  * <p class='bcode'>
  * 	If-None-Match: "737060cd8c284d8af7ad3082f209582d"
  * </p>
  * 
- * <h6 class='topic'>RFC2616 Specification</h6>
+ * <h5 class='topic'>RFC2616 Specification</h5>
  * 
  * The If-None-Match request-header field is used with a method to make it conditional.
  * A client that has one or more entities previously obtained from the resource can verify that none of those entities
@@ -85,7 +85,7 @@ package org.apache.juneau.http;
  * The result of a request having both an If-None-Match header field and either an If-Match or an If-Unmodified-Since
  * header fields is undefined by this specification.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='jp'>
  * 		<a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.http</a>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/IfRange.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/IfRange.java
index c5bf5be..637b1e5 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/IfRange.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/IfRange.java
@@ -22,12 +22,12 @@ import org.apache.juneau.internal.*;
  * <p>
  * If the entity is unchanged, send me the part(s) that I am missing; otherwise, send me the entire new entity.
  * 
- * <h6 class='figure'>Example</h6>
+ * <h5 class='figure'>Example</h5>
  * <p class='bcode'>
  * 	If-Range: "737060cd8c284d8af7ad3082f209582d"
  * </p>
  * 
- * <h6 class='topic'>RFC2616 Specification</h6>
+ * <h5 class='topic'>RFC2616 Specification</h5>
  * 
  * If a client has a partial copy of an entity in its cache, and wishes to have an up-to-date copy of the entire entity
  * in its cache, it could use the Range request-header with a conditional GET (using either or both of
@@ -56,7 +56,7 @@ import org.apache.juneau.internal.*;
  * provide the specified sub-range of the entity using a 206 (Partial content) response.
  * If the entity tag does not match, then the server SHOULD return the entire entity using a 200 (OK) response.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='jp'>
  * 		<a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.http</a>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/IfUnmodifiedSince.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/IfUnmodifiedSince.java
index b6c2428..deba7fd 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/IfUnmodifiedSince.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/IfUnmodifiedSince.java
@@ -18,12 +18,12 @@ package org.apache.juneau.http;
  * <p>
  * Only send the response if the entity has not been modified since a specific time.
  * 
- * <h6 class='figure'>Example</h6>
+ * <h5 class='figure'>Example</h5>
  * <p class='bcode'>
  * 	If-Unmodified-Since: Sat, 29 Oct 1994 19:43:31 GMT
  * </p>
  * 
- * <h6 class='topic'>RFC2616 Specification</h6>
+ * <h5 class='topic'>RFC2616 Specification</h5>
  * 
  * The If-Unmodified-Since request-header field is used with a method to make it conditional.
  * If the requested resource has not been modified since the time specified in this field, the server SHOULD perform the
@@ -54,7 +54,7 @@ package org.apache.juneau.http;
  * The result of a request having both an If-Unmodified-Since header field and either an If-None-Match or an
  * If-Modified-Since header fields is undefined by this specification.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='jp'>
  * 		<a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.http</a>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/LastModified.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/LastModified.java
index 796e078..de5da14 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/LastModified.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/LastModified.java
@@ -18,12 +18,12 @@ package org.apache.juneau.http;
  * <p>
  * The last modified date for the requested object (in "HTTP-date" format as defined by RFC 7231).
  * 
- * <h6 class='figure'>Example</h6>
+ * <h5 class='figure'>Example</h5>
  * <p class='bcode'>
  * 	Last-Modified: Tue, 15 Nov 1994 12:45:26 GMT
  * </p>
  * 
- * <h6 class='topic'>RFC2616 Specification</h6>
+ * <h5 class='topic'>RFC2616 Specification</h5>
  * 
  * The Last-Modified entity-header field indicates the date and time at which the origin server believes the variant was
  * last modified.
@@ -61,7 +61,7 @@ package org.apache.juneau.http;
  * <p>
  * HTTP/1.1 servers SHOULD send Last-Modified whenever feasible.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='jp'>
  * 		<a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.http</a>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Location.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Location.java
index 33b46a9..d8cb7a7 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Location.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Location.java
@@ -18,12 +18,12 @@ package org.apache.juneau.http;
  * <p>
  * Used in redirection, or when a new resource has been created.
  * 
- * <h6 class='figure'>Example</h6>
+ * <h5 class='figure'>Example</h5>
  * <p class='bcode'>
  * 	Location: http://www.w3.org/pub/WWW/People.html
  * </p>
  * 
- * <h6 class='topic'>RFC2616 Specification</h6>
+ * <h5 class='topic'>RFC2616 Specification</h5>
  * 
  * The Location response-header field is used to redirect the recipient to a location other than the Request-URI for
  * completion of the request or identification of a new resource.
@@ -47,7 +47,7 @@ package org.apache.juneau.http;
  * It is therefore possible for a response to contain header fields for both Location and Content-Location.
  * Also see section 13.10 for cache requirements of some methods.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='jp'>
  * 		<a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.http</a>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/MaxForwards.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/MaxForwards.java
index 3fd3ecb..b5a3b77 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/MaxForwards.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/MaxForwards.java
@@ -18,12 +18,12 @@ package org.apache.juneau.http;
  * <p>
  * Limit the number of times the message can be forwarded through proxies or gateways.
  * 
- * <h6 class='figure'>Example</h6>
+ * <h5 class='figure'>Example</h5>
  * <p class='bcode'>
  * 	Max-Forwards: 10
  * </p>
  * 
- * <h6 class='topic'>RFC2616 Specification</h6>
+ * <h5 class='topic'>RFC2616 Specification</h5>
  * 
  * The Max-Forwards request-header field provides a mechanism with the TRACE (section 9.8) and OPTIONS (section 9.2)
  * methods to limit the number of proxies or gateways that can forward the request to the next inbound server.
@@ -50,7 +50,7 @@ package org.apache.juneau.http;
  * The Max-Forwards header field MAY be ignored for all other methods defined by this specification and for any
  * extension methods for which it is not explicitly referred to as part of that method definition.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='jp'>
  * 		<a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.http</a>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/MediaType.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/MediaType.java
index 3d65aa3..ed85f81 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/MediaType.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/MediaType.java
@@ -26,7 +26,7 @@ import org.apache.juneau.json.*;
  * Describes a single media type used in content negotiation between an HTTP client and server, as described in
  * Section 14.1 and 14.7 of RFC2616 (the HTTP/1.1 specification).
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='jp'>
  * 		<a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.http</a>
@@ -262,7 +262,7 @@ public class MediaType implements Comparable<MediaType> {
 	 * 	<ul>
 	 * 		<li><code>10,000</code> for an exact match (e.g. <js>"text"</js>==<js>"text"</js>).
 	 * 		<li><code>5,000</code> for a meta match (e.g. <js>"*"</js>==<js>"text"</js>).
-	 * 	<ul>
+	 * 	</ul>
 	 * 	<li>Add the following for subtype (assuming type match is &lt;0):
 	 * 	<ul>
 	 * 		<li><code>7,500</code> for an exact match (e.g. <js>"json+foo"</js>==<js>"json+foo"</js> or <js>"json+foo"</js>==<js>"foo+json"</js>)
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/MediaTypeRange.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/MediaTypeRange.java
index 98bf611..446d32c 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/MediaTypeRange.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/MediaTypeRange.java
@@ -22,7 +22,7 @@ import org.apache.juneau.internal.*;
  * Describes a single type used in content negotiation between an HTTP client and server, as described in
  * Section 14.1 and 14.7 of RFC2616 (the HTTP/1.1 specification).
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='jp'>
  * 		<a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.http</a>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Pragma.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Pragma.java
index bc1c682..0710fc5 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Pragma.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Pragma.java
@@ -18,12 +18,12 @@ package org.apache.juneau.http;
  * <p>
  * Implementation-specific fields that may have various effects anywhere along the request-response chain.
  * 
- * <h6 class='figure'>Example</h6>
+ * <h5 class='figure'>Example</h5>
  * <p class='bcode'>
  * 	Pragma: no-cache
  * </p>
  * 
- * <h6 class='topic'>RFC2616 Specification</h6>
+ * <h5 class='topic'>RFC2616 Specification</h5>
  * 
  * The Pragma general-header field is used to include implementation- specific directives that might apply to any
  * recipient along the request/response chain.
@@ -58,7 +58,7 @@ package org.apache.juneau.http;
  * Note: because the meaning of "Pragma: no-cache as a response header field is not actually specified, it does not
  * provide a reliable replacement for "Cache-Control: no-cache" in a response.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='jp'>
  * 		<a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.http</a>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/ProxyAuthenticate.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/ProxyAuthenticate.java
index 91c28fa..4602b25 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/ProxyAuthenticate.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/ProxyAuthenticate.java
@@ -18,12 +18,12 @@ package org.apache.juneau.http;
  * <p>
  * Request authentication to access the proxy.
  * 
- * <h6 class='figure'>Example</h6>
+ * <h5 class='figure'>Example</h5>
  * <p class='bcode'>
  * 	Proxy-Authenticate: Basic
  * </p>
  * 
- * <h6 class='topic'>RFC2616 Specification</h6>
+ * <h5 class='topic'>RFC2616 Specification</h5>
  * 
  * The Proxy-Authenticate response-header field MUST be included as part of a 407 (Proxy Authentication Required)
  * response.
@@ -41,7 +41,7 @@ package org.apache.juneau.http;
  * However, an intermediate proxy might need to obtain its own credentials by requesting them from the downstream
  * client, which in some circumstances will appear as if the proxy is forwarding the Proxy-Authenticate header field.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='jp'>
  * 		<a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.http</a>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/ProxyAuthorization.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/ProxyAuthorization.java
index cf80d43..60c07c5 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/ProxyAuthorization.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/ProxyAuthorization.java
@@ -18,12 +18,12 @@ package org.apache.juneau.http;
  * <p>
  * Authorization credentials for connecting to a proxy.
  * 
- * <h6 class='figure'>Example</h6>
+ * <h5 class='figure'>Example</h5>
  * <p class='bcode'>
  * 	Proxy-Authorization: Basic QWxhZGRpbjpvcGVuIHNlc2FtZQ==
  * </p>
  * 
- * <h6 class='topic'>RFC2616 Specification</h6>
+ * <h5 class='topic'>RFC2616 Specification</h5>
  * 
  * The Proxy-Authorization request-header field allows the client to identify itself (or its user) to a proxy which
  * requires authentication.
@@ -43,7 +43,7 @@ package org.apache.juneau.http;
  * A proxy MAY relay the credentials from the client request to the next proxy if that is the mechanism by which the
  * proxies cooperatively authenticate a given request.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='jp'>
  * 		<a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.http</a>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Range.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Range.java
index b1916b1..0571fdb 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Range.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Range.java
@@ -18,12 +18,12 @@ package org.apache.juneau.http;
  * <p>
  * Request only part of an entity. Bytes are numbered from 0.
  * 
- * <h6 class='figure'>Example</h6>
+ * <h5 class='figure'>Example</h5>
  * <p class='bcode'>
  * 	Range: bytes=500-999
  * </p>
  * 
- * <h6 class='topic'>RFC2616 Specification</h6>
+ * <h5 class='topic'>RFC2616 Specification</h5>
  * 
  * Since all HTTP entities are represented in HTTP messages as sequences of bytes, the concept of a byte range is
  * meaningful for any HTTP entity.
@@ -133,7 +133,7 @@ package org.apache.juneau.http;
  * entire entity in reply, it SHOULD only return the requested range to its client.
  * It SHOULD store the entire received response in its cache if that is consistent with its cache allocation policies.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='jp'>
  * 		<a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.http</a>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Referer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Referer.java
index 884f647..9a3e96b 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Referer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Referer.java
@@ -20,12 +20,12 @@ package org.apache.juneau.http;
  * (The word “referrer” has been misspelled in the RFC as well as in most implementations to the point that it has
  * become standard usage and is considered correct terminology)
  * 
- * <h6 class='figure'>Example</h6>
+ * <h5 class='figure'>Example</h5>
  * <p class='bcode'>
  * 	Referer: http://en.wikipedia.org/wiki/Main_Page
  * </p>
  * 
- * <h6 class='topic'>RFC2616 Specification</h6>
+ * <h5 class='topic'>RFC2616 Specification</h5>
  * 
  * The Referer[sic] request-header field allows the client to specify, for the server's benefit, the address (URI) of
  * the resource from which the Request-URI was obtained (the "referrer", although the header field is misspelled.)
@@ -49,7 +49,7 @@ package org.apache.juneau.http;
  * If the field value is a relative URI, it SHOULD be interpreted relative to the Request-URI.
  * The URI MUST NOT include a fragment. See section 15.1.3 for security considerations.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='jp'>
  * 		<a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.http</a>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/RetryAfter.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/RetryAfter.java
index 7e5d372..9475e66 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/RetryAfter.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/RetryAfter.java
@@ -23,13 +23,13 @@ import org.apache.juneau.internal.*;
  * If an entity is temporarily unavailable, this instructs the client to try again later.
  * Value could be a specified period of time (in seconds) or a HTTP-date.
  * 
- * <h6 class='figure'>Example</h6>
+ * <h5 class='figure'>Example</h5>
  * <p class='bcode'>
  * 	Retry-After: 120
  * 	Retry-After: Fri, 07 Nov 2014 23:59:59 GMT
  * </p>
  * 
- * <h6 class='topic'>RFC2616 Specification</h6>
+ * <h5 class='topic'>RFC2616 Specification</h5>
  * 
  * The Retry-After response-header field can be used with a 503 (Service Unavailable) response to indicate how long the
  * service is expected to be unavailable to the requesting client.
@@ -52,7 +52,7 @@ import org.apache.juneau.internal.*;
  * <p>
  * In the latter example, the delay is 2 minutes.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='jp'>
  * 		<a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.http</a>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Server.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Server.java
index 9e51822..0c65753 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Server.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Server.java
@@ -18,12 +18,12 @@ package org.apache.juneau.http;
  * <p>
  * A name for the server.
  * 
- * <h6 class='figure'>Example</h6>
+ * <h5 class='figure'>Example</h5>
  * <p class='bcode'>
  * 	Server: Apache/2.4.1 (Unix)
  * </p>
  * 
- * <h6 class='topic'>RFC2616 Specification</h6>
+ * <h5 class='topic'>RFC2616 Specification</h5>
  * 
  * The Server response-header field contains information about the software used by the origin server to handle the
  * request.
@@ -50,7 +50,7 @@ package org.apache.juneau.http;
  * to attacks against software that is known to contain security holes.
  * Server implementors are encouraged to make this field a configurable option.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='jp'>
  * 		<a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.http</a>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/StringRange.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/StringRange.java
index 09f062e..bcf3311 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/StringRange.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/StringRange.java
@@ -29,7 +29,7 @@ import org.apache.juneau.internal.*;
  * <p>
  * An example of a type range is a value in an <code>Accept-Encoding</code> header.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='jp'>
  * 		<a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.http</a>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/TE.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/TE.java
index e30087e..03780aa 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/TE.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/TE.java
@@ -24,12 +24,12 @@ import org.apache.juneau.internal.*;
  * Transfer-Encoding can be used, plus the "trailers" value (related to the "chunked" transfer method) to notify the
  * server it expects to receive additional fields in the trailer after the last, zero-sized, chunk.
  * 
- * <h6 class='figure'>Example</h6>
+ * <h5 class='figure'>Example</h5>
  * <p class='bcode'>
  * 	TE: trailers, deflate
  * </p>
  * 
- * <h6 class='topic'>RFC2616 Specification</h6>
+ * <h5 class='topic'>RFC2616 Specification</h5>
  * 
  * The TE request-header field indicates what extension transfer-codings it is willing to accept in the response and
  * whether or not it is willing to accept trailer fields in a chunked transfer-coding.
@@ -82,7 +82,7 @@ import org.apache.juneau.internal.*;
  * If the TE field-value is empty or if no TE field is present, the only transfer-coding is "chunked".
  * A message with no transfer-coding is always acceptable.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='jp'>
  * 		<a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.http</a>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Trailer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Trailer.java
index a64f456..064545f 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Trailer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Trailer.java
@@ -19,12 +19,12 @@ package org.apache.juneau.http;
  * The Trailer general field value indicates that the given set of header fields is present in the trailer of a message
  * encoded with chunked transfer coding.
  * 
- * <h6 class='figure'>Example</h6>
+ * <h5 class='figure'>Example</h5>
  * <p class='bcode'>
  * 	Trailer: Max-Forwards
  * </p>
  * 
- * <h6 class='topic'>RFC2616 Specification</h6>
+ * <h5 class='topic'>RFC2616 Specification</h5>
  * 
  * The Trailer general field value indicates that the given set of header fields is present in the trailer of a message
  * encoded with chunked transfer-coding.
@@ -50,7 +50,7 @@ package org.apache.juneau.http;
  * 	<li>Trailer
  * </ul>
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='jp'>
  * 		<a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.http</a>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/TransferEncoding.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/TransferEncoding.java
index 9b0a6a3..daed518 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/TransferEncoding.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/TransferEncoding.java
@@ -19,12 +19,12 @@ package org.apache.juneau.http;
  * The form of encoding used to safely transfer the entity to the user.
  * Currently defined methods are: chunked, compress, deflate, gzip, identity.
  * 
- * <h6 class='figure'>Example</h6>
+ * <h5 class='figure'>Example</h5>
  * <p class='bcode'>
  * 	Transfer-Encoding: chunked
  * </p>
  * 
- * <h6 class='topic'>RFC2616 Specification</h6>
+ * <h5 class='topic'>RFC2616 Specification</h5>
  * 
  * The Transfer-Encoding general-header field indicates what (if any) type of transformation has been applied to the
  * message body in order to safely transfer it between the sender and the recipient.
@@ -50,7 +50,7 @@ package org.apache.juneau.http;
  * <p>
  * Many older HTTP/1.0 applications do not understand the Transfer-Encoding header.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='jp'>
  * 		<a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.http</a>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Upgrade.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Upgrade.java
index 330efaf..fe27d6e 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Upgrade.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Upgrade.java
@@ -18,12 +18,12 @@ package org.apache.juneau.http;
  * <p>
  * Ask the client to upgrade to another protocol.
  * 
- * <h6 class='figure'>Example</h6>
+ * <h5 class='figure'>Example</h5>
  * <p class='bcode'>
  * 	Upgrade: HTTP/2.0, HTTPS/1.3, IRC/6.9, RTA/x11, websocket
  * </p>
  * 
- * <h6 class='topic'>RFC2616 Specification</h6>
+ * <h5 class='topic'>RFC2616 Specification</h5>
  * 
  * The Upgrade general-header allows the client to specify what additional communication protocols it supports and
  * would like to use if the server finds it appropriate to switch protocols.
@@ -73,7 +73,7 @@ package org.apache.juneau.http;
  * Any token can be used as a protocol name; however, it will only be useful if both the client and server associate
  * the name with the same protocol.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='jp'>
  * 		<a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.http</a>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/UserAgent.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/UserAgent.java
index 6ecd07b..c38767b 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/UserAgent.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/UserAgent.java
@@ -18,12 +18,12 @@ package org.apache.juneau.http;
  * <p>
  * The user agent string of the user agent.
  * 
- * <h6 class='figure'>Example</h6>
+ * <h5 class='figure'>Example</h5>
  * <p class='bcode'>
  * 	User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:12.0) Gecko/20100101 Firefox/21.0
  * </p>
  * 
- * <h6 class='topic'>RFC2616 Specification</h6>
+ * <h5 class='topic'>RFC2616 Specification</h5>
  * 
  * The User-Agent request-header field contains information about the user agent originating the request.
  * This is for statistical purposes, the tracing of protocol violations, and automated recognition of user agents for
@@ -43,7 +43,7 @@ package org.apache.juneau.http;
  * 	User-Agent: CERN-LineMode/2.15 libwww/2.17b3
  * </p>
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='jp'>
  * 		<a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.http</a>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Vary.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Vary.java
index 0335755..f5681ba 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Vary.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Vary.java
@@ -19,13 +19,13 @@ package org.apache.juneau.http;
  * Tells downstream proxies how to match future request headers to decide whether the cached response can be used rather
  * than requesting a fresh one from the origin server.
  * 
- * <h6 class='figure'>Example</h6>
+ * <h5 class='figure'>Example</h5>
  * <p class='bcode'>
  * 	Vary: *
  * 	Vary: Accept-Language
  * </p>
  * 
- * <h6 class='topic'>RFC2616 Specification</h6>
+ * <h5 class='topic'>RFC2616 Specification</h5>
  * 
  * The Vary field value indicates the set of request-header fields that fully determines, while the response is fresh,
  * whether a cache is permitted to use the response to reply to a subsequent request without revalidation.
@@ -63,7 +63,7 @@ package org.apache.juneau.http;
  * address of the client), play a role in the selection of the response representation.
  * The "*" value MUST NOT be generated by a proxy server; it may only be generated by an origin server.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='jp'>
  * 		<a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.http</a>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Via.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Via.java
index 0f6c943..bc4bc96 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Via.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Via.java
@@ -18,7 +18,7 @@ package org.apache.juneau.http;
  * <p>
  * Informs the client of proxies through which the response was sent.
  * 
- * <h6 class='figure'>Example</h6>
+ * <h5 class='figure'>Example</h5>
  * <p class='bcode'>
  * 	Via: 1.0 fred, 1.1 example.com (Apache/1.1)
  * </p>
@@ -27,13 +27,13 @@ package org.apache.juneau.http;
  * Informs the client of proxies through which the response was sent.
  * 
  * <p>
- * <h6 class='figure'>Example</h6>
+ * <h5 class='figure'>Example</h5>
  * <p class='bcode'>
  * 	Via: 1.0 fred, 1.1 example.com (Apache/1.1)
  * </p>
  * 
  * <p>
- * <h6 class='topic'>RFC2616 Specification</h6>
+ * <h5 class='topic'>RFC2616 Specification</h5>
  * 
  * The Via general-header field MUST be used by gateways and proxies to indicate the intermediate protocols and
  * recipients between the user agent and the server on requests, and between the origin server and the client on
@@ -109,7 +109,7 @@ package org.apache.juneau.http;
  * hosts have already been replaced by pseudonyms.
  * Applications MUST NOT combine entries which have different received-protocol values.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='jp'>
  * 		<a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.http</a>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Warning.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Warning.java
index a2eeed0..9203551 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Warning.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Warning.java
@@ -18,12 +18,12 @@ package org.apache.juneau.http;
  * <p>
  * A general warning about possible problems with the entity body.
  * 
- * <h6 class='figure'>Example</h6>
+ * <h5 class='figure'>Example</h5>
  * <p class='bcode'>
  * 	Warning: 199 Miscellaneous warning
  * </p>
  * 
- * <h6 class='topic'>RFC2616 Specification</h6>
+ * <h5 class='topic'>RFC2616 Specification</h5>
  * 
  * The Warning general-header field is used to carry additional information about the status or transformation of a
  * message which might not be reflected in the message.
@@ -117,7 +117,7 @@ package org.apache.juneau.http;
  * (This prevents bad consequences of naive caching of Warning header fields.)
  * If all of the warning-values are deleted for this reason, the Warning header MUST be deleted as well.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='jp'>
  * 		<a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.http</a>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/WwwAuthenticate.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/WwwAuthenticate.java
index d336783..6729947 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/WwwAuthenticate.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/WwwAuthenticate.java
@@ -18,12 +18,12 @@ package org.apache.juneau.http;
  * <p>
  * Indicates the authentication scheme that should be used to access the requested entity.
  * 
- * <h6 class='figure'>Example</h6>
+ * <h5 class='figure'>Example</h5>
  * <p class='bcode'>
  * 	WWW-Authenticate: Basic
  * </p>
  * 
- * <h6 class='topic'>RFC2616 Specification</h6>
+ * <h5 class='topic'>RFC2616 Specification</h5>
  * 
  * The WWW-Authenticate response-header field MUST be included in 401 (Unauthorized) response messages.
  * The field value consists of at least one challenge that indicates the authentication scheme(s) and parameters
@@ -39,7 +39,7 @@ package org.apache.juneau.http;
  * than one challenge, or if more than one WWW-Authenticate header field is provided, the contents of a challenge
  * itself can contain a comma-separated list of authentication parameters.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='jp'>
  * 		<a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.http</a>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartParser.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartParser.java
index 9df3428..ce67d94 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartParser.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartParser.java
@@ -34,7 +34,7 @@ public interface HttpPartParser {
 	/**
 	 * Represent "no" part parser.
 	 * 
-	 * <li>
+	 * <p>
 	 * Used to represent the absence of a part parser in annotations.
 	 */
 	public static interface Null extends HttpPartParser {}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartSerializer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartSerializer.java
index 27577b0..93e256e 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartSerializer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartSerializer.java
@@ -51,7 +51,7 @@ public interface HttpPartSerializer {
 	/**
 	 * Represent "no" part part serializer.
 	 * 
-	 * <li>
+	 * <p>
 	 * Used to represent the absence of a part serializer in annotations.
 	 */
 	public static interface Null extends HttpPartSerializer {}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/ObjectUtils.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/ObjectUtils.java
index 19dd747..5c2bf35 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/ObjectUtils.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/ObjectUtils.java
@@ -73,42 +73,42 @@ import org.apache.juneau.transform.*;
  * 	</tr>
  * 	<tr>
  * 		<td>
- * 			{@code Collection} (e.g. {@code List}, {@code LinkedList}, {@code HashSet}, {@code ObjectList})
+ * 			<code>Collection</code> (e.g. <code>List</code>, <code>LinkedList</code>, <code>HashSet</code>, <code>ObjectList</code>)
  * 		</td>
  * 		<td>
- * 			{@code Collection<Object>}
- * 			<br>{@code Object[]}
+ * 			<code>Collection&lt;Object&gt;</code>
+ * 			<br><code>Object[]</code>
  * 		</td>
  * 		<td>
- * 			If {@code Collection} is not constructible, a {@code ObjectList} is created.
+ * 			If <code>Collection</code> is not constructible, a <code>ObjectList</code> is created.
  * 		</td>
  * 	</tr>
  * 	<tr>
  * 		<td>
- * 			{@code X[]} (array of any type X)
+ * 			<code>X[]</code> (array of any type X)
  * 		</td>
  * 		<td>
- * 			{@code List<X>}
+ * 			<code>List&lt;X&gt;</code>
  * 		</td>
  * 		<td>&nbsp;</td>
  * 	</tr>
  * 	<tr>
  * 		<td>
- * 			{@code X[][]} (multi-dimensional arrays)
+ * 			<code>X[][]</code> (multi-dimensional arrays)
  * 		</td>
  * 		<td>
- * 			{@code List<List<X>>}
- * 			<br>{@code List<X[]>}
- * 			<br>{@code List[]<X>}
+ * 			<code>List&lt;List&lt;X&gt;&gt;</code>
+ * 			<br><code>List&lt;X[]&gt;</code>
+ * 			<br><code> List[]&lt;X&gt;</code>
  * 		</td>
  * 		<td>&nbsp;</td>
  * 	</tr>
  * 	<tr>
  * 		<td>
- * 			{@code Enum}
+ * 			<code>Enum</code>
  * 		</td>
  * 		<td>
- * 			{@code String}
+ * 			<code>String</code>
  * 		</td>
  * 		<td>&nbsp;</td>
  * 	</tr>
@@ -117,13 +117,13 @@ import org.apache.juneau.transform.*;
  * 			Bean
  * 		</td>
  * 		<td>
- * 			{@code Map}
+ * 			<code>Map</code>
  * 		</td>
  * 		<td>&nbsp;</td>
  * 	</tr>
  * 	<tr>
  * 		<td>
- * 			{@code String}
+ * 			<code>String</code>
  * 		</td>
  * 		<td>
  * 			Anything
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializer.java
index 0f7c433..0f2ab34 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializer.java
@@ -61,7 +61,7 @@ import org.apache.juneau.serializer.*;
  * Typically, one of the predefined DEFAULT serializers will be sufficient.
  * However, custom serializers can be constructed to fine-tune behavior.
  * 
- * <h6 class='topic'>Behavior-specific subclasses</h6>
+ * <h5 class='topic'>Behavior-specific subclasses</h5>
  * 
  * The following direct subclasses are provided for convenience:
  * <ul class='spaced-list'>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/package.html b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/package.html
index 9826e47..d19b447 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/package.html
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/package.html
@@ -114,7 +114,7 @@
 		for a complete definition of supported POJOs.
 	</p>
 	
-	<h6 class='topic'>Prerequisites</h6>
+	<h5 class='topic'>Prerequisites</h5>
 	<p>
 		The Juneau JSON serialization and parsing support does not require any external prerequisites.  
 		It only requires Java 1.6 or above.
@@ -139,10 +139,10 @@
 			the various supported JSON formats:
 		</p>
 		
-		<h6 class='figure'>Normal JSON</h6>
+		<h5 class='figure'>Normal JSON</h5>
 		<img class='bordered' src="doc-files/Example_JSON.png">
 		
-		<h6 class='figure'>Simple JSON</h6>
+		<h5 class='figure'>Simple JSON</h5>
 		<img class='bordered' src="doc-files/Example_JSONSimple.png">
 
 		<p>
@@ -150,7 +150,7 @@
 			JSON Schema.
 		</p>
 		
-		<h6 class='figure'>JSON Schema</h6>
+		<h5 class='figure'>JSON Schema</h5>
 		<img class='bordered' src="doc-files/Example_JSONSchema.png">
 		
 		<p>
@@ -167,7 +167,7 @@
 				Anything else is converted to JSON strings.
 		</ul>
 			
-		<h6 class='topic'>Examples:</h6>
+		<h5 class='topic'>Examples:</h5>
 		<table class='styled'>
 			<tr>
 				<th>POJO type</th>
@@ -253,7 +253,7 @@
 			{@link org.apache.juneau.json.JsonSerializer#DEFAULT_LAX_READABLE} - Readable output.
 	</ul>
 	
-	<h6 class='topic'>Notes about examples</h6>
+	<h5 class='topic'>Notes about examples</h5>
 	<p>
 		The examples shown in this document will use single-quote, readable settings.
 		<br>For brevity, the examples will use public fields instead of getters/setters to reduce the size of the examples.
@@ -390,14 +390,14 @@
 			It converts bean property names to lowercase-dashed format.
 		</p>
 		
-		<h6 class='topic'>Example:</h6>
+		<h5 class='topic'>Example:</h5>
 		<p class='bcode'>	
 	<ja>@Bean</ja>(propertyNamer=PropertyNamerDLC.<jk>class</jk>)
 	<jk>public class</jk> Person {
 		...
 		</p>
 		
-		<h6 class='figure'>Results</h6>
+		<h5 class='figure'>Results</h5>
 		<p class='bcode'>
 	{
 		id: <jk>1</jk>, 
@@ -565,7 +565,7 @@
 	String jsonSchema = s.serialize(p);
 		</p>
 		
-		<h6 class='figure'>Results</h6>
+		<h5 class='figure'>Results</h5>
 		<p class='bcode'>
 	{
 		type: <js>'object'</js>, 
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/Parser.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/Parser.java
index e7a60cc..5fd5448 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/Parser.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/Parser.java
@@ -31,7 +31,7 @@ import org.apache.juneau.xml.*;
 /**
  * Parent class for all Juneau parsers.
  * 
- * <h6 class='topic'>Valid data conversions</h6>
+ * <h5 class='topic'>Valid data conversions</h5>
  * 
  * Parsers can parse any parsable POJO types, as specified in the <a class="doclink"
  * href="../../../../overview-summary.html#juneau-marshall.PojoCategories">POJO Categories</a>.
@@ -492,7 +492,7 @@ public abstract class Parser extends BeanContext {
 	 * 		<ul>
 	 * 			<li class='jc'>{@link JsonParser}
 	 * 			<li class='jc'>{@link UonParser}
-	 * 		<ul>
+	 * 		</ul>
 	 * 		It has no effect on the following parsers:
 	 * 		<ul>
 	 * 			<li class='jc'>{@link MsgPackParser} - It already doesn't use buffering.
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserGroup.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserGroup.java
index d62f9f2..39ea4b3 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserGroup.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserGroup.java
@@ -35,7 +35,7 @@ import org.apache.juneau.http.*;
  * 		Clones existing groups and all parsers within the group in a single method call.
  * </ul>
  * 
- * <h6 class='topic'>Match ordering</h6>
+ * <h5 class='topic'>Match ordering</h5>
  * 
  * Parsers are matched against <code>Content-Type</code> strings in the order they exist in this group.
  * 
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/remoteable/Body.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/remoteable/Body.java
index 85d992c..de48c92 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/remoteable/Body.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/remoteable/Body.java
@@ -68,7 +68,7 @@ import org.apache.juneau.serializer.*;
  * 	}
  * </p>
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../overview-summary.html#Remoteable.3rdParty'>Interface proxies against 3rd-party REST interfaces</a>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/remoteable/FormData.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/remoteable/FormData.java
index bcf056b..afd7cef 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/remoteable/FormData.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/remoteable/FormData.java
@@ -125,7 +125,7 @@ import org.apache.juneau.urlencoding.*;
  * 	<ja>@FormData</ja>(<js>"foo"</js>)
  * </p>
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../overview-summary.html#Remoteable.3rdParty'>Interface proxies against 3rd-party REST interfaces</a>
@@ -156,7 +156,7 @@ public @interface FormData {
 	 * 		If the data type is <code>NameValuePairs</code>, <code>Map</code>, or a bean,
 	 * 		then it's the equivalent to <js>"*"</js> which will cause the value to be serialized as name/value pairs.
 	 * 
-	 * 		<h6 class='figure'>Example:</h6>
+	 * 		<h5 class='figure'>Example:</h5>
 	 * 		<p class='bcode'>
 	 * 	<jc>// When used on a remote method parameter</jc>
 	 * 	<ja>@Remoteable</ja>(path=<js>"/myproxy"</js>)
@@ -179,7 +179,7 @@ public @interface FormData {
 	 * 	<li>
 	 * 		If used on a request bean method, uses the bean property name.
 	 * 
-	 * 		<h6 class='figure'>Example:</h6>
+	 * 		<h5 class='figure'>Example:</h5>
 	 * 		<p class='bcode'>
 	 * 	<jk>public interface</jk> MyRequestBean {
 	 * 
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/remoteable/FormDataIfNE.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/remoteable/FormDataIfNE.java
index 1894361..b45e58c 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/remoteable/FormDataIfNE.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/remoteable/FormDataIfNE.java
@@ -23,7 +23,7 @@ import org.apache.juneau.urlencoding.*;
 /**
  * Identical to {@link FormData @FormData} except skips values if they're null/blank.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../overview-summary.html#Remoteable.3rdParty'>Interface proxies against 3rd-party REST interfaces</a>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/remoteable/Header.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/remoteable/Header.java
index 57eb65d..9b8b1f7 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/remoteable/Header.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/remoteable/Header.java
@@ -109,7 +109,7 @@ import org.apache.juneau.urlencoding.*;
  * 	<ja>@Header</ja>(<js>"Foo"</js>)
  * </p>
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../overview-summary.html#Remoteable.3rdParty'>Interface proxies against 3rd-party REST interfaces</a>
@@ -140,7 +140,7 @@ public @interface Header {
 	 * 		If the data type is <code>NameValuePairs</code>, <code>Map</code>, or a bean,
 	 * 		then it's the equivalent to <js>"*"</js> which will cause the value to be serialized as name/value pairs.
 	 * 
-	 * 		<h6 class='figure'>Example:</h6>
+	 * 		<h5 class='figure'>Example:</h5>
 	 * 		<p class='bcode'>
 	 * 	<jc>// When used on a remote method parameter</jc>
 	 * 	<ja>@Remoteable</ja>(path=<js>"/myproxy"</js>)
@@ -163,7 +163,7 @@ public @interface Header {
 	 * 	<li>
 	 * 		If used on a request bean method, uses the bean property name.
 	 * 
-	 * 		<h6 class='figure'>Example:</h6>
+	 * 		<h5 class='figure'>Example:</h5>
 	 * 		<p class='bcode'>
 	 * 	<jk>public interface</jk> MyRequestBean {
 	 * 
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/remoteable/HeaderIfNE.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/remoteable/HeaderIfNE.java
index cd6cab2..6439565 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/remoteable/HeaderIfNE.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/remoteable/HeaderIfNE.java
@@ -23,7 +23,7 @@ import org.apache.juneau.urlencoding.*;
 /**
  * Identical to {@link Header @Header} except skips values if they're null/blank.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../overview-summary.html#Remoteable.3rdParty'>Interface proxies against 3rd-party REST interfaces</a>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/remoteable/Path.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/remoteable/Path.java
index 05d0792..b7c78fe 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/remoteable/Path.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/remoteable/Path.java
@@ -107,7 +107,7 @@ import org.apache.juneau.urlencoding.*;
  * 	<ja>@Path</ja>(<js>"foo"</js>)
  * </p>
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../overview-summary.html#Remoteable.3rdParty'>Interface proxies against 3rd-party REST interfaces</a>
@@ -138,7 +138,7 @@ public @interface Path {
 	 * 		If the data type is <code>NameValuePairs</code>, <code>Map</code>, or a bean,
 	 * 		then it's the equivalent to <js>"*"</js> which will cause the value to be treated as name/value pairs.
 	 * 
-	 * 		<h6 class='figure'>Example:</h6>
+	 * 		<h5 class='figure'>Example:</h5>
 	 * 		<p class='bcode'>
 	 * 	<jc>// When used on a remote method parameter</jc>
 	 * 	<ja>@Remoteable</ja>(path=<js>"/myproxy"</js>)
@@ -161,7 +161,7 @@ public @interface Path {
 	 * 	<li>
 	 * 		If used on a request bean method, uses the bean property name.
 	 * 
-	 * 		<h6 class='figure'>Example:</h6>
+	 * 		<h5 class='figure'>Example:</h5>
 	 * 		<p class='bcode'>
 	 * 	<jk>public interface</jk> MyRequestBean {
 	 * 
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/remoteable/Query.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/remoteable/Query.java
index 6aab794..24f6885 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/remoteable/Query.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/remoteable/Query.java
@@ -124,7 +124,7 @@ import org.apache.juneau.urlencoding.*;
  * 	<ja>@Query</ja>(<js>"foo"</js>)
  * </p>
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../overview-summary.html#Remoteable.3rdParty'>Interface proxies against 3rd-party REST interfaces</a>
@@ -155,7 +155,7 @@ public @interface Query {
 	 * 		If the data type is <code>NameValuePairs</code>, <code>Map</code>, or a bean,
 	 * 		then it's the equivalent to <js>"*"</js> which will cause the value to be serialized as name/value pairs.
 	 * 
-	 * 		<h6 class='figure'>Example:</h6>
+	 * 		<h5 class='figure'>Example:</h5>
 	 * 		<p class='bcode'>
 	 * 	<jc>// When used on a remote method parameter</jc>
 	 * 	<ja>@Remoteable</ja>(path=<js>"/myproxy"</js>)
@@ -178,7 +178,7 @@ public @interface Query {
 	 * 	<li>
 	 * 		If used on a request bean method, uses the bean property name.
 	 * 
-	 * 		<h6 class='figure'>Example:</h6>
+	 * 		<h5 class='figure'>Example:</h5>
 	 * 		<p class='bcode'>
 	 * 	<jk>public interface</jk> MyRequestBean {
 	 * 
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/remoteable/QueryIfNE.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/remoteable/QueryIfNE.java
index 49b022e..dc93d4e 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/remoteable/QueryIfNE.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/remoteable/QueryIfNE.java
@@ -23,7 +23,7 @@ import org.apache.juneau.urlencoding.*;
 /**
  * Identical to {@link Query @Query} except skips values if they're null/blank.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../overview-summary.html#Remoteable.3rdParty'>Interface proxies against 3rd-party REST interfaces</a>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/remoteable/RemoteMethod.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/remoteable/RemoteMethod.java
index cfa1af9..67f09a3 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/remoteable/RemoteMethod.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/remoteable/RemoteMethod.java
@@ -34,7 +34,7 @@ import java.lang.annotation.*;
  * 	<li>{@link InputStream} - Returns access to the raw input stream of the response.
  * </ul>
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../overview-summary.html#Remoteable.3rdParty'>Interface proxies against 3rd-party REST interfaces</a>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/remoteable/RemoteMethodArg.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/remoteable/RemoteMethodArg.java
index 4fb3903..175aad0 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/remoteable/RemoteMethodArg.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/remoteable/RemoteMethodArg.java
@@ -20,7 +20,7 @@ import org.apache.juneau.urlencoding.*;
 /**
  * Represents the metadata about an annotated argument of a method on a remote proxy interface.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../overview-summary.html#Remoteable.3rdParty'>Interface proxies against 3rd-party REST interfaces</a>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/remoteable/Remoteable.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/remoteable/Remoteable.java
index e314ece..83b603e 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/remoteable/Remoteable.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/remoteable/Remoteable.java
@@ -20,7 +20,7 @@ import java.lang.annotation.*;
 /**
  * Identifies a remote proxy interface against a REST interface.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../overview-summary.html#juneau-rest-server.Remoteable'>Remoteable Proxies</a>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/remoteable/RemoteableMeta.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/remoteable/RemoteableMeta.java
index c9c7b6e..3ee69d2 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/remoteable/RemoteableMeta.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/remoteable/RemoteableMeta.java
@@ -26,7 +26,7 @@ import java.util.*;
  * Captures the information in {@link Remoteable @Remoteable} and {@link RemoteMethod @RemoteMethod} annotations for
  * caching and reuse.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../overview-summary.html#Remoteable.3rdParty'>Interface proxies against 3rd-party REST interfaces</a>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/remoteable/RemoteableMethodMeta.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/remoteable/RemoteableMethodMeta.java
index d882f31..b695072 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/remoteable/RemoteableMethodMeta.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/remoteable/RemoteableMethodMeta.java
@@ -25,7 +25,7 @@ import java.util.*;
  * <p>
  * Captures the information in {@link RemoteMethod @RemoteMethod} annotations for caching and reuse.
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../overview-summary.html#Remoteable.3rdParty'>Interface proxies against 3rd-party REST interfaces</a>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/remoteable/RequestBean.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/remoteable/RequestBean.java
index 0ff5905..d464b7d 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/remoteable/RequestBean.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/remoteable/RequestBean.java
@@ -81,7 +81,7 @@ import org.apache.juneau.urlencoding.*;
  * 	}
  * </p>
  * 
- * <h6 class='topic'>Additional Information</h6>
+ * <h5 class='section'>See Also:</h5>
  * <ul class='doctree'>
  * 	<li class='link'>
  * 		<a class='doclink' href='../../../../overview-summary.html#Remoteable.3rdParty'>Interface proxies against 3rd-party REST interfaces</a>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/Serializer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/Serializer.java
index d54dc55..46a4676 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/Serializer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/Serializer.java
@@ -127,7 +127,7 @@ public abstract class Serializer extends BeanContext {
 	 * 
 	 * <p>
 	 * This is used to recreate the correct objects during parsing if the object types cannot be inferred.
-	 * <br>For example, when serializing a {@code Map<String,Object>} field where the bean class cannot be determined from
+	 * <br>For example, when serializing a <code>Map&lt;String,Object&gt;</code> field where the bean class cannot be determined from
 	 * the type of the values.
 	 * 
 	 * <p>
@@ -155,7 +155,7 @@ public abstract class Serializer extends BeanContext {
 	 * 	<ja>@Bean</ja>(typeName=<js>"mybean"</js>)
 	 * 	<jk>public class</jk> MyBean {...}
 	 * 
-	 * 	Map&ltString,Object&gt; m = new HashMap&lt;&gt;();
+	 * 	Map&lt;String,Object&gt; m = new HashMap&lt;&gt;();
 	 * 	m.put(<js>"foo"</js>, <jk>new</jk> MyBean());
 	 * 
 	 * 	<jc>// Will not contain '_type' attribute even though type name is on bean and we're serializing</jc>
@@ -840,7 +840,7 @@ public abstract class Serializer extends BeanContext {
 	 * 		- Relative URIs should be considered relative to the request URI.
 	 * </ul>
 	 * 
-	 * <h6 class='figure'>Example:</h6>
+	 * <h5 class='figure'>Example:</h5>
 	 * <p class='bcode'>
 	 * 	<jc>// Define a serializer that converts resource-relative URIs to absolute form.</jc>
 	 * 	WriterSerializer s = JsonSerializer
@@ -894,7 +894,7 @@ public abstract class Serializer extends BeanContext {
 	 * 		- Don't do any URL resolution.
 	 * </ul>
 	 * 
-	 * <h6 class='figure'>Example:</h6>
+	 * <h5 class='figure'>Example:</h5>
 	 * <p class='bcode'>
 	 * 	<jc>// Define a serializer that converts resource-relative URIs to absolute form.</jc>
 	 * 	WriterSerializer s = JsonSerializer
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerGroup.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerGroup.java
index fc67368..77ebab7 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerGroup.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerGroup.java
@@ -33,7 +33,7 @@ import org.apache.juneau.http.*;
  * 		Clones existing groups and all serializers within the group in a single method call.
  * </ul>
  * 
- * <h6 class='topic'>Match ordering</h6>
+ * <h5 class='topic'>Match ordering</h5>
  * 
  * Serializers are matched against <code>Accept</code> strings in the order they exist in this group.
  * 
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transform/BeanFilterBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transform/BeanFilterBuilder.java
index 821e81d..70eca51 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transform/BeanFilterBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transform/BeanFilterBuilder.java
@@ -51,8 +51,8 @@ import org.apache.juneau.annotation.*;
  * 
  * <h5 class='section'>See Also:</h5>
  * <ul>
- *.	<li class='link'><a class="doclink" href="../../../../overview-summary.html#juneau-marshall.BeanFilters">Overview &gt; BeanFilters</a>
- *.</ul>
+ * 	<li class='link'><a class="doclink" href="../../../../overview-summary.html#juneau-marshall.BeanFilters">Overview &gt; BeanFilters</a>
+ * </ul>
  * 
  * @param <T> The bean type that this filter applies to. 
  */
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transform/PojoSwap.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transform/PojoSwap.java
index e405c48..c411680 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transform/PojoSwap.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transform/PojoSwap.java
@@ -61,7 +61,7 @@ import org.apache.juneau.serializer.*;
  * <br>{@link Parser Parsers} use swaps to convert objects of type S into objects of type T, and on calls to
  * {@link BeanMap#put(String,Object)}.
  * 
- * <h6 class='topic'>Swap Class Type {@code <S>}</h6>
+ * <h5 class='topic'>Swap Class Type {@code <S>}</h5>
  * 
  * <p>
  * The swapped object representation of an object must be an object type that the serializers can natively convert to
@@ -84,7 +84,7 @@ import org.apache.juneau.serializer.*;
  * 		An array of anything on this list.
  * </ul>
  * 
- * <h6 class='topic'>Normal Class Type {@code <T>}</h6>
+ * <h5 class='topic'>Normal Class Type {@code <T>}</h5>
  * 
  * <p>
  * The normal object representation of an object.
@@ -148,7 +148,7 @@ public abstract class PojoSwap<T,S> {
 	 * <p>
 	 * This method is the programmatic equivalent to the {@link Swap#mediaTypes() @Swap.mediaTypes()} annotation.
 	 * 
-	 * <h6 class='topic'>Documentation</h6>
+	 * <h5 class='topic'>Documentation</h5>
 	 * <ul>
 	 * 	<li><a class="doclink" href="../../../../overview-summary.html#juneau-marshall.PerMediaTypePojoSwaps">Overview &gt; Per-media-type PojoSwaps</a>
 	 * </ul>
@@ -184,7 +184,7 @@ public abstract class PojoSwap<T,S> {
 	/**
 	 * Sets the media types that this swap is associated with.
 	 * 
-	 * <h6 class='topic'>Documentation</h6>
+	 * <h5 class='topic'>Documentation</h5>
 	 * <ul>
 	 * 	<li><a class="doclink" href="../../../../overview-summary.html#juneau-marshall.PerMediaTypePojoSwaps">Overview &gt; Per-media-type PojoSwaps</a>
 	 * </ul>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transform/PropertyFilter.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transform/PropertyFilter.java
index 722f4e4..829d8d2 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transform/PropertyFilter.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transform/PropertyFilter.java
@@ -36,7 +36,7 @@ package org.apache.juneau.transform;
  * 		<ja>@Override</ja>
  * 		<jk>public</jk> Object writeProperty(Object bean, String name, Object value) {
  * 			AddressBook a = (Address)bean;
- * 			<jk>if</jk> (<js>"taxInfo"</js>.equals(name) && <js>"redacted"</js>.equals(value))
+ * 			<jk>if</jk> (<js>"taxInfo"</js>.equals(name) &amp;&amp; <js>"redacted"</js>.equals(value))
  * 				<jk>return</jk> TaxInfoUtils.<jsm>lookup</jsm>(a.getStreet(), a.getCity(), a.getState());
  * 			<jk>return</jk> value;
  * 		}
@@ -123,7 +123,7 @@ public class PropertyFilter {
 	 * 
 	 * 		<jk>public</jk> Object writeProperty(Object bean, String name, Object value) {
 	 * 			AddressBook a = (Address)bean;
-	 * 			<jk>if</jk> (<js>"taxInfo"</js>.equals(name) && <js>"redacted"</js>.equals(value))
+	 * 			<jk>if</jk> (<js>"taxInfo"</js>.equals(name) &amp;&amp; <js>"redacted"</js>.equals(value))
 	 * 				<jk>return</jk> TaxInfoUtils.<jsm>lookup</jsm>(a.getStreet(), a.getCity(), a.getState());
 	 * 			<jk>return</jk> value;
 	 * 		}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transforms/CalendarSwap.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transforms/CalendarSwap.java
index d7bdbd4..2ae1aca 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transforms/CalendarSwap.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transforms/CalendarSwap.java
@@ -25,7 +25,7 @@ import org.apache.juneau.utils.*;
 /**
  * Transforms {@link Calendar Calendars} to {@link String Strings}.
  * 
- * <h6 class='topic'>Behavior-specific subclasses</h6>
+ * <h5 class='topic'>Behavior-specific subclasses</h5>
  * 
  * The following direct subclasses are provided for convenience to the following formats:
  * <ul>
@@ -86,7 +86,7 @@ public class CalendarSwap extends StringSwap<Calendar> {
 	 * 	<li><js>"2001-07-04T15:30:45Z"</js>
 	 * </ul>
 	 * 
-	 * <h6 class='topic'>Example input:</h6>
+	 * <h5 class='topic'>Example input:</h5>
 	 * <ul>
 	 * 	<li><js>"2001-07-04T15:30:45-05:00"</js>
 	 * 	<li><js>"2001-07-04T15:30:45Z"</js>
@@ -118,7 +118,7 @@ public class CalendarSwap extends StringSwap<Calendar> {
 	 * 	<li><js>"2001-07-04T15:30:45"</js>
 	 * </ul>
 	 * 
-	 * <h6 class='topic'>Example input:</h6>
+	 * <h5 class='topic'>Example input:</h5>
 	 * <ul>
 	 * 	<li><js>"2001-07-04T15:30:45"</js>
 	 * 	<li><js>"2001-07-04T15:30:45.1"</js>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transforms/DateSwap.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transforms/DateSwap.java
index c850974..bc021e9 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transforms/DateSwap.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transforms/DateSwap.java
@@ -25,7 +25,7 @@ import org.apache.juneau.utils.*;
 /**
  * Transforms {@link Date Dates} to {@link String Strings}.
  * 
- * <h6 class='topic'>Behavior-specific subclasses</h6>
+ * <h5 class='topic'>Behavior-specific subclasses</h5>
  * 
  * The following direct subclasses are provided for convenience to the following formats:
  * <ul>
@@ -86,7 +86,7 @@ public class DateSwap extends StringSwap<Date> {
 	 * 	<li><js>"2001-07-04T15:30:45Z"</js>
 	 * </ul>
 	 * 
-	 * <h6 class='topic'>Example input:</h6>
+	 * <h5 class='topic'>Example input:</h5>
 	 * <ul>
 	 * 	<li><js>"2001-07-04T15:30:45-05:00"</js>
 	 * 	<li><js>"2001-07-04T15:30:45Z"</js>
@@ -118,7 +118,7 @@ public class DateSwap extends StringSwap<Date> {
 	 * 	<li><js>"2001-07-04T15:30:45"</js>
 	 * </ul>
 	 * 
-	 * <h6 class='topic'>Example input:</h6>
+	 * <h5 class='topic'>Example input:</h5>
 	 * <ul>
 	 * 	<li><js>"2001-07-04T15:30:45"</js>
 	 * 	<li><js>"2001-07-04T15:30:45.1"</js>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transforms/ReaderSwap.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transforms/ReaderSwap.java
index 39e9d7c..7dd11da 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transforms/ReaderSwap.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transforms/ReaderSwap.java
@@ -39,7 +39,7 @@ import org.apache.juneau.xml.*;
  * <p>
  * This is a one-way transform, since {@code Readers} cannot be reconstituted.
  * 
- * <h6 class='topic'>Behavior-specific subclasses</h6>
+ * <h5 class='topic'>Behavior-specific subclasses</h5>
  * 
  * The following direct subclasses are provided for convenience:
  * <ul>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/package.html b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/package.html
index 6785c5f..2d29434 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/package.html
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/package.html
@@ -120,7 +120,7 @@
 		for a complete definition of supported POJOs.
 	</p>
 	
-	<h6 class='topic'>Prerequisites</h6>
+	<h5 class='topic'>Prerequisites</h5>
 	<p>
 		The Juneau URL-encoding serialization and parsing support does not require any external prerequisites.  
 		It only requires Java 1.6 or above.
@@ -222,7 +222,7 @@
 			Top-level beans and maps can serialized as key/value pairs as shown below:
 		</p>
 		
-		<h6 class='figure'>Example:  A bean with 2 string properties, 'foo' and 'baz', serialized to a query string</h6>
+		<h5 class='figure'>Example:  A bean with 2 string properties, 'foo' and 'baz', serialized to a query string</h5>
 		<p class='bcode'>	
 	http://localhost/sample?<ua>foo</ua>=<us>bar</us>&amp;<ua>baz</ua>=<us>bing</us>
 		</p>
@@ -232,12 +232,12 @@
 			of <js>"&amp;"</js>.
 		</p>
 		
-		<h6 class='figure'>Example:  A bean serialized as a query parameter value.</h6>
+		<h5 class='figure'>Example:  A bean serialized as a query parameter value.</h5>
 		<p class='bcode'>	
 	http://localhost/sample?<ua>a1</ua>=(<ua>foo</ua>=<us>bar</us>,<ua>baz</ua>=<us>bing</us>)
 		</p>
 		
-		<h6 class='figure'>General methodology:</h6>
+		<h5 class='figure'>General methodology:</h5>
 		<table class='styled' style='border-collapse: collapse;'>
 			<tr><th>Java type</th><th>JSON equivalent</th><th>UON</th></tr>
 			<tr>
@@ -305,7 +305,7 @@
 			<li>On bean properties through the <code><ja>@BeanProperty</ja></code> annotations.
 		</ul>
 		
-		<h6 class='figure'>Example:  A serialized Calendar object using <code>CalendarSwap.RFC2822DTZ</code> transform.</h6>
+		<h5 class='figure'>Example:  A serialized Calendar object using <code>CalendarSwap.RFC2822DTZ</code> transform.</h5>
 		<p class='bcode'>	
 	http://localhost/sample?<ua>a1=<us>'Sun,+03+Mar+1901+09:05:06+GMT'</us>
 		</p>
@@ -363,7 +363,7 @@
 			Use the readable serializer for debugging purposes.
 	</ul>
 
-	<h6 class='topic'>Notes about examples</h6>
+	<h5 class='topic'>Notes about examples</h5>
 	<p>
 		The examples shown in this document will use default strict settings.
 		<br>For brevity, the examples will use public fields instead of getters/setters to reduce the size of the 
@@ -510,14 +510,14 @@
 			It converts bean property names to lowercase-dashed format.
 		</p>
 		
-		<h6 class='figure'>Example:</h6>
+		<h5 class='figure'>Example:</h5>
 		<p class='bcode'>	
 	<ja>@Bean</ja>(propertyNamer=PropertyNamerDLC.<jk>class</jk>)
 	<jk>public class</jk> Person {
 		...
 		</p>
 		
-		<h6 class='figure'>Results</h6>
+		<h5 class='figure'>Results</h5>
 		<p class='bcode'>
 	(<ua>id</ua>=<un>1</us>,<ua>name</ua>=<us>'John+Smith'</us>,<ua>uri</ua>=<us>http://sample/addressBook/person/1</us>,
 	<ua>address-book-uri</ua>=<us>http://sample/addressBook</us>,<ua>birth-date</ua>=<us>1946-08-12T00:00:00Z</us>)
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingParser.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingParser.java
index ee8542e..88cd2ca 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingParser.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingParser.java
@@ -43,7 +43,7 @@ public class UrlEncodingParser extends UonParser {
 	private static final String PREFIX = "UrlEncodingParser.";
 
 	/**
-	 * Configuration property:  Parser bean property collections/arrays as separate key/value pairs
+	 * Configuration property:  Parser bean property collections/arrays as separate key/value pairs.
 	 * 
 	 * <h5 class='section'>Property:</h5>
 	 * <ul>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/package.html b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/package.html
index 8a5fc73..b554b23 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/package.html
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/package.html
@@ -119,7 +119,7 @@
 		for a complete definition of supported POJOs.
 	</p>
 	
-	<h6 class='topic'>Prerequisites</h6>
+	<h5 class='topic'>Prerequisites</h5>
 	<p>
 		The Juneau URL-encoding serialization and parsing support does not require any external prerequisites.  
 		It only requires Java 1.6 or above.
@@ -221,7 +221,7 @@
 			Top-level beans and maps can serialized as key/value pairs as shown below:
 		</p>
 		
-		<h6 class='figure'>Example:  A bean with 2 string properties, 'foo' and 'baz', serialized to a query string</h6>
+		<h5 class='figure'>Example:  A bean with 2 string properties, 'foo' and 'baz', serialized to a query string</h5>
 		<p class='bcode'>	
 	http://localhost/sample?<ua>foo</ua>=<us>bar</us>&amp;<ua>baz</ua>=<us>bing</us>
 		</p>
@@ -231,12 +231,12 @@
 			instead of <js>"&amp;"</js>.
 		</p>
 		
-		<h6 class='figure'>Example:  A bean serialized as a query parameter value.</h6>
+		<h5 class='figure'>Example:  A bean serialized as a query parameter value.</h5>
 		<p class='bcode'>	
 	http://localhost/sample?<ua>a1</ua>=(<ua>foo</ua>=<us>bar</us>,<ua>baz</ua>=<us>bing</us>)
 		</p>
 		
-		<h6 class='figure'>General methodology:</h6>
+		<h5 class='figure'>General methodology:</h5>
 		<table class='styled' style='border-collapse: collapse;'>
 			<tr><th>Java type</th><th>JSON equivalent</th><th>UON</th></tr>
 			<tr>
@@ -304,7 +304,7 @@
 			<li>On bean properties through the <code><ja>@BeanProperty</ja></code> annotations.
 		</ul>
 		
-		<h6 class='figure'>Example:  A serialized Calendar object using <code>CalendarSwap.RFC2822DTZ</code> transform.</h6>
+		<h5 class='figure'>Example:  A serialized Calendar object using <code>CalendarSwap.RFC2822DTZ</code> transform.</h5>
 		<p class='bcode'>	
 	http://localhost/sample?<ua>a1=<us>'Sun,+03+Mar+1901+09:05:06+GMT'</us>
 		</p>
@@ -364,7 +364,7 @@
 			Use the readable serializer for debugging purposes.
 	</ul>
 
-	<h6 class='topic'>Notes about examples</h6>
+	<h5 class='topic'>Notes about examples</h5>
 	<p>
 		The examples shown in this document will use default strict settings.
 		<br>For brevity, the examples will use public fields instead of getters/setters to reduce the size of the examples.
@@ -511,14 +511,14 @@
 			It converts bean property names to lowercase-dashed format.
 		</p>
 		
-		<h6 class='figure'>Example:</h6>
+		<h5 class='figure'>Example:</h5>
 		<p class='bcode'>	
 	<ja>@Bean</ja>(propertyNamer=PropertyNamerDLC.<jk>class</jk>)
 	<jk>public class</jk> Person {
 		...
 		</p>
 		
-		<h6 class='figure'>Results</h6>
+		<h5 class='figure'>Results</h5>
 		<p class='bcode'>
 	(<ua>id</ua>=<un>1</us>,<ua>name</ua>=<us>'John+Smith'</us>,<ua>uri</ua>=<us>http://sample/addressBook/person/1</us>,
 		<ua>address-book-uri</ua>=<us>http://sample/addressBook</us>,<ua>birth-date</ua>=<us>1946-08-12T00:00:00Z</us>)
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/Args.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/Args.java
index fdeca7f..6c85e06 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/Args.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/Args.java
@@ -33,7 +33,7 @@ import org.apache.juneau.internal.*;
  * <p>
  * The format of an optional argument is <js>"-argName [zero or more tokens]"</js>.
  * 
- * <h6 class='topic'>Command-line examples</h6>
+ * <h5 class='topic'>Command-line examples</h5>
  * <ul>
  * 	<li><code>java com.sample.MyClass mainArg1</code>
  * 	<li><code>java com.sample.MyClass mainArg1 mainArg2</code>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/CalendarUtils.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/CalendarUtils.java
index b6a2079..a6de8a9 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/CalendarUtils.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/CalendarUtils.java
@@ -42,7 +42,7 @@ public class CalendarUtils {
 		 * 	<li><js>"2001-07-04T15:30:45"</js>
 		 * </ul>
 		 * 
-		 * <h6 class='topic'>Example input:</h6>
+		 * <h5 class='topic'>Example input:</h5>
 		 * <ul>
 		 * 	<li><js>"2001-07-04T15:30:45"</js>
 		 * 	<li><js>"2001-07-04T15:30:45.1"</js>
@@ -63,7 +63,7 @@ public class CalendarUtils {
 		 * 	<li><js>"2001-07-04T15:30:45Z"</js>
 		 * </ul>
 		 * 
-		 * <h6 class='topic'>Example input:</h6>
+		 * <h5 class='topic'>Example input:</h5>
 		 * <ul>
 		 * 	<li><js>"2001-07-04T15:30:45-05:00"</js>
 		 * 	<li><js>"2001-07-04T15:30:45Z"</js>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/PojoQuery.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/PojoQuery.java
index 9f3f57b..cb29449 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/PojoQuery.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/PojoQuery.java
@@ -90,7 +90,7 @@ import org.apache.juneau.internal.*;
  * If the objects being searched are not strings, then the patterns are matched against whatever is return by the
  * {@code Object#toString()} method.
  * 
- * <h6 class='topic'>Example string query patterns:</h6>
+ * <h5 class='topic'>Example string query patterns:</h5>
  * <ul>
  * 	<li><tt>foo</tt> - The string 'foo'
  * 	<li><tt>foo bar</tt> - The string 'foo' or the string 'bar'
@@ -114,7 +114,7 @@ import org.apache.juneau.internal.*;
  * 
  * Any object of type {@link Number} (or numeric primitives) can be searched using numeric patterns.
  * 
- * <h6 class='topic'>Example numeric query patterns:</h6>
+ * <h5 class='topic'>Example numeric query patterns:</h5>
  * <ul>
  * 	<li><tt>123</tt> - The single number 123
  * 	<li><tt>1 2 3</tt>	- 1, 2, or 3
@@ -151,7 +151,7 @@ import org.apache.juneau.internal.*;
  * 	<li><tt>yyyy</tt>
  * </ul>
  * 
- * <h6 class='topic'>Example date query patterns:</h6>
+ * <h5 class='topic'>Example date query patterns:</h5>
  * <ul>
  * 	<li><tt>2001</tt> - A specific year.
  * 	<li><tt>2001.01.01.10.50</tt> - A specific time.
@@ -172,7 +172,7 @@ import org.apache.juneau.internal.*;
  * The view capability allows you to return only the specified subset of columns in the specified order.
  * <br>The view parameter is a list of either <tt>Strings</tt> or <tt>Maps</tt>.
  * 
- * <h6 class='topic'>Example view parameters:</h6>
+ * <h5 class='topic'>Example view parameters:</h5>
  * <ul>
  * 	<li><tt>column1</tt> - Return only column 'column1'.
  * 	<li><tt>column2, column1</tt> - Return only columns 'column2' and 'column1' in that order.
@@ -184,7 +184,7 @@ import org.apache.juneau.internal.*;
  * <br>The sort parameter is a list of strings with an optional <js>'+'</js> or <js>'-'</js> suffix representing
  * ascending and descending order accordingly.
  * 
- * <h6 class='topic'>Example sort parameters:</h6>
+ * <h5 class='topic'>Example sort parameters:</h5>
  * <ul>
  * 	<li><tt>column1</tt> - Sort rows by column 'column1' ascending.
  * 	<li><tt>column1+</tt> - Sort rows by column 'column1' ascending.
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/PojoRest.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/PojoRest.java
index e00a394..4355fff 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/PojoRest.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/PojoRest.java
@@ -332,7 +332,7 @@ public final class PojoRest {
 	 * 
 	 * @param url
 	 * 	The URL of the element to retrieve.
-	 * 	If <jk>null</jk? or blank, returns the root.
+	 * 	If <jk>null</jk> or blank, returns the root.
 	 * @param def The default value if addressed item does not exist.
 	 * @param type The specified object type.
 	 * @param args The specified object parameter types.
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializer.java
index ab867bd..6751407 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializer.java
@@ -100,7 +100,7 @@ import org.apache.juneau.serializer.*;
  * If an attribute name contains any non-valid XML element characters, they will be escaped using standard
  * {@code _x####_} notation.
  * 
- * <h6 class='topic'>Behavior-specific subclasses</h6>
+ * <h5 class='topic'>Behavior-specific subclasses</h5>
  * 
  * The following direct subclasses are provided for convenience:
  * <ul>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/package.html b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/package.html
index 60244c4..e06781b 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/package.html
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/package.html
@@ -136,7 +136,7 @@
 		namespaces and fine-tuning the format of the XML produced.
 	</p>
 	
-	<h6 class='topic'>Prerequisites</h6>
+	<h5 class='topic'>Prerequisites</h5>
 	<p>
 		The Juneau XML serialization and parsing support does not require any external prerequisites.  
 		It only requires Java 1.6 or above.
@@ -161,10 +161,10 @@
 			in the various supported XML formats:
 		</p>
 		
-		<h6 class='figure'>Normal XML</h6>
+		<h5 class='figure'>Normal XML</h5>
 		<img class='bordered' src="doc-files/Example_XML.png">
 		
-		<h6 class='figure'>Simplified XML</h6>
+		<h5 class='figure'>Simplified XML</h5>
 		<img class='bordered' src="doc-files/Example_XMLSimple.png">
 
 		<p>
@@ -172,7 +172,7 @@
 			XML Schema, with support for multiple namespaces.
 		</p>
 		
-		<h6 class='figure'>XML Schema</h6>
+		<h5 class='figure'>XML Schema</h5>
 		<img class='bordered' src="doc-files/Example_XMLSchema.png">
 	</div>
 </div>
@@ -226,7 +226,7 @@
 		Refer to the package-level Javadocs for more information about those formats.
 	</p>
 	
-	<h6 class='topic'>Notes about examples</h6>
+	<h5 class='topic'>Notes about examples</h5>
 	<p>
 		The examples shown in this document will use single-quote, readable settings.
 		<br>For brevity, the examples will use public fields instead of getters/setters to reduce the size of the examples.
@@ -314,7 +314,7 @@
 			They mirror how the data structures are represented in JSON.
 		</p>
 		
-		<h6 class='topic'>Simple types</h6>
+		<h5 class='topic'>Simple types</h5>
 		<p>
 			The representation of loose (not a direct bean property value) simple types are shown below:
 		</p>
@@ -351,7 +351,7 @@
 			</tr>
 		</table>
 		
-		<h6 class='topic'>Maps</h6>
+		<h5 class='topic'>Maps</h5>
 		<p>
 			Loose maps and beans use the element <xt>&lt;object&gt;</xt> for encapsulation.
 		</p>
@@ -426,7 +426,7 @@
 			</tr>
 		</table>
 		
-		<h6 class='topic'>Arrays</h6>
+		<h5 class='topic'>Arrays</h5>
 		<p>
 			Loose collections and arrays use the element <xt>&lt;array&gt;</xt> for encapsulation.
 		</p>
@@ -606,7 +606,7 @@
 			</tr>
 		</table>
 
-		<h6 class='topic'>Beans</h6>
+		<h5 class='topic'>Beans</h5>
 		<table class='styled' style='width:auto'>
 			<tr>
 				<th>Data type</th>
@@ -661,7 +661,7 @@
 			</tr>
 		</table>
 		
-		<h6 class='topic'>Beans with Map properties</h6>
+		<h5 class='topic'>Beans with Map properties</h5>
 		<table class='styled' style='width:auto'>
 			<tr>
 				<th>Data type</th>
@@ -739,7 +739,7 @@
 					cannot automatically be inferred through reflection.
 			</ol>
 			
-			<h6 class='figure'>Example</h6>
+			<h5 class='figure'>Example</h5>
 			<table class='styled' style='width:auto'>
 				<tr>
 					<th>Data type</th>
@@ -784,7 +784,7 @@
 				'b' is of type <code>Object</code> and therefore the bean class cannot be inferred.
 			</p>
 			
-			<h6 class='figure'>Example</h6>
+			<h5 class='figure'>Example</h5>
 			<table class='styled' style='width:auto'>
 				<tr>
 					<th>Java</th>
@@ -846,7 +846,7 @@
 				Pay special attention to when <xa>_type</xa> attributes are and are not used.
 			</p>
 			
-			<h6 class='figure'>Examples</h6>
+			<h5 class='figure'>Examples</h5>
 			<table class='styled' style='width:auto'>
 				<tr>
 					<th>Java</th>
@@ -1217,7 +1217,7 @@
 				specify the name of XML child elements for bean properties of type collection or array.
 			</p>
 			
-			<h6 class='figure'>Example</h6>
+			<h5 class='figure'>Example</h5>
 			<table class='styled' style='width:auto'>
 				<tr>
 					<th>Data type</th>
@@ -1314,7 +1314,7 @@
 				<br>Note that this only supports properties of simple types (e.g. strings, numbers, booleans).
 			</p>
 			
-			<h6 class='figure'>Example</h6>
+			<h5 class='figure'>Example</h5>
 			<table class='styled' style='width:auto'>
 				<tr>
 					<th>Data type</th>
@@ -1349,7 +1349,7 @@
 				force all bean properties to be serialized as XML attributes instead of child elements.
 			</p>
 			
-			<h6 class='figure'>Example</h6>
+			<h5 class='figure'>Example</h5>
 			<table class='styled' style='width:auto'>
 				<tr>
 					<th>Data type</th>
@@ -1388,7 +1388,7 @@
 				class.
 			</p>
 			
-			<h6 class='figure'>Example</h6>
+			<h5 class='figure'>Example</h5>
 			<table class='styled' style='width:auto'>
 				<tr>
 					<th>Data type</th>
@@ -1432,7 +1432,7 @@
 				properties, but there must not be an overlap in bean property names and map keys. 
 			</p>
 			
-			<h6 class='figure'>Example</h6>
+			<h5 class='figure'>Example</h5>
 			<table class='styled' style='width:auto'>
 				<tr>
 					<th>Data type</th>
@@ -2262,7 +2262,7 @@
 			It converts bean property names to lowercase-dashed format.
 		</p>
 		
-		<h6 class='figure'>Example</h6>
+		<h5 class='figure'>Example</h5>
 		<p class='bcode'>	
 	<ja>@Xml</ja>(prefix=<js>"per"</js>)
 	<ja>@Bean</ja>(typeName=<js>"person"</js>,propertyNamer=PropertyNamerDLC.<jk>class</jk>)
@@ -2270,7 +2270,7 @@
 		...
 		</p>
 		
-		<h6 class='figure'>Results</h6>
+		<h5 class='figure'>Results</h5>
 		<p class='bcode'>
 	<xt>&lt;per:person</xt> 
 			<xa>xmlns</xa>=<xs>'http://www.apache.org/2013/Juneau'</xs> 
@@ -2466,7 +2466,7 @@
 	String xmlSchema = ss.serialize(p);
 		</p>
 		
-		<h6 class='figure'>XML results</h6>
+		<h5 class='figure'>XML results</h5>
 		<p class='bcode'>
 	<xt>&lt;person</xt> 
 			<xa>xmlns</xa>=<xs>'http://www.apache.org/2013/Juneau'</xs> 
@@ -2489,7 +2489,7 @@
 	<xt>&lt;/person&gt;</xt>				
 		</p>
 		
-		<h6 class='figure'>XML-Schema results</h6>
+		<h5 class='figure'>XML-Schema results</h5>
 		<p class='bcode'>
 	<xt>&lt;schema</xt> 
 			<xa>xmlns</xa>=<xs>'http://www.w3.org/2001/XMLSchema'</xs> 
@@ -2554,7 +2554,7 @@
 	}
 		</p>
 		
-		<h6 class='figure'>XML results</h6>
+		<h5 class='figure'>XML results</h5>
 		<p class='bcode'>
 	<xt>&lt;per:person</xt> 
 			<xa>xmlns</xa>=<xs>'http://www.apache.org/2013/Juneau'</xs> 
@@ -2583,7 +2583,7 @@
 			The schema consists of 4 documents separated by a <js>'\u0000'</js> character.
 		</p>
 		
-		<h6 class='figure'>XML-Schema results</h6>
+		<h5 class='figure'>XML-Schema results</h5>
 		<p class='bcode'>
 	<xt>&lt;schema</xt> 
 			<xa>xmlns</xa>=<xs>'http://www.w3.org/2001/XMLSchema'</xs> 
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/yaml/proto/package.html b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/yaml/proto/package.html
index a9c0b56..03ef0ed 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/yaml/proto/package.html
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/yaml/proto/package.html
@@ -114,7 +114,7 @@
 		for a complete definition of supported POJOs.
 	</p>
 	
-	<h6 class='topic'>Prerequisites</h6>
+	<h5 class='topic'>Prerequisites</h5>
 	<p>
 		The Juneau JSON serialization and parsing support does not require any external prerequisites.  
 		It only requires Java 1.6 or above.
@@ -139,10 +139,10 @@
 			the various supported JSON formats:
 		</p>
 		
-		<h6 class='figure'>Normal JSON</h6>
+		<h5 class='figure'>Normal JSON</h5>
 		<img class='bordered' src="doc-files/Example_JSON.png">
 		
-		<h6 class='figure'>Simple JSON</h6>
+		<h5 class='figure'>Simple JSON</h5>
 		<img class='bordered' src="doc-files/Example_JSONSimple.png">
 
 		<p>
@@ -150,7 +150,7 @@
 			JSON Schema.
 		</p>
 		
-		<h6 class='figure'>JSON Schema</h6>
+		<h5 class='figure'>JSON Schema</h5>
 		<img class='bordered' src="doc-files/Example_JSONSchema.png">
 		
 		<p>
@@ -167,7 +167,7 @@
 				Anything else is converted to JSON strings.
 		</ul>
 			
-		<h6 class='topic'>Examples:</h6>
+		<h5 class='topic'>Examples:</h5>
 		<table class='styled'>
 			<tr>
 				<th>POJO type</th>
@@ -253,7 +253,7 @@
 			{@link org.apache.juneau.json.JsonSerializer#DEFAULT_LAX_READABLE} - Readable output.
 	</ul>
 	
-	<h6 class='topic'>Notes about examples</h6>
+	<h5 class='topic'>Notes about examples</h5>
 	<p>
 		The examples shown in this document will use single-quote, readable settings.
 		<br>For brevity, the examples will use public fields instead of getters/setters to reduce the size of the examples.
@@ -390,14 +390,14 @@
 			It converts bean property names to lowercase-dashed format.
 		</p>
 		
-		<h6 class='topic'>Example:</h6>
+		<h5 class='topic'>Example:</h5>
 		<p class='bcode'>	
 	<ja>@Bean</ja>(propertyNamer=PropertyNamerDLC.<jk>class</jk>)
 	<jk>public class</jk> Person {
 		...
 		</p>
 		
-		<h6 class='figure'>Results</h6>
+		<h5 class='figure'>Results</h5>
 		<p class='bcode'>
 	{
 		id: <jk>1</jk>, 
@@ -565,7 +565,7 @@
 	String jsonSchema = s.serialize(p);
 		</p>
 		
-		<h6 class='figure'>Results</h6>
+		<h5 class='figure'>Results</h5>
 		<p class='bcode'>
 	{
 		type: <js>'object'</js>, 
diff --git a/juneau-core/juneau-svl/src/main/java/org/apache/juneau/svl/Var.java b/juneau-core/juneau-svl/src/main/java/org/apache/juneau/svl/Var.java
index bca200d..5d76c85 100644
--- a/juneau-core/juneau-svl/src/main/java/org/apache/juneau/svl/Var.java
+++ b/juneau-core/juneau-svl/src/main/java/org/apache/juneau/svl/Var.java
@@ -113,7 +113,7 @@ public abstract class Var {
 	 * The default implementation of this method always returns <jk>true</jk>.  
 	 * Subclasses can override this method to override the default behavior.
 	 * 
-	 * <h6 class='topic'>Important Note</h6>
+	 * <h5 class='topic'>Important Note</h5>
 	 * <p>
 	 * As a general rule, variables that resolve user-entered data should not be recursively resolved as this may 
 	 * cause a security hole.
diff --git a/juneau-core/juneau-svl/src/main/java/org/apache/juneau/svl/VarResolver.java b/juneau-core/juneau-svl/src/main/java/org/apache/juneau/svl/VarResolver.java
index 204ce90..1a9976a 100644
--- a/juneau-core/juneau-svl/src/main/java/org/apache/juneau/svl/VarResolver.java
+++ b/juneau-core/juneau-svl/src/main/java/org/apache/juneau/svl/VarResolver.java
@@ -53,7 +53,7 @@ import org.apache.juneau.svl.vars.*;
  * 	System.<jsf>out</jsf>.println(r.resolve(<js>"java.home is set to $S{java.home}"</js>));
  * </p>
  * 
- * <h6 class='topic'>Context objects</h6>
+ * <h5 class='topic'>Context objects</h5>
  * 
  * Var resolvers can have zero or more context objects associated with them.
  * 
@@ -65,7 +65,7 @@ import org.apache.juneau.svl.vars.*;
  * Context objects can be retrieved by {@link Var} classes through the
  * {@link VarResolverSession#getSessionObject(Class, String)} method.
  * 
- * <h6 class='topic'>Session objects</h6>
+ * <h5 class='topic'>Session objects</h5>
  * 
  * Session objects are considered more ephemeral than context objects.
  * While a context object is unlikely to ever change, a session object may change on every use of the var resolver.
diff --git a/juneau-core/juneau-svl/src/main/java/org/apache/juneau/svl/package.html b/juneau-core/juneau-svl/src/main/java/org/apache/juneau/svl/package.html
index 8253159..c9189db 100644
--- a/juneau-core/juneau-svl/src/main/java/org/apache/juneau/svl/package.html
+++ b/juneau-core/juneau-svl/src/main/java/org/apache/juneau/svl/package.html
@@ -269,7 +269,7 @@
 			Cloning a resolver will copy it's {@link org.apache.juneau.svl.Var} class names and context objects.
 		</p>
 		
-		<h6 class='topic'>Example:</h6>
+		<h5 class='topic'>Example:</h5>
 		<p class='bcode'>
 			<jc>// Create a resolver that copies the default resolver and adds $C and $ARG vars.</jc>
 			VarResolver myVarResolver = VarResolver.<jsf>DEFAULT</jsf>.builder().vars(ConfigFileVar.<jk>class</jk>, 
diff --git a/juneau-doc/src/main/javadoc/javadoc.css b/juneau-doc/src/main/javadoc/javadoc.css
index 041ef0a..ab50546 100755
--- a/juneau-doc/src/main/javadoc/javadoc.css
+++ b/juneau-doc/src/main/javadoc/javadoc.css
@@ -82,8 +82,11 @@ h5 {
 	font-size: 1.1em;
 }
 
+/* h6 shouldn't be used */
 h6 {
-	font-size: 1.0em;
+	background-color: yellow;
+	color: red;
+	font-weight: bold;
 }
 
 ul {
@@ -678,7 +681,7 @@ h1.hidden {
 	font-weight: bold;
 }
 
-h5.section, h6.section {
+h5.section {
 	color: #4e4e4e;
 	margin: 10px 0 5px 0;
 }
diff --git a/juneau-doc/src/main/javadoc/overview.html b/juneau-doc/src/main/javadoc/overview.html
index 19a0b79..a6767cb 100644
--- a/juneau-doc/src/main/javadoc/overview.html
+++ b/juneau-doc/src/main/javadoc/overview.html
@@ -301,7 +301,7 @@
 		Not only can we help you with feedback, but it helps us understand usage patterns to further improve the product.
 	</p>
 
-	<h6 class='topic'>History</h6>
+	<h5 class='topic'>History</h5>
 	<p>
 		Juneau started off as a popular internal IBM toolkit called Juno.
 		Originally used for serializing POJOs to and from JSON, it later expanded in scope to include a variety of 
@@ -553,7 +553,7 @@
 	<h3 class='topic' onclick='toggle(this)'>2.1 - juneau-marshall</h3>
 	<div class='topic'>
 	
-		<h6 class='figure'>Maven Dependency</h6>
+		<h5 class='figure'>Maven Dependency</h5>
 		<p class='bcode' style='width:500px;'>
 	<xt>&lt;dependency&gt;</xt>
 		<xt>&lt;groupId&gt;</xt>org.apache.juneau<xt>&lt;/groupId&gt;</xt>
@@ -562,12 +562,12 @@
 	<xt>&lt;/dependency&gt;</xt>
 		</p>	
 		
-		<h6 class='figure'>Java Library</h6>
+		<h5 class='figure'>Java Library</h5>
 		<p class='bcode' style='width:500px;'>
 	juneau-marshall-7.0.0.jar 
 		</p>	
 		
-		<h6 class='figure'>OSGi Module</h6>
+		<h5 class='figure'>OSGi Module</h5>
 		<p class='bcode' style='width:500px;'>
 	org.apache.juneau.marshall_7.0.0.jar 
 		</p>	
@@ -664,7 +664,7 @@
 				<code>Iterators</code> is available through the use of POJO swaps (described later).
 			</p>
 			
-			<h6 class='toc'>Additional Information - org.apache.juneau.serializer</h6>
+			<h5 class='toc'>Additional Information - org.apache.juneau.serializer</h5>
 			<ol class='toc'>
 				<li><p><a class='doclink' href='org/apache/juneau/serializer/package-summary.html#Serializer'>Serializer API</a></p>
 				<ol>
@@ -752,7 +752,7 @@
 					with escapes.  
 			</ul>
 			
-			<h6 class='toc'>Additional Information - org.apache.juneau.parser</h6>
+			<h5 class='toc'>Additional Information - org.apache.juneau.parser</h5>
 			<ol class='toc'>
 				<li><p><a class='doclink' href='org/apache/juneau/parser/package-summary.html#Parser'>Parser API</a></p>
 				<ol>
@@ -991,7 +991,7 @@
 		.build();
 			</p>
 			
-			<h6 class='topic'>Additional Information</h6>
+			<h5 class='topic'>Additional Information</h5>
 			<p>
 				The following is a list of all configurable properties across all serializers and parsers.
 			</p>
@@ -1888,7 +1888,7 @@
 					instead.
 				</p>
 				
-				<h6 class='section'>See Also:</h6>
+				<h5 class='section'>See Also:</h5>
 				<ul>
 					<li class='jic'>{@link org.apache.juneau.transform.Surrogate}
 				</ul>
@@ -2335,7 +2335,7 @@
 			</div>
 
 			<!-- =================================================================================================== -->
-			<a id="juneau-marshall.ParentPropertyAnnotion"></a>
+			<a id="juneau-marshall.ParentPropertyAnnotation"></a>
 			<h4 class='topic' onclick='toggle(this)'>2.1.7.13 - @ParentProperty Annotation</h4>
 			<div class='topic'>
 				<p>
@@ -2473,7 +2473,7 @@
 	<jk>public</jk> MyPojo(MyBuilder b) {...}
 						</p>
 				</ul>
-				<h6 class='section'>See Also:</h6>
+				<h5 class='section'>See Also:</h5>
 				<ul>
 					<li class='ja'>{@link org.apache.juneau.annotation.Builder}
 					<li class='jic'>{@link org.apache.juneau.transform.Builder}
@@ -3186,7 +3186,7 @@
 				<br>This prevents the parsers from using an internal buffer that would read past the end of the currently
 				parsed POJO.
 			</p>
-			<h6 class='figure'>Examples:</h6>
+			<h5 class='figure'>Examples:</h5>
 			<p class='bcode'>
 	<jc>// If you're calling parse on the same input multiple times, use a session instead of the parser directly.</jc>
 	ReaderParserSession p = JsonParser.<jsm>create</jsm>().unbuffered().build().createSession();
@@ -3232,7 +3232,7 @@
 				The following charts describe equivalent features between the two libraries:
 			</p>
 		
-			<h6 class='topic'>Annotations</h6>
+			<h5 class='topic'>Annotations</h5>
 			<table class='styled' style='min-width:800px;width:50%'>
 				<tr><th>Jackson</th><th>Juneau</th></tr>
 				<tr>
@@ -3640,7 +3640,7 @@
 			<a id="juneau-marshall.AdditionalInfo.JSON"></a>
 			<h4 class='topic' onclick='toggle(this)'>2.1.13.1 - JSON</h4>
 			<div class='topic'>
-				<h6 class='toc'>Additional Information - org.apache.juneau.json</h6>
+				<h5 class='toc'>Additional Information - org.apache.juneau.json</h5>
 				<ol class='toc'>
 					<li><p><a class='doclink' href='org/apache/juneau/json/package-summary.html#Overview'>JSON support overview</a></p> 
 					<ol>
@@ -3668,7 +3668,7 @@
 			<a id="juneau-marshall.AdditionalInfo.XML"></a>
 			<h4 class='topic' onclick='toggle(this)'>2.1.13.2 - XML</h4>
 			<div class='topic'>
-				<h6 class='toc'>Additional Information - org.apache.juneau.xml</h6>
+				<h5 class='toc'>Additional Information - org.apache.juneau.xml</h5>
 				<ol class='toc'>
 					<li><p><a class='doclink' href='org/apache/juneau/xml/package-summary.html#Overview'>XML support overview</a></p> 
 					<ol>
@@ -3707,7 +3707,7 @@
 			<a id="juneau-marshall.AdditionalInfo.HTML"></a>
 			<h4 class='topic' onclick='toggle(this)'>2.1.13.3 - HTML</h4>
 			<div class='topic'>
-				<h6 class='toc'>Additional Information - org.apache.juneau.html</h6>
+				<h5 class='toc'>Additional Information - org.apache.juneau.html</h5>
 				<ol class='toc'>
 					<li><p><a class='doclink' href='org/apache/juneau/html/package-summary.html#HtmlSerializer'>HTML serialization support</a></p> 
 					<li><p><a class='doclink' href='org/apache/juneau/html/package-summary.html#HtmlParser'>HTML parsing support</a></p> 
@@ -3718,7 +3718,7 @@
 			<a id="juneau-marshall.AdditionalInfo.UON"></a>
 			<h4 class='topic' onclick='toggle(this)'>2.1.13.4 - UON</h4>
 			<div class='topic'>
-				<h6 class='toc'>Additional Information - org.apache.juneau.uon</h6>
+				<h5 class='toc'>Additional Information - org.apache.juneau.uon</h5>
 				<ol class='toc'>
 					<li><p><a class='doclink' href='org/apache/juneau/uon/package-summary.html#Overview'>UON support overview</a></p> 
 					<ol>
@@ -3745,7 +3745,7 @@
 			<a id="juneau-marshall.AdditionalInfo.URLEncoding"></a>
 			<h4 class='topic' onclick='toggle(this)'>2.1.13.5 - URL-Encoding</h4>
 			<div class='topic'>
-				<h6 class='toc'>Additional Information - org.apache.juneau.urlencoding</h6>
+				<h5 class='toc'>Additional Information - org.apache.juneau.urlencoding</h5>
 				<ol class='toc'>
 					<li><p><a class='doclink' href='org/apache/juneau/urlencoding/package-summary.html#Overview'>URL encoding support overview</a></p> 
 					<ol>
@@ -3775,7 +3775,7 @@
 	<h3 class='topic' onclick='toggle(this)'>2.2 - juneau-marshall-rdf</h3>
 	<div class='topic'>
 	
-		<h6 class='figure'>Maven Dependency</h6>
+		<h5 class='figure'>Maven Dependency</h5>
 		<p class='bcode' style='width:500px;'>
 	<xt>&lt;dependency&gt;</xt>
 		<xt>&lt;groupId&gt;</xt>org.apache.juneau<xt>&lt;/groupId&gt;</xt>
@@ -3784,12 +3784,12 @@
 	<xt>&lt;/dependency&gt;</xt>
 		</p>	
 		
-		<h6 class='figure'>Java Library</h6>
+		<h5 class='figure'>Java Library</h5>
 		<p class='bcode' style='width:500px;'>
 	juneau-marshall-rdf-7.0.0.jar 
 		</p>	
 	
-		<h6 class='figure'>OSGi Module</h6>
+		<h5 class='figure'>OSGi Module</h5>
 		<p class='bcode' style='width:500px;'>
 	org.apache.juneau.marshall.rdf_7.0.0.jar 
 		</p>	
@@ -3845,7 +3845,7 @@
 	String rdfNTriple = RdfSerializer.<jsf>DEFAULT_NTRIPLE</jsf>.serialize(p);
 		</p>
 
-		<h6 class='toc'>Additional Information - org.apache.juneau.jena</h6>
+		<h5 class='toc'>Additional Information - org.apache.juneau.jena</h5>
 		<ol class='toc'>
 			<li><p><a class='doclink' href='org/apache/juneau/jena/package-summary.html#RdfOverview'>RDF support overview</a></p> 
 			<ol>
@@ -3877,7 +3877,7 @@
 	<h3 class='topic' onclick='toggle(this)'>2.3 - juneau-dto</h3>
 	<div class='topic'>
 	
-		<h6 class='figure'>Maven Dependency</h6>
+		<h5 class='figure'>Maven Dependency</h5>
 		<p class='bcode' style='width:500px;'>
 	<xt>&lt;dependency&gt;</xt>
 		<xt>&lt;groupId&gt;</xt>org.apache.juneau<xt>&lt;/groupId&gt;</xt>
@@ -3886,12 +3886,12 @@
 	<xt>&lt;/dependency&gt;</xt>
 		</p>	
 		
-		<h6 class='figure'>Java Library</h6>
+		<h5 class='figure'>Java Library</h5>
 		<p class='bcode' style='width:500px;'>
 	juneau-dto-7.0.0.jar 
 		</p>	
 	
-		<h6 class='figure'>OSGi Module</h6>
+		<h5 class='figure'>OSGi Module</h5>
 		<p class='bcode' style='width:500px;'>
 	org.apache.juneau.dto_7.0.0.jar 
 		</p>	
@@ -4011,7 +4011,7 @@
 				represent these POJOs in languages other than HTML.
 			</p>
 			
-			<h6 class='toc'>Additional Information - org.apache.juneau.dto.html5</h6>
+			<h5 class='toc'>Additional Information - org.apache.juneau.dto.html5</h5>
 			<ol class='toc'>
 				<li><p><a class='doclink' href='org/apache/juneau/dto/html5/package-summary.html#Overview'>Overview</a></p>
 				<ol>
@@ -4070,7 +4070,7 @@
 				To serialize this to ATOM, use the {@link org.apache.juneau.xml.XmlSerializer} class:
 			</p>
 			
-			<h6 class='figure'>Example with no namespaces</h6>
+			<h5 class='figure'>Example with no namespaces</h5>
 			<p class='bcode'>
 	<jc>// Create a serializer with readable output, no namespaces yet.</jc>
 	XmlSerializer s = XmlSerializer.<jsm>create</jsm>().sq().ws().build();
@@ -4079,7 +4079,7 @@
 	String atomXml = s.serialize(feed);
 			</p>
 			
-			<h6 class='figure'>Results</h6>
+			<h5 class='figure'>Results</h5>
 			<p class='bcode'>
 	<xt>&lt;feed&gt;</xt>
 		<xt>&lt;id&gt;</xt>
@@ -4139,7 +4139,7 @@
 				represent these POJOs in languages other than XML.
 			</p>
 			
-			<h6 class='toc'>Additional Information - org.apache.juneau.dto.atom</h6>
+			<h5 class='toc'>Additional Information - org.apache.juneau.dto.atom</h5>
 			<ol class='toc'>
 				<li><p><a class='doclink' href='org/apache/juneau/dto/atom/package-summary.html#Overview'>Overview</a></p>
 				<ol>
@@ -4324,7 +4324,7 @@
 	<h3 class='topic' onclick='toggle(this)'>2.4 - juneau-svl</h3>
 	<div class='topic'>
 	
-		<h6 class='figure'>Maven Dependency</h6>
+		<h5 class='figure'>Maven Dependency</h5>
 		<p class='bcode' style='width:500px;'>
 	<xt>&lt;dependency&gt;</xt>
 		<xt>&lt;groupId&gt;</xt>org.apache.juneau<xt>&lt;/groupId&gt;</xt>
@@ -4333,12 +4333,12 @@
 	<xt>&lt;/dependency&gt;</xt>
 		</p>	
 		
-		<h6 class='figure'>Java Library</h6>
+		<h5 class='figure'>Java Library</h5>
 		<p class='bcode' style='width:500px;'>
 	juneau-svl-7.0.0.jar 
 		</p>	
 	
-		<h6 class='figure'>OSGi Module</h6>
+		<h5 class='figure'>OSGi Module</h5>
 		<p class='bcode' style='width:500px;'>
 	org.apache.juneau.svl_7.0.0.jar 
 		</p>	
@@ -4371,7 +4371,7 @@
 			It is used extensively in the ConfigFile, REST and Microservice APIs.
 		</p>
 		
-		<h6 class='toc'>Additional Information - org.apache.juneau.svl</h6>
+		<h5 class='toc'>Additional Information - org.apache.juneau.svl</h5>
 		<ol class='toc'>
 			<li><p><a class='doclink' href='org/apache/juneau/svl/package-summary.html#SimpleVarLanguage'>Simple Variable Language</a></p>
 				<ol>
@@ -4388,7 +4388,7 @@
 	<h3 class='topic' onclick='toggle(this)'>2.5 - juneau-config</h3>
 	<div class='topic'>
 	
-		<h6 class='figure'>Maven Dependency</h6>
+		<h5 class='figure'>Maven Dependency</h5>
 		<p class='bcode' style='width:500px;'>
 	<xt>&lt;dependency&gt;</xt>
 		<xt>&lt;groupId&gt;</xt>org.apache.juneau<xt>&lt;/groupId&gt;</xt>
@@ -4397,12 +4397,12 @@
 	<xt>&lt;/dependency&gt;</xt>
 		</p>	
 		
-		<h6 class='figure'>Java Library</h6>
+		<h5 class='figure'>Java Library</h5>
 		<p class='bcode' style='width:500px;'>
 	juneau-config-7.0.0.jar 
 		</p>	
 	
-		<h6 class='figure'>OSGi Module</h6>
+		<h5 class='figure'>OSGi Module</h5>
 		<p class='bcode' style='width:500px;'>
 	org.apache.juneau.config_7.0.0.jar 
 		</p>	
@@ -4514,7 +4514,7 @@
 				Extensive listener APIs.
 		</ul>
 		
-		<h6 class='topic'>Example:</h6>
+		<h5 class='topic'>Example:</h5>
 		<p class='bcode'>
 	<cc>#--------------------------</cc>
 	<cc># My section</cc>
@@ -4645,7 +4645,7 @@
 	cf.save();
 		</p>
 		
-		<h6 class='toc'>Additional Information - org.apache.juneau.ini</h6>
+		<h5 class='toc'>Additional Information - org.apache.juneau.ini</h5>
 		<ol class='toc'>
 			<li><p><a class='doclink' href='org/apache/juneau/ini/package-summary.html#Overview'>Overview</a></p> 
 			<li><p><a class='doclink' href='org/apache/juneau/ini/package-summary.html#Variables'>Variables</a></p> 
@@ -4681,7 +4681,7 @@
 	<h3 class='topic' onclick='toggle(this)'>3.1 - juneau-rest-server</h3>
 	<div class='topic'>
 	
-		<h6 class='figure'>Maven Dependency</h6>
+		<h5 class='figure'>Maven Dependency</h5>
 		<p class='bcode' style='width:500px;'>
 	<xt>&lt;dependency&gt;</xt>
 		<xt>&lt;groupId&gt;</xt>org.apache.juneau<xt>&lt;/groupId&gt;</xt>
@@ -4690,12 +4690,12 @@
 	<xt>&lt;/dependency&gt;</xt>
 		</p>	
 		
-		<h6 class='figure'>Java Library</h6>
+		<h5 class='figure'>Java Library</h5>
 		<p class='bcode' style='width:500px;'>
 	juneau-rest-server-7.0.0.jar 
 		</p>	
 	
-		<h6 class='figure'>OSGi Module</h6>
+		<h5 class='figure'>OSGi Module</h5>
 		<p class='bcode' style='width:500px;'>
 	org.apache.juneau.rest.server_7.0.0.jar 
 		</p>	
@@ -4725,7 +4725,7 @@
 			<br>It also means you need nothing more than a Servlet container such as Jetty to use the REST framework.
 		</p>
 		
-		<h6 class='topic'>Features</h6>
+		<h5 class='topic'>Features</h5>
 		<ul class='spaced-list'>
 			<li>
 				Serializes POJOs to JSON, XML, HTML, URL-Encoding, UON, RDF/XML, N-Triple, Turtle, N3, SOAP, or 
@@ -4942,7 +4942,7 @@
 			</p>
 
 			<!-- ======================================================================================================== -->
-			<a id="juneau-rest-server.Children"></a>
+			<a id="juneau-rest-server.RestServlet"></a>
 			<h4 class='topic' onclick='toggle(this)'>3.1.3.1 - RestServlet</h4>
 			<div class='topic'>
 				<p>
@@ -4976,7 +4976,7 @@
 			</div>
 
 			<!-- ======================================================================================================== -->
-			<a id="juneau-rest-server.Children"></a>
+			<a id="juneau-rest-server.RestServletDefault"></a>
 			<h4 class='topic' onclick='toggle(this)'>3.1.3.2 - RestServletDefault</h4>
 			<div class='topic'>
 				<p>
@@ -5083,7 +5083,7 @@
 					Child Resources are REST servlets or objects that are linked to parent resources through the 
 					{@link org.apache.juneau.rest.annotation.RestResource#children() @RestResource.children()} annotation.
 				</p>
-				<h6 class='figure'>Example:</h6>
+				<h5 class='figure'>Example:</h5>
 				<p class='bcode'>
 	<jd>/** Parent Resource */</jd>
 	<ja>@RestResource</ja>(
@@ -5109,7 +5109,7 @@
 					<br>Initialization of and access to the child resources occurs through the parent resource.
 					<br>Children can be nested arbitrary deep to create complex REST interfaces with a single top-level REST servlet.
 				</p>
-				<h6 class='section'>See Also:</h6>
+				<h5 class='section'>See Also:</h5>
 				<ul>
 					<li class='jf'>{@link org.apache.juneau.rest.RestContext#REST_children}
 				</ul>
@@ -5209,7 +5209,7 @@
 					This API can be extended to provide your own custom resource resolution.
 					<br>Later topics discuss how to use this API to instantiate resources using Spring.
 				</p>
-				<h6 class='section'>See Also:</h6>
+				<h5 class='section'>See Also:</h5>
 				<ul>
 					<li class='jf'>{@link org.apache.juneau.rest.RestContext#REST_resourceResolver}
 				</ul>
@@ -5272,7 +5272,7 @@
 						</ul>
 				</ul>
 	
-				<h6 class='section'>See Also:</h6>
+				<h5 class='section'>See Also:</h5>
 				<ul>
 					<li class='ja'>{@link org.apache.juneau.rest.annotation.RestHook}
 				</ul>
@@ -5489,7 +5489,7 @@
 				{@link org.apache.juneau.rest.annotation.RestMethod @RestMethod} annotation. 
 				<br>The annotation allows the framework to identify the available REST methods through reflection.
 			</p>
-			<h6 class='figure'>Example:</h6>
+			<h5 class='figure'>Example:</h5>
 			<p class='bcode'>
 	<ja>@RestMethod</ja>(name=<jsf>GET</jsf>, path=<js>"/"</js>)
 	<jk>public</jk> String sayHello() {
@@ -5598,7 +5598,7 @@
 							<li class='ja'>{@link org.apache.juneau.rest.annotation.Body} - The HTTP content parsed as a POJO.
 						</ul>
 				</ul>
-				<h6 class='figure'>Example:</h6>
+				<h5 class='figure'>Example:</h5>
 				<p class='bcode'>
 	<ja>@RestMethod</ja>(name=<jsf>GET</jsf>, path=<js>"/example1/{a1}/{a2}/{a3}/*"</js>)
 	<jk>public</jk> String doGetExample1(
@@ -5622,11 +5622,11 @@
 		<jc>// Do something with all of those</jc>
 	}
 				</p>
-				<h6 class='section'>Notes:</h6>
+				<h5 class='section'>Notes:</h5>
 				<ul>
 					<li>All annotations have programmatic equivalents on the {@link org.apache.juneau.rest.RestRequest} class.
 				</ul>
-				<h6 class='section'>See Also:</h6>
+				<h5 class='section'>See Also:</h5>
 				<ul>
 					<li class='jf'>{@link org.apache.juneau.rest.RestContext#REST_paramResolvers} - For configuring custom parameter types.
 				</ul>
@@ -5707,7 +5707,7 @@
 	<ja>@RestMethod</ja>(...)
 	<jk>public</jk> Object myMethod(RequestBody body) {...}			
 				</p>
-				<h6 class='figure'>Example:</h6>
+				<h5 class='figure'>Example:</h5>
 				<p class='bcode'>
 	<ja>@RestMethod</ja>(...)
 	<jk>public void</jk> doPost(RequestBody body) {
@@ -5745,7 +5745,7 @@
 	<ja>@RestMethod</ja>(...)
 	<jk>public</jk> Object myMethod(RequestHeaders headers) {...}			
 				</p>
-				<h6 class='figure'>Example:</h6>
+				<h5 class='figure'>Example:</h5>
 				<p class='bcode'>
 	<ja>@RestMethod</ja>(...)
 	<jk>public</jk> Object myMethod(RequestHeaders headers) {
@@ -5788,7 +5788,7 @@
 	<ja>@RestMethod</ja>(...)
 	<jk>public</jk> Object myMethod(RequestQuery query) {...}			
 				</p>
-				<h6 class='figure'>Example:</h6>
+				<h5 class='figure'>Example:</h5>
 				<p class='bcode'>
 	<ja>@RestMethod</ja>(...)
 	<jk>public</jk> Object myMethod(RequestQuery query) {
@@ -5835,7 +5835,7 @@
 	<ja>@RestMethod</ja>(...)
 	<jk>public</jk> Object myMethod(RequestFormData query) {...}			
 				</p>
-				<h6 class='figure'>Example:</h6>
+				<h5 class='figure'>Example:</h5>
 				<p class='bcode'>
 	<ja>@RestMethod</ja>(...)
 	<jk>public</jk> Object myMethod(RequestFormData formData) {
@@ -5967,7 +5967,7 @@
 		<jk>return</jk> <js>"GET /urlWithParams?foo="</js>+foo+<js>"&amp;bar="</js>+bar+<js>"&amp;baz="</js>+baz;
 	}
 				</p>
-				<h6 class='section'>See Also:</h6>
+				<h5 class='section'>See Also:</h5>
 				<ul>
 					<li class='jf'>{@link org.apache.juneau.rest.RestContext#REST_path}
 					<li class='ja'>{@link org.apache.juneau.rest.annotation.Path}
@@ -5988,7 +5988,7 @@
 	<ja>@RestMethod</ja>(...)
 	<jk>public</jk> Object myMethod(RequestPathMatch path) {...}			
 				</p>
-				<h6 class='figure'>Example:</h6>
+				<h5 class='figure'>Example:</h5>
 				<p class='bcode'>
 	<ja>@RestMethod</ja>(..., path=<js>"/{foo}/{bar}/{baz}/*"</js>)
 	<jk>public void</jk> doGet(RequestPathMatch path) {
@@ -6025,7 +6025,7 @@
 					<br>It can also be <jk>void</jk> if the method is not sending any output (e.g. a request redirect) or is 
 					setting the output using the {@link org.apache.juneau.rest.RestResponse#setOutput(Object)} method.
 				</p>
-				<h6 class='figure'>Example:</h6>
+				<h5 class='figure'>Example:</h5>
 				<p class='bcode'>
 	<ja>@RestMethod</ja>(name=<jsf>GET</jsf>)
 	<jk>public</jk> String doGet() {
@@ -6084,7 +6084,7 @@
 						By accessing the {@link java.io.Writer} directly by calling 
 						{@link org.apache.juneau.rest.RestResponse#getNegotiatedWriter()} and writing the output yourself.
 				</ul>
-				<h6 class='figure'>Example:</h6>
+				<h5 class='figure'>Example:</h5>
 				<p class='bcode'>
 	<jc>// Equivalent method 1</jc>
 	<ja>@RestMethod</ja>(name=<jsf>GET</jsf>, path=<js>"/example1/{personId}"</js>)
@@ -6111,7 +6111,7 @@
 		s.serialize(p, res.getNegotiatedWriter());
 	}
 				</p>
-				<h6 class='section'>See Also:</h6>
+				<h5 class='section'>See Also:</h5>
 				<ul>
 					<li class='jf'>{@link org.apache.juneau.rest.RestContext#REST_responseHandlers} - For configuring custom response handlers.
 				</ul>
@@ -6132,7 +6132,7 @@
 					interface which is handled by the {@link org.apache.juneau.rest.response.WritableHandler} class.
 					<br>This allows these objects to be returned as responses by REST methods.
 				</p>
-				<h6 class='figure'>Example:</h6>
+				<h5 class='figure'>Example:</h5>
 				<p class='bcode'>
 	<ja>@RestMethod</ja>(...)
 	<jk>public</jk> Object sayHello(RestRequest req) {
@@ -6173,7 +6173,7 @@
 					interface which is handled by the {@link org.apache.juneau.rest.response.StreamableHandler} class.
 					<br>This allows these objects to be returned as responses by REST methods.
 				</p>
-				<h6 class='figure'>Example:</h6>
+				<h5 class='figure'>Example:</h5>
 				<p class='bcode'>
 	<ja>@RestMethod</ja>(...)
 	<jk>public</jk> Object showPicture(RestRequest req) {
@@ -6213,7 +6213,7 @@
 				<p>
 					The following example shows the difference between handling redirects via <l>RestResponse</l> and the simplified approach of using this class.
 				</p>
-				<h6 class='figure'>Example:</h6>
+				<h5 class='figure'>Example:</h5>
 				<p class='bcode'>
 	<jc>// Redirect to "/contextPath/servletPath/foobar"</jc>
 
@@ -6232,7 +6232,7 @@
 				<p>
 					The constructor can use a <l>MessageFormat</l>-style pattern with multiple arguments.
 				</p>
-				<h6 class='figure'>Example:</h6>
+				<h5 class='figure'>Example:</h5>
 				<p class='bcode'>
 	<ja>@RestMethod</ja>(...)
 	<jk>public</jk> Redirect redirectExample3() {
@@ -6244,7 +6244,7 @@
 				</p>
 				<p>
 					Redirecting to the servlet root can be accomplished by simply using the no-arg constructor.
-				<h6 class='figure'>Example:</h6>
+				<h5 class='figure'>Example:</h5>
 				<p class='bcode'>
 	<jc>// Simply redirect to the servlet root.
 	// Equivalent to res.sendRedirect(req.getServletURI()).</jc>
@@ -6264,7 +6264,7 @@
 					tied to the same HTTP method and path, but differentiated by some request attribute such as a specific 
 					header value.
 				</p>
-				<h6 class='figure'>Example:</h6>
+				<h5 class='figure'>Example:</h5>
 				<p class='bcode'>
 	<jc>// GET method that gets invoked for administrators</jc>
 	<ja>@RestMethod</ja>(name=<jsf>GET</jsf>, path=<js>"/*"</js>, matchers=IsAdminMatcher.<jk>class</jk>)
@@ -6290,7 +6290,7 @@
 	}
 				</p>
 				
-				<h6 class='section'>Notes:</h6>
+				<h5 class='section'>Notes:</h5>
 				<ul class='spaced-list'>
 					<li>
 						If no methods are found with a matching matcher, a <l>412 Precondition Failed</l> status is returned.
@@ -6307,7 +6307,7 @@
 						<br>Otherwise, methods are attempted in the order they appear in the class.
 				</ul>
 				
-				<h6 class='section'>See Also:</h6>
+				<h5 class='section'>See Also:</h5>
 				<ul>
 					<li class='ja'>{@link org.apache.juneau.rest.annotation.RestMethod#matchers}
 					<li class='jc'>{@link org.apache.juneau.rest.matchers.MultipartFormDataMatcher}
@@ -6322,7 +6322,7 @@
 		<div class='topic'>
 			<p>
 				The {@link org.apache.juneau.rest.annotation.Body @Body} annotation provides easy access to the HTTP body content as any parsable POJO type
-				(See <a class='doclink' href='../../../../overview-summary.html#juneau-marshall.PojoCategories'>POJO Categories</a>).
+				(See <a class='doclink' href='#juneau-marshall.PojoCategories'>POJO Categories</a>).
 				<br>In the example below, we're POSTing beans.
 			</p>
 			<p class='bcode'>
@@ -6356,7 +6356,7 @@
 				<l>Content-Type</l> HTTP header.  
 				<br>So the body content could be JSON or XML or any other supported parsing types.
 			</p>
-			<h6 class='section'>See Also:</h6>
+			<h5 class='section'>See Also:</h5>
 			<ul>
 				<li class='ja'>{@link org.apache.juneau.rest.annotation.Body}
 				<li class='jc'>{@link org.apache.juneau.rest.RequestBody}
@@ -6430,7 +6430,7 @@
 					The samples include a <l>TempDirResource</l> class that uses the File Upload library to allow files to 
 					be uploaded as multipart form posts.
 				</p>
-				<h6 class='figure'>Example:</h6>
+				<h5 class='figure'>Example:</h5>
 				<p class='bcode'>
 	<ja>@RestResource</ja>(
 		path=<js>"/tempDir"</js>
@@ -6474,7 +6474,7 @@
 			<p>
 				The {@link org.apache.juneau.rest.annotation.FormData @FormData} annotation is used to retrieve request form post entries.
 			</p>
-			<h6 class='figure'>Example:</h6>
+			<h5 class='figure'>Example:</h5>
 			<p class='bcode'>	
 	<ja>@RestMethod</ja>(name=<jsf>POST</jsf>)
 	<jk>public void</jk> doPost(RestRequest req, RestResponse res,
@@ -6507,7 +6507,7 @@
 					<br>The {@link org.apache.juneau.rest.annotation.Query @Query} annotation can be used to retrieve a URL parameter in the URL string without triggering the
 					servlet to drain the body content.
 			</ul>
-			<h6 class='section'>See Also:</h6>
+			<h5 class='section'>See Also:</h5>
 			<ul>
 				<li class='ja'>{@link org.apache.juneau.rest.annotation.FormData}
 				<li class='ja'>{@link org.apache.juneau.rest.annotation.HasFormData}
@@ -6528,7 +6528,7 @@
 				<br>Therefore, this annotation can be used in conjunction with the {@link org.apache.juneau.rest.annotation.Body @Body} annotation or
 				{@link org.apache.juneau.rest.RestRequest#getBody()} method for <code>application/x-www-form-urlencoded POST</code> calls.
 			</p>
-			<h6 class='figure'>Example:</h6>
+			<h5 class='figure'>Example:</h5>
 			<p class='bcode'>
 	<ja>@RestMethod</ja>(name=<jsf>GET</jsf>)
 	<jk>public void</jk> doGet(RestRequest req, RestResponse res,
@@ -6553,7 +6553,7 @@
 				to POJOs and controls what POJO types are supported.
 				<br>As a general rule, any POJO convertable from a String is supported.
 			</p>
-			<h6 class='section'>See Also:</h6>
+			<h5 class='section'>See Also:</h5>
 			<ul>
 				<li class='ja'>{@link org.apache.juneau.rest.annotation.Query}
 				<li class='ja'>{@link org.apache.juneau.rest.annotation.HasQuery}
@@ -6568,7 +6568,7 @@
 			<p>
 				The {@link org.apache.juneau.rest.annotation.Header @Header} is used to retrieve request headers.
 			</p>
-			<h6 class='figure'>Example:</h6>
+			<h5 class='figure'>Example:</h5>
 			<p class='bcode'>
 	<ja>@RestMethod</ja>(name=<jsf>GET</jsf>)
 	<jk>public void</jk> doGet(RestRequest req, RestResponse res, <ja>@Header</ja>(<js>"ETag"</js>) UUID etag) {...}
@@ -6588,7 +6588,7 @@
 				to POJOs and controls what POJO types are supported.
 				<br>As a general rule, any POJO convertible from a String is supported.
 			</p>
-			<h6 class='section'>See Also:</h6>
+			<h5 class='section'>See Also:</h5>
 			<ul>
 				<li class='ja'>{@link org.apache.juneau.rest.annotation.Header}
 				<li class='jc'>{@link org.apache.juneau.rest.RequestHeaders}
@@ -6657,7 +6657,7 @@
 	}
 			</p>
 			
-			<h6 class='section'>See Also:</h6>
+			<h5 class='section'>See Also:</h5>
 			<ul class='doctree'>
 				<li class='jf'>{@link org.apache.juneau.rest.RestContext#REST_serializers}
 			</ul>
@@ -6723,7 +6723,7 @@
 		}
 	}
 			</p>
-			<h6 class='section'>See Also:</h6>
+			<h5 class='section'>See Also:</h5>
 			<ul class='doctree'>
 				<li class='jf'>{@link org.apache.juneau.rest.RestContext#REST_parsers}
 			</ul>
@@ -6744,7 +6744,7 @@
 				<li class='ja'>{@link org.apache.juneau.rest.annotation.RestResource#properties()} 
 				<li class='jc'>{@link org.apache.juneau.rest.RestContextBuilder} - Various methods on the context builder.
 			</ul>
-			<h6 class='figure'>Example:</h6>
+			<h5 class='figure'>Example:</h5>
 			<p class='bcode'>
 	<jk>import static</jk> org.apache.juneau.BeanContext.*;
 	<jk>import static</jk> org.apache.juneau.serializer.Serializer.*;
@@ -6836,7 +6836,7 @@
 				<li class='jm'>{@link org.apache.juneau.rest.RestContext#getProperties()}
 				<li class='jm'>{@link org.apache.juneau.rest.RestRequest#getProperties()}
 			</ul>
-			<h6 class='section'>See Also:</h6>
+			<h5 class='section'>See Also:</h5>
 			<ul>
 				<li class='ja'>{@link org.apache.juneau.rest.annotation.RestResource#flags()} - Shorthand for boolean properties.
 				<li class='ja'>{@link org.apache.juneau.rest.annotation.RestMethod#flags()} - Shorthand for boolean properties.
@@ -6852,7 +6852,7 @@
 		<div class='topic'>
 			<p>
 				The Juneau serializers and parsers can be configured on how to handle POJOs through the use of Transforms.
-				(See <a class='doclink' href='../../../../overview-summary.html#juneau-marshall.Transforms'>Transforms</a>)
+				(See <a class='doclink' href='#juneau-marshall.Transforms'>Transforms</a>)
 			</p>
 			<p>
 				Transforms are associated serializers and parsers registered on a REST resource via the following:
@@ -6974,7 +6974,7 @@
 				the servlet.
 				<br>If multiple guards are present, ALL guards must pass.
 			</p>
-			<h6 class='section'>See Also:</h6>
+			<h5 class='section'>See Also:</h5>
 			<ul>
 				<li class='jf'>{@link org.apache.juneau.rest.RestContext#REST_guards}
 			</ul>
@@ -6995,7 +6995,7 @@
 				<li class='ja'>{@link org.apache.juneau.rest.annotation.RestMethod#converters()} 
 				<li class='jm'>{@link org.apache.juneau.rest.RestContextBuilder#converters(Class...)} 
 			</ul>
-			<h6 class='figure'>Example:</h6>
+			<h5 class='figure'>Example:</h5>
 			<p class='bcode'>
 	<jc>// Associate the Traversable converter to all Java REST methods in this servlet</jc>
 	<ja>@RestResource</ja>(converters=Traversable.<jk>class</jk>)
@@ -7079,7 +7079,7 @@
 				</ul>
 			</ul>
 		
-			<h6 class='section'>See Also:</h6>
+			<h5 class='section'>See Also:</h5>
 			<ul>
 				<li class='jf'>{@link org.apache.juneau.rest.RestContext#REST_converters} 
 			</ul>
@@ -7129,7 +7129,7 @@
 	#--------------------------------------------------------------------------------</cc>
 	<ck>MyRestServlet.greeting</ck> = Hello!
 			</p>
-			<h6 class='section'>See Also:</h6>
+			<h5 class='section'>See Also:</h5>
 			<ul>
 				<li class='jf'>{@link org.apache.juneau.rest.RestContext#REST_messages}
 			</ul>
@@ -7146,7 +7146,7 @@
 				based on the request <l>Accept-Encoding</l> and <l>Content-Encoding</l> headers.
 			</p>
 			
-			<h6 class='figure'>Example:</h6>
+			<h5 class='figure'>Example:</h5>
 			<p class='bcode'>
 	<jc>// Servlet with automated support for GZIP compression</jc>
 	<ja>@RestResource</ja>(encoders={GzipEncoder.<jk>class</jk>})
@@ -7167,7 +7167,7 @@
 						{@link org.apache.juneau.encoders.IdentityEncoder}
 				</ul>
 			</ul>
-			<h6 class='section'>See Also:</h6>
+			<h5 class='section'>See Also:</h5>
 			<ul>
 				<li class='jf'>{@link org.apache.juneau.rest.RestContext#REST_encoders}
 			</ul>
@@ -7209,7 +7209,7 @@
 			<ul>
 				<li class='jm'>{@link org.apache.juneau.rest.RestContextBuilder#vars(Class[])}
 			</ul>
-			<h6 class='figure'>Example:</h6>
+			<h5 class='figure'>Example:</h5>
 			<p class='bcode'>
 	<jc>// Defined a variable that simply wrapps all strings inside [] brackets.</jc>
 	<jc>// e.g. "$BRACKET{foobar}" -> "[foobar]"</jc>
@@ -7257,7 +7257,7 @@
 				The following is the default list of supported variables.
 			</p>
 			<a id="DefaultRestSvlVariables"></a>
-			<h6 class='topic'>Default REST SVL variables</h6>
+			<h5 class='topic'>Default REST SVL variables</h5>
 			<ul class='spaced-list'>
 				<li><b>Initialization-time variables:</b>
 				<ul>
@@ -7332,7 +7332,7 @@
 				In recap, the Configuration API provides support for INI-style configuration files with embedded string variables:
 			</p>
 			
-			<h6 class='figure'>Example:</h6>
+			<h5 class='figure'>Example:</h5>
 			<p class='bcode'>
 	<cc>#--------------------------</cc>
 	<cc># Examples </cc>
@@ -7358,7 +7358,7 @@
 				<li class='ja'>{@link org.apache.juneau.rest.annotation.RestResource#config()}
 			</ul>
 			
-			<h6 class='figure'>Example:</h6>
+			<h5 class='figure'>Example:</h5>
 			<p class='bcode'>
 	<ja>@RestResource</ja>(
 		<jc>// Config file is located at ./config_dir/myconfig.cfg</jc>
@@ -7500,7 +7500,7 @@
 				directory.
 			</p>
 			
-			<h6 class='figure'>Example:</h6>
+			<h5 class='figure'>Example:</h5>
 			<p class='bcode'>
 	<jk>package</jk> com.foo.mypackage;
 
@@ -7523,7 +7523,7 @@
 				<li><l>[working-dir]/docs</l> directory.
 			</ol>
 		
-			<h6 class='section'>Notes:</h6>
+			<h5 class='section'>Notes:</h5>
 			<ul class='spaced-list'>
 				<li>
 					Mappings are cumulative from parent to child.  
@@ -7532,7 +7532,7 @@
 					The media type on the response is determined by the 
 					{@link org.apache.juneau.rest.RestContext#getMediaTypeForName(String)} method.
 			</ul>
-			<h6 class='section'>See Also:</h6>
+			<h5 class='section'>See Also:</h5>
 			<ul>
 				<li class='jf'>{@link org.apache.juneau.rest.RestContext#REST_staticFiles}
 			</ul>
@@ -7579,7 +7579,7 @@
 			...
 		}
 			</p>
-			<h6 class='section'>See Also:</h6>
+			<h5 class='section'>See Also:</h5>
 			<ul>
 				<li class='jf'>{@link org.apache.juneau.rest.RestContext#REST_clientVersionHeader}
 			</ul>
@@ -7594,7 +7594,7 @@
 				(i.e. REST interfaces that document themselves).
 				
 			</p>
-			<h6 class='figure'>OPTIONS page for HelloWorld sample resource</h6>
+			<h5 class='figure'>OPTIONS page for HelloWorld sample resource</h5>
 		 	<img class='bordered' src='doc-files/HelloWorldOptions.png' style='width:800px;'>
 			<p>
 		 		The {@link org.apache.juneau.rest.RestServletDefault} class implements the page by creating a method 
@@ -7672,7 +7672,7 @@
 			</div>
 			
 			<!-- ======================================================================================================== -->
-			<a id="juneau-rest- defined on the resource/method"></a>
+			<a id="juneau-rest-server.RestInfoProviderDefault"></a>
 			<h4 class='topic' onclick='toggle(this)'>3.1.23.2 - RestInfoProviderDefault</h4>
 			<div class='topic'>
 				<p>
@@ -7726,14 +7726,14 @@
 						<br>You'll still get an auto-generated Swagger doc with information gather solely through reflection, including methods, parameters, consumes/produces, etc...
 					<li>
 						Specify localized JSON Swagger files on your classpath.
-						<br><h6 class='figure'>Example:</h6>
+						<br><h5 class='figure'>Example:</h5>
 						<p class='bcode'>
 	MyResource_ja_JP.json
 						</p>
 					<li>
 						Use {@link org.apache.juneau.rest.annotation.ResourceSwagger @ResourceSwagger} and {@link org.apache.juneau.rest.annotation.MethodSwagger @MethodSwagger}
 						annotations on your resource classes and methods.
-						<br><h6 class='figure'>Example:</h6>
+						<br><h5 class='figure'>Example:</h5>
 						<p class='bcode'>
 	<ja>@RestMethod</ja>(
 		swagger=<ja>@MethodSwagger</ja>(tags=<js>"foo,bar,baz"</js>)
@@ -7742,7 +7742,7 @@
 						</p>
 					<li> 
 						Use properties files identified by the {@link org.apache.juneau.rest.annotation.RestResource#messages @RestResource.messages()} annotation.
-						<br><h6 class='figure'>Example:</h6>
+						<br><h5 class='figure'>Example:</h5>
 						<p class='bcode'>
 	<ck>MyResource.myMethod.tags</ck> = <cv>foo,bar,baz</cv>
 						</p>
@@ -7750,7 +7750,7 @@
 						Use any combination of the above.
 					<li>
 						Extend the <l>RestInfoProviderDefault</l> and provide customized behavior.	
-						<br><h6 class='figure'>Example:</h6>
+						<br><h5 class='figure'>Example:</h5>
 						<p class='bcode'>
 	<jc>// Our customized info provider.</jc>
 	<jc>// Extend from the default implementation and selectively override values.</jc>
@@ -7894,7 +7894,7 @@
 	)
 	<jk>public class</jk> HelloWorldResource <jk>extends</jk> RestServletDefault {...}
 			</p>
-			<h6 class='section'>See Also:</h6>
+			<h5 class='section'>See Also:</h5>
 			<ul>
 				<li class='ja'>{@link org.apache.juneau.rest.annotation.HtmlDoc}
 				<li class='jc'>{@link org.apache.juneau.rest.HtmlDocBuilder}
@@ -7915,7 +7915,7 @@
 					<li class='jm'>{@link org.apache.juneau.rest.RestContextBuilder#widgets(Widget...)}
 					<li class='jf'>{@link org.apache.juneau.rest.RestContext#REST_widgets}
 				</ul>
-				<h6 class='figure'>Example:</h6>
+				<h5 class='figure'>Example:</h5>
 				<p class='bcode'>
 	<ja>@RestMethod</ja>(
 		widgets={
@@ -7991,7 +7991,7 @@
 					<li class='jm'>{@link org.apache.juneau.rest.widget.Widget#getClasspathResourceAsString(String) getClasspathResourceAsString(String)}
 					<li class='jm'>{@link org.apache.juneau.rest.widget.Widget#getClasspathResourceAsString(String,Locale) getClasspathResourceAsString(String,Locale)}
 				</ul>
-				<h6 class='section'>Example:</h6>
+				<h5 class='section'>Example:</h5>
 				<p class='bcode'>
 	<jk>public class</jk> MyWidget <jk>extends</jk> Widget {
 
@@ -8008,7 +8008,7 @@
 		}
 	}
 				</p>
-				<h6 class='section'>See Also:</h6>
+				<h5 class='section'>See Also:</h5>
 				<ul>
 					<li class='jf'>{@link org.apache.juneau.rest.RestContext#REST_widgets}
 				</ul>
@@ -8045,7 +8045,7 @@
 					<br>Appends the specified headers if they weren't already set programmatically.	
 			</ul>		
 			
-			<h6 class='figure'>Example:</h6>
+			<h5 class='figure'>Example:</h5>
 			<p class='bcode'>
 	<jc>// Servlet with default headers</jc>
 	<ja>@RestResource</ja>(
@@ -8108,7 +8108,7 @@
 				if the message is actually logged.
 			</p>
 			
-			<h6 class='figure'>Example:</h6>
+			<h5 class='figure'>Example:</h5>
 			<p class='bcode'>
 	logger.logObjects(<jsf>DEBUG</jsf>, <js>"Pojo contents:\n{0}"</js>, myPojo);
 			</p>
@@ -8544,7 +8544,7 @@
 				<li>
 					The method must be public.
 				<li>
-					The parameter and return types must be <a href='../../../../../overview-summary.html#juneau-marshall.PojoCategories'>serializable and parsable</a>.
+					The parameter and return types must be <a href='#juneau-marshall.PojoCategories'>serializable and parsable</a>.
 			</ul>
 			<p>
 				Juneau provides the capability of calling methods on POJOs on a server through client-side proxy interfaces.
@@ -9091,7 +9091,7 @@
 	<h3 class='topic' onclick='toggle(this)'>3.2 - juneau-rest-server-jaxrs</h3>
 	<div class='topic'>
 	
-		<h6 class='figure'>Maven Dependency</h6>
+		<h5 class='figure'>Maven Dependency</h5>
 		<p class='bcode' style='width:500px;'>
 	<xt>&lt;dependency&gt;</xt>
 		<xt>&lt;groupId&gt;</xt>org.apache.juneau<xt>&lt;/groupId&gt;</xt>
@@ -9100,12 +9100,12 @@
 	<xt>&lt;/dependency&gt;</xt>
 		</p>	
 		
-		<h6 class='figure'>Java Library</h6>
+		<h5 class='figure'>Java Library</h5>
 		<p class='bcode' style='width:500px;'>
 	juneau-rest-server-jaxrs-7.0.0.jar 
 		</p>	
 		
-		<h6 class='figure'>OSGi Module</h6>
+		<h5 class='figure'>OSGi Module</h5>
 		<p class='bcode' style='width:500px;'>
 	org.apache.juneau.rest.server_7.0.0.jar 
 		</p>	
@@ -9116,7 +9116,7 @@
 			JAX/RS environment. 
 		</p>
 
-		<h6 class='toc'>Additional Information - org.apache.juneau.rest.jaxrs</h6>
+		<h5 class='toc'>Additional Information - org.apache.juneau.rest.jaxrs</h5>
 		<ol class='toc'>
 			<li><p><a class='doclink' href='org/apache/juneau/rest/jaxrs/package-summary.html#BaseProvider'>Juneau JAX-RS Provider</a></p>
 		</ol>
@@ -9127,7 +9127,7 @@
 	<h3 class='topic' onclick='toggle(this)'>3.3 - juneau-rest-client</h3>
 	<div class='topic'>
 	
-		<h6 class='figure'>Maven Dependency</h6>
+		<h5 class='figure'>Maven Dependency</h5>
 		<p class='bcode' style='width:500px;'>
 	<xt>&lt;dependency&gt;</xt>
 		<xt>&lt;groupId&gt;</xt>org.apache.juneau<xt>&lt;/groupId&gt;</xt>
@@ -9136,12 +9136,12 @@
 	<xt>&lt;/dependency&gt;</xt>
 		</p>	
 		
-		<h6 class='figure'>Java Library</h6>
+		<h5 class='figure'>Java Library</h5>
 		<p class='bcode' style='width:500px;'>
 	juneau-rest-client-7.0.0.jar 
 		</p>	
 	
-		<h6 class='figure'>OSGi Module</h6>
+		<h5 class='figure'>OSGi Module</h5>
 		<p class='bcode' style='width:500px;'>
 	org.apache.juneau.rest.client_7.0.0.jar 
 		</p>	
@@ -9180,7 +9180,7 @@
 			Refer to the additional information for an in-depth examination of the API.
 		</p>
 		
-		<h6 class='toc'>Additional Information - org.apache.juneau.rest.client</h6>
+		<h5 class='toc'>Additional Information - org.apache.juneau.rest.client</h5>
 		<ol class='toc'>
 			<li><p><a class='doclink' href='org/apache/juneau/rest/client/package-summary.html#RestClient'>REST Client API</a></p>
 			<ol>
@@ -9323,7 +9323,7 @@
 					- Returns access to the raw input stream of the response.
 			</ul>
 	
-			<h6 class='toc'>Additional Information - org.apache.juneau.remoteable</h6>
+			<h5 class='toc'>Additional Information - org.apache.juneau.remoteable</h5>
 			<ol class='toc'>
 				<li><p><a class='doclink' href='org/apache/juneau/remoteable/package-summary.html#Overview'>Remoteable support overview</a></p> 
 			</ol>
@@ -9358,7 +9358,7 @@
 	<h3 class='topic' onclick='toggle(this)'>4.1 - juneau-microservice-server</h3>
 	<div class='topic'>
 	
-		<h6 class='figure'>Maven Dependency</h6>
+		<h5 class='figure'>Maven Dependency</h5>
 		<p class='bcode' style='width:500px;'>
 	<xt>&lt;dependency&gt;</xt>
 		<xt>&lt;groupId&gt;</xt>org.apache.juneau<xt>&lt;/groupId&gt;</xt>
@@ -9367,12 +9367,12 @@
 	<xt>&lt;/dependency&gt;</xt>
 		</p>	
 		
-		<h6 class='figure'>Java Library</h6>
+		<h5 class='figure'>Java Library</h5>
 		<p class='bcode' style='width:500px;'>
 	juneau-microservice-server-7.0.0.jar 
 		</p>	
 
-		<h6 class='figure'>OSGi Module</h6>
+		<h5 class='figure'>OSGi Module</h5>
 		<p class='bcode' style='width:500px;'>
 	org.apache.juneau.microservice.server_7.0.0.jar 
 		</p>	
@@ -9417,7 +9417,7 @@
 				- Shutdown and/or restart the JVM.
 		</ul>
 	
-		<h6 class='toc'>Additional Information - org.apache.juneau.microservice</h6>
+		<h5 class='toc'>Additional Information - org.apache.juneau.microservice</h5>
 		<ol class='toc'>
 			<li><p><a class='doclink' href='org/apache/juneau/microservice/package-summary.html#Introduction'>Microservice Introduction</a></p> 
 			<li><p><a class='doclink' href='org/apache/juneau/microservice/package-summary.html#GettingStarted'>Getting Started</a></p> 
@@ -9448,7 +9448,7 @@
 	<h3 class='topic' onclick='toggle(this)'>4.2 - juneau-microservice-template</h3>
 	<div class='topic'>
 	
-		<h6 class='figure'>Archive File</h6>
+		<h5 class='figure'>Archive File</h5>
 		<p class='bcode' style='width:500px;'>
 	my-microservice-7.0.0.zip 
 		</p>	
@@ -9459,7 +9459,7 @@
 			up-and-running. 
 		</p>
 		
-		<h6 class='topic'>Instructions on how to install template project</h6>
+		<h5 class='topic'>Instructions on how to install template project</h5>
 		<p>
 			Download the <code>my-microservice-7.0.0.zip</code> file from the downloads page
 			(located in the binaries) and import it into your workspace as an existing project:
@@ -9506,7 +9506,7 @@
 	<h3 class='topic' onclick='toggle(this)'>5.1 - juneau-examples-core</h3>
 	<div class='topic'>
 	
-		<h6 class='figure'>Archive File</h6>
+		<h5 class='figure'>Archive File</h5>
 		<p class='bcode' style='width:500px;'>
 	juneau-examples-core-7.0.0.zip 
 		</p>	
@@ -9519,7 +9519,7 @@
 			<code>juneau-examples-core-7.0.0.zip</code> file. 
 		</p>
 		
-		<h6 class='topic'>Instructions on how to install juneau-examples-core project</h6>
+		<h5 class='topic'>Instructions on how to install juneau-examples-core project</h5>
 		<p>
 			Download the <code>juneau-examples-core-7.0.0.zip</code> file from the downloads page
 			(located in the binaries) and import it into your workspace as an existing project:
@@ -9546,7 +9546,7 @@
 	<h3 class='topic' onclick='toggle(this)'>5.2 - juneau-examples-rest</h3>
 	<div class='topic'>
 	
-		<h6 class='figure'>Archive File</h6>
+		<h5 class='figure'>Archive File</h5>
 		<p class='bcode' style='width:500px;'>
 	juneau-examples-rest-7.0.0.zip 
 		</p>	
@@ -9560,7 +9560,7 @@
 			using embedded Jetty.
 		</p>	
 		
-		<h6 class='topic'>Instructions on how to install juneau-examples-rest project</h6>
+		<h5 class='topic'>Instructions on how to install juneau-examples-rest project</h5>
 		<p>
 			Download the <code>juneau-examples-rest-7.0.0.zip</code> file from the downloads page
 			(located in the binaries) and import it into your workspace as an existing project:
@@ -9643,7 +9643,7 @@
 				The <l>RootResources</l> class consists entirely of annotations:
 			</p>
 			
-			<h6 class='figure'>RootResources.java</h6>
+			<h5 class='figure'>RootResources.java</h5>
 			<p class='bcode'>
 	<jd>/**
 	 * Sample REST resource showing how to implement a "router" resource page.
@@ -9685,7 +9685,7 @@
 				The resource bundle contains the localized strings for the resource:
 			</p>
 			
-			<h6 class='figure'>RootResources.properties</h6>
+			<h5 class='figure'>RootResources.properties</h5>
 			<p class='bcode'>
 	<cc>#--------------------------------------------------------------------------------
 	# RootResources labels
@@ -9709,7 +9709,7 @@
 				For example, the <l>HelloWorldResource</l> class is annotated as follows:
 			</p>
 			
-			<h6 class='figure'>HelloWorldResource.java</h6>
+			<h5 class='figure'>HelloWorldResource.java</h5>
 			<p class='bcode'>
 	<ja>@RestResource</ja>(messages=<js>"nls/HelloWorldResource"</js>, path=<js>"/helloWorld"</js>)
 	<jk>public class</jk> HelloWorldResource <jk>extends</jk> Resource {
@@ -9751,7 +9751,7 @@
 				The <l>HelloWorldResource</l> class is a simple resource that prints a "Hello world!" message.
 			</p>
 			
-			<h6 class='figure'>HelloWorldResource.java</h6>
+			<h5 class='figure'>HelloWorldResource.java</h5>
 			<p class='bcode'>
 	<jd>/** 
 	* Sample REST resource that prints out a simple "Hello world!" message. 
@@ -9777,7 +9777,7 @@
 	}
 			</p>
 			
-			<h6 class='figure'>HelloWorldResource.properties</h6>
+			<h5 class='figure'>HelloWorldResource.properties</h5>
 			<p class='bcode'>
 	<cc>#--------------------------------------------------------------------------------
 	# HelloWorldResource labels
@@ -9844,7 +9844,7 @@
 				as either annotated Java parameters, or through methods on the <l>RestRequest</l> object.
 			</p>
 			
-			<h6 class='figure'>MethodExampleResource.java</h6>
+			<h5 class='figure'>MethodExampleResource.java</h5>
 			<p class='bcode'>				
 	<jd>/** 
 	* Sample REST resource that shows how to define REST methods and OPTIONS pages 
@@ -10038,7 +10038,7 @@
 				Notice how the conversion to POJOs is automatically done for us, even for non-standard POJOs such as UUID.
 			</p>
 			
-			<h6 class='topic'>Self-documenting design through Swagger OPTIONS pages</h6>
+			<h5 class='topic'>Self-documenting design through Swagger OPTIONS pages</h5>
 			<p>
 				One of the main features of Juneau is that it produces OPTIONS pages for self-documenting design (i.e. REST 
 				interfaces that document themselves).
@@ -10069,7 +10069,7 @@
 				the following Java method:
 			</p>
 			
-			<h6 class='figure'>RestServletDefault.java</h6>
+			<h5 class='figure'>RestServletDefault.java</h5>
 			<p class='bcode'>
 	<jd>/** OPTIONS request handler */</jd>
 	<ja>@RestMethod</ja>(name=<jsf>OPTIONS</jsf>, path=<js>"/*"</js>)
@@ -10103,7 +10103,7 @@
 					parameters.
 			</p> 	
 				
-			<h6 class='figure'>MethodExampleResource.properties</h6>
+			<h5 class='figure'>MethodExampleResource.properties</h5>
 			<p class='bcode'>
 	<cc>#--------------------------------------------------------------------------------
 	# MethodExampleResource labels
@@ -10158,7 +10158,7 @@
 				The class is shown below:
 			</p>
 			
-			<h6 class='figure'>UrlEncodedFormResource.java</h6>
+			<h5 class='figure'>UrlEncodedFormResource.java</h5>
 			<p class='bcode'>
 	<jd>/** 
 	* Sample REST resource for loading URL-Encoded form posts into POJOs. 
@@ -10196,7 +10196,7 @@
 					file located in the same package as the class:
 			</p>
 			
-			<h6 class='figure'>UrlEncodedForm.html</h6>
+			<h5 class='figure'>UrlEncodedForm.html</h5>
 			<b>TODO - Needs update</b>
 			<p class='bcode'>
 	<xt>&lt;html&gt;</xt> 
@@ -10249,7 +10249,7 @@
 				The <l>$L</l> variables are string variable that pull in localized values from the resource bundle:
 			</p>
 			
-			<h6 class='figure'>UrlEncodedFormResource.properties</h6>
+			<h5 class='figure'>UrlEncodedFormResource.properties</h5>
 			<p class='bcode'>
 	<cc>#--------------------------------------------------------------------------------
 	# UrlEncodedFormResource labels
@@ -10325,7 +10325,7 @@
 	}
 			</p>
 			
-			<h6 class='toc'>Additional Information</h6>
+			<h5 class='toc'>Additional Information</h5>
 			<ul class='toc'>
 				<li class='jm'>
 					{@link org.apache.juneau.rest.RestContextBuilder#vars(Class[])} 
@@ -10364,7 +10364,7 @@
 				The class is shown below:
 			</p>
 			
-			<h6 class='figure'>RequestEchoResource.java</h6>
+			<h5 class='figure'>RequestEchoResource.java</h5>
 			<p class='bcode'>
 	<jd>/** 
 	 * Sample REST resource for echoing HttpServletRequests back to the browser
@@ -10423,7 +10423,7 @@
 				as follows:
 			</p>
 			
-			<h6 class='figure'>Hypothetical RequestEchoResource.createSerializers() method</h6>
+			<h5 class='figure'>Hypothetical RequestEchoResource.createSerializers() method</h5>
 			<p class='bcode'>
 	<jd>/** Override the default rest serializers to add some transforms through an INIT hook*/</jd>
 	<ja>@RestHook</ja>(<jsf>INIT</jsf>)
@@ -10540,7 +10540,7 @@
 					defining these namespaces.
 				</p>
 				
-				<h6 class='figure'>package-info.java</h6>
+				<h5 class='figure'>package-info.java</h5>
 				<p class='bcode'>		
 	<jc>// XML and RDF namespaces used in this package</jc>
 	<ja>@Xml</ja>(ns=<js>"ab"</js>,
@@ -10566,7 +10566,7 @@
 					Our address book uses the following interface:
 				</p>	
 				
-				<h6 class='figure'>IAddressBook.java</h6>
+				<h5 class='figure'>IAddressBook.java</h5>
 				<p class='bcode'>
 	<jd>/** 
 	* Interface used to help illustrate proxy interfaces. 
@@ -10597,7 +10597,7 @@
 	} 
 				</p>
 				
-				<h6 class='topic'>Notes</h6>
+				<h5 class='topic'>Notes</h5>
 				<ul class='spaced-list'>
 					<li>
 						You interface an interface for our address book so that you can later
@@ -10608,7 +10608,7 @@
 					It maintains a list of <l>Person</l> objects with some additional convenience methods:
 				</p>	
 				
-				<h6 class='figure'>AddressBook.java</h6>
+				<h5 class='figure'>AddressBook.java</h5>
 				<p class='bcode'>
 	<jd>/** Address book bean */</jd>
 	<jk>public class</jk> AddressBook <jk>extends</jk> LinkedList&lt;Person&gt; <jk>implements</jk> IAddressBook {
@@ -10687,7 +10687,7 @@
 	} 
 				</p>
 				
-				<h6 class='topic'>Notes</h6>
+				<h5 class='topic'>Notes</h5>
 				<ul class='spaced-list'>
 					<li>
 						The <code><ja>@Xml</ja>(elementName=<js>"addressBook"</js>)</code> annotation tells the toolkit that 
@@ -10708,7 +10708,7 @@
 					The <l>Person</l> bean is defined as follows:
 				</p>
 				
-				<h6 class='figure'>Person.java</h6>
+				<h5 class='figure'>Person.java</h5>
 				<p class='bcode'>
 	<jd>/** Person bean */</jd>
 	<ja>@Xml</ja>(ns=<js>"per"</js>)
@@ -10761,7 +10761,7 @@
 	}
 				</p>
 				
-				<h6 class='topic'>Notes</h6>
+				<h5 class='topic'>Notes</h5>
 				<ul class='spaced-list'>
 					<li>
 						The <l>ns="per"</l> annotations override the default <l>"ab"</l> namespace defined on the package.
@@ -10781,7 +10781,7 @@
 					The <l>Address</l> bean is defined as follows:
 				</p>
 				
-				<h6 class='figure'>Address.java</h6>
+				<h5 class='figure'>Address.java</h5>
 				<p class='bcode'>
 	<jd>/** 
 	* Address bean 
@@ -10821,7 +10821,7 @@
 	}
 				</p>
 				
-				<h6 class='topic'>Notes</h6>
+				<h5 class='topic'>Notes</h5>
 				<ul class='spaced-list'>
 					<li>
 						This class shows how the namespace can be overridden at the property level through the 
@@ -10831,7 +10831,7 @@
 					The <l>CreatePerson</l> bean is used as the input data for creating a person.
 				</p>
 				
-				<h6 class='figure'>CreatePerson.java</h6>
+				<h5 class='figure'>CreatePerson.java</h5>
 				<p class='bcode'>
 	<jd>/** Bean for creating a new person */</jd>
 	<ja>@Xml</ja>(ns=<js>"per"</js>)
@@ -10855,7 +10855,7 @@
 					The <l>CreateAddress</l> bean is used as the input data for creating an address.
 				</p>
 				
-				<h6 class='figure'>CreateAddress.java</h6>
+				<h5 class='figure'>CreateAddress.java</h5>
 				<p class='bcode'>
 	<jd>/** Bean for creating a new address */</jd>
 	<ja>@Xml</ja>(ns=<js>"addr"</js>)
@@ -10882,7 +10882,7 @@
 					The <l>AddressBookResource</l> class is our REST resource class. 
 				</p>
 				
-				<h6 class='figure'>AddressBookResource.java</h6>
+				<h5 class='figure'>AddressBookResource.java</h5>
 				<p class='bcode'>
 	<jd>/** 
 	* Proof-of-concept resource that shows off the capabilities of working with POJO resources. 
@@ -11203,7 +11203,7 @@
 	} 	
 				</p>
 				
-				<h6 class='topic'>Notes</h6>
+				<h5 class='topic'>Notes</h5>
 				<ul class='spaced-list'>
 					<li>
 						The <l>@RestResource.messages()</l> annotation identifies 
@@ -11243,7 +11243,7 @@
 					The OPTIONS page uses the servlet resource bundle to specify the labels so that they're globalizable.
 				</p>
 				
-				<h6 class='figure'>AddressBookResource.properties</h6>
+				<h5 class='figure'>AddressBookResource.properties</h5>
 				<p class='bcode'>
 	<ck>title</ck> = <cv>AddressBook sample resource</cv>
 	<ck>description</ck> = <cv>Proof-of-concept resource that shows off the capabilities of working with POJO resources</cv>
@@ -11347,13 +11347,13 @@
 					Let's see what the output looks like in other formats:
 				</p>
 				
-				<h6 class='figure'>JSON</h6>
+				<h5 class='figure'>JSON</h5>
 				<img class='bordered' src="doc-files/Samples.AddressBookResource.Demo.3.png">
 				
-				<h6 class='figure'>Lax JSON</h6>
+				<h5 class='figure'>Lax JSON</h5>
 				<img class='bordered' src="doc-files/Samples.AddressBookResource.Demo.4.png">
 				
-				<h6 class='figure'>XML</h6>
+				<h5 class='figure'>XML</h5>
 				<img class='bordered' src="doc-files/Samples.AddressBookResource.Demo.5.png">
 				<p>
 					Notice how our <l>XML_enableNamespaces</l> and <l>XML_autoDetectNamespaces</l> settings result
@@ -11364,7 +11364,7 @@
 					<l>uri</l> properties to become XML attributes instead of elements.
 				</p>
 				
-				<h6 class='figure'>RDF/XML</h6>
+				<h5 class='figure'>RDF/XML</h5>
 				<img class='bordered' src="doc-files/Samples.AddressBookResource.Demo.6.png">
 				<p>
 					Notice how the <code><ja>@BeanProperty</ja>(uri=<jk>true</jk>)</code> annotations are used to identify 
@@ -11378,13 +11378,13 @@
 					themselves.
 				</p>
 				
-				<h6 class='figure'>HTML Schema</h6>
+				<h5 class='figure'>HTML Schema</h5>
 				<img class='bordered' src="doc-files/Samples.AddressBookResource.Demo.7.png">
 				
-				<h6 class='figure'>JSON Schema</h6>
+				<h5 class='figure'>JSON Schema</h5>
 				<img class='bordered' src="doc-files/Samples.AddressBookResource.Demo.8.png">
 				
-				<h6 class='figure'>XML Schema</h6>
+				<h5 class='figure'>XML Schema</h5>
 				<img class='bordered' src="doc-files/Samples.AddressBookResource.Demo.9.png">
 				<p>
 					Now let's see what else you can do.
@@ -11423,13 +11423,13 @@
 					functions against the data structure before serialization:
 				</p>
 				
-				<h6 class='figure'>Show only the name and addresses columns</h6>
+				<h5 class='figure'>Show only the name and addresses columns</h5>
 				<img class="bordered" src="doc-files/Samples.AddressBookResource.Queryable.1.png">
 				
-				<h6 class='figure'>Show only names that start with 'B*'</h6>
+				<h5 class='figure'>Show only names that start with 'B*'</h5>
 				<img class="bordered" src="doc-files/Samples.AddressBookResource.Queryable.2.png">
 				
-				<h6 class='figure'>Show only entries with age greater than 60</h6>
+				<h5 class='figure'>Show only entries with age greater than 60</h5>
 				<img class="bordered" src="doc-files/Samples.AddressBookResource.Queryable.3.png">
 			</div>
 		
@@ -11456,7 +11456,7 @@
 					You'll notice that the class is a stand-alone executable that can be invoked as a plain Java process.
 				</p>
 				
-				<h6 class='figure'>ClientTest.java</h6>
+				<h5 class='figure'>ClientTest.java</h5>
 				<p class='bcode'>		
 	<jd>/** 
 	* Sample client code for interacting with AddressBookResource 
@@ -11717,7 +11717,7 @@
 			</p>
 			<img class='bordered' src='doc-files/Samples.TempDirResource.2.png'>
 			
-			<h6 class='figure'>TempDirResource.java</h6>
+			<h5 class='figure'>TempDirResource.java</h5>
 			<p class='bcode'>
 	<jd>/** 
 	* Sample resource that extends DirectoryResource to open up the temp directory as a REST resource. 
@@ -11781,7 +11781,7 @@
 	}		
 			</p>
 			
-			<h6 class='figure'>TempDirResource.properties</h6>
+			<h5 class='figure'>TempDirResource.properties</h5>
 			<p class='bcode'>
 	<cc>#--------------------------------------------------------------------------------
 	# TempDirResource labels
@@ -11793,7 +11793,7 @@
 			Note how a system property variable can be defined in the properties file.
 		</p>
 		
-		<h6 class='figure'>TempDirUploadPage.html</h6>
+		<h5 class='figure'>TempDirUploadPage.html</h5>
 		<b>TODO - Needs update</b>
 		<p class='bcode'>
 	<xt>&lt;html&gt;</xt>
@@ -11843,7 +11843,7 @@
 			</p>
 			<img class='bordered' src='doc-files/Samples.AtomFeedResource.3.png'>
 			
-			<h6 class='figure'>AtomFeedResource.java</h6>
+			<h5 class='figure'>AtomFeedResource.java</h5>
 			<p class='bcode'>
 	<jd>/** 
 	* Sample resource that shows how to generate ATOM feeds. 
@@ -11958,7 +11958,7 @@
 			</p>
 			<img class='bordered' src='doc-files/Samples.DockerRegistryResource.2.png'>
 			
-			<h6 class='figure'>DockerRegistryResource.java</h6>
+			<h5 class='figure'>DockerRegistryResource.java</h5>
 			<p class='bcode'>
 	<jd>/** 
 	* Sample resource that shows how to mirror query results from a Docker registry. 
@@ -12014,7 +12014,7 @@
 				The Docker registry URL is specified in the <l>examples.cfg</l> file:
 			</p>
 			
-			<h6 class='figure'>examples.cfg</h6>
+			<h5 class='figure'>examples.cfg</h5>
 			<p class='bcode'>
 	<cc>#================================================================================
 	# DockerRegistryResource properties
@@ -12044,7 +12044,7 @@
 			</p>
 			<img class='bordered' src='doc-files/Samples.TumblrParserResource.1.png'>
 			
-			<h6 class='figure'>TumblrParserResource.java</h6>
+			<h5 class='figure'>TumblrParserResource.java</h5>
 			<p class='bcode'>
 	<ja>@RestResource</ja>( 
 		path=<js>"/tumblrParser"</js>, 
@@ -12130,7 +12130,7 @@
 			</p>
 			<img class='bordered' src='doc-files/Samples.PhotosResource.2.png'>
 			
-			<h6 class='figure'>PhotosResource.java</h6>
+			<h5 class='figure'>PhotosResource.java</h5>
 			<p class='bcode'>
 	<jd>/**
 	 * Sample resource that allows images to be uploaded and retrieved.
@@ -12277,7 +12277,7 @@
 			</p>
 			<img class='bordered' src='doc-files/Samples.JsonSchemaResource.2.png'>
 			
-			<h6 class='figure'>JsonSchemaResource.java</h6>
+			<h5 class='figure'>JsonSchemaResource.java</h5>
 			<p class='bcode'>
 	<jd>/** 
 	* Sample resource that shows how to serialize JSON-Schema documents. 
@@ -12367,7 +12367,7 @@
 			</p>
 			<img class='bordered' src='doc-files/Samples.SqlQueryResource.2.png'>
 			
-			<h6 class='figure'>SqlQueryResource.java</h6>
+			<h5 class='figure'>SqlQueryResource.java</h5>
 			<p class='bcode'>
 	<jd>/** 
 	* Sample resource that shows how Juneau can serialize ResultSets. 
@@ -12474,7 +12474,7 @@
 	} 
 			</p>
 			
-			<h6 class='figure'>SqlQueryResource.html</h6>
+			<h5 class='figure'>SqlQueryResource.html</h5>
 			<b>TODO - Needs update</b>
 			<p class='bcode'>
 	<xt>&lt;html&gt;</xt> 
@@ -12528,7 +12528,7 @@
 	<xt>&lt;/html&gt;</xt> 		
 			</p>
 			
-			<h6 class='figure'>samples.cfg</h6>
+			<h5 class='figure'>samples.cfg</h5>
 			<p class='bcode'>
 	<cc>#================================================================================
 	# SqlQueryResource properties
@@ -12563,7 +12563,7 @@
 					relatively straightforward to implement.
 			</p>
 			
-			<h6 class='figure'>ConfigResource.java</h6>
+			<h5 class='figure'>ConfigResource.java</h5>
 			<p class='bcode'>
 	<jd>/** 
 	* Shows contents of the microservice configuration file. 
@@ -12731,7 +12731,7 @@
 	} 		
 			</p>
 			
-			<h6 class='figure'>ConfigEdit.html</h6>
+			<h5 class='figure'>ConfigEdit.html</h5>
 			<b>TODO - Needs update</b>
 			<p class='bcode'>
 	<xt>&lt;html&gt;</xt> 
@@ -12804,7 +12804,7 @@
 	<h3 class='topic' onclick='toggle(this)'>6.1 - juneau-marshall</h3>
 	<div class='topic'>
 
-		<h6 class='topic'>Demarshalling vulnerabilities</h6>
+		<h5 class='topic'>Demarshalling vulnerabilities</h5>
 		<p>
 			One common security vulnerability is the ability to create arbitrary Java object instances through crafted
 			user input.  For example, support for constructing POJOs based on an input attribute defining a 
@@ -12864,7 +12864,7 @@
 			should be safe from demarshalling vulnerabilities.  
 		</p>
 		
-		<h6 class='topic'>Dependent libraries</h6>
+		<h5 class='topic'>Dependent libraries</h5>
 		<p>
 			When accessing security vulnerabilities of any library, dependent libraries must also be taken into account:
 		</p>
@@ -13033,7 +13033,7 @@
 		<p>
 		</p>
 	
-		<h6 class='topic'>juneau-marshall</h6>
+		<h5 class='topic'>juneau-marshall</h5>
 		<ul class='spaced-list'>
 			<li>
 				Significant improvements made to the internals of the Serializer and Parser classes.
@@ -13178,7 +13178,7 @@
 				New support for <a class='doclink' href='#juneau-marshall.PojoBuilders'>POJO Builders</a>.	
 		</ul>
 
-		<h6 class='topic'>juneau-dto</h6>
+		<h5 class='topic'>juneau-dto</h5>
 		<ul class='spaced-list'>
 			<li>
 				Enhancements to Swagger DTO:
@@ -13197,7 +13197,7 @@
 				</ul>
 		</ul>
 		
-		<h6 class='topic'>juneau-rest-server</h6>
+		<h5 class='topic'>juneau-rest-server</h5>
 		<ul class='spaced-list'>
 			<li>
 				The <js>"$R{...}"</js> variable has been split into the following:
@@ -13385,7 +13385,7 @@
 				</ul>
 		</ul>
 
-		<h6 class='topic'>juneau-rest-client</h6>
+		<h5 class='topic'>juneau-rest-client</h5>
 		<ul class='spaced-list'>
 			<li>
 				New configuration property {@link org.apache.juneau.rest.client.RestClient#RESTCLIENT_query} and
@@ -13403,7 +13403,7 @@
 				</ul>
 		</ul>
 
-		<h6 class='topic'>Documentation</h6>
+		<h5 class='topic'>Documentation</h5>
 		<ul class='spaced-list'>
 			<li>
 				New and updated sections in overview document:
@@ -13420,11 +13420,10 @@
 					<li><p><a class='doclink' href='#juneau-marshall.BeanIgnoreAnnotation'>@BeanIgnore Annotation</a></p>
 					<li><p><a class='doclink' href='#juneau-marshall.NamePropertyAnnotation'>@NameProperty Annotation</a></p>
 					<li><p><a class='doclink' href='#juneau-marshall.ParentPropertyAnnotation'>@ParentProperty Annotation</a></p>
-					<li><p><a class='doclink' href='#juneau-marshall.URIAnnotation'>@URI Annotation</a></p>
+					<li><p><a class='doclink' href='#juneau-marshall.URIs'>URIs</a></p>
 					<li><p><a class='doclink' href='#juneau-marshall.BeanFilters'>BeanFilters</a></p>
 					<li><p><a class='doclink' href='#juneau-marshall.StopClasses'>Stop Classes</a></p>
-					<li><p><a class='doclink' href='#juneau-marshall.SerializingToObjectMaps'>Serializing to ObjectMaps</a></p>
-					<li><p><a class='doclink' href='#juneau-marshall.SerializingReadersAndInputStreams'>Serializing Readers and InputStreams</a></p>
+					<li><p><a class='doclink' href='##juneau-marshall.BypassSerialization'>Bypass Serialization</a></p>
 				</ul>		
 			<li>
 				Updated javadocs:
@@ -13451,7 +13450,7 @@
 			<li>Eclipse Jetty:  9.4.6.v20170531 to 9.4.8.v20171121
 		</ul>
 	
-		<h6 class='topic'>juneau-marshall</h6>
+		<h5 class='topic'>juneau-marshall</h5>
 		<ul class='spaced-list'>
 			<li>New static <code>create()</code> methods for builders on serializers and parsers.
 				<br>This simplifies the syntax of creation of serializers and parsers by scratch.
@@ -13477,7 +13476,7 @@
 				Fixed some bugs in the XML parser related to whitespace and comments.
 		</ul>
 
-		<h6 class='topic'>juneau-svl</h6>
+		<h5 class='topic'>juneau-svl</h5>
 		<ul class='spaced-list'>
 			<li>New methods on {@link org.apache.juneau.svl.Var} class to restrict when nested and embedded variables
 			are resolved.
@@ -13487,7 +13486,7 @@
 				</ul>
 		</ul>
 
-		<h6 class='topic'>juneau-rest-server</h6>
+		<h5 class='topic'>juneau-rest-server</h5>
 		<ul class='spaced-list'>
 			<li>
 				New {@link org.apache.juneau.rest.annotation.RestResource#maxInput() @RestResource.maxInput()} and 
@@ -13495,7 +13494,7 @@
 				potential DoS attacks.
 		</ul>
 
-		<h6 class='topic'>juneau-microservice-server</h6>
+		<h5 class='topic'>juneau-microservice-server</h5>
 		<ul class='spaced-list'>
 			<li>
 				New pluggable console commands.
@@ -13581,20 +13580,20 @@
 			This release ups the Java prerequisite to Java 7.
 		</p>
 		
-		<h6 class='topic'>juneau-marshall</h6>
+		<h5 class='topic'>juneau-marshall</h5>
 		<ul class='spaced-list'>
 			<li>
 				New class {@link org.apache.juneau.http.HttpMethodName} with valid static string HTTP method names.
 		</ul>
 		
-		<h6 class='topic'>juneau-dto</h6>
+		<h5 class='topic'>juneau-dto</h5>
 		<ul class='spaced-list'>
 			<li>
 				Class <code>org.apache.juneau.dto.Link</code> renamed to {@link org.apache.juneau.dto.LinkString}.
 				Helps avoid confusion since there are other Link classes in the library.
 		</ul>
 
-		<h6 class='topic'>juneau-rest-server</h6>
+		<h5 class='topic'>juneau-rest-server</h5>
 		<ul class='spaced-list'>
 			<li>
 				Annotation <code><ja>@HtmlDoc</ja>(links)</code> renamed to {@link org.apache.juneau.rest.annotation.HtmlDoc#navlinks() navlinks}.
@@ -13802,7 +13801,7 @@
 			</tr>
 		</table>
 
-		<h6 class='topic'>juneau-marshall</h6>
+		<h5 class='topic'>juneau-marshall</h5>
 		<ul class='spaced-list'>
 			<li>
 				Improvements to swap support.
@@ -13963,12 +13962,12 @@
 			<li>
 				New class: {@link org.apache.juneau.utils.PojoMerge}
 			<li>
-				New doc: <a class='doclink' href='#juneau-marshallPojoAnnotation'>2.6.2 - @Pojo annotation</a>
+				New doc: <a class='doclink' href='#juneau-marshall.PojoAnnotation'>2.6.2 - @Pojo annotation</a>
 			<li>
 				New doc: <a class='doclink' href='#juneau-marshall.SerializingReadersAndInputStreams'>2.6.5 - Serializing Readers and InputStreams</a>
 		</ul>
 		
-		<h6 class='topic'>juneau-dto</h6>
+		<h5 class='topic'>juneau-dto</h5>
 		<ul class='spaced-list'>
 			<li>
 				{@link org.apache.juneau.dto.html5.HtmlElementMixed#children(Object...)} can now take in collections
@@ -13980,7 +13979,7 @@
 		</ul>
 
 
-		<h6 class='topic'>juneau-rest-server</h6>
+		<h5 class='topic'>juneau-rest-server</h5>
 		<ul class='spaced-list'>
 			<li>
 				Revamped and simplified servlet and REST-call lifecycle handling through new
@@ -14069,7 +14068,7 @@
 				parsers.
 		</ul>
 
-		<h6 class='topic'>juneau-microservice</h6>
+		<h5 class='topic'>juneau-microservice</h5>
 		<ul class='spaced-list'>
 			<li>
 				The microservice has been significantly modified to be configured via a <code>jetty.xml</code> file
@@ -14100,7 +14099,7 @@
 				Jetty thread dumps through REST calls.
 		</ul>
 
-		<h6 class='topic'>org.apache.juneau.rest.examples</h6>
+		<h5 class='topic'>org.apache.juneau.rest.examples</h5>
 		<ul class='spaced-list'>
 			<li>
 				New example of adding a menu-item widget to the Pet Store resource (including tooltips):
@@ -14117,7 +14116,7 @@
 			Juneau 6.3.1 is a minor release.
 		</p>
 
-		<h6 class='topic'>org.apache.juneau</h6>
+		<h5 class='topic'>org.apache.juneau</h5>
 		<ul class='spaced-list'>
 			<li>
 				{@link org.apache.juneau.utils.PojoQuery} improvements.
@@ -14146,7 +14145,7 @@
 				<js>""{exceptionMessage}"</js> values.
 		</ul>
 
-		<h6 class='topic'>org.apache.juneau.rest</h6>
+		<h5 class='topic'>org.apache.juneau.rest</h5>
 		<ul class='spaced-list'>
 			<li>
 				New 'light' stylesheet:
@@ -14314,7 +14313,7 @@
 				Two new variables added to <code>$R</code> variable: <js>"$R{servletClass}"</js>, <js>"$R{servletClassSimple}"</js>
 		</ul>
 
-		<h6 class='topic'>org.apache.juneau.rest.examples</h6>
+		<h5 class='topic'>org.apache.juneau.rest.examples</h5>
 		<ul class='spaced-list'>
 			<li>
 				Added CONTENT-TYPE and STYLES menu items to most pages.
@@ -14332,16 +14331,16 @@
 			arbitrary 3rd-party REST interfaces.
 		</p>
 
-		<h6 class='topic'>org.apache.juneau</h6>
+		<h5 class='topic'>org.apache.juneau</h5>
 		<ul class='spaced-list'>
 			<li>
 				New package:  {@link org.apache.juneau.http}.
 			<li>
 				Support for dynamic beans.  See {@link org.apache.juneau.annotation.BeanProperty#name() @BeanProperty.name()}.
 			<li>
-				New doc: <a class='doclink' href='#Core.VirtualBeans'>2.8 - Virtual Beans</a>
+				New doc: <code><del>2.8 - Virtual Beans</del></code>
 			<li>
-				New doc: <a class='doclink' href='#Core.JacksonComparison'>2.13 - Comparison with Jackson</a>
+				New doc: <code><del>2.13 - Comparison with Jackson</del></code>
 			<li>
 				All parsers now allow for numeric types with <js>'K'</js>/<js>'M'</js>/<js>'G'</js> suffixes to represent
 				kilobytes, megabytes, and gigabytes.
@@ -14486,7 +14485,7 @@
 			<li>New annotation property: {@link org.apache.juneau.annotation.BeanProperty#format() @BeanProperty.format()}.
 		</ul>
 
-		<h6 class='topic'>org.apache.juneau.rest</h6>
+		<h5 class='topic'>org.apache.juneau.rest</h5>
 		<ul class='spaced-list'>
 			<li>
 				MAJOR enhancements made to the REST API.
@@ -14705,7 +14704,7 @@
 			</li>
 		</ul>
 
-		<h6 class='topic'>org.apache.juneau.rest.client</h6>
+		<h5 class='topic'>org.apache.juneau.rest.client</h5>
 		<ul class='spaced-list'>
 			<li>
 				New {@link org.apache.juneau.remoteable.Path @Path} annotation for specifying path variables on remoteable interfaces.
@@ -14720,11 +14719,11 @@
 				{@link org.apache.juneau.remoteable.Header @Header},{@link org.apache.juneau.remoteable.HeaderIfNE @HeaderIfNE}, 
 		</ul>
 
-		<h6 class='topic'>org.apache.juneau.microservice</h6>
+		<h5 class='topic'>org.apache.juneau.microservice</h5>
 		<ul class='spaced-list'>
 		</ul>
 
-		<h6 class='topic'>org.apache.juneau.examples.rest</h6>
+		<h5 class='topic'>org.apache.juneau.examples.rest</h5>
 		<ul class='spaced-list'>
 			<li>
 				Many code enhancements make to examples to reflect new functionality.
@@ -14743,7 +14742,7 @@
 			Juneau 6.2.0 is a major update.
 		</p>
 
-		<h6 class='topic'>org.apache.juneau</h6>
+		<h5 class='topic'>org.apache.juneau</h5>
 		<ul class='spaced-list'>
 			<li>
 				Revamped the serializer, parser classes to use builders for creation.
@@ -14796,7 +14795,7 @@
 				<ul>
 					<li>New {@link org.apache.juneau.dto.swagger.SwaggerBuilder} class.
 					<li>Fluent-style setters added to the Swagger beans.
-					<li>Added Swagger examples <a href="#DTOs.Swagger">here</a> and in the <a class='doclink' href='org/apache/juneau/dto/swagger/package-summary.html#TOC'>org.apache.juneau.dto.swagger</a> javadocs.
+					<li>Added Swagger examples <code><del>here</del></code> and in the <a class='doclink' href='org/apache/juneau/dto/swagger/package-summary.html#TOC'>org.apache.juneau.dto.swagger</a> javadocs.
 				</ul>
 			<li>Improvements to {@link org.apache.juneau.svl.VarResolver}.
 				<ul>
@@ -14823,8 +14822,8 @@
 			<li>Support for defining interface proxies against 3rd-party REST interfaces.
 				<br>New package {@link org.apache.juneau.remoteable} for all remoteable proxy interface annotations.
 				<br><ja>@Remoteable</ja> annotation has been moved to this package.
-			<li>Updated doc: <a class='doclink' href='#Remoteable'>6 - Remoteable Services</a>
-			<li>New doc: <a class='doclink' href='#Remoteable.3rdParty'>6.1 -  Interface proxies against 3rd-party REST interfaces</a>
+			<li>Updated doc: <code><del>6 - Remoteable Services</del></code>
+			<li>New doc: <code><del>6.1 -  Interface proxies against 3rd-party REST interfaces</del></code>
 			<li>New URL-encoding serializer setting: <code><del>UrlEncodingSerializerContext.URLENC_paramFormat</del></code>.
 			<li>New methods on {@link org.apache.juneau.urlencoding.UrlEncodingSerializerBuilder}:
 			<ul>
@@ -14833,7 +14832,7 @@
 			</ul> 		
 		</ul>
 		
-		<h6 class='topic'>org.apache.juneau.rest</h6>
+		<h5 class='topic'>org.apache.juneau.rest</h5>
 		<ul class='spaced-list'>
 			<li>{@link org.apache.juneau.rest.annotation.RestResource @RestResource} annotation can now be applied to 
 				any class!  You're no longer restricted to subclassing your resources from {@link org.apache.juneau.rest.RestServlet}.
@@ -14946,7 +14945,7 @@
 			<li>{@link org.apache.juneau.rest.annotation.RestMethod#name() @RestMethod.name()} annotation is now optional.  Defaults to <js>"GET"</js>.
 		</ul>
 
-		<h6 class='topic'>org.apache.juneau.rest.client</h6>
+		<h5 class='topic'>org.apache.juneau.rest.client</h5>
 		<ul class='spaced-list'>
 			<li>Revamped the client API to use builders.
 			<li>New doc: <a class='doclink' href='org/apache/juneau/rest/client/package-summary.html#Debugging'>1.5 - Debugging</a>
@@ -15021,7 +15020,7 @@
 				</ul>			
 		</ul>
 		
-		<h6 class='topic'>org.apache.juneau.microservice</h6>
+		<h5 class='topic'>org.apache.juneau.microservice</h5>
 		<ul class='spaced-list'>
 			<li><js>"REST/port"</js> configuration setting can now be a comma-limited list of port numbers to try.
 				<br>You can also specify one or more <code>0</code>s to try a random port.
@@ -15048,7 +15047,7 @@
 			It also makes several improvements to the HTML and XML serialization support and introduces HTML5 DTO beans.
 		</p>
 
-		<h6 class='topic'>org.apache.juneau</h6>
+		<h5 class='topic'>org.apache.juneau</h5>
 		<ul class='spaced-list'>
 			<li>Improvements to XML serialization support.
 				<ul>
@@ -15157,7 +15156,7 @@
 				<li>All fields are now final which should improve overall performance.
 				<li>Replaced support for <code>toObjectMap()</code> and <code>fromObjectMap()/T(ObjectMap)</code> methods with
 					generalized <code>swap(BeanSession)</code>/<code>unswap(BeanSession,X)</code>/<code>T(BeanSession,X)</code> methods.<br>
-					See new section <a class='doclink' href='#Core.SwapMethods'>Swap methods</a> for information.
+					See new section <code><del>Swap methods</del></code> for information.
 			</ul>
 			<li>Session-level media type now available through {@link org.apache.juneau.BeanSession#getMediaType()} method.
 				Allows for swaps and serializer/parser behavior to be tailored to individual media types.
@@ -15210,7 +15209,7 @@
 			<li>New {@link org.apache.juneau.BeanContext#getClassMeta(Type,Type...)} and {@link org.apache.juneau.BeanSession#getClassMeta(Type,Type...)}
 				methods for retrieving Map and Collection class metas.  
 				Replaces the various <code>getMapClassMeta()</code>/<code>getCollectionClassMeta()</code> methods.  
-			<li>New section added to this document:	<a class='doclink' href='#DTOs'>Juneau Data Transfer Objects (org.apache.juneau.dto)</a>
+			<li>New section added to this document:	<code><del>Juneau Data Transfer Objects (org.apache.juneau.dto)</del></code>
 			<li>Modified the UON specification to work with mixed content.
 			<ul>
 				<li>The new specification is considerably cleaner and eliminates the need for separate normal/simple modes.
@@ -15236,7 +15235,7 @@
 				properties into a single <code><del>SerializerContext.SERIALIZER_useWhitespace</del></code> setting.
 		</ul>
 		
-		<h6 class='topic'>org.apache.juneau.rest</h6>
+		<h5 class='topic'>org.apache.juneau.rest</h5>
 		<ul class='spaced-list'>
 			<li>{@link org.apache.juneau.rest.RestRequest} now passes locale and timezone to serializers/parsers/transforms.
 			<li><code><del>RestRequest.getTimeZone()</del></code> method.
@@ -15276,7 +15275,7 @@
 			Juneau 6.0.1 is a minor update.
 		</p>
 
-		<h6 class='topic'>org.apache.juneau</h6>
+		<h5 class='topic'>org.apache.juneau</h5>
 		<ul class='spaced-list'>
 			<li>General improvements to JSON parser.
 				<ul>
@@ -15305,7 +15304,7 @@
 			The major change is rebranding from "Juno" to "Juneau" in preparation for donation to the Apache Foundation.
 		</p>
 
-		<h6 class='topic'>org.apache.juneau</h6>
+		<h5 class='topic'>org.apache.juneau</h5>
 		<ul class='spaced-list'>
 			<li>Major changes around how serializer and parser class properties are defined to improve performance
 				and concurrency.
@@ -15396,7 +15395,7 @@
 			<li>Introduced {@link org.apache.juneau.dto.swagger Swagger DTOs}.
 		</ul>		
 
-		<h6 class='topic'>org.apache.juneau.rest</h6>
+		<h5 class='topic'>org.apache.juneau.rest</h5>
 		<ul class='spaced-list'>
 			<li>OPTIONS pages replaced with Swagger documents.
 				Lots of changes related to supporting Swagger.
@@ -15450,7 +15449,7 @@
 			</li>
 		</ul>
 		
-		<h6 class='topic'>org.apache.juneau.rest.client</h6>
+		<h5 class='topic'>org.apache.juneau.rest.client</h5>
 		<ul class='spaced-list'>
 			<li>Removed the <code>JazzRestClient</code> class.
 			<li>New method <code><del>RestClient.setClientVersion(String)</del></code>.
@@ -15465,7 +15464,7 @@
 			Juno 5.2.0.1 is a moderate update.
 		</p>
 
-		<h6 class='topic'>com.ibm.team.juno</h6>
+		<h5 class='topic'>com.ibm.team.juno</h5>
 		<ul class='spaced-list'>
 			<li>Improved support for multi-line values in config files.
 				Any line that begins with whitespace is interpreted as a continuation of the previous line.
@@ -15500,7 +15499,7 @@
 			<li>Default value for <code><del>XmlParserContext.XML_trimWhitespace</del></code> changed to <jk>true</jk>.			
 		</ul>
 
-		<h6 class='topic'>Server</h6>
+		<h5 class='topic'>Server</h5>
 		<ul class='spaced-list'>
 			<li>New methods on {@link org.apache.juneau.rest.RestContext}:
 				<ul>
@@ -15508,7 +15507,7 @@
 				</ul>
 		</ul>
 
-		<h6 class='topic'>Client</h6>
+		<h5 class='topic'>Client</h5>
 		<ul class='spaced-list'>
 			<li>Fixed potential issue in {@link org.apache.juneau.rest.client.RestClient} where the HTTP connection pool could end up exhausted if an error occurred.
 			<li>Improved thread safety on {@link org.apache.juneau.rest.client.RestClient}.
@@ -15526,7 +15525,7 @@
 			Major changes have been made to the microservice architecture and config INI file APIs.
 		</p>
 		
-		<h6 class='topic'>Core</h6>
+		<h5 class='topic'>Core</h5>
 		<ul class='spaced-list'>
 			<li>Significant changes and enhancements to the <a class='doclink' href='org/apache/juneau/ini/package-summary.html#TOC'>org.apache.juneau.ini</a> API.
 				<ul>
@@ -15713,7 +15712,7 @@
 			<li>New {@link org.apache.juneau.utils.PojoQuery} modified to handle bean getters that throw exceptions.
 		</ul>
 
-		<h6 class='topic'>Client</h6>
+		<h5 class='topic'>Client</h5>
 		<ul class='spaced-list'>
 			<li>Upgraded to use Apache HttpClient 4.5.
 			<li>New classes:
@@ -15825,7 +15824,7 @@
 				</ul>
 		</ul>
 
-		<h6 class='topic'>Server</h6>
+		<h5 class='topic'>Server</h5>
 		<ul class='spaced-list'>
 			<li>New {@link org.apache.juneau.rest.ReaderResource} class.   
 				Represents the contents of a text file with convenience methods for resolving
@@ -15885,7 +15884,7 @@
 			<li>New {@link org.apache.juneau.rest.RestUtils#trimPathInfo(StringBuffer,String,String)} method.
 		</ul>
 
-		<h6 class='topic'>Microservice</h6>
+		<h5 class='topic'>Microservice</h5>
 		<ul class='spaced-list'>
 			<li>Completely revamped API.
 			<li>New {@link org.apache.juneau.microservice.Microservice} class that serves as a generic
@@ -15924,19 +15923,19 @@
 				</ul>
 		</ul>
 		
-		<h6 class='topic'>Samples</h6>
+		<h5 class='topic'>Samples</h5>
 		<ul class='spaced-list'>
 			<li>Converted to a REST microservice.
 			<li>Look-and-feel changed to IBM DevOps.
 		</ul>
 		
-		<h6 class='topic'>Documentation Updates</h6>
+		<h5 class='topic'>Documentation Updates</h5>
 		<ul class='spaced-list'>
 			<li><a href='org/apache/juneau/microservice/package-summary.html#TOC'>org.apache.juneau.microservice</a> - New package-level javadoc.
 			<li><a href='org/apache/juneau/ini/package-summary.html#TOC'>org.apache.juneau.ini</a> - New package-level javadoc.
 			<li><del><code>StringVarResolver</code></del> - New documentation.
 			<li><a href='org/apache/juneau/client/package-summary.html#TOC'>org.apache.juneau.rest.client</a> - New package-level javadoc.
-			<li><a href='#Samples'>Overview / Samples</a> - New section.
+			<li><code><del>Overview / Samples</del></code> - New section.
 			<li><a href='org/apache/juneau/transform/package-summary.html#StopClasses'>org.apache.juneau.transform / Stop Classes</a> - New section.
 			<li><a href='org/apache/juneau/server/package-summary.html#TOC'>org.apache.juneau.rest</a> - Extensive updates.
 		</ul>
@@ -15951,7 +15950,7 @@
 			The biggest improvement is the ability to associate external INI config files with REST servlets using the {@link org.apache.juneau.ini.ConfigFile} functionality.
 		</p>
 		
-		<h6 class='topic'>Core</h6>
+		<h5 class='topic'>Core</h5>
 		<ul class='spaced-list'>
 			<li>Significant API changes to <a class='doclink' href='org/apache/juneau/ini/package-summary.html#TOC'>org.apache.juneau.ini</a> API.
 				<ul>
@@ -15980,7 +15979,7 @@
 				This affects the way most parsers handle blank values.
 		</ul>
 		
-		<h6 class='topic'>Server</h6>
+		<h5 class='topic'>Server</h5>
 		<ul class='spaced-list'>
 			<li>You can now parse into non-static inner classes of a servlet for parameters/attributes/content.
 				Useful if you like to define your marshaller beans inside your servlet.
@@ -16026,7 +16025,7 @@
 				</ul>
 		</ul>
 				
-		<h6 class='topic'>Microservice</h6>
+		<h5 class='topic'>Microservice</h5>
 		<ul class='spaced-list'>
 			<li>New juneau-microservice.jar file that encapsulates all 3 juneau jars with code necessary for creating fast and efficent jetty-powered REST microservices.<br>
 				Contains the following:
@@ -16045,10 +16044,10 @@
 	<div class='topic'>
 		<p>
 			Juno 5.1.0.19 is a minor update in terms of core functionality.
-			But it introduces a <a class='doclink' href='#Microservices'>Microservices</a> project for building REST microservices and docker containers.
+			But it introduces a <code><del>Microservices</del></code> project for building REST microservices and docker containers.
 		</p>
 
-		<h6 class='topic'>Core</h6>
+		<h5 class='topic'>Core</h5>
 		<ul class='spaced-list'>
 			<li>Beans can now be serialized to and parsed from {@link org.apache.juneau.ObjectMap ObjectMaps}.
 				See <a class='doclink' href='org/apache/juneau/transform/package-summary.html#ToObjectMaps'>Serializing to ObjectMaps</a> for details.
@@ -16058,12 +16057,12 @@
 			<li>Behavior change on <del><code>StringVarResolver</code></del>.  <jk>null</jk> input now results in blank strings instead of <jk>null</jk>.
 		</ul>
 		
-		<h6 class='topic'>Client</h6>
+		<h5 class='topic'>Client</h5>
 		<ul class='spaced-list'>
 			<li>New {@link org.apache.juneau.rest.client.RestClient#doCallback(String)} method.
 		</ul>
 		
-		<h6 class='topic'>Server</h6>
+		<h5 class='topic'>Server</h5>
 		<ul class='spaced-list'>
 			<li>New {@link org.apache.juneau.rest.RestRequest#getHeaders()} method.
 			<li>New <code>RestResponse.getUnbufferedWriter()</code> method.
@@ -16085,7 +16084,7 @@
 			Juno 5.1.0.18 is a minor update affecting the server component only.
 		</p>
 
-		<h6 class='topic'>Server</h6>
+		<h5 class='topic'>Server</h5>
 		<ul class='spaced-list'>
 			<li>Fixed bug where localized strings weren't resolving when using chained resource bundles.
 			<li>Servlet and method labels and descriptions can now contain embedded string variables.
@@ -16113,7 +16112,7 @@
 			Juno 5.1.0.17 is a major update.
 		</p>
 
-		<h6 class='topic'>Core</h6>
+		<h5 class='topic'>Core</h5>
 		<ul class='spaced-list'>
 			<li>{@link org.apache.juneau.BeanMap#get(Object)} and {@link org.apache.juneau.BeanMap#put(String,Object)} now
 				automatically performs filtering if filters are defined on the bean property or bean property class.
@@ -16144,7 +16143,7 @@
 		</ul>
 		
 
-		<h6 class='topic'>Server</h6>
+		<h5 class='topic'>Server</h5>
 		<ul class='spaced-list'>
 			<li>New {@link org.apache.juneau.rest.response.ZipFileListResponseHandler} class.
 			<li>Simplified labels in servlet resource bundles:
@@ -16215,7 +16214,7 @@
 			<li>Support for sorting resources by name in {@link org.apache.juneau.rest.labels.ChildResourceDescriptions}.
 		</ul>
 		
-		<h6 class='topic'>Samples</h6>
+		<h5 class='topic'>Samples</h5>
 		<ul class='spaced-list'>
 			<li>Added <code>/tempDir/upload</code> showing how to use <code>ServletFileUpload</code> with multipart form posts.
 		</ul>
@@ -16230,7 +16229,7 @@
 			Juno 5.1.0.16 is a moderate update.
 		</p>
 		
-		<h6 class='topic'>Core</h6>
+		<h5 class='topic'>Core</h5>
 		<ul class='spaced-list'>
 			<li>New methods on {@link org.apache.juneau.ClassMeta} that eliminates language-specific code in 
 				the general class metadata.
@@ -16257,14 +16256,14 @@
 			<li>FindBug fixes.
 		</ul>
 
-		<h6 class='topic'>Server</h6>
+		<h5 class='topic'>Server</h5>
 		<ul class='spaced-list'>
 			<li>New <code><del>RestRequest.getServletParentURI()</del></code> method.
 			<li>New <code>$R{servletParentURI}</code> variable.
 			<li>Removed final modifier from {@link org.apache.juneau.rest.labels.ChildResourceDescriptions}.
 		</ul>
 		
-		<h6 class='topic'>Samples</h6>
+		<h5 class='topic'>Samples</h5>
 		<ul class='spaced-list'>
 			<li>Added source code links to examples.
 		</ul>
@@ -16278,7 +16277,7 @@
 			Juno 5.1.0.15 is a minor update.
 		</p>
 		
-		<h6 class='topic'>Core</h6>
+		<h5 class='topic'>Core</h5>
 		<ul class='spaced-list'>
 			<li>New properties in <code><del>SerializerContext</del></code>:
 				<ol>
@@ -16290,7 +16289,7 @@
 			<li>Improvements in {@link org.apache.juneau.csv.CsvSerializer}.
 		</ul>
 	
-		<h6 class='topic'>Server</h6>
+		<h5 class='topic'>Server</h5>
 		<ul class='spaced-list'>
 			<li>New properties in <code>RestServletProperties</code>:
 				<ol>
@@ -16301,7 +16300,7 @@
 			<li>Improvements involving path calculations when servlets deployed outside of a war file with a context root.
 		</ul>
 		
-		<h6 class='topic'>Client</h6>
+		<h5 class='topic'>Client</h5>
 		<ul class='spaced-list'>
 			<li>New methods in {@link org.apache.juneau.rest.client.RestCall}:
 				<ol>
@@ -16340,13 +16339,13 @@
 				to invoke server-side POJO methods through client-side proxy interfaces.
 		</p>
 		
-		<h6 class='topic'>Core</h6>		
+		<h5 class='topic'>Core</h5>		
 		<ul class='spaced-list'>
 			<li>Simplified {@link org.apache.juneau.utils.PojoIntrospector} class.
 			<li>New {@link org.apache.juneau.internal.ClassUtils#getMethodSignature(Method)} method.
 		</ul>
 		
-		<h6 class='topic'>Client</h6>		
+		<h5 class='topic'>Client</h5>		
 		<ul class='spaced-list'>
 			<li>New methods in {@link org.apache.juneau.rest.client.RestClient} for working with remoteable services:
 			<ul>
@@ -16355,7 +16354,7 @@
 			</ul>
 		</ul>
 
-		<h6 class='topic'>Server</h6>		
+		<h5 class='topic'>Server</h5>		
 		<ul class='spaced-list'>
 			<li>Added a default OPTIONS page to {@link org.apache.juneau.rest.RestServletDefault} and <code><del>RestServletJenaDefault</del></code>.
 			<li><code>RestServletProperties.REST_allowMethodParam</code> has been enhanced to allow you to
@@ -16376,7 +16375,7 @@
 			Juno 5.1.0.13 is a minor update.
 		</p>
 
-		<h6 class='topic'>Core</h6>		
+		<h5 class='topic'>Core</h5>		
 		<ul class='spaced-list'>
 			<li>{@link org.apache.juneau.ClassMeta#newInstance()} method can now create new instances of arrays.
 			<li>Arguments passed to <code><del>Link</del></code> are now serialized using {@link org.apache.juneau.urlencoding.UrlEncodingSerializer}, so arbitrary POJOs can now be passed as arguments.
@@ -16388,7 +16387,7 @@
 			<li>Improved implementation of <del><code>UrlEncodingSerializer.serializeUrlPart(Object)</code></del> method.
 		</ul>
 
-		<h6 class='topic'>Server</h6>		
+		<h5 class='topic'>Server</h5>		
 		<ul class='spaced-list'>
 			<li>{@link org.apache.juneau.rest.RestConverter} API fixed to handle the existence of POJO filters.
 				{@link org.apache.juneau.rest.converters.Introspectable}/{@link org.apache.juneau.rest.converters.Queryable}/{@link org.apache.juneau.rest.converters.Traversable} classes can now work with filtered POJOs.  
@@ -16397,7 +16396,7 @@
 			<li>Fixed bug where two REST java methods mapped to the same path pattern wasn't triggering an exception when it was supposed to.
 		</ul>
 		
-		<h6 class='topic'>Client</h6>		
+		<h5 class='topic'>Client</h5>		
 		<ul class='spaced-list'>	
 			<li>New <code><del>RestCall.setRedirectMaxAttempts(int)</del></code> method to prevent endless redirection loops.
 			<li>New <code><del>RestCall#setRetryable(int,long,RetryOn)</del></code> method to automatically retry on failed connection attempts.
@@ -16413,14 +16412,14 @@
 			Juno 5.1.0.12 is a minor update.
 		</p>
 
-		<h6 class='topic'>Core</h6>		
+		<h5 class='topic'>Core</h5>		
 		<ul class='spaced-list'>
 			<li>Fixed {@link org.apache.juneau.ini.ConfigFile#isEmpty()} method.
 			<li>Changed behavior on {@link org.apache.juneau.uon.UonParser} to not treat <js>'~'</js> characters as escapes
 				unless followed by one of the following characters:  <code>( ) , $ = ~</code>.
 		</ul>
 
-		<h6 class='topic'>Client</h6>		
+		<h5 class='topic'>Client</h5>		
 		<ul class='spaced-list'>
 			<li>New class {@link org.apache.juneau.rest.client.RestCallInterceptor}.  
 				Allows responses to be inspected and modified before being processed.  
@@ -16437,7 +16436,7 @@
 			Juno 5.1.0.11 is a moderate update.
 		</p>
 
-		<h6 class='topic'>Core</h6>		
+		<h5 class='topic'>Core</h5>		
 		<ul class='spaced-list'>
 			<li>Additions to {@link org.apache.juneau.html.annotation.Html @Html} bean annotation.
 				<ul>
@@ -16466,7 +16465,7 @@
 			<li>Config INI files now support keys with name <js>"*"</js>.
 		</ul>
 
-		<h6 class='topic'>Server</h6>		
+		<h5 class='topic'>Server</h5>		
 		<ul class='spaced-list'>
 			<li>REST method parameters can now be generic types (e.g. <del><ja>@Param</ja>(<js>"foo"</js>) Map&lt;String,Integer&gt; foo</del>).
 				This applies to headers, attributes, and parameters.
@@ -16498,7 +16497,7 @@
 				of {@link org.apache.juneau.rest.RestServletDefault} and <code><del>RestServletJenaDefault</del></code>.
 		</ul>
 				
-		<h6 class='topic'>Client</h6>		
+		<h5 class='topic'>Client</h5>		
 		<ul class='spaced-list'>
 			<li>New method {@link org.apache.juneau.rest.client.RestCall#allowRedirectsOnPosts(boolean)}.
 			<li>New method <code>RestCall.peekInputStream()</code> allows you to read response bodies without interrupting execution flow.
@@ -16510,7 +16509,7 @@
 			<li>TLS support in <code>JazzRestClient</code>.
 		</ul>
 
-		<h6 class='topic'>Other changes</h6>	
+		<h5 class='topic'>Other changes</h5>	
 		<ul class='spaced-list'>
 			<li><code>samples.ear</code> and <code>samples.war</code> projects
 				have been replaced with an OSGi bundle with activated servlets in <code>juno.samples</code>.
@@ -16525,7 +16524,7 @@
 			Juno 5.1.0.10 is a moderate update.
 		</p>
 
-		<h6 class='topic'>Core</h6>		
+		<h5 class='topic'>Core</h5>		
 		<ul class='spaced-list'>
 			<li>Major changes to URL-Encoded serializer and parser.
 				<ul>
@@ -16542,7 +16541,7 @@
 			<li>New {@link org.apache.juneau.serializer.WriterSerializer#toString(Object)} method that's identical to the serialize method but throws <code>RuntimeExceptions</code> to make the serializer easier to use for debugging.
 		</ul>
 
-		<h6 class='topic'>Server</h6>		
+		<h5 class='topic'>Server</h5>		
 		<ul class='spaced-list'>
 			<li>Fixed major issue that prevented parsing URL-Encoded form posts into POJOs.
 				Calling <del><code>HttpServlet.getParameter(String)</code></del> was forcing the underlying servlet code to process the HTTP body itself, preventing the <code>UrlEncodingSerializer</code>
@@ -16557,7 +16556,7 @@
 				{@link org.apache.juneau.rest.RestServletDefault} and <code><del>RestServletJenaDefault</del></code>.
 		</ul>
 		
-		<h6 class='topic'>Client</h6>		
+		<h5 class='topic'>Client</h5>		
 		<ul class='spaced-list'>
 			<li>Moved to Apache HttpClient 4.3 to match Jazz 6.0.
 			<li>Renamed <code>RestResponseEntity</code> to {@link org.apache.juneau.rest.client.RestRequestEntity}.
@@ -16573,7 +16572,7 @@
 			<li>Renamed <code>RestClient.shutdown()</code> to {@link org.apache.juneau.rest.client.RestClient#close()} to mirror change in Apache API.		
 		</ul>
 
-		<h6 class='topic'>Samples</h6>		
+		<h5 class='topic'>Samples</h5>		
 		<ul class='spaced-list'>
 			<li>New <code>CodeFormatterResource</code> for quickly formatting Java and XML code samples in Javadocs.
 			<li>New <code>UrlEncodedFormResource</code> for showing how to work with URL-Encoded form posts.
@@ -16755,7 +16754,7 @@
 			Juno 5.1.0.3 is a moderate update.
 		</p>
 		
-		<h6 class='topic'>Core API updates</h6>
+		<h5 class='topic'>Core API updates</h5>
 		<ul class='spaced-list'>
 			<li>Ability to detect and use non-public bean classes, getters/setters, and fields using the following new properties:
 				<ul>
@@ -16788,7 +16787,7 @@
 			<li>{@link org.apache.juneau.html.HtmlDocSerializer} will now embed the data portion of the output in a <code><xt>&lt;div</xt> <xa>id</xa>=<xs>'data'</xs><xt>&gt;</xt></code> element to make it easier to extract the data portion of the page in Javascript in browsers.
 		</ul>
 
-		<h6 class='topic'>REST Server API updates</h6>
+		<h5 class='topic'>REST Server API updates</h5>
 		<ul class='spaced-list'>
 			<li>New {@link org.apache.juneau.rest.RestRequest#getJavaMethod()} method for getting access to the method used to handle a request.
 				Useful for accessing the method name or annotations during requests, such as in calls to {@link org.apache.juneau.rest.RestGuard#guard(RestRequest,RestResponse)}.
@@ -16841,7 +16840,7 @@
 		<p>
 			Juno 5.1.0.0 is a major update.
 		</p>
-		<h6 class='topic'>Major changes</h6>
+		<h5 class='topic'>Major changes</h5>
 		<ul class='spaced-list'>
 			<li>Brand new REST client API that uses Apache HttpClient for HTTP communication.<br>
 				The new client API is simply a thin layer on top of <code>HttpClient</code> that performs 
@@ -16867,7 +16866,7 @@
 				<li>New <code>org.apache.juneau.parser.Parser.parse(Object,int,ClassMeta)</code> convenience method added.
 			</ul>
 		</ul>	
-		<h6 class='topic'>Other changes</h6>
+		<h5 class='topic'>Other changes</h5>
 		<ul class='spaced-list'>
 			<li>Various new methods added to {@link org.apache.juneau.internal.StringUtils} and {@link org.apache.juneau.internal.ClassUtils}.
 			<li>Improved support on <code><del>BeanContext.getClassMetaFromString(String)</del></code>.<br>
@@ -17285,7 +17284,7 @@
 		<p>
 			Juno 5.0.0.25 is a minor update.
 		</p>
-		<h6 class='topic'>Core API updates</h6>
+		<h5 class='topic'>Core API updates</h5>
 		<ul class='spaced-list'>
 			<li>
 				New {@link org.apache.juneau.dto.ResultSetList} DTO for serializing SQL result sets to JSON/XML/HTML and so forth.
@@ -17294,7 +17293,7 @@
 				New <code>SqlQueryResource</code> class in the sample war for demonstrating the <code>ResultSetList</code> DTO.
 			</li>
 		</ul>
-		<h6 class='topic'>Server API updates</h6>
+		<h5 class='topic'>Server API updates</h5>
 		<ul class='spaced-list'>
 			<li>
 				Fixed issue with media type for CSS files being reported as <js>"text/plain"</js> instead of <js>"text/css"</js>.
@@ -17315,7 +17314,7 @@
 		<p>
 			Juno 5.0.0.24 is a major update.
 		</p>
-		<h6 class='topic'>Core API updates</h6>
+		<h5 class='topic'>Core API updates</h5>
 		<ul class='spaced-list'>
 			<li>
 				New support for {@link org.apache.juneau.dto.atom ATOM}.
@@ -17351,7 +17350,7 @@
 				Eliminated old RDF/XML serializer.
 			</li>
 		</ul>	
-		<h6 class='topic'>Documentation updates</h6>
+		<h5 class='topic'>Documentation updates</h5>
 		<ul>
 			<li>New {@link org.apache.juneau.json JSON Support Overview} document.</li>
 			<li>New {@link org.apache.juneau.xml XML Support Overview} document.</li>
@@ -17387,7 +17386,7 @@
 		<p>
 			Juno 5.0.0.22 is a minor update.
 		</p>
-		<h6 class='topic'>Core API changes</h6>
+		<h5 class='topic'>Core API changes</h5>
 		<ul class='spaced-list'>
 			<li>
 		    	New <code><ja>@Property</ja>.nls()</code> annotation for specifying localized property values.<br>
@@ -17395,7 +17394,7 @@
 		    	See the <code>AddressBookResource</code> class for an example.
 		    </li>
 		</ul>
-		<h6 class='topic'>REST Servlet API changes</h6>
+		<h5 class='topic'>REST Servlet API changes</h5>
 		<ul class='spaced-list'>
 			<li>Fix a bug where the <code>&amp;Content</code> query parameter was not always parsed correctly.</li>
 		</ul>
@@ -17408,7 +17407,7 @@
 		<p>
 			Juno 5.0.0.21 is a minor update.
 		</p>
-		<h6 class='topic'>Core API changes</h6>
+		<h5 class='topic'>Core API changes</h5>
 		<ul class='spaced-list'>
 			<li>
 				New <code><del>HtmlDocSerializerContext.HTMLDOC_navlinks</del></code> annotation for addint links to HTML page views.
@@ -17417,7 +17416,7 @@
 				Renamed the properties in <code><del>HtmlDocSerializerContext</del></code> for clarity.
 			</li>
 		</ul>		
-		<h6 class='topic'>Servlet API changes</h6>
+		<h5 class='topic'>Servlet API changes</h5>
 		<ul class='spaced-list'>
 			<li>
 				Added new <code>RestServlet.addDefaultProperties(ObjectMap,RestRequest)</code> method for programatically adding properties to the property map per request.
@@ -17444,7 +17443,7 @@
 		<p>
 			Juno 5.0.0.20 is a major update.
 		</p>
-		<h6 class='topic'>Core API changes</h6>
+		<h5 class='topic'>Core API changes</h5>
 		<ul class='spaced-list'>
 			<li>
 				New Jena-based {@link org.apache.juneau.jena.RdfSerializer} for serializing POJOs to RDF/XML, RDF/XML-ABBREV, N-Triple, Turtle, and N3.<br>
@@ -17460,7 +17459,7 @@
 				For developers concerned about performance, they can always change it back to false and specify the namespaces themselves.	
 			</li>
 		</ul>
-		<h6 class='topic'>REST server API changes</h6>
+		<h5 class='topic'>REST server API changes</h5>
 		<ul class='spaced-list'>
 			<li>
 				Allow inheritance of {@link org.apache.juneau.rest.annotation.RestResource @RestResource} annotation.<br>
@@ -17497,7 +17496,7 @@
 				These augment the existing <code>getBeanContext()</code> / <code>getSerializers()</code> / <code>getParsers()</code> methods.		
 			</li>
 		</ul>
-		<h6 class='topic'>REST client API changes</h6>
+		<h5 class='topic'>REST client API changes</h5>
 		<ul class='spaced-list'>
 			<li>
 				New <code>RestCall.setDateHeader(String,Object)</code> method for setting ISO8601 datetime headers.
@@ -17547,7 +17546,7 @@
 			However, I'm keeping it around, since it's considerably faster and uses far less memory than the Jena-based serializer since it serializes directly from POJOs to RDF/XML.<br> 
 			It may or may not be removed in the future depending on demand.
 		</p>
-		<h6 class='topic'>Other changes</h6>
+		<h5 class='topic'>Other changes</h5>
 		<ul class='spaced-list'>
 			<li>
 				New {@link org.apache.juneau.jso.JsoParser} class.  
@@ -17620,7 +17619,7 @@
 		<p>
 			Adoptions will be required if you have previously used these classes.
 		</p>
-		<h6 class='topic'>Core API changes</h6>
+		<h5 class='topic'>Core API changes</h5>
 		<ul class='spaced-list'>
 			<li>
 				New <a class='doclink' href='org/apache/juneau/serializer/package-summary.html#TOC'>org.apache.juneau.serializer</a> package.
@@ -17689,7 +17688,7 @@
 				Renamed <code>PojoSwap</code> to {@link org.apache.juneau.utils.PojoQuery} to not confuse it with the new Filter API.
 			</li>
 		</ul>
-		<h6 class='topic'>REST server API changes</h6>
+		<h5 class='topic'>REST server API changes</h5>
 		<ul class='spaced-list'>
 			<li>
 				Eliminated <code>org.apache.juneau.rest.serializers</code> and <code>org.apache.juneau.rest.parsers</code> packages.
@@ -17698,7 +17697,7 @@
 				</ul>
 			</li>
 		</ul>
-		<h6 class='topic'>REST client API changes</h6>
+		<h5 class='topic'>REST client API changes</h5>
 		<ul class='spaced-list'>
 			<li>
 				Simplified {@link org.apache.juneau.rest.client.RestClient} API.
@@ -17720,7 +17719,7 @@
 		<p>
 			Juno 5.0.0.13 is a minor update.
 		</p>
-		<h6 class='topic'>Core API changes</h6>
+		<h5 class='topic'>Core API changes</h5>
 		<ul class='spaced-list'>
 			<li>		
 				New support for relative URIs.
@@ -17745,7 +17744,7 @@
 				Removed <code>BeanProperty#id</code> annotation.
 			</li>
 		</ul>
-		<h6 class='topic'>REST server API changes</h6>
+		<h5 class='topic'>REST server API changes</h5>
 		<ul class='spaced-list'>
 			<li>
 				Improvements to {@link org.apache.juneau.rest.RestServlet} to automatically handle relative URIs in POJOs.
@@ -17768,7 +17767,7 @@
 		<p>
 			Juno 5.0.0.12 is a minor update.
 		</p>
-		<h6 class='topic'>Core API changes</h6>
+		<h5 class='topic'>Core API changes</h5>
 		<ul class='spaced-list'>
 			<li>
 				Relaxed method naming conventions when using {@link org.apache.juneau.annotation.BeanProperty @BeanProperty} annotation.<br>
@@ -17776,7 +17775,7 @@
 				Eliminated the <code>BeanProperty.method</code> annotation, since it's now unnecessary.
   			</li>
 		</ul>		
-		<h6 class='topic'>REST server API changes</h6>
+		<h5 class='topic'>REST server API changes</h5>
 		<ul class='spaced-list'>
 			<li>		
 				Significantly improved response error messages.<br> 
@@ -17804,7 +17803,7 @@
 		<p>
 			Juno 5.0.0.11 is a moderate update.
 		</p>
-		<h6 class='topic'>REST server API changes</h6>
+		<h5 class='topic'>REST server API changes</h5>
 		<ul class='spaced-list'>
 			<li>	
 				New <code>UrlEncodingRestSerializer</code> and <code>UrlEncodingRestParser</code> classes.<br>
@@ -17826,12 +17825,12 @@
 		<p>
 			Juno 5.0.0.10 is a minor update.
 		</p>
-		<h6 class='topic'>Core API changes</h6>
+		<h5 class='topic'>Core API changes</h5>
 		<ul class='spaced-list'>
 			<li>New {@link org.apache.juneau.ObjectMap#findKeyIgnoreCase(String)} method.
 			<li>HtmlSerializer will now create 2-dimensional tables for collections of mixed beans/maps if all object have the same set of property names/keys.</li>
 		</ul>
-		<h6 class='topic'>REST server API changes</h6>
+		<h5 class='topic'>REST server API changes</h5>
 		<ul class='spaced-list'>
 			<li>New <code>RestServletProperties</code> class that defines all the class-level properties that can be set on the servlet.</li>
 			<li>Properties can be set through {@link org.apache.juneau.rest.annotation.RestResource#properties() @RestResource.properties} annotation, or new <code><del>RestServlet.setProperty(String,Object)</del></code> method.</li>
@@ -17851,7 +17850,7 @@
 		<p>
 			Juno 5.0.0.9 is a moderate update.
 		</p>
-		<h6 class='topic'>Core API changes</h6>
+		<h5 class='topic'>Core API changes</h5>
 		<ul class='spaced-list'>
 			<li>
 				{@link org.apache.juneau.ini INI config file support}:
@@ -17866,7 +17865,7 @@
 			<li>Ability to use {@link org.apache.juneau.annotation.Bean @Bean} annotation to override bean identification settings.</li>
 			<li>New {@link org.apache.juneau.ObjectMap#cast(Class)} method to convert <code>ObjectMaps</code> directly to beans.</li>
 		</ul>
-		<h6 class='topic'>REST server API changes</h6>
+		<h5 class='topic'>REST server API changes</h5>
 		<ul class='spaced-list'>
 			<li>Build-in default <code>OPTIONS</code> pages.</li>
 			<li>New {@link org.apache.juneau.rest.annotation.RestResource#defaultRequestHeaders() @RestResource.defaultRequestHeaders} and {@link org.apache.juneau.rest.annotation.RestResource#defaultResponseHeaders() @RestResource.defaultResponseHeaders} annotations.</li>
@@ -17878,7 +17877,7 @@
 			<li>New <del><code>@HasParam</code></del> annotation.</li>
 			<li>Full RFC2616 support for matching <code>Accept</code> headers to serializers.</li>		
 		</ul>
-		<h6 class='topic'>Other notes</h6>
+		<h5 class='topic'>Other notes</h5>
 		<ul class='spaced-list'>
 			<li>Smaller library size (460kB).</li>
 		</ul>
@@ -17910,7 +17909,7 @@
 		<p>
 			Juno 5.0.0.7 is a major update.
 		</p>
-		<h6 class='topic'>Core API updates</h6>
+		<h5 class='topic'>Core API updates</h5>
 		<ul class='spaced-list'>
 			<li>Combined previous 3 libraries into a single library.</li>
 			<li>
@@ -18006,12 +18005,12 @@
 				Improved {@link org.apache.juneau.utils.PojoQuery} support.
 			</li>
 		</ul>
-		<h6 class='topic'>REST client updates</h6>
+		<h5 class='topic'>REST client updates</h5>
 		<ul class='spaced-list'>
 			<li>GZIP compression support.</li>
 			<li>Bug fixes.</li>
 		</ul>
-		<h6 class='topic'>REST server updates</h6>
+		<h5 class='topic'>REST server updates</h5>
 		<ul class='spaced-list'>
  			<li>
 				Support for overriding bean context and serializer properties in a REST method call through new <code><del>RestResponse.setProperty(String,Object)</del></code> method.<br>
diff --git a/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/Microservice.java b/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/Microservice.java
index 1671e2c..c15753f 100755
--- a/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/Microservice.java
+++ b/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/Microservice.java
@@ -48,7 +48,7 @@ import org.apache.juneau.utils.*;
  * Your microservice class must be specified as the <jk>Main-Class</jk> entry in the manifest file of your microservice 
  * jar file.
  * 
- * <h6 class='topic'>Microservice Configuration</h6>
+ * <h5 class='topic'>Microservice Configuration</h5>
  * 
  * This class defines the following method for accessing configuration for your microservice:
  * <ul class='spaced-list'>
@@ -60,7 +60,7 @@ import org.apache.juneau.utils.*;
  * 		{@link #getManifest()} - The manifest file for the main jar file.
  * </ul>
  * 
- * <h6 class='topic'>Entry point Method</h6>
+ * <h5 class='topic'>Entry point Method</h5>
  * 
  * Subclasses must implement a static void main method as the entry point for the microservice.
  * Typically, this method will simply consist of the following...
@@ -70,7 +70,7 @@ import org.apache.juneau.utils.*;
  * 	}
  * </p>
  * 
- * <h6 class='topic'>Lifecycle Methods</h6>
+ * <h5 class='topic'>Lifecycle Methods</h5>
  * 
  * Subclasses must implement the following lifecycle methods:
  * <ul class='spaced-list'>
@@ -82,7 +82,7 @@ import org.apache.juneau.utils.*;
  * 		{@link #kill()} - Can be used to forcibly shut down the service.  Doesn't get called during normal operation.
  * </ul>
  * 
- * <h6 class='topic'>Lifecycle Listener Methods</h6>
+ * <h5 class='topic'>Lifecycle Listener Methods</h5>
  * 
  * Subclasses can optionally implement the following event listener methods:
  * <ul class='spaced-list'>
@@ -96,7 +96,7 @@ import org.apache.juneau.utils.*;
  * 		{@link #onConfigChange(ConfigFile, Set)} - Gets executed after a config file has been modified.
  * </ul>
  * 
- * <h6 class='topic'>Other Methods</h6>
+ * <h5 class='topic'>Other Methods</h5>
  * 
  * Subclasses can optionally override the following methods to provide customized behavior:
  * <ul class='spaced-list'>
diff --git a/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/Resource.java b/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/Resource.java
index 9baf89b..efe0f44 100755
--- a/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/Resource.java
+++ b/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/Resource.java
@@ -28,7 +28,7 @@ import org.apache.juneau.svl.vars.*;
  * 	<li>
  * 		<code class='snippet'>$ARG{...}</code> - Command line arguments pulled from {@link Microservice#getArgs()}.
  * 		
- * 		<h6 class='figure'>Example:</h6>
+ * 		<h5 class='figure'>Example:</h5>
  * 		<p class='bcode'>
  * 	String firstArg = request.getVarResolver().resolve(<js>"$ARG{0}"</js>);  <jc>// First argument.</jc>
  * 	String namedArg = request.getVarResolver().resolve(<js>"$ARG{myarg}"</js>);  <jc>// Named argument (e.g. "myarg=foo"). </jc>
@@ -36,7 +36,7 @@ import org.apache.juneau.svl.vars.*;
  * 	<li>
  * 		<code class='snippet'>$MF{...}</code> - Manifest file entries pulled from {@link Microservice#getManifest()}.
  * 		
- * 		<h6 class='figure'>Example:</h6>
+ * 		<h5 class='figure'>Example:</h5>
  * 		<p class='bcode'>
  * 	String mainClass = request.getVarResolver().resolve(<js>"$MF{Main-Class}"</js>);  <jc>// Main class. </jc>
  * 		</p>
diff --git a/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/ResourceGroup.java b/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/ResourceGroup.java
index 6aae17b..7002b52 100755
--- a/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/ResourceGroup.java
+++ b/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/ResourceGroup.java
@@ -29,7 +29,7 @@ import org.apache.juneau.svl.vars.*;
  * 		<jk>$ARG{...}</jk> - Command line arguments.
  * 		<br>Resolves values from {@link Microservice#getArgs()}.
  * 		
- * 		<h6>Example:</h6>
+ * 		<h5>Example:</h5>
  * 		<p class='bcode'>
  * 	String firstArg = request.getVarResolver().resolve(<js>"$ARG{0}"</js>);  <jc>// First argument.</jc>
  * 	String namedArg = request.getVarResolver().resolve(<js>"$ARG{myarg}"</js>);  <jc>// Named argument (e.g. "myarg=foo"). </jc>
@@ -37,7 +37,7 @@ import org.apache.juneau.svl.vars.*;
  * 	<li>
  * 		<jk>$MF{...}</jk> - Manifest file entries.
  * 		
- * 		<h6>Example:</h6>
+ * 		<h5>Example:</h5>
  * 		<p class='bcode'>
  * 	String mainClass = request.getVarResolver().resolve(<js>"$MF{Main-Class}"</js>);  <jc>// Main class. </jc>
  * 		</p>
diff --git a/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/ResourceJenaGroup.java b/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/ResourceJenaGroup.java
index 01b57d3..624fe69 100644
--- a/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/ResourceJenaGroup.java
+++ b/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/ResourceJenaGroup.java
@@ -30,7 +30,7 @@ import org.apache.juneau.svl.vars.*;
  * 		<jk>$ARG{...}</jk> - Command line arguments.
  * 		<br>Resolves values from {@link Microservice#getArgs()}.
  * 		
- * 		<h6>Example:</h6>
+ * 		<h5>Example:</h5>
  * 		<p class='bcode'>
  * 	String firstArg = request.getVarResolver().resolve(<js>"$ARG{0}"</js>);  <jc>// First argument.</jc>
  * 	String namedArg = request.getVarResolver().resolve(<js>"$ARG{myarg}"</js>);  <jc>// Named argument (e.g. "myarg=foo"). </jc>
@@ -38,7 +38,7 @@ import org.apache.juneau.svl.vars.*;
  * 	<li>
  * 		<jk>$MF{...}</jk> - Manifest file entries.
  * 		
- * 		<h6>Example:</h6>
+ * 		<h5>Example:</h5>
  * 		<p class='bcode'>
  * 	String mainClass = request.getVarResolver().resolve(<js>"$MF{Main-Class}"</js>);  <jc>// Main class. </jc>
  * 		</p>
diff --git a/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/RestMicroservice.java b/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/RestMicroservice.java
index 918a578..35a48be 100755
--- a/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/RestMicroservice.java
+++ b/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/RestMicroservice.java
@@ -33,12 +33,12 @@ import org.eclipse.jetty.xml.*;
 /**
  * Entry point for Juneau microservice that implements a REST interface using Jetty on a single port.
  * 
- * <h6 class='topic'>Jetty Server Details</h6>
+ * <h5 class='topic'>Jetty Server Details</h5>
  * 
  * The Jetty server is created by the {@link #createServer()} method and started with the {@link #startServer()} method.
  * These methods can be overridden to provided customized behavior.
  * 
- * <h6 class='topic'>Defining REST Resources</h6>
+ * <h5 class='topic'>Defining REST Resources</h5>
  * 
  * Top-level REST resources are defined in the <code>jetty.xml</code> file as normal servlets.
  * 
@@ -47,7 +47,7 @@ import org.eclipse.jetty.xml.*;
  * Logging is initialized by the {@link #initLogging()} method.
  * This method can be overridden to provide customized logging behavior.
  * 
- * <h6 class='topic'>Lifecycle Listener Methods</h6>
+ * <h5 class='topic'>Lifecycle Listener Methods</h5>
  * Subclasses can optionally implement the following event listener methods:
  * <ul class='spaced-list'>
  * 	<li>
diff --git a/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/package.html b/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/package.html
index 95b4762..b74ee62 100755
--- a/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/package.html
+++ b/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/package.html
@@ -564,7 +564,7 @@
 			Extensive listener APIs.
 	</ul>
 	
-	<h6 class='topic'>Examples:</h6>
+	<h5 class='topic'>Examples:</h5>
 	<p class='bcode'>
 	<cc>#--------------------------</cc>
 	<cc># My section</cc>
@@ -632,7 +632,7 @@
 	String firstArg = cf.getString(<js>"MySection/firstArg"</js>); 
 	</p>
 	
-	<h6 class='topic'>Additional Information</h6>
+	<h5 class='section'>See Also:</h5>
 	<ul class='doctree'>
 		<li class='jp'>
 			<a href='../core/ini/package-summary.html#TOC'><l>org.apache.juneau.ini</l></a> 
@@ -669,7 +669,7 @@
 					<li><l>$I{key}, $I{key,default}</l> - Servlet initialization parameters.
 				</ul>
 				
-				<h6 class='figure'>Example usage:</h6>
+				<h5 class='figure'>Example usage:</h5>
 				<p class='bcode'>
 	<cc>#-------------------------------</cc>
 	<cc># Properties for MyHelloResource </cc>
@@ -712,7 +712,7 @@
 					<li><l>$UE{...}</l> - URL-Encode the specified value.
 				</ul>
 				
-				<h6 class='figure'>Example usage:</h6>
+				<h5 class='figure'>Example usage:</h5>
 				<p class='bcode'>
 	<cc>#-----------------------------</cc>
 	<cc># Contents of microservice.cfg </cc>
@@ -864,7 +864,7 @@
 		and parsed POJOs.
 	</p>
 	
-	<h6 class='topic'>Additional Information</h6>
+	<h5 class='section'>See Also:</h5>
 	<ul class='doctree'>
 		<li class='jp'>
 			<a href='../server/package-summary.html#TOC'><l>org.apache.juneau.rest</l></a> 
diff --git a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClient.java b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClient.java
index 80c0e0f..c7734d5 100644
--- a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClient.java
+++ b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClient.java
@@ -122,7 +122,7 @@ public class RestClient extends BeanContext {
 	public static final String RESTCLIENT_executorService = PREFIX + "executorService.o";
 
 	/**
-	 * Configuration property:  Shut down executor service on close.</b>  
+	 * Configuration property:  Shut down executor service on close.
 	 * 
 	 * <h5 class='section'>Property:</h5>
 	 * <ul>
@@ -168,7 +168,7 @@ public class RestClient extends BeanContext {
 	 * <h5 class='section'>Property:</h5>
 	 * <ul>
 	 * 	<li><b>Name:</b>  <js>"RestClient.interceptors.lo"</js>
-	 * 	<li><b>Data type:</b>  <code>List&lt;Class&lt;? <jk>implements</jk> RestCallInterceptor | RestCallInterceptor</code>&gt;</code>
+	 * 	<li><b>Data type:</b>  <code>List&lt;Class&lt;? <jk>implements</jk> RestCallInterceptor&gt; | RestCallInterceptor&gt;</code>
 	 * 	<li><b>Default:</b>  empty list.
 	 * 	<li><b>Methods:</b> 
 	 * 		<ul>
diff --git a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClientBuilder.java b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClientBuilder.java
index 7da6314..2bd7a84 100644
--- a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClientBuilder.java
+++ b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClientBuilder.java
@@ -1750,7 +1750,7 @@ public class RestClientBuilder extends BeanContextBuilder {
 	}
 
 	/**
-	 * TODO
+	 * Configuration property:  Parameter format.
 	 * 
 	 * <h5 class='section'>See Also:</h5>
 	 * <ul>
@@ -1765,7 +1765,7 @@ public class RestClientBuilder extends BeanContextBuilder {
 	}
 
 	/**
-	 * TODO
+	 * Configuration property:  Parameter format.
 	 * 
 	 * <h5 class='section'>See Also:</h5>
 	 * <ul>
diff --git a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/package.html b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/package.html
index d38e798..7e3406e 100644
--- a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/package.html
+++ b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/package.html
@@ -89,7 +89,7 @@
 		seemlessly send and receive serialized POJOs in requests and responses.  
 	</p>
 	
-	<h6 class='notes'>Features:</h6>
+	<h5 class='notes'>Features:</h5>
 	<ul class='notes'>
 		<li>
 			Converts POJOs directly to HTTP request message bodies using {@link org.apache.juneau.serializer.Serializer} 
@@ -120,7 +120,7 @@
 		<li><code>httpmime-4.5.jar</code>
 	</ul>
 	
-	<h6 class='topic'>Example:</h6>
+	<h5 class='topic'>Example:</h5>
 	<p class='bcode'>
 	<jc>// Examples below use the Juneau Address Book resource example</jc>
 
@@ -211,7 +211,7 @@
 	rc = client.doPost(<js>"http://localhost:9080/addressBook/0/addresses"</js>, newAddress).run();	
 	</p>
 	
-	<h6 class='notes'>Notes:</h6>
+	<h5 class='notes'>Notes:</h5>
 	<ul class='notes'>
 		<li>
 			The {@link org.apache.juneau.rest.client.RestClient} class exposes all the builder methods on the Apache 
@@ -233,7 +233,7 @@
 			<li>{@link org.apache.juneau.rest.client.SSLOpts#LAX} - Allows for self-signed certificates.
 		</ul>
 		
-		<h6 class='topic'>Example:</h6>
+		<h5 class='topic'>Example:</h5>
 		<p class='bcode'>
 	<jc>// Create a client that ignores self-signed or otherwise invalid certificates.</jc>
 	RestClientBuilder builder = RestClient.<jsm>create</jsm>() 
@@ -278,7 +278,7 @@
 				{@link org.apache.juneau.ini.ConfigFile} class.
 			</p>
 			
-			<h6 class='figure'>Contents of <code>MyConfig.cfg</code></h6>
+			<h5 class='figure'>Contents of <code>MyConfig.cfg</code></h5>
 			<p class='bcode'>
 		<jc>#================================================================================
 		# My Connection Settings
@@ -288,7 +288,7 @@
 		ssl = {certValidate:'LAX',hostVerify:'LAX'}
 			</p>
 			
-			<h6 class='figure'>Code that reads an <code>SSLOpts</code> bean from the config file</h6>
+			<h5 class='figure'>Code that reads an <code>SSLOpts</code> bean from the config file</h5>
 			<p class='bcode'>
 		<jc>// Read config file and set SSL options based on what's in that file.</jc>
 		ConfigFile cf = ConfigFile.<jsm>create</jsm>().build(<js>"MyConfig.cfg"</js>);
@@ -312,7 +312,7 @@
 				can be used to quickly enable BASIC authentication support.
 			</p>
 			
-			<h6 class='topic'>Example:</h6>
+			<h5 class='topic'>Example:</h5>
 			<p class='bcode'>
 	<jc>// Create a client that performs BASIC authentication using the specified user/pw.</jc>
 	RestClient restClient = RestClient.<jsm>create</jsm>() 
@@ -572,7 +572,7 @@
 			method can be used to look for a SUCCESS message in the output:
 		</p>	
 		
-		<h6 class='topic'>Example:</h6>
+		<h5 class='topic'>Example:</h5>
 		<p class='bcode'>
 	<jc>// Throw a RestCallException if SUCCESS is not found in the output.</jc>
 	restClient.doPost(<jsf>URL</jsf>)
@@ -584,7 +584,7 @@
 			It throws an exception if a failure message is detected.
 		</p>	
 		
-		<h6 class='topic'>Example:</h6>
+		<h5 class='topic'>Example:</h5>
 		<p class='bcode'>
 	<jc>// Throw a RestCallException if FAILURE or ERROR is found in the output.</jc>
 	restClient.doPost(<jsf>URL</jsf>)
@@ -602,7 +602,7 @@
 			<js>"x=number"</js> and <js>"y=string"</js> from a response body.
 		</p>	
 		
-		<h6 class='topic'>Example:</h6>
+		<h5 class='topic'>Example:</h5>
 		<p class='bcode'>
 	<jk>final</jk> List&lt;Number&gt; xList = <jk>new</jk> ArrayList&lt;Number&gt;();
 	<jk>final</jk> List&lt;String&gt; yList = <jk>new</jk> ArrayList&lt;String&gt;();
@@ -645,7 +645,7 @@
 	</div>
 	
 	<!-- ======================================================================================================== -->
-	<a id="#PipingOutput"></a>
+	<a id="PipingOutput"></a>
 	<h3 class='topic' onclick='toggle(this)'>1.4 - Piping Response Output</h3>
 	<div class='topic'>
 		<p>
@@ -660,7 +660,7 @@
 			output on a REST call.
 		</p>
 		
-		<h6 class='topic'>Example:</h6>
+		<h5 class='topic'>Example:</h5>
 		<p class='bcode'>
 	<jc>// Pipe output from REST call to System.out in real-time.</jc>
 	restClient.doPost(<jsf>URL</jsf>).byLines().pipeTo(<jk>new</jk> PrintWriter(System.<jk>out</jk>)).run();
@@ -736,7 +736,7 @@
 			These methods will cause the HTTP request and response headers and body to be logged to the specified logger.  
 		</p>
 		
-		<h6 class='topic'>Example:</h6>
+		<h5 class='topic'>Example:</h5>
 		<p class='bcode'>
 	<jc>// Log the HTTP request/response to the specified logger.</jc>
 	<jk>int</jk> rc = restClient.doGet(<jsf>URL</jsf>).logTo(<jsf>INFO</jsf>, getLogger()).run();
diff --git a/juneau-rest/juneau-rest-server-jaxrs/src/main/java/org/apache/juneau/rest/jaxrs/package.html b/juneau-rest/juneau-rest-server-jaxrs/src/main/java/org/apache/juneau/rest/jaxrs/package.html
index a69ee15..a2f7da0 100644
--- a/juneau-rest/juneau-rest-server-jaxrs/src/main/java/org/apache/juneau/rest/jaxrs/package.html
+++ b/juneau-rest/juneau-rest-server-jaxrs/src/main/java/org/apache/juneau/rest/jaxrs/package.html
@@ -111,7 +111,7 @@
 			Class or method level converters.
 	</ul>
 	
-	<h6 class='topic'>Juneau JAX-RS Provider API</h6>
+	<h5 class='topic'>Juneau JAX-RS Provider API</h5>
 	<p>
 		The Juneau JAX-RS provider API consists of the following classes:
 	</p>
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RequestBody.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RequestBody.java
index b24853a..d175245 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RequestBody.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RequestBody.java
@@ -242,7 +242,7 @@ public class RequestBody {
 	/**
 	 * Returns the HTTP body content as a simple hexadecimal character string.
 	 * 
-	 * <h6 class='section'>Example:</h6>
+	 * <h5 class='section'>Example:</h5>
 	 * <p class='bcode'>
 	 * 	0123456789ABCDEF
 	 * </p>
@@ -259,7 +259,7 @@ public class RequestBody {
 	/**
 	 * Returns the HTTP body content as a simple space-delimited hexadecimal character string.
 	 * 
-	 * <h6 class='section'>Example:</h6>
+	 * <h5 class='section'>Example:</h5>
 	 * <p class='bcode'>
 	 * 	01 23 45 67 89 AB CD EF
 	 * </p>
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RequestHeaders.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RequestHeaders.java
index c9b593a..aae4060 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RequestHeaders.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RequestHeaders.java
@@ -409,7 +409,7 @@ public class RequestHeaders extends TreeMap<String,String[]> {
 	 * <p>
 	 * Content-Types that are acceptable for the response.
 	 * 
-	 * <h6 class='figure'>Example:</h6>
+	 * <h5 class='figure'>Example:</h5>
 	 * <p class='bcode'>
 	 * 	Accept: text/plain
 	 * </p>
@@ -426,7 +426,7 @@ public class RequestHeaders extends TreeMap<String,String[]> {
 	 * <p>
 	 * Character sets that are acceptable.
 	 * 
-	 * <h6 class='figure'>Example:</h6>
+	 * <h5 class='figure'>Example:</h5>
 	 * <p class='bcode'>
 	 * 	Accept-Charset: utf-8
 	 * </p>
@@ -443,7 +443,7 @@ public class RequestHeaders extends TreeMap<String,String[]> {
 	 * <p>
 	 * List of acceptable encodings.
 	 * 
-	 * <h6 class='figure'>Example:</h6>
+	 * <h5 class='figure'>Example:</h5>
 	 * <p class='bcode'>
 	 * 	Accept-Encoding: gzip, deflate
 	 * </p>
@@ -460,7 +460,7 @@ public class RequestHeaders extends TreeMap<String,String[]> {
 	 * <p>
 	 * List of acceptable human languages for response.
 	 * 
-	 * <h6 class='figure'>Example:</h6>
+	 * <h5 class='figure'>Example:</h5>
 	 * <p class='bcode'>
 	 * 	Accept-Language: en-US
 	 * </p>
@@ -477,7 +477,7 @@ public class RequestHeaders extends TreeMap<String,String[]> {
 	 * <p>
 	 * Authentication credentials for HTTP authentication.
 	 * 
-	 * <h6 class='figure'>Example:</h6>
+	 * <h5 class='figure'>Example:</h5>
 	 * <p class='bcode'>
 	 * 	Authorization: Basic QWxhZGRpbjpvcGVuIHNlc2FtZQ==
 	 * </p>
@@ -494,7 +494,7 @@ public class RequestHeaders extends TreeMap<String,String[]> {
 	 * <p>
 	 * Used to specify directives that must be obeyed by all caching mechanisms along the request-response chain.
 	 * 
-	 * <h6 class='figure'>Example:</h6>
+	 * <h5 class='figure'>Example:</h5>
 	 * <p class='bcode'>
 	 * 	Cache-Control: no-cache
 	 * </p>
@@ -511,7 +511,7 @@ public class RequestHeaders extends TreeMap<String,String[]> {
 	 * <p>
 	 * Control options for the current connection and list of hop-by-hop request fields.
 	 * 
-	 * <h6 class='figure'>Example:</h6>
+	 * <h5 class='figure'>Example:</h5>
 	 * <p class='bcode'>
 	 * 	Connection: keep-alive
 	 * 	Connection: Upgrade
@@ -529,7 +529,7 @@ public class RequestHeaders extends TreeMap<String,String[]> {
 	 * <p>
 	 * The length of the request body in octets (8-bit bytes).
 	 * 
-	 * <h6 class='figure'>Example:</h6>
+	 * <h5 class='figure'>Example:</h5>
 	 * <p class='bcode'>
 	 * 	Content-Length: 348
 	 * </p>
@@ -546,7 +546,7 @@ public class RequestHeaders extends TreeMap<String,String[]> {
 	 * <p>
 	 * The MIME type of the body of the request (used with POST and PUT requests).
 	 * 
-	 * <h6 class='figure'>Example:</h6>
+	 * <h5 class='figure'>Example:</h5>
 	 * <p class='bcode'>
 	 * 	Content-Type: application/x-www-form-urlencoded
 	 * </p>
@@ -563,7 +563,7 @@ public class RequestHeaders extends TreeMap<String,String[]> {
 	 * <p>
 	 * The date and time that the message was originated (in "HTTP-date" format as defined by RFC 7231 Date/Time Formats).
 	 * 
-	 * <h6 class='figure'>Example:</h6>
+	 * <h5 class='figure'>Example:</h5>
 	 * <p class='bcode'>
 	 * 	Date: Tue, 15 Nov 1994 08:12:31 GMT
 	 * </p>
@@ -580,7 +580,7 @@ public class RequestHeaders extends TreeMap<String,String[]> {
 	 * <p>
 	 * Indicates that particular server behaviors are required by the client.
 	 * 
-	 * <h6 class='figure'>Example:</h6>
+	 * <h5 class='figure'>Example:</h5>
 	 * <p class='bcode'>
 	 * 	Expect: 100-continue
 	 * </p>
@@ -597,7 +597,7 @@ public class RequestHeaders extends TreeMap<String,String[]> {
 	 * <p>
 	 * The email address of the user making the request.
 	 * 
-	 * <h6 class='figure'>Example:</h6>
+	 * <h5 class='figure'>Example:</h5>
 	 * <p class='bcode'>
 	 * 	From: user@example.com
 	 * </p>
@@ -615,7 +615,7 @@ public class RequestHeaders extends TreeMap<String,String[]> {
 	 * The domain name of the server (for virtual hosting), and the TCP port number on which the server is listening.
 	 * The port number may be omitted if the port is the standard port for the service requested.
 	 * 
-	 * <h6 class='figure'>Example:</h6>
+	 * <h5 class='figure'>Example:</h5>
 	 * <p class='bcode'>
 	 * 	Host: en.wikipedia.org:8080
 	 * 	Host: en.wikipedia.org
@@ -635,7 +635,7 @@ public class RequestHeaders extends TreeMap<String,String[]> {
 	 * This is mainly for methods like PUT to only update a resource if it has not been modified since the user last
 	 * updated it.
 	 * 
-	 * <h6 class='figure'>Example:</h6>
+	 * <h5 class='figure'>Example:</h5>
 	 * <p class='bcode'>
 	 * 	If-Match: "737060cd8c284d8af7ad3082f209582d"
 	 * </p>
@@ -652,7 +652,7 @@ public class RequestHeaders extends TreeMap<String,String[]> {
 	 * <p>
 	 * Allows a 304 Not Modified to be returned if content is unchanged.
 	 * 
-	 * <h6 class='figure'>Example:</h6>
+	 * <h5 class='figure'>Example:</h5>
 	 * <p class='bcode'>
 	 * 	If-Modified-Since: Sat, 29 Oct 1994 19:43:31 GMT
 	 * </p>
@@ -669,7 +669,7 @@ public class RequestHeaders extends TreeMap<String,String[]> {
 	 * <p>
 	 * Allows a 304 Not Modified to be returned if content is unchanged, see HTTP ETag.
 	 * 
-	 * <h6 class='figure'>Example:</h6>
+	 * <h5 class='figure'>Example:</h5>
 	 * <p class='bcode'>
 	 * 	If-None-Match: "737060cd8c284d8af7ad3082f209582d"
 	 * </p>
@@ -686,7 +686,7 @@ public class RequestHeaders extends TreeMap<String,String[]> {
 	 * <p>
 	 * If the entity is unchanged, send me the part(s) that I am missing; otherwise, send me the entire new entity.
 	 * 
-	 * <h6 class='figure'>Example:</h6>
+	 * <h5 class='figure'>Example:</h5>
 	 * <p class='bcode'>
 	 * 	If-Range: "737060cd8c284d8af7ad3082f209582d"
 	 * </p>
@@ -703,7 +703,7 @@ public class RequestHeaders extends TreeMap<String,String[]> {
 	 * <p>
 	 * Only send the response if the entity has not been modified since a specific time.
 	 * 
-	 * <h6 class='figure'>Example:</h6>
+	 * <h5 class='figure'>Example:</h5>
 	 * <p class='bcode'>
 	 * 	If-Unmodified-Since: Sat, 29 Oct 1994 19:43:31 GMT
 	 * </p>
@@ -720,7 +720,7 @@ public class RequestHeaders extends TreeMap<String,String[]> {
 	 * <p>
 	 * Limit the number of times the message can be forwarded through proxies or gateways.
 	 * 
-	 * <h6 class='figure'>Example:</h6>
+	 * <h5 class='figure'>Example:</h5>
 	 * <p class='bcode'>
 	 * 	Max-Forwards: 10
 	 * </p>
@@ -737,7 +737,7 @@ public class RequestHeaders extends TreeMap<String,String[]> {
 	 * <p>
 	 * Implementation-specific fields that may have various effects anywhere along the request-response chain.
 	 * 
-	 * <h6 class='figure'>Example:</h6>
+	 * <h5 class='figure'>Example:</h5>
 	 * <p class='bcode'>
 	 * 	Pragma: no-cache
 	 * </p>
@@ -754,7 +754,7 @@ public class RequestHeaders extends TreeMap<String,String[]> {
 	 * <p>
 	 * Authorization credentials for connecting to a proxy.
 	 * 
-	 * <h6 class='figure'>Example:</h6>
+	 * <h5 class='figure'>Example:</h5>
 	 * <p class='bcode'>
 	 * 	Proxy-Authorization: Basic QWxhZGRpbjpvcGVuIHNlc2FtZQ==
 	 * </p>
@@ -771,7 +771,7 @@ public class RequestHeaders extends TreeMap<String,String[]> {
 	 * <p>
 	 * Request only part of an entity. Bytes are numbered from 0.
 	 * 
-	 * <h6 class='figure'>Example:</h6>
+	 * <h5 class='figure'>Example:</h5>
 	 * <p class='bcode'>
 	 * 	Range: bytes=500-999
 	 * </p>
@@ -788,7 +788,7 @@ public class RequestHeaders extends TreeMap<String,String[]> {
 	 * <p>
 	 * This is the address of the previous web page from which a link to the currently requested page was followed.
 	 * 
-	 * <h6 class='figure'>Example:</h6>
+	 * <h5 class='figure'>Example:</h5>
 	 * <p class='bcode'>
 	 * 	Referer: http://en.wikipedia.org/wiki/Main_Page
 	 * </p>
@@ -807,7 +807,7 @@ public class RequestHeaders extends TreeMap<String,String[]> {
 	 * Transfer-Encoding can be used, plus the "trailers" value (related to the "chunked" transfer method) to notify the
 	 * server it expects to receive additional fields in the trailer after the last, zero-sized, chunk.
 	 * 
-	 * <h6 class='figure'>Example:</h6>
+	 * <h5 class='figure'>Example:</h5>
 	 * <p class='bcode'>
 	 * 	TE: trailers, deflate
 	 * </p>
@@ -839,7 +839,7 @@ public class RequestHeaders extends TreeMap<String,String[]> {
 	 * <p>
 	 * The user agent string of the user agent.
 	 * 
-	 * <h6 class='figure'>Example:</h6>
+	 * <h5 class='figure'>Example:</h5>
 	 * <p class='bcode'>
 	 * 	User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:12.0) Gecko/20100101 Firefox/21.0
 	 * </p>
@@ -856,7 +856,7 @@ public class RequestHeaders extends TreeMap<String,String[]> {
 	 * <p>
 	 * Ask the server to upgrade to another protocol.
 	 * 
-	 * <h6 class='figure'>Example:</h6>
+	 * <h5 class='figure'>Example:</h5>
 	 * <p class='bcode'>
 	 * 	Upgrade: HTTP/2.0, HTTPS/1.3, IRC/6.9, RTA/x11, websocket
 	 * </p>
@@ -873,7 +873,7 @@ public class RequestHeaders extends TreeMap<String,String[]> {
 	 * <p>
 	 * Informs the server of proxies through which the request was sent.
 	 * 
-	 * <h6 class='figure'>Example:</h6>
+	 * <h5 class='figure'>Example:</h5>
 	 * <p class='bcode'>
 	 * 	Via: 1.0 fred, 1.1 example.com (Apache/1.1)
 	 * </p>
@@ -890,7 +890,7 @@ public class RequestHeaders extends TreeMap<String,String[]> {
 	 * <p>
 	 * A general warning about possible problems with the entity body.
 	 * 
-	 * <h6 class='figure'>Example:</h6>
+	 * <h5 class='figure'>Example:</h5>
 	 * <p class='bcode'>
 	 * 	Warning: 199 Miscellaneous warning
 	 * </p>
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java
index 93fbce6..064fcbd 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java
@@ -523,7 +523,7 @@ public final class RestContext extends BeanContext {
 	 * 	<jc>// Our customized classpath resource finder.</jc>
 	 * 	<jk>public class</jk> MyClasspathResourceFinder <jk>extends</jk> ClasspathResourceFinderBasic {
 	 * 		<ja>@Override</ja> 
-	 * 		<jk>public</jk> InputStream findResource(Class<?> baseClass, String name, Locale locale) <jk>throws</jk> IOException {
+	 * 		<jk>public</jk> InputStream findResource(Class&lt;?&gt; baseClass, String name, Locale locale) <jk>throws</jk> IOException {
 	 * 			<jc>// Do your own resolution.</jc>
 	 * 		}
 	 * 	}
@@ -3198,7 +3198,7 @@ public final class RestContext extends BeanContext {
 	 * They can be nested arbitrarily deep.
 	 * They can also return values that themselves contain other variables.
 	 * 
-	 * <h6 class='figure'>Example:</h6>
+	 * <h5 class='figure'>Example:</h5>
 	 * <p class='bcode'>
 	 * 	<ja>@RestResource</ja>(
 	 * 		messages=<js>"nls/Messages"</js>,
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestConverter.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestConverter.java
index bf48bbe..f9bf329 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestConverter.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestConverter.java
@@ -50,7 +50,7 @@ import org.apache.juneau.serializer.*;
  * Converters can also be associated at the servlet level using the {@link RestResource#converters() @RestResource.converters()} annotation.
  * <br>Applying converters at the resource level is equivalent to applying converters to each resource method individually.
  * 
- * <h6 class='topic'>How to implement</h6>
+ * <h5 class='topic'>How to implement</h5>
  * 
  * Implementers should simply implement the {@link #convert(RestRequest, Object)} and return back a 'converted' object.
  * <br>It's up to the implementer to decide what this means.
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestGuard.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestGuard.java
index a88ef9b..0e6bda7 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestGuard.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestGuard.java
@@ -32,7 +32,7 @@ import org.apache.juneau.rest.annotation.*;
  * <p>
  * If multiple guards are specified, ALL guards must pass in order for the request to proceed.
  * 
- * <h6 class='topic'>How to implement</h6>
+ * <h5 class='topic'>How to implement</h5>
  * 
  * Typically, guards will be used for permissions checking on the user making the request, but it can also be used for
  * other purposes like pre-call validation of a request.
@@ -44,7 +44,7 @@ import org.apache.juneau.rest.annotation.*;
  * <p>
  * Guards must implement a no-args constructor.
... 555 lines suppressed ...

-- 
To stop receiving notification emails like this one, please contact
jamesbognar@apache.org.

Mime
View raw message